hexo-theme-solitude 3.0.20 → 4.0.0

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

@@ -1,16 +1,16 @@
 #local-search
-    div.search-dialog
+    div.search-dialog(role="dialog" aria-modal="true" aria-labelledby="local-search-title")
         nav.search-nav
-            span.search-dialog-title=__('nav.search')
-            button.search-close-button
+            span.search-dialog-title#local-search-title=__('nav.search')
+            button.search-close-button(type="button" aria-label=__('search.close'))
                 i.solitude.fas.fa-xmark
         div.search-wrap
             div.search-box
-                input.search-box-input#search-input(type="text", autocomplete="off", spellcheck="false", autocorrect="off", autocapitalize="off", placeholder=__('search.placeholder'))
-            div#search-results
-                #search-hits
-                    each tag in theme.search.tags || []
-                        a.tag-list(href='javascript:void(0);' onclick="pjax.loadUrl('" + url_for('/tags/' + tag) + "/')")=tag
+                input.search-box-input#search-input(type="search" autocomplete="off" spellcheck="false" autocorrect="off" autocapitalize="off" placeholder=__('search.placeholder') aria-label=__('search.placeholder'))
+            div#search-suggestions(aria-label=__('search.suggestions'))
+                each tag in theme.search.tags || []
+                    button.tag-list(type="button" data-query=tag)=tag
+            ul#search-results(hidden)
             div#search-pagination
             div#search-tips
-    div#search-mask
+    div#search-mask

package/layout/index.pug

@@ -23,7 +23,7 @@ mixin categoryBar()
 //- 文章列表组件
 mixin postsList()
   .recent-posts#recent-posts
-    +conditionalWrapper(theme.comment.hot_tip.enable)
+    if theme.comment.hot_tip.enable
       include ./includes/widgets/third-party/hot/index.pug
     
     each post, index in page.posts.sort("-sticky" || "-date").data
@@ -34,14 +34,16 @@ mixin postsList()
 
 //- 首页主内容组件
 mixin homeContent()
-  main.layout#content-inner
-    #home
+  main.layout.layout--home#content-inner
+    .home-category-bar.category-in-bar
       +categoryBar()
-      +postsList()
-    
-    //- 侧边栏
-    include ./includes/widgets/aside/aside
+    .home-layout-row
+      #home
+        +postsList()
+
+      //- 侧边栏
+      include ./includes/widgets/aside/aside
 
 block content
   +homeTop()
-  +homeContent()
+  +homeContent()

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "3.0.20",
+  "version": "4.0.0",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.",
   "main": "package.json",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
   "keywords": [
     "hexo",
     "theme",
     "solitude",
     "Card UI Design",
     "@everfu",
-    "everly",
+    "everfu",
+    "伍拾柒",
     "hexo-theme-solitude"
   ],
   "repository": {
@@ -26,8 +30,5 @@
   },
   "homepage": "https://solitude.js.org",
   "author": "Hexo-Theme-Solitude<o@efu.me>",
-  "license": "Apache-2.0",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  }
-}
+  "license": "Apache-2.0"
+}

package/plugins.yml

@@ -1,21 +1,21 @@
 algolia_search:
   name: algoliasearch
   file: dist/algoliasearch.umd.js
-  version: 5.19.0
+  version: 5.55.2
 instantsearch:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.75.7
+  version: 4.105.0
 docsearch_css:
   name: "@docsearch/css"
   other_name: docsearch-css
   file: dist/style.css
-  version: 3.8.2
+  version: 3.9.0
 docsearch_js:
   name: "@docsearch/js"
   other_name: docsearch-js
   file: dist/umd/index.js
-  version: 3.8.2
+  version: 3.9.0
 pjax:
   name: pjax
   file: pjax.min.js
@@ -23,16 +23,16 @@ pjax:
 twikoo:
   name: twikoo
   file: dist/twikoo.all.min.js
-  version: 1.6.41
+  version: 1.7.14
 waline_js:
   name: "@waline/client"
   file: dist/waline.js
   other_name: waline
-  version: 3.4.3
+  version: 3.15.2
 waline_css:
   name: "@waline/client"
   file: dist/waline.css
-  version: 3.4.3
+  version: 3.15.2
   other_name: waline
 valine:
   name: valine
@@ -50,12 +50,12 @@ katex:
   name: katex
   file: dist/katex.min.css
   other_name: KaTeX
-  version: 0.16.9
+  version: 0.16.47
 katex_copytex:
   name: katex
   file: dist/contrib/copy-tex.min.js
   other_name: KaTeX
-  version: 0.16.9
+  version: 0.16.47
 lazyload:
   name: vanilla-lazyload
   file: dist/lazyload.iife.min.js
@@ -71,7 +71,7 @@ aplayer_js:
 meting_js:
   name: meting
   file: dist/Meting.min.js
-  version: 2.0.1
+  version: 2.0.2
 pace_js:
   name: pace-js
   other_name: pace
@@ -80,12 +80,12 @@ pace_js:
 swiper_css:
   name: swiper
   file: swiper-bundle.min.css
-  version: 11.0.5
+  version: 14.0.5
   other_name: Swiper
 swiper_js:
   name: swiper
   file: swiper-bundle.min.js
-  version: 11.0.5
+  version: 14.0.5
   other_name: Swiper
 busuanzi_js:
   name: busuanzi
@@ -98,7 +98,7 @@ snackbar:
 fontawesome:
   name: "@fortawesome/fontawesome-free"
   file: css/all.min.css
-  version: 6.7.2
+  version: 7.3.0
   other_name: font-awesome
 medium_zoom:
   name: medium-zoom
@@ -106,22 +106,22 @@ medium_zoom:
   version: 1.1.0
 fancyapps_ui:
   name: "@fancyapps/ui"
-  file: dist/fancybox/fancybox.umd.min.js
-  version: 5.0.36
+  file: dist/fancybox/fancybox.umd.js
+  version: 6.1.14
   other_name: fancyapps-ui
 fancyapps_css:
   name: "@fancyapps/ui"
-  file: dist/fancybox/fancybox.min.css
-  version: 5.0.36
+  file: dist/fancybox/fancybox.css
+  version: 6.1.14
   other_name: fancyapps-ui
 mermaid_js:
   name: mermaid
   file: dist/mermaid.js
-  version: 11.4.1
+  version: 11.16.0
 chart_js:
   name: chart.js
   file: dist/chart.umd.js
-  version: 4.4.1
+  version: 4.5.1
   other_name: Chart.js
 typeit_js:
   name: typeit
@@ -139,6 +139,7 @@ qrcode:
   other_name: qrcodejs
 color_thief:
   name: colorthief
-  file: dist/color-thief.min.js
-  version: 2.6.0
+  file: dist/umd/color-thief.global.js
+  version: 3.4.0
   other_name: color-thief
+  cdnjs_format: https://cdn.jsdelivr.net/npm/${name}@${version}/${min_file}

package/scripts/event/cdn.js

@@ -32,20 +32,24 @@ hexo.extend.filter.register("before_generate", () => {
     waterfall: { name, file: "js/third_party/waterfall.min.js", version },
     universe_js: { name, file: "js/third_party/universe.min.js", version },
     post_ai: { name, file: "js/post_ai.js", version },
+    friend_links: { name, file: "js/friend_links.js", version },
     envelope_js: { name, file: "js/third_party/envelope.min.js", version },
   };
 
   const minFile = (file) =>
     file.replace(/(?<!\.min)\.(js|css)$/g, (ext) => `.min${ext}`);
 
+  const formatCDN = (format, value) =>
+    (format || "").replace(/\$\{(.+?)}/g, (match, key) => value[key]);
+
   const createCDNLink = (data, type, cond = "") => {
     Object.keys(data).forEach((key) => {
-      let { name, version, file, other_name } = data[key];
+      let { name, version, file, other_name, cdnjs_format } = data[key];
       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 min_file = minFile(file);
+      const min_file = cond === "internal" ? file : minFile(file);
       const verType = CDN.version
         ? type === "local"
           ? `?v=${version}`
@@ -69,11 +73,12 @@ hexo.extend.filter.register("before_generate", () => {
             : `/pluginsSrc/${name}/${file + verType}`,
         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]
+        cdnjs: formatCDN(
+          cdnjs_format ||
+            "https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}",
+          value
         ),
+        custom: formatCDN(CDN.custom_format, value),
       };
 
       data[key] = cdnSource[type];

package/scripts/event/friend_links.js

@@ -0,0 +1,30 @@
+"use strict";
+
+const getFriendLinksMeta = (hexo) => {
+  const linksData = hexo.locals.get("data")?.links;
+  const groups = Array.isArray(linksData?.links) ? linksData.links : [];
+  const total = groups.reduce(
+    (count, group) =>
+      count + (Array.isArray(group?.link_list) ? group.link_list.length : 0),
+    0
+  );
+  const configuredThreshold = Number(
+    hexo.theme.config.page?.links?.async_threshold
+  );
+  const threshold =
+    Number.isInteger(configuredThreshold) && configuredThreshold >= 0
+      ? configuredThreshold
+      : 200;
+
+  return { linksData, total, async: total > threshold };
+};
+
+hexo.extend.generator.register("friend-links-data", function () {
+  const meta = getFriendLinksMeta(this);
+  if (!meta.linksData || meta.total === 0) return;
+
+  return {
+    path: "links.json",
+    data: JSON.stringify({ ...meta.linksData, total: meta.total }),
+  };
+});

package/scripts/event/merge_config.js

@@ -26,13 +26,16 @@ hexo.extend.filter.register(
           icon: null,
         },
         group: null,
-        recommendList: {
-          sup: "Recommend",
-          title: "Solitude Docs",
-          url: "https://solitude.js.org/",
-          img: "/img/default.avif",
-          color: "none",
-        },
+        recommendList: [
+          {
+            order: 1,
+            sup: "Recommend",
+            title: "Solitude Docs",
+            url: "https://solitude.js.org/",
+            img: "/img/default.avif",
+            color: "none",
+          },
+        ],
       },
       aside: {
         home: { noSticky: "about", Sticky: "allInfo" },
@@ -82,6 +85,7 @@ hexo.extend.filter.register(
         tags: true,
         categories: true,
         archives: 0,
+        links: { async_threshold: 200 },
         default: { cover: ["/img/default.avif"] },
       },
       post: {
@@ -136,6 +140,10 @@ hexo.extend.filter.register(
       theme_color: {
         dark: "#ffc848",
         light: "#425AEF",
+        nav_hover_text: {
+          dark: "#1b1c20",
+          light: "#ffffff",
+        },
       },
       display_mode: {
         type: "auto",

package/scripts/filter/comment.js

@@ -9,5 +9,5 @@ hexo.extend.filter.register('before_generate', () => {
     if (typeof use === 'string') {
         use = use.split(',').slice(0,2)
     }
-    themeConfig.comment.use = use.map(item => item.toLowerCase().replace(/\b[a-z]/g, s => s.toUpperCase()))
-})
+    themeConfig.comment.use = use.map(item => item.trim().toLowerCase().replace(/\b[a-z]/g, s => s.toUpperCase()))
+})

package/scripts/filter/default.js

@@ -14,7 +14,7 @@ hexo.extend.filter.register("after_post_render", function (data) {
     data.excerpt =
       layout === "post" ? data.description || data.excerpt : data.title;
     data.toc = !!(config.aside.toc[layout] && data.toc !== false);
-    data.aside = layout === "post" ? data.aside || true : data.aside || false;
+    data.aside = data.aside !== undefined ? data.aside : (layout === "post");
   };
 
   if (data.layout === "post" || data.layout === "page") {

package/scripts/helper/inject_head_js.js

@@ -7,6 +7,16 @@
 
 hexo.extend.helper.register("inject_head_js", function () {
   const createJS = () => `
+        const parseConfig = (id) => {
+            const element = document.getElementById(id)
+            if (!element) return {}
+            try {
+                return JSON.parse(element.content?.textContent || element.textContent || '{}')
+            } catch (error) {
+                console.error('Invalid Solitude config:', error)
+                return {}
+            }
+        }
         const saveToLocal = {
             set: function setWithExpiry(key, value, ttl) {
                 if (ttl === 0)
@@ -25,7 +35,13 @@ hexo.extend.helper.register("inject_head_js", function () {
                 if (!itemStr) {
                     return undefined
                 }
-                const item = JSON.parse(itemStr)
+                let item
+                try {
+                    item = JSON.parse(itemStr)
+                } catch (error) {
+                    localStorage.removeItem(key)
+                    return undefined
+                }
                 const now = new Date()
 
                 if (now.getTime() > item.expiry) {
@@ -35,40 +51,62 @@ hexo.extend.helper.register("inject_head_js", function () {
                 return item.value
             }
         };
-        window.utils = {
+        const resourceRequests = new Map()
+        const loadResource = (url, create) => {
+            const absoluteUrl = new URL(url, document.baseURI).href
+            if (resourceRequests.has(absoluteUrl)) return resourceRequests.get(absoluteUrl)
+            const request = new Promise((resolve, reject) => {
+                const element = create(absoluteUrl)
+                element.addEventListener('load', () => resolve(element), {once: true})
+                element.addEventListener('error', () => {
+                    resourceRequests.delete(absoluteUrl)
+                    reject(new Error('Unable to load ' + absoluteUrl))
+                }, {once: true})
+                document.head.appendChild(element)
+            })
+            resourceRequests.set(absoluteUrl, request)
+            return request
+        }
+        const api = window.Solitude || {}
+        window.Solitude = api
+        api.installLegacyAdapter = () => {
+            const aliases = {
+                utils: api,
+                sco: api,
+                GLOBAL_CONFIG: api.config
+            }
+            Object.entries(aliases).forEach(([name, value]) => {
+                if (name in window) return
+                Object.defineProperty(window, name, {
+                    configurable: true,
+                    enumerable: false,
+                    value
+                })
+            })
+        }
+        Object.defineProperties(api, {
+            config: {configurable: true, get: () => parseConfig('site-config')},
+            page: {configurable: true, get: () => parseConfig('config-diff')}
+        })
+        Object.assign(api, {
             saveToLocal: saveToLocal,
-            getCSS: (url, id = false) => new Promise((resolve, reject) => {
-              const link = document.createElement('link')
-              link.rel = 'stylesheet'
-              link.href = url
-              if (id) link.id = id
-              link.onerror = reject
-              link.onload = link.onreadystatechange = function() {
-                const loadState = this.readyState
-                if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-                link.onload = link.onreadystatechange = null
-                resolve()
-              }
-              document.head.appendChild(link)
+            loadStyle: (url, options = {}) => loadResource(url, href => {
+                const link = document.createElement('link')
+                link.rel = 'stylesheet'
+                link.href = href
+                if (options.id) link.id = options.id
+                return link
             }),
-            getScript: (url, attr = {}) => new Promise((resolve, reject) => {
-              const script = document.createElement('script')
-              script.src = url
-              script.async = true
-              script.onerror = reject
-              script.onload = script.onreadystatechange = function() {
-                const loadState = this.readyState
-                if (loadState && loadState !== 'loaded' && loadState !== 'complete') return
-                script.onload = script.onreadystatechange = null
-                resolve()
-              }
-
-              Object.keys(attr).forEach(key => {
-                script.setAttribute(key, attr[key])
+            loadScript: (url, options = {}) => {
+              if (url.includes('barrage')) api.installLegacyAdapter()
+              return loadResource(url, src => {
+                const script = document.createElement('script')
+                script.src = src
+                script.async = options.async !== false
+                Object.entries(options.attributes || {}).forEach(([key, value]) => script.setAttribute(key, value))
+                return script
               })
-
-              document.head.appendChild(script)
-            }),
+            },
             addGlobalFn: (key, fn, name = false, parent = window) => {
                 const globalFn = parent.globalFn || {}
                 const keyObj = globalFn[key] || {}
@@ -82,7 +120,7 @@ hexo.extend.helper.register("inject_head_js", function () {
             },
             addEventListenerPjax: (ele, event, fn, option = false) => {
               ele.addEventListener(event, fn, option)
-              utils.addGlobalFn('pjax', () => {
+              api.addGlobalFn('pjax', () => {
                   ele.removeEventListener(event, fn, option)
               })
             },
@@ -92,7 +130,15 @@ hexo.extend.helper.register("inject_head_js", function () {
                     item.textContent = (date.getMonth() + 1).toString()+'/'+date.getDate().toString();
                 });
             },
+        })
+        api.getCSS = (url, id = false) => api.loadStyle(url, {id})
+        api.getScript = (url, attr = {}) => api.loadScript(url, {attributes: attr})
+        api.on = (name, handler) => {
+            const eventName = 'solitude:' + name
+            document.addEventListener(eventName, handler)
+            return () => document.removeEventListener(eventName, handler)
         }
+        api.navigate = url => api.pjax?.loadUrl ? api.pjax.loadUrl(url) : window.location.assign(url)
     `;
   return `<script>(()=>{${createJS()}})()</script>`;
 });

package/scripts/helper/related_post.js

@@ -12,23 +12,22 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     const headlineLang = this._p('star');
 
     const relatedPostsMap = new Map();
+    const currentTags = new Set((currentPost.tags || []).map(tag => tag.name));
 
-    currentPost.tags.forEach(tag => {
-        allPosts.forEach(post => {
-            if (isTagRelated(tag.name, post.tags) && currentPost.path !== post.path) {
-                if (!relatedPostsMap.has(post.path)) {
-                    relatedPostsMap.set(post.path, {
-                        title: post.title,
-                        path: post.path,
-                        cover: post.cover || 'var(--default-bg-color)',
-                        weight: 1,
-                        updated: post.updated,
-                        created: post.date
-                    });
-                } else {
-                    relatedPostsMap.get(post.path).weight += 1;
-                }
-            }
+    allPosts.forEach(post => {
+        if (currentPost.path === post.path) return;
+        const weight = (post.tags || []).reduce(
+            (count, tag) => count + Number(currentTags.has(tag.name)),
+            0
+        );
+        if (!weight) return;
+        relatedPostsMap.set(post.path, {
+            title: post.title,
+            path: post.path,
+            cover: post.cover || 'var(--default-bg-color)',
+            weight,
+            updated: post.updated,
+            created: post.date
         });
     });
 
@@ -45,7 +44,7 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
                 <i class="solitude fas fa-star"></i>
                 <span>${headlineLang}</span>
                 <div class="relatedPosts-link">
-                    <a onclick="event.preventDefault(); toRandomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">${this._p('random')}</a>
+                    <a onclick="event.preventDefault(); Solitude.randomPost();" href="javascript:void(0);" rel="external nofollow" data-pjax-state="">${this._p('random')}</a>
                 </div>
             </div>
             <div class="relatedPosts-list">`;
@@ -69,10 +68,6 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
     return result;
 });
 
-function isTagRelated(tagName, tags) {
-    return tags.some(tag => tagName === tag.name);
-}
-
 function compare(attr, dateType) {
     return (a, b) => {
         const val1 = a[attr];

package/scripts/tags/chart.js

@@ -18,7 +18,7 @@ const chart = (args, content) => {
         new Chart(ctx, {${content}});
       };
       document.addEventListener("DOMContentLoaded", chart);
-      utils.addEventListenerPjax(document, "pjax:complete", chart);
+      Solitude.addEventListenerPjax(document, "pjax:complete", chart);
     }()
     </script>
   </div>`;

package/scripts/tags/typeit.js

@@ -19,7 +19,7 @@ const typeit = ([tag], content) => {
           .go();
       }
       document.addEventListener("DOMContentLoaded", typeit);
-      utils.addEventListenerPjax(document, "pjax:complete", typeit);
+      Solitude.addEventListenerPjax(document, "pjax:complete", typeit);
     }()
     </script>
   </div>`