Merge pull request #983 from gethinode/develop

Fix external links in navbar
Merge branch 'main' into develop
2025-10-07 01:54:23 +00:00 · 2024-06-04 09:12:15 +02:00 · 2024-06-04 09:06:15 +02:00 · 2024-06-04 09:05:47 +02:00 · 2024-06-04 09:05:11 +02:00 · 2024-06-04 06:19:46 +02:00
6 changed files with 19 additions and 13 deletions
--- a/data/structures/image.yml
+++ b/data/structures/image.yml
@@ -137,4 +137,4 @@ arguments:
    comment:
      Flag to indicate if the image should render a plain image instead of an
      image set. When set, no transformations are applied to the image.
-    release: v0.24.0-beta5
+    release: v0.24.0
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/gethinode/mod-katex v1.1.0 // indirect
 	github.com/gethinode/mod-leaflet v1.1.0 // indirect
 	github.com/gethinode/mod-lottie v1.5.3 // indirect
-	github.com/gethinode/mod-utils/v2 v2.3.6 // indirect
+	github.com/gethinode/mod-utils/v2 v2.3.7 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -218,6 +218,8 @@ github.com/gethinode/mod-utils/v2 v2.3.5 h1:r8V330xQkHTjzAFNCde1Kpz6fgidzmMRW82e
 github.com/gethinode/mod-utils/v2 v2.3.5/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
 github.com/gethinode/mod-utils/v2 v2.3.6 h1:Ta+WKc83sK9ZROKmUwS4pA32Qm0bQqoMmWHEOzDvZ5Y=
 github.com/gethinode/mod-utils/v2 v2.3.6/go.mod h1:GTYeknoLujNjfDxI+V9Dcug26CYJSTJ0B/U2dagw9oY=
+github.com/gethinode/mod-utils/v2 v2.3.7 h1:FFsUPO7NBp9Bhjovf0Ki5hnDGfeMKV/3RNz1Qpv7+oQ=
+github.com/gethinode/mod-utils/v2 v2.3.7/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=
--- a/layouts/partials/assets/navbar-item.html
+++ b/layouts/partials/assets/navbar-item.html
@@ -19,9 +19,13 @@
 {{- $class := .class -}}
 {{- $cue := .cue | default site.Params.main.externalLinks.cue -}}
 {{- $tab := .tab | default site.Params.main.externalLinks.tab -}}
-{{- $baseURL := $page.Scratch.Get "baseURL" -}}
-
-{{- $menuURL := urls.JoinPath $baseURL ((or $menu.PageRef $menu.URL) | relLangURL) -}}
+{{- $baseURL := $page.Scratch.Get "baseURL" | default "/" -}}
+{{- $menuURL := "" -}}
+{{ if or (strings.HasPrefix $menu.PageRef "http") (strings.HasPrefix $menu.URL "http") }}
+    {{ $menuURL = or $menu.PageRef $menu.URL }}
+{{ else }}
+    {{- $menuURL = urls.JoinPath $baseURL ((or $menu.PageRef $menu.URL) | relLangURL) -}}
+{{ end }}
 {{- $pageURL := $page.RelPermalink -}}
 {{- $isActive := or (and (hasPrefix $pageURL $menuURL) (ne $menuURL ("/" | relLangURL))) (eq $pageURL $menuURL) -}}
 {{- $isAlias := $menu.Params.alias -}}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,19 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.0-beta11",
+  "version": "0.24.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.24.0-beta11",
+      "version": "0.24.1",
      "license": "MIT",
      "dependencies": {
        "@fullhuman/postcss-purgecss": "^6.0.0",
        "autoprefixer": "^10.4.19",
        "cssnano": "^7.0.1",
        "cssnano-preset-advanced": "^7.0.1",
-        "hugo-bin": "0.123.2",
+        "hugo-bin": "0.123.3",
        "purgecss-whitelister": "^2.4.0"
      },
      "devDependencies": {
@@ -4309,9 +4309,9 @@
      "dev": true
    },
    "node_modules/hugo-bin": {
-      "version": "0.123.2",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.123.2.tgz",
-      "integrity": "sha512-HxKrHHso1PpXMOoZbAmopCqsYzdL3oUUR+/NTBdrhAOZFsKGaP1abLdJgu9GUyhUq+gYQOtDUtpB9wjoDyv6GQ==",
+      "version": "0.123.3",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.123.3.tgz",
+      "integrity": "sha512-30lebZNVnrpDo5HV5RbCHZ3WhYXsrvUJ0EyJkoYXMd8SHs2HZuc3s0O7RY7aP+pkC9SX3ahU9rNsB9bcKuSw1g==",
      "funding": [
        {
          "type": "github",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.0-beta11",
+  "version": "0.24.1",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
@@ -71,7 +71,7 @@
    "autoprefixer": "^10.4.19",
    "cssnano": "^7.0.1",
    "cssnano-preset-advanced": "^7.0.1",
-    "hugo-bin": "0.123.2",
+    "hugo-bin": "0.123.3",
    "purgecss-whitelister": "^2.4.0"
  },
  "devDependencies": {
Author	SHA1	Message	Date
Mark Dumay	deaf9f0fec	Merge pull request #983 from gethinode/develop Fix external links in navbar	2024-06-04 09:12:15 +02:00
Mark Dumay	7ed3313c55	Merge branch 'main' into develop	2024-06-04 09:06:15 +02:00
Mark Dumay	1477ff7bb2	Bump package release	2024-06-04 09:05:47 +02:00
Mark Dumay	7e2f6606bf	Fix external links in navbar	2024-06-04 09:05:11 +02:00
Mark Dumay	2acc8fc737	Merge pull request #982 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-06-04 06:19:46 +02:00
markdumay	96fe90ce9d	fix: update Hugo module dependencies	2024-06-04 03:06:36 +00:00
github-actions[bot]	acf25e5375	Merge pull request #979 from gethinode/dependabot/npm_and_yarn/hugo-bin-0.123.3 Bump hugo-bin from 0.123.2 to 0.123.3	2024-06-03 13:58:51 +00:00
dependabot[bot]	aa35e03692	Bump hugo-bin from 0.123.2 to 0.123.3 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.123.2 to 0.123.3. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.123.2...v0.123.3) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-03 13:51:57 +00:00
Mark Dumay	31cf9eb577	Merge pull request #978 from gethinode/develop Publish v0.24.0 release	2024-06-03 13:14:41 +02:00
Mark Dumay	9a8ebd3558	Update release tag for plain images support	2024-06-03 13:08:22 +02:00
Mark Dumay	148c587283	Merge branch 'main' into develop	2024-06-03 13:06:01 +02:00
Mark Dumay	7c9c4cbabb	Publish v0.24.0 release	2024-06-03 13:05:15 +02:00