From e019cf8811e89b68cc8fe8d4318e3da74fd1c145 Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:55:03 +0200 Subject: [PATCH 1/5] Include script to generate server headers --- .gitignore | 1 + config/_default/hugo.toml | 55 ++++--- config/_default/server.toml | 61 ++++---- package-lock.json | 278 +++++++++++++++++++++++++++++++++++- package.json | 4 +- 5 files changed, 342 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 7bd14ec..b3aad27 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /_vendor /public +/prebuild resources/ node_modules/ diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index 77feef0..bd29152 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -20,17 +20,39 @@ languageCode = "en-us" defaultContentLanguage = "en" defaultContentLanguageInSubdir = false -[outputFormats.REDIR] -mediaType = "text/netlify" -baseName = "_redirects" -isPlainText = true -notAlternative = true +[outputFormats] + [outputFormats.server] + mediaType = "application/toml" + baseName = "server" + isPlainText = true + notAlternative = true + permalinkable = true + root = true + [outputFormats.netlify] + mediaType = "application/toml" + baseName = "netlify" + isPlainText = true + notAlternative = true + permalinkable = true + root = true + [outputFormats.REDIR] + mediaType = "text/netlify" + baseName = "_redirects" + isPlainText = true + notAlternative = true + [outputFormats.XML] + isPlainText = false + mediaType = "application/xml" + isHtml = false + noUgly = true + permalinkable = false + name = "xml" [mediaTypes."text/netlify"] delimiter = "" [outputs] -home = ["HTML", "RSS", "REDIR"] +home = ["HTML", "RSS", "REDIR", "netlify", "server"] [build] writeStats = true @@ -67,15 +89,6 @@ home = ["HTML", "RSS", "REDIR"] [services.googleAnalytics] # ID = "G-xxxxxxxxxx" -[outputFormats] - [outputFormats.XML] - isPlainText = false - mediaType = "application/xml" - isHtml = false - noUgly = true - permalinkable = false - name = "xml" - [minify] [minify.tdewolff.js] keepVarNames = true @@ -98,6 +111,9 @@ home = ["HTML", "RSS", "REDIR"] [[module.mounts]] source = "content" target = "content" + [[module.mounts]] + source = "data" + target = "data" [[module.mounts]] source = "i18n" target = "i18n" @@ -107,8 +123,11 @@ home = ["HTML", "RSS", "REDIR"] [[module.mounts]] source = "static" target = "static" - [[module.mounts]] - source = "netlify.toml" - target = "assets/config/netlify.toml" [[module.imports]] path = "github.com/gethinode/hinode" + +[segments] + [segments.headers] + [[segments.headers.includes]] + kind = '{home}' + output = '{netlify,server}' diff --git a/config/_default/server.toml b/config/_default/server.toml index c80d88d..fe6a908 100644 --- a/config/_default/server.toml +++ b/config/_default/server.toml @@ -1,40 +1,29 @@ +# Auto-generated file - do not modify + [[headers]] -for = '/**' -[headers.values] - Strict-Transport-Security = "max-age=31536000; includeSubDomains; preload" - X-Content-Type-Options = "nosniff" - X-XSS-Protection = "1; mode=block" - Content-Security-Policy = """\ - default-src 'self'; \ - script-src 'self' https://*.google-analytics.com https://*.googletagmanager.com; \ - style-src 'self' https://fonts.googleapis.com https://www.youtube.com; \ - object-src 'none'; \ + for = '/**' + + [headers.values] + Access-Control-Allow-Origin = '*' + Content-Security-Policy = """ base-uri 'self'; \ - connect-src 'self' - https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com; \ - font-src 'self' https://fonts.gstatic.com; \ - frame-src 'self' https://www.youtube-nocookie.com https://www.youtube.com; \ - img-src 'self' data: https://i.vimeocdn.com https://i.ytimg.com https://*.google-analytics.com https://*.googletagmanager.com https://tile.openstreetmap.org; \ + connect-src 'self' *.google-analytics.com *.analytics.google.com *.googletagmanager.com; \ + default-src 'none'; \ + font-src 'self' fonts.gstatic.com; \ + form-action 'self'; \ + frame-src player.cloudinary.com player.vimeo.com www.youtube-nocookie.com www.youtube.com; \ + img-src 'self' *.google-analytics.com *.googletagmanager.com data: *.imgix.net *.imagekit.io *.cloudinary.com i.vimeocdn.com i.ytimg.com tile.openstreetmap.org; \ manifest-src 'self'; \ - media-src 'self' \ - """ - X-Frame-Options = "SAMEORIGIN" - Referrer-Policy = "strict-origin" - Permissions-Policy = """\ - geolocation=(), \ - midi=(), \ - sync-xhr=(), \ - microphone=(), \ - camera=(), \ - magnetometer=(), \ - gyroscope=(), \ - fullscreen=(), \ - payment=() \ - """ - cache-control = """\ - max-age=0, \ - no-cache, \ - no-store, \ - must-revalidate \ + media-src 'self'; \ + object-src 'none'; \ + script-src 'self' *.google-analytics.com *.googletagmanager.com; \ + style-src 'self' www.youtube.com; \ """ - Access-Control-Allow-Origin = "*" + Permissions-Policy = 'geolocation=(), midi=(), sync-xhr=(), microphone=(), camera=(), magnetometer=(), gyroscope=(), fullscreen=(), payment=() ' + Referrer-Policy = 'strict-origin' + Strict-Transport-Security = 'max-age=31536000; includeSubDomains; preload' + X-Content-Type-Options = 'nosniff' + X-Frame-Options = 'SAMEORIGIN' + X-XSS-Protection = '1; mode=block' + cache-control = 'max-age=0, no-cache, no-store, must-revalidate ' + diff --git a/package-lock.json b/package-lock.json index 82f7b00..43f068a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gethinode/template", - "version": "0.14.0", + "version": "0.15.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gethinode/template", - "version": "0.14.0", + "version": "0.15.0", "license": "MIT", "dependencies": { "@fullhuman/postcss-purgecss": "^6.0.0", @@ -18,6 +18,7 @@ }, "devDependencies": { "@gethinode/netlify-plugin-dartsass": "^0.3.0", + "cpy-cli": "^5.0.0", "eslint": "^9.9.1", "markdownlint-cli2": "^0.14.0", "neostandard": "^0.11.4", @@ -1111,6 +1112,23 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/aggregate-error": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz", + "integrity": "sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==", + "dev": true, + "license": "MIT", + "dependencies": { + "clean-stack": "^4.0.0", + "indent-string": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -1326,6 +1344,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/arrify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz", + "integrity": "sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -1698,6 +1729,35 @@ "node": ">= 6" } }, + "node_modules/clean-stack": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-4.2.0.tgz", + "integrity": "sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/clean-stack/node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -1783,6 +1843,113 @@ } } }, + "node_modules/cp-file": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-10.0.0.tgz", + "integrity": "sha512-vy2Vi1r2epK5WqxOLnskeKeZkdZvTKfFZQCplE3XWsP+SUJyd5XAUFC9lFgTjjXJF2GMne/UML14iEmkAaDfFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.10", + "nested-error-stacks": "^2.1.1", + "p-event": "^5.0.1" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cpy": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/cpy/-/cpy-10.1.0.tgz", + "integrity": "sha512-VC2Gs20JcTyeQob6UViBLnyP0bYHkBh6EiKzot9vi2DmeGlFT9Wd7VG3NBrkNx/jYvFBeyDOMMHdHQhbtKLgHQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "arrify": "^3.0.0", + "cp-file": "^10.0.0", + "globby": "^13.1.4", + "junk": "^4.0.1", + "micromatch": "^4.0.5", + "nested-error-stacks": "^2.1.1", + "p-filter": "^3.0.0", + "p-map": "^6.0.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cpy-cli": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cpy-cli/-/cpy-cli-5.0.0.tgz", + "integrity": "sha512-fb+DZYbL9KHc0BC4NYqGRrDIJZPXUmjjtqdw4XRRg8iV8dIfghUX/WiL+q4/B/KFTy3sK6jsbUhBaz0/Hxg7IQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "cpy": "^10.1.0", + "meow": "^12.0.1" + }, + "bin": { + "cpy": "cli.js" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cpy-cli/node_modules/meow": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", + "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16.10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cpy/node_modules/globby": { + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", + "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", + "dev": true, + "license": "MIT", + "dependencies": { + "dir-glob": "^3.0.1", + "fast-glob": "^3.3.0", + "ignore": "^5.2.4", + "merge2": "^1.4.1", + "slash": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cpy/node_modules/slash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -3713,6 +3880,19 @@ "node": ">=0.8.19" } }, + "node_modules/indent-string": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", + "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -4286,6 +4466,19 @@ "node": ">=4.0" } }, + "node_modules/junk": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/junk/-/junk-4.0.1.tgz", + "integrity": "sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -4794,6 +4987,13 @@ "node": ">=10" } }, + "node_modules/nested-error-stacks": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz", + "integrity": "sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==", + "dev": true, + "license": "MIT" + }, "node_modules/netlify-plugin-hugo-cache-resources": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/netlify-plugin-hugo-cache-resources/-/netlify-plugin-hugo-cache-resources-0.2.1.tgz", @@ -5212,6 +5412,54 @@ "node": ">=12.20" } }, + "node_modules/p-event": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-5.0.1.tgz", + "integrity": "sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-timeout": "^5.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-filter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-3.0.0.tgz", + "integrity": "sha512-QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-map": "^5.1.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-filter/node_modules/p-map": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-5.5.0.tgz", + "integrity": "sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -5242,6 +5490,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-map": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-6.0.0.tgz", + "integrity": "sha512-T8BatKGY+k5rU+Q/GTYgrEf2r4xRMevAN5mtXc2aPc4rS1j3s+vWTaO2Wag94neXuCAUAs8cxBL9EeB5EA6diw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-timeout": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz", + "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", diff --git a/package.json b/package.json index 1035b89..ce1ae4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gethinode/template", - "version": "0.14.0", + "version": "0.15.0", "description": "Hinode is a clean blog theme for Hugo, an open-source static site generator", "main": "index.js", "scripts": { @@ -11,6 +11,7 @@ "build": "hugo --gc --minify", "build:cache": "npm run -s prebuild && hugo config | grep cachedir && hugo --gc --minify -e ci", "build:debug": "hugo -e debug --debug", + "build:headers": "hugo --renderSegments headers -d prebuild && cpy prebuild/server.toml config/_default/ --flat", "build:preview": "npm run build -D -F", "clean:public": "rimraf public", "clean:install": "rimraf package-lock.json node_modules", @@ -48,6 +49,7 @@ }, "devDependencies": { "@gethinode/netlify-plugin-dartsass": "^0.3.0", + "cpy-cli": "^5.0.0", "eslint": "^9.9.1", "neostandard": "^0.11.4", "markdownlint-cli2": "^0.14.0", From 9e6f44fd57d4ca366cf783294c0dbff53435b4a3 Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:56:50 +0200 Subject: [PATCH 2/5] Update purge config --- config/postcss.config.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/postcss.config.js b/config/postcss.config.js index cdf2056..5711725 100644 --- a/config/postcss.config.js +++ b/config/postcss.config.js @@ -14,15 +14,19 @@ const purgecss = require('@fullhuman/postcss-purgecss')({ ...whitelister([ './assets/scss/theme/fonts.scss', './assets/scss/theme/theme.scss', + './_vendor/github.com/gethinode/hinode/assets/scss/common/_styles.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_clipboard.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_command.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_nav.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_navbar.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_search.scss', + './_vendor/github.com/gethinode/hinode/assets/scss/components/_sidebar.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_syntax.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_syntax-dark.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_syntax-light.scss', './_vendor/github.com/gethinode/hinode/assets/scss/components/_table.scss', + './_vendor/github.com/gethinode/hinode/assets/scss/theme/fonts.scss', + './_vendor/github.com/gethinode/mod-cookieyes/v2/assets/scss/cookieyes.scss', './_vendor/github.com/gethinode/mod-flexsearch/v2/assets/scss/modules/flexsearch/flexsearch.scss', './_vendor/github.com/gethinode/mod-katex/dist/katex.scss', './_vendor/github.com/gethinode/mod-leaflet/dist/leaflet.scss', From ee0ab5bae1965031e1d174cc108bb5c01a7599c7 Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:10:01 +0200 Subject: [PATCH 3/5] Update build stats --- hugo_stats.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hugo_stats.json b/hugo_stats.json index 17367bb..b8b6558 100644 --- a/hugo_stats.json +++ b/hugo_stats.json @@ -24,8 +24,10 @@ "span", "strong", "svg", + "symbol", "title", - "ul" + "ul", + "use" ], "classes": [ "active", @@ -108,7 +110,9 @@ "ms-auto", "ms-md-3", "mt-3", + "mt-4", "mt-5", + "mt-md-0", "mx-auto", "mx-md-0", "my-auto", @@ -169,6 +173,14 @@ "top-bar" ], "ids": [ + "fa-face-frown", + "fab-github", + "fab-linkedin", + "fab-medium", + "fas-book-open", + "fas-ellipsis", + "fas-moon", + "fas-sun", "navbar-0-collapse", "navbar-mode", "navbar-mode-checkbox", From 526cbdf0a155adb9d9abec2b47da0db7b9e8146d Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:10:06 +0200 Subject: [PATCH 4/5] Upate dependencies --- go.mod | 14 ++++++++------ go.sum | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index b4518a3..cd46c92 100644 --- a/go.mod +++ b/go.mod @@ -4,16 +4,18 @@ go 1.20 require ( github.com/airbnb/lottie-web v5.12.2+incompatible // indirect - github.com/gethinode/hinode v0.26.7 // indirect + github.com/gethinode/hinode v0.27.3 // indirect github.com/gethinode/mod-bootstrap v1.3.1 // indirect + github.com/gethinode/mod-csp v1.0.3 // indirect github.com/gethinode/mod-flexsearch v1.12.1 // indirect - github.com/gethinode/mod-flexsearch/v2 v2.0.1 // indirect + github.com/gethinode/mod-flexsearch/v2 v2.0.2 // indirect github.com/gethinode/mod-fontawesome v1.10.0 // indirect + github.com/gethinode/mod-google-analytics v1.1.3 // indirect github.com/gethinode/mod-katex v1.1.2 // indirect - github.com/gethinode/mod-leaflet v1.1.1 // indirect - github.com/gethinode/mod-lottie v1.5.8 // indirect - github.com/gethinode/mod-simple-datatables v1.0.10 // indirect - github.com/gethinode/mod-utils/v2 v2.7.0 // indirect + github.com/gethinode/mod-leaflet v1.2.0 // indirect + github.com/gethinode/mod-lottie v1.5.11 // indirect + github.com/gethinode/mod-simple-datatables v1.0.14 // indirect + github.com/gethinode/mod-utils/v2 v2.8.3 // indirect github.com/nextapps-de/flexsearch v0.0.0-20240501124520-961c3ae84a87 // indirect github.com/twbs/bootstrap v5.3.3+incompatible // indirect ) diff --git a/go.sum b/go.sum index 4b9c2c5..bcc84a5 100644 --- a/go.sum +++ b/go.sum @@ -114,6 +114,10 @@ github.com/gethinode/hinode v0.26.6 h1:wHSZlUH+0qH+6ifyGXHen4+QFjuYfbgKAIM44NgrO github.com/gethinode/hinode v0.26.6/go.mod h1:55RIU/2XkuJiJyPE4DUV0J8Q0bTS7dcqhmQB4FARk5c= github.com/gethinode/hinode v0.26.7 h1:KxsuJ7n6M8DYQNasw8KOAGWUb/OsxA6SMkKDDTcvorU= github.com/gethinode/hinode v0.26.7/go.mod h1:YYtAJzvr7yTsc/7agiyDyMWm1QMHynqmR/+F5jfUrDQ= +github.com/gethinode/hinode v0.27.2 h1:31IpMXM3iDPxpc2y+yyp/gzqDUu86GuaED3DjIdC6h8= +github.com/gethinode/hinode v0.27.2/go.mod h1:lJgdmaw5yMoS8Az8nYBqikcAO1DqI0hpiX8KpOQLLVM= +github.com/gethinode/hinode v0.27.3 h1:vpJcqVo/be5s1QVmtI34CtxzMn9SkqWxO6+iSmlDCSA= +github.com/gethinode/hinode v0.27.3/go.mod h1:fPC0mX3UnMr8WlI2EK01VP89FxBNXs5/3po2f4b5Z7U= github.com/gethinode/mod-bootstrap v1.2.2 h1:Q8E04OKWr9owk7nhQ/NBukUgSFhsECxZsOLEaf5oeiQ= github.com/gethinode/mod-bootstrap v1.2.2/go.mod h1:DcpPc2cNaXUPGEvhD7npuEEPA7573NvakTlrwFbyjr8= github.com/gethinode/mod-bootstrap v1.2.5 h1:h6yAlkMZA34wJU3pLFpLxp1ynEBte/YTY4kGEQtMGPE= @@ -126,6 +130,8 @@ github.com/gethinode/mod-bootstrap v1.3.0 h1:UxNmXgXo7gA8C8z1ar47+tSccmKYpaYBBN+ github.com/gethinode/mod-bootstrap v1.3.0/go.mod h1:CL9IDot6nbXIWJYE/KxfsTdYYEJIGL17BXbAYPn+wVQ= github.com/gethinode/mod-bootstrap v1.3.1 h1:ZUX72St0WZ5tyXpEPBJlayX/dmCH3cGErzsozkUKCok= github.com/gethinode/mod-bootstrap v1.3.1/go.mod h1:CL9IDot6nbXIWJYE/KxfsTdYYEJIGL17BXbAYPn+wVQ= +github.com/gethinode/mod-csp v1.0.3 h1:tRmnuVZ3UpCc9HR8qsAwbU0OJ/UsNVSbse0SZuwGcCg= +github.com/gethinode/mod-csp v1.0.3/go.mod h1:Nb22QMicoUHgZQUKP5TCgVrSI8K3KU7jLuLBShmotjg= github.com/gethinode/mod-flexsearch v1.6.0 h1:Rjx+GLOByFLmaWD9hZXwmuKN8A89te6BZAIq2c9QBKg= github.com/gethinode/mod-flexsearch v1.6.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4= github.com/gethinode/mod-flexsearch v1.7.0 h1:VFTf6iUyT9b47jTDAxh8nVHU1eUBrdxlykaC90lTfqk= @@ -148,6 +154,8 @@ github.com/gethinode/mod-flexsearch v1.12.1 h1:clkGUWaNPe9Dt/66Apy7oH9NwVQfnD6Op github.com/gethinode/mod-flexsearch v1.12.1/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ= github.com/gethinode/mod-flexsearch/v2 v2.0.1 h1:5unGUSb1tX1LBtKygnLfdt7CnVJuFKSt6VXiKRxdojc= github.com/gethinode/mod-flexsearch/v2 v2.0.1/go.mod h1:d7MMkVlz0l6cEk76e0mkveEsDxGfu5Sv+HUIhoGguhE= +github.com/gethinode/mod-flexsearch/v2 v2.0.2 h1:5FkLbjORwKvK544H/yaAltyIB7eptRPxxh5VcfDDeqM= +github.com/gethinode/mod-flexsearch/v2 v2.0.2/go.mod h1:d7MMkVlz0l6cEk76e0mkveEsDxGfu5Sv+HUIhoGguhE= github.com/gethinode/mod-fontawesome v1.5.0 h1:3mW5dnWauuF9wSWXNIY+PPgTNPlc/xQOQoG7XGic1Yk= github.com/gethinode/mod-fontawesome v1.5.0/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI= github.com/gethinode/mod-fontawesome v1.5.1 h1:C7goQY4HrEua/lpjC++laydNKBuYo1+307ngn5tyXeM= @@ -166,6 +174,8 @@ github.com/gethinode/mod-fontawesome v1.9.1 h1:cQk84vriqffM4fuUUoM9j3SSD+3ppeW2j github.com/gethinode/mod-fontawesome v1.9.1/go.mod h1:xBKsZH3WJtMOItZVlp9SbO51uaBy6IbvUZSKpNu3b6Y= github.com/gethinode/mod-fontawesome v1.10.0 h1:Izs2AKc+YVBa1TywcH54OKLTNCUMXRoFIqOs+n0FgOo= github.com/gethinode/mod-fontawesome v1.10.0/go.mod h1:xBKsZH3WJtMOItZVlp9SbO51uaBy6IbvUZSKpNu3b6Y= +github.com/gethinode/mod-google-analytics v1.1.3 h1:24qxV5vKIex3zSdow+5r0o8rox1lrO31oGi0/XusBy4= +github.com/gethinode/mod-google-analytics v1.1.3/go.mod h1:dl628cFozpCvoIMCiV7ujzQipjxcm3eatXrSfLPWNII= github.com/gethinode/mod-katex v1.0.4 h1:NozgWPFnHhx1W+E9DnwMTRpvxPbdqdANEtwp9N3/mj8= github.com/gethinode/mod-katex v1.0.4/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg= github.com/gethinode/mod-katex v1.0.5 h1:AVhcTINYory0ygChQERf8PcyJkbT1oqhmLRF6ESnWOY= @@ -194,6 +204,8 @@ github.com/gethinode/mod-leaflet v1.1.0 h1:FXzPCic5XmUluxQ6e7LYUhhLnxuQOBwry8qjG github.com/gethinode/mod-leaflet v1.1.0/go.mod h1:Ei0x9WiL7Dbi4JeG6yI1CE63bT1QJ8sKi67Jea1wFSE= github.com/gethinode/mod-leaflet v1.1.1 h1:AIHR4k8SjmeoZxtjLgSS6/N3jKeZNZGdZTgu/7MwP4c= github.com/gethinode/mod-leaflet v1.1.1/go.mod h1:Ei0x9WiL7Dbi4JeG6yI1CE63bT1QJ8sKi67Jea1wFSE= +github.com/gethinode/mod-leaflet v1.2.0 h1:5q5LHmGNi9N4cdRDCsl/6oI8vY3oQ2ogNUjP3NCnk4Y= +github.com/gethinode/mod-leaflet v1.2.0/go.mod h1:Ei0x9WiL7Dbi4JeG6yI1CE63bT1QJ8sKi67Jea1wFSE= github.com/gethinode/mod-lottie v1.3.0 h1:vQ8CXkjdp2IeFskTzu+ZnKOEio8GtN08urVK+oCH81E= github.com/gethinode/mod-lottie v1.3.0/go.mod h1:erRCgSL2FCfKHI0jQbSpM+g0jXl7SjKVJrh7kWGteKs= github.com/gethinode/mod-lottie v1.4.0 h1:0Ls1Q/8p0gQpuX9+dtfNGKcjBNeymjE7gERdnN3lCCE= @@ -216,6 +228,8 @@ github.com/gethinode/mod-lottie v1.5.7 h1:hcf04kmKv7xrI2byxtgHwkScYIHfP9aquInHNZ github.com/gethinode/mod-lottie v1.5.7/go.mod h1:rhWg+MSSnWmqHKNEViE/9/78RjQD6uWWFASgjvFjgyo= github.com/gethinode/mod-lottie v1.5.8 h1:glg5HcjOBkFt5MoF7p24NN+RzctExPQUDXvdhPx9u6I= github.com/gethinode/mod-lottie v1.5.8/go.mod h1:Z/FlAcCJWYI1Z9tQnL0yRN4lqhyZl9CqYpfJUPVDaGc= +github.com/gethinode/mod-lottie v1.5.11 h1:xhxBPDS0iyUY+C1ANaD5EeQV7fO1FG0wMoCjgrCMi/0= +github.com/gethinode/mod-lottie v1.5.11/go.mod h1:6FKqk8c+Jkbk2udCxUKVLF1K1wrGwthPsOvRzeoPXRQ= github.com/gethinode/mod-simple-datatables v1.0.2 h1:zhqxHet3iLQWYCBbGROALpOY9zQlptMycFkz1Tto5bA= github.com/gethinode/mod-simple-datatables v1.0.2/go.mod h1:mmrcvAJU2i3SMU56VmQ5PW43uDXBcsJKcZwCHrvl3Kc= github.com/gethinode/mod-simple-datatables v1.0.3 h1:JL2nBlEHWMmkE7EZrpfpmzka47dklJUh23/xKJkOQoI= @@ -232,6 +246,8 @@ github.com/gethinode/mod-simple-datatables v1.0.9 h1:8OnpY/axFkgxJ598DHW4nDtxsCY github.com/gethinode/mod-simple-datatables v1.0.9/go.mod h1:rgQWdDZ6lTR9+08dGY1zBDLZI/UneKPufakAK20+lmI= github.com/gethinode/mod-simple-datatables v1.0.10 h1:/nYy4oCgooUJhTBgLdQzMnJEjolkD+dp2nkfLNT9Klg= github.com/gethinode/mod-simple-datatables v1.0.10/go.mod h1:rgQWdDZ6lTR9+08dGY1zBDLZI/UneKPufakAK20+lmI= +github.com/gethinode/mod-simple-datatables v1.0.14 h1:332WtbaQtTm7VP0b7zYfpogTBcOEetkJrNd01K4d/JE= +github.com/gethinode/mod-simple-datatables v1.0.14/go.mod h1:mP3yjAdVE1G6JHfv8VVsRmvaPlPwddXknI675AuVs2I= github.com/gethinode/mod-utils v1.0.0 h1:cqHm2xS5uDiJzRm1KfHaNbq6uMVDKLhQa8/BuTZ1nhY= github.com/gethinode/mod-utils v1.0.0/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE= github.com/gethinode/mod-utils v1.0.1 h1:jhZGlGFHHL1f5HXbBMXfiZ2gCz4TVafAzjnRPTIBSEE= @@ -262,6 +278,8 @@ github.com/gethinode/mod-utils/v2 v2.5.2 h1:URGTpJo0dN4/oF2yL6o2d2pkcSlG1F0hgIF9 github.com/gethinode/mod-utils/v2 v2.5.2/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY= github.com/gethinode/mod-utils/v2 v2.7.0 h1:5CKygjsc7X4dFtb90ihWyDVvUp2iqoJE8C7M+jeWYus= github.com/gethinode/mod-utils/v2 v2.7.0/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY= +github.com/gethinode/mod-utils/v2 v2.8.3 h1:t1MJcIdFhYi0gCkm8f0DYZwyfq7pRdRc0eNpqZa11ic= +github.com/gethinode/mod-utils/v2 v2.8.3/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY= github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3 h1:H/qVR5O4BXjRjD+5PZB+r4ug2BSJ2Of4RtwOntd+OKo= github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU= github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 h1:re7L8FxbXQpnX8BgzkdUnDpsUmloGNyLmiy2ZCln8pg= From e1f8cf9b735573ffb36e3e32b83f9cbf411a6260 Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:14:07 +0200 Subject: [PATCH 5/5] Update package lock file --- package-lock.json | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index d1f0f4e..b08ece0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "devDependencies": { "@gethinode/netlify-plugin-dartsass": "^0.3.0", "cpy-cli": "^5.0.0", - "eslint": "^9.9.1", + "eslint": "^9.13.0", "markdownlint-cli2": "^0.14.0", "neostandard": "^0.11.6", "netlify-plugin-hugo-cache-resources": "^0.2.1", @@ -4981,33 +4981,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/neostandard/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/neostandard/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/nested-error-stacks": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz",