swpp-backends 2.1.7-beta.0 → 2.1.7-beta.1

package/dist/index.js

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

package/dist/resources/sw-dom.js

@@ -3,22 +3,22 @@ document.addEventListener('DOMContentLoaded', () => {
     const checkServiceWorker = () => 'serviceWorker' in navigator && navigator.serviceWorker.controller
     /** 发送信息到 sw */
     const postMessage2SW = type => navigator.serviceWorker.controller.postMessage(type)
-    const pjaxUpdate = url => new Promise(resolve => {
+    const pjaxUpdate = url => {
         const type = url.endsWith('js') ? 'script' : 'link'
-        const name = type.length === 4 ? 'href' : 'src'
-        for (let item of document.querySelectorAll(type)) {
+        const name = type === 'link' ? 'href' : 'src'
+        for (let item of document.getElementsByTagName(type)) {
             const itUrl = item[name]
             if (url.length > itUrl ? url.endsWith(itUrl) : itUrl.endsWith(url)) {
                 const newEle = document.createElement(type)
                 const content = item.text || item.textContent || item.innerHTML || ''
+                // noinspection JSUnresolvedReference
                 Array.from(item.attributes).forEach(attr => newEle.setAttribute(attr.name, attr.value))
                 newEle.appendChild(document.createTextNode(content))
                 item.parentNode.replaceChildren(newEle, item)
-                return resolve(true)
+                return true
             }
         }
-        resolve(false)
-    })
+    }
     if (!checkServiceWorker()) return
     if (sessionStorage.getItem('updated')) {
         sessionStorage.removeItem('updated');
@@ -33,17 +33,12 @@ document.addEventListener('DOMContentLoaded', () => {
                 sessionStorage.setItem('updated', '1')
                 // noinspection JSUnresolvedVariable,JSUnresolvedFunction
                 if (window.Pjax?.isSupported()) {
-                    Promise.all(list.map(url => {
-                        if (url.endsWith('.js'))
-                            return pjaxUpdate(url)
-                        if (url.endsWith('.css'))
-                            return pjaxUpdate(url)
-                        return Promise.resolve()
-                    })).then(() => location.reload())
-                } else location.reload()
+                    list.filter(url => /\.(js|css)$/.test(url))
+                        .forEach(pjaxUpdate)
+                }
+                location.reload()
                 break
             case 'escape':
-                sessionStorage.setItem('updated', '1')
                 location.reload()
                 break
         }

package/dist/resources/sw-template.js

@@ -188,6 +188,8 @@
             const newVersion = {global, local: info[0].version, escape: oldVersion?.escape ?? 0}
             // 新用户和刚进行过逃逸操作的用户不进行更新操作
             if (!oldVersion || escapeTrigger) {
+                // noinspection JSValidateTypes
+                newVersion.escape = '@$$[escape]'
                 escapeTrigger = false
                 writeVersion(newVersion)
                 return {new: newVersion, old: oldVersion}

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "swpp-backends",
-  "version": "2.1.7-beta.0",
+  "version": "2.1.7-beta.1",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
-  "scripts": {
-    "prepublishOnly": "tsc && gulp copy-resources"
-  },
   "description": "Generate a powerful ServiceWorker for your website.",
   "author": "kmar",
   "license": "AGPL-3.0",
@@ -33,5 +30,6 @@
   "keywords": [
     "ServiceWorker",
     "sw"
-  ]
+  ],
+  "scripts": {}
 }