fix: avoid sw.js being loaded from wrong path

xing · Feb 23, 2018 · 14ec44b · 14ec44b
1 parent 4fd8f21
commit 14ec44b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/config/index.js b/packages/config/index.js
@@ -134,6 +134,8 @@ function resolvePaths(config) {
 function normalizeURLs(config) {
   var basePath = config.basePath.replace(/^\/*/, '/').replace(/\/*$/, '');
   var assetPath = config.assetPath.replace(/(^\/*|\/*$)/g, '');
+  var workerPath = config.workerPath.replace(/^\/*/, '/');
+
   return Object.assign({}, config, {
     locations: config.locations
       .map(function(location) {
@@ -144,6 +146,7 @@ function normalizeURLs(config) {
       }),
     basePath: basePath,
     assetPath: assetPath,
+    workerPath: workerPath,
   });
 }
 

diff --git a/packages/pwa/dom.js b/packages/pwa/dom.js
@@ -15,7 +15,7 @@ module.exports = function installServiceWorker() {
       window.location.hostname === 'localhost'
     ) {
       window.addEventListener('load', function() {
-        resolve(navigator.serviceWorker.register('/' + hopsConfig.workerPath));
+        resolve(navigator.serviceWorker.register(hopsConfig.workerPath));
       });
     }
   });