Merge pull request #893 from gethinode/develop

Bump package release
Merge branch 'main' into develop
2025-10-08 10:34:26 +00:00 · 2024-04-25 11:15:01 +02:00 · 2024-04-25 11:09:42 +02:00 · 2024-04-25 11:07:07 +02:00 · 2024-04-25 11:06:21 +02:00 · 2024-04-25 09:00:07 +00:00
6 changed files with 54 additions and 93 deletions
--- a/.github/workflows/lint-build.yml
+++ b/.github/workflows/lint-build.yml
@@ -41,7 +41,7 @@ jobs:

    strategy:
      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-12, windows-latest, ubuntu-latest]
        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
        node-version: [18.x, 20.x]

@@ -89,6 +89,9 @@ jobs:
        restore-keys: |
          ${{ runner.os }}-${{ env.CACHE_KEY }}

+    - name: Display environment
+      run: npm run env
+
    - name: Build main site
      run: npm run build:cache

--- a/assets/js/analytics.js
+++ b/assets/js/analytics.js
@@ -1,69 +1,21 @@
 // Adapted from https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates/google_analytics.html

-{{- define "__ga_js_set_doNotTrack" -}}{{/* This is also used in the async version. */}}
-    {{- $pc := .Site.Config.Privacy.GoogleAnalytics -}}
-    {{- if not $pc.RespectDoNotTrack -}}
+{{ 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;
-    {{- else -}}
-        var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);
-        var doNotTrack = (dnt == "1" || dnt == "yes");
-    {{- end -}}
-{{- end -}}
-
-{{- $pc := .Site.Config.Privacy.GoogleAnalytics -}}
-{{- if (and (not hugo.IsServer) (not $pc.Disable)) -}}
-    {{ with .Site.Config.Services.GoogleAnalytics.ID -}}
-        {{ if hasPrefix . "G-"}}
-            {{ template "__ga_js_set_doNotTrack" $ }}
-
-            if (!doNotTrack) {
-                window.dataLayer = window.dataLayer || [];
-
-                function gtag() {
-                    dataLayer.push(arguments);
-                }
-                
-                gtag('js', new Date());
-                gtag('config', '{{ . }}', { 'anonymize_ip': {{- $pc.AnonymizeIP -}} });
-            }
-
-        {{ else if hasPrefix . "UA-" }}
-            {{ template "__ga_js_set_doNotTrack" $ }}
-
-            if (!doNotTrack) {
-                (function(i, s, o, g, r, a, m) {
-                    i['GoogleAnalyticsObject'] = r;
-                    i[r] = i[r] || function() {
-                        (i[r].q = i[r].q || []).push(arguments)
-                    }, i[r].l = 1 * new Date();
-                    a = s.createElement(o),
-                        m = s.getElementsByTagName(o)[0];
-                    a.async = 1;
-                    a.src = g;
-                    m.parentNode.insertBefore(a, m)
-                })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-                
-                {{- if $pc.UseSessionStorage }}
-                    if (window.sessionStorage) {
-                        var GA_SESSION_STORAGE_KEY = 'ga:clientId';
-                        ga('create', '{{ . }}', {
-                            'storage': 'none',
-                            'clientId': sessionStorage.getItem(GA_SESSION_STORAGE_KEY)
-                        });
-                    
-                        ga(function(tracker) {
-                            sessionStorage.setItem(GA_SESSION_STORAGE_KEY, tracker.get('clientId'));
-                        });
-                    }
-                {{ else }}
-                    ga('create', '{{ . }}', 'auto');
-                {{ end -}}
-                {{ if $pc.AnonymizeIP }}
-                    ga('set', 'anonymizeIp', true);
-                {{ end }}
-                
-                ga('send', 'pageview');
-            }
-        {{- end }}
-    {{ end -}}
-{{- end }}
+        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 }}
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/airbnb/lottie-web v5.12.2+incompatible // indirect
 	github.com/gethinode/mod-bootstrap v1.2.5 // indirect
-	github.com/gethinode/mod-flexsearch v1.10.0 // indirect
+	github.com/gethinode/mod-flexsearch v1.11.1 // indirect
 	github.com/gethinode/mod-fontawesome v1.8.1 // indirect
 	github.com/gethinode/mod-katex v1.0.7 // indirect
 	github.com/gethinode/mod-leaflet v1.0.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -52,6 +52,12 @@ github.com/gethinode/mod-flexsearch v1.9.0 h1:AE+w7QeZTxh36JNTG+CASDLxaqlCZKn+EU
 github.com/gethinode/mod-flexsearch v1.9.0/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
 github.com/gethinode/mod-flexsearch v1.10.0 h1:ymlHu5G2635D/h2axG4jgpGS+Vvtzxg07SZX8pJOJSo=
 github.com/gethinode/mod-flexsearch v1.10.0/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
+github.com/gethinode/mod-flexsearch v1.10.1 h1:aZ4WjUxfiCV1eiGjIUdP+lRTlOI/flPc6ABUQ99C+Es=
+github.com/gethinode/mod-flexsearch v1.10.1/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
+github.com/gethinode/mod-flexsearch v1.11.0 h1:CQArPhjQRtIZqAK4ysOiBzAB1hi//L4RTelH+ScjbXU=
+github.com/gethinode/mod-flexsearch v1.11.0/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
+github.com/gethinode/mod-flexsearch v1.11.1 h1:TtaE6Dv0lH4x73SHDaZpQJLjk52lRu/VoLf6+CXFOLs=
+github.com/gethinode/mod-flexsearch v1.11.1/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
 github.com/gethinode/mod-fontawesome v1.0.2 h1:ZSK6D20/w4y5GnfYfTBB58uHD0ChIfkpKfRGwioS9rg=
 github.com/gethinode/mod-fontawesome v1.0.2/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.1.0 h1:rsDzUI+3ZlS/do2ff3ne8/z3KwHeysmuA+WsXlumXXk=
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.23.7",
+  "version": "0.23.8",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.23.7",
+      "version": "0.23.8",
      "license": "MIT",
      "devDependencies": {
        "@fullhuman/postcss-purgecss": "^6.0.0",
@@ -20,7 +20,7 @@
        "eslint-plugin-import": "^2.29.1",
        "eslint-plugin-n": "^16.6.2",
        "eslint-plugin-promise": "^6.1.1",
-        "hugo-bin": "^0.121.1",
+        "hugo-bin": "0.122.3",
        "markdownlint-cli2": "^0.13.0",
        "netlify-plugin-hugo-cache-resources": "^0.2.1",
        "npm-run-all": "^4.1.5",
@@ -29,7 +29,7 @@
        "replace-in-files-cli": "^2.2.0",
        "rimraf": "^5.0.5",
        "shx": "^0.3.4",
-        "stylelint": "^16.3.1",
+        "stylelint": "^16.4.0",
        "stylelint-config-standard-scss": "^13.1.0"
      },
      "optionalDependencies": {
@@ -291,9 +291,9 @@
      }
    },
    "node_modules/@csstools/selector-specificity": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.2.tgz",
-      "integrity": "sha512-RpHaZ1h9LE7aALeQXmXrJkRG84ZxIsctEN2biEUmFyKpzFM3zZ35eUMcIzZFsw/2olQE6v69+esEqU2f1MKycg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.3.tgz",
+      "integrity": "sha512-KEPNw4+WW5AVEIyzC80rTbWEUatTW2lXpN8+8ILC8PiPeWPjwUzrPZDIOZ2wwqDmeqOYTdSGyL3+vE5GC3FB3Q==",
      "dev": true,
      "funding": [
        {
@@ -2065,9 +2065,9 @@
      }
    },
    "node_modules/css-functions-list": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz",
-      "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz",
+      "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==",
      "dev": true,
      "engines": {
        "node": ">=12 || >=16"
@@ -4386,9 +4386,9 @@
      "dev": true
    },
    "node_modules/hugo-bin": {
-      "version": "0.121.1",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.121.1.tgz",
-      "integrity": "sha512-q+6vnm1lYT9T8oCY32RtZGTmfNvl5oXbJjh1gpBDigdE9/4sdQesRP/JgYtiXag3dkUvpkXxRZmfgZA1adGC3g==",
+      "version": "0.122.3",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.122.3.tgz",
+      "integrity": "sha512-t3is8dMTLhAQFwdZxCgMydF2Fd7+6SUPCGoIzsZnQ1ZqdGGSQUA1spga9MIwwMVbTjfG0wZ6efYLxyqqjPviDA==",
      "dev": true,
      "funding": [
        {
@@ -8879,20 +8879,20 @@
      }
    },
    "node_modules/stylelint": {
-      "version": "16.3.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.3.1.tgz",
-      "integrity": "sha512-/JOwQnBvxEKOT2RtNgGpBVXnCSMBgKOL2k7w0K52htwCyJls4+cHvc4YZgXlVoAZS9QJd2DgYAiRnja96pTgxw==",
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.4.0.tgz",
+      "integrity": "sha512-uSx7VMuXwLuYcNSIg+0/fFNv0WinsfLAqsVVy7h7p80clKOHiGE8pfY6UjqwylTHiJrRIahTl6a8FPxGezhWoA==",
      "dev": true,
      "dependencies": {
        "@csstools/css-parser-algorithms": "^2.6.1",
        "@csstools/css-tokenizer": "^2.2.4",
        "@csstools/media-query-list-parser": "^2.1.9",
-        "@csstools/selector-specificity": "^3.0.2",
+        "@csstools/selector-specificity": "^3.0.3",
        "@dual-bundle/import-meta-resolve": "^4.0.0",
        "balanced-match": "^2.0.0",
        "colord": "^2.9.3",
        "cosmiconfig": "^9.0.0",
-        "css-functions-list": "^3.2.1",
+        "css-functions-list": "^3.2.2",
        "css-tree": "^2.3.1",
        "debug": "^4.3.4",
        "fast-glob": "^3.3.2",
@@ -8921,7 +8921,7 @@
        "strip-ansi": "^7.1.0",
        "supports-hyperlinks": "^3.0.0",
        "svg-tags": "^1.0.0",
-        "table": "^6.8.1",
+        "table": "^6.8.2",
        "write-file-atomic": "^5.0.1"
      },
      "bin": {
@@ -9276,9 +9276,9 @@
      }
    },
    "node_modules/table": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
-      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
+      "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
      "dev": true,
      "dependencies": {
        "ajv": "^8.0.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.23.7",
+  "version": "0.23.8",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
@@ -78,7 +78,7 @@
    "eslint-plugin-import": "^2.29.1",
    "eslint-plugin-n": "^16.6.2",
    "eslint-plugin-promise": "^6.1.1",
-    "hugo-bin": "^0.121.1",
+    "hugo-bin": "0.122.3",
    "markdownlint-cli2": "^0.13.0",
    "netlify-plugin-hugo-cache-resources": "^0.2.1",
    "npm-run-all": "^4.1.5",
@@ -87,7 +87,7 @@
    "replace-in-files-cli": "^2.2.0",
    "rimraf": "^5.0.5",
    "shx": "^0.3.4",
-    "stylelint": "^16.3.1",
+    "stylelint": "^16.4.0",
    "stylelint-config-standard-scss": "^13.1.0"
  },
  "optionalDependencies": {
Author	SHA1	Message	Date
Mark Dumay	9f03167c1e	Merge pull request #893 from gethinode/develop Bump package release	2024-04-25 11:15:01 +02:00
Mark Dumay	b7add5ed8d	Merge branch 'main' into develop	2024-04-25 11:09:42 +02:00
Mark Dumay	d78df1cd0a	Bump package release	2024-04-25 11:07:07 +02:00
Mark Dumay	b231f486b0	Merge pull request #892 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-04-25 11:06:21 +02:00
markdumay	0601a8583f	fix: update Hugo module dependencies	2024-04-25 09:00:07 +00:00
Mark Dumay	d9190b121f	Merge pull request #888 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-04-25 10:59:19 +02:00
Mark Dumay	d568cdadf1	Merge branch 'main' into hugo-mod-dependencies	2024-04-25 10:47:40 +02:00
Mark Dumay	c17d98e073	Merge pull request #889 from gethinode/develop Fix runner image to macOS 12	2024-04-25 10:47:23 +02:00
Mark Dumay	7d3a878c56	Update hugo bin	2024-04-25 10:30:02 +02:00
Mark Dumay	f7d5605d2d	Fix runner image to macOS 12	2024-04-25 10:23:52 +02:00
Mark Dumay	306a94261b	Revert back to hugo v0.125.2	2024-04-25 10:06:55 +02:00
Mark Dumay	484dc39338	Display env	2024-04-25 10:03:13 +02:00
Mark Dumay	dca9b3a1da	Revert back to hugo v0.125.2	2024-04-25 09:49:45 +02:00
Mark Dumay	f11f9f0d71	Temp disable nodejs v18 test	2024-04-25 07:48:36 +02:00
markdumay	e10d41cb76	fix: update Hugo module dependencies	2024-04-25 05:29:12 +00:00
Mark Dumay	b929b8e12a	Merge pull request #883 from gethinode/dependabot/npm_and_yarn/hugo-bin-0.122.3 Bump hugo-bin from 0.121.1 to 0.122.3	2024-04-24 17:07:10 +02:00
Mark Dumay	f4d8ab82f1	Merge branch 'main' into dependabot/npm_and_yarn/hugo-bin-0.122.3	2024-04-24 16:50:20 +02:00
Mark Dumay	7aa17ef998	Merge pull request #887 from gethinode/develop Fix Google Analytics config	2024-04-24 16:38:46 +02:00
Mark Dumay	aa2da9a398	Fix Google Analytics config fixes #882	2024-04-24 16:32:32 +02:00
Mark Dumay	d920da77f2	Merge pull request #885 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-04-24 16:10:31 +02:00
markdumay	5920c352bd	fix: update Hugo module dependencies	2024-04-24 03:17:55 +00:00
dependabot[bot]	934ea784cc	Bump hugo-bin from 0.121.1 to 0.122.3 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.121.1 to 0.122.3. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.121.1...v0.122.3) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-04-23 14:09:25 +00:00
github-actions[bot]	2577c24b08	Merge pull request #884 from gethinode/dependabot/npm_and_yarn/stylelint-16.4.0 Bump stylelint from 16.3.1 to 16.4.0	2024-04-23 14:08:42 +00:00
dependabot[bot]	da74fc8a93	Bump stylelint from 16.3.1 to 16.4.0 Bumps [stylelint](https://github.com/stylelint/stylelint) from 16.3.1 to 16.4.0. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.3.1...16.4.0) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-04-23 14:03:27 +00:00