fix: 修復首頁文章 valine 評論數只顯示第一篇的 bug

fix: 修復子目錄下，第三方插件本地資源無法加載的 bug closed #908
fix: 評論系統開啟時 busuanzi 的 page_pv 不顯示的 bug closed #902
fix: 修復 pjax 下，使用 mermaid 跳轉會重新加載的 bug

README.md

@@ -9,7 +9,7 @@
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.3.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)

README_CN.md

@@ -9,7 +9,7 @@
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/master?color=%231ab1ad&label=master)
 ![master version](https://img.shields.io/github/package-json/v/jerryc127/hexo-theme-butterfly/dev?label=dev)
 ![https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff](https://img.shields.io/npm/v/hexo-theme-butterfly?color=%09%23bf00ff)
-![hexo version](https://img.shields.io/badge/hexo-5.0+-0e83c)
+![hexo version](https://img.shields.io/badge/hexo-5.3.0+-0e83c)
 ![license](https://img.shields.io/github/license/jerryc127/hexo-theme-butterfly?color=FF5531)
 
 ![](https://cdn.jsdelivr.net/gh/jerryc127/CDN@m2/img/theme-butterfly-readme.png)

layout/includes/header/post-info.pug

@@ -76,6 +76,10 @@
             if theme.twikoo.visitor
               +pvBlock('','','')
                 span#twikoo_visitors
+          default
+            if theme.busuanzi.page_pv
+              +pvBlock('','post-meta-pv-cv','')
+                span#busuanzi_value_page_pv
       else if theme.busuanzi.page_pv
         +pvBlock('','post-meta-pv-cv','')
           span#busuanzi_value_page_pv

layout/includes/third-party/card-post-count/twikoo.pug

@@ -28,7 +28,7 @@ script.
         if (typeof twikoo === 'object') {
           runTwikoo()
         } else {
-          getScript('!{theme.asset.twikoo}').then(runTwikoo)
+          getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
         }
     }
 

layout/includes/third-party/card-post-count/valine.pug

@@ -6,8 +6,8 @@ script.
           el: '#vcomment',
           appId: '#{theme.valine.appId}',
           appKey: '#{theme.valine.appKey}',
+          serverURLs: '#{theme.valine.serverURLs}'
         }
-        
         const valine = new Valine(initData)
       }
 

layout/includes/third-party/comments/twikoo.pug

@@ -15,13 +15,15 @@ script.
     }
 
     const getCount = () => {
+      const countELement = document.getElementById('twikoo-count')
+      if(!countELement) return
       twikoo.getCommentsCount({
         envId: '!{envId}',
         region: '!{region}',
         urls: [window.location.pathname],
         includeReply: false
       }).then(function (res) {
-        document.getElementById('twikoo-count').innerText = res[0].count
+        countELement.innerText = res[0].count
       }).catch(function (err) {
         console.error(err);
       });
@@ -37,7 +39,7 @@ script.
         setTimeout(runFn,0)
         return
       } 
-      getScript('!{theme.asset.twikoo}').then(runFn)
+      getScript('!{url_for(theme.asset.twikoo)}').then(runFn)
     }
 
     if ('!{use[0]}' === 'Twikoo' || !!{lazyload}) {

layout/includes/third-party/math/katex.pug

@@ -1,6 +1,6 @@
-link(rel="stylesheet" type="text/css" href=theme.asset.katex)
+link(rel="stylesheet" type="text/css" href=url_for(theme.asset.katex))
 script(src=url_for(theme.asset.katex_copytex))
-link(rel="stylesheet" type="text/css" href=theme.asset.katex_copytex_css)
+link(rel="stylesheet" type="text/css" href=url_for(theme.asset.katex_copytex_css))
 script.
   (() => {
     document.querySelectorAll('#article-container span.katex-display').forEach(item => {

layout/includes/third-party/math/mathjax.pug

@@ -37,7 +37,7 @@ script.
     }
     
     const script = document.createElement('script')
-    script.src = '!{theme.asset.mathjax}'
+    script.src = '!{url_for(theme.asset.mathjax)}'
     script.id = 'MathJax-script'
     script.async = true
     document.head.appendChild(script)

layout/includes/third-party/math/mermaid.pug

@@ -18,7 +18,7 @@ script.
       }
 
       const loadMermaid = () => {
-        window.loadMermaid ? runMermaid() : getScript('!{theme.asset.mermaid}').then(runMermaid)
+        window.loadMermaid ? runMermaid() : getScript('!{url_for(theme.asset.mermaid)}').then(runMermaid)
       }
 
       window.pjax ? loadMermaid() : document.addEventListener('DOMContentLoaded', loadMermaid)

layout/includes/third-party/newest-comments/twikoo-comment.pug

@@ -43,7 +43,7 @@ script.
       if (typeof twikoo === 'object') {
         runTwikoo()
       } else {
-        getScript('!{theme.asset.twikoo}').then(runTwikoo)
+        getScript('!{url_for(theme.asset.twikoo)}').then(runTwikoo)
       }
     }
 

layout/includes/third-party/pjax.pug

@@ -3,7 +3,7 @@ if theme.pjax.exclude
   each val in theme.pjax.exclude
     - pjaxExclude = pjaxExclude + `:not([href="${val}"])`
 
-- let pjaxSelectors = ['title','#config-diff','#body-wrap','#rightside-config-hide','#rightside-config-show','.js-pjax']
+- let pjaxSelectors = ['head > title','#config-diff','#body-wrap','#rightside-config-hide','#rightside-config-show','.js-pjax']
 
 - let choose = theme.comments.use
 if choose

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

scripts/events/config.js

@@ -104,7 +104,7 @@ hexo.extend.filter.register('before_generate', () => {
           const data = path.join(hexo.plugin_dir,'hexo-butterfly-extjs/plugins.yml')
           result = hexo.render.renderSync({ path: data, engine: 'yaml'})
           Object.keys(result).map(key => {
-            result[key] = 'pluginsSrc/' + result[key]
+            result[key] = '/pluginsSrc/' + result[key]
           })
         } catch (e) {}
         return result

scripts/events/init.js

@@ -4,9 +4,9 @@ hexo.extend.filter.register('before_generate', () => {
   // Get first two digits of the Hexo version number
   const hexoVer = hexo.version.replace(/(^.*\..*)\..*/, '$1')
 
-  if (hexoVer < 5) {
-    logger.error('Please update Hexo to V5.0.0 or higher!')
-    logger.error('請把 Hexo 升級到 V5.0.0 或更高的版本！')
+  if (hexoVer < 5.3) {
+    logger.error('Please update Hexo to V5.3.0 or higher!')
+    logger.error('請把 Hexo 升級到 V5.3.0 或更高的版本！')
     process.exit(-1)
   }
 

source/css/_search/local-search.styl

@@ -51,7 +51,7 @@
           color: $search-color
 
       .search-result
-        margin: 0 0 8px
+        margin: 0 8px 8px 0
         word-break: break-all
 
       .search-keyword