Merge pull request #235 from gethinode/develop

Fixes
Merge branch 'main' into develop
2025-10-07 10:04:22 +00:00 · 2023-04-27 12:58:45 +02:00 · 2023-04-27 12:36:22 +02:00 · 2023-04-27 12:35:51 +02:00 · 2023-04-27 12:34:56 +02:00 · 2023-04-27 11:44:45 +02:00
6 changed files with 15 additions and 10 deletions
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -10,7 +10,7 @@

    <body>
        {{- if site.Params.main.enableDarkMode -}}
-            {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "page" .) -}}
+            {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "header" true "page" .) -}}
        {{- end -}}
        <div class="d-flex flex-column min-vh-100{{ if and .IsHome .Site.Params.home.style }} {{ .Site.Params.home.style }}{{ end }}">
            <div class="{{ if .Site.Params.navigation.fixed }}mb-4{{ end }}">
@@ -57,6 +57,6 @@
            {{- partial "footer/footer.html" . -}}
        {{ end -}}

-        {{- partialCached "footer/scripts.html" (dict "page" .) }}
+        {{- partialCached "footer/scripts.html" (dict "header" false "page" .) }}
    </body>
 </html>
--- a/layouts/partials/footer/scripts.html
+++ b/layouts/partials/footer/scripts.html
@@ -1,6 +1,7 @@
 {{ $filename := .filename | default "js/main.bundle.js" -}}
 {{ $match := .match | default "{js/*.js,js/vendor/**.js}" }}
 {{ $page := .page }}
+{{ $header := .header }}

 {{ $files := slice -}}
 {{ range $index, $file := resources.Match $match -}}
@@ -11,7 +12,7 @@
    {{ $bundle := $files | resources.Concat $filename -}}
    {{ $js := $bundle | resources.ExecuteAsTemplate $filename $page -}}

-    {{- if (not site.IsServer) -}}
+    {{- if and (not site.IsServer) $header -}}
        {{- $pc := site.Config.Privacy.GoogleAnalytics -}}
        {{- if and (not $pc.Disable) (hasPrefix site.GoogleAnalytics "G-") }}
            <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.GoogleAnalytics }}"></script>
--- a/layouts/partials/head/twitter_cards.html
+++ b/layouts/partials/head/twitter_cards.html
@@ -1,7 +1,7 @@
 <!-- Copied from doks -->
 <meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="{{ .Site.Params.twitterSite }}">
-<meta name="twitter:creator" content="{{ .Site.Params.twitterCreator }}">
+{{ with .Site.Params.twitterSite }}<meta name="twitter:site" content="{{ . }}">{{ end }}
+{{ with .Site.Params.twitterCreator }}<meta name="twitter:creator" content="{{ . }}">{{ end }}
 <meta name="twitter:title" content="{{ $.Scratch.Get "title" }}">
 <meta name="twitter:description" content="{{ $.Scratch.Get "description" }}">
 <meta name="twitter:image" content="{{ $.Scratch.Get "thumbnail" }}">
--- a/netlify.toml
+++ b/netlify.toml
@@ -24,15 +24,19 @@
        X-XSS-Protection = "1; mode=block"
        Content-Security-Policy = """\
            default-src 'self'; \
+            child-src 'self' app.netlify.com; \
            script-src 'self' \
+                app.netlify.com netlify-cdp-loader.netlify.app \
                https://utteranc.es/client.js https://*.google-analytics.com https://*.googletagmanager.com; \
-            style-src 'self' https://utteranc.es https://fonts.googleapis.com https://www.youtube.com; \
+            style-src 'self' \
+                netlify.app https://utteranc.es 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://fonts.gstatic.com; \
-            frame-src 'self' https://utteranc.es https://www.youtube-nocookie.com https://www.youtube.com; \
+            frame-src 'self' https://utteranc.es https://www.youtube-nocookie.com https://www.youtube.com \
+                app.netlify.com; \
            img-src 'self' https://i.vimeocdn.com https://i.ytimg.com https://*.google-analytics.com https://*.googletagmanager.com; \
            manifest-src 'self'; \
            media-src 'self' \
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.12.4",
+  "version": "0.12.5",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.12.4",
+      "version": "0.12.5",
      "license": "MIT",
      "devDependencies": {
        "@fortawesome/fontawesome-free": "^6.4.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.12.4",
+  "version": "0.12.5",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
Author	SHA1	Message	Date
Mark Dumay	e53a333ebf	Merge pull request #235 from gethinode/develop Fixes	2023-04-27 12:58:45 +02:00
Mark Dumay	5ed8c28bee	Merge branch 'main' into develop	2023-04-27 12:36:22 +02:00
mark	fa47b7d93e	Bump release	2023-04-27 12:35:51 +02:00
mark	f1693c8cf0	Refine Netlify CSP headers	2023-04-27 12:34:56 +02:00
mark	740fd91038	Remove empty parameters	2023-04-27 11:44:45 +02:00
mark	9a0dba5ee4	Fix loading tag manager script twice	2023-04-27 11:44:25 +02:00