From f9e8dec0d0244541f9d08f8bb1bd247beb27d13c Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 1 Jun 2021 20:04:05 +0100 Subject: [PATCH 1/3] Remove spurious AppSubUrl in serviceworker request. There is another spurious AppSubUrl placement in the serviceworker registration. This PR removes it. Signed-off-by: Andrew Thornton --- web_src/js/features/serviceworker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/serviceworker.js b/web_src/js/features/serviceworker.js index e92d21cde90f6..2877947e2a1fd 100644 --- a/web_src/js/features/serviceworker.js +++ b/web_src/js/features/serviceworker.js @@ -44,7 +44,7 @@ export default async function initServiceWorker() { // normally we'd serve the service worker as a static asset from AssetUrlPrefix but // the spec strictly requires it to be same-origin so it has to be AppSubUrl to work await checkCacheValidity(); - await navigator.serviceWorker.register(joinPaths(AppSubUrl, workerAssetPath)); + await navigator.serviceWorker.register(workerAssetPath); } catch (err) { console.error(err); await invalidateCache(); From 64b1c34d10f9c1e5fbe046f62c7fa3ca57abf320 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 1 Jun 2021 21:32:47 +0100 Subject: [PATCH 2/3] placate lint Signed-off-by: Andrew Thornton --- web_src/js/features/serviceworker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/serviceworker.js b/web_src/js/features/serviceworker.js index 2877947e2a1fd..94147d76d134d 100644 --- a/web_src/js/features/serviceworker.js +++ b/web_src/js/features/serviceworker.js @@ -1,6 +1,6 @@ import {joinPaths} from '../utils.js'; -const {UseServiceWorker, AppSubUrl, AssetUrlPrefix, AppVer} = window.config; +const {UseServiceWorker, AssetUrlPrefix, AppVer} = window.config; const cachePrefix = 'static-cache-v'; // actual version is set in the service worker script const workerAssetPath = joinPaths(AssetUrlPrefix, 'serviceworker.js'); From f22ffe606e0b42488f3e2266b4c26ebad953894f Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Wed, 2 Jun 2021 10:33:55 +0100 Subject: [PATCH 3/3] as per silverwind Signed-off-by: Andrew Thornton --- web_src/js/features/serviceworker.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web_src/js/features/serviceworker.js b/web_src/js/features/serviceworker.js index 94147d76d134d..37cd15c5bd4bc 100644 --- a/web_src/js/features/serviceworker.js +++ b/web_src/js/features/serviceworker.js @@ -41,8 +41,7 @@ export default async function initServiceWorker() { // unregister all service workers where scriptURL does not match the current one await unregisterOtherWorkers(); try { - // normally we'd serve the service worker as a static asset from AssetUrlPrefix but - // the spec strictly requires it to be same-origin so it has to be AppSubUrl to work + // the spec strictly requires it to be same-origin so the AssetUrlPrefix should contain AppSubUrl await checkCacheValidity(); await navigator.serviceWorker.register(workerAssetPath); } catch (err) {