hexo-theme-volantis 5.8.1 → 6.0.1

package/layout/_plugins/search/script.ejs

@@ -1,12 +1,15 @@
 <script>
-  const SearchServiceDataPathRoot = ("<%- config.root %>" || "/").endsWith("/") ?
-    "<%- config.root %>" || "/" :
-    "<%- config.root %>/" || "/";
-  const SearchServiceDataPath = SearchServiceDataPathRoot + "content.json";
-
-  function loadSearchScript() {
-    // see: layout/_partial/scripts/_ctrl/cdnCtrl.ejs
-    return volantis.js("<%- theme.cdn.map.js.search %>");
+  async function loadSearchScript() {
+    <% if(theme.search.service === 'algolia') { %>
+      await volantis.js("<%- theme.cdn.algolia_search_v4 %>")
+      await volantis.js("<%- theme.cdn.instantsearch_v4 %>")
+    <% } %>
+        
+    <% if(theme.search.service === 'meilisearch') { %>
+      await volantis.js("<%- theme.cdn.instantsearch_v4 %>")
+      await volantis.js("<%- theme.cdn.instant_meilisearch %>")
+    <% } %>
+    return volantis.js("<%- theme.cdn['volantis_search_' + theme.search.service] %>");
   }
 
   function loadSearchService() {

package/layout/_plugins/swiper/script.ejs

@@ -1,8 +1,8 @@
 <script>
   function load_swiper() {
     if (!document.querySelectorAll(".swiper-container")[0]) return;
-    volantis.css("<%- theme.plugins.swiper.css %>");
-    volantis.js("<%- theme.plugins.swiper.js %>").then(() => {
+    volantis.css("<%- theme.cdn.swiper_css %>");
+    volantis.js("<%- theme.cdn.swiper_js %>").then(() => {
       pjax_swiper();
     });
   }

package/layout/{_partial/scripts/toc.ejs → _plugins/toc/script.ejs}

@@ -1,26 +1,29 @@
 <script>
-  function listennSidebarTOC() {
+  function listenSidebarTOC() {
     const navItems = document.querySelectorAll(".toc li");
     if (!navItems.length) return;
-    let targets = []
-    const sections = [...navItems].map((element) => {
+    const targets = []
+    const sections = Array.from(navItems).forEach((element) => {
       const link = element.querySelector(".toc-link");
       const target = document.getElementById(
-        decodeURI(link.getAttribute("href")).replace("#", "")
+        link.getAttribute("href") ? decodeURI(link.getAttribute("href")).replace("#", "") : link.getAttribute("toc-action").split("toc-")[1] // 兼容 hexo-blog-encrypt
       );
       targets.push(target)
       // 解除 a 标签 href 的 锚点定位, a 标签 href 的 锚点定位 会随机启用?? 产生错位???
-      link.setAttribute("onclick","return false;")
-      link.setAttribute("toc-action","toc-"+decodeURI(link.getAttribute("href")).replace("#", ""))
-      link.setAttribute("href","/")
+      if (link.getAttribute("href")) {
+        link.setAttribute("toc-action", "toc-" + decodeURI(link.getAttribute("href")).replace("#", ""))
+        link.removeAttribute("href")
+      }
       // 配置 点击 触发新的锚点定位
-      link.addEventListener("click", (event) => {
-        event.preventDefault();
-        // 这里的 addTop 是通过错位使得 toc 自动展开.
-        volantis.scroll.to(target,{addTop: 5, observer:true})
-        // Anchor id
-        history.pushState(null, document.title, "#" + target.id);
-      });
+      if (target && target.id) {
+        link.addEventListener("click", (event) => {
+          event.preventDefault();
+          // 这里的 addTop 是通过错位使得 toc 自动展开.
+          volantis.scroll.to(target, { addTop: 5, observer: true })
+          // Anchor id
+          history.pushState(null, document.title, "#" + target.id);
+        });
+      }
       return target;
     });
 
@@ -39,25 +42,27 @@
     }
 
     // 方案一：
-    volantis.activateNavIndex=0
+    volantis.activateNavIndex = 0
     activateNavByIndex(navItems[volantis.activateNavIndex])
-    volantis.scroll.push(()=>{
-      if (targets[0].getBoundingClientRect().top >= 0) {
-        volantis.activateNavIndex = 0
-      }else if (targets[targets.length-1].getBoundingClientRect().top < 0) {
-        volantis.activateNavIndex = targets.length-1
-      } else {
-        for (let index = 0; index < targets.length; index++) {
-          const target0 = targets[index];
-          const target1 = targets[(index+1)%targets.length];
-          if (target0.getBoundingClientRect().top < 0&&target1.getBoundingClientRect().top >= 0) {
-            volantis.activateNavIndex=index
-            break;
+    if (targets[0]) {
+      volantis.scroll.push(() => {
+        if (targets[0].getBoundingClientRect().top >= 0) {
+          volantis.activateNavIndex = 0
+        } else if (targets[targets.length - 1].getBoundingClientRect().top < 0) {
+          volantis.activateNavIndex = targets.length - 1
+        } else {
+          for (let index = 0; index < targets.length; index++) {
+            const target0 = targets[index];
+            const target1 = targets[(index + 1) % targets.length];
+            if (target0.getBoundingClientRect().top < 0 && target1.getBoundingClientRect().top >= 0) {
+              volantis.activateNavIndex = index
+              break;
+            }
           }
         }
-      }
-      activateNavByIndex(navItems[volantis.activateNavIndex])
-    })
+        activateNavByIndex(navItems[volantis.activateNavIndex])
+      })
+    }
 
     // 方案二：
     // IntersectionObserver 不是完美精确到像素级别 也不是低延时性的
@@ -101,10 +106,9 @@
     // createIntersectionObserver(document.documentElement.scrollHeight);
   }
 
-  document.addEventListener("DOMContentLoaded", ()=>{
-    volantis.requestAnimationFrame(listennSidebarTOC)
-  });
-  document.addEventListener("pjax:success", ()=>{
-    volantis.requestAnimationFrame(listennSidebarTOC)
+  document.addEventListener("DOMContentLoaded", () => {
+    volantis.requestAnimationFrame(listenSidebarTOC)
   });
-</script>
+  volantis.pjax.push(listenSidebarTOC);
+</script>
+

package/layout/_widget/blogger.ejs

@@ -4,11 +4,11 @@
     <% if (item.avatar) { %>
       <% if (item.url) { %>
         <a class='avatar flat-box <%- item.shape %>' href='<%- url_for(item.url) %>'>
-          <img no-lazy src='<%- item.avatar %>'/>
+          <img no-lazy src='<%- item.avatar %>' alt='avatar' />
         </a>
       <% } else { %>
         <div class='avatar'>
-          <img no-lazy src='<%- item.avatar %>'/>
+          <img no-lazy src='<%- item.avatar %>' alt='avatar' />
         </div>
       <% } %>
     <% } %>
@@ -35,9 +35,9 @@
               target="_blank"
               rel="external nofollow noopener noreferrer">
               <% if (value.img) { %>
-                <img src="<%- value.img %>"/>
+                <img src="<%- value.img %>"  alt='social' />
               <% } else if (value.avatar) { %>
-                <img src="<%- value.avatar %>" style="border-radius:120px"/>
+                <img src="<%- value.avatar %>"  alt='social' style="border-radius:120px"/>
               <% } %>
             </a>
           <% } %>

package/layout/_widget/webinfo.ejs

@@ -25,25 +25,24 @@
         </div>
       <% } %>
 
-      <% if (item.type.visitcounter.siteuv.enable && (!!theme.analytics.busuanzi || !!theme.analytics.leancloud.app_id)) { %>
+      <% if (item.type.visitcounter.enable && theme.plugins.busuanzi.enable) { %>
         <div class="webinfo-item">
           <div><%= item.type.visitcounter.siteuv.text %></div>
-          <% if (!!theme.analytics.busuanzi) {%>
-          <div><span id="busuanzi_value_site_uv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.siteuv.unit %></div>
-          <% } else { %>
-          <div><span id="lc-uv"><span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.siteuv.unit %></div>
-          <% } %>
+          <div>
+            <span id="busuanzi_value_site_uv">
+              <i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i>
+            </span> 
+            <%= item.type.visitcounter.siteuv.unit %>
+          </div>
         </div>
-      <% } %>
-
-      <% if (item.type.visitcounter.sitepv.enable && (!!theme.analytics.busuanzi || !!theme.analytics.leancloud.app_id)) { %>
         <div class="webinfo-item">
           <div><%= item.type.visitcounter.sitepv.text %></div>
-          <% if (!!theme.analytics.busuanzi) {%>
-          <div><span id="busuanzi_value_site_pv"><i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i></span> <%= item.type.visitcounter.sitepv.unit %></div>
-          <% } else { %>
-          <div><span id="lc-sv"><span id='number'><i class="fa-solid fa-loader fa-spin fa-fw" aria-hidden="true"></i></span></span> <%= item.type.visitcounter.sitepv.unit %></div>
-          <% } %>
+          <div>
+            <span id="busuanzi_value_site_pv">
+              <i class="fa-solid fa-fan fa-spin fa-fw" aria-hidden="true"></i>
+            </span> 
+            <%= item.type.visitcounter.sitepv.unit %>
+          </div>
         </div>
       <% } %>
 

package/layout/friends.ejs

@@ -62,8 +62,8 @@
     <%- page.more %>
     <%- partial('_partial/meta',{post: page, position: 'bottom'}) %>
   </article>
-
+  <% if (page.comments == undefined || page.comments != false) { %>
   <%- partial('_plugins/comments/index',{post: page}) %>
-
+  <% } %>
 </div>
 <%- partial('_partial/side') %>

package/layout/layout.ejs

@@ -13,13 +13,6 @@
     <!-- Custom Files bodyBegin begin-->
     <%- volantis_inject('bodyBegin') %>
     <!-- Custom Files bodyBegin end-->
-    <!-- front-matter body_begin begin -->
-    <%_ if (page.import && page.import.body_begin){ _%>
-      <%_ getList(page.import.body_begin).forEach(function(item){ _%>
-        <%- item %>
-      <%_ }) _%>
-    <%_ } _%>
-    <!-- front-matter body_begin end -->
     <%- partial('_partial/header', null, {cache: false, path: path}) %>
     <div id="l_body">
       <%- partial('_partial/cover') %>
@@ -29,7 +22,7 @@
           <%- partial('_plugins/pjax/pdata') %>
         </div>
         <%- partial('_partial/footer', null, {cache: !config.relative_link}) %>
-        <a id="s-top" class="fa-solid fa-arrow-up fa-fw" href="/" onclick="return false;" title="top"></a>
+        <a id="s-top" class="fa-solid fa-arrow-up fa-fw" title="top"></a>
       </div>
     </div>
     <div>
@@ -48,12 +41,5 @@
     <!-- Custom Files bodyEnd begin-->
     <%- volantis_inject('bodyEnd') %>
     <!-- Custom Files bodyEnd end-->
-    <!-- front-matter body_end begin -->
-    <%_ if (page.import && page.import.body_end){ _%>
-      <%_ getList(page.import.body_end).forEach(function(item){ _%>
-        <%- item %>
-      <%_ }) _%>
-    <%_ } _%>
-    <!-- front-matter body_end end -->
   </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "5.8.1",
+  "version": "6.0.1",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {
@@ -21,9 +21,9 @@
     "url": "https://github.com/volantis-x/hexo-theme-volantis/issues"
   },
   "homepage": "https://volantis.js.org",
-  "devDependencies": {
-    "hexo": "^6.1.0",
-    "hexo-renderer-stylus": "^2.0.1",
+  "dependencies": {
+    "hexo": "^8.1.1",
+    "hexo-renderer-stylus": "^3.0.1",
     "hexo-renderer-ejs": "^2.0.0",
     "hexo-generator-json-content": "^4.2.3"
   }

package/scripts/events/lib/cdn.js

@@ -0,0 +1,206 @@
+/* Getting the version of the theme. */
+const { version } = require('../../../package.json');
+const theme_version = version;
+const path = require('path')
+const site_root = hexo.config.root;
+// _cdn.yml
+/* It's reading the `_cdn.yml` file in the theme directory. */
+const cdn_info = hexo.render.renderSync({ path: path.join(hexo.theme_dir, '/_cdn.yml'), engine: 'yaml' })
+
+/**
+ * If the item is an object and not an array, then it's an object.
+ * @param item - The item to test.
+ */
+function isObject(item) {
+  return item && typeof item === 'object' && !Array.isArray(item);
+}
+
+/**
+ * It takes two objects and merges the second object into the first object
+ * @param target - The object that will be modified.
+ * @param source - The object to merge into the target.
+ * @returns The merged object.
+ */
+function merge(target, source) {
+  for (const key in source) {
+    if (isObject(target[key]) && isObject(source[key])) {
+      merge(target[key], source[key]);
+    } else {
+      target[key] = source[key];
+    }
+  }
+  return target;
+}
+
+// volantis_cdn_system_prefix
+// 在本配置文件中 匹配以 "volantis-local/npm/static/cdnjs" 开头的链接路径替换为该格式的前缀开头 prefix
+/**
+ * It will replace the prefix of the source with the prefix you set in the configuration file
+ * @param source - the source object to be processed
+ * @param hexo - The hexo object.
+ */
+function volantis_cdn_system_prefix(source, hexo) {
+  const prefix_list = ["local", "npm", "static", "cdnjs"];
+  for (const key in source) {
+    if (isObject(source[key])) {
+      volantis_cdn_system_prefix(source[key], hexo);
+    } else if (source[key] && typeof source[key] == "string") {
+      for (const prefix of prefix_list) {
+        if (source[key].match(new RegExp(`^volantis-${prefix}\/`, "g"))) {
+          const my_prefix = hexo.theme.config.cdn_system.system_config[prefix].prefix.replace(/\$\{site_root\}/g, site_root)
+          source[key] = my_prefix + source[key].replace(new RegExp(`^volantis-${prefix}`, "g"), "")
+          break;
+        }
+      }
+    } else if (source[key] && Array.isArray(source[key]) && source[key].length > 0) {
+      source[key].forEach((item, index) => {
+        if (item && typeof item == "string") {
+          for (const prefix of prefix_list) {
+            if (item.match(new RegExp(`^volantis-${prefix}\/`, "g"))) {
+              const my_prefix = hexo.theme.config.cdn_system.system_config[prefix].prefix.replace(/\$\{site_root\}/g, site_root)
+              source[key][index] = my_prefix + item.replace(new RegExp(`^volantis-${prefix}`, "g"), "")
+              break;
+            }
+          }
+        } else if (isObject(item)) {
+          volantis_cdn_system_prefix(item, hexo);
+        }
+      })
+    }
+  }
+}
+
+/**
+ * It takes a file name and returns the same file name with the extension replaced with `.min` if the
+ * file name doesn't already end with `.min`
+ * @param file - The file name to be minified.
+ * @returns The file name with the extension replaced with .min.ext
+ */
+const minFile = (file) => {
+  return file.replace(/(?<!\.min)\.(js|css)$/g, ext => '.min' + ext)
+}
+
+// 匹配 CDN 资源
+/**
+ * `match_cdn_source` is a function that takes a key as an argument and returns the CDN source of the
+ * corresponding key.
+ * 
+ * The function first checks if the key is valid and if the corresponding CDN source exists. If so, it
+ * will then check the priority of the CDN source. If the priority is `custom`, it will check if the
+ * custom CDN source exists. If the priority is not `custom`, it will check if the corresponding CDN
+ * source is enabled. If so, it will then return the CDN source.
+ * 
+ * The `format` variable is the format of the CDN source. The `value` variable is the value of the CDN
+ * source. The `value` variable is a JavaScript object that contains the following properties:
+ * 
+ * - `version`: the version of the CDN source
+ * - `name`: the name of the CDN source
+ * -
+ * @param key - The name of the library in the _cdn.yml file.
+ * @returns The return value is a string.
+ */
+function match_cdn_source(key) {
+  if (key && cdn_info[key]) {
+    // _cdn.yml item
+    const info = cdn_info[key];
+    const system_config = hexo.theme.config.cdn_system.system_config;
+    for (const iterator of hexo.theme.config.cdn_system.priority) {
+      // priority item
+      if (iterator === "custom") {
+        if (system_config.custom) {
+          const r = system_config.custom[key];
+          if (r) {
+            return r;
+          }
+        }
+      } else {
+        if (info[iterator] === true) {
+          const prefix = system_config[iterator].prefix?.replace(/\$\{site_root\}/g, site_root);
+          const format = system_config[iterator].format;
+          let name = info.name;
+          let file = info.file;
+          if (iterator === "cdnjs") {
+            if (info.cdnjs_name) {
+              name = info.cdnjs_name;
+            }
+            if (info.cdnjs_file) {
+              file = info.cdnjs_file;
+            } else {
+              file = file.replace(/^[lib|dist]*\/|browser\//g, '');
+            }
+          }
+          if (info.local === true) {
+            file = file.replace(/^source\//g, '')
+          }
+          let min_file = minFile(file)
+          if (iterator === "cdnjs") {
+            if (info.cdnjs_no_min_file) {
+              min_file = file;
+            }
+          }
+          let version = info.version;
+          if (info.local === true) {
+            version = theme_version
+          }
+          const timestamp = hexo.theme.config.getStartTime;
+          const value = {
+            version,
+            name,
+            file,
+            min_file,
+            prefix,
+            timestamp,
+          }
+          let res = format;
+          let p = 0;
+          while (/\$\{(.+?)\}/g.test(res)) {
+            res = res?.replace(/\$\{(.+?)\}/g, (match, $1) => value[$1] ? value[$1] : eval($1)) || null
+            // 防止死循环。。。
+            p++;
+            if (p > 20) {
+              break;
+            }
+          }
+          return res
+        }
+      }
+    }
+  }
+  return null;
+}
+
+// 收集 CDN 资源
+/**
+ * `hexo.theme.config.cdn` is an object that contains the CDN source for each library.
+ * 
+ * The `cdn_info` object is defined in the `_cdn.yml` file. It contains the name of the library, the
+ * version, and the CDN source etc.
+ * 
+ * The `match_cdn_source` function returns the CDN source for
+ * the library.
+ * 
+ * The `collect_cdn_source` function is called in the `_cdn.yml` file. It loops through the
+ * `cdn_info` object and adds the CDN source for each library to the `hexo.theme.config.cdn` object.
+ * 
+ * The `hexo.theme.config.debug` variable is defined in the `_config.yml` file. It is set to `true`
+ */
+function collect_cdn_source() {
+  hexo.theme.config.cdn = {}
+  Object.keys(cdn_info).forEach(e => {
+    hexo.theme.config.cdn[e] = match_cdn_source(e)
+  })
+  if (hexo.theme.config.debug == "cdn")
+    console.log(hexo.theme.config.cdn);
+}
+
+hexo.on('generateBefore', () => {
+  /* It's replacing the prefix of the source with the prefix you set in the configuration file. */
+  volantis_cdn_system_prefix(hexo.theme.config, hexo);
+  // 可以在 source/_data/cdn.yml 覆盖 theme/_cdn.yml
+  const data = hexo.locals.get('data');
+  if (data.cdn) {
+    merge(cdn_info, data.cdn);
+  }
+  /* Collecting the CDN source for each library. */
+  collect_cdn_source();
+});

package/scripts/events/lib/check-configuration.js

@@ -1,4 +1,4 @@
-module.exports =(hexo) => {
+module.exports = (hexo) => {
   try {
     let config = hexo.config;
     let themeConfig = hexo.theme.config;
@@ -17,9 +17,9 @@ description主要用于SEO，告诉搜索引擎一个关于您站点的简单描
 see: https://hexo.io/zh-cn/docs/configuration
 description is not configured!`);
     }
-    if (themeConfig?.search?.service===`google`||themeConfig?.search?.service===`algolia`||themeConfig?.search?.service===`azure`||themeConfig?.search?.service===`baidu`) {
-      return `原 google, algolia, azure, baidu 站内搜索 系祖传代码, 且文档丢失, 不便后续维护 在 5.0 版本被移除
-The google, algolia, azure, baidu site search is ancestral code, and the document is lost, which is inconvenient for subsequent maintenance. It was removed in version 5.0
+    if (themeConfig?.search?.service === `google` || themeConfig?.search?.service === `azure` || themeConfig?.search?.service === `baidu`) {
+      return `原 google, azure, baidu 站内搜索 系祖传代码, 且文档丢失, 不便后续维护 在 5.0 版本被移除
+The google, azure, baidu site search is ancestral code, and the document is lost, which is inconvenient for subsequent maintenance. It was removed in version 5.0
 see: https://volantis.js.org/v5/theme-settings/#站内搜索`
     }
     if (`backstretch` in themeConfig?.plugins) {
@@ -27,17 +27,17 @@ see: https://volantis.js.org/v5/theme-settings/#站内搜索`
 jquery.backstretch was removed in version 5.0, replaced by parallax
 see: https://volantis.js.org/v5/theme-settings/#幻灯片背景-视差滚动效果`
     }
-    if ("valinecount" in themeConfig?.article?.body?.top_meta||"valinecount" in themeConfig?.article?.body?.bottom_meta||"valinecount" in themeConfig?.article?.body?.meta_library) {
+    if ("valinecount" in themeConfig?.article?.body?.top_meta || "valinecount" in themeConfig?.article?.body?.bottom_meta || "valinecount" in themeConfig?.article?.body?.meta_library) {
       return `ValineCount 在 5.0 版本被移除
 ValineCount has been removed in version 5.0
 see: https://volantis.js.org/v5/theme-settings/#文章布局配置`
     }
-    if (themeConfig?.comments?.service=="valine"||themeConfig?.comments?.service=="minivaline") {
+    if (themeConfig?.comments?.service == "valine" || themeConfig?.comments?.service == "minivaline") {
       return `Valine 在 5.0 版本被移除
 Valine has been removed in version 5.0
 see: https://volantis.js.org/v5/theme-settings/#选择评论系统`
     }
-  } catch (error) {}
+  } catch (error) { }
   hexo.log.info(`Check environment configuration success!`);
   return true;
 };

package/scripts/events/lib/check-environment.js

@@ -1,41 +1,41 @@
 // 环境配置检查可以避免一些奇葩的报错
 
 const exec = require('child_process').exec;
-module.exports =(hexo) => {
+module.exports = (hexo) => {
   if (!hexo.checkEnvironment) {
-    hexo.checkEnvironment=1;
+    hexo.checkEnvironment = 1;
     hexo.log.info(`Checking environment configuration...`);
 
     // Checking environment
     exec('node -v', (err, stdout, stderr) => {
       if (err) {
-        CheckError(hexo,`node.js: ${err}`);
+        CheckError(hexo, `node.js: ${err}`);
       }
       let nodeVersion = stdout.match(/v(\d*)/)[1];
-      if (nodeVersion<16) {
+      if (nodeVersion < 16) {
         hexo.log.info(`node.js 版本：${stdout}`);
-        CheckError(hexo,`node.js 版本过低，请升级至 v16.x 及以上版本！`);
-      }else{
+        CheckError(hexo, `node.js 版本过低，请升级至 v16.x 及以上版本！`);
+      } else {
         exec('hexo -v', (err, stdout, stderr) => {
           if (err) {
-            CheckError(hexo,`hexo-cli: ${err}`);
+            CheckError(hexo, `hexo-cli: ${err}`);
           }
           let hexoVersion1 = stdout.match(/hexo:\s*(\d*)/)[1];
           let hexoVersion2 = stdout.match(/hexo:\s*\d*\.(\d*)/)[1];
-          if (hexoVersion1<5 || (hexoVersion1==5 && hexoVersion2<4)) {
+          if (hexoVersion1 < 5 || (hexoVersion1 == 5 && hexoVersion2 < 4)) {
             hexo.log.info(`hexo  版本：${stdout}`);
-            CheckError(hexo,`hexo 版本过低，请升级至 5.4 以上版本！`);
-          }else{
+            CheckError(hexo, `hexo 版本过低，请升级至 5.4 以上版本！`);
+          } else {
             let hexoClVersion1 = stdout.match(/hexo-cli:\s*(\d*)/)[1];
             let hexoClVersion2 = stdout.match(/hexo-cli:\s*\d*\.(\d*)/)[1];
-            if (hexoClVersion1<4 || (hexoClVersion1==4 && hexoClVersion2<1)) {
+            if (hexoClVersion1 < 4 || (hexoClVersion1 == 4 && hexoClVersion2 < 1)) {
               hexo.log.info(`hexo-cli 版本：${stdout}`);
-              CheckError(hexo,`hexo-cli 版本过低，请升级至 4.1 以上版本！`);
-            }else{
+              CheckError(hexo, `hexo-cli 版本过低，请升级至 4.1 以上版本！`);
+            } else {
               // Checking configuration
               let checkConfiguration = require('./check-configuration')(hexo);
-              if (checkConfiguration!==true) {
-                CheckConfError(hexo,checkConfiguration);
+              if (checkConfiguration !== true) {
+                CheckConfError(hexo, checkConfiguration);
               }
             }
           }
@@ -45,7 +45,7 @@ module.exports =(hexo) => {
   }
 };
 
-function CheckError(hexo,msg) {
+function CheckError(hexo, msg) {
   hexo.log.error(`
 ============================================================
 环境配置检查失败！| Environment configuration check failed!
@@ -65,7 +65,7 @@ debug: env
   throw new Error('环境配置检查失败！| Environment configuration check failed!');
 }
 
-function CheckConfError(hexo,msg) {
+function CheckConfError(hexo, msg) {
   hexo.log.error(`
 ============================================================
 配置文件检查失败！| Configuration check failed!

package/scripts/events/lib/config.js

@@ -17,29 +17,6 @@ function merge(target, source) {
   return target;
 }
 
-// volantis_static_cdn
-function volantis_static_cdn(source,hexo) {
-  for (const key in source) {
-    if (isObject(source[key])) {
-      volantis_static_cdn(source[key],hexo);
-    } else if(source[key] && typeof source[key] =="string") {
-      if(source[key].match(/^volantis-static\//g)){
-        source[key] = hexo.theme.config.volantis_static_cdn + source[key].replace(/^volantis-static\//g,"")
-      }
-    } else if(source[key] && Array.isArray(source[key]) && source[key].length>0) {
-      source[key].forEach((item,index)=>{
-        if(item && typeof item =="string") {
-          if(item.match(/^volantis-static\//g)){
-            source[key][index] = hexo.theme.config.volantis_static_cdn + item.replace(/^volantis-static\//g,"")
-          }
-        }else if (isObject(item)){
-          volantis_static_cdn(item,hexo);
-        }
-      })
-    }
-  }
-}
-
 module.exports = hexo => {
   if (!hexo.locals.get) return;
 
@@ -86,6 +63,5 @@ module.exports = hexo => {
       mergeLang(language);
     }
   }
-  volantis_static_cdn(hexo.theme.config,hexo);
   hexo.theme.config.info.theme_version = version;
 };

package/scripts/events/lib/render-stylus.js

@@ -69,10 +69,10 @@ function merge(target, source) {
   }
   return target;
 }
-function getType(file){
-  var filename=file;
-  var index1=filename.lastIndexOf(".");
-  var index2=filename.length;
-  var type=filename.substring(index1+1,index2);
+function getType(file) {
+  var filename = file;
+  var index1 = filename.lastIndexOf(".");
+  var index2 = filename.length;
+  var type = filename.substring(index1 + 1, index2);
   return type;
 }