Update Hexo Theme Butterfly DEV

ccknbc-actions · Nov 20, 2024 · 17b3250 · 17b3250
2 parents 0c084d1 + 95ca687
commit 17b3250
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 37 deletions.
diff --git a/layout/includes/header/post-info.pug b/layout/includes/header/post-info.pug
@@ -60,49 +60,38 @@
           if block
             block
 
-      - const commentUse = comments && comments.use && comments.use[0]
-      if page.comments !== false && commentUse && !comments.lazyload
-        - let handled = false
+      mixin otherPV()
+        if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.page_pv
+          +pvBlock('', '', '')
+            span#umamiPV(data-path=url_for(page.path))
+              i.fa-solid.fa-spinner.fa-spin
+        else if theme.busuanzi.page_pv
+          +pvBlock('', 'post-meta-pv-cv', '')
+            span#busuanzi_value_page_pv
+              i.fa-solid.fa-spinner.fa-spin
 
+      - const commentUse = comments.use && comments.use[0]
+      if page.comments !== false && commentUse && !comments.lazyload
         if commentUse === 'Valine' && theme.valine.visitor
           +pvBlock(url_for(page.path), 'leancloud_visitors', page.title)
             span.leancloud-visitors-count
               i.fa-solid.fa-spinner.fa-spin
-          - handled = true
         else if commentUse === 'Waline' && theme.waline.pageview
           +pvBlock('', '', '')
             span.waline-pageview-count(data-path=url_for(page.path))
               i.fa-solid.fa-spinner.fa-spin
-          - handled = true
         else if commentUse === 'Twikoo' && theme.twikoo.visitor
           +pvBlock('', '', '')
             span#twikoo_visitors
               i.fa-solid.fa-spinner.fa-spin
-          - handled = true
         else if commentUse === 'Artalk' && theme.artalk.visitor
           +pvBlock('', '', '')
             span#ArtalkPV
               i.fa-solid.fa-spinner.fa-spin
-          - handled = true
-
-        if !handled
-          if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.page_pv
-            +pvBlock('', '', '')
-              span#umamiPV(data-path=url_for(page.path))
-                i.fa-solid.fa-spinner.fa-spin
-          else if theme.busuanzi.page_pv
-            +pvBlock('', 'post-meta-pv-cv', '')
-              span#busuanzi_value_page_pv
-                i.fa-solid.fa-spinner.fa-spin
+        else
+          +otherPV()
       else
-        if theme.umami_analytics.enable && theme.umami_analytics.UV_PV.page_pv
-          +pvBlock('', '', '')
-            span#umamiPV(data-path=url_for(page.path))
-              i.fa-solid.fa-spinner.fa-spin
-        else if theme.busuanzi.page_pv
-          +pvBlock('', 'post-meta-pv-cv', '')
-            span#busuanzi_value_page_pv
-              i.fa-solid.fa-spinner.fa-spin
+        +otherPV()
 
       if comments.count && !comments.lazyload && page.comments !== false && comments.use
         - var whichCount = comments.use[0]

diff --git a/layout/includes/page/shuoshuo.pug b/layout/includes/page/shuoshuo.pug
@@ -41,9 +41,12 @@
                           ${item.content}
                         </div>
                         <div class="shuoshuo-footer">
-                          <div class="shuoshuo-tags">
-                            ${item.tags.map(tag => `<span class="shuoshuo-tag">${tag}</span>`).join('')}
-                          </div>
+                          ${item.tags && item.tags.length ? `
+                            <div class="shuoshuo-footer">
+                              <div class="shuoshuo-tags">
+                                ${item.tags.map(tag => `<span class="shuoshuo-tag">${tag}</span>`).join('')}
+                              </div>
+                          </div>` : ''}
                         </div>
                       </div>
                       `
@@ -98,6 +101,7 @@
           .shuoshuo-content
             !=markdown(i.content)
           .shuoshuo-footer
-            .shuoshuo-tags
-              each tag in i.tags
-                span.shuoshuo-tag=tag
+            if i.tags
+              .shuoshuo-tags
+                each tag in i.tags
+                  span.shuoshuo-tag=tag
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "5.0.0",
+  "version": "5.1.0-b1",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

diff --git a/plugins.yml b/plugins.yml
@@ -8,8 +8,8 @@ activate_power_mode:
   version: 1.1.4
 algolia_search:
   name: algoliasearch
-  file: dist/algoliasearch-lite.umd.js
-  version: 5.7.0
+  file: dist/lite/builds/browser.umd.js
+  version: 5.8.1
 aplayer_css:
   name: aplayer
   file: dist/APlayer.min.css
@@ -111,7 +111,7 @@ instantpage:
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.74.2
+  version: 4.75.0
 katex:
   name: katex
   file: dist/katex.min.css
@@ -137,7 +137,7 @@ medium_zoom:
 mermaid:
   name: mermaid
   file: dist/mermaid.min.js
-  version: 11.2.1
+  version: 11.3.0
 meting_js:
   name: butterfly-extsrc
   file: metingjs/dist/Meting.min.js

diff --git a/source/css/_search/algolia.styl b/source/css/_search/algolia.styl
@@ -59,6 +59,7 @@
           height: 24px
           text-align: center
           line-height: 24px
+          addBorderRadius()
 
       .ais-Pagination-item--selected
         a

diff --git a/source/js/search/algolia.js b/source/js/search/algolia.js
@@ -85,9 +85,10 @@ window.addEventListener('load', () => {
     document.querySelector('#algolia-info .algolia-stats')
   ]
 
+  const searchClient = typeof algoliasearch === 'function' ? algoliasearch : window['algoliasearch/lite'].liteClient
   const search = instantsearch({
     indexName,
-    searchClient: algoliasearch(appId, apiKey),
+    searchClient: searchClient(appId, apiKey),
     searchFunction (helper) {
       disableDiv.forEach(item => {
         item.style.display = helper.state.query ? '' : 'none'