add a script to remove the old service worker

bytes-zone · Nov 28, 2020 · 23b4262 · 23b4262
1 parent 3dce722
commit 23b4262
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/default.nix b/default.nix
@@ -11,6 +11,7 @@ in pkgs.stdenv.mkDerivation {
     pkgs.zola
     pkgs.nodePackages.html-minifier
     pkgs.nodePackages.clean-css-cli
+    pkgs.nodePackages.uglify-js
   ];
   buildPhase = ''
     zola build
@@ -21,8 +22,25 @@ in pkgs.stdenv.mkDerivation {
       -exec cleancss -O 1 -o {}.min {} \; \
       -exec mv {}.min {} \;
 
+    echo "compressing JS"
+    find public \
+      -type f -name '*.js' \
+      -exec uglifyjs -o {}.min {} \; \
+      -exec mv {}.min {} \;
+
     echo "compressing HTML"
-    html-minifier --collapse-whitespace --decode-entities --remove-comments --remove-attribute-quotes --remove-redundant-attributes --remove-optional-tags --remove-script-type-attributes --remove-style-link-type-attributes --input-dir public --output-dir public
+    html-minifier \
+      --collapse-whitespace \
+      --decode-entities \
+      --remove-comments \
+      --remove-attribute-quotes \
+      --remove-redundant-attributes \
+      --remove-optional-tags \
+      --remove-script-type-attributes \
+      --remove-style-link-type-attributes \
+      --file-ext html \
+      --input-dir public \
+      --output-dir public
   '';
 
   installPhase = ''

diff --git a/static/remove-old-service-worker.js b/static/remove-old-service-worker.js
@@ -0,0 +1,13 @@
+// I had a service worker with elm-pages. Now it's gone, so we need to unregister
+// it or it'll keep showing the wrong content. I'll probably drop this code
+// eventually!
+navigator.serviceWorker.getRegistrations().then(function(registrations) {
+  for (var i = 0; i < registrations.length; i++) {
+    registrations[i].unregister();
+  }
+
+  // do a hard reload to make sure we have all the latest assets etc.
+  if (registrations.length > 0) {
+    window.location.reload(true)
+  }
+})
diff --git a/templates/base.html b/templates/base.html
@@ -24,6 +24,8 @@
     <meta property="twitter:description" content="{{ config.description }}">
     <meta property="og:type" content="website">
     {% endblock -%}
+
+    <script src="remove-old-service-worker.js" defer></script>
   </head>
   <body>
     <header>