feat(pwa): Get version-cache from config

Signed-off-by: Khusika Dhamar Gusti <[email protected]>
khusika · Jul 11, 2021 · 98592e1 · 98592e1
1 parent c824f4b
commit 98592e1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/assets/sw.js b/assets/sw.js
@@ -1,4 +1,4 @@
-const CACHE_VERSION = 1;
+const CACHE_VERSION = new URL(location).searchParams.get("version");
 const BASE_CACHE_FILES = ["/css/home.min.css", "/css/page.min.css", "/js/themes.min.js", "/site.webmanifest", "/404.html"];
 const OFFLINE_CACHE_FILES = ["/css/page.min.css", "/js/themes.min.js", "/offline/index.html"];
 const NOT_FOUND_CACHE_FILES = ["/css/page.min.css", "/js/themes.min.js", "/404.html"];

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -445,8 +445,13 @@ ignoreErrors = ["err-missing-comment-accesstoken", "err-missing-oembed-accesstok
   images = ["/logo.png"]
   # whether to enable CSS and JS source mapping
   SourceMap = false
-  # whether to enable PWA support
-  enablePWA = true
+
+  # PWA config
+  [params.pwa]
+    # whether to enable PWA support
+    enable = true
+    # service-worker version
+    version = "1.0.0"
 
   # Header config
   # 页面头部导航栏配置

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -38,7 +38,7 @@
             {{- if ne .Site.Params.footer.enable false -}}
             {{- partial "footer.html" . -}}
             {{- end -}}
-            {{- if eq .Site.Params.enablePWA true -}}
+            {{- if eq .Site.Params.pwa.enable true -}}
             {{- partial "pwa.html" . -}}
             {{- end -}}
             </footer>

diff --git a/layouts/partials/assets.html b/layouts/partials/assets.html
@@ -182,7 +182,7 @@
 {{- end -}}
 {{- end -}}
 
-{{- if eq $.Site.Params.enablePWA true -}}
+{{- if eq $.Site.Params.pwa.enable true -}}
 {{- dict "Source" "sw.js" "Minify" true "Fingerprint" $fingerprint | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}}
 {{- end -}}
 

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