From 6b1ebff77982a038c5d0f3e84b84da15dcbd7749 Mon Sep 17 00:00:00 2001 From: Jeff Fredrickson Date: Thu, 4 Jul 2024 22:35:17 -0600 Subject: [PATCH] address Hugo deprecations --- package-lock.json | 15 ++++++++------- package.json | 4 ++-- themes/default/layouts/_default/baseof.html | 6 +++--- themes/retro/layouts/_default/baseof.html | 6 +++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9557f9d..8796175 100644 --- a/package-lock.json +++ b/package-lock.json @@ -315,9 +315,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001488", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz", - "integrity": "sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ==", + "version": "1.0.30001639", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz", + "integrity": "sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg==", "dev": true, "funding": [ { @@ -332,7 +332,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "4.1.2", @@ -1910,9 +1911,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001488", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz", - "integrity": "sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ==", + "version": "1.0.30001639", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz", + "integrity": "sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg==", "dev": true }, "chalk": { diff --git a/package.json b/package.json index cc1859f..2eb4efe 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "Hugo-based ejeff.org website", "scripts": { "start": "concurrently npm:serve:default npm:serve:retro", - "serve:default": "hugo server --buildDrafts --buildFuture --noHTTPCache --bind 0.0.0.0 --port 1313 --verbose --disableFastRender --ignoreCache --config config.yml,config.default.yml", - "serve:retro": "hugo server --buildDrafts --buildFuture --noHTTPCache --bind 0.0.0.0 --port 1314 --verbose --disableFastRender --ignoreCache --config config.yml,config.retro.yml", + "serve:default": "hugo server --buildDrafts --buildFuture --noHTTPCache --bind 0.0.0.0 --port 1313 --logLevel info --disableFastRender --ignoreCache --config config.yml,config.default.yml", + "serve:retro": "hugo server --buildDrafts --buildFuture --noHTTPCache --bind 0.0.0.0 --port 1314 --logLevel info --disableFastRender --ignoreCache --config config.yml,config.retro.yml", "build": "npm run build:default && npm run build:retro", "build:default": "hugo --config config.yml,config.default.yml", "build:retro": "hugo --config config.yml,config.retro.yml" diff --git a/themes/default/layouts/_default/baseof.html b/themes/default/layouts/_default/baseof.html index 34c5a0f..0404615 100644 --- a/themes/default/layouts/_default/baseof.html +++ b/themes/default/layouts/_default/baseof.html @@ -11,12 +11,12 @@ - {{- if .Site.IsServer -}} + {{- if hugo.IsServer -}} {{- $random := md5 now.Unix -}} - {{- $tailwind := resources.Get "/css/tailwind.css" | resources.PostCSS | resources.ExecuteAsTemplate (printf "tailwind.dev.%s.css" $random) . -}} + {{- $tailwind := resources.Get "/css/tailwind.css" | css.PostCSS | resources.ExecuteAsTemplate (printf "tailwind.dev.%s.css" $random) . -}} {{- else -}} - {{- $tailwind := resources.Get "/css/tailwind.css" | resources.PostCSS | resources.Fingerprint | resources.Minify -}} + {{- $tailwind := resources.Get "/css/tailwind.css" | css.PostCSS | resources.Fingerprint | resources.Minify -}} {{- end -}} diff --git a/themes/retro/layouts/_default/baseof.html b/themes/retro/layouts/_default/baseof.html index d6d34a1..77f10b5 100644 --- a/themes/retro/layouts/_default/baseof.html +++ b/themes/retro/layouts/_default/baseof.html @@ -8,12 +8,12 @@ - {{- if .Site.IsServer -}} + {{- if hugo.IsServer -}} {{- $random := md5 now.Unix -}} - {{- $tailwind := resources.Get "/css/tailwind.css" | resources.PostCSS | resources.ExecuteAsTemplate (printf "tailwind.dev.%s.css" $random) . -}} + {{- $tailwind := resources.Get "/css/tailwind.css" | css.PostCSS | resources.ExecuteAsTemplate (printf "tailwind.dev.%s.css" $random) . -}} {{- else -}} - {{- $tailwind := resources.Get "/css/tailwind.css" | resources.PostCSS | resources.Fingerprint | resources.Minify -}} + {{- $tailwind := resources.Get "/css/tailwind.css" | css.PostCSS | resources.Fingerprint | resources.Minify -}} {{- end -}}