Merge pull request #1261 from gethinode/develop

Improve deployment to subfolder
gethinode · Oct 23, 2024 · 1b96477 · 1b96477
2 parents a730255 + f910d1b
commit 1b96477
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/assets/js/critical/languageSelector.js b/assets/js/critical/languageSelector.js
@@ -1,9 +1,12 @@
 /* eslint-disable */
-{{- if site.Params.main.enableLanguageSelectionStorage -}} 
+{{- if site.Params.main.enableLanguageSelectionStorage -}}
+{{- $folder := (urls.Parse site.BaseURL).Path | default "/" -}}
 
 (() => {
   'use strict'
 
+  const folder = '{{ $folder }}'
+
   // Function to get the selected language from local storage
   function getLanguage () {
     return getLocalStorage('selectedLanguage', document.documentElement.lang, 'functional')
@@ -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 + '/'
     }
   })
 })()

diff --git a/exampleSite/hugo_stats.json b/exampleSite/hugo_stats.json
@@ -503,7 +503,6 @@
       "body-file-collapse-1",
       "bouton",
       "breadcrumb",
-      "btn-webshare",
       "button",
       "button-group",
       "card",

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	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.2 // 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
 )
diff --git a/go.sum b/go.sum
@@ -322,6 +322,8 @@ github.com/gethinode/mod-utils/v2 v2.8.1 h1:u7sFbgJ5sBEMYC/GwcMRyjRAd5NxTjBnbld5
 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=

diff --git a/layouts/partials/assets/link.html b/layouts/partials/assets/link.html
@@ -13,7 +13,15 @@
 {{ end }}
 
 <!-- Initialize arguments -->
-{{ $destination := path.Clean (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 := "" -}}