hexo-swpp 2.7.0-beta.2 → 2.7.0-beta.4

package/lib/configLoader.js

@@ -22,11 +22,13 @@ module.exports.load = hexo => {
                         break
                     }
                     if (!defA) {
-                        list.append(key)
+                        list.push(key)
                         handle(value, defValue, list)
                         list.pop()
                     }
                     break
+                case 'boolean':
+                    break
             }
         }
     }
@@ -42,11 +44,6 @@ module.exports.load = hexo => {
 const defConfig = {
     // sw 有关配置项
     serviceWorker: {
-        /**
-         * 是否让插件自动生成 sw，为 false 该分类下所有配置项失效
-         * @type boolean
-         */
-        enable: true,
         /**
          * 逃生门
          * @type number
@@ -67,11 +64,6 @@ const defConfig = {
     },
     // 与 SW 注册有关的配置项
     register: {
-        /**
-         * 是否让插件生成注册代码，为 false 时该分类下所有配置项失效
-         * @type boolean
-         */
-        enable: true,
         /**
          * sw 注册成功时的动作
          * @type ?VoidFunction
@@ -105,11 +97,6 @@ const defConfig = {
     },
     // 与 DOM 端有关的配置项
     dom: {
-        /**
-         * 是否让插件生成 DOM 端 JS，为 false 是该分类下所有配置项失效
-         * @type boolean
-         */
-        enable: true,
         /**
          * 版本更新完成后的动作
          * @type VoidFunction
@@ -173,11 +160,6 @@ const defConfig = {
      * @see https://kmar.top/posts/73014407/#c60b3060
      */
     external: {
-        /**
-         * 是否启用外部文件的更新
-         * @type boolean
-         */
-        enable: false,
         /**
          * 拉取网络文件时的超时时间
          * @type number

package/lib/jsonBuilder.js

@@ -97,7 +97,7 @@ module.exports = (hexo, hexoConfig, swRules) => {
             }
             // 外链监控
             const external = config.external
-            if (!external.enable) return
+            if (!external) return
             const indexOf = (str, ...chars) => {
                 let result = str.length
                 chars.forEach(it => {
@@ -511,7 +511,7 @@ module.exports = (hexo, hexoConfig, swRules) => {
 
     function replaceDevRequest(url) {
         const external = config.external
-        if (!external.enable || !external.replace) return url
+        if (!external || !external.replace) return url
         for (let value of external.replace) {
             for (let source of value.source) {
                 if (url.match(source)) {

package/lib/swBuilder.js

@@ -16,7 +16,7 @@ module.exports = (hexo, hexoConfig, rules) => {
 
     // noinspection JSUnresolvedVariable
     hexo.extend.generator.register('buildSw', () => {
-        if (!serviceWorkerConfig.enable) return
+        if (!serviceWorkerConfig) return
         const absPath = module.path + '/sw-template.js'
         const rootPath = nodePath.resolve('./')
         const relativePath = nodePath.relative(rootPath, absPath)
@@ -177,14 +177,14 @@ module.exports = (hexo, hexoConfig, rules) => {
 
     // 生成注册 sw 的代码
     const registerConfig = config.register
-    if (registerConfig.enable) {
+    if (registerConfig) {
         // noinspection JSUnresolvedVariable
         hexo.extend.injector.register('head_begin', () => registerConfig.builder(root, hexoConfig, config), "default")
     }
 
     // 插入 sw-dom.js
     const domConfig = config.dom
-    if (domConfig.enable) {
+    if (domConfig) {
         // noinspection JSUnresolvedVariable,HtmlUnknownTarget
         hexo.extend.injector.register('body_begin', () => `<script src="/sw-dom.js"></script>`)
         // noinspection JSUnresolvedVariable

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-swpp",
-  "version": "2.7.0-beta.2",
+  "version": "2.7.0-beta.4",
   "main": "index.js",
   "dependencies": {
     "hexo-log": "^3.0.0",