hexo-theme-shokax 0.2.8 → 0.2.10

package/.gitattribute

@@ -0,0 +1 @@
+* text=auto eol=lf

package/README.md

@@ -7,11 +7,11 @@
 ![version](https://shields.io/npm/v/hexo-theme-shokax)
 ![build](https://img.shields.io/github/actions/workflow/status/theme-shoka-x/hexo-theme-shokaX/build-theme.yml)
 
-语言(language): 简体中文 | [English](./README_en.md) \
+语言(language): 简体中文 | [English](./README_en.MD) \
 此项目是shoka的一个二次开发版(算精神续作),致力于提高性能和优化魔改体验 \
-诞生原因是目前shoka已经两年没有更新了,积压了大量BUG和功能请求。\
+诞生原因是目前shoka已经两年没有更新了,积压了大量BUG和功能请求。
 
-shokaX的社区资源导航和插件仓库为[awesome-shokaX](https://github.com/zkz098/awesome-shokaX)
+shokaX的社区资源导航和插件仓库为[awesome-shokaX](https://github.com/theme-shoka-x/awesome-shokaX)
 
 ## 💬 和shoka的区别
 原先shoka使用了javascript+Native+nunjucks的技术 \
@@ -75,7 +75,7 @@ GPL许可证主要目的是限制修改后的分发行为，避免未经许可
 | hexo-theme-shoka | amehime           | 本项目的父主题            |
 
 ## 开发者们
-[![](https://contributors-img.web.app/image?repo=zkz098/hexo-theme-shokaX)](https://github.com/zkz098/hexo-theme-shokaX/graphs/contributors)
+[![](https://contributors-img.web.app/image?repo=theme-shoka-x/hexo-theme-shokaX)](https://github.com/theme-shoka-x/hexo-theme-shokaX/graphs/contributors)
 
 ## 特别鸣谢
 [<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" width="25%">](https://jb.gg/OpenSourceSupport)

package/README_en.MD

@@ -1,4 +1,4 @@
-If the repository address you are visiting is zkz098/hexo-theme-shokaX, please switch to the latest address: theme-shoka-x/hexo-theme-shokaX.
+If the repository address you are visiting is **zkz098/hexo-theme-shokaX**, please switch to the latest address: [theme-shoka-x/hexo-theme-shokaX](https://github.com/theme-shoka-x/hexo-theme-shokaX)
 
 # hexo-theme-shokaX
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX?ref=badge_shield)
@@ -11,7 +11,7 @@ Language: [简体中文](./README.md) | English \
 This project is a secondary development version of shoka (spiritual sequel), dedicated to improving performance and optimizing modding experience.
 The reason for its birth is that shoka has not been updated for two years, with a large backlog of bugs and feature requests.
 
-The community resource navigation and plugin repository for shokaX is awesome-shokaX.
+The community resource navigation and plugin repository for shokaX is [awesome-shokaX](https://github.com/theme-shoka-x/awesome-shokaX)
 
 ## 💬 Differences with shoka
 The original shoka used javascript+Native+nunjucks technology, while shokaX uses typescript+Vue 3+Pug technology and has changed a lot of hard-to-access CDN links.
@@ -30,7 +30,7 @@ Remarks:
 - *: Requires implementation using Injection API.
 
 ## 🔧 How to Install?
-It is recommended to use [ShokaX-CLI](https://github.com/zkz098/shokaX-CLI) and execute the following command:
+It is recommended to use [ShokaX-CLI](https://github.com/theme-shoka-x/shokaX-CLI) and execute the following command:
 ```bash
 npm i shokax-cli --location=global
 # hexo init initializes the environment
@@ -50,7 +50,7 @@ license: GPL 3 or later
 
 ## Contributors
 
-[![](https://contributors-img.web.app/image?repo=zkz098/hexo-theme-shokaX)](https://github.com/zkz098/hexo-theme-shokaX/graphs/contributors)
+[![](https://contributors-img.web.app/image?repo=theme-shoka-x/hexo-theme-shokaX)](https://github.com/theme-shoka-x/hexo-theme-shokaX/graphs/contributors)
 
 ## Special thanks
 [<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" width="25%">](https://jb.gg/OpenSourceSupport)

package/_config.yml

@@ -61,14 +61,15 @@ seo:
 visitor:
   clarity: false
   baiduAnalytics: false
+  googleAnalytics: false
 
-darkmode: false
+darkmode: true
 auto_dark: # 自动亮/暗模式
   enable: true #是否开启
   start: 20 #开始时间
   end: 7 #结束时间
 
-auto_scroll: true
+auto_scroll: false
 
 loader:
   start: true # 进入页面时显示加载动画
@@ -252,7 +253,7 @@ widgets:
   recent_comments: true
 
 footer:
-  # Specify the date when the site was setup. If not defined, current year will be used.
+  # Specify the date when the site was set up. If not defined, current year will be used.
   since: 2022
   icon:
     name: sakura rotate
@@ -277,7 +278,7 @@ post:
 
 # 文章是否失效
 outime:
-  enable: true
+  enable: false
   days: 90 # 超过 90 天文章失效
 
 reward:
@@ -391,7 +392,6 @@ vendorsList:
   js:
     - pace
     - pjax
-#    - fetch  # polyfill已暂时禁用
     - anime
     - algolia
     - instantsearch

package/_images.yml

@@ -1,4 +1,4 @@
-# 此images已失效,见https://github.com/zkz098/hexo-theme-shokaX/issues/6
+# 此images已失效,见https://github.com/theme-shoka-x/hexo-theme-shokaX/issues/6
 - 6833939bly1giciryrr3rj20zk0m8nhk.jpg
 - 6833939bly1gicis081o9j20zk0m8dmr.jpg
 - 6833939bly1gicis3attqj20zk0m8k7l.jpg

package/layout/_mixin/comment.pug

@@ -34,7 +34,8 @@ mixin CommentRender()
                         wordLimit: #{theme.waline.wordLimit},
                         pageSize: #{theme.waline.pageSize},
                         pageview: #{theme.waline.pageview},
-                        path: path
+                        path: path,
+                        dark: 'html[data-theme="dark"]'
                     });
                 }, 1000)
         else if gt

package/layout/_partials/footer.pug

@@ -34,7 +34,7 @@ div(class="status")
             if beianN && RC
                 br
                 a(target="_blank" href=`https://www.beian.gov.cn/portal/registerSystemInfo?recordcode=${RC}`)
-                    img(src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;")
+                    img(src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;" width="20" height="20")
                     != beianN
     != shokax_inject('status')
 

package/layout/_partials/layout.pug

@@ -83,15 +83,15 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                 empty: "!{__('search.empty')}",
                 stats: "!{__('search.stats')}"
             },
-            valine: `#{page.valine ? _safedump(page.valine) : 'true'}`,
-                chart: `#{page.chart ? 'true' : 'false'}`,
-                copy_tex: `#{page.math ? 'true' : 'false'}`,
-                katex: `#{page.math ? 'true' : 'false'}`,
-                mermaid: `#{page.mermaid ? 'true' : 'false'}`,
+            valine: #{page.valine ? _safedump(page.valine) : true},
+                chart: #{!!page.chart},
+                copy_tex: #{!!page.math},
+                katex: #{!!page.math},
+                mermaid: #{!!page.mermaid},
                 audio: `#{_safedump(page.audio)}`,
-                fancybox: `#{page.fancybox !== false ? 'true' : 'false'}`,
-                nocopy: `#{page.nocopy ? 'true' : 'false'}`,
-                outime: `#{page.outime !== false ? 'true' : 'false'}`,
+                fancybox: #{page.fancybox !== false},
+                nocopy: #{!!page.nocopy},
+                outime: #{page.outime !== false},
                 template: `#{__('outime.template')}`,
                 quiz: {
                 choice: `#{__('quiz.choice')}`,
@@ -119,6 +119,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         != _js('app.js')
         != partial('_partials/third-party/baidu-analytics.pug', {}, {cache: true})
         != partial('_partials/third-party/clarity.pug', {}, {cache: true})
+        != partial('_partials/third-party/google-analytics.pug', {}, {cache: true})
         if theme.twikoo.enable
             != _new_comments('twikoo')
         else if theme.waline.enable

package/layout/_partials/post/nav.pug

@@ -1,7 +1,7 @@
 mixin navpost(item, type)
     - var postText = item.title || item.link || __('post.untitled')
     - var lastcat = item.categories.last()
-    - var itemlink=`<span class="type">${__('post.' + type)}</span><span class="category"><i class="ic i-flag"></i>${lastcat?.name}</span><h3>${ postText }</h3>`
+    - var itemlink = `<span class="type">${__('post.' + type)}</span>${lastcat && lastcat.name ? `<span class="category"><i class="ic i-flag"></i>${lastcat.name}</span>` : ''}<h3>${postText}</h3>`
     != _url(item.path, itemlink, {itemprop: 'url', rel: type, 'data-background-image': _cover(item), title: postText})
 
 div(class="post-nav")

package/layout/_partials/third-party/google-analytics.pug

@@ -0,0 +1,10 @@
+- var googleId = theme.visitor.googleAnalytics 
+if googleId
+    script(async, src=`https://www.googletagmanager.com/gtag/js?id=${ googleId }`)
+    script(data-pjax=true).
+        window.dataLayer = window.dataLayer || [];
+        function gtag() {
+            dataLayer.push(arguments);
+        }
+        gtag('js', new Date());
+        gtag('config', '#{googleId}');

package/layout/post.pug

@@ -11,7 +11,8 @@ block title
         each cat in page.categories.toArray()
             - var cat_list = cat.name + comma + cat_list
             - var comma = ' - '
-        - var page_title = page.title + ' - ' + cat_list
+        if cat_list.length !== 0
+            - var page_title = page.title + ' - ' + cat_list
     != `${page_title}`
 
 block header

package/package.json

@@ -1,35 +1,33 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.2.8",
+    "version": "0.2.10",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
-    "author": "Chou kaitaku",
+    "author": "zkz098",
     "license": "GPL-3.0-or-later",
     "scripts": {
         "test": "tsc",
         "build": "pnpm install && tsc"
     },
     "devDependencies": {
-
         "@types/fancybox": "^3.5.3",
         "@types/hexo": "^3.8.8",
         "@types/jquery": "^3.5.16",
         "@types/js-yaml": "^4.0.5",
         "@types/lozad": "^1.16.1",
-        "@types/node": "^20.1.0",
-        "@typescript-eslint/eslint-plugin": "^5.59.0",
-        "@typescript-eslint/parser": "^5.59.0",
-
-        "eslint": "^8.39.0",
-        "eslint-config-standard": "^17.0.0",
+        "@types/node": "^20.2.3",
+        "@typescript-eslint/eslint-plugin": "^5.59.7",
+        "@typescript-eslint/parser": "^5.59.7",
+        "eslint": "^8.41.0",
+        "eslint-config-standard": "*",
         "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^15.7.0",
+        "eslint-plugin-n": "^16.0.0",
         "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-vue": "^9.11.0",
+        "eslint-plugin-vue": "^9.14.0",
         "hexo-fs": "^4.1.1",
         "hexo-util": "^3.0.1",
-        "instantsearch.js": "^4.54.1",
+        "instantsearch.js": "^4.56.0",
         "theme-shokax-anime": "^0.0.4",
         "theme-shokax-pjax": "^0.0.2",
         "typescript": "^5.0.4",

package/scripts/helpers/asset.js

@@ -91,7 +91,7 @@ hexo.extend.helper.register('_vendor_font', () => {
     const fontDisplay = '&display=swap';
     const fontSubset = '&subset=latin,latin-ext';
     const fontStyles = ':300,300italic,400,400italic,700,700italic';
-    const fontHost = '//fonts.geekzu.org';
+    const fontHost = 'https://fonts.googleapis.com';
     let fontFamilies = ['global', 'logo', 'title', 'headings', 'posts', 'codes'].map(item => {
         if (config[item] && config[item].family && config[item].external) {
             return config[item].family + fontStyles;

package/scripts/plugin/lib/injects.js

@@ -8,6 +8,8 @@ const node_path_1 = __importDefault(require("node:path"));
 const injects_point_1 = __importDefault(require("./injects-point"));
 const defaultExtname = '.pug';
 class StylusInject {
+    files;
+    base_dir;
     constructor(base_dir) {
         this.base_dir = base_dir;
         this.files = [];
@@ -17,6 +19,8 @@ class StylusInject {
     }
 }
 class ViewInject {
+    base_dir;
+    raws;
     constructor(base_dir) {
         this.base_dir = base_dir;
         this.raws = [];

package/source/css/_common/components/tags/tabs.styl

@@ -3,7 +3,6 @@
   position: relative;
 
   .nav {
-    overflow: hidden;
     border-bottom: .0625rem solid var(--grey-1-a7);
     height: 2.6875rem;
 

package/source/css/_common/scaffolding/base.styl

@@ -148,6 +148,7 @@ input, textarea {
 }
 @font-face {
   font-family: 'ic';
+  font-display: swap;
   src: url('//at.alicdn.com/t/font_' + $iconfont + '.eot');
   src: url('//at.alicdn.com/t/font_' + $iconfont + '.eot?#iefix') format('embedded-opentype'),
   url('//at.alicdn.com/t/font_' + $iconfont + '.woff2') format('woff2'),
@@ -157,9 +158,9 @@ input, textarea {
 }
 
 @font-face {
-    font-family: 'jetbrains-mono';
-    font-display: swap;
-    src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono@2.242/fonts/webfonts/JetBrainsMono-Regular.woff2") format("woff2");
+  font-family: 'jetbrains-mono';
+  font-display: swap;
+  src: url("https://cdn.jsdelivr.net/gh/JetBrains/JetBrainsMono@2.242/fonts/webfonts/JetBrainsMono-Regular.woff2") format("woff2");
 }
 
 .ic {

package/source/css/comment.styl

@@ -1,5 +1,3 @@
 @import "_variables.styl";
 
 @import "_mixins.styl";
-
-@import "_common/components/third-party/valine";

package/source/js/_app/components.js

@@ -1,4 +1,4 @@
-const sideBarToggleHandle = function (event, force) {
+const sideBarToggleHandle = (event, force) => {
     if (sideBar.hasClass('on')) {
         sideBar.removeClass('on');
         menuToggle.removeClass('close');
@@ -14,25 +14,24 @@ const sideBarToggleHandle = function (event, force) {
             sideBar.style = '';
         }
         else {
-            transition(sideBar, 'slideRightIn', function () {
+            transition(sideBar, 'slideRightIn', () => {
                 sideBar.addClass('on');
                 menuToggle.addClass('close');
             });
         }
     }
 };
-const sideBarTab = function () {
+const sideBarTab = () => {
     const sideBarInner = sideBar.child('.inner');
-    const panels = sideBar.find('.panel');
     if (sideBar.child('.tab')) {
         sideBarInner.removeChild(sideBar.child('.tab'));
     }
     const list = document.createElement('ul');
     let active = 'active';
     list.className = 'tab';
-    ['contents', 'related', 'overview'].forEach(function (item) {
+    ['contents', 'related', 'overview'].forEach((item) => {
         const element = sideBar.child('.panel.' + item);
-        if (element.innerHTML.replace(/(^\s*)|(\s*$)/g, '').length < 1) {
+        if (element.innerHTML.trim().length < 1) {
             if (item === 'contents') {
                 showContents.display('none');
             }
@@ -54,14 +53,14 @@ const sideBarTab = function () {
         else {
             element.removeClass('active');
         }
-        tab.addEventListener('click', function (event) {
+        tab.addEventListener('click', (event) => {
             const target = event.currentTarget;
             if (target.hasClass('active'))
                 return;
-            sideBar.find('.tab .item').forEach(function (element) {
+            sideBar.find('.tab .item').forEach((element) => {
                 element.removeClass('active');
             });
-            sideBar.find('.panel').forEach(function (element) {
+            sideBar.find('.panel').forEach((element) => {
                 element.removeClass('active');
             });
             sideBar.child('.panel.' + target.className.replace(' item', '')).addClass('active');
@@ -78,18 +77,18 @@ const sideBarTab = function () {
         sideBar.child('.panels').style.paddingTop = '.625rem';
     }
 };
-const sidebarTOC = function () {
-    const activateNavByIndex = function (index, lock) {
+const sidebarTOC = () => {
+    const activateNavByIndex = (index) => {
         const target = navItems[index];
         if (!target)
             return;
         if (target.hasClass('current')) {
             return;
         }
-        $dom.each('.toc .active', function (element) {
+        $dom.each('.toc .active', (element) => {
             element && element.removeClass('active current');
         });
-        sections.forEach(function (element) {
+        sections.forEach((element) => {
             element && element.removeClass('active');
         });
         target.addClass('active current');
@@ -113,32 +112,32 @@ const sidebarTOC = function () {
     if (navItems.length < 1) {
         return;
     }
-    let sections = Array.prototype.slice.call(navItems) || [];
+    let sections = [...navItems];
     let activeLock = null;
-    sections = sections.map(function (element, index) {
+    sections = sections.map((element, index) => {
         const link = element.child('a.toc-link');
         const anchor = $dom(decodeURI(link.attr('href')));
         if (!anchor)
             return null;
         const alink = anchor.child('a.anchor');
-        const anchorScroll = function (event) {
+        const anchorScroll = (event) => {
             event.preventDefault();
             const target = $dom(decodeURI(event.currentTarget.attr('href')));
             activeLock = index;
-            pageScroll(target, null, function () {
+            pageScroll(target, null, () => {
                 activateNavByIndex(index);
                 activeLock = null;
             });
         };
         link.addEventListener('click', anchorScroll);
-        alink && alink.addEventListener('click', function (event) {
+        alink && alink.addEventListener('click', (event) => {
             anchorScroll(event);
             clipBoard(CONFIG.hostname + '/' + LOCAL.path + event.currentTarget.attr('href'));
         });
         return anchor;
     });
     const tocElement = sideBar.child('.contents.panel');
-    const findIndex = function (entries) {
+    const findIndex = (entries) => {
         let index = 0;
         let entry = entries[index];
         if (entry.boundingClientRect.top > 0) {
@@ -155,8 +154,8 @@ const sidebarTOC = function () {
         }
         return sections.indexOf(entry.target);
     };
-    const createIntersectionObserver = function () {
-        const observer = new IntersectionObserver(function (entries, observe) {
+    const createIntersectionObserver = () => {
+        const observer = new IntersectionObserver((entries) => {
             const index = findIndex(entries) + (diffY < 0 ? 1 : 0);
             if (activeLock === null) {
                 activateNavByIndex(index);
@@ -164,23 +163,23 @@ const sidebarTOC = function () {
         }, {
             rootMargin: '0px 0px -100% 0px', threshold: 0
         });
-        sections.forEach(function (element) {
+        sections.forEach((element) => {
             element && observer.observe(element);
         });
     };
     createIntersectionObserver();
 };
-const backToTopHandle = function () {
+const backToTopHandle = () => {
     pageScroll(0);
 };
-const goToBottomHandle = function () {
+const goToBottomHandle = () => {
     pageScroll(parseInt(String(Container.changeOrGetHeight())));
 };
-const goToCommentHandle = function () {
+const goToCommentHandle = () => {
     pageScroll($dom('#comments'));
 };
-const menuActive = function () {
-    $dom.each('.menu .item:not(.title)', function (element) {
+const menuActive = () => {
+    $dom.each('.menu .item:not(.title)', (element) => {
         const target = element.child('a[href]');
         const parentItem = element.parentNode.parentNode;
         if (!target)

package/source/js/_app/fireworks.js

@@ -29,51 +29,41 @@ function setParticuleDirection(p) {
 }
 function createParticule(x, y) {
     const p = {
-        x: undefined,
-        y: undefined,
+        x,
+        y,
         color: undefined,
         radius: undefined,
         endPos: undefined,
-        draw: undefined
+        draw() {
+            ctx.beginPath();
+            ctx.arc(p.x, p.y, p.radius, 0, 2 * Math.PI, true);
+            ctx.fillStyle = p.color;
+            ctx.fill();
+        }
     };
-    p.x = x;
-    p.y = y;
     p.color = colors[anime.random(0, colors.length - 1)];
     p.radius = anime.random(16, 32);
     p.endPos = setParticuleDirection(p);
-    p.draw = function () {
-        ctx.beginPath();
-        ctx.arc(p.x, p.y, p.radius, 0, 2 * Math.PI, true);
-        ctx.fillStyle = p.color;
-        ctx.fill();
-    };
     return p;
 }
 function createCircle(x, y) {
     const p = {
-        x: undefined,
-        y: undefined,
-        color: undefined,
-        radius: undefined,
+        x,
+        y,
+        color: '#FFF',
+        radius: 0.1,
         endPos: undefined,
-        alpha: undefined,
-        lineWidth: undefined,
-        draw: undefined
-    };
-    p.x = x;
-    p.y = y;
-    p.color = '#FFF';
-    p.radius = 0.1;
-    p.alpha = 0.5;
-    p.lineWidth = 6;
-    p.draw = function () {
-        ctx.globalAlpha = p.alpha;
-        ctx.beginPath();
-        ctx.arc(p.x, p.y, p.radius, 0, 2 * Math.PI, true);
-        ctx.lineWidth = p.lineWidth;
-        ctx.strokeStyle = p.color;
-        ctx.stroke();
-        ctx.globalAlpha = 1;
+        alpha: 0.5,
+        lineWidth: 6,
+        draw() {
+            ctx.globalAlpha = p.alpha;
+            ctx.beginPath();
+            ctx.arc(p.x, p.y, p.radius, 0, 2 * Math.PI, true);
+            ctx.lineWidth = p.lineWidth;
+            ctx.strokeStyle = p.color;
+            ctx.stroke();
+            ctx.globalAlpha = 1;
+        }
     };
     return p;
 }
@@ -93,12 +83,8 @@ function animateParticules(x, y) {
         duration: anime.random(1200, 1800),
         easing: 'easeOutExpo',
         update: renderParticule,
-        x: function (p) {
-            return p.endPos.x;
-        },
-        y: function (p) {
-            return p.endPos.y;
-        },
+        x: p => p.endPos.x,
+        y: p => p.endPos.y,
         radius: 0.1
     }).add({
         targets: circle,
@@ -116,11 +102,11 @@ function animateParticules(x, y) {
 }
 const render = anime({
     duration: Infinity,
-    update: function () {
+    update() {
         ctx.clearRect(0, 0, canvasEl.width, canvasEl.height);
     }
 });
-const hasAncestor = function (node, name) {
+const hasAncestor = (node, name) => {
     name = name.toUpperCase();
     do {
         if (node === null || node === undefined)
@@ -130,7 +116,7 @@ const hasAncestor = function (node, name) {
     } while ((node = node.parentNode) !== null);
     return false;
 };
-document.addEventListener(tap, function (e) {
+document.addEventListener(tap, (e) => {
     if (hasAncestor(e.target, 'a')) {
         return;
     }