Merge branch 'main' into dependabot/github_actions/actions/cache-5

Author: markdumay

.github/workflows/lint-build.yml

@@ -10,9 +10,10 @@ on:
 
 env:
   CACHE_KEY: 'hugo-hinode-template'
-  CACHE_PATH_DEBIAN: '/tmp/hugo_cache_runner'
-  CACHE_PATH_WIN: '~\AppData\Local\hugo_cache'
-  CACHE_PATH_MAC: '/Users/runner/Library/Caches/hugo_cache'
+
+permissions:
+  pull-requests: read
+  contents: read
 
 jobs:
   lint:
@@ -34,7 +35,7 @@ jobs:
       run: npm i
 
     - name: Lint the source files
-      run: npm run lint      
+      run: npm run lint
 
   build:
     needs: lint
@@ -44,17 +45,27 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
         node-version: [22.x, 24.x]
+        include:
+          - os: ubuntu-latest
+            hugo_cachedir: '/tmp/hugo_cache_runner'
+          - os: macos-latest
+            hugo_cachedir: '/Users/runner/Library/Caches/hugo_cache'
+          - os: windows-latest
+            hugo_cachedir: '~\AppData\Local\hugo_cache'
 
     runs-on: ${{ matrix.os }}
 
+    env:
+      HUGO_CACHEDIR: ${{ matrix.hugo_cachedir }}
+
     steps:
     - name: Check out repository
       uses: actions/checkout@v6
 
     - name: Install Go
       uses: actions/setup-go@v6
       with:
-        go-version: ">1.0.0"
+        go-version: "stable"
 
     - name: Set up Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v6
@@ -64,9 +75,13 @@ jobs:
         cache-dependency-path: '**/package-lock.json'
 
     - name: Install Dart Sass
-      run:  |
+      env:
+        DART_SASS_VERSION: "1.98.0"
+      run: |
         if [ "$RUNNER_OS" == "Linux" ]; then
-          sudo snap install dart-sass
+          curl -fsSL "https://github.com/sass/dart-sass/releases/download/${DART_SASS_VERSION}/dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz" \
+            | tar -xz -C "$HOME"
+          echo "$HOME/dart-sass" >> $GITHUB_PATH
         elif [ "$RUNNER_OS" == "macOS" ]; then
           brew install sass/sass/sass
         elif [ "$RUNNER_OS" == "Windows" ]; then
@@ -76,23 +91,34 @@ jobs:
 
     # [24/AUG/23] Adjusted from npm ci for non-macOS to prevent EBADPLATFORM error due to fsevents
     - name: Perform clean install of npm
-      run:  |
+      run: |
         if [ "$RUNNER_OS" == "macOS" ]; then
           npm ci
         else
           npm i
         fi
       shell: bash
 
-    # Cache Hugo cachedir and resourcedir (configured in config/ci/hugo.toml) for each OS
-    # No additional cache invalidation is needed, Hugo uses checksums itself
+    # On Windows, HUGO_CACHEDIR is initialised from the matrix as '~\AppData\Local\hugo_cache'.
+    # Hugo requires an absolute path, so expand ~ to %LOCALAPPDATA% before using the cache.
+    - name: Expand Hugo cache directory on Windows
+      if: runner.os == 'Windows'
+      run: echo "HUGO_CACHEDIR=$env:LOCALAPPDATA\hugo_cache" >> $env:GITHUB_ENV
+      shell: pwsh
+
+    # Cache Hugo cachedir and resourcedir (configured in config/ci/hugo.toml) for each OS.
+    # Rolling key restores the previous snapshot as a warm start, then saves a fresh one after build.
+    # No additional content-based invalidation is needed; Hugo uses checksums itself.
     - name: Use Hugo cache
       uses: actions/cache@v5
       with:
-        path: ${{ runner.os == 'Windows' && env.CACHE_PATH_WIN || runner.os == 'macOS' && env.CACHE_PATH_MAC || env.CACHE_PATH_DEBIAN }}
-        key: ${{ runner.os }}-${{ env.CACHE_KEY }}
+        path: ${{ env.HUGO_CACHEDIR }}
+        key: ${{ runner.os }}-${{ env.CACHE_KEY }}-${{ github.run_id }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.CACHE_KEY }}
+          ${{ runner.os }}-${{ env.CACHE_KEY }}-
+
+    - name: Display environment
+      run: npm run env
 
     - name: Build main site
       run: npm run build:cache

.gitignore

@@ -1,6 +1,9 @@
 /_vendor
 /public
 /prebuild
+prebuild-headers/
+prebuild-headers-dev/
+prebuild-headers-prod/
 resources/
 node_modules/
 

.husky/commit-msg

@@ -0,0 +1 @@
+npx --no -- commitlint --edit $1

.husky/install.mjs

@@ -0,0 +1,6 @@
+// Skip Husky install in production and CI
+if (process.env.NODE_ENV === 'production' || process.env.CI === 'true') {
+    process.exit(0)
+}
+const husky = (await import('husky')).default
+console.log(husky())

.husky/pre-commit

@@ -0,0 +1 @@
+npm test

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2025 Mark Dumay
+Copyright (c) 2022-2026 Mark Dumay
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

config/_default/hugo.toml

@@ -1,5 +1,5 @@
 title = "Hinode"
-copyright = "Copyright © 2022 - 2025 Mark Dumay."
+copyright = "Copyright © 2022 - 2026 Hinode Team."
 enableGitInfo = true
 
 # additional settings
@@ -123,7 +123,9 @@ home = ["HTML", "RSS", "REDIR", "netlify", "server"]
     source = "static"
     target = "static"
   [[module.imports]]
-    path = "github.com/gethinode/hinode"
+    path = "github.com/gethinode/mod-blocks"
+  [[module.imports]]
+    path = "github.com/gethinode/hinode/v2"
 
 [segments]
   [segments.headers]

config/_default/params.toml

@@ -10,15 +10,15 @@
     [main.colorMode]
         enabled = true
         modes = ["light", "dark"]
+        toggle = false
     [main.internalLinks]
         validate = true
         pretty = false
     [main.externalLinks]
         cue = false
         tab = false
     [main.build]
-        transpiler = "libsass"
-
+        transpiler = "dartsass"
 
 [debugging]
     showJS = false
@@ -30,12 +30,6 @@
     release = "https://github.com/gethinode/hinode/releases/tag/"
     checkVersion = false
 
-[home]
-    # sections = ["posts"]
-    fullCover = false
-    centerHeadline = false
-    style = ""
-
 [navigation]
     anchor = true
     logo = "/img/logo_icon.svg"
@@ -90,24 +84,6 @@
     weight = 50
     clipboard = true
 
-# toml-docs-start sections
-# [sections]
-#     [sections.posts]
-#         title = "Posts"
-#         sort = "date"
-#         reverse = true
-#         nested = true
-#         cols = 3
-#         color = ""
-#         padding = "0"
-#         header = "full"
-#         footer = "none"
-#         orientation = "stacked"
-#         style = "border-0 card-zoom"
-#         homepage = 3
-#         separator = true
-# toml-docs-end sections
-
 [favicon]
     logo = "img/favicon.png"
     sizes = [16, 32, 48]
@@ -128,7 +104,7 @@
     # themeFontPath = "https://fonts.googleapis.com/css2?family=Inter:wght@200;300;600&display=swap" # external path
     themeFontPath = "/fonts" # local path
     fontSizeBase = "1rem"
-    purge = false
+    purge = true
 
 [schema]
     type = "Organization"

config/_default/server.toml

@@ -7,23 +7,23 @@
     Access-Control-Allow-Origin = '*'
     Content-Security-Policy = """
         base-uri 'self'; \
-        connect-src 'self' *.google-analytics.com *.analytics.google.com *.googletagmanager.com; \
+        connect-src 'self' *.analytics.google.com *.google.com *.google-analytics.com *.googletagmanager.com; \
         default-src 'none'; \
-        font-src 'self' fonts.gstatic.com; \
+        font-src 'self' fonts.gstatic.com data:; \
         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; \
+        frame-ancestors 'self' http://localhost:1313 gethinode.com; \
+        frame-src *.googletagmanager.com player.cloudinary.com www.youtube-nocookie.com www.youtube.com player.vimeo.com; \
+        img-src 'self' *.google-analytics.com *.googletagmanager.com googletagmanager.com ssl.gstatic.com www.gstatic.com data: *.imgix.net *.imagekit.io *.cloudinary.com i.ytimg.com tile.openstreetmap.org i.vimeocdn.com; \
         manifest-src 'self'; \
         media-src 'self'; \
         object-src 'none'; \
-        script-src 'self' *.google-analytics.com *.googletagmanager.com; \
-        style-src 'self' www.youtube.com; \
+        script-src 'self' *.google-analytics.com *.googletagmanager.com *.analytics.google.com googletagmanager.com tagmanager.google.com player.vimeo.com; \
+        style-src 'self' googletagmanager.com tagmanager.google.com fonts.googleapis.com www.youtube.com 'unsafe-inline'; \
         """
     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 '
 

config/ci/hugo.toml

@@ -1,23 +1,27 @@
 # cachedir default on POSIX: '/tmp/hugo_cache_runner'
 # cachedir default on Windows: '~\AppData\Local\hugo_cache'
 # cachedir default on macOS: '/Users/runner/Library/Caches/hugo_cache'
+#
+# All six Hugo cache types are configured here to:
+#   - redirect assets/images from :resourceDir to :cacheDir so GitHub Actions can cache them
+#   - set maxAge = -1 across the board so --gc never prunes entries between CI runs
 
 [caches]
   [caches.assets]
-    dir = ':cacheDir/resources/_gen' # map to cacheDir instead of resourceDir to utilize GitHub action/cache
-    maxAge = -1
-  [caches.getcsv]
-    dir = ':cacheDir/:project'
-    maxAge = -1
-  [caches.getjson]
-    dir = ':cacheDir/:project'
+    dir = ':cacheDir/resources/_gen' # redirect from :resourceDir to :cacheDir
     maxAge = -1
   [caches.getresource]
     dir = ':cacheDir/:project'
     maxAge = -1
   [caches.images]
-    dir = ':cacheDir/resources/_gen' # map to cacheDir instead of resourceDir to utilize GitHub action/cache
+    dir = ':cacheDir/resources/_gen' # redirect from :resourceDir to :cacheDir
     maxAge = -1
+  [caches.misc]
+    dir = ':cacheDir/:project'
+    maxAge = -1
+  [caches.modulequeries]
+    dir = ':cacheDir/modules'
+    maxAge = -1 # override default 24h so --gc does not prune module query results
   [caches.modules]
     dir = ':cacheDir/modules'
     maxAge = -1