hexo-theme-gnix 11.0.0 → 13.0.0

package/layout/common/footer.jsx

@@ -2,92 +2,25 @@ const { Component, cacheComponent } = require("../../include/util/common");
 
 class Footer extends Component {
   render() {
-    const { siteTitle, siteYear, author, links, subdomains, copyright, showVisitorCounter, visitorCounterTitle, ICPRecord } = this.props;
+    const { copyright, showVisitorCounter, visitorCounterTitle, ICPRecord } = this.props;
 
-    const svg_line = (
-      <svg aria-hidden="true" width="100%" height="8" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <pattern id="a" width="91" height="8" patternUnits="userSpaceOnUse">
-          <g clip-path="url(#clip0_2426_11367)">
-            <path
-              d="M114 4c-5.067 4.667-10.133 4.667-15.2 0S88.667-.667 83.6 4 73.467 8.667 68.4 4 58.267-.667 53.2 4 43.067 8.667 38 4 27.867-.667 22.8 4 12.667 8.667 7.6 4-2.533-.667-7.6 4s-10.133 4.667-15.2 0S-32.933-.667-38 4s-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0-10.133-4.667-15.2 0-10.133 4.667-15.2 0"
-              stroke="var(--lavender)"
-              stroke-linecap="square"
-            ></path>
-          </g>
-        </pattern>
-        <rect width="100%" height="100%" fill="url(#a)"></rect>
-      </svg>
-    );
-
-    const footer_brand = (
-      <div class="footer-column footer-brand">
-        <p class="footer-title">{author || siteTitle}</p>
-        <p class="footer-meta">
-          <span
-            dangerouslySetInnerHTML={{
-              __html: `&copy; 2022 - ${siteYear}`,
-            }}
-          ></span>
-          &nbsp;Powered by Hexo
+    return (
+      <footer class="footer">
+        <div class="footer-brand">
+          <p class="footer-credit">
+            2022&ndash;PRESENT&ensp;<span class="footer-author">© GnixAij Oag</span> CC BY-NC-SA 4.0
+          </p>
           {showVisitorCounter ? (
-            <>
-              <br />
+            <p class="footer-meta">
               <span id="busuanzi_container_site_uv" dangerouslySetInnerHTML={{ __html: visitorCounterTitle }}></span>
-            </>
+            </p>
           ) : null}
           {ICPRecord ? (
-            <>
-              <br />
-              <a href="https://beian.miit.gov.cn/" style={"color: inherit"} target="_blank" rel="noopener" dangerouslySetInnerHTML={{ __html: ICPRecord }}></a>
-            </>
+            <p class="footer-meta">
+              <a href="https://beian.miit.gov.cn/" class="footer-icp" target="_blank" rel="noopener" dangerouslySetInnerHTML={{ __html: ICPRecord }}></a>
+            </p>
           ) : null}
-        </p>
-        {copyright ? <p class="footer-meta" dangerouslySetInnerHTML={{ __html: copyright }}></p> : null}
-      </div>
-    );
-
-    const footer_social = (
-      <div class="footer-column footer-social">
-        <p class="footer-heading">Social Media</p>
-        <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>
-                );
-              })
-            : null}
-        </div>
-      </div>
-    );
-
-    const footer_subdomains = (
-      <div class="footer-column footer-subdomains">
-        <p class="footer-heading">Quick Links</p>
-        <div class="footer-links">
-          {Object.keys(subdomains).length
-            ? Object.keys(subdomains).map((name) => {
-                const link = subdomains[name];
-                return (
-                  <a class="footer-link" target="_self" rel="noopener" title={name} href={link.url}>
-                    {name}
-                  </a>
-                );
-              })
-            : null}
-        </div>
-      </div>
-    );
-
-    return (
-      <footer class="footer">
-        <div class="footer-grid">
-          {footer_brand}
-          {footer_subdomains}
-          {footer_social}
+          {copyright ? <p class="footer-meta" dangerouslySetInnerHTML={{ __html: copyright }}></p> : null}
         </div>
       </footer>
     );
@@ -96,33 +29,10 @@ class Footer extends Component {
 
 module.exports = cacheComponent(Footer, "common.footer", (props) => {
   const { config, helper, page, site } = props;
-  const { url_for, _p, date } = helper;
+  const { _p, date } = helper;
   const { title, author, footer, plugins } = config;
   const langKey = helper.language_key(page);
 
-  const links = {};
-  if (footer?.links) {
-    Object.keys(footer.links).forEach((name) => {
-      const link = footer.links[name];
-      links[name] = {
-        url: url_for(typeof link === "string" ? link : link.url),
-        icon: link.icon,
-      };
-    });
-  }
-
-  const subdomains = {};
-  if (footer?.subdomains) {
-    Object.keys(footer.subdomains).forEach((name) => {
-      const link = footer.subdomains[name];
-      const targetUrl = typeof link === "string" ? link : link.url;
-      subdomains[name] = {
-        url: helper.localized_url_for(targetUrl, langKey),
-      };
-    });
-  }
-
-  // Build archives grouped by year from site posts
   let archives = [];
   if (site?.posts?.length) {
     const archiveDir = config.archive_dir || "archives";
@@ -148,8 +58,6 @@ module.exports = cacheComponent(Footer, "common.footer", (props) => {
     siteTitle: title,
     siteYear: date(new Date(), "YYYY"),
     author,
-    links,
-    subdomains,
     archives,
     copyright: footer?.copyright ?? "",
     showVisitorCounter: plugins && plugins.busuanzi === true,

package/layout/common/head.jsx

@@ -5,7 +5,7 @@ const StructuredData = require("../../layout/misc/structured_data");
 const Plugins = require("./plugins");
 const { getArticleFontInitScript } = require("../../include/util/article_font");
 const { getThemeInitScript } = require("../../include/util/theme");
-const { getDefaultLanguageKey, getI18nKey, getLanguage, getPageLanguageKey, getPageLocale, isI18nEnabled, normalizeLocale, toArray } = require("../../include/util/i18n");
+const { getDefaultLanguageKey, getLanguage, getPageLanguageKey, getPageLocale, isI18nEnabled, normalizeLocale } = require("../../include/util/i18n");
 const fs = require("node:fs");
 const path = require("node:path");
 
@@ -82,27 +82,15 @@ function addExplicitAlternates(links, alternates, helper, config) {
   });
 }
 
-function collectDocuments(site) {
-  return [...toArray(site?.posts), ...toArray(site?.pages)];
-}
-
 function getHreflangLinks(site, page, config, helper) {
   if (!isI18nEnabled(config)) return [];
 
   const links = new Map();
-  const pageKey = getI18nKey(page);
   const langKey = getPageLanguageKey(page, config);
   const locale = getPageLocale(page, config);
 
   addAlternateLink(links, locale, page.permalink || page.path, helper, config);
-  addExplicitAlternates(links, page.i18n?.alternates || page.alternates || page.hreflang, helper, config);
-
-  if (pageKey) {
-    collectDocuments(site).forEach((item) => {
-      if (!item || getI18nKey(item) !== pageKey) return;
-      addAlternateLink(links, getPageLocale(item, config), item.permalink || item.path, helper, config);
-    });
-  }
+  addExplicitAlternates(links, page.i18n, helper, config);
 
   if (links.size > 1 && !links.has("x-default")) {
     const defaultLanguage = getLanguage(config, getDefaultLanguageKey(config));
@@ -174,10 +162,10 @@ module.exports = class extends Component {
 
     return (
       <head>
+        <meta charset="utf-8" />
         <script dangerouslySetInnerHTML={{ __html: themeInitScript }}></script>
         <script dangerouslySetInnerHTML={{ __html: articleFontUtilsScript }}></script>
         <script dangerouslySetInnerHTML={{ __html: articleFontInitScript }}></script>
-        <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         {noIndex ? <meta name="robots" content="noindex" /> : null}
         {meta?.length ? <MetaTags meta={meta} /> : null}

package/layout/common/navbar.jsx

@@ -1,25 +1,5 @@
 const { Component, Fragment, cacheComponent } = require("../../include/util/common");
-const { getI18nKey, getLanguage, getLanguageKeys, getPageLanguageKey, isExternalUrl, isI18nEnabled, toArray } = require("../../include/util/i18n");
-
-function isActiveMenuLink(menuUrl, pageUrl) {
-  const menuPath = sanitizeLink(menuUrl);
-  const pagePath = sanitizeLink(pageUrl);
-  if (menuPath === pagePath) return true;
-  if (!menuPath) return false;
-  return pagePath.startsWith(`${menuPath}/`);
-}
-
-function sanitizeLink(url) {
-  let paths = url
-    .replace(/(^\w+:|^)\/\//, "")
-    .split("#")[0]
-    .split("/")
-    .filter((p) => p.trim() !== "");
-  if (paths.length > 0 && paths[paths.length - 1].trim() === "index.html") {
-    paths = paths.slice(0, paths.length - 1);
-  }
-  return paths.join("/");
-}
+const { getLanguage, getLanguageKeys, getPageLanguageKey, isExternalUrl, isI18nEnabled } = require("../../include/util/i18n");
 
 const renderLinkIcon = (link) => {
   if (!link.icon) return null;
@@ -36,16 +16,6 @@ const renderLinkIcon = (link) => {
   return <iconify-icon icon={link.icon}></iconify-icon>;
 };
 
-function collectDocuments(site) {
-  return [...toArray(site?.posts), ...toArray(site?.pages)];
-}
-
-function getDocumentUrl(helper, document) {
-  const href = document?.path || document?.permalink;
-  if (!href) return null;
-  return isExternalUrl(href) ? href : helper.url_for(href);
-}
-
 function getTargetLanguageKey(config, currentLanguageKey) {
   const languageKeys = getLanguageKeys(config);
   if (currentLanguageKey === "en" && languageKeys.includes("cn")) return "cn";
@@ -71,27 +41,24 @@ function getLanguageSwitch(site, page, config, helper) {
   if (!targetLanguage || targetLanguageKey === currentLanguageKey) return null;
   const targetLanguageName = getTargetLanguageDisplayName(currentLanguageKey, targetLanguageKey, targetLanguage);
 
-  const pageKey = getI18nKey(page);
   let url = null;
-
-  if (pageKey) {
-    const alternate = collectDocuments(site).find((item) => getI18nKey(item) === pageKey && getPageLanguageKey(item, config) === targetLanguageKey);
-    url = getDocumentUrl(helper, alternate);
+  const pageI18n = page.i18n;
+  if (pageI18n && typeof pageI18n === "object" && targetLanguageKey) {
+    const altUrl = pageI18n[targetLanguageKey] || (targetLanguage ? pageI18n[targetLanguage.locale] : null);
+    if (altUrl) {
+      url = isExternalUrl(altUrl) ? altUrl : helper.url_for(altUrl);
+    }
   }
 
   const isDocumentPage = ["page", "post"].includes(page?.layout);
   const title = helper.__("navbar.language_switch", targetLanguageName);
-  const homeUrl = helper.localized_url_for("/", currentLanguageKey);
-  const unavailableTitle = helper.__("navbar.language_unavailable_title");
   const unavailableMessage = helper.__("navbar.language_unavailable", targetLanguageName);
-  const stayLabel = helper.__("navbar.language_stay");
-  const homeLabel = helper.__("navbar.language_home");
-  const closeLabel = helper.__("navbar.language_close");
 
   const mode = !url && isDocumentPage ? "missing" : "link";
 
   if (!url && mode === "link") {
-    url = helper.localized_url_for(page?.path || "/", targetLanguageKey);
+    const targetPath = page?.current > 1 ? "/" : (page?.path || "/");
+    url = helper.localized_url_for(targetPath, targetLanguageKey);
   }
 
   return {
@@ -100,12 +67,7 @@ function getLanguageSwitch(site, page, config, helper) {
     locale: targetLanguage.locale,
     label: targetLanguageName,
     title,
-    homeUrl,
-    unavailableTitle,
     unavailableMessage,
-    stayLabel,
-    homeLabel,
-    closeLabel,
   };
 }
 
@@ -127,7 +89,7 @@ class Navbar extends Component {
       <Fragment>
         <nav class="navbar navbar-main">
           <div class="navbar-container" onclick="toggleNav(event)">
-            <a href={siteUrl} style={"font-family: homemade-apple; color: var(--text); display: flex; align-items: center; padding: 0 1em;"}>
+            <a id="navbar-logo-link" href={siteUrl} style={"font-family: homemade-apple; color: var(--text); display: flex; align-items: center; padding: 0 1em;"}>
               GnixAij
             </a>
             <div class="navbar-menu">
@@ -135,9 +97,8 @@ class Navbar extends Component {
                 <div class="navbar-start">
                   {Object.keys(menu).map((name) => {
                     const item = menu[name];
-                    const navbar_item_class = `navbar-item ${item.active ? "is-active" : ""}`;
                     return (
-                      <a class={navbar_item_class} href={item.url} aria-current={item.active ? "page" : null}>
+                      <a class="navbar-item" href={item.url} data-navbar-menu={name}>
                         {name}
                       </a>
                     );
@@ -162,7 +123,7 @@ class Navbar extends Component {
                     <a id="language-switch-link" class="navbar-item" href={languageSwitch.url || '#'} title={languageSwitch.title} aria-label={languageSwitch.title} lang={languageSwitch.locale} hreflang={languageSwitch.locale} style={languageSwitch.mode === 'link' ? '' : 'display:none'}>
                       {languageIcon}
                     </a>
-                    <button id="language-switch-button" type="button" class="navbar-item" title={languageSwitch.title} aria-label={languageSwitch.title} lang={languageSwitch.locale} popovertarget="language-switch-popover" style={languageSwitch.mode === 'missing' ? '' : 'display:none'}>
+                    <button id="language-switch-button" type="button" class="navbar-item" title={languageSwitch.title} aria-label={languageSwitch.title} lang={languageSwitch.locale} data-toast-message={languageSwitch.unavailableMessage} onclick="window.showSiteToast?.(this.dataset.toastMessage); return false;" style={languageSwitch.mode === 'missing' ? '' : 'display:none'}>
                       {languageIcon}
                     </button>
                   </Fragment>
@@ -192,31 +153,6 @@ class Navbar extends Component {
             </button>
           </div>
         </nav>
-        {languageSwitch ? (
-          <div id="language-switch-popover" class="article-popover language-switch-popover" popover="auto" tabindex="-1">
-            <div class="article-popover-header">
-              <h3>{languageSwitch.unavailableTitle}</h3>
-              <button type="button" class="article-popover-close" popovertarget="language-switch-popover" popovertargetaction="hide" aria-label={languageSwitch.closeLabel}>
-                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" role="img" aria-label={languageSwitch.closeLabel}>
-                  <title>{languageSwitch.closeLabel}</title>
-                  <path d="M18 6 6 18" />
-                  <path d="m6 6 12 12" />
-                </svg>
-              </button>
-            </div>
-            <div class="article-popover-body language-switch-popover-body">
-              <p>{languageSwitch.unavailableMessage}</p>
-              <div class="language-switch-popover-actions">
-                <button type="button" class="language-switch-popover-action" popovertarget="language-switch-popover" popovertargetaction="hide">
-                  {languageSwitch.stayLabel}
-                </button>
-                <a id="language-switch-home-link" class="language-switch-popover-action is-primary" href={languageSwitch.homeUrl} onclick="document.getElementById('language-switch-popover')?.hidePopover()">
-                  {languageSwitch.homeLabel}
-                </a>
-              </div>
-            </div>
-          </div>
-        ) : null}
       </Fragment>
     );
   }
@@ -233,11 +169,9 @@ module.exports = cacheComponent(Navbar, "common.navbar", (props) => {
 
   const menu = {};
   if (navbar?.menu) {
-    const pageUrl = typeof page.path !== "undefined" ? url_for(page.path) : "";
     Object.keys(navbar.menu).forEach((name) => {
-      const url = helper.localized_url_for(navbar.menu[name], langKey);
-      const active = isActiveMenuLink(url, pageUrl);
-      menu[name] = { url, active };
+      const rawValue = navbar.menu[name];
+      menu[name] = { url: helper.localized_url_for(rawValue, langKey) };
     });
   }
 

package/layout/layout.jsx

@@ -9,30 +9,47 @@ const { DEFAULT_SETTINGS: ARTICLE_FONT_DEFAULT_SETTINGS } = require("../include/
 
 function buildLangSwitchScript(site, page, config, helper) {
   const lswitch = Navbar.getLanguageSwitch(site, page, config, helper);
-  if (!lswitch) return "";
 
-  const payload = JSON.stringify({
-    mode: lswitch.mode,
-    url: lswitch.url || "",
-    locale: lswitch.locale,
-    homeUrl: lswitch.homeUrl,
-  });
+  const langKey = helper.language_key(page);
+  const menu = {};
+  if (config.navbar?.menu) {
+    Object.keys(config.navbar.menu).forEach((name) => {
+      const rawValue = config.navbar.menu[name];
+      menu[name] = { url: helper.localized_url_for(rawValue, langKey) };
+    });
+  }
+  const siteUrl = helper.localized_url_for("/", langKey);
+
+  const payload = lswitch
+    ? JSON.stringify({
+        mode: lswitch.mode,
+        url: lswitch.url || "",
+        locale: lswitch.locale,
+      })
+    : "null";
 
   return `<script data-swup-reload-script>
     (function() {
       var d = ${payload};
       var l = document.getElementById('language-switch-link');
       var b = document.getElementById('language-switch-button');
-      if (!l && !b) return;
-      if (d.mode === 'link' && d.url) {
-        if (l) { l.href = d.url; l.style.display = ''; l.setAttribute('lang', d.locale); l.setAttribute('hreflang', d.locale); }
-        if (b) b.style.display = 'none';
-      } else {
-        if (l) l.style.display = 'none';
-        if (b) { b.style.display = ''; b.setAttribute('lang', d.locale); }
-        var h = document.getElementById('language-switch-home-link');
-        if (h) h.href = d.homeUrl;
+      if (l || b) {
+        if (d && d.mode === 'link' && d.url) {
+          if (l) { l.href = d.url; l.style.display = ''; l.setAttribute('lang', d.locale); l.setAttribute('hreflang', d.locale); }
+          if (b) b.style.display = 'none';
+        } else {
+          if (l) l.style.display = 'none';
+          if (b) { b.style.display = ''; b.setAttribute('lang', d.locale); }
+        }
       }
+      var menu = ${JSON.stringify(menu)};
+      Object.keys(menu).forEach(function(name) {
+        var link = document.querySelector('a[data-navbar-menu="' + name + '"]');
+        if (!link) return;
+        link.href = menu[name].url;
+      });
+      var logo = document.getElementById('navbar-logo-link');
+      if (logo) logo.href = ${JSON.stringify(siteUrl)};
     })();
   <\/script>`;
 }

package/layout/plugin/goatcounter.jsx

@@ -0,0 +1,25 @@
+const { Component, Fragment, cacheComponent } = require("../../include/util/common");
+
+class Goatcounter extends Component {
+  render() {
+    const { url } = this.props;
+
+    return (
+      <Fragment>
+        <script data-goatcounter={url} async src="//gc.zgo.at/count.js"></script>
+      </Fragment>
+    );
+  }
+}
+
+Goatcounter.Cacheable = cacheComponent(Goatcounter, "plugin.goatcounter", (props) => {
+  const { head, plugin } = props;
+  if (!head || !plugin.url) {
+    return null;
+  }
+  return {
+    url: plugin.url,
+  };
+});
+
+module.exports = Goatcounter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-gnix",
-  "version": "11.0.0",
+  "version": "13.0.0",
   "author": "Efterklang <gaojiaxing0220@gmail.com> (https://vluv.space)",
   "license": "MIT",
   "description": "Second generation of Hexo theme Icarus, now with Catppuccin flavor and night mode support.",
@@ -21,8 +21,7 @@
     "lint": "biome check --write .",
     "format": "biome format .",
     "check": "biome check",
-    "test": "node test/md_generator.test.js",
-    "build:swup": "cp src/swup.js source/js/swup.js"
+    "test": "node test/md_generator.test.js"
   },
   "files": [
     "include",
@@ -34,9 +33,6 @@
     "README.md"
   ],
   "dependencies": {
-    "@mdit/plugin-tab": "^0.24.2",
-    "@swup/head-plugin": "^2.3.1",
-    "@swup/scripts-plugin": "^2.1.0",
     "esbuild": "^0.28.0",
     "feedsmith": "^2.9.4",
     "hexo-pagination": "^4.0.0",
@@ -47,19 +43,16 @@
     "markdown-exit": "^1.0.0-beta.9",
     "markdown-exit-mermaid": "^2.2.3",
     "markdown-exit-ratex": "^0.2.2",
-    "markdown-exit-shiki": "^0.3.2",
-    "markdown-it-abbr": "^2.0.0",
+    "@shikijs/colorized-brackets": "^4.0.2",
+    "@shikijs/transformers": "^4.0.2",
+    "shiki": "^4.0.2",
     "markdown-it-anchor": "^9.2.0",
     "markdown-it-footnote": "^4.0.0",
-    "markdown-it-ins": "^4.0.0",
     "markdown-it-mark": "^4.0.0",
-    "markdown-it-sub": "^2.0.0",
-    "markdown-it-sup": "^2.0.0",
     "markdown-it-task-lists": "^2.1.1",
-    "swup": "^4.8.3"
+    "hexo-util": "^4.0.0"
   },
   "peerDependencies": {
-    "hexo": "^8.1.1",
-    "hexo-util": "^4.0.0"
+    "hexo": "^8.1.2"
   }
 }

package/scripts/index.js

@@ -2,6 +2,7 @@ require("../include/hexo/i18n")(hexo);
 require("../include/hexo/filter")(hexo);
 require("../include/hexo/generator")(hexo);
 require("../include/hexo/feed")(hexo);
+require("../include/hexo/sitemap")(hexo);
 require("../include/hexo/encrypt")(hexo);
 require("../include/hexo/view").init(hexo);
 require("../include/hexo/helper")(hexo);

package/source/css/archive.css

@@ -167,16 +167,14 @@
 
 .archive-item::before {
   position: absolute;
-  top: 0.86rem;
-  left: -1.18rem;
+  top: 1em;
+  left: -1rem;
   width: 0.55rem;
   height: 0.55rem;
   border-radius: 999px;
   background: transparent;
   content: "";
-  transition:
-    background 140ms ease,
-    transform 140ms ease;
+  transition: background 500ms ease;
 }
 
 .archive-item:hover::before,