hexo-theme-shokax 0.3.0 → 0.3.1

package/README.md

@@ -1,3 +1,6 @@
+# 📣 公告
+* [ShokaX 正在寻找社区维护者](https://github.com/theme-shoka-x/hexo-theme-shokaX/discussions/137)
+
 # 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)
 ![LICENSE](	https://img.shields.io/github/license/theme-shoka-x/hexo-theme-shokaX)
@@ -47,6 +50,13 @@ github仓库建议通过右边的 releases 下载,步骤为:
 - 下载 Assets 中的 `Source code(zip)`
 - 解压即可作为主题使用
 
+## 📚子项目
+- [ShokaX docs](https://github.com/theme-shoka-x/shokaX-docs) ShokaX 主题文档 (正在编写中，欢迎加入！)
+- [HRMNMI](https://github.com/theme-shoka-x/hexo-renderer-multi-next-markdown-it) ShokaX 正在使用的 markdown 渲染器 (等待重构)
+- [ShokaX CLI](https://github.com/theme-shoka-x/shokaX-CLI) ShokaX 命令行安装程序
+- [ShokaX Pjax](https://github.com/theme-shoka-x/theme-shokax-pjax) ShokaX 提供的高效 Pjax 实现
+- [ShokaX Anime](https://github.com/theme-shoka-x/theme-shokax-anime) ShokaX 提供的精简版 Anime.js 实现
+
 ## 🛠️二次开发
 [ShokaX官方开发文档](https://docs.kaitaku.xyz/develop/basic/)
 
@@ -58,8 +68,7 @@ github仓库建议通过右边的 releases 下载,步骤为:
 - [Easy hexo](https://easyhexo.com/)
 
 # 许可证
-许可证: AGPL 3 or later \
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX?ref=badge_large)
+许可证: AGPL 3 or later
 
 ## 特别说明
 AGPL许可证主要目的是限制修改后的分发行为，避免未经许可的二次修改封装商业行为 \

package/layout/_mixin/comment.pug

@@ -21,7 +21,6 @@ mixin CommentRender()
             script(type="module" data-pjax).
                 import { init } from 'https://unpkg.com/@waline/client@v2/dist/waline.mjs';
 
-                const path = document.getElementById("twikoo_visitors").getAttribute("data-path");
                 setTimeout(function () {
                     init({
                         el: '#wcomments',
@@ -34,7 +33,7 @@ mixin CommentRender()
                         wordLimit: #{theme.waline.wordLimit},
                         pageSize: #{theme.waline.pageSize},
                         pageview: #{theme.waline.pageview},
-                        path: path,
+                        path: window.location.pathname,
                         dark: 'html[data-theme="dark"]'
                     });
                 }, 1000)

package/layout/_partials/layout.pug

@@ -73,17 +73,17 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         - var ccText = theme.creative_commons.license.toUpperCase()
         script(data-config type="text/javascript").
             var LOCAL = {
-                path: `#{_permapath(page.path)}`,
-                favicon: {
-                show: `#{__('favicon.show')}`,
-                hide: `#{__('favicon.hide')}`
-            },
-            search: {
-            placeholder: "!{__('search.placeholder')}",
-                empty: "!{__('search.empty')}",
-                stats: "!{__('search.stats')}"
-            },
-            valine: #{page.valine ? _safedump(page.valine) : true},
+                    path: `#{_permapath(page.path)}`,
+                    favicon: {
+                    show: `#{__('favicon.show')}`,
+                    hide: `#{__('favicon.hide')}`
+                },
+                search: {
+                    placeholder: "!{__('search.placeholder')}",
+                    empty: "!{__('search.empty')}",
+                    stats: "!{__('search.stats')}"
+                },
+                valine: #{page.valine ? _safedump(page.valine) : true},
                 chart: #{!!page.chart},
                 copy_tex: #{!!page.math},
                 katex: #{!!page.math},
@@ -94,18 +94,18 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                 outime: #{page.outime !== false},
                 template: `#{__('outime.template')}`,
                 quiz: {
-                choice: `#{__('quiz.choice')}`,
-                multiple: `#{__('quiz.multiple')}`,
-                true_false: `#{__('quiz.true_false')}`,
-                essay: `#{__('quiz.essay')}`,
-                gap_fill: `#{__('quiz.gap_fill')}`,
-                mistake: `#{__('quiz.mistake')}`
-            },
-            ignores: [
-            (uri) => uri.includes('#'),
-            (uri) => new RegExp(LOCAL.path + '$').test(uri),
-                !{JSON.stringify(ignores)}
-            ]
+                    choice: `#{__('quiz.choice')}`,
+                    multiple: `#{__('quiz.multiple')}`,
+                    true_false: `#{__('quiz.true_false')}`,
+                    essay: `#{__('quiz.essay')}`,
+                    gap_fill: `#{__('quiz.gap_fill')}`,
+                    mistake: `#{__('quiz.mistake')}`
+                },
+                ignores: [
+                    (uri) => uri.includes('#'),
+                    (uri) => new RegExp(LOCAL.path + '$').test(uri),
+                        !{JSON.stringify(ignores)}
+                ]
             };
 
         if theme.polyfill.enable

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -16,21 +16,21 @@
         "@types/jquery": "^3.5.16",
         "@types/js-yaml": "^4.0.5",
         "@types/lozad": "^1.16.1",
-        "@types/node": "^20.2.3",
-        "@typescript-eslint/eslint-plugin": "^6.0.0",
-        "@typescript-eslint/parser": "^5.59.7",
-        "eslint": "^8.41.0",
+        "@types/node": "^20.4.4",
+        "@typescript-eslint/eslint-plugin": "^6.2.0",
+        "@typescript-eslint/parser": "^6.2.0",
+        "eslint": "^8.45.0",
         "eslint-config-standard": "*",
         "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^16.0.0",
+        "eslint-plugin-n": "^16.0.1",
         "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-vue": "^9.14.0",
+        "eslint-plugin-vue": "^9.15.1",
         "hexo-fs": "^4.1.1",
-        "hexo-util": "^3.0.1",
-        "instantsearch.js": "^4.56.0",
+        "hexo-util": "^3.1.0",
+        "instantsearch.js": "^4.56.7",
         "theme-shokax-anime": "^0.0.4",
         "theme-shokax-pjax": "^0.0.2",
-        "typescript": "^5.0.4",
+        "typescript": "^5.1.6",
         "vue": "^3.3.4"
     },
     "dependencies": {

package/scripts/generaters/script.js

@@ -7,16 +7,13 @@ const package_json_1 = __importDefault(require("../../package.json"));
 const fs = require("hexo-fs");
 const node_path_1 = __importDefault(require("node:path"));
 function findJsFile(path) {
-    console.log(path);
     let result = [];
     fs.readdirSync(path).forEach((item) => {
-        console.log(item);
         if (!item.endsWith('js')) {
             result = result.concat(findJsFile(node_path_1.default.join(path, item)));
         }
         else {
             if (item.indexOf('player') === -1 && item.indexOf('fireworks') === -1) {
-                console.log('push');
                 result.push(node_path_1.default.join(path, item));
             }
         }
@@ -24,7 +21,6 @@ function findJsFile(path) {
     return result;
 }
 hexo.extend.generator.register('script', function (locals) {
-    const log = hexo.log || console.log;
     const config = hexo.config;
     const theme = hexo.theme.config;
     const siteConfig = {
@@ -77,7 +73,7 @@ hexo.extend.generator.register('script', function (locals) {
         siteConfig.audio = theme.audio;
     }
     let text = '';
-    let path = '';
+    let path;
     if (fs.existsSync('themes/shokaX/source/js/_app/library/dom.js')) {
         path = 'themes/shokaX/source/js/_app';
     }
@@ -89,7 +85,6 @@ hexo.extend.generator.register('script', function (locals) {
     files = files.concat(findJsFile(node_path_1.default.join(path, 'page')));
     files = files.concat(findJsFile(node_path_1.default.join(path, 'pjax')));
     files = files.concat(findJsFile(node_path_1.default.join(path, 'components')));
-    console.log(files);
     files.forEach(function (item) {
         text += fs.readFileSync(item).toString();
     });

package/scripts/helpers/summary_ai.js

@@ -47,7 +47,6 @@ function postMessage(path, content, dbPath, startMessage) {
                             db ??= {};
                             db[path] ??= {};
                             db[path][dbPath] ??= '';
-                            console.log(db[path]);
                             db[path][dbPath] = summary;
                         }
                         node_fs_1.default.writeFileSync('summary.json', JSON.stringify(db));

package/scripts/plugin/index.js

@@ -1,7 +1,7 @@
 "use strict";
 /*!
-  index.js in next-theme/hexo-theme-next by theme-next
-  under GNU AFFERO GENERAL PUBLIC LICENSE v3.0
+  index.js in next-theme/hexo-theme-next by next-theme
+  under GNU AFFERO GENERAL PUBLIC LICENSE v3.0 OR LATER
   https://github.com/next-theme/hexo-theme-next/blob/master/LICENSE.md
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {

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

@@ -1,108 +1,116 @@
-/* normalize.css v8..1 | MIT License | github.com/necolas/normalize.css */
-/* Document
-========================================================================== */
+/*! modern-normalize v2.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
+
+/*
+Document
+========
+*/
+
 /**
- * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in iOS.
- */
+Use a better box model (opinionated).
+*/
+
+*,
+::before,
+::after {
+  box-sizing: border-box;
+}
+
 html {
-  line-height: 1.15; /* 1 */
-  -webkit-text-size-adjust: 100%; /* 2 */
+  /* Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3) */
+  font-family:
+          system-ui,
+          'Segoe UI',
+          Roboto,
+          Helvetica,
+          Arial,
+          sans-serif,
+          'Apple Color Emoji',
+          'Segoe UI Emoji';
+  line-height: 1.15; /* 1. Correct the line height in all browsers. */
+  -webkit-text-size-adjust: 100%; /* 2. Prevent adjustments of font size after orientation changes in iOS. */
+  -moz-tab-size: 4; /* 3. Use a more readable tab size (opinionated). */
+  tab-size: 4; /* 3 */
 }
 
-/* Sections
-========================================================================== */
-/**
- * Remove the margin in all browsers.
- */
+/*
+Sections
+========
+*/
+
 body {
-  margin: 0;
+  margin: 0; /* Remove the margin in all browsers. */
 }
 
-/**
- * Render the `main` element consistently in IE.
- */
-main {
-  display: block;
-}
+/*
+Grouping content
+================
+*/
 
 /**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-h1 {
-  font-size: 2em;
-  margin: .67em 0;
-}
+1. Add the correct height in Firefox.
+2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
+*/
 
-/* Grouping content
-========================================================================== */
-/**
- * 1. Add the correct box sizing in Firefox.
- * 2. Show the overflow in Edge and IE.
- */
 hr {
-  box-sizing: content-box; /* 1 */
   height: 0; /* 1 */
-  overflow: visible; /* 2 */
+  color: inherit; /* 2 */
 }
 
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-pre {
-  font-family: monospace, monospace; /* 1 */
-  font-size: 1em; /* 2 */
-}
+/*
+Text-level semantics
+====================
+*/
 
-/* Text-level semantics
-========================================================================== */
 /**
- * Remove the gray background on active links in IE 1.
- */
-a {
-  background: transparent;
-}
+Add the correct text decoration in Chrome, Edge, and Safari.
+*/
 
-/**
- * 1. Remove the bottom border in Chrome 57-
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
- */
 abbr[title] {
-  border-bottom: none; /* 1 */
-  text-decoration: underline; /* 2 */
-  //text-decoration: underline dotted; /* 2 */
+  text-decoration: underline dotted;
 }
 
 /**
- * Add the correct font weight in Chrome, Edge, and Safari.
- */
-b, strong {
+Add the correct font weight in Edge and Safari.
+*/
+
+b,
+strong {
   font-weight: bolder;
 }
 
 /**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-code, kbd, samp {
-  font-family: monospace, monospace; /* 1 */
+1. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
+2. Correct the odd 'em' font sizing in all browsers.
+*/
+
+code,
+kbd,
+samp,
+pre {
+  font-family:
+          ui-monospace,
+          SFMono-Regular,
+          Consolas,
+          'Liberation Mono',
+          Menlo,
+          monospace; /* 1 */
   font-size: 1em; /* 2 */
 }
 
 /**
- * Add the correct font size in all browsers.
- */
+Add the correct font size in all browsers.
+*/
+
 small {
   font-size: 80%;
 }
 
 /**
- * Prevent `sub` and `sup` elements from affecting the line height in
- * all browsers.
- */
-sub, sup {
+Prevent 'sub' and 'sup' elements from affecting the line height in all browsers.
+*/
+
+sub,
+sup {
   font-size: 75%;
   line-height: 0;
   position: relative;
@@ -110,29 +118,43 @@ sub, sup {
 }
 
 sub {
-  bottom: -.25em;
+  bottom: -0.25em;
 }
 
 sup {
-  top: -.5em;
+  top: -0.5em;
 }
 
-/* Embedded content
-========================================================================== */
+/*
+Tabular data
+============
+*/
+
 /**
- * Remove the border on images inside links in IE 1.
- */
-img {
-  border-style: none;
+1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
+2. Correct table border color inheritance in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
+*/
+
+table {
+  text-indent: 0; /* 1 */
+  border-color: inherit; /* 2 */
 }
 
-/* Forms
-========================================================================== */
+/*
+Forms
+=====
+*/
+
 /**
- * 1. Change the font styles in all browsers.
- * 2. Remove the margin in Firefox and Safari.
- */
-button, input, optgroup, select, textarea {
+1. Change the font styles in all browsers.
+2. Remove the margin in Firefox and Safari.
+*/
+
+button,
+input,
+optgroup,
+select,
+textarea {
   font-family: inherit; /* 1 */
   font-size: 100%; /* 1 */
   line-height: 1.15; /* 1 */
@@ -140,150 +162,113 @@ button, input, optgroup, select, textarea {
 }
 
 /**
- * Show the overflow in IE.
- * 1. Show the overflow in Edge.
- */
-button, input {
-  /* 1 */
-  overflow: visible;
-}
+Remove the inheritance of text transform in Edge and Firefox.
+*/
 
-/**
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
- * 1. Remove the inheritance of text transform in Firefox.
- */
-button, select {
-  /* 1 */
+button,
+select {
   text-transform: none;
 }
 
 /**
- * Correct the inability to style clickable types in iOS and Safari.
- */
-button, [type='button'], [type='reset'], [type='submit'] {
+Correct the inability to style clickable types in iOS and Safari.
+*/
+
+button,
+[type='button'],
+[type='reset'],
+[type='submit'] {
   -webkit-appearance: button;
 }
 
 /**
- * Remove the inner border and padding in Firefox.
- */
-button::-moz-focus-inner, [type='button']::-moz-focus-inner, [type='reset']::-moz-focus-inner, [type='submit']::-moz-focus-inner {
+Remove the inner border and padding in Firefox.
+*/
+
+::-moz-focus-inner {
   border-style: none;
   padding: 0;
 }
 
 /**
- * Restore the focus styles unset by the previous rule.
- */
-button:-moz-focusring, [type='button']:-moz-focusring, [type='reset']:-moz-focusring, [type='submit']:-moz-focusring {
-  outline: .0625rem dotted ButtonText;
+Restore the focus styles unset by the previous rule.
+*/
+
+:-moz-focusring {
+  outline: 1px dotted ButtonText;
 }
 
 /**
- * Correct the padding in Firefox.
- */
-fieldset {
-  padding: .35em .75em .625em;
+Remove the additional ':invalid' styles in Firefox.
+See: https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737
+*/
+
+:-moz-ui-invalid {
+  box-shadow: none;
 }
 
 /**
- * 1. Correct the text wrapping in Edge and IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 3. Remove the padding so developers are not caught out when they zero out
- *    `fieldset` elements in all browsers.
- */
+Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers.
+*/
+
 legend {
-  box-sizing: border-box; /* 1 */
-  color: inherit; /* 2 */
-  display: table; /* 1 */
-  max-width: 100%; /* 1 */
-  padding: 0; /* 3 */
-  white-space: normal; /* 1 */
+  padding: 0;
 }
 
 /**
- * Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
+Add the correct vertical alignment in Chrome and Firefox.
+*/
+
 progress {
   vertical-align: baseline;
 }
 
 /**
- * Remove the default vertical scrollbar in IE 10+.
- */
-textarea {
-  overflow: auto;
-}
+Correct the cursor style of increment and decrement buttons in Safari.
+*/
 
-/**
- * 1. Add the correct box sizing in IE 1.
- * 2. Remove the padding in IE 1.
- */
-[type='checkbox'], [type='radio'] {
-  box-sizing: border-box; /* 1 */
-  padding: 0; /* 2 */
-}
-
-/**
- * Correct the cursor style of increment and decrement buttons in Chrome.
- */
-[type='number']::-webkit-inner-spin-button, [type='number']::-webkit-outer-spin-button {
+::-webkit-inner-spin-button,
+::-webkit-outer-spin-button {
   height: auto;
 }
 
 /**
- * 1. Correct the odd appearance in Chrome and Safari.
- * 2. Correct the outline style in Safari.
- */
+1. Correct the odd appearance in Chrome and Safari.
+2. Correct the outline style in Safari.
+*/
+
 [type='search'] {
-  outline-offset: -.125rem; /* 2 */
   -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
 }
 
 /**
- * Remove the inner padding in Chrome and Safari on macOS.
- */
-[type='search']::-webkit-search-decoration {
+Remove the inner padding in Chrome and Safari on macOS.
+*/
+
+::-webkit-search-decoration {
   -webkit-appearance: none;
 }
 
 /**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Safari.
- */
+1. Correct the inability to style clickable types in iOS and Safari.
+2. Change font properties to 'inherit' in Safari.
+*/
+
 ::-webkit-file-upload-button {
-  font: inherit; /* 2 */
   -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
 }
 
-/* Interactive
-========================================================================== */
 /*
- * Add the correct display in Edge, IE 10+, and Firefox.
- */
-details {
-  display: block;
-}
+Interactive
+===========
+*/
 
 /*
- * Add the correct display in all browsers.
- */
+Add the correct display in Chrome and Safari.
+*/
+
 summary {
   display: list-item;
-}
-
-/* Misc
-========================================================================== */
-/**
- * Add the correct display in IE 10+.
- */
-template {
-  display: none;
-}
-
-/**
- * Add the correct display in IE 1.
- */
-[hidden] {
-  display: none;
-}
+}

package/source/js/_app/globals/handles.js

@@ -1,4 +1,4 @@
-const resizeHandle = (event) => {
+const resizeHandle = () => {
     siteNavHeight = siteNav.changeOrGetHeight();
     headerHightInner = siteHeader.changeOrGetHeight();
     headerHight = headerHightInner + $dom('#waves').changeOrGetHeight();
@@ -8,7 +8,7 @@ const resizeHandle = (event) => {
     oWinHeight = window.innerHeight;
     oWinWidth = window.innerWidth;
 };
-const scrollHandle = (event) => {
+const scrollHandle = () => {
     const winHeight = window.innerHeight;
     const docHeight = getDocHeight();
     const contentVisibilityHeight = docHeight > winHeight ? docHeight - winHeight : document.body.scrollHeight - winHeight;