hexo-theme-shokax 0.2.5 → 0.2.6

package/languages/en.yml

@@ -1,15 +1,15 @@
 name: English
 
 favicon:
-  show: （●´3｀●）Goooood
-  hide: (´Д｀)Booooom
+  show: (●´3｀●) Here we go again.
+  hide: (´Д｀) It's a disaster!
 
 title:
   archive: Archive
   category: Category
   tag: Tag
   all: All
-  not_found: Σ( ° △ °|||)︴404!
+  not_found: Σ( ° △ °|||)︴404! Nothing can be seen
   category_in: Posted in category "%s"
   tag_in: Posted with tag "%s"
   archive_in: Posted on "%s"
@@ -22,13 +22,13 @@ menu:
   tags: Tags
   about: About
   search: Search
-  aboutsite: About the Website
-  census: Blog access statistics
-  updata: Changelog
-  statistics: Article statistics
-  admiration: Appreciation to author
+  census: Blog Visits Statistics
+  aboutsite: About This Site
+  updata: Update Log
+  statistics: Statistics
+  admiration: Appreciation
   friends: Friends
-  privacy: Privacy policy
+  privacy: Privacy Policy
 
 sidebar:
   overview: Overview

package/languages/zh-HK.yml

@@ -22,6 +22,13 @@ menu:
   tags: 標籤
   about: 關於
   search: 檢索
+  census: 博客訪問統計
+  aboutsite: 關於本站
+  updata: 更新日誌
+  statistics: 統計
+  admiration: 讚賞博主
+  friends: 友鏈
+  privacy: 隱私政策
 
 sidebar:
   overview: 本站概覽

package/languages/zh-TW.yml

@@ -22,6 +22,13 @@ menu:
   tags: 標籤
   about: 關於
   search: 檢索
+  census: 博客訪問統計
+  aboutsite: 關於本站
+  updata: 更新日誌
+  statistics: 統計
+  admiration: 讚賞博主
+  friends: 友鏈
+  privacy: 隱私政策
 
 sidebar:
   overview: 本站概要

package/layout/_partials/head/head.pug

@@ -2,7 +2,7 @@
 - var yandexValid = theme?.seo?.yandex,baiduValid = theme?.seo?.baidu
 - var siteTitle = config.title,noBaiduT = theme?.seo?.disable_baidu_transformation
 - var feedLink = full_url_for("/feed.json")
-- var tk= theme?.twikoo?.enable;var jsInjects = theme?.inject?.head?.js,cssInjects = theme?.inject?.head?.css
+- var tk= theme?.twikoo?.enable
 - var wl = theme.waline.enable,gt=theme?.gitalk?.enable
 meta(charset="UTF-8")
 meta(name="viewport" content="width=device-width,initial-scale=1,maximum-scale=2")

package/layout/_partials/layout.pug

@@ -2,6 +2,10 @@ include ../_mixin/breadcrumb.pug
 include ../_mixin/sidebar.pug
 include ../_mixin/widgets.pug
 
+- var ignores = []
+if (theme.quicklink.ignores)
+    - ignores.push(theme.quicklink.ignores)
+
 doctype html
 html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'filter: grayscale(1);':'' )
     head
@@ -67,65 +71,43 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                     != partial('_partials/footer.pug', {}, {cache: true})
         - var ccIcon = '<i class="ic i-creative-commons"></i>'
         - 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')}\"`
-            |    },
-            if theme.widgets.recent_comments || page.comment !== false
-                != `valine: ${page.valine ? _safedump(page.valine) : 'true'},`
-            if page.chart
-                | chart: true,
-            if page.math
-                | copy_tex: true,
-                | katex: true,
-            if page.mermaid
-                | mermaid: true,
-            if page.audio
-                != `audio: ${_safedump(page.audio)},`
-            if page.audio === false
-                | audio: {},
-            if page.fancybox !== false
-                | fancybox: true,
-            if page.copyright !== false
-                if page.copyright === true
-                    | nocopy: true,
-                    != `copyright: \'${__("tips.nocopy")}\',`
-                else
-                    != `copyright: \'${__("tips.copyright", ccIcon + ccText)}\',`
-            if page.outime === false
-                | outime: false,
-            else
-                | outime: true,template: `!{ __('outime.template') }`,
-            if page.quiz
-                | quiz: {
-                != `choice: \'${__('quiz.choice')}\',`
-                != `multiple: \'${__('quiz.multiple')}\',`
-                != `true_false: \'${__('quiz.true_false')}\',`
-                != `essay: \'${__('quiz.essay')}\',`
-                != `gap_fill: \'${__('quiz.gap_fill')}\',`
-                != `mistake: \'${__('quiz.mistake')}\'`
-                | },
-            | ignores : [
-            |   function(uri) {
-            |       return uri.includes('#');
-            |   },
-            |   function(uri) {
-            |       return new RegExp(LOCAL.path+"$").test(uri);
-            |   }
-            if theme.quicklink.ignores
-                | ,
-                != _safedump(theme.quicklink.ignores)
-            | ]
-            | };
-        </script>
+        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'}`,
+                chart: `#{page.chart ? 'true' : 'false'}`,
+                copy_tex: `#{page.math ? 'true' : 'false'}`,
+                katex: `#{page.math ? 'true' : 'false'}`,
+                mermaid: `#{page.mermaid ? 'true' : 'false'}`,
+                audio: `#{_safedump(page.audio)}`,
+                fancybox: `#{page.fancybox !== false ? 'true' : 'false'}`,
+                nocopy: `#{page.nocopy ? 'true' : 'false'}`,
+                outime: `#{page.outime !== false ? 'true' : '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)}
+            ]
+            };
+
         script(src="https://polyfill.alicdn.com/polyfill.min.js")
         if theme.advVendors.enable
             each i in _list_vendor_js()

package/layout/_partials/post/footer.pug

@@ -11,7 +11,7 @@ div(class="meta")
                 != __('post.edited')
             time(title=__('post.modified') + __('symbol.colon') + full_date(post.updated) itemprop="dateModified" datetime=moment(post.updated).format())
                 != date(post.updated)
-    if theme.waline.pageview && !theme.waline.enable
+    if theme.waline.pageview && !theme.waline.enable && !theme.twikoo.enable
         script(type = "module" data-pjax).
             import { pageviewCount } from 'https://unpkg.com/@waline/client/dist/pageview.mjs';
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.2.5",
+    "version": "0.2.6",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -19,7 +19,7 @@
         "@types/jquery": "^3.5.16",
         "@types/js-yaml": "^4.0.5",
         "@types/lozad": "^1.16.1",
-        "@types/node": "^18.15.13",
+        "@types/node": "^20.1.0",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
         "@typescript-eslint/parser": "^5.59.0",
         "@vuepress/client": "2.0.0-beta.61",
@@ -39,7 +39,7 @@
         "typescript": "^5.0.4",
         "vue": "^3.2.47",
         "vuepress": "2.0.0-beta.61",
-        "vuepress-plugin-sitemap2": "2.0.0-beta.206"
+        "vuepress-plugin-sitemap2": "2.0.0-beta.208"
     },
     "dependencies": {
         "js-yaml": "^4.1.0",

package/scripts/generaters/config.js

@@ -3,20 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const hexo_util_1 = __importDefault(require("hexo-util"));
+const hexo_util_1 = require("hexo-util");
 const node_fs_1 = __importDefault(require("node:fs"));
 const path_1 = __importDefault(require("path"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 hexo.extend.filter.register('before_generate', () => {
     if (hexo.config.theme_config) {
-        hexo.theme.config = hexo_util_1.default.deepMerge(hexo.theme.config, hexo.config.theme_config);
+        hexo.theme.config = (0, hexo_util_1.deepMerge)(hexo.theme.config, hexo.config.theme_config);
     }
     const data = hexo.locals.get('data');
     if (data.languages) {
         const { i18n } = hexo.theme;
         const mergeLang = lang => {
             if (data.languages[lang]) {
-                i18n.set(lang, hexo_util_1.default.deepMerge(i18n.get([lang]), data.languages[lang]));
+                i18n.set(lang, (0, hexo_util_1.deepMerge)(i18n.get([lang]), data.languages[lang]));
             }
         };
         for (const lang of ['en', 'ja', 'zh-CN', 'zh-HK', 'zh-TW']) {

package/source/js/_app/library.js

@@ -303,3 +303,15 @@ const pageScroll = function (target, offset, complete) {
     };
     anime(opt).play();
 };
+let inCloudFlare = true;
+window.addEventListener('DOMContentLoaded', function () {
+    inCloudFlare = false;
+});
+if (document.readyState === 'loading') {
+    window.addEventListener('load', function () {
+        if (inCloudFlare) {
+            window.dispatchEvent(new Event('DOMContentLoaded'));
+            console.log('%c ☁️cloudflare patch ' + '%c running(rocket & minify)', 'color: white; background: #ff8c00; padding: 5px 3px;', 'padding: 4px;border:1px solid #ff8c00');
+        }
+    });
+}

package/source/js/_app/page.js

@@ -2,35 +2,26 @@ const cardActive = function () {
     if (!$dom('.index.wrap')) {
         return;
     }
-    if (!window.IntersectionObserver) {
-        $dom.each('.index.wrap article.item, .index.wrap section.item', function (article) {
-            if (article.hasClass('show') === false) {
-                article.addClass('show');
+    const io = new IntersectionObserver(function (entries) {
+        entries.forEach(function (article) {
+            if (article.target.hasClass('show')) {
+                io.unobserve(article.target);
             }
-        });
-    }
-    else {
-        const io = new IntersectionObserver(function (entries) {
-            entries.forEach(function (article) {
-                if (article.target.hasClass('show')) {
+            else {
+                if (article.isIntersecting || article.intersectionRatio > 0) {
+                    article.target.addClass('show');
                     io.unobserve(article.target);
                 }
-                else {
-                    if (article.isIntersecting || article.intersectionRatio > 0) {
-                        article.target.addClass('show');
-                        io.unobserve(article.target);
-                    }
-                }
-            });
-        }, {
-            root: null,
-            threshold: [0.3]
-        });
-        $dom.each('.index.wrap article.item, .index.wrap section.item', function (article) {
-            io.observe(article);
+            }
         });
-        $dom('.index.wrap .item:first-child').addClass('show');
-    }
+    }, {
+        root: null,
+        threshold: [0.3]
+    });
+    $dom.each('.index.wrap article.item, .index.wrap section.item', function (article) {
+        io.observe(article);
+    });
+    $dom('.index.wrap .item:first-child').addClass('show');
     $dom.each('.cards .item', function (element, index) {
         ['mouseenter', 'touchstart'].forEach(function (item) {
             element.addEventListener(item, function (event) {
@@ -50,7 +41,7 @@ const cardActive = function () {
 const registerExtURL = function () {
     $dom.each('span.exturl', function (element) {
         const link = document.createElement('a');
-        link.href = decodeURIComponent(atob(element.dataset.url).split('').map(function (c) {
+        link.href = decodeURIComponent(window.atob(element.dataset.url).split('').map(function (c) {
             return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
         }).join(''));
         link.rel = 'noopener external nofollow noreferrer';
@@ -688,5 +679,5 @@ const siteInit = function () {
 window.addEventListener('DOMContentLoaded', siteInit, {
     passive: true
 });
-console.log('%c Theme.ShokaX v' + CONFIG.version + ' %c https://github.com/zkz098/hexo-theme-shokaX ', 'color: white; background: #e9546b; padding:5px 0;', 'padding:4px;border:1px solid #e9546b;');
+console.log('%c Theme.ShokaX v' + CONFIG.version + ' %c https://github.com/theme-shoka-x/hexo-theme-shokaX ', 'color: white; background: #e9546b; padding:5px 0;', 'padding:4px;border:1px solid #e9546b;');
 console.log('%c by kaitaku ' + '%c https://www.kaitaku.xyz', 'color: white; background: #00bfff; padding: 5px 3px;', 'padding: 4px;border:1px solid #00bfff');