fix(init): Properly set PWA on production environment

Fixes broken commit on 8d52d26
khusika · Aug 5, 2021 · 2e6eacb · 2e6eacb
1 parent fc18207
commit 2e6eacb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -1,6 +1,7 @@
 {{- partial "init.html" . -}}
 
 {{- $params := .Scratch.Get "params" -}}
+{{- $pwa := .Scratch.Get "pwa" -}}
 {{- $offline := $params.offline -}}
 
 <!DOCTYPE html>
@@ -42,11 +43,9 @@
             {{- if ne .Site.Params.footer.enable false -}}
             {{- partial "footer.html" . -}}
             {{- end -}}
-            {{- if eq hugo.Environment "production" -}}
-            {{- with (eq $.Site.Params.pwa.enable "true") -}}
+            {{- if and (eq hugo.Environment "production") ($pwa.enable) -}}
             {{- partial "pwa.html" . -}}
             {{- end -}}
-            {{- end -}}
             </footer>
         </div>
 

diff --git a/layouts/partials/assets.html b/layouts/partials/assets.html
@@ -2,6 +2,7 @@
 {{- $cdn := .Scratch.Get "cdn" | default dict -}}
 {{- $fingerprint := .Scratch.Get "fingerprint" -}}
 {{- $config := (.Scratch.Get "this").config -}}
+{{- $pwa := .Scratch.Get "pwa" -}}
 
 {{- /* Font Awesome */ -}}
 {{- if $params.cdnfontawesome -}}
@@ -175,11 +176,9 @@
 {{- end -}}
 {{- end -}}
 
-{{- if eq hugo.Environment "production" -}}
-{{- with (eq $.Site.Params.pwa.enable "true") -}}
+{{- if and (eq hugo.Environment "production") ($pwa.enable) -}}
 {{- dict "Source" "sw.js" "Minify" true "Fingerprint" $fingerprint | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}}
 {{- end -}}
-{{- end -}}
 
 {{- /* Cookie Consent */ -}}
 {{- if .Site.Params.cookieconsent | and .Site.Params.cookieconsent.enable -}}

diff --git a/layouts/partials/init.html b/layouts/partials/init.html
@@ -23,6 +23,7 @@
         {{- end -}}
     {{- end -}}
     {{- .Scratch.Set "cdn" $cdn -}}
+    {{- .Scratch.Set "pwa" .Site.Params.pwa -}}
     {{- .Scratch.Set "fingerprint" .Site.Params.fingerprint -}}
     {{- .Scratch.Set "analytics" .Site.Params.analytics -}}
     {{- .Scratch.Set "comment" $params.comment -}}

diff --git a/layouts/partials/pwa.html b/layouts/partials/pwa.html
@@ -1,7 +1,8 @@
+{{- $pwa := .Scratch.Get "pwa" -}}
 <script>
 if ('serviceWorker' in navigator) {
     navigator.serviceWorker
-        .register('/sw.min.js?version={{.Site.Params.pwa.version}}', { scope: '/' })
+        .register('/sw.min.js?version={{ $pwa.version }}', { scope: '/' })
         .then(() => {
             console.info('{{- .Site.Title -}}\u00A0Service Worker Registered');
         }, err => console.error('{{- .Site.Title -}}\u00A0Service Worker registration failed: ', err));