fix merge conflict

fix：侧边栏归档卡片自定义排序异常

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,61 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!-- Do not delete the template (不要刪除模板) -->
-
-<!--
-IMPORTANT: Please follow the template to create a new issue.
-重要：請依照該模板來提交。
-
-If you upgrade from the old version, and an error occurs when running, please copy the new content in the config to the butterfly.yml
-如果你是由舊版本升級到新版，執行時出現報錯，請首先把config裡新的內容複製到舊的butterfly設定去(如有)
-
-If you are a problem when visiting the website, please open your browser 'developer tools (shortcut F12)' and check the console if there is an error, include your website address in the feedback
-如果你是線上訪問出現問題，請檢查瀏覽器‘開發人員工具（快捷鍵F12）’的console是否有報錯，反饋時附上你的網站
--->
-
-
-## I want to create a Bug report <!-- 我想要建立一個 Bug report --> 
-
-<!-- Check all with "x" especially FAQ & Documentation!! (使用 "x" 選擇) -->
-<!-- 請確認是否都已經翻閲過如下的資料, 尤其是安裝文件！！ -->
-- [] Yes, I have read [Hexo Docs page](https://hexo.io/docs/), especially [Templates](https://hexo.io/docs/templates.html), [Variables](https://hexo.io/docs/variables.html), [Helpers](https://hexo.io/docs/helpers.html) and [Troubleshooting](https://hexo.io/docs/troubleshooting.html).
-- [] Yes, I have read [Butterfly Documentation](https://butterfly.js.org/posts/21cfbf15/).
-- [] And yes, I already searched for current [issues](https://github.com/jerryc127/hexo-theme-butterfly/issues?utf8=%E2%9C%93&q=is%3Aissue) and this did not help me.
-
-## Butterfly Information
-
-<!-- Butterfly的版本 -->
-<!-- 檢視主題的package.json -->
-**Butterfly Version:**
-
-<!-- Windows/macOS/Linux/Android/iOS -->
-**Platform:**
-
-<!-- Chrome/Safari/FireFox/.. -->
-**Browser:**
-
-## Expected behavior <!-- (預期行為) -->
-
-## Actual behavior <!-- (實際行為) -->
-
-## Steps to reproduce the behavior <!-- (重現步驟) -->
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-<!-- If applicable, add screenshots to help explain your problem -->
-<!-- 請儘量提供截圖來定位問題 -->
-## Screenshots <!-- (截圖) -->
-
-<!-- Provide your website to find the issues -->
-## Website
-
-## Describe the bug

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,63 @@
+name: Bug report
+description: Create a report to help us improve
+title: '[Bug]: '
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        重要：請依照該模板來提交 
+        Please follow the template to create a new issue
+  - type: input
+    id: butterfly-ver
+    attributes:
+      label: 使用的 Butterfly 版本？ | What version of Butterfly are you use?
+      description: 檢視主題的 package.json | Check the theme's package.json
+    validations:
+      required: true
+
+  - type: dropdown
+    id: browser
+    attributes:
+      label: 使用的瀏覽器？ || What browse are you using?
+      options:
+        - Chrome
+        - Edge
+        - Safari
+        - Opera
+        - Other
+    validations:
+      required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 使用的系統？ || What operating system are you using?
+      options:
+        - Windows
+        - macOS 
+        - Linux
+        - Android
+        - iOS
+        - Other
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: 問題描述 | Describe the bug
+      description: 請描述你的問題現象 | A clear and concise description of what the bug is.
+      placeholder: 請儘量提供截圖來定位問題 | If applicable, add screenshots to help explain your problem
+      value:
+    validations:
+      required: true
+
+  - type: input
+    id: website
+    attributes:
+      label: 出現問題網站 | Website
+      description: 請提供下可復現網站地址 | Please supply a website url which can reproduce problem.
+      placeholder:
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,22 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions about Butterfly
+    url: https://github.com/jerryc127/hexo-theme-butterfly/discussions
+    about: 一些使用問題請到 Discussion 詢問。 Please ask questions in Discussion.
+
+  - name: Butterfly Q&A
+    url: https://butterfly.js.org/posts/98d20436/
+    about: Butterfly Q&A
+
+  - name: Telegram
+    url: https://t.me/bu2fly
+    about: 'Official Telegram Group'
+
+  - name: QQ 1群
+    url: https://jq.qq.com/?_wv=1027&k=KU9105XR
+    about: '群號 1070540070，不要兩個Q群都添加'
+
+  - name: QQ 2群
+    url: https://jq.qq.com/?_wv=1027&k=r1nK0DQz
+    about: '群號 978221020，不要兩個Q群都添加'
+

.github/ISSUE_TEMPLATE/custom.md

@@ -1,9 +0,0 @@
----
-name: Custom issue template
-about: Describe this issue template's purpose here.
-title: ''
-labels: ''
-assignees: ''
----
-
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,14 @@
+name: Feature request
+description: Suggest an idea for this project
+title: '[Feature]: '
+
+body:
+  - type: textarea
+    id: feature-request
+    attributes:
+      label: 想要的功能 | What feature do you want?
+      description: 請描述你需要的新功能 | A clear and concise description of what the feature is.
+      placeholder:
+      value:
+    validations:
+      require: true

.github/stale.yml

@@ -10,7 +10,7 @@ exemptLabels:
   - enhancement
   - documentation 
 # Label to use when marking an issue as stale
-staleLabel: wontfix
+staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had

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)
@@ -79,7 +79,7 @@ npm i hexo-theme-butterfly
 - [x] Related articles
 - [x] Displays outdated notice for a post
 - [x] Share (AddThis/Sharejs/Addtoany)
-- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus)
+- [X] Comment (Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42)
 - [x] Multiple Comment System Support
 - [x] Online Chats (Chatra/Tidio/Daovoice/Gitter/Crisp)
 - [x] Web analytics

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)
@@ -79,7 +79,7 @@ theme: butterfly
 - [x] 顯示相關文章
 - [x] 過期文章提醒
 - [x] 多種分享系統（AddThis/Sharejs/Addtoany）
-- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus）
+- [X] 多種評論系統（Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42）
 - [x] 支持雙評論部署
 - [x] 多種在線聊天（Chatra/Tidio/Daovoice/Gitter/Crisp）
 - [x] 多種分析系統

_config.yml

@@ -39,6 +39,7 @@ social:
   # fas fa-envelope: mailto:xxxxxx@gmail.com || Email
 
 # search (搜索)
+# see https://butterfly.js.org/posts/ceeb73f/#搜索系統
 # --------------------------------------
 
 # Algolia search
@@ -50,6 +51,8 @@ algolia_search:
 # Local search
 local_search:
   enable: false
+  preload: false
+  CDN:
 
 # Math (數學)
 # --------------------------------------
@@ -148,6 +151,7 @@ post_meta:
     label: true # true or false 顯示描述性文字
 
 # wordcount (字數統計)
+# see https://butterfly.js.org/posts/ceeb73f/#字數統計
 wordcount:
   enable: false
   post_wordcount: true
@@ -181,6 +185,7 @@ toc:
 post_copyright:
   enable: true
   decode: false
+  author_href:
   license: CC BY-NC-SA 4.0
   license_url: https://creativecommons.org/licenses/by-nc-sa/4.0/
 
@@ -254,7 +259,7 @@ addtoany:
 
 comments:
   # Up to two comments system, the first will be shown as default
-  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus
+  # Choose: Disqus/Disqusjs/Livere/Gitalk/Valine/Waline/Utterances/Facebook Comments/Twikoo/Giscus/Remark42
   use: # Valine,Disqus
   text: true # Display the comment name next to the button
   # lazyload: The comment system will be load when comment element enters the browser's viewport.
@@ -308,7 +313,7 @@ valine:
 waline:
   serverURL: # Waline server address url
   bg: # waline background
-  visitor: false
+  pageview: false
   option:
 
 # utterances
@@ -349,6 +354,13 @@ giscus:
     dark: dark
   option:
 
+# Remark42
+# https://remark42.com/docs/configuration/frontend/
+remark42:
+  host: # Your Host URL
+  siteId: # Your Site ID
+  option:
+
 # Chat Services
 # --------------------------------------
 
@@ -468,6 +480,8 @@ site_verification:
 #   blockquote_padding_color: "#49b1f5"
 #   blockquote_background_color: "#49b1f5"
 #   scrollbar_color: "#49b1f5"
+#   meta_theme_color_light: "ffffff"
+#   meta_theme_color_dark: "#0d0d0d"
 
 # The top_img settings of home page
 # default: top img - full screen, site info - middle (默認top_img全屏，site_info在中間)
@@ -614,6 +628,10 @@ aside:
   button: true
   mobile: true # display on mobile
   position: right # left or right
+  display:
+    archive: true
+    tag: true
+    category: true
   card_author:
     enable: true
     description:
@@ -827,88 +845,70 @@ inject:
 # Don't modify the following settings unless you know how they work
 # 非必要請不要修改
 CDN:
-  # main
+  # The CDN provider of internal scripts (主題內部 js 的 cdn 配置)
-  main_css:
+  # option: local/jsdelivr/unpkg/cdnjs/custom
-  main:
+  # Dev version can only choose. ( dev版的主題只能設置為 local )
-  utils:
+  internal_provider: local
 
-  # pjax
+  # The CDN provider of third party scripts (第三方 js 的 cdn 配置)
-  pjax:
+  # option: local/jsdelivr/unpkg/cdnjs/custom
+  # when set it to local, you need to install hexo-butterfly-extjs
+  third_party_provider: jsdelivr
 
-  # comments
+  # Add version number to CDN, true or false  
-  gitalk:
+  version: false
-  gitalk_css:
-  blueimp_md5:
-  valine:
-  disqusjs:
-  disqusjs_css:
-  utterances:
-  twikoo:
-  waline:
-  giscus:
 
-  # share
+  # Custom format
-  addtoany:
+  # For example: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}
-  sharejs:
+  custom_format:
-  sharejs_css:
 
-  # search
+  option:
-  local_search:
+    # main_css:
-  algolia_js:
+    # main:
-  algolia_search_v4:
+    # utils:
-  instantsearch_v4:
+    # translate:
-
+    # local_search:
-  # math
+    # algolia_js:
-  mathjax:
+    # algolia_search_v4:
-  katex:
+    # instantsearch_v4:
-  katex_copytex:
+    # pjax:
-  katex_copytex_css:
+    # gitalk:
-  mermaid:
+    # gitalk_css:
-
+    # blueimp_md5:
-  # count
+    # valine:
-  busuanzi:
+    # disqusjs:
-
+    # disqusjs_css:
-  # background effect
+    # twikoo:
-  canvas_ribbon:
+    # waline_js:
-  canvas_fluttering_ribbon:
+    # waline_css:
-  canvas_nest:
+    # sharejs:
-
+    # sharejs_css:
-  lazyload:
+    # mathjax:
-  instantpage:
+    # katex:
-  typed:
+    # katex_copytex:
-  pangu:
+    # mermaid:
-
+    # canvas_ribbon:
-  # photo
+    # canvas_fluttering_ribbon:
-  fancybox_css_v4:
+    # canvas_nest:
-  fancybox_v4:
+    # lazyload:
-  medium_zoom:
+    # instantpage:
-
+    # typed:
-  # snackbar
+    # pangu:
-  snackbar_css:
+    # fancybox_css_v4:
-  snackbar:
+    # fancybox_v4:
-
+    # medium_zoom:
-  # effect
+    # snackbar_css:
-  activate_power_mode:
+    # snackbar:
-  fireworks:
+    # activate_power_mode:
-  click_heart:
+    # fireworks:
-  ClickShowText:
+    # click_heart:
-
+    # ClickShowText:
-  # fontawesome
+    # fontawesomeV6:
-  fontawesomeV6:
+    # flickr_justified_gallery_js:
-
+    # flickr_justified_gallery_css:
-  # Conversion between Traditional and Simplified Chinese
+    # aplayer_css:
-  translate:
+    # aplayer_js:
-
+    # meting_js:
-  # flickr-justified-gallery
+    # prismjs_js:
-  flickr_justified_gallery_js:
+    # prismjs_lineNumber_js:
-  flickr_justified_gallery_css:
+    # prismjs_autoloader:
-
-  # aplayer
-  aplayer_css:
-  aplayer_js:
-  meting_js:
-
-  # Prism.js
-  prismjs_js:
-  prismjs_lineNumber_js:
-  prismjs_autoloader:

languages/default.yml

@@ -43,7 +43,6 @@ search:
     hits_stats: '${hits} results found in ${time} ms'
 
   local_search:
-    label: Local search
     input_placeholder: Search for Posts
     hits_empty: "We didn't find any results for the search: ${query}"
 

languages/en.yml

@@ -43,7 +43,6 @@ search:
     hits_stats: '${hits} results found in ${time} ms'
 
   local_search:
-    label: Local search
     input_placeholder: Search for Posts
     hits_empty: "We didn't find any results for the search: ${query}"
 

languages/zh-CN.yml

@@ -44,7 +44,6 @@ search:
     hits_stats: '找到 ${hits} 条结果，用时 ${time} 毫秒'
 
   local_search:
-    label: 本地搜索
     input_placeholder: 搜索文章
     hits_empty: '找不到您查询的内容：${query}'
 

languages/zh-TW.yml

@@ -44,7 +44,6 @@ search:
     hits_stats: '找到 ${hits} 條結果，用時 ${time} 毫秒'
 
   local_search:
-    label: 本地搜尋
     input_placeholder: 搜尋文章
     hits_empty: '找不到您查詢的內容：${query}'
 

layout/archive.pug

@@ -3,6 +3,7 @@ extends includes/layout.pug
 block content
   include ./includes/mixins/article-sort.pug
   #archive
-    .article-sort-title= _p('page.articles') + ' - ' + site.posts.length
+    - const archiveLength = findArchiveLength(fragment_cache)
+    .article-sort-title= _p('page.articles') + ' - ' + archiveLength
     +articleSort(page.posts)
     include includes/pagination.pug

layout/includes/additional-js.pug

@@ -1,34 +1,34 @@
 div
-  script(src=url_for(theme.CDN.utils))
+  script(src=url_for(theme.asset.utils))
-  script(src=url_for(theme.CDN.main))
+  script(src=url_for(theme.asset.main))
 
   if theme.translate.enable
-    script(src=url_for(theme.CDN.translate))
+    script(src=url_for(theme.asset.translate))
 
   if theme.medium_zoom
-    script(src=url_for(theme.CDN.medium_zoom))
+    script(src=url_for(theme.asset.medium_zoom))
   else if theme.fancybox
-    script(src=url_for(theme.CDN.fancybox_v4))
+    script(src=url_for(theme.asset.fancybox_v4))
 
   if theme.instantpage
-    script(src=url_for(theme.CDN.instantpage), type='module')
+    script(src=url_for(theme.asset.instantpage), type='module')
 
   if theme.lazyload.enable
-    script(src=url_for(theme.CDN.lazyload))
+    script(src=url_for(theme.asset.lazyload))
 
   if theme.snackbar.enable
-    script(src=url_for(theme.CDN.snackbar))
+    script(src=url_for(theme.asset.snackbar))
 
   if theme.pangu.enable
     != partial("includes/third-party/pangu.pug", {}, { cache: true })
 
   //- search
   if theme.algolia_search.enable
-    script(src=url_for(theme.CDN.algolia_search_v4))
+    script(src=url_for(theme.asset.algolia_search_v4))
-    script(src=url_for(theme.CDN.instantsearch_v4))
+    script(src=url_for(theme.asset.instantsearch_v4))
-    script(src=url_for(theme.CDN.algolia_js))
+    script(src=url_for(theme.asset.algolia_js))
   else if theme.local_search.enable
-    script(src=url_for(theme.CDN.local_search))
+    script(src=url_for(theme.asset.local_search))
 
   if theme.preloader
     != partial("includes/loading/loading-js", {}, { cache: true })
@@ -69,4 +69,4 @@ div
     != partial("includes/third-party/pjax", {}, { cache: true })
 
   if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
-    script(async data-pjax src=url_for(theme.CDN.busuanzi))
+    script(async data-pjax src='//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')

layout/includes/head.pug

@@ -16,7 +16,9 @@
 - else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
-- var themeColor = theme.display_mode === 'dark' ? '#0d0d0d' : '#ffffff'
+- var themeColorLight = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_light || '#ffffff'
+- var themeColorDark = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_dark || '#0d0d0d'
+- var themeColor = theme.display_mode === 'dark' ? themeColorDark : themeColorLight
 
 meta(charset='UTF-8')
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
@@ -46,14 +48,14 @@ if (theme.pwa && theme.pwa.enable)
   !=partial('includes/head/pwa', {}, {cache: true})
 
 //- main css
-link(rel='stylesheet', href=url_for(theme.CDN.main_css))
+link(rel='stylesheet', href=url_for(theme.asset.main_css))
-link(rel='stylesheet', href=url_for(theme.CDN.fontawesomeV6) media="print" onload="this.media='all'")
+link(rel='stylesheet', href=url_for(theme.asset.fontawesomeV6) media="print" onload="this.media='all'")
 
 if (theme.snackbar && theme.snackbar.enable)
-  link(rel='stylesheet', href=url_for(theme.CDN.snackbar_css) media="print" onload="this.media='all'")
+  link(rel='stylesheet', href=url_for(theme.asset.snackbar_css) media="print" onload="this.media='all'")
 
 if theme.fancybox
-  link(rel='stylesheet' href=url_for(theme.CDN.fancybox_css_v4) media="print" onload="this.media='all'")
+  link(rel='stylesheet' href=url_for(theme.asset.fancybox_css_v4) media="print" onload="this.media='all'")
 
 //- google_adsense
 !=partial('includes/head/google_adsense', {}, {cache: true})

layout/includes/head/config.pug

@@ -19,7 +19,8 @@
   let localSearch = 'undefined';
   if (theme.local_search && theme.local_search.enable) {
     localSearch = JSON.stringify({
-      path: config.search.path,
+      path: theme.local_search.CDN ? theme.local_search.CDN : config.root + config.search.path,
+      preload: theme.local_search.preload,
       languages: {
         // search languages
         hits_empty: _p("search.local_search.hits_empty"),
@@ -113,8 +114,8 @@ script.
     Snackbar: !{Snackbar},
     source: {
       justifiedGallery: {
-        js: '!{url_for(theme.CDN.flickr_justified_gallery_js)}',
+        js: '!{url_for(theme.asset.flickr_justified_gallery_js)}',
-        css: '!{url_for(theme.CDN.flickr_justified_gallery_css)}'
+        css: '!{url_for(theme.asset.flickr_justified_gallery_css)}'
       }
     },
     isPhotoFigcaption: !{theme.photofigcaption},

layout/includes/header/index.pug

@@ -19,7 +19,7 @@ if !theme.disable_top_img && page.top_img !== false
   if top_img !== false
     - var imgSource = top_img && top_img.indexOf('/') !== -1 ? `background-image: url('${url_for(top_img)}')` : `background: ${top_img}`
     - var bg_img = top_img ? imgSource : ''
-    - var site_title = is_archive() ? fragment_cache('findArchivesTitle', function(){return findArchivesTitle(theme.menu);}) : page.title || page.tag || page.category || config.title
+    - var site_title = is_archive() ? findArchivesTitle(page, theme.menu, date) : page.title || page.tag || page.category || config.title
     - var isHomeClass = is_home() ? 'full_page' : 'not-home-page'
     - is_post() ? isHomeClass = 'post-bg' : isHomeClass
   else

layout/includes/header/post-info.pug

@@ -61,16 +61,28 @@
           if block
             block
 
-      if theme.busuanzi.page_pv
+      - const commentUse = comments.use
-        +pvBlock('','post-meta-pv-cv','')
+      if commentUse && !comments.lazyload
-          span#busuanzi_value_page_pv
+        if commentUse[0] === 'Valine' && theme.valine.visitor
-      else if comments.use && !comments.lazyload
-        if (comments.use.includes('Valine') && theme.valine.visitor) || (comments.use.includes('Waline') && theme.waline.visitor)
           +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
             span.leancloud-visitors-count
-        else if (comments.use.includes('Twikoo') && theme.twikoo.visitor)
+              i.fa-solid.fa-spinner.fa-spin
+        else if commentUse[0] === 'Waline' && theme.waline.pageview
+          +pvBlock('','','')
+            span.waline-pageview-count(data-path=url_for(page.path))
+              i.fa-solid.fa-spinner.fa-spin
+        else if commentUse[0] === 'Twikoo' && theme.twikoo.visitor
           +pvBlock('','','')
             span#twikoo_visitors
+              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 if theme.busuanzi.page_pv
+        +pvBlock('','post-meta-pv-cv','')
+          span#busuanzi_value_page_pv
+            i.fa-solid.fa-spinner.fa-spin
 
       if comments.count && !comments.lazyload && page.comments !== false && comments.use
         - var whichCount = comments.use[0]
@@ -85,27 +97,42 @@
         
         case whichCount
           when 'Disqus'
-          when 'Disqusjs'
             +countBlock
               span.disqus-comment-count
                 a(href=full_url_for(page.path) + '#disqus_thread')
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Disqusjs'
+            +countBlock
+              a(href=full_url_for(page.path) + '#disqusjs')
+                span.disqus-comment-count(data-disqus-url=full_url_for(page.path))
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Valine'
             +countBlock
               a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Waline'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
-                span.waline-comment-count(id=url_for(page.path))
+                span.waline-comment-count(data-path=url_for(page.path))
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Gitalk'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.gitalk-comment-count
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Twikoo'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span#twikoo-count
+                  i.fa-solid.fa-spinner.fa-spin
           when 'Facebook Comments'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
-                span.fb-comments-count(data-href=urlNoIndex())
+                span.fb-comments-count(data-href=urlNoIndex())
+                  i.fa-solid.fa-spinner.fa-spin
+          when 'Remark42'
+            +countBlock
+              a(href=url_for(page.path) + '#post-comment')
+                span.remark42__counter(data-url=urlNoIndex())
+                  i.fa-solid.fa-spinner.fa-spin

layout/includes/layout.pug

@@ -1,4 +1,5 @@
 - var htmlClassHideAside = theme.aside.enable && theme.aside.hide ? 'hide-aside' : ''
+- page.aside = is_archive() ? theme.aside.display.archive: is_category() ? theme.aside.display.category : is_tag() ? theme.aside.display.tag : page.aside
 - var hideAside = !theme.aside.enable || page.aside === false ? 'hide-aside' : ''
 - var pageType = is_post() ? 'post' : 'page'
 

layout/includes/mixins/post-ui.pug

@@ -5,7 +5,7 @@ mixin postUI(posts)
         let link = article.link || article.path
         let title = article.title || _p('no_title')
         const position = theme.cover.position
-        let leftOrRight = position === 'both' 
+        let leftOrRight = position === 'both'
           ? index%2 == 0 ? 'left' : 'right'
           : position === 'left' ? 'left' : 'right'
         let post_cover = article.cover
@@ -70,24 +70,38 @@ mixin postUI(posts)
           if theme.comments.card_post_count
             case theme.comments.use[0]
               when 'Disqus'
-              when 'Disqusjs'
                 +countBlockInIndex
                   a(href=full_url_for(link) + '#disqus_thread')
+                    i.fa-solid.fa-spinner.fa-spin
+              when 'Disqusjs'
+                +countBlockInIndex
+                  a(href=full_url_for(link) + '#disqusjs')
+                    span.disqus-comment-count(data-disqus-url=full_url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Valine'
                 +countBlockInIndex
-                  a(href=url_for(link) + '#post-comment' itemprop="discussionUrl")
+                  a(href=url_for(link) + '#post-comment')
-                    span.valine-comment-count(data-xid=url_for(link) itemprop="commentCount")
+                    span.valine-comment-count(data-xid=url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Waline'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
                     span.waline-comment-count(id=url_for(link))
+                      i.fa-solid.fa-spinner.fa-spin
               when 'Twikoo'
                 +countBlockInIndex
                   a.twikoo-count(href=url_for(link) + '#post-comment')
+                    i.fa-solid.fa-spinner.fa-spin
               when 'Facebook Comments'
                 +countBlockInIndex
                   a(href=url_for(link) + '#post-comment')
                     span.fb-comments-count(data-href=urlNoIndex(article.permalink))
+                      i.fa-solid.fa-spinner.fa-spin
+              when 'Remark42'
+                +countBlockInIndex
+                  a(href=url_for(link) + '#post-comment')
+                    span.remark42__counter(data-url=urlNoIndex(article.permalink))
+                      i.fa-solid.fa-spinner.fa-spin
 
         //- Display the article introduction on homepage
         case theme.index_post_content.method

layout/includes/post/post-copyright.pug

@@ -1,8 +1,8 @@
 if theme.post_copyright.enable && page.copyright !== false
-  - let author = page.copyright_author ? page.copyright_author : config.author
+  - let author = page.copyright_author || config.author
-  - let authorHref = page.copyright_author_href ? page.copyright_author_href : `mailto:${config.email}`
+  - let authorHref = page.copyright_author_href || theme.post_copyright.author_href || config.url
-  - let url = page.copyright_url ? page.copyright_url : page.permalink
+  - let url = page.copyright_url || page.permalink
-  - let info = page.copyright_info ? page.copyright_info : _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
+  - let info = page.copyright_info || _p('post.copyright.copyright_content', theme.post_copyright.license_url, theme.post_copyright.license, config.url, config.title)
   .post-copyright
     .post-copyright__author
       span.post-copyright-meta= _p('post.copyright.author') + ": "

layout/includes/sidebar.pug

@@ -3,21 +3,16 @@
   #sidebar-menus
     .avatar-img.is-center
       img(src=url_for(theme.avatar.img) onerror=`onerror=null;src='${theme.error_img.flink}'` alt="avatar")
-    .site-data.is-center
+    .sidebar-site-data.site-data.is-center
-      .data-item
+      a(href=url_for(config.archive_dir) + '/')
-        a(href=url_for(config.archive_dir) + '/')
+        .headline= _p('aside.articles') 
-          .headline= _p('aside.articles') 
+        .length-num= site.posts.length
-          .length-num= site.posts.length
+      a(href=url_for(config.tag_dir) + '/' )
-
+        .headline= _p('aside.tags')
-      .data-item
+        .length-num= site.tags.length
-        a(href=url_for(config.tag_dir) + '/' )
+      a(href=url_for(config.category_dir) + '/')
-          .headline= _p('aside.tags')
+        .headline= _p('aside.categories') 
-          .length-num= site.tags.length
+        .length-num= site.categories.length
-
-      .data-item
-        a(href=url_for(config.category_dir) + '/')
-          .headline= _p('aside.categories') 
-          .length-num= site.categories.length
 
     hr
     !=partial('includes/header/menu_item', {}, {cache: true})

layout/includes/third-party/aplayer.pug

@@ -1,3 +1,3 @@
-link(rel='stylesheet' href=url_for(theme.CDN.aplayer_css) media="print" onload="this.media='all'")
+link(rel='stylesheet' href=url_for(theme.asset.aplayer_css) media="print" onload="this.media='all'")
-script(src=url_for(theme.CDN.aplayer_js))
+script(src=url_for(theme.asset.aplayer_js))
-script(src=url_for(theme.CDN.meting_js))
+script(src=url_for(theme.asset.meting_js))

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

@@ -9,4 +9,6 @@ case theme.comments.use[0]
   when 'Waline'
     include ./waline.pug
   when 'Facebook Comments'
-    include ./fb.pug
+    include ./fb.pug
+  when 'Remark42'
+    include ./remark42.pug

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

@@ -0,0 +1,18 @@
+- const { host, siteId, option } = theme.remark42
+
+script.
+  (()=>{
+    window.remark_config = Object.assign({
+      host: '!{host}',
+      site_id: '!{siteId}',
+    },!{JSON.stringify(option)})
+
+    function getCount () {
+      const s = document.createElement('script')
+      s.src = remark_config.host + '/web/counter.js'
+      s.defer = true
+      document.head.appendChild(s)
+    }
+
+    window.pjax ? getCount() : window.addEventListener('load', getCount)
+  })()

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

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

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

@@ -6,13 +6,14 @@ script.
           el: '#vcomment',
           appId: '#{theme.valine.appId}',
           appKey: '#{theme.valine.appKey}',
+          serverURLs: '#{theme.valine.serverURLs}'
         }
         
         const valine = new Valine(initData)
       }
 
       if (typeof Valine === 'function') initValine() 
-      else getScript('!{url_for(theme.CDN.valine)}').then(initValine)
+      else getScript('!{url_for(theme.asset.valine)}').then(initValine)
     }
 
     window.pjax ? loadValine() : window.addEventListener('load', loadValine)

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

@@ -5,12 +5,13 @@ script.
         let initData = {
           el: null,
           serverURL: '!{theme.waline.serverURL}',
+          comment: true
         }
-        const waline = new Waline(initData)
+        const waline = Waline.init(initData)
       }
 
       if (typeof Waline === 'function') initWaline() 
-      else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
+      else getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
     }
 
     window.pjax ? loadWaline() : window.addEventListener('load', loadWaline)

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

@@ -4,7 +4,7 @@ script.
   function loadDisqus () {
     var disqus_config = function () {
       this.page.url = '!{ page.permalink }'
-      this.page.identifier = '!{ page.path }'
+      this.page.identifier = '!{ url_for(page.path) }'
       this.page.title = '!{ disqusPageTitle }'
     };
 
@@ -24,6 +24,10 @@ script.
         (d.head || d.body).appendChild(s);
       })();
     }
+
+    document.getElementById('darkmode').addEventListener('click', () => {
+      setTimeout(() => window.disqusReset(), 200)
+    })
   }
 
   if ('!{theme.comments.use[0]}' === 'Disqus' || !!{theme.comments.lazyload}) {

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

@@ -5,34 +5,43 @@ script.
     function addDisqusjsCSS () {
       const ele = document.createElement('link')
       ele.rel = 'stylesheet'
-      ele.href= '!{url_for(theme.CDN.disqusjs_css)}'
+      ele.href= '!{url_for(theme.asset.disqusjs_css)}'
       document.getElementsByTagName('head')[0].appendChild(ele)
     }
 
     function initDisqusjs () {
-      window.DISQUS = null
+      window.disqusjs = null
-      new DisqusJS(Object.assign({
+      disqusjs = new DisqusJS(Object.assign({
         shortname: '!{theme.disqusjs.shortname}',
-        identifier: '!{ page.path }',
+        identifier: '!{ url_for(page.path) }',
         url: '!{ page.permalink }',
         title: '!{ disqusjsPageTitle }',
         apikey: '!{theme.disqusjs.apikey}',
       },!{JSON.stringify(theme.disqusjs.option)}))
+
+      disqusjs.render(document.getElementById('disqusjs'))
+    }
+
+    const themeChange = () => {
+      const ele = document.getElementById('disqus_thread')
+      if(!ele) return
+      disqusjs.destroy()
+      initDisqusjs()
     }
 
 
-    window.disqusReset = initDisqusjs
+    document.getElementById('darkmode').addEventListener('click', themeChange)
 
     if (window.disqusJsLoad) initDisqusjs()
     else {
       addDisqusjsCSS()
-      getScript('!{url_for(theme.CDN.disqusjs)}').then(initDisqusjs)
+      getScript('!{url_for(theme.asset.disqusjs)}').then(initDisqusjs)
       window.disqusJsLoad = true
     }
   }
 
   if ('!{theme.comments.use[0]}' === 'Disqusjs' || !!{theme.comments.lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqus_thread'), loadDisqusjs)
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('disqusjs'), loadDisqusjs)
     else loadDisqusjs()
   }
   else {

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

@@ -7,7 +7,7 @@ script.
     if (typeof FB === 'object') FB.XFBML.parse()
     else {
       let ele = document.createElement('script')
-      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v13.0&autoLogAppEvents=1')
+      ele.setAttribute('src','https://connect.facebook.net/!{theme.facebook_comments.lang}/sdk.js#xfbml=1&version=v13.0&appId=!{theme.facebook_comments.app_id}&autoLogAppEvents=1')
       ele.setAttribute('async', 'true')
       ele.setAttribute('defer', 'true')
       ele.setAttribute('crossorigin', 'anonymous')

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

@@ -5,7 +5,7 @@ script.
     let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '!{themes.dark}' : '!{themes.light}'
 
     const config = Object.assign({
-      src: '!{theme.CDN.giscus}',
+      src: 'https://giscus.app/client.js',
       'data-repo': '!{repo}',
       'data-repo-id': '!{repo_id}',
       'data-category-id': '!{category_id}',

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

@@ -2,7 +2,7 @@ script.
   function addGitalkSource () {
     const ele = document.createElement('link')
     ele.rel = 'stylesheet'
-    ele.href= '!{url_for(theme.CDN.gitalk_css)}'
+    ele.href= '!{url_for(theme.asset.gitalk_css)}'
     document.getElementsByTagName('head')[0].appendChild(ele)
   }
 
@@ -24,7 +24,7 @@ script.
     if (typeof Gitalk === 'function') initGitalk()
     else {
       addGitalkSource()
-      getScript('!{url_for(theme.CDN.gitalk)}').then(initGitalk)
+      getScript('!{url_for(theme.asset.gitalk)}').then(initGitalk)
     }
   }
   

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

@@ -22,7 +22,7 @@ hr
           when 'Valine'
             #vcomment.vcomment
           when 'Disqusjs'
-            #disqus_thread
+            #disqusjs
           when 'Livere'
             #lv-container(data-id="city" data-uid=theme.livere.uid)
           when 'Gitalk'
@@ -40,3 +40,5 @@ hr
                         data-numposts= theme.facebook_comments.pageSize || 10
                         data-order-by= theme.facebook_comments.order_by || 'social'
                         data-width="100%")
+          when 'Remark42'
+            #remark42

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

@@ -20,3 +20,5 @@ each name in theme.comments.use
       !=partial('includes/third-party/comments/giscus', {}, {cache: true})
     when 'Facebook Comments'
       !=partial('includes/third-party/comments/facebook_comments', {}, {cache: true})
+    when 'Remark42'
+      !=partial('includes/third-party/comments/remark42', {}, {cache: true})

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

@@ -0,0 +1,67 @@
+- const { host, siteId, option } = theme.remark42
+script.
+  var remark_config = Object.assign({
+    host: '!{host}',
+    site_id: '!{siteId}',
+    components: ['embed'],
+    theme: document.documentElement.getAttribute('data-theme') === 'dark' ? 'dark' : 'light'
+  },!{JSON.stringify(option)})
+
+  function addRemark42(){
+    for (let i = 0; i < remark_config.components.length; i++) {
+      const s = document.createElement('script')
+      s.src = remark_config.host + '/web/' + remark_config.components[i] + '.js'
+      s.defer = true
+      document.head.appendChild(s)
+    }
+  }
+
+  function initRemark42() {
+    if (window.REMARK42) {
+      if (this.remark42Instance) {
+        this.remark42Instance.destroy()
+      }
+
+      this.remark42Instance = window.REMARK42.createInstance({
+        ...remark_config
+      })
+    }
+  }
+
+  function getCount () {
+    const ele = document.querySelector('.remark42__counter')
+    if (ele) {
+      const s = document.createElement('script')
+      s.src = remark_config.host + '/web/counter.js'
+      s.defer = true
+      document.head.appendChild(s)
+    }
+  }
+
+  function loadRemark42 () {
+    if (window.REMARK42) {
+      this.initRemark42()
+      getCount()
+    } else {
+      addRemark42()
+      window.addEventListener('REMARK42::ready', () => {
+        this.initRemark42()
+        getCount()
+      })
+    }
+  }
+
+  document.getElementById('darkmode').addEventListener('click',()=>{
+    if (!window.REMARK42) return
+    let theme = document.documentElement.getAttribute('data-theme') === 'dark' ? 'light' : 'dark'
+    window.REMARK42.changeTheme(theme)
+  })
+
+  if ('!{theme.comments.use[0]}' === 'Remark42' || !!{theme.comments.lazyload}) {
+    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('remark42'), loadRemark42)
+    else loadRemark42()
+  } else {
+    function loadOtherComment () {
+      loadRemark42()
+    }
+  }

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

@@ -9,19 +9,21 @@ script.
         envId: '!{envId}',
         region: '!{region}',
         onCommentLoaded: function () {
-          btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.vemoji)'))
+          btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
         }
       }, !{JSON.stringify(option)}))
     }
 
     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.CDN.twikoo}').then(runFn)
+      getScript('!{url_for(theme.asset.twikoo)}').then(runFn)
     }
 
     if ('!{use[0]}' === 'Twikoo' || !!{lazyload}) {

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

@@ -2,7 +2,7 @@ script.
   function loadUtterances () {
     let ele = document.createElement('script')
     ele.setAttribute('id', 'utterances_comment')
-    ele.setAttribute('src', '!{url_for(theme.CDN.utterances)}')
+    ele.setAttribute('src', 'https://utteranc.es/client.js')
     ele.setAttribute('repo', '!{theme.utterances.repo}')
     ele.setAttribute('issue-term', '!{theme.utterances.issue_term}')
     let nowTheme = document.documentElement.getAttribute('data-theme') === 'dark' ? '#{theme.utterances.dark_theme}' : '#{theme.utterances.light_theme}'

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

@@ -18,7 +18,7 @@ script.
     }
 
     if (typeof Valine === 'function') initValine() 
-    else getScript('!{url_for(theme.CDN.valine)}').then(initValine)
+    else getScript('!{url_for(theme.asset.valine)}').then(initValine)
   }
 
   if ('!{theme.comments.use[0]}' === 'Valine' || !!{theme.comments.lazyload}) {

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

@@ -1,23 +1,35 @@
-- const { serverURL, visitor, option } = theme.waline
+- const { serverURL, option, pageview } = theme.waline
+- const { lazyload, count, use } = theme.comments
 
 script.
   function loadWaline () {
+    function insertCSS () {
+      const link = document.createElement("link")
+      link.rel = "stylesheet"
+      link.href = "!{url_for(theme.asset.waline_css)}"
+      document.head.appendChild(link)
+    }
+
     function initWaline () {
-      const waline = new Waline(Object.assign({
+      const waline = Waline.init(Object.assign({
         el: '#waline-wrap',
         serverURL: '!{serverURL}',
-        path: location.pathname,
+        pageview: !{lazyload ? false : pageview},
-        visitor: !{visitor},
+        dark: 'html[data-theme="dark"]',
-        dark: 'html[data-theme="dark"]'
+        path: window.location.pathname,
+        comment: !{lazyload ? false : count},
       }, !{JSON.stringify(option)}))
     }
 
     if (typeof Waline === 'function') initWaline()
-    else getScript('!{url_for(theme.CDN.waline)}').then(initWaline)
+    else {
+      insertCSS()
+      getScript('!{url_for(theme.asset.waline_js)}').then(initWaline)
+    }
   }
 
-  if ('!{theme.comments.use[0]}' === 'Waline' || !!{theme.comments.lazyload}) {
+  if ('!{use[0]}' === 'Waline' || !!{lazyload}) {
-    if (!{theme.comments.lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
+    if (!{lazyload}) btf.loadComment(document.getElementById('waline-wrap'),loadWaline)
     else setTimeout(loadWaline, 0)
   } else {
     function loadOtherComment () {

layout/includes/third-party/effect.pug

@@ -1,19 +1,19 @@
 if theme.fireworks && theme.fireworks.enable
   canvas.fireworks(mobile=`${theme.fireworks.mobile}`)
-  script(src=url_for(theme.CDN.fireworks))
+  script(src=url_for(theme.asset.fireworks))
 
 if (theme.canvas_ribbon && theme.canvas_ribbon.enable)
-  script(defer id="ribbon" src=url_for(theme.CDN.canvas_ribbon) size=theme.canvas_ribbon.size
+  script(defer id="ribbon" src=url_for(theme.asset.canvas_ribbon) size=theme.canvas_ribbon.size
   alpha=theme.canvas_ribbon.alpha zIndex=theme.canvas_ribbon.zIndex mobile=`${theme.canvas_ribbon.mobile}` data-click=`${theme.canvas_ribbon.click_to_change}`)
 
 if (theme.canvas_fluttering_ribbon && theme.canvas_fluttering_ribbon.enable)
-  script(defer id="fluttering_ribbon" mobile=`${theme.canvas_fluttering_ribbon.mobile}` src=url_for(theme.CDN.canvas_fluttering_ribbon))
+  script(defer id="fluttering_ribbon" mobile=`${theme.canvas_fluttering_ribbon.mobile}` src=url_for(theme.asset.canvas_fluttering_ribbon))
 
 if (theme.canvas_nest && theme.canvas_nest.enable)
-  script#canvas_nest(defer color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.CDN.canvas_nest))
+  script#canvas_nest(defer color=theme.canvas_nest.color opacity=theme.canvas_nest.opacity zIndex=theme.canvas_nest.zIndex count=theme.canvas_nest.count mobile=`${theme.canvas_nest.mobile}` src=url_for(theme.asset.canvas_nest))
 
 if theme.activate_power_mode.enable
-  script(src=url_for(theme.CDN.activate_power_mode))
+  script(src=url_for(theme.asset.activate_power_mode))
   script.
     POWERMODE.colorful = !{theme.activate_power_mode.colorful};
     POWERMODE.shake = !{theme.activate_power_mode.shake};
@@ -22,11 +22,11 @@ if theme.activate_power_mode.enable
 
 //- 鼠標特效
 if theme.click_heart && theme.click_heart.enable
-  script#click-heart(src=url_for(theme.CDN.click_heart) async mobile=`${theme.click_heart.mobile}`)
+  script#click-heart(src=url_for(theme.asset.click_heart) async mobile=`${theme.click_heart.mobile}`)
 
 if theme.ClickShowText && theme.ClickShowText.enable
   script#click-show-text(
-    src= url_for(theme.CDN.ClickShowText)
+    src= url_for(theme.asset.ClickShowText)
     data-mobile= `${theme.ClickShowText.mobile}`
     data-text= theme.ClickShowText.text.join(",")
     data-fontsize= theme.ClickShowText.fontSize

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

@@ -1,6 +1,5 @@
-link(rel="stylesheet" type="text/css" href=theme.CDN.katex)
+link(rel="stylesheet" type="text/css" href=url_for(theme.asset.katex))
-script(src=url_for(theme.CDN.katex_copytex))
+script(src=url_for(theme.asset.katex_copytex))
-link(rel="stylesheet" type="text/css" href=theme.CDN.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.CDN.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.CDN.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/index.pug

@@ -23,4 +23,6 @@ if use
       include ./github-issues.pug
     when 'Utterances'
       - userRepo = theme.utterances.repo
-      include ./github-issues.pug
+      include ./github-issues.pug
+    when 'Remark42'
+      include ./remark42.pug  

layout/includes/third-party/newest-comments/remark42.pug

@@ -0,0 +1,80 @@
+- const { host, siteId } = theme.remark42
+
+script.
+  window.addEventListener('load', () => {
+    const changeContent = (content) => {
+      if (content === '') return content
+
+      content = content.replace(/<img.*?src="(.*?)"?[^\>]+>/ig, '[!{_p("aside.card_newest_comments.image")}]') // replace image link
+      content = content.replace(/<a[^>]+?href=["']?([^"']+)["']?[^>]*>([^<]+)<\/a>/gi, '[!{_p("aside.card_newest_comments.link")}]') // replace url
+      content = content.replace(/<pre><code>.*?<\/pre>/gi, '[!{_p("aside.card_newest_comments.code")}]') // replace code
+      content = content.replace(/<[^>]+>/g,"") // remove html tag
+
+      if (content.length > 150) {
+        content = content.substring(0,150) + '...'
+      }
+      return content
+    }
+
+    const generateHtml = array => {
+      let result = ''
+
+      if (array.length) {
+        for (let i = 0; i < array.length; i++) {
+          result += '<div class=\'aside-list-item\'>'
+
+          if (!{theme.newest_comments.avatar}) {
+            const name = '!{theme.lazyload.enable ? "data-lazy-src" : "src"}'
+            result += `<a href='${array[i].url}' class='thumbnail'><img ${name}='${array[i].avatar}' alt='${array[i].nick}'></a>`
+          }
+
+          result += `<div class='content'>
+          <a class='comment' href='${array[i].url}' title='${array[i].content}'>${array[i].content}</a>
+          <div class='name'><span>${array[i].nick} / </span><time datetime="${array[i].date}">${btf.diffDate(array[i].date, true)}</time></div>
+          </div></div>`
+        }
+      } else {
+        result += '!{_p("aside.card_newest_comments.zero")}'
+      }
+
+      let $dom = document.querySelector('#card-newest-comments .aside-list')
+      $dom.innerHTML= result
+      window.lazyLoadInstance && window.lazyLoadInstance.update()
+      window.pjax && window.pjax.refresh($dom)
+    }
+
+    const getComment = () => {
+      fetch('!{host}/api/v1/last/!{theme.newest_comments.limit}?site=!{siteId}')
+        .then(response => response.json())
+        .then(data => {
+          const remark42 = data.map(function (e) {
+            return {
+              'avatar': e.user.picture,
+              'content': changeContent(e.text),
+              'nick': e.user.name,
+              'url': e.locator.url,
+              'date': e.time,
+            }
+          })
+          saveToLocal.set('remark42-newest-comments', JSON.stringify(remark42), !{theme.newest_comments.storage}/(60*24))
+          generateHtml(remark42)
+        }).catch(e => {
+          const $dom = document.querySelector('#card-newest-comments .aside-list')
+          $dom.innerHTML= "!{_p('aside.card_newest_comments.error')}"
+        })
+    }
+
+    const newestCommentInit = () => {
+      if (document.querySelector('#card-newest-comments .aside-list')) {
+        const data = saveToLocal.get('valine-newest-comments')
+        if (data) {
+          generateHtml(JSON.parse(data))
+        } else {
+          getComment()
+        }
+      }
+    }
+
+    newestCommentInit()
+    document.addEventListener('pjax:complete', newestCommentInit)
+  })

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

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

layout/includes/third-party/newest-comments/valine.pug

@@ -1,6 +1,6 @@
 - let default_avatar = theme.valine.avatar
 
-script(src=url_for(theme.CDN.blueimp_md5))
+script(src=url_for(theme.asset.blueimp_md5))
 script.
   window.addEventListener('load', () => {
     const changeContent = (content) => {

layout/includes/third-party/newest-comments/waline.pug

@@ -1,5 +1,3 @@
-- let { avatar,avatarCDN } = theme.waline
-
 script.
   window.addEventListener('load', () => {
     const changeContent = (content) => {
@@ -45,11 +43,11 @@ script.
 
     const getComment = () => {
       const loadWaline = () => {
-        Waline.Widget.RecentComments({
+        Waline.RecentComments({
           serverURL: '!{theme.waline.serverURL}',
           count: !{theme.newest_comments.limit}
-        }).then(res => {
+        }).then(({comments}) => {
-          const walineArray = res.comments.map(e => {
+          const walineArray = comments.map(e => {
             return {
               'content': changeContent(e.comment),
               'avatar': e.avatar,
@@ -67,7 +65,7 @@ script.
       }
 
       if (typeof Waline === 'function') loadWaline() 
-      else getScript('!{url_for(theme.CDN.waline)}').then(loadWaline)
+      else getScript('!{url_for(theme.asset.waline_js)}').then(loadWaline)
     }
 
     const newestCommentInit = () => {

layout/includes/third-party/pangu.pug

@@ -2,7 +2,7 @@ script.
   function panguFn () {
     if (typeof pangu === 'object') pangu.autoSpacingPage()
     else {
-      getScript('!{url_for(theme.CDN.pangu)}')
+      getScript('!{url_for(theme.asset.pangu)}')
         .then(() => {
           pangu.autoSpacingPage()
         })

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
@@ -12,7 +12,7 @@ if choose
   if choose.includes('Utterances') || choose.includes('Giscus')
     - pjaxSelectors.unshift('link[rel="canonical"]')
 
-script(src=url_for(theme.CDN.pjax))
+script(src=url_for(theme.asset.pjax))
 script.
   let pjaxSelectors = !{JSON.stringify(pjaxSelectors)}
 
@@ -47,6 +47,7 @@ script.
     const $bodyClassList = document.body.classList
     $bodyClassList.contains('read-mode') && $bodyClassList.remove('read-mode')
 
+    typeof disqusjs === 'object' && disqusjs.destroy()
   })
 
   document.addEventListener('pjax:complete', function () {

layout/includes/third-party/prismjs.pug

@@ -1,5 +1,5 @@
 if config.prismjs && config.prismjs.enable && !config.prismjs.preprocess
-  script(src=url_for(theme.CDN.prismjs_js))
+  script(src=url_for(theme.asset.prismjs_js))
-  script(src=url_for(theme.CDN.prismjs_autoloader))
+  script(src=url_for(theme.asset.prismjs_autoloader))
   if config.prismjs.line_number
-    script(src=url_for(theme.CDN.prismjs_lineNumber_js))
+    script(src=url_for(theme.asset.prismjs_lineNumber_js))

layout/includes/third-party/search/algolia.pug

@@ -1,7 +1,7 @@
 #algolia-search
   .search-dialog
     nav.search-nav
-      span.search-dialog-title= 'Algolia'
+      span.search-dialog-title= _p('search.title')
       button.search-close-button
         i.fas.fa-times
 
@@ -11,6 +11,8 @@
       #algolia-search-results
         #algolia-hits
         #algolia-pagination
-        #algolia-stats
+        #algolia-info
+          .algolia-stats
+          .algolia-poweredBy
   
   #search-mask

layout/includes/third-party/search/local-search.pug

@@ -1,7 +1,7 @@
 #local-search
   .search-dialog
     nav.search-nav
-      span.search-dialog-title=_p("search.local_search.label")
+      span.search-dialog-title= _p('search.title')
       span#loading-status
       button.search-close-button
         i.fas.fa-times

layout/includes/third-party/share/addtoany.pug

@@ -5,6 +5,6 @@
       a(class="a2a_button_" + name)
 
     a.a2a_dd(href="https://www.addtoany.com/share")
-script(async src=url_for(theme.CDN.addtoany))
+script(async src='https://static.addtoany.com/menu/page.js')
 
 

layout/includes/third-party/share/share-js.pug

@@ -1,3 +1,3 @@
 .social-share(data-image=url_for(page.cover|| theme.avatar.img) data-sites= theme.sharejs.sites)
-link(rel='stylesheet' href=url_for(theme.CDN.sharejs_css) media="print" onload="this.media='all'")
+link(rel='stylesheet' href=url_for(theme.asset.sharejs_css) media="print" onload="this.media='all'")
-script(src=url_for(theme.CDN.sharejs) defer)
+script(src=url_for(theme.asset.sharejs) defer)

layout/includes/third-party/subtitle.pug

@@ -29,7 +29,7 @@ case source
         if (typeof Typed === 'function') {
           subtitleType()
         } else {
-          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
         }
       } else {
         subtitleType()
@@ -61,7 +61,7 @@ case source
         if (typeof Typed === 'function') {
           subtitleType()
         } else {
-          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
         }
       } else {
         subtitleType()
@@ -94,7 +94,7 @@ case source
         if (typeof Typed === 'function') {
           subtitleType()
         } else {
-          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
         }
       } else {
         subtitleType()
@@ -121,7 +121,7 @@ case source
         if (typeof Typed === 'function') {
           subtitleType()
         } else {
-          getScript('!{url_for(theme.CDN.typed)}').then(subtitleType)
+          getScript('!{url_for(theme.asset.typed)}').then(subtitleType)
         }
       } else {
         subtitleType()

layout/includes/widget/card_author.pug

@@ -6,21 +6,16 @@ if theme.aside.card_author.enable
       .author-info__name= config.author
       .author-info__description!= theme.aside.card_author.description || config.description
 
-    .card-info-data.is-center
+    .card-info-data.site-data.is-center
-      .card-info-data-item
+      a(href=url_for(config.archive_dir) + '/')
-        a(href=url_for(config.archive_dir) + '/')
+        .headline= _p('aside.articles')
-          .headline= _p('aside.articles') 
+        .length-num= site.posts.length
-          .length-num= site.posts.length
+      a(href=url_for(config.tag_dir) + '/')
-
+        .headline= _p('aside.tags')
-      .card-info-data-item
+        .length-num= site.tags.length
-        a(href=url_for(config.tag_dir) + '/')
+      a(href=url_for(config.category_dir) + '/')
-          .headline= _p('aside.tags')
+        .headline= _p('aside.categories') 
-          .length-num= site.tags.length
+        .length-num= site.categories.length
-
-      .card-info-data-item
-        a(href=url_for(config.category_dir) + '/')
-          .headline= _p('aside.categories') 
-          .length-num= site.categories.length
 
     if theme.aside.card_author.button.enable
       a#card-info-btn(href=theme.aside.card_author.button.link)

layout/includes/widget/card_webinfo.pug

@@ -12,20 +12,24 @@ if theme.aside.card_webinfo.enable
         .webinfo-item
           .item-name= _p('aside.card_webinfo.runtime.name') + " :"
           .item-count#runtimeshow(data-publishDate=date_xml(theme.runtimeshow.publish_date))
+            i.fa-solid.fa-spinner.fa-spin
       if theme.wordcount.enable && theme.wordcount.total_wordcount
         .webinfo-item
           .item-name=_p('aside.card_webinfo.site_wordcount') + " :"
           .item-count=totalcount(site)
-      if theme.busuanzi.site_uv 
+      if theme.busuanzi.site_uv
         .webinfo-item
           .item-name= _p('aside.card_webinfo.site_uv_name') + " :"
           .item-count#busuanzi_value_site_uv
+            i.fa-solid.fa-spinner.fa-spin
       if theme.busuanzi.site_pv
         .webinfo-item
           .item-name= _p('aside.card_webinfo.site_pv_name') + " :"
           .item-count#busuanzi_value_site_pv
+            i.fa-solid.fa-spinner.fa-spin
       if theme.aside.card_webinfo.last_push_date
         .webinfo-item
           .item-name= _p('aside.card_webinfo.last_push_date.name') + " :"
           .item-count#last-push-date(data-lastPushDate=date_xml(Date.now()))
+            i.fa-solid.fa-spinner.fa-spin
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "4.1.0",
+  "version": "4.3.0",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {
@@ -23,7 +23,7 @@
     "email": "my@crazywong.com"
   },
   "dependencies": {
-    "hexo-renderer-stylus": "^2.0.1",
+    "hexo-renderer-stylus": "^2.1.0",
     "hexo-renderer-pug": "^3.0.0"
   },
   "homepage": "https://butterfly.js.org/",

plugins.yml

@@ -0,0 +1,182 @@
+algolia_search_v4:
+  name: algoliasearch
+  file: dist/algoliasearch-lite.umd.js
+  version: 4.13.1
+instantsearch_v4:
+  name: instantsearch.js
+  file: dist/instantsearch.production.min.js
+  version: 4.42.0
+pjax:
+  name: pjax
+  file: pjax.min.js
+  version: 0.2.8
+gitalk:
+  name: gitalk
+  file: dist/gitalk.min.js
+  version: 1.7.2
+gitalk_css:
+  name: gitalk
+  file: dist/gitalk.css
+  version: 1.7.2
+blueimp_md5:
+  name: blueimp-md5
+  file: js/md5.min.js
+  version: 2.19.0
+valine:
+  name: valine
+  file: dist/Valine.min.js
+  version: 1.4.18
+disqusjs:
+  name: disqusjs
+  file: dist/browser/disqusjs.es2015.umd.min.js
+  version: 3.0.1
+disqusjs_css:
+  name: disqusjs
+  file: dist/browser/styles/disqusjs.css
+  version: 3.0.1
+twikoo:
+  name: twikoo
+  file: dist/twikoo.all.min.js
+  version: 1.5.11
+waline_js:
+  name: '@waline/client'
+  file: dist/waline.js
+  other_name: waline
+  version: 2.6.1
+waline_css:
+  name: '@waline/client'
+  file: dist/waline.css
+  other_name: waline
+  version: 2.6.1
+sharejs:
+  name: butterfly-extsrc
+  file: sharejs/dist/js/social-share.min.js
+  version: 1.1.3
+sharejs_css:
+  name: butterfly-extsrc
+  file: sharejs/dist/css/share.min.css
+  version: 1.1.3
+mathjax:
+  name: mathjax
+  file: es5/tex-mml-chtml.js
+  version: 3.2.2
+katex:
+  name: katex
+  file: dist/katex.min.css
+  other_name: KaTeX
+  version: 0.16.0
+katex_copytex:
+  name: katex
+  file: dist/contrib/copy-tex.min.js
+  other_name: KaTeX
+  version: 0.16.0
+mermaid:
+  name: mermaid
+  file: dist/mermaid.min.js
+  version: 9.1.2
+canvas_ribbon:
+  name: butterfly-extsrc
+  file: dist/canvas-ribbon.min.js
+  version: 1.1.3
+canvas_fluttering_ribbon:
+  name: butterfly-extsrc
+  file: dist/canvas-fluttering-ribbon.min.js
+  version: 1.1.3
+canvas_nest:
+  name: butterfly-extsrc
+  file: dist/canvas-nest.min.js
+  version: 1.1.3
+activate_power_mode:
+  name: butterfly-extsrc
+  file: dist/activate-power-mode.min.js
+  version: 1.1.3
+fireworks:
+  name: butterfly-extsrc
+  file: dist/fireworks.min.js
+  version: 1.1.3
+click_heart:
+  name: butterfly-extsrc
+  file: dist/click-heart.min.js
+  version: 1.1.3
+ClickShowText:
+  name: butterfly-extsrc
+  file: dist/click-show-text.min.js
+  version: 1.1.3
+lazyload:
+  name: vanilla-lazyload
+  file: dist/lazyload.iife.min.js
+  version: 17.3.1
+instantpage:
+  name: instant.page
+  file: instantpage.js
+  version: 5.1.0
+typed:
+  name: typed.js
+  file: lib/typed.min.js
+  version: 2.0.12
+pangu:
+  name: pangu
+  file: dist/browser/pangu.min.js
+  version: 4.0.7
+fancybox_css_v4:
+  name: '@fancyapps/ui'
+  file: dist/fancybox.css
+  version: 4.0.27
+  other_name: fancyapps-ui
+fancybox_v4:
+  name: '@fancyapps/ui'
+  file: dist/fancybox.umd.js
+  version: 4.0.27
+  other_name: fancyapps-ui
+medium_zoom:
+  name: medium-zoom
+  file: dist/medium-zoom.min.js
+  version: 1.0.6
+snackbar_css:
+  name: node-snackbar
+  file: dist/snackbar.min.css
+  version: 0.1.16
+snackbar:
+  name: node-snackbar
+  file: dist/snackbar.min.js
+  version: 0.1.16
+fontawesomeV6:
+  name: '@fortawesome/fontawesome-free'
+  file: css/all.min.css
+  other_name: font-awesome
+  version: 6.1.1
+flickr_justified_gallery_js:
+  name: flickr-justified-gallery
+  file: dist/fjGallery.min.js
+  version: 2.1.2
+flickr_justified_gallery_css:
+  name: flickr-justified-gallery
+  file: dist/fjGallery.css
+  version: 2.1.2
+aplayer_css:
+  name: aplayer
+  file: dist/APlayer.min.css
+  version: 1.10.1
+aplayer_js:
+  name: aplayer
+  file: dist/APlayer.min.js
+  version: 1.10.1
+meting_js:
+  name: butterfly-extsrc
+  file: metingjs/dist/Meting.min.js
+  version: 1.1.3
+prismjs_js:
+  name: prismjs
+  file: prism.js
+  other_name: prism
+  version: 1.28.0
+prismjs_lineNumber_js:
+  name: prismjs
+  file: plugins/line-numbers/prism-line-numbers.min.js
+  other_name: prism
+  version: 1.28.0
+prismjs_autoloader:
+  name: prismjs
+  file: plugins/autoloader/prism-autoloader.min.js
+  other_name: prism
+  version: 1.28.0

scripts/events/cdn.js

@@ -0,0 +1,94 @@
+/**
+ * Butterfly
+ * Merge CDN
+ */
+
+'use strict'
+
+const { version } = require('../../package.json')
+const path = require('path')
+
+hexo.extend.filter.register('before_generate', () => {
+  const themeConfig = hexo.theme.config
+  const { CDN } = themeConfig
+
+  const thirdPartySrc = hexo.render.renderSync({ path: path.join(hexo.theme_dir,'/plugins.yml'), engine: 'yaml'})
+  const internalSrc = {
+    main: {
+      name: 'hexo-theme-butterfly',
+      file: 'js/main.js',
+      version
+    },
+    utils: {
+      name: 'hexo-theme-butterfly',
+      file: 'js/utils.js',
+      version
+    },
+    translate: {
+      name: 'hexo-theme-butterfly',
+      file: 'js/tw_cn.js',
+      version
+    },
+    local_search: {
+      name: 'hexo-theme-butterfly',
+      file: 'js/search/local-search.js',
+      version
+    },
+    algolia_js: {
+      name: 'hexo-theme-butterfly',
+      file: 'js/search/algolia.js',
+      version
+    }
+  }
+
+  const minFile = (file) => {
+    return file.replace(/(?<!\.min)\.(js|css)$/g, ext => '.min' + ext)
+  }
+
+  const createCDNLink = (data, type, cond = '') => {
+    Object.keys(data).map(key => {
+      let { name, version, file, other_name } = data[key]
+
+      const min_file = minFile(file)
+      const cdnjs_name = other_name || name
+      const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '')
+      const min_cdnjs_file = minFile(cdnjs_file)
+      if (cond === 'internal') file = `source/${file}`
+      const verType = CDN.version ? `@${version}` : ''
+
+      const value = {
+        version,
+        name,
+        file,
+        cdnjs_file,
+        min_file,
+        min_cdnjs_file,
+        cdnjs_name
+      }
+      const cdnSource = {
+        local: cond === 'internal' ? cdnjs_file : `/pluginsSrc/${name}/${file}`,
+        jsdelivr: `https://cdn.jsdelivr.net/npm/${name}${verType}/${min_file}`,
+        unpkg: `https://unpkg.com/${name}${verType}/${file}`,
+        cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
+        custom: (CDN.custom_format || '').replace(/\$\{(.+?)\}/g, (match, $1) => value[$1])
+      }
+      
+      data[key] = cdnSource[type]
+    })
+
+    if (cond === 'internal') data['main_css'] = 'css/index.css'
+    return data
+  }
+
+  // delete null value
+  const deleteNullValue = obj => {
+    if (!obj) return
+    for (const i in obj) {
+      obj[i] === null && delete obj[i]
+    }
+    return obj
+  }
+
+  themeConfig.asset = Object.assign(createCDNLink(internalSrc,CDN.internal_provider,'internal'),
+  createCDNLink(thirdPartySrc,CDN.third_party_provider), deleteNullValue(CDN.option))
+})

scripts/events/comment.js

@@ -0,0 +1,14 @@
+/**
+ * Capitalize the first letter of comment name
+ */
+
+hexo.extend.filter.register('before_generate', () => {
+  const themeConfig = hexo.theme.config
+  let { use } = themeConfig.comments
+  if (!use) return
+  if (typeof use === 'string') {
+    use = use.split(',')
+  }
+  const newArray = use.map(item => item.toLowerCase().replace(/\b[a-z]/g, s => s.toUpperCase()))
+  themeConfig.comments.use = newArray
+})

scripts/events/config.js

@@ -1,128 +0,0 @@
-/**
- * Butterfly
- * 1. Merge CDN
- * 2. Capitalize the first letter of comment name
- */
-
-'use strict'
-
-hexo.extend.filter.register('before_generate', () => {
-  const themeConfig = hexo.theme.config
-
-  /**
-   * Merge CDN
-   */
-
-  const defaultCDN = {
-    main_css: '/css/index.css',
-    main: '/js/main.js',
-    utils: '/js/utils.js',
-
-    // pjax
-    pjax: 'https://cdn.jsdelivr.net/npm/pjax/pjax.min.js',
-
-    // comments
-    gitalk: 'https://cdn.jsdelivr.net/npm/gitalk@latest/dist/gitalk.min.js',
-    gitalk_css: 'https://cdn.jsdelivr.net/npm/gitalk/dist/gitalk.min.css',
-    blueimp_md5: 'https://cdn.jsdelivr.net/npm/blueimp-md5/js/md5.min.js',
-    valine: 'https://cdn.jsdelivr.net/npm/valine/dist/Valine.min.js',
-    disqusjs: 'https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js',
-    disqusjs_css: 'https://cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css',
-    utterances: 'https://utteranc.es/client.js',
-    twikoo: 'https://cdn.jsdelivr.net/npm/twikoo/dist/twikoo.all.min.js',
-    waline: 'https://cdn.jsdelivr.net/npm/@waline/client/dist/Waline.min.js',
-    giscus: 'https://giscus.app/client.js',
-
-    // share
-    addtoany: 'https://static.addtoany.com/menu/page.js',
-    sharejs: 'https://cdn.jsdelivr.net/npm/social-share.js/dist/js/social-share.min.js',
-    sharejs_css: 'https://cdn.jsdelivr.net/npm/social-share.js/dist/css/share.min.css',
-
-    // search
-    local_search: '/js/search/local-search.js',
-    algolia_js: '/js/search/algolia.js',
-    algolia_search_v4: 'https://cdn.jsdelivr.net/npm/algoliasearch@4/dist/algoliasearch-lite.umd.js',
-    instantsearch_v4: 'https://cdn.jsdelivr.net/npm/instantsearch.js@4/dist/instantsearch.production.min.js',
-
-    // math
-    mathjax: 'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js',
-    katex: 'https://cdn.jsdelivr.net/npm/katex@latest/dist/katex.min.css',
-    katex_copytex: 'https://cdn.jsdelivr.net/npm/katex@latest/dist/contrib/copy-tex.min.js',
-    katex_copytex_css: 'https://cdn.jsdelivr.net/npm/katex@latest/dist/contrib/copy-tex.css',
-    mermaid: 'https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js',
-
-    // count
-    busuanzi: '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js',
-
-    // background effect
-    canvas_ribbon: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-ribbon.min.js',
-    canvas_fluttering_ribbon: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-fluttering-ribbon.min.js',
-    canvas_nest: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/canvas-nest.min.js',
-
-    lazyload: 'https://cdn.jsdelivr.net/npm/vanilla-lazyload/dist/lazyload.iife.min.js',
-    instantpage: 'https://cdn.jsdelivr.net/npm/instant.page/instantpage.min.js',
-    typed: 'https://cdn.jsdelivr.net/npm/typed.js/lib/typed.min.js',
-    pangu: 'https://cdn.jsdelivr.net/npm/pangu/dist/browser/pangu.min.js',
-
-    // photo
-    fancybox_css_v4: 'https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox.css',
-    fancybox_v4: 'https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox.umd.js',
-    medium_zoom: 'https://cdn.jsdelivr.net/npm/medium-zoom/dist/medium-zoom.min.js',
-
-    // snackbar
-    snackbar_css: 'https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.css',
-    snackbar: 'https://cdn.jsdelivr.net/npm/node-snackbar/dist/snackbar.min.js',
-
-    // effect
-    activate_power_mode: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/activate-power-mode.min.js',
-    fireworks: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/fireworks.min.js',
-    click_heart: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-heart.min.js',
-    ClickShowText: 'https://cdn.jsdelivr.net/npm/butterfly-extsrc@1/dist/click-show-text.min.js',
-
-    // fontawesome
-    fontawesomeV6: 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6/css/all.min.css',
-
-    // Conversion between Traditional and Simplified Chinese
-    translate: '/js/tw_cn.js',
-
-    // flickr-justified-gallery
-    flickr_justified_gallery_js: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery@2/dist/fjGallery.min.js',
-    flickr_justified_gallery_css: 'https://cdn.jsdelivr.net/npm/flickr-justified-gallery@2/dist/fjGallery.min.css',
-
-    // aplayer
-    aplayer_css: 'https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css',
-    aplayer_js: 'https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js',
-    meting_js: 'https://cdn.jsdelivr.net/gh/metowolf/MetingJS@1.2/dist/Meting.min.js',
-
-    // Prism.js
-    prismjs_js: 'https://cdn.jsdelivr.net/npm/prismjs/prism.min.js',
-    prismjs_lineNumber_js: 'https://cdn.jsdelivr.net/npm/prismjs/plugins/line-numbers/prism-line-numbers.min.js',
-    prismjs_autoloader: 'https://cdn.jsdelivr.net/npm/prismjs/plugins/autoloader/prism-autoloader.min.js'
-  }
-
-  // delete null value
-  const deleteNullValue = obj => {
-    for (const i in obj) {
-      obj[i] === null && delete obj[i]
-    }
-    return obj
-  }
-
-  themeConfig.CDN = Object.assign(defaultCDN, deleteNullValue(themeConfig.CDN))
-
-  /**
-   * Capitalize the first letter of comment name
-   */
-
-  let { use } = themeConfig.comments
-
-  if (!use) return
-
-  if (typeof use === 'string') {
-    use = use.split(',')
-  }
-
-  const newArray = use.map(item => item.toLowerCase().replace(/\b[a-z]/g, s => s.toUpperCase()))
-
-  themeConfig.comments.use = newArray
-})

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) {
+  if (hexoVer < 5.3) {
-    logger.error('Please update Hexo to V5.0.0 or higher!')
+    logger.error('Please update Hexo to V5.3.0 or higher!')
-    logger.error('請把 Hexo 升級到 V5.0.0 或更高的版本！')
+    logger.error('請把 Hexo 升級到 V5.3.0 或更高的版本！')
     process.exit(-1)
   }
 

scripts/helpers/findArchiveLength.js

@@ -0,0 +1,58 @@
+hexo.extend.helper.register('findArchiveLength', function (func) {
+  const allPostsLength = this.site.posts.length;
+  if (hexo.config.archive_generator && hexo.config.archive_generator.enable === false ) return allPostsLength
+  const { yearly, monthly, daily } = hexo.config.archive_generator
+  const { year, month, day } = this.page
+  if (yearly === false || !year) return allPostsLength
+
+  const posts = this.site.posts.sort('date')
+
+  const compareFunc = (type,y1,m1,d1,y2,m2,d2) => {
+    if (type === 'year') {
+      return y1 === y2
+    } else if (type === 'month') {
+      return y1 === y2 && m1 === m2
+    } else if (type === 'day') {
+      return y1 === y2 && m1 === m2 && d1 === d2
+    }
+  }
+
+  const generateDateObj = (type) => {
+    let dateObj = []
+    let length = 0
+
+    posts.forEach(post => {
+      let date = post.date.clone()
+      const year = date.year()
+      const month = date.month() + 1
+      const day = date.date()
+      let lastData = dateObj[length - 1]
+
+      if (!lastData || !compareFunc(type, lastData.year, lastData.month, lastData.day, year, month, day)) {
+        const name = type === 'year' ? year : type === 'month' ? `${year}-${month}` : `${year}-${month}-${day}`
+        length = dateObj.push({
+          name,
+          year,
+          month,
+          day,
+          count: 1
+        })
+      } else {
+        lastData.count++
+      }
+    });
+
+    return dateObj
+  }
+
+  const data = func('createArchiveObj', ()=> {
+    const yearObj = yearly ? generateDateObj('year') : []
+    const monthObj = monthly ? generateDateObj('month') : []
+    const dayObj = daily ? generateDateObj('day') : []
+    const fullObj = [...yearObj, ...monthObj, ...dayObj]
+    return fullObj
+  })
+
+  const name = month ? day ? `${year}-${month}-${day}` : `${year}-${month}` : year
+  return data.find(item => item.name === name).count
+})

scripts/helpers/inject_head_js.js

@@ -8,6 +8,10 @@
 hexo.extend.helper.register('inject_head_js', function () {
   const { darkmode, aside } = this.theme
 
+  const { theme_color } = hexo.theme.config
+  const themeColorLight = theme_color && theme_color.enable && theme_color.meta_theme_color_light || '#ffffff'
+  const themeColorDark = theme_color && theme_color.enable && theme_color.meta_theme_color_dark || '#0d0d0d'
+
   const localStore = `
     win.saveToLocal = {
       set: function setWithExpiry(key, value, ttl) {
@@ -62,13 +66,13 @@ hexo.extend.helper.register('inject_head_js', function () {
       win.activateDarkMode = function () {
         document.documentElement.setAttribute('data-theme', 'dark')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
-          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#0d0d0d')
+          document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorDark}')
         }
       }
       win.activateLightMode = function () {
         document.documentElement.setAttribute('data-theme', 'light')
         if (document.querySelector('meta[name="theme-color"]') !== null) {
-          document.querySelector('meta[name="theme-color"]').setAttribute('content', '#ffffff')
+          document.querySelector('meta[name="theme-color"]').setAttribute('content', '${themeColorLight}')
         }
       }
       const t = saveToLocal.get('theme')

scripts/helpers/page.js

@@ -71,7 +71,13 @@ hexo.extend.helper.register('injectHtml', function (data) {
   return result
 })
 
-hexo.extend.helper.register('findArchivesTitle', function (menu) {
+hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
+  if (page.year) {
+    const dateStr = page.month ? `${page.year}-${page.month}` : `${page.year}`
+    const date_format = page.month ? hexo.theme.config.aside.card_archives.format : 'YYYY'
+    return date(dateStr, date_format)
+  }
+
   const defaultTitle = this._p('page.archives')
   if (!menu) return defaultTitle
 

scripts/helpers/related_post.js

@@ -54,14 +54,15 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
         relatedPosts[i].cover === false
           ? relatedPosts[i].randomcover
           : relatedPosts[i].cover
-      result += `<div><a href="${this.url_for(relatedPosts[i].path)}" title="${relatedPosts[i].title}">`
+      const title = this.escape_html(relatedPosts[i].title)
+      result += `<div><a href="${this.url_for(relatedPosts[i].path)}" title="${title}">`
       result += `<img class="cover" src="${this.url_for(cover)}" alt="cover">`
       if (dateType === 'created') {
         result += `<div class="content is-center"><div class="date"><i class="far fa-calendar-alt fa-fw"></i> ${this.date(relatedPosts[i].created, hexoConfig.date_format)}</div>`
       } else {
         result += `<div class="content is-center"><div class="date"><i class="fas fa-history fa-fw"></i> ${this.date(relatedPosts[i].updated, hexoConfig.date_format)}</div>`
       }
-      result += `<div class="title">${relatedPosts[i].title}</div>`
+      result += `<div class="title">${title}</div>`
       result += '</div></a></div>'
     }
 

scripts/tag/note.js

@@ -17,7 +17,7 @@ function postNote (args, content) {
   const iconArray = args[args.length - 2]
   if (iconArray && iconArray.startsWith('fa')) {
     icon = `<i class="note-icon ${iconArray}"></i>`
-    args[args.length - 2] = 'icon'
+    args[args.length - 2] = 'icon-padding'
   }
 
   return `<div class="note ${args.join(' ')}">${icon + hexo.render.renderSync({ text: content, engine: 'markdown' })}</div>`

source/css/_global/function.styl

@@ -131,7 +131,7 @@ if hexo-config('enter_transitions')
     &.open
       for i in 1 2 3 4
         > :nth-child({i})
-          animation: sidebarItem (i / 5) s
+          animation: sidebarItem (i / 5)s
 
 .scroll-down-effects
   animation: scroll-down-effect 1.5s infinite

source/css/_layout/aside.styl

@@ -38,24 +38,7 @@
         margin-top: -.42em
 
     .card-info-data
-      display: table
       margin: 14px 0 4px
-      width: 100%
-      table-layout: fixed
-
-      & > .card-info-data-item
-        display: table-cell
-
-        a
-          .headline
-            @extend .limit-one-line
-            color: var(--font-color)
-            font-size: 1em
-
-          .length-num
-            margin-top: -.42em
-            color: var(--text-highlight-color)
-            font-size: 1.4em
 
     .card-info-social-icons
       margin: 6px 0 -6px
@@ -340,6 +323,30 @@
     &:hover
       transform: rotate(360deg)
 
+.site-data
+  display: table
+  width: 100%
+  table-layout: fixed
+
+  & > a
+    display: table-cell
+
+    div
+      transition: all .3s
+
+    &:hover
+      div
+        color: $theme-color !important
+
+    .headline
+      @extend .limit-one-line
+      color: var(--font-color)
+
+    .length-num
+      margin-top: -.32em
+      color: var(--text-highlight-color)
+      font-size: 1.4em
+
 @keyframes more-btn-move
   0%,
   100%
@@ -396,7 +403,7 @@
 
   if hexo-config('aside.card_archives.sort_order')
     .card-archives
-      order: hexo-config('aside.card-archives.sort_order')
+      order: hexo-config('aside.card_archives.sort_order')
 
   if hexo-config('aside.card_webinfo.sort_order')
     .card-webinfo

source/css/_layout/post.styl

@@ -152,6 +152,11 @@ beautify()
 
 #post
   .tag_share
+    &:after
+      display: block
+      clear: both
+      content: ''
+
     .post-meta
       &__tag-list
         display: inline-block
@@ -174,7 +179,7 @@ beautify()
     .post_share
       display: inline-block
       float: right
-      margin: 8px 0 20px
+      margin: 8px 0 0
       width: fit-content
 
       .social-share

source/css/_layout/sidebar.styl

@@ -25,24 +25,8 @@
     & > .avatar-img
       margin: 20px auto
 
-    .site-data
+    .sidebar-site-data
-      display: table
       padding: 0 10px
-      width: 100%
-      table-layout: fixed
-
-      .data-item
-        display: table-cell
-
-        & > a > div
-          @extend .limit-one-line
-
-        .length-num
-          color: var(--text-highlight-color)
-          font-size: 1.28em
-
-        .headline
-          color: var(--font-color)
 
     hr
       margin: 20px auto

source/css/_layout/third-party.styl

@@ -89,6 +89,7 @@ mjx-container[display],
 .has-jax
   overflow-x: auto
   overflow-y: hidden
+  line-height: normal !important
 
 .aplayer
   color: $font-black

source/css/_mode/darkmode.styl

@@ -118,8 +118,10 @@ if hexo-config('darkmode.enable') || hexo-config('display_mode') == 'dark'
         fill: alpha(#FFFFFF, .9) !important
 
     // Disqusjs 反代模式下的適配
-    #disqus_thread
+    #disqusjs
       #dsqjs
+        &:hover,
+        &:focus,
         .dsqjs-tab-active,
         .dsqjs-no-comment
           color: alpha(#FFFFFF, .7)

source/css/_page/homepage.styl

@@ -82,6 +82,9 @@
         i
           margin: 0 4px 0 0
 
+        .fa-spinner
+          margin: 0
+
         .article-meta-label
           if hexo-config('post_meta.page.label')
             padding-right: 4px

source/css/_search/algolia.styl

@@ -11,7 +11,8 @@
         color: var(--search-input-color)
 
     .ais-Hits-list
-      padding-left: 24px
+      margin: 0
+      padding: 0
       @extend .list-beauty
 
       a
@@ -25,12 +26,17 @@
         color: $search-keyword-highlight
         font-weight: bold
 
+    .algolia-hit-item-content
+      margin: 0 0 8px
+      word-break: break-all
+
     .ais-Pagination
-      margin: 16px 0 0
+      margin: 20px 0 0
       padding: 0
       text-align: center
 
       .ais-Pagination-list
+        margin: 0
         padding: 0
         list-style: none
 
@@ -52,7 +58,34 @@
           color: #eee
           cursor: default
 
+      .ais-Pagination-item--disabled
+        visibility: hidden
+
     .algolia-logo
       padding-top: 2px
       width: 80px
-      height: 30px
+      height: 30px
+
+    #algolia-hits
+      > div
+        overflow-y: scroll
+
+        +minWidth768()
+          max-height: calc(80vh - 240px)
+
+        +maxWidth768()
+          height: calc(100vh - 260px)
+
+    #algolia-info
+      div
+        display: inline
+
+      .algolia-poweredBy
+        float: right
+
+.apple
+  #algolia-search
+    #algolia-hits
+      > div
+        +maxWidth768()
+          height: calc(90vh - 260px)

source/css/_search/index.styl

@@ -1,6 +1,6 @@
 .search-dialog
   position: fixed
-  top: 100px
+  top: 10%
   left: 50%
   z-index: 1001
   display: none

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
@@ -60,7 +60,7 @@
 
     .search-result-list
       overflow-y: auto
-      max-height: 210px
+      max-height: calc(80vh - 130px)
 
       +maxWidth768()
         padding-bottom: 40px

source/css/_tags/note.styl

@@ -7,7 +7,7 @@
   if hexo-config('note.border_radius') is a 'unit'
     border-radius: unit(hexo-config('note.border_radius'), px)
 
-  &.icon
+  &.icon-padding
     padding-left: 3em
 
   & > .note-icon

source/js/main.js

@@ -478,7 +478,6 @@ document.addEventListener('DOMContentLoaded', function () {
       typeof utterancesTheme === 'function' && utterancesTheme()
       typeof changeGiscusTheme === 'function' && changeGiscusTheme()
       typeof FB === 'object' && window.loadFBComment()
-      window.DISQUS && document.getElementById('disqus_thread').children.length && setTimeout(() => window.disqusReset(), 200)
       typeof runMermaid === 'function' && window.runMermaid()
     },
     showOrHideBtn: (e) => { // rightside 點擊設置 按鈕 展開

source/js/search/algolia.js

@@ -26,16 +26,39 @@ window.addEventListener('load', () => {
 
   const searchClickFn = () => {
     document.querySelector('#search-button > .search').addEventListener('click', openSearch)
+  }
+
+  const searchClickFnOnce = () => {
     document.getElementById('search-mask').addEventListener('click', closeSearch)
     document.querySelector('#algolia-search .search-close-button').addEventListener('click', closeSearch)
   }
 
-  searchClickFn()
+  const cutContent = content => {
+    if (content === '') return ''
 
-  window.addEventListener('pjax:complete', function () {
+    const firstOccur = content.indexOf('<mark>')
-    getComputedStyle(document.querySelector('#algolia-search .search-dialog')).display === 'block' && closeSearch()
+
-    searchClickFn()
+    let start = firstOccur - 30
-  })
+    let end = firstOccur + 120
+    let pre = ''
+    let post = ''
+
+    if (start <= 0) {
+      start = 0
+      end = 140
+    } else {
+      pre = '...'
+    }
+
+    if (end > content.length) {
+      end = content.length
+    } else {
+      post = '...'
+    }
+
+    let matchContent = pre + content.substring(start, end) + post
+    return matchContent
+  }
 
   const algolia = GLOBAL_CONFIG.algolia
   const isAlgoliaValid = algolia.appId && algolia.apiKey && algolia.indexName
@@ -43,81 +66,97 @@ window.addEventListener('load', () => {
     return console.error('Algolia setting is invalid!')
   }
 
-  const searchClient = window.algoliasearch(algolia.appId, algolia.apiKey)
   const search = instantsearch({
     indexName: algolia.indexName,
-    searchClient
+    searchClient: algoliasearch(algolia.appId, algolia.apiKey),
+    searchFunction(helper) {
+      helper.state.query && helper.search()
+    },
   })
 
-  search.addWidgets([
+  const configure = instantsearch.widgets.configure({
-    instantsearch.widgets.configure({
+    hitsPerPage: 5
-      hitsPerPage: 5
+  })
-    })
-  ])
 
-  search.addWidgets([
+  const searchBox = instantsearch.widgets.searchBox({
-    instantsearch.widgets.searchBox({
+    container: '#algolia-search-input',
-      container: '#algolia-search-input',
+    showReset: false,
-      showReset: false,
+    showSubmit: false,
-      showSubmit: false,
+    placeholder: GLOBAL_CONFIG.algolia.languages.input_placeholder,
-      placeholder: GLOBAL_CONFIG.algolia.languages.input_placeholder,
+    showLoadingIndicator: true
-      showLoadingIndicator: true
+  })
-    })
-  ])
 
-  search.addWidgets([
+  const hits = instantsearch.widgets.hits({
-    instantsearch.widgets.hits({
+    container: '#algolia-hits',
-      container: '#algolia-hits',
+    templates: {
-      templates: {
+      item(data) {
-        item: function (data) {
+        const link = data.permalink ? data.permalink : (GLOBAL_CONFIG.root + data.path)
-          const link = data.permalink ? data.permalink : (GLOBAL_CONFIG.root + data.path)
+        const result = data._highlightResult
-          return `
+        const content = result.contentStripTruncate
-            <a href="${link}" class="algolia-hit-item-link">
+                        ? cutContent(result.contentStripTruncate.value)
-            ${data._highlightResult.title.value || 'no-title'}
+                        : result.contentStrip
-            </a>`
+                        ? cutContent(result.contentStrip.value)
-        },
+                        : result.content
-        empty: function (data) {
+                        ? cutContent(result.content.value)
-          return (
+                        : ''
-            '<div id="algolia-hits-empty">' +
+        return `
-            GLOBAL_CONFIG.algolia.languages.hits_empty.replace(/\$\{query}/, data.query) +
+          <a href="${link}" class="algolia-hit-item-link">
-            '</div>'
+          ${result.title.value || 'no-title'}
-          )
+          </a>
-        }
+          <p class="algolia-hit-item-content">${content}</p>`
+      },
+      empty: function (data) {
+        return (
+          '<div id="algolia-hits-empty">' +
+          GLOBAL_CONFIG.algolia.languages.hits_empty.replace(/\$\{query}/, data.query) +
+          '</div>'
+        )
       }
-    })
+    }
-  ])
+  })
 
-  search.addWidgets([
+  const stats = instantsearch.widgets.stats({
-    instantsearch.widgets.stats({
+    container: '#algolia-info > .algolia-stats',
-      container: '#algolia-stats',
+    templates: {
-      templates: {
+      text: function (data) {
-        text: function (data) {
+        const stats = GLOBAL_CONFIG.algolia.languages.hits_stats
-          const icon = '<svg viewBox="0 0 1366 362" xmlns="http://www.w3.org/2000/svg"><linearGradient id="a" x1="428.26" x2="434.14" y1="404.15" y2="409.85" gradientTransform="matrix(94.045 0 0 -94.072 -40382 38480)" gradientUnits="userSpaceOnUse"><stop stop-color="#00aeff" offset="0"/><stop stop-color="#3369e7" offset="1"/></linearGradient><path d="M61.8 15.4h242.8c23.9 0 43.4 19.4 43.4 43.4v242.9c0 23.9-19.4 43.4-43.4 43.4H61.8c-23.9 0-43.4-19.4-43.4-43.4v-243c0-23.9 19.4-43.3 43.4-43.3z" fill="url(#a)"/><path d="M187 98.7c-51.4 0-93.1 41.7-93.1 93.2S135.6 285 187 285s93.1-41.7 93.1-93.2-41.6-93.1-93.1-93.1zm0 158.8c-36.2 0-65.6-29.4-65.6-65.6s29.4-65.6 65.6-65.6 65.6 29.4 65.6 65.6-29.3 65.6-65.6 65.6zm0-117.8v48.9c0 1.4 1.5 2.4 2.8 1.7l43.4-22.5c1-.5 1.3-1.7.8-2.7-9-15.8-25.7-26.6-45-27.3-1 0-2 .8-2 1.9zm-60.8-35.9l-5.7-5.7c-5.6-5.6-14.6-5.6-20.2 0l-6.8 6.8c-5.6 5.6-5.6 14.6 0 20.2l5.6 5.6c.9.9 2.2.7 3-.2 3.3-4.5 6.9-8.8 10.9-12.8 4.1-4.1 8.3-7.7 12.9-11 1-.6 1.1-2 .3-2.9zM217.5 89V77.7c0-7.9-6.4-14.3-14.3-14.3h-33.3c-7.9 0-14.3 6.4-14.3 14.3v11.6c0 1.3 1.2 2.2 2.5 1.9 9.3-2.7 19.1-4.1 29-4.1 9.5 0 18.9 1.3 28 3.8 1.2.3 2.4-.6 2.4-1.9z" fill="#FFF"/><path d="m842.5 267.6c0 26.7-6.8 46.2-20.5 58.6s-34.6 18.6-62.8 18.6c-10.3 0-31.7-2-48.8-5.8l6.3-31c14.3 3 33.2 3.8 43.1 3.8 15.7 0 26.9-3.2 33.6-9.6s10-15.9 10-28.5v-6.4c-3.9 1.9-9 3.8-15.3 5.8-6.3 1.9-13.6 2.9-21.8 2.9-10.8 0-20.6-1.7-29.5-5.1s-16.6-8.4-22.9-15-11.3-14.9-14.8-24.8-5.3-27.6-5.3-40.6c0-12.2 1.9-27.5 5.6-37.7 3.8-10.2 9.2-19 16.5-26.3 7.2-7.3 16-12.9 26.3-17s22.4-6.7 35.5-6.7c12.7 0 24.4 1.6 35.8 3.5s21.1 3.9 29 6.1v155.2zm-108.7-77.2c0 16.4 3.6 34.6 10.8 42.2s16.5 11.4 27.9 11.4c6.2 0 12.1-0.9 17.6-2.6s9.9-3.7 13.4-6.1v-97.1c-2.8-0.6-14.5-3-25.8-3.3-14.2-0.4-25 5.4-32.6 14.7-7.5 9.3-11.3 25.6-11.3 40.8zm294.3 0c0 13.2-1.9 23.2-5.8 34.1s-9.4 20.2-16.5 27.9-15.6 13.7-25.6 17.9-25.4 6.6-33.1 6.6c-7.7-0.1-23-2.3-32.9-6.6s-18.4-10.2-25.5-17.9-12.6-17-16.6-27.9-6-20.9-6-34.1 1.8-25.9 5.8-36.7 9.6-20 16.8-27.7 15.8-13.6 25.6-17.8c9.9-4.2 20.8-6.2 32.6-6.2s22.7 2.1 32.7 6.2c10 4.2 18.6 10.1 25.6 17.8 7.1 7.7 12.6 16.9 16.6 27.7 4.2 10.8 6.3 23.5 6.3 36.7zm-40 0.1c0-16.9-3.7-31-10.9-40.8-7.2-9.9-17.3-14.8-30.2-14.8s-23 4.9-30.2 14.8-10.7 23.9-10.7 40.8c0 17.1 3.6 28.6 10.8 38.5 7.2 10 17.3 14.9 30.2 14.9s23-5 30.2-14.9c7.2-10 10.8-21.4 10.8-38.5zm127.1 86.4c-64.1 0.3-64.1-51.8-64.1-60.1l-0.1-184.8 39.1-6.2v183.6c0 4.7 0 34.5 25.1 34.6v32.9zm68.9 0h-39.3v-168.8l39.3-6.2v175zm-19.7-193.5c13.1 0 23.8-10.6 23.8-23.7s-10.6-23.7-23.8-23.7-23.8 10.6-23.8 23.7 10.7 23.7 23.8 23.7zm117.4 18.6c12.9 0 23.8 1.6 32.6 4.8s15.9 7.7 21.1 13.4 8.9 13.5 11.1 21.7c2.3 8.2 3.4 17.2 3.4 27.1v100.6c-6 1.3-15.1 2.8-27.3 4.6s-25.9 2.7-41.1 2.7c-10.1 0-19.4-1-27.7-2.9-8.4-1.9-15.5-5-21.5-9.3-5.9-4.3-10.5-9.8-13.9-16.6-3.3-6.8-5-16.4-5-26.4 0-9.6 1.9-15.7 5.6-22.3 3.8-6.6 8.9-12 15.3-16.2 6.5-4.2 13.9-7.2 22.4-9s17.4-2.7 26.6-2.7c4.3 0 8.8 0.3 13.6 0.8s9.8 1.4 15.2 2.7v-6.4c0-4.5-0.5-8.8-1.6-12.8-1.1-4.1-3-7.6-5.6-10.7-2.7-3.1-6.2-5.5-10.6-7.2s-10-3-16.7-3c-9 0-17.2 1.1-24.7 2.4s-13.7 2.8-18.4 4.5l-4.7-32.1c4.9-1.7 12.2-3.4 21.6-5.1s19.5-2.6 30.3-2.6zm3.3 141.9c12 0 20.9-0.7 27.1-1.9v-39.8c-2.2-0.6-5.3-1.3-9.4-1.9s-8.6-1-13.6-1c-4.3 0-8.7 0.3-13.1 1-4.4 0.6-8.4 1.8-11.9 3.5s-6.4 4.1-8.5 7.2c-2.2 3.1-3.2 4.9-3.2 9.6 0 9.2 3.2 14.5 9 18 5.9 3.6 13.7 5.3 23.6 5.3zm-772.2-140.9c12.9 0 23.8 1.6 32.6 4.8s15.9 7.7 21.1 13.4c5.3 5.8 8.9 13.5 11.1 21.7 2.3 8.2 3.4 17.2 3.4 27.1v100.6c-6 1.3-15.1 2.8-27.3 4.6s-25.9 2.7-41.1 2.7c-10.1 0-19.4-1-27.7-2.9-8.4-1.9-15.5-5-21.5-9.3-5.9-4.3-10.5-9.8-13.9-16.6-3.3-6.8-5-16.4-5-26.4 0-9.6 1.9-15.7 5.6-22.3 3.8-6.6 8.9-12 15.3-16.2 6.5-4.2 13.9-7.2 22.4-9s17.4-2.7 26.6-2.7c4.3 0 8.8 0.3 13.6 0.8 4.7 0.5 9.8 1.4 15.2 2.7v-6.4c0-4.5-0.5-8.8-1.6-12.8-1.1-4.1-3-7.6-5.6-10.7-2.7-3.1-6.2-5.5-10.6-7.2s-10-3-16.7-3c-9 0-17.2 1.1-24.7 2.4s-13.7 2.8-18.4 4.5l-4.7-32.1c4.9-1.7 12.2-3.4 21.6-5.1 9.4-1.8 19.5-2.6 30.3-2.6zm3.4 142c12 0 20.9-0.7 27.1-1.9v-39.8c-2.2-0.6-5.3-1.3-9.4-1.9s-8.6-1-13.6-1c-4.3 0-8.7 0.3-13.1 1-4.4 0.6-8.4 1.8-11.9 3.5s-6.4 4.1-8.5 7.2c-2.2 3.1-3.2 4.9-3.2 9.6 0 9.2 3.2 14.5 9 18s13.7 5.3 23.6 5.3zm158.5 31.9c-64.1 0.3-64.1-51.8-64.1-60.1l-0.1-184.8 39.1-6.2v183.6c0 4.7 0 34.5 25.1 34.6v32.9z" fill="#182359"/></svg>'
+          .replace(/\$\{hits}/, data.nbHits)
-          const stats = GLOBAL_CONFIG.algolia.languages.hits_stats
+          .replace(/\$\{time}/, data.processingTimeMS)
-            .replace(/\$\{hits}/, data.nbHits)
+        return (
-            .replace(/\$\{time}/, data.processingTimeMS)
+          `<hr>${stats}`
-          return (
+        )
-            `<hr>${stats}<span class="algolia-logo pull-right">${icon}</span>`
-          )
-        }
       }
-    })
+    }
-  ])
+  })
+
+  const powerBy = instantsearch.widgets.poweredBy({
+    container: '#algolia-info > .algolia-poweredBy',
+  })
+
+  const pagination = instantsearch.widgets.pagination({
+    container: '#algolia-pagination',
+    totalPages: 5,
+    templates: {
+      first: '<i class="fas fa-angle-double-left"></i>',
+      last: '<i class="fas fa-angle-double-right"></i>',
+      previous: '<i class="fas fa-angle-left"></i>',
+      next: '<i class="fas fa-angle-right"></i>'
+    }
+  })
+
+
+  search.addWidgets([configure,searchBox,hits,stats,powerBy,pagination]) // add the widgets to the instantsearch instance
 
-  search.addWidgets([
-    instantsearch.widgets.pagination({
-      container: '#algolia-pagination',
-      totalPages: 5,
-      templates: {
-        first: '<i class="fas fa-angle-double-left"></i>',
-        last: '<i class="fas fa-angle-double-right"></i>',
-        previous: '<i class="fas fa-angle-left"></i>',
-        next: '<i class="fas fa-angle-right"></i>'
-      }
-    })
-  ])
   search.start()
 
+  searchClickFn()
+  searchClickFnOnce()
+
+  window.addEventListener('pjax:complete', () => {
+    getComputedStyle(document.querySelector('#algolia-search .search-dialog')).display === 'block' && closeSearch()
+    searchClickFn()
+  })
+
   window.pjax && search.on('render', () => {
     window.pjax.refresh(document.getElementById('algolia-hits'))
   })

source/js/search/local-search.js

@@ -1,14 +1,17 @@
 window.addEventListener('load', () => {
   let loadFlag = false
+  let dataObj = []
+  const $searchMask = document.getElementById('search-mask')
+
   const openSearch = () => {
     const bodyStyle = document.body.style
     bodyStyle.width = '100%'
     bodyStyle.overflow = 'hidden'
-    btf.animateIn(document.getElementById('search-mask'), 'to_show 0.5s')
+    btf.animateIn($searchMask, 'to_show 0.5s')
     btf.animateIn(document.querySelector('#local-search .search-dialog'), 'titleScale 0.5s')
     setTimeout(() => { document.querySelector('#local-search-input input').focus() }, 100)
     if (!loadFlag) {
-      search(GLOBAL_CONFIG.localSearch.path)
+      search()
       loadFlag = true
     }
     // shortcut: ESC
@@ -25,35 +28,35 @@ window.addEventListener('load', () => {
     bodyStyle.width = ''
     bodyStyle.overflow = ''
     btf.animateOut(document.querySelector('#local-search .search-dialog'), 'search_close .5s')
-    btf.animateOut(document.getElementById('search-mask'), 'to_hide 0.5s')
+    btf.animateOut($searchMask, 'to_hide 0.5s')
   }
 
-  // click function
   const searchClickFn = () => {
     document.querySelector('#search-button > .search').addEventListener('click', openSearch)
-    document.getElementById('search-mask').addEventListener('click', closeSearch)
-    document.querySelector('#local-search .search-close-button').addEventListener('click', closeSearch)
   }
 
-  searchClickFn()
+  const searchClickFnOnce = () => {
+    document.querySelector('#local-search .search-close-button').addEventListener('click', closeSearch)
+    $searchMask.addEventListener('click', closeSearch)
+    if (GLOBAL_CONFIG.localSearch.preload) dataObj = fetchData(GLOBAL_CONFIG.localSearch.path)
+  }
 
-  // pjax
+  // check url is json or not
-  window.addEventListener('pjax:complete', function () {
+  const isJson = url => {
-    getComputedStyle(document.querySelector('#local-search .search-dialog')).display === 'block' && closeSearch()
+    const reg = /\.json$/
-    searchClickFn()
+    return reg.test(url)
-  })
+  }
 
-  async function search (path) {
+  const fetchData = async (path) => {
-    let datas = []
+    let data = []
-    const typeF = path.split('.')[1]
+    const response = await fetch(path)
-    const response = await fetch(GLOBAL_CONFIG.root + path)
+    if (isJson(path)) {
-    if (typeF === 'json') {
+      data = await response.json()
-      datas = await response.json()
+    } else {
-    } else if (typeF === 'xml') {
       const res = await response.text()
       const t = await new window.DOMParser().parseFromString(res, 'text/xml')
       const a = await t
-      datas = [...a.querySelectorAll('entry')].map(function (item) {
+      data = [...a.querySelectorAll('entry')].map(item =>{
         return {
           title: item.querySelector('title').textContent,
           content: item.querySelector('content') && item.querySelector('content').textContent,
@@ -66,10 +69,18 @@ window.addEventListener('load', () => {
       $loadDataItem.nextElementSibling.style.display = 'block'
       $loadDataItem.remove()
     }
+    return data
+  }
+
+  const search = () => {
+    if (!GLOBAL_CONFIG.localSearch.preload) {
+      dataObj = fetchData(GLOBAL_CONFIG.localSearch.path)
+    }
 
     const $input = document.querySelector('#local-search-input input')
     const $resultContent = document.getElementById('local-search-results')
     const $loadingStatus = document.getElementById('loading-status')
+
     $input.addEventListener('input', function () {
       const keywords = this.value.trim().toLowerCase().split(/[\s]+/)
       if (keywords[0] !== '') $loadingStatus.innerHTML = '<i class="fas fa-spinner fa-pulse"></i>'
@@ -79,82 +90,99 @@ window.addEventListener('load', () => {
       if (keywords.length <= 0) return
       let count = 0
       // perform local searching
-      datas.forEach(function (data) {
+      dataObj.then(data => {
-        let isMatch = true
+        data.forEach(data => {
-        let dataTitle = data.title ? data.title.trim().toLowerCase() : ''
+          let isMatch = true
-        const dataContent = data.content ? data.content.trim().replace(/<[^>]+>/g, '').toLowerCase() : ''
+          let dataTitle = data.title ? data.title.trim().toLowerCase() : ''
-        const dataUrl = data.url.startsWith('/') ? data.url : GLOBAL_CONFIG.root + data.url
+          const dataContent = data.content ? data.content.trim().replace(/<[^>]+>/g, '').toLowerCase() : ''
-        let indexTitle = -1
+          const dataUrl = data.url.startsWith('/') ? data.url : GLOBAL_CONFIG.root + data.url
-        let indexContent = -1
+          let indexTitle = -1
-        let firstOccur = -1
+          let indexContent = -1
-        // only match artiles with not empty titles and contents
+          let firstOccur = -1
-        if (dataTitle !== '' || dataContent !== '') {
+          // only match articles with not empty titles and contents
-          keywords.forEach(function (keyword, i) {
+          if (dataTitle !== '' || dataContent !== '') {
-            indexTitle = dataTitle.indexOf(keyword)
+            keywords.forEach((keyword, i) => {
-            indexContent = dataContent.indexOf(keyword)
+              indexTitle = dataTitle.indexOf(keyword)
-            if (indexTitle < 0 && indexContent < 0) {
+              indexContent = dataContent.indexOf(keyword)
-              isMatch = false
+              if (indexTitle < 0 && indexContent < 0) {
-            } else {
+                isMatch = false
-              if (indexContent < 0) {
+              } else {
-                indexContent = 0
+                if (indexContent < 0) {
+                  indexContent = 0
+                }
+                if (i === 0) {
+                  firstOccur = indexContent
+                }
               }
-              if (i === 0) {
-                firstOccur = indexContent
-              }
-            }
-          })
-        } else {
-          isMatch = false
-        }
-
-        // show search results
-        if (isMatch) {
-          if (firstOccur >= 0) {
-            // cut out 130 characters
-            // let start = firstOccur - 30 < 0 ? 0 : firstOccur - 30
-            // let end = firstOccur + 50 > dataContent.length ? dataContent.length : firstOccur + 50
-            let start = firstOccur - 30
-            let end = firstOccur + 100
-
-            if (start < 0) {
-              start = 0
-            }
-
-            if (start === 0) {
-              end = 100
-            }
-
-            if (end > dataContent.length) {
-              end = dataContent.length
-            }
-
-            let matchContent = dataContent.substring(start, end)
-
-            // highlight all keywords
-            keywords.forEach(function (keyword) {
-              const regS = new RegExp(keyword, 'gi')
-              matchContent = matchContent.replace(regS, '<span class="search-keyword">' + keyword + '</span>')
-              dataTitle = dataTitle.replace(regS, '<span class="search-keyword">' + keyword + '</span>')
             })
-
+          } else {
-            str += '<div class="local-search__hit-item"><a href="' + dataUrl + '" class="search-result-title">' + dataTitle + '</a>'
+            isMatch = false
-            count += 1
-
-            if (dataContent !== '') {
-              str += '<p class="search-result">' + matchContent + '...</p>'
-            }
           }
-          str += '</div>'
+
+          // show search results
+          if (isMatch) {
+            if (firstOccur >= 0) {
+              // cut out 130 characters
+              // let start = firstOccur - 30 < 0 ? 0 : firstOccur - 30
+              // let end = firstOccur + 50 > dataContent.length ? dataContent.length : firstOccur + 50
+              let start = firstOccur - 30
+              let end = firstOccur + 100
+              let pre = ''
+              let post = ''
+
+              if (start < 0) {
+                start = 0
+              }
+
+              if (start === 0) {
+                end = 100
+              } else {
+                pre = '...'
+              }
+
+              if (end > dataContent.length) {
+                end = dataContent.length
+              } else {
+                post = '...'
+              }
+
+              let matchContent = dataContent.substring(start, end)
+
+              // highlight all keywords
+              keywords.forEach(keyword => {
+                const regS = new RegExp(keyword, 'gi')
+                matchContent = matchContent.replace(regS, '<span class="search-keyword">' + keyword + '</span>')
+                dataTitle = dataTitle.replace(regS, '<span class="search-keyword">' + keyword + '</span>')
+              })
+
+              str += '<div class="local-search__hit-item"><a href="' + dataUrl + '" class="search-result-title">' + dataTitle + '</a>'
+              count += 1
+
+              if (dataContent !== '') {
+                str += '<p class="search-result">' + pre + matchContent + post + '</p>'
+              }
+            }
+            str += '</div>'
+          }
+        })
+        if (count === 0) {
+          str += '<div id="local-search__hits-empty">' + GLOBAL_CONFIG.localSearch.languages.hits_empty.replace(/\$\{query}/, this.value.trim()) +
+            '</div>'
         }
+        str += '</div>'
+        $resultContent.innerHTML = str
+        if (keywords[0] !== '') $loadingStatus.innerHTML = ''
+        window.pjax && window.pjax.refresh($resultContent)
       })
-      if (count === 0) {
-        str += '<div id="local-search__hits-empty">' + GLOBAL_CONFIG.localSearch.languages.hits_empty.replace(/\$\{query}/, this.value.trim()) +
-          '</div>'
-      }
-      str += '</div>'
-      $resultContent.innerHTML = str
-      if (keywords[0] !== '') $loadingStatus.innerHTML = ''
-      window.pjax && window.pjax.refresh($resultContent)
     })
   }
+
+  searchClickFn()
+  searchClickFnOnce()
+
+  // pjax
+  window.addEventListener('pjax:complete', () => {
+    !btf.isHidden($searchMask) && closeSearch()
+    searchClickFn()
+  })
 })