hexo-swpp 2.4.1 → 2.4.3

package/lib/jsonBuilder.js

@@ -267,22 +267,21 @@ module.exports = (hexo, config, pluginConfig, swRules) => {
     const isMerge = (pathname, tidied) => {
         // noinspection JSUnresolvedVariable
         const optional = pluginConfig.json?.merge
-        if (!optional) return false
         const {tag_dir, archive_dir, category_dir} = config
         if (pathname.includes(`/${tag_dir}/`)) {
-            if (optional.tags ?? true)
+            if (optional?.tags ?? true)
                 return tidied.tags = true
         } else if (pathname.includes(`/${archive_dir}/`)) {
-            if (optional.archives ?? true)
+            if (optional?.archives ?? true)
                 return tidied.archives = true
         } else if (pathname.includes(`/${category_dir}/`)) {
-            if (optional.categories ?? true)
+            if (optional?.categories ?? true)
                 return tidied.categories = true
         } else if (pathname.startsWith('/page/') || pathname.length <= 1) {
-            if (optional.index ?? true)
+            if (optional?.index ?? true)
                 return tidied.index = true
         } else {
-            const list = optional.custom
+            const list = optional?.custom
             if (!list) return false
             for (let reg of list) {
                 if (pathname.startsWith(`/${reg}/`))

package/lib/sw-template.js

@@ -19,21 +19,10 @@
         dbVersion.read().then(oldVersion => {
             if (oldVersion && oldVersion.escape !== escape) {
                 oldVersion.escape = escape
-                const rules = new VersionList()
-                rules.refresh = true
                 // noinspection JSUnresolvedVariable
-                Promise.all([
-                    dbVersion.write(oldVersion),
-                    deleteCache(rules),
-                    updateJson(true)
-                ]).then(
-                    args => clients.matchAll().then(
-                        list => list.forEach(client => client.postMessage({
-                            type: 'escape',
-                            version: args[2].version
-                        }))
-                    )
-                )
+                caches.delete(CACHE_NAME)
+                    .then(() => clients.matchAll())
+                    .then(list => list.forEach(client => client.postMessage({type: 'escape'})))
             }
         })
     })
@@ -138,7 +127,7 @@
         /** 解析字符串 */
         const parseJson = json => dbVersion.read().then(oldVersion => {
             const {info, global} = json
-            const newVersion = {global, local: info[0].version, escape: oldVersion.escape}
+            const newVersion = {global, local: info[0].version, escape: oldVersion?.escape}
             //新用户不进行更新操作
             if (!oldVersion || skip) {
                 dbVersion.write(newVersion)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-swpp",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "main": "index.js",
   "dependencies": {
     "hexo-log": "^3.0.0",