hexo-theme-gnix 1.1.0 → 1.2.1

package/README.md

@@ -1,10 +1,13 @@
-# Hexo Theme Icarus
+## Installation
 
-## Demo & Preview
+```shell
+bun add hexo-theme-gnix
+hexo config theme gnix
+```
 
-[vluv's space](https://vluv.space/)
+## Features
 
-### Multiple Theme Support
+### Multiple-Theme Support
 
 Support multiple light and dark themes:
 
@@ -12,95 +15,40 @@ Support multiple light and dark themes:
 - **Light Themes**: `Nord`, `Cattpuccin Latte`
 - **Dark Themes**: `Catppuccin Mocha`, `Catppuccin Macchiato`, `Tokyo Night`
 
-| ![](assets/README/nord.png) | ![](assets/README/mocha.png) |
-| --------------------------- | ---------------------------- |
-
-### Mermaid Filter [^2]
-
-[^2]:
-    Require [Efterklang/hexo-mermaid-diagram](https://github.com/Efterklang/hexo-mermaid-diagram)
-    🚧 Dark mode WIP...
-
-![image](https://github.com/user-attachments/assets/3bd2d897-721d-4505-8194-6a592bbceb31)
-
-### Components
+<table border="1">
+  <tr>
+    <td><img width="3074" height="2060" alt="image" src="https://github.com/user-attachments/assets/80f772e7-2d91-4bd2-bfbe-bf73753721dc" /></td>
+    <td><img width="3074" height="2060" alt="image" src="https://github.com/user-attachments/assets/0ae6a569-5e88-41a2-92f3-e08b9d3e5531" /></td>
+    <td><img width="1758" height="2060" alt="image" src="https://github.com/user-attachments/assets/673a89fa-0ab0-43bb-a9e8-8dfd8eebaa90" /></td>
+  </tr>
+</table>
 
-#### Table
-
-| ![1763371106238](assets/README/table_nord.png) | ![1763371131768](assets/README/table_tokyo.png) |
-| ---------------------------------------------- | ----------------------------------------------- |
-
-#### Quote
-
-| ![1763371059037](assets/README/quote_light.png) |
-| ----------------------------------------------- |
-| ![1763371021736](assets/README/quote_dark.png)  |
-
-#### Footer
-
-| ![1763371250167](assets/README/footer_nord.png) |
-| ----------------------------------------------- |
-| ![1763371215054](assets/README/footer_dark.png) |
-
-## Installation
-
-### Using git submodule(Recommended)
-
-Using git submodule instead of bun add is recommended if you want to make any customizations to the theme
+## Components
 
 ```shell
-$ git submodule add https://github.com/Efterklang/hexo-theme-icarus themes/icarus
-$ hexo config theme icarus
-```
-
-```diff package.json
-{
-  "dependencies": {
-+   "hexo": "^7.2.0",
-+   "hexo-cli": "^4.3.2",
-+   "hexo-generator-archive": "^2.0.0",
-+   "hexo-generator-category": "^2.0.0",
-+   "hexo-generator-tag": "^2.0.0",
-+   "hexo-pagination": "^3.0.0",
-+   "hexo-renderer-inferno": "^1.0.2",
-+   "hexo-server": "^3.0.0",
-+   "hexo-util": "^3.3.0",
-+   "inferno": "^9.0.3",
-+   "inferno-create-element": "^9.0.3",
-+   "moment": "^2.30.1"
-  }
-}
+bun i hexo-renderer-markdown-exit
 ```
 
-### Using Bun
-
-```shell
-$ bun add git+https://github.com/Efterklang/hexo-theme-icarus
-$ hexo config theme icarus
-```
+### Table, Math, Quote, Callout & Tabs, Highlight
 
-## Setup
+<table>
+  <tr>
+    <td><img width="1806" height="378" alt="image" src="https://github.com/user-attachments/assets/63712c7c-4c4c-4a9e-89cb-1b558769e438" /></td>
+    <td><img width="1754" height="394" alt="image" src="https://github.com/user-attachments/assets/4055601f-da4f-4643-8eaf-7965afe3836f" /></td>
+  </tr>
+  <tr>
+    <td><img width="1314" height="508" alt="image" src="https://github.com/user-attachments/assets/26c31f7d-55dd-4e3f-994f-99492bb801f0" /></td>
+    <td><img width="1798" height="372" alt="image" src="https://github.com/user-attachments/assets/13251a06-444b-4aaf-aed4-c9f436f10393" /></td>
+  </tr>
+</table>
 
-<details>
-<summary>Math Rendering Setup</summary>
+---
 
-To enable math rendering with optimized performance, use [markdown-it-mathjax3-pro](https://github.com/NeoNexusX/markdown-it-mathjax3-pro), which supports both SSR and CSR modes
-
-</details>
-
-<details>
-<summary>Code Highlight Setup</summary>
-
-Use [hexo-shiki-highlight](https://github.com/Efterklang/hexo-shiki-highlight) plugin for code block highlighting, support multiple themes as well;
-
-Set `syntax_highlighter` to `shiki` in your hexo `_config.yml`:
-
-```yaml _config.yml
-# Syntax Highlighter
-syntax_highlighter: shiki
-```
+<table>
+  <tr>
+    <td><img width="1750" height="330" alt="image" src="https://github.com/user-attachments/assets/976531e7-6988-476f-a24b-d3aa40b53cab" /></td>
+    <td><img width="976" height="330" alt="image" src="https://github.com/user-attachments/assets/8ee76260-8054-41a2-8d89-2b982d4ef2bc" /></td>
+  </tr>
+</table>
 
-| <img width="1386" height="720" alt="image" src="https://github.com/user-attachments/assets/f0435c12-5140-4ca4-86bb-e5237039cc2d" /> | <img width="1394" height="736" alt="image" src="https://github.com/user-attachments/assets/406a656f-9e99-4fb7-bb34-a2e1078451e4" /> |
-| ----------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
 
-</details>

package/include/hexo/filter/locals.js

@@ -1,8 +1,3 @@
-/**
- * Register the Hexo filter for merging theme and site config, and add all helper functions to a
- * dedicated property (<code>helper</code>) in the locals.
- * @module hexo/filter/locals
- */
 const fs = require("node:fs");
 const path = require("node:path");
 const yaml = require("js-yaml");

package/layout/archive.jsx

@@ -1,6 +1,5 @@
-const moment = require("moment");
+const { format, isValid, parseISO } = require("date-fns");
 const { Component, Fragment } = require("../include/util/common");
-const { toMomentLocale } = require("hexo/dist/plugins/helper/date");
 const Paginator = require("./misc/paginator");
 const ArticleMedia = require("./common/article_media");
 
@@ -9,9 +8,6 @@ module.exports = class extends Component {
     const { config, page, helper } = this.props;
     const { url_for, __, date_xml, date } = helper;
 
-    const language = toMomentLocale(
-      page.lang || page.language || config.language,
-    );
     const timelineCss = `
             span.year {
                 position: absolute;
@@ -44,18 +40,20 @@ module.exports = class extends Component {
             }
         `;
     function renderArticleList(posts, year, month = null) {
-      const time = moment(
-        [page.year, page.month ? page.month - 1 : null].filter(
-          (i) => i !== null,
-        ),
-      );
+      let time = null;
+      if (page.year) {
+        const mm = page.month ? String(page.month).padStart(2, "0") : "01";
+        time = parseISO(`${page.year}-${mm}-01T00:00:00.000Z`);
+      }
       return (
         <div class="card">
           <div class="card-content">
             <span class="year">
               {month === null
                 ? year
-                : time.locale(language).format("MMMM YYYY")}
+                : isValid(time)
+                  ? format(time, "LLLL yyyy")
+                  : year}
             </span>
             <div class="timeline">
               {posts.map((post) => {

package/layout/common/article_media.jsx

@@ -2,13 +2,15 @@
  * Article media component, used in article lists such as archive page and recent posts widget
  */
 const { Component } = require("inferno");
-const moment = require("moment");
+const { format, parseISO, isValid } = require("date-fns");
 
 module.exports = class extends Component {
   render() {
     const { url, title, date, categories } = this.props;
     // Formatted like May.15
-    const formattedDate = moment(date).format("MMM.DD");
+    let formattedDate = "";
+    const d = typeof date === "string" ? parseISO(date) : date;
+    formattedDate = isValid(d) ? format(d, "MMM.dd") : "";
     const categoryTags = [];
     categories.forEach((category, i) => {
       categoryTags.push(<a href={category.url}>{category.name}</a>);

package/layout/common/comment.jsx

@@ -1,13 +1,8 @@
-const {
-  Component,
-  loadComponent,
-  handleWidgetError,
-} = require("../../include/util/common");
+const { Component, loadComponent } = require("../../include/util/common");
 
 module.exports = class extends Component {
   render() {
     const { config, page, helper } = this.props;
-    const { __ } = helper;
     const { comment } = config;
     if (!comment || typeof comment.type !== "string") {
       return null;
@@ -18,10 +13,6 @@ module.exports = class extends Component {
         <div class="card-content">
           {(() => {
             const Comment = loadComponent(`comment/${comment.type}`);
-            if (!Comment) {
-              handleWidgetError(`comment "${comment.type}"`);
-              return null;
-            }
             return (
               <Comment
                 config={config}

package/layout/common/footer.jsx

@@ -83,23 +83,23 @@ class Footer extends Component {
         <div class="footer-links">
           {Object.keys(links).length
             ? Object.keys(links).map((name) => {
-              const link = links[name];
-              return (
-                <a
-                  class="footer-link"
-                  target="_blank"
-                  rel="noopener"
-                  title={name}
-                  href={link.url}
-                >
-                  {link.icon ? (
-                    <iconify-icon icon={link.icon}></iconify-icon>
-                  ) : (
-                    name
-                  )}
-                </a>
-              );
-            })
+                const link = links[name];
+                return (
+                  <a
+                    class="footer-link"
+                    target="_blank"
+                    rel="noopener"
+                    title={name}
+                    href={link.url}
+                  >
+                    {link.icon ? (
+                      <iconify-icon icon={link.icon}></iconify-icon>
+                    ) : (
+                      name
+                    )}
+                  </a>
+                );
+              })
             : null}
         </div>
       </div>
@@ -111,19 +111,19 @@ class Footer extends Component {
         <div class="footer-links">
           {Object.keys(subdomains).length
             ? Object.keys(subdomains).map((name) => {
-              const link = subdomains[name];
-              return (
-                <a
-                  class="footer-link"
-                  target="_blank"
-                  rel="noopener"
-                  title={name}
-                  href={link.url}
-                >
-                  {name}
-                </a>
-              );
-            })
+                const link = subdomains[name];
+                return (
+                  <a
+                    class="footer-link"
+                    target="_blank"
+                    rel="noopener"
+                    title={name}
+                    href={link.url}
+                  >
+                    {name}
+                  </a>
+                );
+              })
             : null}
         </div>
       </div>
@@ -135,10 +135,10 @@ class Footer extends Component {
         <div class="footer-links">
           {archives?.length
             ? archives.map((item) => (
-              <a class="footer-link" href={item.url}>
-                {item.year}
-              </a>
-            ))
+                <a class="footer-link" href={item.url}>
+                  {item.year}
+                </a>
+              ))
             : null}
         </div>
       </div>

package/layout/common/head.jsx

@@ -209,7 +209,7 @@ module.exports = class extends Component {
           href={url_for("/css/callout_blocks.css")}
           onload="this.onload=null;this.rel='stylesheet'"
         />
-        <link rel="stylesheet" href="/css/shiki/shiki.min.css" />
+        <link rel="stylesheet" href="/css/shiki/shiki.css" />
         {/* Iconify Icons */}
         <script
           async

package/layout/common/scripts.jsx

@@ -24,7 +24,7 @@ module.exports = class extends Component {
         ></script>
         <script async src="/js/shiki/shiki.js"></script>
         <script async src="/js/instant-page.min.js" type="module"></script>
-        {config.plugins.live2d_Asoul && (
+        {config?.plugins?.live2d_Asoul && (
           <>
             <script src="/js/live2d_Asoul/TweenLite.js" defer></script>
             <script

package/layout/common/toc.jsx

@@ -14,7 +14,11 @@ class FloatingToc extends Component {
 
     return (
       <div class="toc-container" id="icarus-toc-container">
-        <button class="toc-button" onclick="document.getElementById('icarus-toc-container').classList.toggle('is-open')">
+        <button
+          class="toc-button"
+          type="button"
+          onclick="document.getElementById('icarus-toc-container').classList.toggle('is-open')"
+        >
           <svg
             xmlns="http://www.w3.org/2000/svg"
             width="24"
@@ -36,7 +40,10 @@ class FloatingToc extends Component {
             <line x1="3" y1="18" x2="3.01" y2="18"></line>
           </svg>
         </button>
-        <div class="toc-body" onclick="if(event.target === this || event.target.closest('.toc-link')) { document.getElementById('icarus-toc-container').classList.remove('is-open'); }">
+        <div
+          class="toc-body"
+          onclick="if(event.target === this || event.target.closest('.toc-link')) { document.getElementById('icarus-toc-container').classList.remove('is-open'); }"
+        >
           <div dangerouslySetInnerHTML={{ __html: tocContent }} />
         </div>
       </div>

package/layout/misc/open_graph.jsx

@@ -1,12 +1,4 @@
-/**
- * A JSX component that renders Open Graph tags.
- * @module view/misc/open_graph
- *
- * @see https://hexo.io/docs/helpers#open-graph
- * @see https://github.com/hexojs/hexo/blob/4.2.0/lib/plugins/helper/open_graph.js
- */
-const urlFn = require("node:url");
-const moment = require("moment");
+const { isDate, parseISO, isValid } = require("date-fns");
 const { Component } = require("inferno");
 const { encodeURL, stripHTML, escapeHTML } = require("hexo-util");
 const localeMap = {
@@ -82,38 +74,29 @@ module.exports = class extends Component {
     }
     images
       .map((path) => {
-        if (!urlFn.parse(path).host) {
-          // resolve `path`'s absolute path relative to current page's url
-          // `path` can be both absolute (starts with `/`) or relative.
-          return urlFn.resolve(url, path);
-        }
-        return path;
+        const parsed = new URL(path, url);
+        return parsed.toString();
       })
       .forEach((path) => {
         htmlTags.push(<meta property="og:image" content={path} />);
       });
 
-    if (
-      date &&
-      (moment.isMoment(date) || moment.isDate(date)) &&
-      !Number.isNaN(date.valueOf())
-    ) {
-      htmlTags.push(
-        <meta property="article:published_time" content={date.toISOString()} />,
-      );
+    if (date) {
+      const d = typeof date === "string" ? parseISO(date) : date;
+      if ((isDate(d) || d instanceof Date) && isValid(d)) {
+        htmlTags.push(
+          <meta property="article:published_time" content={d.toISOString()} />,
+        );
+      }
     }
 
-    if (
-      updated &&
-      (moment.isMoment(updated) || moment.isDate(updated)) &&
-      !Number.isNaN(updated.valueOf())
-    ) {
-      htmlTags.push(
-        <meta
-          property="article:modified_time"
-          content={updated.toISOString()}
-        />,
-      );
+    if (updated) {
+      const u = typeof updated === "string" ? parseISO(updated) : updated;
+      if ((isDate(u) || u instanceof Date) && isValid(u)) {
+        htmlTags.push(
+          <meta property="article:modified_time" content={u.toISOString()} />,
+        );
+      }
     }
 
     if (author) {

package/layout/misc/structured_data.jsx

@@ -1,28 +1,7 @@
-/**
- * A JSX component that renders simple Google structured data.
- * @module view/misc/structured_data
- */
-const urlFn = require("node:url");
-const moment = require("moment");
+const { isDate, parseISO, isValid } = require("date-fns");
 const { Component } = require("inferno");
 const { stripHTML, escapeHTML } = require("hexo-util");
 
-/**
- * A JSX component that renders simple Google structured data.
- *
- * @name StructuredData
- * @example
- * <StructuredData
- *     title="Page title"
- *     url="/page/url"
- *     author="Page author name"
- *     publisher="Page publisher name"
- *     publisherLogo="/path/to/logo"
- *     description="Page description"
- *     images={[ '/path/to/image' ]}
- *     date="Page publish date"
- *     updated="Page update date" />
- */
 module.exports = class extends Component {
   render() {
     const { title, url, author, publisher } = this.props;
@@ -39,12 +18,8 @@ module.exports = class extends Component {
     }
     images = images
       .map((path) => {
-        if (!urlFn.parse(path).host) {
-          // resolve `path`'s absolute path relative to current page's url
-          // `path` can be both absolute (starts with `/`) or relative.
-          return urlFn.resolve(url, path);
-        }
-        return path;
+        const parsed = new URL(path, url);
+        return parsed.toString();
       })
       .filter(
         (url) =>
@@ -54,24 +29,23 @@ module.exports = class extends Component {
           url.endsWith(".webp"),
       );
 
-    if (typeof publisherLogo === "string" && !urlFn.parse(publisherLogo).host) {
-      publisherLogo = urlFn.resolve(url, publisherLogo);
+    if (typeof publisherLogo === "string") {
+      const parsedLogo = new URL(publisherLogo, url);
+      publisherLogo = parsedLogo.toString();
     }
 
-    if (
-      date &&
-      (moment.isMoment(date) || moment.isDate(date)) &&
-      !Number.isNaN(date.valueOf())
-    ) {
-      date = date.toISOString();
+    if (date) {
+      const d = typeof date === "string" ? parseISO(date) : date;
+      if ((isDate(d) || d instanceof Date) && isValid(d)) {
+        date = d.toISOString();
+      }
     }
 
-    if (
-      updated &&
-      (moment.isMoment(updated) || moment.isDate(updated)) &&
-      !Number.isNaN(updated.valueOf())
-    ) {
-      updated = updated.toISOString();
+    if (updated) {
+      const u = typeof updated === "string" ? parseISO(updated) : updated;
+      if ((isDate(u) || u instanceof Date) && isValid(u)) {
+        updated = u.toISOString();
+      }
     }
 
     const data = {

package/layout/plugin/busuanzi.jsx

@@ -1,15 +1,5 @@
-/**
- * Busuanzi visitor counter plugin JSX component.
- * @module view/plugin/baidu_analytics
- */
 const { Component, cacheComponent } = require("../../include/util/common");
-/**
- * Busuanzi visitor counter plugin JSX component.
- *
- * @see https://busuanzi.ibruce.info/
- * @example
- * <Busuanzi />
- */
+
 class Busuanzi extends Component {
   render() {
     return (
@@ -20,16 +10,6 @@ class Busuanzi extends Component {
   }
 }
 
-/**
- * Cacheable Busuanzi visitor counter plugin JSX component.
- * <p>
- * This class is supposed to be used in combination with the <code>locals</code> hexo filter
- * ({@link module:hexo/filter/locals}).
- *
- * @see module:util/cache.cacheComponent
- * @example
- * <Busuanzi.Cacheable head={true} />
- */
 Busuanzi.Cacheable = cacheComponent(Busuanzi, "plugin.busuanzi", (props) => {
   if (!props.head) {
     return null;

package/package.json

@@ -1,25 +1,27 @@
 {
   "name": "hexo-theme-gnix",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "author": "Efterklang <gaojiaxing0220@gmail.com>",
   "license": "MIT",
   "description": "Second generation of Hexo theme Icarus, now with Catppuccin flavor and night mode support.",
   "keywords": [
     "hexo",
     "theme",
-    "icarus",
     "catppuccin"
   ],
-  "homepage": "https://github.com/Efterklang/hexo-theme-icarus",
-  "repository": "https://github.com/Efterklang/hexo-theme-icarus.git",
+  "homepage": "https://github.com/Efterklang/gnix-blog-theme",
+  "repository": "https://github.com/Efterklang/gnix-blog-theme.git",
   "bugs": {
-    "url": "https://github.com/Efterklang/hexo-theme-icarus/issues"
+    "url": "https://github.com/Efterklang/gnix-blog-theme/issues"
   },
   "engines": {
     "node": ">=14"
   },
   "scripts": {
-    "lint": "biome check --write ."
+    "lint": "biome check --write .",
+    "format": "biome format .",
+    "check": "biome check",
+    "test": "echo \"No tests configured\" && exit 0"
   },
   "files": [
     "include",
@@ -31,12 +33,13 @@
     "README.md"
   ],
   "dependencies": {
+    "date-fns": "^2.30.0",
+    "hexo-pagination": "^4.0.0",
     "hexo-renderer-inferno": "^1.0.2",
-    "moment": "^2.30.1"
+    "js-yaml": "^4.1.1"
   },
   "peerDependencies": {
     "hexo": ">=7.0.0",
-    "hexo-util": ">=4.0.0",
-    "hexo-pagination": ">=3.0.0"
+    "hexo-util": ">=4.0.0"
   }
 }

package/source/css/optional/chinese.css

@@ -13,5 +13,5 @@
 }
 
 .content {
-  font-family: "Huiwen-mincho";
+  font-family: "Huiwen-mincho", sans-serif;
 }