swpp-backends 2.3.1 → 2.3.2

package/dist/DomBuilder.js

@@ -21,7 +21,7 @@ function buildDomJs() {
     }
     let template = fs_1.default.readFileSync(path_1.default.resolve('./', module.path, 'resources/sw-dom.js'), 'utf-8');
     if (config.onsuccess)
-        template = template.replaceAll('// ${onSuccess}', `(${config.onsuccess.toString()})()`);
+        template = template.replaceAll('const {onSuccess} = require(\'../config\')', `const onSuccess = ${config.onsuccess.toString()};`);
     return template;
 }
 exports.buildDomJs = buildDomJs;

package/dist/index.js

@@ -10,7 +10,7 @@ const VersionAnalyzer_1 = require("./VersionAnalyzer");
 const DomBuilder_1 = require("./DomBuilder");
 // noinspection JSUnusedGlobalSymbols
 exports.default = {
-    version: '2.3.1',
+    version: '2.3.2',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: Variant_1.readUpdateJson,
         readRules: Variant_1.readRules, readMergeVersionMap: Variant_1.readMergeVersionMap,

package/dist/resources/sw-dom.js

@@ -19,26 +19,26 @@ document.addEventListener('DOMContentLoaded', () => {
         }
     }
     const SESSION_KEY = 'updated'
+    // noinspection JSFileReferences
+    const {onSuccess} = require('../config')
     if (sessionStorage.getItem(SESSION_KEY)) {
+        onSuccess()
         sessionStorage.removeItem(SESSION_KEY);
-        // ${onSuccess}
     } else postMessage2SW('update')
     navigator.serviceWorker.addEventListener('message', event => {
-        sessionStorage.setItem(SESSION_KEY, '1')
         const data = event.data
-        switch (data.type) {
-            case 'update':
-                const list = data.list
-                // noinspection JSUnresolvedVariable,JSUnresolvedFunction
-                if (list && window.Pjax?.isSupported()) {
-                    list.filter(url => /\.(js|css)$/.test(url))
-                        .forEach(pjaxUpdate)
-                }
-                location.reload()
-                break
-            case 'escape':
-                location.reload()
-                break
+        sessionStorage.setItem(SESSION_KEY, data.type)
+        let list = data.list?.filter(url => /\.(js|css)$/.test(url))
+        if (list) {
+            // noinspection JSUnresolvedReference
+            if (window.Pjax?.isSupported?.())
+                list.forEach(pjaxUpdate)
+            location.reload()
+        } else {
+            const newVersion = data.new, oldVersion = data.old
+            if (oldVersion && (newVersion.global !== oldVersion.global || newVersion.local !== oldVersion.local)) {
+                onSuccess()
+            }
         }
     })
 })

package/dist/resources/sw-template.js

@@ -28,13 +28,16 @@
             readVersion().then(async oldVersion => {
                 // noinspection JSIncompatibleTypesComparison
                 if (oldVersion && oldVersion.escape !== escape) {
-                    // noinspection JSValidateTypes
-                    oldVersion.escape = escape
+                    const list = await caches.open(CACHE_NAME)
+                        .then(cache => cache.keys())
+                        .then(keys => keys?.map(it => it.url))
                     await caches.delete(CACHE_NAME)
-                    await writeVersion(oldVersion)
+                    const info = await updateJson()
+                    info.type = 'escape'
+                    info.list = list
                     // noinspection JSUnresolvedReference
-                    const list = await clients.matchAll()
-                    list.forEach(client => client.postMessage({type: 'escape'}))
+                    const clientList = await clients.matchAll()
+                    clientList.forEach(client => client.postMessage(info))
                 }
             })
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swpp-backends",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",