Merge pull request #1262 from d-oit/patch-1

Fix attribute aria-inledby -> aria-labelledby

.gitignore

@@ -1,4 +1,5 @@
 _vendor/
+prebuild/
 public/
 resources/
 node_modules/

README.md

@@ -123,7 +123,7 @@ Hinode is inspired by the following themes:
 ## Donate
 
 <!-- markdownlint-disable MD033 -->
-<a href="https://www.buymeacoffee.com/markdumay" target="_blank" rel="noopener noreferrer"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;"></a>
+<a href="https://www.buymeacoffee.com/markdumay" target="_blank" rel="noopener noreferrer nofollow"><img src="https://cdn.buymeacoffee.com/buttons/lato-orange.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;"></a>
 <!-- markdownlint-enable MD033 -->
 
 ## License

assets/js/alert.js

@@ -3,13 +3,13 @@ const alert = document.getElementById('page-alert')
 const closeBtn = document.getElementById('page-alert-btn-close')
 if (alert !== null && closeBtn !== null) {
   const version = alert.getAttribute('data-page-alert-version') || 'unknown'
-  const hideAlert = sessionStorage.getItem(`page-alert-${version}`) !== null
+  const hideAlert = getSessionStorage(`page-alert-${version}`, null, 'functional') !== null
   if (hideAlert) {
     alert.classList.add('d-none')
   }
 
   closeBtn.addEventListener('click', () => {
-    sessionStorage.setItem(`page-alert-${version}`, 'seen')
+    setSessionStorage(`page-alert-${version}`, 'seen', 'functional')
     alert.classList.add('d-none')
   })
 }

assets/js/analytics.js

@@ -1,21 +0,0 @@
-// Adapted from https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates/google_analytics.html
-
-{{ if and (not hugo.IsServer) (not site.Config.Privacy.GoogleAnalytics.Disable) }}
-  {{ with site.Config.Services.GoogleAnalytics.ID }}
-    {{ if strings.HasPrefix (lower .) "ua-" }}
-      {{ warnf "Google Analytics 4 (GA4) replaced Google Universal Analytics (UA) effective 1 July 2023. See https://support.google.com/analytics/answer/11583528. Create a GA4 property and data stream, then replace the Google Analytics ID in your site configuration with the new value." }}
-    {{ else }}
-        var doNotTrack = false;
-        if ({{ site.Config.Privacy.GoogleAnalytics.RespectDoNotTrack }}) {
-          var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);
-          var doNotTrack = (dnt == "1" || dnt == "yes");
-        }
-        if (!doNotTrack) {
-          window.dataLayer = window.dataLayer || [];
-          function gtag(){dataLayer.push(arguments);}
-          gtag('js', new Date());
-          gtag('config', '{{ . }}');
-        }
-    {{ end }}
-  {{ end }}
-{{ end }}

assets/js/critical/_cookie.js

@@ -0,0 +1,33 @@
+/* eslint-disable no-undef, no-unused-vars */
+function hasConsent (category) {
+  // TODO: placeholder function
+  return true
+}
+
+function getLocalStorage (key, def, category) {
+  if (hasConsent(category)) {
+    return localStorage.getItem(key)
+  } else {
+    return def
+  }
+}
+
+function setLocalStorage (key, val, category) {
+  if (hasConsent(category)) {
+    localStorage.setItem(key, val)
+  }
+}
+
+function getSessionStorage (key, def, category) {
+  if (hasConsent(category)) {
+    return sessionStorage.getItem(key)
+  } else {
+    return def
+  }
+}
+
+function setSessionStorage (key, val, category) {
+  if (hasConsent(category)) {
+    sessionStorage.setItem(key, val)
+  }
+}

assets/js/critical/color.js

@@ -11,8 +11,8 @@
 
   const supportedThemes = ['auto', 'dark', 'light'];
 
-  // retrieves the currently stored theme from local storage (cookie)
-  const storedTheme = localStorage.getItem('theme')
+  // retrieves the currently stored theme from local storage
+  const storedTheme = getLocalStorage('theme', 'auto', 'functional')
 
   // retrieves the theme preferred by the client, defaults to light
   function getPreferredTheme() {
@@ -25,7 +25,7 @@
       return storedTheme
     } else {
       const preference = getPreferredTheme()
-      localStorage.setItem('theme', preference)
+      setLocalStorage('theme', preference, 'functional')
       return preference
     }
   }
@@ -35,7 +35,7 @@
     if (!supportedThemes.includes(theme)) {
       theme = 'auto'
     }
-    localStorage.setItem('theme', theme)
+    setLocalStorage('theme', theme, 'functional')
 
     if (theme === 'auto') {
       document.documentElement.setAttribute('data-bs-theme', (getPreferredTheme()))

assets/js/critical/languageSelector.js

@@ -1,17 +1,20 @@
 /* eslint-disable */
 {{- if site.Params.main.enableLanguageSelectionStorage -}}
+{{- $folder := (urls.Parse site.BaseURL).Path | default "/" -}}
 
 (() => {
   'use strict'
 
-  // Function to get the selected language from localStorage
+  const folder = '{{ $folder }}'
+
+  // Function to get the selected language from local storage
   function getLanguage () {
-    return localStorage.getItem('selectedLanguage')
+    return getLocalStorage('selectedLanguage', document.documentElement.lang, 'functional')
   }
 
-  // Function to set the selected language in localStorage
+  // Function to set the selected language in local storage
   function setLanguage (language) {
-    localStorage.setItem('selectedLanguage', language)
+    setLocalStorage('selectedLanguage', language, 'functional')
   }
   
   // Function to apply the selected language to the website
@@ -22,7 +25,7 @@
           window.location.href = href
         }
       } else {
-        window.location.href = '/' + language + '/'
+        window.location.href = folder + language + '/'
       }
     }
   }
@@ -57,7 +60,7 @@
       // Redirect to the localized homepage
       const defaultLang = '{{ site.LanguageCode | default site.Language.Lang }}'
       let language = storedLanguage ? storedLanguage : defaultLang
-      window.location.href = '/' + language + '/'
+      window.location.href = folder + language + '/'
     }
   })
 })()

assets/js/navbar.js

@@ -5,15 +5,22 @@ const modeSelectors = document.querySelectorAll('.switch-mode-collapsed')
 const colorsBG = ['body', 'secondary', 'tertiary']
 
 function updateNavbar () {
+  let storedTheme
+  if (typeof getLocalStorage === "function") {
+    storedTheme = getLocalStorage('theme', null, 'functional')
+  }
+
   if (window.scrollY > 75) {
     navbar.classList.add('nav-active')
-    const storedTheme = localStorage.getItem('theme')
+    if (storedTheme) {
       navbar.setAttribute('data-bs-theme', storedTheme)
+    }
   } else {
     navbar.classList.remove('nav-active')
     const defaultTheme = navbar.getAttribute('data-bs-overlay')
 
-    if (defaultTheme) {
+    const targetTheme = defaultTheme ? defaultTheme : storedTheme
+    if (targetTheme) {
       navbar.setAttribute('data-bs-theme', defaultTheme)
     }
   }

assets/js/sharing.js

@@ -14,23 +14,22 @@ function webShareAPI (title, description, link) {
     .catch((error) => console.log('Error sharing', error))
 }
 
-const shareBtn = document.getElementById('btn-webshare')
-
-if (shareBtn !== null) {
+const shareButtons = document.querySelectorAll('[data-sharing-url]')
+shareButtons.forEach(btn => {
   if (navigator.share) {
-    const title = shareBtn.getAttribute('data-sharing-title')
-    const description = shareBtn.getAttribute('data-sharing-description')
-    const url = shareBtn.getAttribute('data-sharing-url')
+    const title = btn.getAttribute('data-sharing-title')
+    const description = btn.getAttribute('data-sharing-description')
+    const url = btn.getAttribute('data-sharing-url')
 
     // show button if it supports webShareAPI
-    shareBtn.style.display = 'block'
-    shareBtn.addEventListener('click', () =>
+    btn.style.display = 'block'
+    btn.addEventListener('click', () =>
       webShareAPI(title, description, url)
     )
   } else {
     // hide button if host does not support Web Share API
-    shareBtn.style.display = 'none'
-  }
+    btn.style.display = 'none'
   }
+})
 
 {{- end -}}

config/_default/hugo.toml

@@ -26,6 +26,32 @@ defaultContentLanguage = "en"
 defaultContentLanguageInSubdir = false
 # toml-docs-end language
 
+# toml-docs-start headers
+[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
+# toml-docs-end headers
+
+  [outputFormats.XML]
+    isPlainText = false
+    mediaType = "application/xml"
+    isHtml = false
+    noUgly = true
+    permalinkable = false
+    name = "xml"
+
 # toml-docs-start redirect
   [outputFormats.REDIR]
     mediaType = "text/netlify"
@@ -35,11 +61,13 @@ notAlternative = true
 
 [mediaTypes."text/netlify"]
 delimiter = ""
-
-[outputs]
-home = ["HTML", "RSS", "REDIR"]
 # toml-docs-end redirect
 
+# toml-docs-start outputs
+[outputs]
+home = ["HTML", "RSS", "REDIR", "netlify", "server"]
+# toml-docs-end outputs
+
 # toml-docs-start build
 [build]
   writeStats = true
@@ -77,15 +105,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
@@ -126,10 +145,14 @@ home = ["HTML", "RSS", "REDIR"]
 # toml-docs-start modules
   [[module.imports]]
     path = "github.com/gethinode/mod-bootstrap"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-csp"
   [[module.imports]]
     path = "github.com/gethinode/mod-flexsearch/v2"
   [[module.imports]]
     path = "github.com/gethinode/mod-fontawesome"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-google-analytics"
   [[module.imports]]
     path = "github.com/gethinode/mod-katex"
   [[module.imports]]
@@ -141,3 +164,11 @@ home = ["HTML", "RSS", "REDIR"]
   [[module.imports]]
     path = "github.com/gethinode/mod-utils/v2"
 # toml-docs-end modules
+
+# toml-docs-start segments
+[segments]
+  [segments.headers]
+    [[segments.headers.includes]]
+       kind = '{home}'
+       output = '{netlify,server}'
+# toml-docs-end segments

config/_default/languages.toml

@@ -11,5 +11,5 @@
         title = "Follow me"
         caption = "I work on everything coding and tweet developer memes"
     [en.params.footer]
-        # license = "Licensed under Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer'>CC BY-NC-SA 4.0</a>)."
+        # license = "Licensed under Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer nofollow'>CC BY-NC-SA 4.0</a>)."
 # toml-docs-end lang-param

config/_default/params.toml

@@ -10,6 +10,8 @@
     footerBelowFold = false
     loading = "lazy"
     breakpoint = "md"
+    [main.internalLinks]
+        validate = true
     [main.externalLinks]
         cue = false
         tab = false
@@ -204,3 +206,29 @@
 
 [links]
     hinode = "https://gethinode.com"
+
+# toml-docs-start headers
+[headers]
+  [headers.netlify]
+    source = "netlify.toml"
+# toml-docs-end headers
+
+# toml-docs-start csp
+[modules.hinode.csp]
+    style-src = ["www.youtube.com"]
+    font-src = ["fonts.gstatic.com"]
+    frame-src = [
+        "player.cloudinary.com",
+        "player.vimeo.com",
+        "www.youtube-nocookie.com",
+        "www.youtube.com"
+    ]
+    img-src = [
+        "data:",
+        "*.imgix.net",
+        "*.imagekit.io",
+        "*.cloudinary.com",
+        "i.vimeocdn.com",
+        "i.ytimg.com"
+    ]
+# toml-docs-end csp

config/_default/server.toml

@@ -1,41 +1,29 @@
-# toml-docs-start server-config
+# 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'; \
+    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://player.cloudinary.com https://player.vimeo.com https://www.youtube-nocookie.com https://www.youtube.com; \
-        img-src 'self' data: https://*.imgix.net https://*.imagekit.io https://*.cloudinary.com 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' \
+        media-src 'self'; \
+        object-src 'none'; \
+        script-src 'self' *.google-analytics.com *.googletagmanager.com; \
+        style-src 'self' www.youtube.com; \
         """
-    X-Frame-Options = "SAMEORIGIN"
-    Referrer-Policy = "strict-origin"
-    Permissions-Policy = """\
-        geolocation=(), \
-        midi=(), \
-        sync-xhr=(), \
-        microphone=(), \
-        camera=(), \
-        magnetometer=(), \
-        gyroscope=(), \
-        payment=() \
-        """
-    cache-control = """\
-        max-age=0, \
-        no-cache, \
-        no-store, \
-        must-revalidate \
-        """
-    Access-Control-Allow-Origin = "*"
-# toml-docs-end server-config
+    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/postcss.config.js

@@ -10,7 +10,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
     return [...(els.tags || []), ...(els.classes || []), ...(els.ids || [])]
   },
   dynamicAttributes: ['data-bs-theme'],
-  safelist: [
+  safelist: ['was-validated',
     ...whitelister([
       './assets/scss/components/_clipboard.scss',
       './assets/scss/components/_command.scss',
@@ -24,6 +24,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
       './assets/scss/components/_video.scss',
       './assets/scss/theme/fonts.scss',
       './assets/scss/theme/theme.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',

data/netlify.toml

@@ -0,0 +1,35 @@
+# toml-docs-start netlify
+[build]
+    publish = "exampleSite/public"
+    command = "npm run build:example"
+
+[build.environment]
+    DART_SASS_VERSION = "1.78.0"
+    HUGO_VERSION = "0.134.1"
+    HUGO_ENV = "production"
+    HUGO_ENABLEGITINFO = "true"
+    NODE_VERSION = "20.17.0"
+    NPM_VERSION = "10.8.2"
+# toml-docs-end netlify
+
+[context.deploy-preview]
+    command = "npm run build:example -- -b $DEPLOY_PRIME_URL"
+
+[context.branch-deploy]
+    command = "npm run build:example -- -b $DEPLOY_PRIME_URL"
+
+[dev]
+    framework = "#custom"
+    command = "npm run start:example"
+    targetPort = 1313
+    port = 8888
+    publish = "public"
+    autoLaunch = false
+
+# toml-docs-start plugins
+[[plugins]]
+    package = "@gethinode/netlify-plugin-dartsass"
+
+[[plugins]]
+    package = "netlify-plugin-hugo-cache-resources"
+# toml-docs-end plugins

data/server.toml

@@ -0,0 +1,41 @@
+# toml-docs-start server-config
+[[headers]]
+    for = "/**"
+    [headers.values]
+        Strict-Transport-Security = "max-age=31536000; includeSubDomains; preload"
+        X-Content-Type-Options = "nosniff"
+        X-XSS-Protection = "1; mode=block"
+        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 \
+            """
+        Access-Control-Allow-Origin = "*"
+        Content-Security-Policy = """\
+            default-src 'none'; \
+            script-src 'self'; \
+            font-src 'self'; \
+            connect-src 'self'; \
+            img-src 'self'; \
+            style-src 'self'; \
+            base-uri 'self'; \
+            object-src 'none'; \
+            form-action 'self'; \
+            manifest-src 'self'; \
+            media-src 'self' \
+            """
+# toml-docs-end server-config

data/structures/script.yml

@@ -0,0 +1,46 @@
+comment: >-
+  Includes a reference to a local or external JavaScript file. Hinode uses the
+  template defined in `layouts/partials/templates/script.html` to generate the
+  link to a (bundled) JavaScript file. It includes context such as the state,
+  category, and integrity. For example, you can adapt this template to implement
+  cookie consent management.
+arguments:
+  link:
+    type: string
+    optional: false
+    comment: >-
+      Location of the script source, either an URL for an external script or a
+      (relative) path for a local script.
+  state:
+    type: select
+    optional: true
+    comment: >-
+      Defines the loading behavior of the script bundle. By default, scripts are
+      loaded immediately. Use `async` to process the script in the background.
+      Use `defer` to load the script in relative order when the DOM is fully
+      built.
+    options:
+      values:
+        - async
+        - defer
+        - immediate
+  category:
+    type: select
+    optional: true
+    default: other
+    comment: >-
+      Assigns the script to a category that can be used for cookie consent
+      management.
+    options:
+      values:
+        - necessary
+        - functional
+        - analytics
+        - performance
+        - advertisement
+        - other
+  integrity:
+    type: string
+    optional: true
+    comment: >-
+      Cryptographic hash of the script to enable Subresource Integrity (SRI).

data/structures/scripts.yml

@@ -8,62 +8,17 @@ arguments:
       - '*hugolib.pageForShortcode'
     optional: false
     comment: Context of the current page.
-  core:
-    type: bool
-    default: false
-    optional: true
-    comment: >-
-      Trigger to include all core files in the script bundle. Core bundles are
-      loaded asynchronously in each page of the site.
-  filename:
-    type: string
-    default: js/main.bundle.js
-    optional: true
-    comment: >-
-      Path of the target bundle file, relative to the site root.
-  match:
-    type: string
-    default: {js/*.js,js/vendor/**.js}
-    optional: true
-    comment: >-
-      Regular expression that defines the pattern of source files to be included
-      in the bundle. The pattern is relative to the project's `asset` folder.
-  header:
-    type: bool
-    default: false
-    comment: >-
-      Trigger to consider the script as loaded in the page header. When enabled,
-      it includes a script to load Google Analytics adjacent to any bundle
-      input.
-  localize:
-    type: bool
-    default: false
-    optional: true
-    comment: >-
-      Triggers the creation of a language-specific bundle file. The language
-      code is appended as suffix to the base name. For example, the English
-      version of `js/main.bundle.js` becomes `js/main.bundle.en.js`.
-  skipTemplate:
-    type: bool
-    default: false
-    optional: true
-    comment: >-
-      Script source input can contain Go Template magic. As such, Hinode
-      processes all input files with `resources.ExecuteAsTemplate`. However,
-      certain input files may be incompatible. Set `skipTemplate` to true to
-      skip template processing.
-  state:
+  type:
     type: select
+    default: core
     optional: true
-    default: async
     comment: >-
-      Defines the loading behavior of the script bundle. By default, scripts are
-      processed in the background and loaded when ready (`async`). Set the state
-      to `immediate` to load the script immediately (such as critical scripts).
-      Use 'defer' to load the script in relative order when the DOM is fully
-      built.
-    options:
+      Type of script bundle. Critical scripts are included in the page header
+      and are loaded immediately. Core scripts are bundled by category and are
+      loaded asynchronously. Optional scripts are loaded individually on the
+      pages that require them. They use the synchronization method as defined
+      in their containing module.
     values:
-        - async
-        - defer
-        - immediate
+      - critical
+      - core
+      - optional

exampleSite/config/_default/hugo.toml

@@ -20,6 +20,28 @@ languageCode = "en-us"
 defaultContentLanguage = "en"
 defaultContentLanguageInSubdir = true
 
+[outputFormats]
+  [outputFormats.netlify]
+    mediaType = "application/toml"
+    baseName = "netlify"
+    isPlainText = true
+    notAlternative = true
+    permalinkable = true
+    root = true
+  [outputFormats.server]
+    mediaType = "application/toml"
+    baseName = "server"
+    isPlainText = true
+    notAlternative = true
+    permalinkable = true
+    root = true
+  [outputFormats.XML]
+    isPlainText = false
+    mediaType = "application/xml"
+    isHtml = false
+    noUgly = true
+    permalinkable = false
+    name = "xml"
   [outputFormats.REDIR]
     mediaType = "text/netlify"
     baseName = "_redirects"
@@ -30,7 +52,7 @@ notAlternative = true
 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-T85PPZ36GN"
 
-[outputFormats]
-  [outputFormats.XML]
-    isPlainText = false
-    mediaType = "application/xml"
-    isHtml = false
-    noUgly = true
-    permalinkable = false
-    name = "xml"
-
 [minify]
   [minify.tdewolff.js]
     keepVarNames = true
@@ -84,8 +97,36 @@ home = ["HTML", "RSS", "REDIR"]
   [minify.tdewolff.html]
     keepWhitespace = true
 
+[segments]
+  [segments.headers]
+    [[segments.headers.includes]]
+       kind = '{home}'
+       output = '{netlify,server}'
+
 [module]
   # Build and serve using local hinode clone declared in the named Hugo workspace:
   workspace = "hinode.work"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-cookieyes/v2"
   [[module.imports]]
     path = "github.com/gethinode/hinode"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-bootstrap"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-csp"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-flexsearch/v2"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-fontawesome"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-google-analytics"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-katex"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-leaflet"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-lottie"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-simple-datatables"
+  [[module.imports]]
+    path = "github.com/gethinode/mod-utils/v2"

exampleSite/config/_default/languages.toml

@@ -11,7 +11,7 @@ tagline = "A Hugo Theme"
 title = "Follow me"
 caption = "I work on everything coding and tweet developer memes"
 [en.params.footer]
-# license = "Licensed under Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer'>CC BY-NC-SA 4.0</a>)."
+# license = "Licensed under Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer nofollow'>CC BY-NC-SA 4.0</a>)."
 # toml-docs-end lang-param
 [en.params.sections.blog]
 reference = "More Posts"
@@ -30,7 +30,7 @@ tagline = "Een Hugo Thema"
 title = "Volg mij"
 caption = "Ik doe aan programmeren en tweet memes"
 [nl.params.footer]
-# license = "Gelicenseerd onder Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer'>CC BY-NC-SA 4.0</a>)."
+# license = "Gelicenseerd onder Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer nofollow'>CC BY-NC-SA 4.0</a>)."
 [nl.params.sections.blog]
 reference = "Meer artikelen"
 [nl.params.sections.projects]
@@ -49,7 +49,7 @@ tagline = "Un thème Hugo"
 title = "Suivez-moi"
 caption = "Je code et je tweet des mèmes de développeurs."
 [fr.params.footer]
-# license = "Gelicenseerd onder Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer'>CC BY-NC-SA 4.0</a>)."
+# license = "Gelicenseerd onder Creative Commons (<a href='https://creativecommons.org/licenses/by-nc-sa/4.0/' class='link-secondary' target='_blank' rel='noopener noreferrer nofollow'>CC BY-NC-SA 4.0</a>)."
 [fr.params.sections.blog]
 reference = "Plus d'articles"
 [fr.params.sections.projects]

exampleSite/config/_default/netlify.toml

@@ -0,0 +1,19 @@
+[[redirects]]
+	from = '/fr/*'
+	to = '/fr/404.html'
+	status = 404
+
+[[redirects]]
+	from = '/nl/*'
+	to = '/nl/404.html'
+	status = 404
+
+[[redirects]]
+	from = '/en/*'
+	to = '/en/404.html'
+	status = 404
+
+[[redirects]]  # Default language should be last.
+	from = '/*'
+	to = '/en/404.html'
+	status = 404

exampleSite/config/_default/params.toml

@@ -8,6 +8,8 @@
     footerBelowFold = false
     loading = "lazy"
     breakpoint = "md"
+    [main.internalLinks]
+        validate = true
     [main.externalLinks]
         cue = true
         tab = true
@@ -191,3 +193,7 @@
     observatory = "https://observatory.mozilla.org/analyze/demo.gethinode.com"
     pagespeed = "https://pagespeed.web.dev/report?url=https%3A%2F%2Fdemo.gethinode.com%2F"
     hinode = "https://gethinode.com"
+
+[modules.cookieyes]
+    # local = true
+    url = "https://cdn-cookieyes.com/client_data/a54b5553f349dd13bd225f8e/script.js"

exampleSite/config/_default/server.toml

@@ -1,41 +1,49 @@
-# toml-docs-start server-config
+# 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'; \
+    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://player.cloudinary.com https://player.vimeo.com https://www.youtube-nocookie.com https://www.youtube.com; \
-        img-src 'self' data: https://*.imgix.net https://*.imagekit.io https://*.cloudinary.com https://i.vimeocdn.com https://i.ytimg.com https://*.google-analytics.com https://*.googletagmanager.com https://tile.openstreetmap.org; \
+        connect-src 'self' *.cookieyes.com cdn-cookieyes.com *.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' cdn-cookieyes.com *.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' \
+        media-src 'self'; \
+        object-src 'none'; \
+        script-src 'self' cdn-cookieyes.com *.google-analytics.com *.googletagmanager.com; \
+        style-src 'self' 'unsafe-inline' www.youtube.com; \
         """
-    X-Frame-Options = "SAMEORIGIN"
-    Referrer-Policy = "strict-origin"
-    Permissions-Policy = """\
-        geolocation=(), \
-        midi=(), \
-        sync-xhr=(), \
-        microphone=(), \
-        camera=(), \
-        magnetometer=(), \
-        gyroscope=(), \
-        payment=() \
-        """
-    cache-control = """\
-        max-age=0, \
-        no-cache, \
-        no-store, \
-        must-revalidate \
-        """
-    Access-Control-Allow-Origin = "*"
-# toml-docs-end server-config
+    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 '
+
+[[redirects]]
+  from = '/fr/*'
+  status = 404
+  to = '/fr/404.html'
+
+[[redirects]]
+  from = '/nl/*'
+  status = 404
+  to = '/nl/404.html'
+
+[[redirects]]
+  from = '/en/*'
+  status = 404
+  to = '/en/404.html'
+
+[[redirects]]
+  from = '/*'
+  status = 404
+  to = '/en/404.html'
+

exampleSite/config/postcss.config.js

@@ -10,7 +10,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
     return [...(els.tags || []), ...(els.classes || []), ...(els.ids || [])]
   },
   dynamicAttributes: ['data-bs-theme'],
-  safelist: [
+  safelist: ['was-validated',
     ...whitelister([
       './_vendor/github.com/gethinode/hinode/assets/scss/components/_clipboard.scss',
       './_vendor/github.com/gethinode/hinode/assets/scss/components/_command.scss',
@@ -24,6 +24,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
       './_vendor/github.com/gethinode/hinode/assets/scss/components/_video.scss',
       './_vendor/github.com/gethinode/hinode/assets/scss/theme/fonts.scss',
       './_vendor/github.com/gethinode/hinode/assets/scss/theme/theme.scss',
+      './exampleSite/_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',

exampleSite/content/en/blog/image.md

@@ -14,7 +14,7 @@ As an example, the following shortcode displays an image with rounded corners an
 
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* image src="https://res.cloudinary.com/demo/image/upload/dog.webp"
+{{</* image src="https://res.cloudinary.com/demo/dog.webp"
     ratio="21x9" caption="Cloudinary image" class="rounded" plain=true */>}}
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->

exampleSite/content/en/cookies.md

@@ -0,0 +1,44 @@
+---
+title: Cookie Policy
+description: Cookie policy of gethinode.com
+date: 2024-09-19
+layout: docs
+---
+<!-- markdownlint-disable MD036 -->
+*Effective Date 19-Sep-2024*
+
+## What are cookies?
+
+This Cookie Policy explains what cookies are and how we use them, the types of cookies we use i.e, the information we collect using cookies and how that information is used, and how to manage the cookie settings.
+
+Cookies are small text files that are used to store small pieces of information. They are stored on your device when the website is loaded on your browser. These cookies help us make the website function properly, make it more secure, provide better user experience, and understand how the website performs and to analyze what works and where it needs improvement.
+
+## How do we use cookies?
+
+As most of the online services, our website uses first-party and third-party cookies for several purposes. First-party cookies are mostly necessary for the website to function the right way, and they do not collect any of your personally identifiable data.
+
+The third-party cookies used on our website are mainly for understanding how the website performs, how you interact with our website, keeping our services secure, providing advertisements that are relevant to you, and all in all providing you with a better and improved user experience and help speed up your future interactions with our website.
+
+## Types of Cookies we use
+
+{{< cky-audit >}}
+
+## Manage cookie preferences
+
+{{< cky-banner >}}
+
+You can change your cookie preferences any time by clicking the above button. This will let you revisit the cookie consent banner and change your preferences or withdraw your consent right away.
+
+In addition to this, different browsers provide different methods to block and delete cookies used by websites. You can change the settings of your browser to block/delete the cookies. Listed below are the links to the support documents on how to manage and delete cookies from the major web browsers.
+
+Chrome: https://support.google.com/accounts/answer/32050
+
+Safari: https://support.apple.com/en-in/guide/safari/sfri11471/mac
+
+Firefox: https://support.mozilla.org/en-US/kb/clear-cookies-and-site-data-firefox?redirectslug=delete-cookies-remove-info-websites-stored&redirectlocale=en-US
+
+Internet Explorer: https://support.microsoft.com/en-us/topic/how-to-delete-cookie-files-in-internet-explorer-bca9446f-d873-78de-77ba-d42645fa52fc
+
+If you are using any other web browser, please visit your browser’s official support documents.
+
+*Cookie Policy generated by {{< link "https://www.cookieyes.com" >}}CookieYes - Cookie Policy Generator{{< /link >}}.*

exampleSite/content/en/privacy.md

@@ -0,0 +1,47 @@
+---
+title: Privacy Policy
+description: Privacy policy of gethinode.com
+date: 2024-09-19
+layout: docs
+---
+<!-- markdownlint-disable MD036 -->
+*Effective Date 19-Sep-2024*
+
+This Privacy Policy describes the policies of gethinode.com on the collection, use and disclosure of your information that we collect when you use our website (https://gethinode.com, referred to as the “Service”). By accessing or using the Service, you are consenting to the collection, use and disclosure of your information in accordance with this Privacy Policy. If you do not consent to the same, please do not access or use the Service.
+
+We may modify this Privacy Policy at any time without any prior notice to you and will post the revised Privacy Policy on the Service. The revised Policy will be effective 180 days from when the revised Policy is posted in the Service and your continued access or use of the Service after such time will constitute your acceptance of the revised Privacy Policy. We therefore recommend that you periodically review this page.
+
+## How we share your information
+
+We will not transfer your personal information to any third party without seeking your consent, except in limited circumstances as described
+below:
+
+- Analytics
+
+We require such third party’s to use the personal information we transfer to them only for the purpose for which it was transferred and not to retain it for longer than is required for fulfilling the said purpose.
+
+We may also disclose your personal information for the following: (1) to comply with applicable law, regulation, court order or other legal process; (2) to enforce your agreements with us, including this Privacy Policy; or (3) to respond to claims that your use of the Service violates any third-party rights. If the Service or our company is merged or acquired with another company, your information will be one of the assets that is transferred to the new owner.
+
+## Your rights
+
+Depending on the law that applies, you may have a right to access and rectify or erase your personal data or receive a copy of your personal data, restrict or object to the active processing of your data, ask us to share (port) your personal information to another entity,withdraw any consent you provided to us to process your data, a right to lodge a complaint with a statutory authority and such other rights as may be relevant under applicable laws. <!-- To exercise these rights, you can write to us at privacy@gethinode.com. We will respond to your request in accordance with applicable law. -->
+
+Do note that if you do not allow us to collect or process the required personal information or withdraw the consent to process the same for the required purposes, you may not be able to access or use the services for which your information was sought.
+
+## Cookies etc.
+
+To learn more about how we use these and your choices in relation to these tracking technologies, please refer to our {{< link "cookies" >}}Cookie Policy/Settings{{< /link >}}.
+
+## Security
+
+The security of your information is important to us and we will use reasonable security measures to prevent the loss, misuse or unauthorized alteration of your information under our control. However, given the inherent risks, we cannot guarantee absolute security and consequently, we cannot ensure or warrant the security of any information you transmit to us and you do so at your own risk.
+
+## Third party links & use of your information
+
+Our Service may contain links to other websites that are not operated by us. This Privacy Policy does not address the privacy policy and other practices of any third parties, including any third party operating any website or service that may be accessible via a link on the Service. We strongly advise you to review the privacy policy of every site you visit. We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
+
+<!-- ## Grievance / Data Protection Officer
+
+If you have any queries or concerns about the processing of your information that is available with us, you may email us at privacy@gethinode.com. We will address your concerns in accordance with applicable law. -->
+
+*Privacy Policy generated with {{< link "https://www.cookieyes.com" >}}CookieYes{{< /link >}}.*

exampleSite/data/server.toml

@@ -0,0 +1,63 @@
+# toml-docs-start server-config
+[[headers]]
+    for = "/**"
+    [headers.values]
+        Strict-Transport-Security = "max-age=31536000; includeSubDomains; preload"
+        X-Content-Type-Options = "nosniff"
+        X-XSS-Protection = "1; mode=block"
+        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 \
+            """
+        Access-Control-Allow-Origin = "*"
+        Content-Security-Policy = """\
+            default-src 'none'; \
+            script-src 'self'; \
+            font-src 'self'; \
+            connect-src 'self'; \
+            img-src 'self'; \
+            style-src 'self'; \
+            base-uri 'self'; \
+            object-src 'none'; \
+            form-action 'self'; \
+            manifest-src 'self'; \
+            media-src 'self' \
+            """
+# toml-docs-end server-config
+
+# toml-docs-start server-custom-404
+[[redirects]]
+	from = '/fr/*'
+	to = '/fr/404.html'
+	status = 404
+
+[[redirects]]
+	from = '/nl/*'
+	to = '/nl/404.html'
+	status = 404
+
+[[redirects]]
+	from = '/en/*'
+	to = '/en/404.html'
+	status = 404
+
+[[redirects]]  # Default language should be last.
+	from = '/*'
+	to = '/en/404.html'
+	status = 404
+# toml-docs-end server-custom-404

exampleSite/go.mod

@@ -2,3 +2,6 @@ module github.com/gethinode/hinode/exampleSite
 
 go 1.19
 
+require (
+	github.com/gethinode/mod-cookieyes/v2 v2.2.2 // indirect
+)

exampleSite/go.sum

@@ -1,14 +1,2 @@
-github.com/gethinode/hinode v0.22.5 h1:zpjSDgWQVbq4BjPduxwexQB18gawFeinzPkaRRTs2Tg=
-github.com/gethinode/hinode v0.22.5/go.mod h1:hsskrlBRnTbpCjrDtGbK8C1VYGML7ezHtCDGDiYL2mQ=
-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-flexsearch v1.9.0 h1:AE+w7QeZTxh36JNTG+CASDLxaqlCZKn+EUD6ulnPGak=
-github.com/gethinode/mod-flexsearch v1.9.0/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
-github.com/gethinode/mod-fontawesome v1.8.1 h1:iyvULrpaGizQoI5Vl9WjFYcMGWefdyG90NGK2UKax+k=
-github.com/gethinode/mod-fontawesome v1.8.1/go.mod h1:xBKsZH3WJtMOItZVlp9SbO51uaBy6IbvUZSKpNu3b6Y=
-github.com/gethinode/mod-katex v1.0.5 h1:AVhcTINYory0ygChQERf8PcyJkbT1oqhmLRF6ESnWOY=
-github.com/gethinode/mod-katex v1.0.5/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
-github.com/gethinode/mod-leaflet v1.0.0 h1:HdnWafOGkkK1hYGfqLYF3pp9dAFS/caxlzML9sO1rCc=
-github.com/gethinode/mod-leaflet v1.0.0/go.mod h1:Ei0x9WiL7Dbi4JeG6yI1CE63bT1QJ8sKi67Jea1wFSE=
-github.com/gethinode/mod-lottie v1.4.3 h1:IKZO8a4yQyPKUwZ6POsZRIH/B++yEzXDe5HxrFF79KA=
-github.com/gethinode/mod-lottie v1.4.3/go.mod h1:nt4wLnDFIhjBGRMuQJJ2bH80VREpbcsBUsdO6uWXjLs=
+github.com/gethinode/mod-cookieyes/v2 v2.2.2 h1:VNIdbZnzXw/0Jito/IcDNqQ9yRYLCGrDwyrMqtSJgE4=
+github.com/gethinode/mod-cookieyes/v2 v2.2.2/go.mod h1:tULb7D7CoTycGUyL7ryqHJKaX11XuL2SN+XwP7/DI0Y=

exampleSite/hinode.work.sum

@@ -1,18 +1,9 @@
-github.com/airbnb/lottie-web v5.12.2+incompatible h1:Ldogtlhiucf7mMsgisyxSBY0qunV44+lpa9Icy2KoQc=
-github.com/airbnb/lottie-web v5.12.2+incompatible/go.mod h1:nTss557UK9FGnp8QYlCMO29tjUHwbdAHG/DprbGfHGE=
 github.com/gethinode/hinode v0.22.5 h1:zpjSDgWQVbq4BjPduxwexQB18gawFeinzPkaRRTs2Tg=
 github.com/gethinode/hinode v0.22.5/go.mod h1:hsskrlBRnTbpCjrDtGbK8C1VYGML7ezHtCDGDiYL2mQ=
-github.com/gethinode/mod-flexsearch v1.8.1 h1:xwPvmmxd8Tdyxp8/rnd9KRGqIDtZs/YwAQJ1i9oQMiM=
-github.com/gethinode/mod-flexsearch v1.8.1/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
-github.com/gethinode/mod-fontawesome v1.8.0 h1:YEuCmvCdzcemF1eFK35Wnp1asKKO3/xbxGArnjq6PRY=
-github.com/gethinode/mod-fontawesome v1.8.0/go.mod h1:uvuC2YL8mdXNp6NRzFOu4TWsHvtY9AZ8YxJkF23/M/8=
-github.com/gethinode/mod-leaflet v0.4.0 h1:Xc6c1UTf4m1saQLFfFWT5sEpwj25xVGuS8csGC82UUI=
-github.com/gethinode/mod-leaflet v0.4.0/go.mod h1:yr+bUKAstifdB16mbYh69OayAmgPOlNUubAmVn5eL2M=
-github.com/gethinode/mod-lottie v1.4.1 h1:RzCjYsxFPqyBsYAcdPeUP0rvF+hD9eEl7NrxuaRiKQQ=
-github.com/gethinode/mod-lottie v1.4.1/go.mod h1:QjKlEmYbekrNGwa9EdFlPcXxwWWcraJUQ6xIL+syA60=
-github.com/gethinode/mod-utils v1.0.2 h1:0b3i+/bBHY1Td9N6khDbL1nf3d5HGc4QzI4BbEWHoU4=
-github.com/gethinode/mod-utils v1.0.2/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
-github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 h1:re7L8FxbXQpnX8BgzkdUnDpsUmloGNyLmiy2ZCln8pg=
-github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
-github.com/twbs/bootstrap v5.3.2+incompatible h1:tuiO5acc6xnZUR77Sbi5aKWXxjYxbmsSbJwYrhAKoQQ=
-github.com/twbs/bootstrap v5.3.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
+github.com/gethinode/mod-cookieyes v1.0.2 h1:WL9sjpYKjkV+jRKIrm6H82UpthQjFksvKGptW6HD/QU=
+github.com/gethinode/mod-cookieyes v1.0.2/go.mod h1:VrBUKm5apop6KIb+R8eRqvlf3AAPnv5aMajL0RorIjY=
+github.com/gethinode/mod-cookieyes/v2 v2.0.3 h1:o5PAAOjx8baRcSkhTAQuZ+hX9cK8oWjeC3sYxt1DT2c=
+github.com/gethinode/mod-cookieyes/v2 v2.0.4 h1:QgYSD3S23351e7xEeQb+Mon+e+I6RbnnrTyvpxBST1A=
+github.com/gethinode/mod-cookieyes/v2 v2.0.4/go.mod h1:tULb7D7CoTycGUyL7ryqHJKaX11XuL2SN+XwP7/DI0Y=
+github.com/gethinode/mod-cookieyes/v2 v2.1.2 h1:hzGCbRbpNAVkLr+jFWpAQaXHG0lgK+KgIpaZYsI1J+U=
+github.com/gethinode/mod-cookieyes/v2 v2.1.2/go.mod h1:tULb7D7CoTycGUyL7ryqHJKaX11XuL2SN+XwP7/DI0Y=

exampleSite/hugo_stats.json

@@ -142,6 +142,8 @@
       "carousel-item",
       "checkbox",
       "chroma",
+      "cky-audit-table-element",
+      "cky-banner-element",
       "col",
       "col-10",
       "col-12",
@@ -501,7 +503,6 @@
       "body-file-collapse-1",
       "bouton",
       "breadcrumb",
-      "btn-webshare",
       "button",
       "button-group",
       "card",
@@ -515,6 +516,7 @@
       "collapse",
       "collapse-1",
       "command-prompt",
+      "cookies-etc",
       "custom-activity",
       "data-tables",
       "docs",
@@ -560,6 +562,8 @@
       "formule-katex",
       "groupe-de-boutons",
       "groupe-de-cartes",
+      "how-do-we-use-cookies",
+      "how-we-share-your-information",
       "icon",
       "image",
       "imagekitio",
@@ -572,6 +576,7 @@
       "lien",
       "link",
       "lottie-animation-0",
+      "manage-cookie-preferences",
       "map",
       "mark",
       "nav",
@@ -596,10 +601,12 @@
       "publication",
       "release",
       "réduire",
+      "security",
       "spinner",
       "sub",
       "sup",
       "table",
+      "third-party-links--use-of-your-information",
       "timeline",
       "toast",
       "toast-container",
@@ -609,8 +616,11 @@
       "toast-message-email-4",
       "toc-collapse",
       "tooltip",
+      "types-of-cookies-we-use",
       "video",
       "vimeo",
+      "what-are-cookies",
+      "your-rights",
       "youtube"
     ]
   }

exampleSite/layouts/_default/baseof.html

@@ -0,0 +1,80 @@
+{{- /* Set version-aware sidebar menu */ -}}
+{{- $version := partial "utilities/GetVersion.html" (dict "page" . "base" true) -}}
+{{- $.Scratch.Set "version" $version -}}
+{{ with partial "utilities/GetMenu" (dict "page" . "version" $version) }}{{ $.Scratch.Set "sidebar" . }}{{ end }}
+
+{{- /* Validate if current version is latest */ -}}
+{{- if and site.Params.docs.checkVersion $version -}}
+    {{- if ne $version "latest" -}}
+        {{- if partial "utilities/IsOlder" (dict "current" $version) -}}
+            {{- $.Scratch.Set "pageAlertMsg" (T "newerVersionAlert" site.Title) -}}
+            {{- $.Scratch.Set "pageAlertURL" (or site.Params.docs.latestURL site.baseURL) -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+
+{{- /* Initialize module configuration */ -}}
+{{- $modules := partialCached "utilities/InitModules.html" . -}}
+{{- $.Scratch.Set "modules" $modules -}}
+
+{{- $fullCover := or (or (and .IsHome .Site.Params.home.fullCover) .Page.Params.fullCover) .Site.Params.main.footerBelowFold }}
+{{- $.Scratch.Set "fullCover" $fullCover -}}
+
+{{- /* Define section headings */ -}}
+{{- $loading := "" -}}
+{{- if $fullCover }}{{ $loading = .Site.Params.main.loading }}{{ end -}}
+{{ $sections := partial "utilities/GetSections.html" (dict "page" . "loading" $loading) }}
+{{- $.Scratch.Set "sections" $sections -}}
+
+{{- /* Define main breakpoint */ -}}
+{{- $.Scratch.Set "breakpoint" (partialCached "utilities/GetBreakpoint.html" .) }}
+
+{{- /* Define base URL */ -}}
+{{ $lang := site.LanguageCode | default site.Language.Lang }}
+{{ $.Scratch.Set "baseURL" (strings.TrimSuffix (printf "%s/" $lang) site.Home.RelPermalink) }}
+
+<!doctype html>
+<html lang="{{ .Site.Language.Lang }}" class="no-js">
+    <head>
+        {{- partial "footer/scripts.html" (dict "page" . "type" "critical") -}}
+        {{ block "head" . }}{{ end -}}
+    </head>
+
+    <body>
+        <div class="d-flex flex-column min-vh-100">
+            <div class="d-flex flex-column {{ if $fullCover }} fullscreen{{ end }}{{ if .IsHome }} {{ .Site.Params.home.style }}{{ end }}">
+                {{- partial "assets/navbar.html" (dict
+                    "page" .
+                    "fixed" site.Params.navigation.fixed
+                    "overlay" site.Params.navigation.overlay
+                    "overlayMode" site.Params.navigation.overlayMode
+                    "color" site.Params.navigation.color
+                    "style" (default "light" site.Params.navigation.style)
+                    "size" (default "md" site.Params.navigation.size))
+                -}}
+                <div class="main-content">
+                    {{ block "featured" . }}{{ end -}}
+                </div>
+                {{ if .Site.Params.main.footerBelowFold }}
+                    {{ block "main" . }}{{ end -}}
+                {{ end }}
+            </div>
+
+            {{ if not .Site.Params.main.footerBelowFold }}
+                {{ block "main" . }}{{ end -}}
+                {{- partial "footer/social.html" . -}}
+                {{- partial "footer/footer.html" . -}}
+            {{ end }}
+        </div>
+
+        {{ if .Site.Params.main.footerBelowFold }}
+            {{- partial "footer/social.html" . -}}
+            {{- partial "footer/footer.html" . -}}
+        {{ end }}
+
+        {{- partial "footer/toast-container.html" . -}}
+        {{- partial "assets/symbols.html" . -}}
+        {{- partialCached "footer/scripts.html" (dict "page" .) -}}
+        {{- partial "footer/scripts.html" (dict "page" . "type" "optional") -}}
+    </body>
+</html>

exampleSite/layouts/partials/footer/footer.html

@@ -0,0 +1,15 @@
+<footer class="container-fluid footer text-center p-3">
+    <div class="container-xxl text-center">
+        <small>
+            {{- $copyright := printf "%s © %s %s %s." (T "copyright") (dateFormat "2006" now) .Site.Title (T "rights") }}
+            {{ cond (gt (len .Site.Copyright) 0) .Site.Copyright $copyright }}
+            {{ .Site.Params.footer.license | safeHTML }} |
+            {{ partial "assets/link.html" (dict "destination" "/en/privacy" "text" (T "privacy") "class" "link-bg-footer" "page" .Page) }} |
+            {{ partial "assets/link.html" (dict "destination" "/en/cookies" "text" (T "cookies") "class" "link-bg-footer" "page" .Page) }} |
+            {{ if .Site.Params.main.endorse }}
+                {{ $link := partial "assets/link.html" (dict "destination" (index site.Params.links "hinode") "text" "Hinode" "class" "link-bg-footer" "page" .Page) }}
+                {{ T "poweredBy" $link | safeHTML }}
+            {{ end }}
+        </small>
+    </div>
+</footer>

go.mod

@@ -5,13 +5,15 @@ go 1.19
 require (
 	github.com/airbnb/lottie-web v5.12.2+incompatible // indirect
 	github.com/gethinode/mod-bootstrap v1.3.1 // indirect
+	github.com/gethinode/mod-csp v1.0.3 // indirect
 	github.com/gethinode/mod-flexsearch/v2 v2.0.1 // 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
 )

go.sum

@@ -24,6 +24,14 @@ 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.0 h1:Obp0MVMBjIPZbKDh6Ejl5pImDG7yERMLf2or9UVnwPA=
+github.com/gethinode/mod-csp v1.0.0/go.mod h1:Nb22QMicoUHgZQUKP5TCgVrSI8K3KU7jLuLBShmotjg=
+github.com/gethinode/mod-csp v1.0.1 h1:IUUwPc41UNw7DAFuJ75nNPzhkPExenxXU7susdLaxdQ=
+github.com/gethinode/mod-csp v1.0.1/go.mod h1:Nb22QMicoUHgZQUKP5TCgVrSI8K3KU7jLuLBShmotjg=
+github.com/gethinode/mod-csp v1.0.2 h1:KX8EeoCGbHhGSo5r0YIa9BmPZ6S6v7L9CChTejREkK4=
+github.com/gethinode/mod-csp v1.0.2/go.mod h1:Nb22QMicoUHgZQUKP5TCgVrSI8K3KU7jLuLBShmotjg=
+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.0.1 h1:FJkRsUzSnQTXl3MWCigT4E6vfff870UWTnkGqaDGIhA=
 github.com/gethinode/mod-flexsearch v1.0.1/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.1.0 h1:7BCMyQDlYlskNXuazt8Jg/jg9WREexu2xVkYqThkAX4=
@@ -118,6 +126,20 @@ 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.0.0 h1:fly42RQ69bdyJe8WFefsBIo7WMIXkd3wZn32kyAr4h4=
+github.com/gethinode/mod-google-analytics v1.0.0/go.mod h1:dl628cFozpCvoIMCiV7ujzQipjxcm3eatXrSfLPWNII=
+github.com/gethinode/mod-google-analytics v1.0.1 h1:zbmOdnAhhFCA7qWw7fnR46biWhqW2r06sIaTWyhB5R0=
+github.com/gethinode/mod-google-analytics v1.0.1/go.mod h1:dl628cFozpCvoIMCiV7ujzQipjxcm3eatXrSfLPWNII=
+github.com/gethinode/mod-google-analytics v1.0.2 h1:ljrAYdAPqiQg6rdnL6Je8zLK6mhlXoTGJ/vGtIUpX+w=
+github.com/gethinode/mod-google-analytics v1.0.2/go.mod h1:dl628cFozpCvoIMCiV7ujzQipjxcm3eatXrSfLPWNII=
+github.com/gethinode/mod-google-analytics v1.0.3 h1:QUm4AeBR6D9cLx26F6Cy5qQvQe/19c2wTJAqxmCfAq4=
+github.com/gethinode/mod-google-analytics v1.0.3/go.mod h1:dl628cFozpCvoIMCiV7ujzQipjxcm3eatXrSfLPWNII=
+github.com/gethinode/mod-google-analytics v1.1.1 h1:XzMXd6nBDl5Lj1Q5pd8MWtE87FI/vRCsUAkAvfuXDxE=
+github.com/gethinode/mod-google-analytics v1.1.1/go.mod h1:dl628cFozpCvoIMCiV7ujzQipjxcm3eatXrSfLPWNII=
+github.com/gethinode/mod-google-analytics v1.1.2 h1:mcoqaRRorut+PxYxJnOEMfKIlVIIOd6vxKhuEYTwFzw=
+github.com/gethinode/mod-google-analytics v1.1.2/go.mod h1:dl628cFozpCvoIMCiV7ujzQipjxcm3eatXrSfLPWNII=
+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.0 h1:me/3dIIZBkfk1mRIFt8QiAGYwYDoSG5bc2hHRtIutFc=
 github.com/gethinode/mod-katex v1.0.0/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.1 h1:809QUztxmKgMNchU+v03iMO7Ma+ISc3ZzhXYauc21rs=
@@ -162,6 +184,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.0.0 h1:1CUZMcgN5FAyjjyuP3qkaOQ6M5sv6HUAbosW4sIT5VE=
 github.com/gethinode/mod-lottie v1.0.0/go.mod h1:erRCgSL2FCfKHI0jQbSpM+g0jXl7SjKVJrh7kWGteKs=
 github.com/gethinode/mod-lottie v1.0.1 h1:+IE7xtnSVQpJS56oBJq9RWKZeFEfxrOZAqE3BSrS/u0=
@@ -206,6 +230,12 @@ 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.9 h1:1MFsq8pO7s4RXu1sA0z75xdp63FPdJ6ar9OhEieDSj8=
+github.com/gethinode/mod-lottie v1.5.9/go.mod h1:TA1rPRwSilT5mXUakNSVlXNrgTpE87mUOB/fdunAdA0=
+github.com/gethinode/mod-lottie v1.5.10 h1:tYFgk74T9zWy2FRkfkRI+8QVQy6lnuABnTeWQ8nUX5w=
+github.com/gethinode/mod-lottie v1.5.10/go.mod h1:L7NpvCAm04R59GSAAm/UFoDCs/6UtrIC5zQEjgQSr4k=
+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.0 h1:Dj4WGw12OkaimwkCpLn5Jhmd49dvNJW9O2P/W9F+HlQ=
 github.com/gethinode/mod-simple-datatables v1.0.0/go.mod h1:K8T7fIdb8pMOB+OSW4A5lz5IW99+HyzcTgx764fvOGw=
 github.com/gethinode/mod-simple-datatables v1.0.2 h1:zhqxHet3iLQWYCBbGROALpOY9zQlptMycFkz1Tto5bA=
@@ -224,6 +254,12 @@ 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.12 h1:myyVp1ctQA6j+5UTWcDwQmy8ipXdjs8T+qpTpRPBPII=
+github.com/gethinode/mod-simple-datatables v1.0.12/go.mod h1:QuH7wz1igohzCgL76xI1960mFxPPrqgvGtLwR/0cFyQ=
+github.com/gethinode/mod-simple-datatables v1.0.13 h1:3GTn46Zh56SFzCUP7CUSrmp/ZoiaVG19q4xdObSx6Pc=
+github.com/gethinode/mod-simple-datatables v1.0.13/go.mod h1:a2qIdYegX5gBubGbspuHv/2UA/8O89oUG/U5hd7jLK8=
+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=
@@ -280,6 +316,14 @@ github.com/gethinode/mod-utils/v2 v2.6.0 h1:r7l/E6fbPZHnjFyJY4T/xzekd7Xp3czNVCMg
 github.com/gethinode/mod-utils/v2 v2.6.0/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.0 h1:BdB+onItuO29g5ZLEz/HEwq9c4xBEM4GGqQc3kQ++js=
+github.com/gethinode/mod-utils/v2 v2.8.0/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.8.1 h1:u7sFbgJ5sBEMYC/GwcMRyjRAd5NxTjBnbld5b0V5n98=
+github.com/gethinode/mod-utils/v2 v2.8.1/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.8.2 h1:rKndAMmRBSO5Cgoa/2CvF5XchDSvLvd4TYAbfbbQVhE=
+github.com/gethinode/mod-utils/v2 v2.8.2/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=

layouts/_default/_markup/render-blockquote.html

@@ -9,10 +9,18 @@
 }}
 
 {{ if eq .Type "alert" }}
-    <blockquote class="blockquote-alert blockquote-alert-{{ .AlertType }}">
+    {{ $alert := .AlertType }}
+    {{ $icon := (index $icons $alert) }}
+
+    <blockquote class="blockquote-alert blockquote-alert-{{ $alert }}">
         <p class="blockquote-alert-heading">
-            {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-fw" (index $icons .AlertType))) }}
-            {{ or (i18n .AlertType) (title .AlertType) }}
+            {{ with $icon }} 
+                {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-fw" .)) }}
+                {{ or (i18n $alert) (title $alert) }}
+            {{ else }}
+                {{ title $alert }}
+                {{ warnf "Unsupported alert type: '%s'. See %s" $alert $.Position }}
+            {{ end }}
         </p>
     {{ trim .Text "\n\r" | safeHTML }}
     </blockquote>

layouts/_default/_markup/render-heading.html

@@ -1,5 +1,12 @@
-{{ if site.Params.navigation.anchor }}
-<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="heading">{{ .Text | safeHTML }} <a href="#{{ .Anchor | safeURL }}" aria-labelledby="{{ .Anchor | safeURL }}">{{- partial "assets/icon.html" (dict "icon" "fas link anchor") }}</a></h{{ .Level }}>
+{{ $text := trim .Text " \n\r" }}
+
+{{ if and site.Params.navigation.anchor $text }}
+<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="heading">
+    {{- .Text | safeHTML -}}
+    <a href="#{{ .Anchor | safeURL }}" aria-labelledby="{{ .Anchor | safeURL }}">
+        {{- partial "assets/icon.html" (dict "icon" "fas link anchor") }}
+    </a>
+</h{{ .Level }}>
 {{ else }}
 <h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ .Text | safeHTML }}</h{{ .Level }}>
 {{ end }}

layouts/_default/baseof.html

@@ -14,7 +14,7 @@
 {{- end -}}
 
 {{- /* Initialize module configuration */ -}}
-{{- $modules := partial "utilities/InitModules.html" (dict "page" .) -}}
+{{- $modules := partialCached "utilities/InitModules.html" . -}}
 {{- $.Scratch.Set "modules" $modules -}}
 
 {{- $fullCover := or (or (and .IsHome .Site.Params.home.fullCover) .Page.Params.fullCover) .Site.Params.main.footerBelowFold }}
@@ -27,7 +27,7 @@
 {{- $.Scratch.Set "sections" $sections -}}
 
 {{- /* Define main breakpoint */ -}}
-{{- $.Scratch.Set "breakpoint" (partial "utilities/GetBreakpoint.html") }}
+{{- $.Scratch.Set "breakpoint" (partialCached "utilities/GetBreakpoint.html" .) }}
 
 {{- /* Define base URL */ -}}
 {{ $lang := site.LanguageCode | default site.Language.Lang }}
@@ -36,7 +36,8 @@
 <!doctype html>
 <html lang="{{ .Site.Language.Lang }}" class="no-js">
     <head>
-        {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "header" true "page" .) -}}
+        {{- partial "footer/scripts.html" (dict "page" . "type" "critical") -}}
+        {{- partial "footer/scripts.html" (dict "page" . "type" "functional") -}}
         {{ block "head" . }}{{ end -}}
     </head>
 
@@ -74,7 +75,7 @@
 
         {{- partial "footer/toast-container.html" . -}}
         {{- partial "assets/symbols.html" . -}}
-        {{- partialCached "footer/scripts.html" (dict "header" false "page" . "core" true) }}
-        {{- partial "footer/optional-scripts.html" . -}}
+        {{- partialCached "footer/scripts.html" (dict "page" .) -}}
+        {{- partial "footer/scripts.html" (dict "page" . "type" "optional") -}}
     </body>
 </html>

layouts/_default/single.html

@@ -6,7 +6,7 @@
     {{ $toc := .Render "single/panel-toc" }}
 
     {{ with $sidebar }}
-        <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-inledby="offcanvas-label">
+        <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-labelledby="offcanvas-label">
             <div class="offcanvas-header">
                 <h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper $.Section }}</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="{{ T "close" }}"></button>

layouts/alias.html

@@ -8,7 +8,8 @@
     <meta charset="utf-8">
     <noscript><meta http-equiv="refresh" content="0; url={{ .Permalink }}"></noscript>
     {{ if site.Params.main.enableLanguageSelectionStorage }} 
-      {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "header" true "page" page) -}}
+      {{- partial "footer/scripts.html" (dict "page" page "type" "critical") -}}
+      {{- partial "footer/scripts.html" (dict "page" page "type" "functional") -}}
     {{ else }}
       <script src='{{ partial "utilities/GetStaticURL" (dict "url" "js/alias.js") }}'></script>
     {{ end }}

layouts/partials/assets/adapters/cloudinary.html

@@ -39,13 +39,22 @@
 {{ $element := "" }}
 
 <!-- Split path between upload dir and sub dir -->
-{{ $newdir := partial "utilities/URLJoin.html" (dict "base" (index (split $dir "upload") 0) "path" "upload") }}
-{{ $file = partial "utilities/URLJoin.html" (dict "base" (index (split $dir "upload") 1) "path" $file) }}
-{{ $dir = $newdir }}
+{{ $dir = path.Clean (trim .dir "/") }}
+{{ $api := "image/upload" }}
+
+<!-- Define the account, optional API segment, and directory -->
+{{ $elements := split $dir "/" }}
+{{ $account := index $elements 0 }}
+{{ $operation := "" }}
+{{ if and (in (slice "image" "video") (index $elements 1)) (eq (index $elements 2) "upload") }}
+    {{ $api = delimit (slice | append (index $elements 1) | append (index $elements 2)) "/" }}
+    {{ $dir = delimit (after 3 $elements) "/" }}
+{{ else }}
+    {{ $dir = delimit (after 1 $elements) "/" }}
+{{ end }}
 
 <!-- Generate image URL -->
 {{ if not $error }}
-    {{ $operation := "" }}
     {{ if $format }}
         {{ $operation = printf "%s,h_%d,w_%d" $transform $height $width }}
         {{ $file = printf "%s.%s" (strings.TrimSuffix (path.Ext $file) $file) $format }}
@@ -55,7 +64,7 @@
     {{ with $anchor }}
         {{ $operation = printf "%s,g_%s" $operation . }}
     {{ end }}
-    {{- $element = partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $dir $operation $file)) -}}
+    {{- $element = partial "utilities/URLJoin.html" (dict "elements" (slice "https://" $host $account $api $operation $dir $file)) -}}
 {{ end }}
 
 {{ return $element }}

layouts/partials/assets/button.html

@@ -64,7 +64,7 @@
 {{- if $isExternal -}}
     {{- if $tab -}}
         {{- $target = "_blank" -}}
-        {{- $rel = "noopener noreferrer" -}}
+        {{- $rel = "noopener noreferrer nofollow" -}}
     {{- end -}}
 
     {{- if and $title $cue -}}

layouts/partials/assets/card-group.html

@@ -49,6 +49,11 @@
     "5" (printf "(min-width: %s) 20vw, (min-width: %s) 33.3vw, 100vw" $breakpoint.currentSize $breakpoint.prevSize)
 }}
 
+{{ if not $args.responsive }}
+    {{ $colsMap = dict  "auto" "" "1" "row-cols-1" "2" "row-cols-2" "3" "row-cols-3" "4" "row-cols-4" "5" "row-cols-5" }}
+    {{ $sizesMap = dict "auto" "100vw" "1" "100vw" "2" "50vw" "3" "33.3vw" "4" "25vw" "5" "20vw" }}
+{{ end }}
+
 <!-- Apply optional pagination -->
 {{ $isPages := in (slice "page.Pages" "resource.Resources") (printf "%T" $list) }}
 {{ $paginator := "" }}
@@ -58,7 +63,7 @@
     {{ else }}
         {{ $paginator = $args.page.Paginate $list }}
     {{ end }}
-    {{ $list = first $paginator.PageSize (after (mul (sub $paginator.PageNumber 1) $paginator.PageSize) $list) }}
+    {{ $list = first $paginator.PagerSize (after (mul (sub $paginator.PageNumber 1) $paginator.PagerSize) $list) }}
 {{ end }}
 
 <!-- Initialize list elements -->
@@ -103,7 +108,7 @@
 {{- $colGrid := "" -}}
 {{ if not $args.scroll }}
     {{ $colGrid = index $colsMap $args.cols }}
-    {{ if $args.responsive }}{{ $sizes = index $sizesMap $args.cols }}{{ end }}
+    {{ $sizes = index $sizesMap $args.cols }}
 {{ else }}
     {{ if in (slice "2" "3" "4" "5") $args.cols }}
         {{ $sizes = replace (printf "%.1fvw" (div 100.0 (int $args.cols))) ".0" "" }}

layouts/partials/assets/card.html

@@ -52,11 +52,12 @@
 {{- $page := "" }}
 {{- if .path }}
     {{ $page = partial "utilities/GetPage.html" (dict "url" .path "page" page) }}
-    {{- if not $page }}
+    {{ $validate := site.Params.main.internalLinks.validate | default true }}
+    {{- if and $validate (not $page) }}
         {{ if page.File }}
-            {{- errorf "partial [assets/card.html] - Cannot find target page '%s', see '%s'" .path page.File.Path -}}
+            {{- warnf "partial [assets/card.html] - Cannot find target page '%s', see '%s'" .path page.File.Path -}}
         {{ else }}
-            {{- errorf "partial [assets/card.html] - Cannot find target page '%s'" .path -}}
+            {{- warnf "partial [assets/card.html] - Cannot find target page '%s'" .path -}}
         {{ end }}
     {{- end }}
 {{- end }}
@@ -95,7 +96,7 @@
     
     {{- if $href -}}
         <a href="{{ $href }}" class="{{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }} stretched-link">
-                <p class="card-title fs-lg-5 fs-6 fw-bold">{{ $title }}</p>
+                <p class="card-title fs-lg-5 fs-6">{{ $title }}</p>
             {{ with $description }}
                 <div class="card-text {{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }}">
                 {{ . | safeHTML }}
@@ -104,7 +105,7 @@
         </a>
     {{- else -}}
         <div>
-            {{ with $title }}<p class="card-title fs-lg-5 fs-6 fw-bold">{{ . }}</p>{{ end -}}
+            {{ with $title }}<p class="card-title fs-lg-5 fs-6">{{ . }}</p>{{ end -}}
             {{ with $description }}<div class="card-text">{{ . | safeHTML }}</div>{{ end -}}
         </div>
     {{- end -}}

layouts/partials/assets/link.html

@@ -13,7 +13,15 @@
 {{ end }}
 
 <!-- Initialize arguments -->
-{{ $destination := strings.TrimPrefix (strings.TrimSuffix "/" site.BaseURL) .destination }}
+{{ $destination := .destination }}
+{{ $u := urls.Parse $destination }}
+{{ if not $u.Scheme }}
+    {{ $b := urls.Parse site.BaseURL }}
+    {{ $destination = strings.TrimPrefix $b.Path $destination }}
+{{ else }}
+    {{ $destination = (strings.TrimPrefix (strings.TrimSuffix "/" site.BaseURL) $destination) }}
+{{ end }}
+{{ $destination = path.Clean $destination }}
 {{ if not $destination }}{{ $destination = "/" }}{{ end }}
 
 {{- $target := "" -}}
@@ -38,7 +46,7 @@
 
     {{- if $tab -}}
         {{- $target = "_blank" -}}
-        {{- $rel = "noopener noreferrer" -}}
+        {{- $rel = "noopener noreferrer nofollow" -}}
     {{- end -}}
 
     {{- if $cue -}}
@@ -60,7 +68,9 @@
         {{ $ref := partial "utilities/GetPage.html" (dict "url" $destination "page" $page) }}
         {{- if not $ref -}}
             {{ $pageContext := "" }}
-            {{ with $page.File }}{{ $pageContext = path.Join "/content" .Dir }}{{ end }}
+            {{ with $page.File }}
+                {{ $pageContext = path.Dir (strings.TrimPrefix hugo.WorkingDir .Filename) }}
+            {{ end }}
             {{ $isPageRes := fileExists (path.Join $pageContext $destination) }}
             {{ $isStatic := fileExists (path.Join "static" $destination) }}
             {{ if and (not $isPageRes) (not $isStatic) }}

layouts/partials/assets/nav.html

@@ -74,6 +74,7 @@
                             "title" $item.Title
                             "class" $class
                             "color" $color
+                            "href" $item.Params.href
                             "content" (partial "utilities/GetDescription.html" (dict "page" $item))
                             "thumbnail" $thumbnail
                         ) -}}

layouts/partials/assets/navbar-item.html

@@ -42,7 +42,7 @@
 
 {{- if $isExternal }}
     {{- if $tab -}}
-        {{ $externalHref = "target=\"_blank\" rel=\"noopener noreferrer\"" }}
+        {{ $externalHref = "target=\"_blank\" rel=\"noopener noreferrer nofollow\"" }}
     {{- end -}}
 
     {{- if $cue -}}
@@ -85,10 +85,10 @@
             "size" "sm"
         )}}
     {{ else }}
-        <a class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{ . }}{{ end }}" 
+        {{ cond $menuURL "<a" "<div" | safeHTML }} class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{ . }}{{ end }}" 
             {{ if $isIcon }}aria-label="{{ $menu.Name }}"{{ end }}
             data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
-            {{ if $menuURL }} href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }}{{ end }} {{ $button | safeHTMLAttr }}>
+            {{ if $menuURL }} href="{{ $menuURL }}{{ $params | safeHTML }}"{{ with $externalHref }} {{ . | safeHTML }}{{ end }}{{ end }} {{ $button | safeHTML }}>
             
             {{- with $menu.Pre }}
                 {{ if hasPrefix . "<i" }}
@@ -100,6 +100,6 @@
             <span {{ if $isActive }} class="active"{{ end }}>{{ if or (not $isIcon) $plain }}{{ $menu.Name }}{{ end }}</span>
             {{- with $menu.Post }}{{ . }}{{ end -}}
             {{- if not $isIcon }}&nbsp;{{ $suffix }}{{ end -}}
-        </a>
+        {{ cond $menuURL "</a>" "</div>" | safeHTML }}
     {{ end }}
 {{ end }}

layouts/partials/assets/persona.html

@@ -45,7 +45,7 @@
 {{- $rel := "" -}}
 {{- if and $isExternal $tab -}}
     {{- $target = "_blank" -}}
-    {{- $rel = "noopener noreferrer" -}}
+    {{- $rel = "noopener noreferrer nofollow" -}}
 {{- end -}}
 
 <!-- Inline partial to render the card's body -->

layouts/partials/assets/sharing.html

@@ -58,8 +58,8 @@
                 {{ partial "assets/button.html" (dict "toast" $target "clipboard" $clipboard "href" $url "icon" (printf "%s fa-fw" $item.icon) "class" "btn-social p-0" "label" (T "shareLink" $item.name) "spacing" false) }}
             {{- end -}}
             {{ if $page.Site.Params.sharing.webshare }}
-                {{ $attr := dict "data-sharing-title" .Title "data-sharing-description" .Description "data-sharing-url" .Permalink }}
-                {{ partial "assets/button.html" (dict "href" "#!" "icon" "fas share-nodes fa-fw" "id" "btn-webshare" "class" "btn-social p-0" "attributes" $attr "label" (T "shareLink" (T "shareSystem")) "spacing" false) }}
+                {{ $attr := dict "data-sharing-title" $page.Title "data-sharing-description" $page.Description "data-sharing-url" $page.Permalink }}
+                {{ partial "assets/button.html" (dict "href" "#!" "icon" "fas share-nodes fa-fw" "class" "btn-social p-0" "attributes" $attr "label" (T "shareLink" (T "shareSystem")) "spacing" false) }}
             {{- end -}}
             {{ with $download }}
                 {{ $label := (T "download" ) }}

layouts/partials/footer/footer.html

@@ -3,7 +3,7 @@
         <small>
             {{- $copyright := printf "%s © %s %s %s." (T "copyright") (dateFormat "2006" now) .Site.Title (T "rights") }}
             {{ cond (gt (len .Site.Copyright) 0) .Site.Copyright $copyright }}
-            {{ .Site.Params.footer.license | safeHTML }}
+            {{ .Site.Params.footer.license | safeHTML }} |
             {{ if .Site.Params.main.endorse }}
                 {{ $link := partial "assets/link.html" (dict "destination" (index site.Params.links "hinode") "text" "Hinode" "class" "link-bg-footer" "page" .Page) }}
                 {{ T "poweredBy" $link | safeHTML }}

layouts/partials/footer/optional-scripts.html

@@ -1,46 +0,0 @@
-{{ $page_modules := slice }}
-{{ if reflect.IsMap .Params.modules }}
-    {{ $page_modules = .Params.modules }}
-{{ else }}
-    {{ $page_modules = $page_modules | append .Params.modules }}
-{{ end }}
-{{ with .Scratch.Get "dependencies" }}{{ $page_modules = append $page_modules . | uniq }}{{ end }}
-
-{{ $config := page.Scratch.Get "modules" }}
-{{ if not $config }}
-    {{ errorf "partial [footer/optional-scripts.html] - Cannot initialize module configuration" }}
-{{ end }}
-
-{{- $modules := $config.optional | intersect $page_modules  -}}
-{{- range $index, $mod := $modules -}}
-    {{- $filename := printf "js/%s.bundle.js" $mod -}}
-    {{- $match := printf "js/modules/%s/**.js" $mod -}}
-    {{- $skipTemplate := false -}}
-    {{- if reflect.IsSlice $config.disableTemplate -}}
-        {{- if in $config.disableTemplate $mod}}
-            {{- $skipTemplate = true -}}
-        {{- end -}}
-    {{- end -}}
-
-    {{ $state := "" }}
-    {{- with (index $config.modules $mod) -}}
-        {{- with index . "state" }}{{ $state = . }}{{ end -}}
-    {{- end -}}
-
-    {{ $localize := false }}
-    {{- if reflect.IsSlice $config.localize -}}
-        {{- if in $config.localize $mod}}
-            {{- $localize = true -}}
-        {{- end -}}
-    {{- end -}}
-
-    {{- partial "footer/scripts.html" (dict 
-        "filename" $filename
-        "match" $match
-        "header" false
-        "skipTemplate" $skipTemplate
-        "state" $state
-        "localize" $localize
-        "page" page
-    ) }}
-{{- end -}}

layouts/partials/footer/scripts.html

@@ -6,50 +6,42 @@
 
 {{ $error := false }}
 
-<!-- Validate arguments -->
-{{ if partial "utilities/IsInvalidArgs.html" (dict "structure" "scripts" "args" . "group" "partial") }}
-    {{- errorf "partial [footer/scripts.html] - Invalid arguments" -}}
-    {{ $error = true }}
+<!-- Define inline partials -->
+{{ define "partials/match.html" }}
+    {{ $result := "" }}
+    {{ $matches := slice }}
+    {{ if gt (len .modules) 0 }}
+        {{ range .modules }}
+            {{ $matches = $matches | append (printf "js/modules/%s/**.js" .) }}
+        {{ end }}
+        {{ $result = printf "{%s}" (delimit $matches ",") }}
     {{ end }}
 
-<!-- Initialize arguments -->
-{{- $absoluteURL := site.Params.main.canonifyAssetsURLs | default false -}}
-{{- $filename := .filename | default "js/main.bundle.js" -}}
-{{- $match := .match | default "{js/*.js,js/vendor/**.js}" -}}
-{{- $page := .page -}}
-{{- $header := .header -}}
-{{- $core := .core | default false -}}
-{{- $skipTemplate := .skipTemplate | default false -}}
-{{- $localize := .localize | default false }}
-
-{{- $state := .state | default "async" -}}
-{{- if or $header (eq $state "immediate") }}{{ $state = "" }}{{ end -}}
-
-{{- $modules := "" -}}
-{{ if $core }}
-    {{ $config := $page.Scratch.Get "modules" }}
-    {{ if not $config }}
-        {{ errorf "partial [footer/scripts.html] - Cannot initialize module configuration" }}
+    {{ return $result }}
 {{ end }}
 
-    {{- $modules = $config.core -}}
-    {{- if reflect.IsSlice $config.localize -}}
-        {{- range $index, $mod := $modules -}}            
-            {{- if in $config.localize $mod}}
-                {{- $localize = true -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
+{{ define "partials/bundle-script.html" }}
+    {{ $page := .page }}
+    {{ $match := .match }}
+    {{ $destination := .destination }}
+    {{ $cat := .cat }}
+    {{ $localize := .localize }}
+    {{ $modules := .modules }}
+    {{ $skipTemplate := .skipTemplate }}
+    {{ $absoluteURL := .absoluteURL }}
+    {{ $state := cond (ne .state "immediate") .state "" }}
+
+    {{ if and $cat (ne $cat "other") }}
+        {{ $destination = path.Join (path.Dir $destination) (printf "%s-%s%s" (path.BaseName $destination) $cat (path.Ext $destination)) }}
+    {{ end }}
 
     {{ if $localize }}
-    {{ $filename = path.Join (path.Dir $filename) (printf "%s.%s%s" (path.BaseName $filename) $page.Language.Lang (path.Ext $filename)) }}
+        {{ $destination = path.Join (path.Dir $destination) (printf "%s.%s%s" (path.BaseName $destination) $page.Language.Lang (path.Ext $destination)) }}
     {{ end }}
 
-<!-- Main code -->
-{{- $bundle := partial "utilities/bundle" (dict
+    {{- $bundle := partial "utilities/bundle.html" (dict
         "match" $match
-    "filename" $filename
+        "filename" $destination
         "modules" $modules
         "basepath" "js/modules"
         "all" true
@@ -57,21 +49,127 @@
     ) -}}
     {{- $js := $bundle -}}
     {{- if not $skipTemplate -}}
-    {{- $js = $bundle | resources.ExecuteAsTemplate $filename $page -}}
-{{- end -}}
-
-{{- if and (not hugo.IsServer) $header -}}
-    {{- $pc := site.Config.Privacy.GoogleAnalytics -}}
-    {{- if and (not $pc.Disable) (hasPrefix site.Config.Services.GoogleAnalytics.ID "G-") }}
-        <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.Config.Services.GoogleAnalytics.ID }}"></script>
-    {{- end }}
+        {{- $js = $bundle | resources.ExecuteAsTemplate $destination $page -}}
     {{- end -}}
 
     {{- if gt (len $js.Content) 0 -}}
-    {{- if not hugo.IsProduction -}}
-        <script src="{{ if $absoluteURL }}{{ $js.Permalink }}{{ else }}{{ $js.RelPermalink }}{{ end }}"{{ with $state }} {{ . | safeHTMLAttr }}{{ end }}></script>
-    {{ else -}}
+        {{ $integrity := "" }}
+        {{- if hugo.IsProduction -}}
             {{ $js = $js | minify | fingerprint -}}
-        <script src="{{ if $absoluteURL }}{{ $js.Permalink }}{{ else }}{{ $js.RelPermalink }}{{ end }}" integrity="{{ $js.Data.Integrity }}" crossorigin="anonymous"{{ with $state}} {{ . | safeHTMLAttr }}{{ end }}></script>
+            {{ $integrity = $js.Data.Integrity }}
         {{ end -}}
+        {{ partial "templates/script.html" (dict "link" (cond $absoluteURL $js.Permalink $js.RelPermalink) "category" $cat "state" $state "integrity" $integrity) }}
     {{ end -}}
+{{ end }}
+
+<!-- Initialize arguments -->
+{{ $args := partial "utilities/InitArgs.html" (dict "structure" "scripts" "args" .) }}
+{{ if $args.err }}
+    {{ partial "utilities/LogErr.html" (dict 
+        "partial" "footer/scripts.html" 
+        "msg" "Invalid arguments"
+        "details" $args.errmsg
+        "file" page.File
+    )}}
+{{ end }}
+
+<!-- Initialize local arguments -->
+{{ $patterns := dict 
+    "other" "js/critical/*.js"
+    "functional" "js/critical/functional/**.js"
+    "analytics" "js/critical/analytics/**.js"
+    "performance" "js/critical/performance/**.js"
+    "advertisement" "js/critical/advertisement/**.js"
+    "core" "{js/*.js,js/vendor/**.js}"
+}}
+
+{{- $absoluteURL := site.Params.main.canonifyAssetsURLs | default false -}}
+{{ $state := "immediate" }}
+{{ $config := $args.page.Scratch.Get "modules" }}
+
+{{ $page_modules := slice }}
+{{ if reflect.IsMap $args.page.Params.modules }}
+    {{ $page_modules = $args.page.Params.modules }}
+{{ else }}
+    {{ $page_modules = $page_modules | append $args.page.Params.modules }}
+{{ end }}
+{{ with $args.page.Scratch.Get "dependencies" }}{{ $page_modules = append $page_modules . | uniq }}{{ end }}
+
+{{- $categories := dict "other" slice -}}
+
+{{ $modules := slice }}
+{{ if eq $args.type "critical" }}
+    {{- $modules = $config.critical -}}
+    {{ $categories = merge $categories (dict "functional" slice "analytics" slice "performance" slice "advertisement" slice) }}
+{{ else if eq $args.type "core" }}
+    {{- $modules = $config.core -}}
+{{ else if eq $args.type "optional" }}
+    {{- $modules = $config.optional | intersect $page_modules  -}}
+{{ end }}
+
+{{ range $cat, $val := $config.categories }}
+    {{ $categories = merge $categories (dict $cat (intersect $val $modules)) }}
+{{ end }}
+
+{{ $localize := false }}
+{{ if gt (intersect (or $config.localize slice) $modules | len) 0 }}{{ $localize = true }}{{ end }}
+
+{{ $skipTemplate := false }}
+{{ if gt (intersect (or $config.skipTemplate slice) $modules | len) 0 }}{{ $skipTemplate = true }}{{ end }}
+
+<!-- Main code -->
+{{ if not $error }}
+    <!-- include external scripts first -->
+    {{ range $mod, $cfg := $config.modules }}
+        {{ if eq (index $cfg "integration") $args.type }}
+            {{ if or (index $cfg "local") (not hugo.IsServer) }}
+                {{ with index $cfg "url" }}
+                    {{ partial "templates/script.html" (dict "link" . "category" (index $cfg "category") "state" (index $cfg "state")) }}
+                {{ end }}
+            {{ end }}
+        {{ end }}
+    {{ end }}
+
+    <!-- Bundle the critical and core scripts by category -->
+    {{ if ne $args.type "optional" }}
+        {{ range $cat, $val := $categories }}
+            {{ if or (gt ($val | len) 0) (eq $args.type "critical") }}
+                {{ $match := "" }}
+                {{ if eq $args.type "critical" }}
+                    {{ $match = index $patterns $cat }}
+                {{ else if eq $cat "other" }}
+                    {{ $match = index $patterns $args.type }}
+                {{ end }}
+
+                {{ partial "partials/bundle-script.html" (dict 
+                    "page" $args.page
+                    "match" $match
+                    "destination" (printf "js/%s.bundle.js" $args.type)
+                    "cat" $cat
+                    "modules" $val
+                    "localize" $localize
+                    "skipTemplate" $skipTemplate
+                    "absoluteURL" $absoluteURL
+                    "state" (cond (eq $args.type "critical") "immediate" "async")
+                )}} 
+            {{ end }}
+        {{ end }}
+    {{ else }}
+        <!-- Bundle the optional scripts by module name and category -->
+        {{ range $cat, $val := $categories }}
+            {{ range $val }}
+                {{ $modconfig := index $config.modules . }}
+                {{ partial "partials/bundle-script.html" (dict 
+                    "page" $args.page
+                    "destination" (printf "js/%s.js" .)
+                    "cat" $cat
+                    "modules" (slice .)
+                    "localize" $modconfig.localize
+                    "skipTemplate" $modconfig.disabletemplate
+                    "absoluteURL" $absoluteURL
+                    "state" $modconfig.state
+                )}} 
+            {{ end }}
+        {{ end }}
+    {{ end }}
+{{ end }}

layouts/partials/footer/social.html

@@ -20,7 +20,7 @@
                 </div>
                 <div class="col col-6 text-sm-start">
                     {{ range .Site.Menus.social -}}
-                        <a href="{{ .URL }}" {{ if $tab }} target="_blank" rel="noopener noreferrer"{{ end }} aria-label="{{ .Name | safeHTML }}" class="text-decoration-none link-secondary d-inline p-2">
+                        <a href="{{ .URL }}" {{ if $tab }} target="_blank" rel="noopener noreferrer nofollow"{{ end }} aria-label="{{ .Name | safeHTML }}" class="text-decoration-none link-secondary d-inline p-2">
                             {{ if hasPrefix .Pre "<i" }}
                                 {{ .Pre | safeHTML }}
                             {{ else }}

layouts/partials/head/seo.html

@@ -1,13 +1,17 @@
 <!-- TODO: replace scratch with dict -->
 
 <!-- Adapted from doks -->
+{{ with .Params.meta.title }}
+    {{ $.Scratch.Set "title" . -}}
+{{ else }}
     {{ with .Title -}}
         {{ $.Scratch.Set "title" . -}}
     {{ else -}}
         {{ $.Scratch.Set "title" .Site.Title -}}
     {{ end -}}
+{{ end }}
 
-{{ $description := or (partial "utilities/GetDescription.html" (dict "page" .)) .Site.Params.main.description }}
+{{ $description := or (partial "utilities/GetDescription.html" (dict "page" . "meta" true)) .Site.Params.main.description }}
 {{ if gt (strings.RuneCount $description) 150 }}
     {{ $description = print (substr $description 0 150) "..." }}
 {{ end }}
@@ -42,7 +46,7 @@
 {{ if eq .Kind "404" -}}
     <meta name="robots" content="noindex, follow">
 {{ else }}
-  {{ with .Params.robots -}}
+  {{ with or .Params.robots .Params.meta.robots -}}
     <meta name="robots" content="{{ . }}">
   {{ else -}}
     <meta name="robots" content="index, follow">

layouts/partials/head/stylesheet.html

@@ -21,9 +21,9 @@
 
 {{ if $core }}
     {{- if reflect.IsSlice $config.excludeSCSS -}}
-        {{- $modules = complement $config.excludeSCSS (or $config.core slice) -}}
+        {{- $modules = complement $config.excludeSCSS (append $config.core $config.critical) -}}
     {{ else }}
-        {{- $modules = $config.core -}}
+        {{- $modules = append $config.core $config.critical -}}
     {{ end }}
 {{- end -}}
 
@@ -63,7 +63,7 @@
 -}}
 
 {{- $options := (dict "transpiler" $transpiler "targetPath" $target "enableSourceMap" (not hugo.IsProduction) "vars" $vars) -}}
-{{- $bundle := partial "utilities/bundle" (dict "match" $source "filename" (printf "scss/bundle-%d.scss" now.UnixNano) "modules" $modules "basepath" "scss" "debugging" site.Params.debugging.showSCSS) -}}
+{{- $bundle := partial "utilities/bundle.html" (dict "match" $source "filename" (printf "scss/bundle-%d.scss" now.UnixNano) "modules" $modules "basepath" "scss" "debugging" site.Params.debugging.showSCSS) -}}
 
 {{- if gt ($bundle.Content | len) 0 }}
     {{- $css := $bundle | resources.ExecuteAsTemplate $target . | toCSS $options -}}

layouts/partials/templates/script.html

@@ -0,0 +1,26 @@
+<!-- 
+    Copyright © 2024 The Hinode Team / Mark Dumay. All rights reserved.
+    Use of this source code is governed by The MIT License (MIT) that can be found in the LICENSE file.
+    Visit gethinode.com/license for more details.
+-->
+
+<!-- Initialize arguments -->
+{{ $args := partial "utilities/InitArgs.html" (dict "structure" "script" "args" .) }}
+{{ if $args.err }}
+    {{ partial "utilities/LogErr.html" (dict 
+        "partial" "templates/script.html" 
+        "msg" "Invalid arguments"
+        "details" $args.errmsg
+        "file" page.File
+    )}}
+{{ end }}
+
+<!-- Initialize local arguments -->
+{{ $category := cond (ne $args.category "other") $args.category "" }}
+
+<!-- Main code -->
+<script src="{{ $args.link }}"
+    {{- with $category }} data-category="{{ . }}"{{ end -}}
+    {{- with $args.integrity }}integrity="{{ . }}" crossorigin="anonymous"{{ end }}
+    {{- with $args.state }} {{ . | safeHTMLAttr }}{{ end -}}>
+</script>

layouts/partials/utilities/AddModule.html

@@ -1,7 +1,7 @@
 {{ with .module }}
 	{{- $dependencies := page.Scratch.Get "dependencies" -}}
 	{{- if reflect.IsSlice $dependencies -}}
-		{{- $dependencies = complement $dependencies . -}}
+		{{- $dependencies = complement $dependencies (slice .) -}}
 	{{ else }}
 		{{- $dependencies = slice . -}}
 	{{ end }}

layouts/partials/utilities/InitModules.html

@@ -1,28 +1,18 @@
-{{ $page := .page }}
-
+{{ $critical := slice }}
 {{ $core := slice }}
 {{ $optional := slice }}
 {{ $excludeSCSS := slice }}
 {{ $disableTemplate := slice }}
 {{ $localize := slice }}
+{{ $category := dict }}
 {{ $modules := dict }}
 
-{{ range $key, $mod := $page.Site.Params.modules }}
-    {{ if eq $key "core" }}
-        {{ warnf "DEPRECATED: module parameter `core` has been deprecated in release v0.24.0" }}
-        {{ $core = $core | append $mod }}
-    {{ else if eq $key "optional" }}
-        {{ warnf "DEPRECATED: module parameter `optional` has been deprecated in release v0.24.0" }}
-        {{ $optional = $optional | append $mod }}
-    {{ else if eq $key "excludescss" }}
-        {{ warnf "DEPRECATED: module parameter `excludeSCSS` has been deprecated in release v0.24.0" }}
-        {{ $excludeSCSS = $excludeSCSS | append $mod }}
-    {{ else if eq $key "disabletemplate" }}
-        {{ warnf "DEPRECATED: module parameter `disableTemplate` has been deprecated in release v0.24.0" }}
-        {{ $disableTemplate = $disableTemplate | append $mod }}
-    {{ else if reflect.IsMap $mod }}
+{{ range $key, $mod := .Site.Params.modules }}
+    {{ if reflect.IsMap $mod }}
         {{ $integration := index $mod "integration" }}
-        {{ if eq $integration "core" }}
+        {{ if eq $integration "critical" }}
+            {{ $critical = $critical | append $key }}
+        {{ else if eq $integration "core" }}
             {{ $core = $core | append $key }}
         {{ else if eq $integration "optional" }}
             {{ $optional = $optional | append $key }}
@@ -42,6 +32,12 @@
             {{ $localize = $localize | append $key }}
         {{ end }}
 
+        {{ $categoryKey := "other" }}
+        {{ with (index $mod "category") }}{{ $categoryKey = . }}{{ end }}
+        {{ $cat := index $category $categoryKey | default slice }}
+        {{ $cat = $cat | append $key}}
+        {{ $category = merge $category (dict $categoryKey $cat) }}
+
         {{ $modules = merge $modules (dict $key $mod) }}
     {{ else }}
         {{ warnf "Unsupported module parameter: %s" $key }}
@@ -50,14 +46,16 @@
 
 {{ $modules := dict 
     "modules" $modules
+    "critical" $critical
     "core" $core
     "optional" $optional
     "excludeSCSS" $excludeSCSS
     "disableTemplate" $disableTemplate
     "localize" $localize
+    "categories" $category
 }}
 
-{{- if and $page.IsPage (not (in $core "bootstrap")) -}}
+{{- if and .IsPage (not (in $core "bootstrap")) -}}
     {{- errorf "Bootstrap is a required module, please add it to 'modules.core' in your site parameters" -}}
 {{- end -}}
 

layouts/shortcodes/file.html

@@ -39,6 +39,11 @@
 {{ if isset .Params "full" }}{{ $full = partial "utilities/CastBool.html" (.Get "full") }}{{ end -}}
 {{- $class := .Get "class" | default "" -}}
 
+{{ if not (fileExists $file) }}
+    {{ warnf "Cannot find file: '%q'. See %s" $file $.Position }}
+    {{ $error = true }}
+{{ end }}
+
 <!-- Main code -->
 {{- if not $error -}}
     {{- /* Force-check if the file exists */ -}}

layouts/shortcodes/link.html

@@ -81,7 +81,9 @@
     {{ $ref := partial "utilities/GetPage.html" (dict "url" $url "page" .Page) }}
     {{- if not $ref -}}
         {{ $pageContext := "" }}
-        {{ with .Page.File }}{{ $pageContext = path.Join "/content" .Dir }}{{ end }}
+        {{ with .Page.File }}
+            {{ $pageContext = path.Dir (strings.TrimPrefix hugo.WorkingDir .Filename) }}
+        {{ end }}
         {{ $isPageRes := fileExists (path.Join $pageContext $url) }}
         {{ $isStatic := fileExists (path.Join "/static" $url) }}
         {{ if and (not $isPageRes) (not $isStatic) }}

netlify.toml

@@ -1,88 +1,81 @@
-# toml-docs-start netlify
+# Auto-generated file - do not modify
 [build]
-    publish = "exampleSite/public"
-    command = "npm run build:example"
+  command = 'npm run build:example'
+  publish = 'exampleSite/public'
 
   [build.environment]
-    DART_SASS_VERSION = "1.77.5"
-    HUGO_VERSION = "0.131.0"
-    HUGO_ENV = "production"
-    HUGO_ENABLEGITINFO = "true"
-    NODE_VERSION = "20.16.0"
-    NPM_VERSION = "10.8.1"
-# toml-docs-end netlify
+    DART_SASS_VERSION = '1.78.0'
+    HUGO_ENABLEGITINFO = 'true'
+    HUGO_ENV = 'production'
+    HUGO_VERSION = '0.134.1'
+    NODE_VERSION = '20.17.0'
+    NPM_VERSION = '10.8.2'
 
-[[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'; \
-            child-src 'self' app.netlify.com; \
-            script-src 'self' \
-                https://*.netlify.app app.netlify.com netlify-cdp-loader.netlify.app \
-                https://*.google-analytics.com https://*.googletagmanager.com; \
-            style-src 'self' \
-                https://*.netlify.app https://fonts.googleapis.com https://www.youtube.com; \
-            object-src 'none'; \
-            base-uri 'self'; \
-            connect-src 'self'
-                https://*.google-analytics.com https://*.analytics.google.com https://*.googletagmanager.com; \
-            font-src 'self' https://*.netlify.app https://fonts.gstatic.com; \
-            frame-src 'self' https://player.cloudinary.com https://player.vimeo.com https://www.youtube-nocookie.com https://www.youtube.com \
-                app.netlify.com; \
-            img-src 'self' data: https://*.imgix.net https://*.imagekit.io https://*.cloudinary.com https://*.netlify.app https://i.vimeocdn.com https://i.ytimg.com https://*.google-analytics.com https://*.googletagmanager.com https://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=(), \
-            payment=() \
-            """
-        cache-control = """\
-            max-age=0, \
-            no-cache, \
-            no-store, \
-            must-revalidate \
-            """
-        Access-Control-Allow-Origin = "*"
+[context]
+  [context.branch-deploy]
+    command = 'npm run build:example -- -b $DEPLOY_PRIME_URL'
 
   [context.deploy-preview]
-    command = "npm run build:example -- -b $DEPLOY_PRIME_URL"
-
-[context.branch-deploy]
-    command = "npm run build:example -- -b $DEPLOY_PRIME_URL"
+    command = 'npm run build:example -- -b $DEPLOY_PRIME_URL'
 
 [dev]
-    framework = "#custom"
-    command = "npm run start:example"
-    targetPort = 1313
-    port = 8888
-    publish = "public"
   autoLaunch = false
-
-# toml-docs-start plugins
-[[plugins]]
-    package = "@gethinode/netlify-plugin-dartsass"
+  command = 'npm run start:example'
+  framework = '#custom'
+  port = 8888
+  publish = 'public'
+  targetPort = 1313
 
 [[plugins]]
-    package = "netlify-plugin-hugo-cache-resources"
-	[plugins.inputs]
-	# Redirected in exampleSite/config/_default/hugo.toml
-	# srcdir = ""
+  package = '@gethinode/netlify-plugin-dartsass'
+
+[[plugins]]
+  package = 'netlify-plugin-hugo-cache-resources'
+
+[[headers]]
+  for = '/**'
+
+  [headers.values]
+    Access-Control-Allow-Origin = '*'
+    Content-Security-Policy = """
+        base-uri 'self'; \
+        connect-src 'self' *.cookieyes.com cdn-cookieyes.com *.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' cdn-cookieyes.com *.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'; \
+        object-src 'none'; \
+        script-src 'self' cdn-cookieyes.com *.google-analytics.com *.googletagmanager.com; \
+        style-src 'self' 'unsafe-inline' www.youtube.com; \
+        """
+    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 '
+
+[[redirects]]
+  from = '/fr/*'
+  status = 404
+  to = '/fr/404.html'
+
+[[redirects]]
+  from = '/nl/*'
+  status = 404
+  to = '/nl/404.html'
+
+[[redirects]]
+  from = '/en/*'
+  status = 404
+  to = '/en/404.html'
+
+[[redirects]]
+  from = '/*'
+  status = 404
+  to = '/en/404.html'
 
-# [[plugins]]
-    # package = "@netlify/plugin-lighthouse"
-    # [plugins.inputs]
-    # output_path = "reports/lighthouse.html"
-# toml-docs-end plugins

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.27.0-alpha4",
+  "version": "0.27.2",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",
@@ -28,6 +28,8 @@
     "build:example": "npm run -s prebuild && hugo --gc --minify -s exampleSite",
     "build:example:ci": "npm run -s prebuild && hugo --gc --minify -s exampleSite -e ci",
     "build:debug": "hugo -e debug --debug",
+    "build:headers": "hugo --renderSegments headers -d prebuild && cpy prebuild/server.toml config/_default/ --flat",
+    "build:example:headers": "hugo -s exampleSite --renderSegments headers -d prebuild && cpy exampleSite/prebuild/netlify.toml ./ --flat && cpy exampleSite/prebuild/server.toml exampleSite/config/_default/ --flat",
     "build:preview": "npm run build -D -F",
     "clean:public": "rimraf public exampleSite/public",
     "clean:install": "rimraf package-lock.json node_modules",
@@ -36,7 +38,7 @@
     "lint:styles": "stylelint \"assets/scss/**/*.{css,sass,scss,sss,less}\" --allow-empty-input",
     "lint:markdown": "markdownlint-cli2 \"*.md\" \"content/**/*.md\" \"exampleSite/**/*.md\"",
     "mod:clean": "hugo mod clean",
-    "mod:update": "rimraf _vendor && hugo mod get && npm run -s mod:vendor && npm run -s mod:tidy",
+    "mod:update": "rimraf _vendor && hugo mod get -u ./... && npm run -s mod:vendor && npm run -s mod:tidy",
     "mod:tidy": "hugo mod tidy && hugo mod tidy -s exampleSite",
     "mod:vendor": "rimraf _vendor && hugo mod vendor",
     "test": "npm run -s lint",
@@ -71,21 +73,22 @@
     "autoprefixer": "^10.4.20",
     "cssnano": "^7.0.6",
     "cssnano-preset-advanced": "^7.0.6",
-    "hugo-bin": "0.131.1",
+    "hugo-bin": "0.133.3",
     "purgecss-whitelister": "^2.4.0"
   },
   "devDependencies": {
     "@gethinode/netlify-plugin-dartsass": "^0.3.0",
-    "eslint": "^9.9.1",
+    "cpy-cli": "^5.0.0",
+    "eslint": "^9.13.0",
     "markdownlint-cli2": "^0.14.0",
-    "neostandard": "^0.11.4",
+    "neostandard": "^0.11.7",
     "netlify-plugin-hugo-cache-resources": "^0.2.1",
     "npm-run-all": "^4.1.5",
     "postcss-cli": "^11.0.0",
     "replace-in-files-cli": "^3.0.0",
     "rimraf": "^6.0.1",
     "shx": "^0.3.4",
-    "stylelint": "^16.9.0",
+    "stylelint": "^16.10.0",
     "stylelint-config-standard-scss": "^13.1.0"
   },
   "optionalDependencies": {