hexo-theme-stellar 1.33.0 → 1.34.0

package/layout/_plugins/mermaid.ejs

@@ -1,29 +1,33 @@
 <script defer type="text/javascript" src="<%- conf.js %>"></script>
 <script>
-  window.addEventListener('DOMContentLoaded', (event) => {
-    var mermaid_config = {
-      startOnLoad: true,
-      theme:
-        "<%- theme.style.prefers_theme %>" == "auto" &&
-          window.matchMedia("(prefers-color-scheme: dark)").matches
-          ? "dark"
-          : "<%- conf.theme %>",
-      logLevel: 3,
-      themeVariables: {
-        darkMode: true
-      },
-      flowchart: {
-        useMaxWidth: false,
-        htmlLabels: true,
-        curve: "linear"
-      },
-      gantt: {
-        axisFormat: "%Y/%m/%d"
-      },
-      sequence: {
-        actorMargin: 50
+  utils.initPlugin(() => {
+    const els = document.querySelectorAll('.mermaid');
+    if (els.length > 0) {
+      const mermaid_config = {
+        startOnLoad: false,
+        theme:
+          "<%- theme.style.prefers_theme %>" == "auto" &&
+            window.matchMedia("(prefers-color-scheme: dark)").matches
+            ? "dark"
+            : "<%- conf.theme %>",
+        logLevel: 3,
+        themeVariables: {
+          darkMode: true
+        },
+        flowchart: {
+          useMaxWidth: false,
+          htmlLabels: true,
+          curve: "linear"
+        },
+        gantt: {
+          axisFormat: "%Y/%m/%d"
+        },
+        sequence: {
+          actorMargin: 50
+        }
       }
+      mermaid.initialize(mermaid_config);
+      mermaid.run();
     }
-    mermaid.initialize(mermaid_config);
-  });
+  }, 'mermaid');
 </script>

package/layout/_plugins/pjax.ejs

@@ -0,0 +1,8 @@
+<script>
+    window.StellarPjaxConfig = {
+        selectors: <%- JSON.stringify((conf.selectors || ['title', '#l_cover', '.l_body']).includes('#l_cover') ? (conf.selectors || ['title', '#l_cover', '.l_body']) : (conf.selectors || ['title', '#l_cover', '.l_body']).concat('#l_cover')) %>,
+        timeout: <%= conf.timeout || 10000 %>,
+        cacheBust: <%= conf.cacheBust || false %>
+    };
+</script>
+<script src="<%- url_for('/js/plugins/pjax.js') %>" defer></script>

package/layout/_plugins/scrollreveal.ejs

@@ -1,16 +1,17 @@
 <script defer src="<%- conf.js %>"></script>
 <script>
-  window.addEventListener('DOMContentLoaded', (event) => {
-    const slideUp = {
-      distance: `<%- conf.distance %>`,
-      duration: `<%- conf.duration %>`,
-      interval: `<%- conf.interval %>`,
-      scale: `<%- conf.scale %>`,
-      opacity: 0,
-      easing: "ease-out"
-    };
-    ScrollReveal({ container: '.widgets' }).reveal('.slide-up', { ...slideUp });
-    ScrollReveal({ container: '.l_main' }).reveal('.slide-up', { ...slideUp });
-    ScrollReveal({ container: '.l_right' }).reveal('.slide-up', { ...slideUp });
-  });
+  utils.initPlugin(() => {
+    const els = document.querySelectorAll('.slide-up');
+    if (els.length > 0) {
+      const slideUp = {
+        distance: `<%- conf.distance %>`,
+        duration: `<%- conf.duration %>`,
+        interval: `<%- conf.interval %>`,
+        scale: `<%- conf.scale %>`,
+        opacity: 0,
+        easing: "ease-out"
+      };
+      ScrollReveal().reveal('.slide-up', { ...slideUp });
+    }
+  }, 'scrollreveal');
 </script>

package/layout/_plugins/swiper.ejs

@@ -1,5 +1,5 @@
 <script>
-  window.addEventListener('DOMContentLoaded', (event) => {
+  utils.initPlugin(() => {
     const swiper_api = document.getElementById('swiper-api');
     if (swiper_api != undefined) {
       utils.css(`<%- conf.css %>`);
@@ -22,5 +22,5 @@
         });
       })
     }
-  });
+  }, 'swiper');
 </script>

package/layout/index.ejs

@@ -12,15 +12,17 @@ function layout_post_card(layout, post, content) {
   if (layout == 'post' && post.cover != undefined && post.poster != undefined) {
     layout += ' photo';
   }
-  el += `<a class="post-card${scrollreveal(' ')} ${layout}" href="${pretty_url(post.link || post.path)}">`
+  el += `<div class="post-card-wrap${scrollreveal(' ')}">`;
+  el += `<a class="post-card ${layout}" href="${pretty_url(post.link || post.path)}">`
   el += content;
   el += '</a>';
+  el += '</div>';
   return el;
 }
 
 function layout_post_list(partial) {
   var el = '';
-  el += '<div class="post-list post">';
+  el += `<div class="post-list post">`;
   page.posts.each(function(post){
     if (post.indexing != false) {
       el += layout_post_card('post', post, partial(post));

package/layout/index_topic.ejs

@@ -7,8 +7,8 @@ function layout_topic_list(partial) {
     if (topic == null) {
       continue
     }
-    el += `<div class="post-list wiki topic">`
-    el += `<a class="post-card wiki topic${scrollreveal(' ')}" href="${pretty_url(topic.homepage?.path || '/')}">`
+    el += `<div class="post-card-wrap${scrollreveal(' ')}">`
+    el += `<a class="post-card wiki topic" href="${pretty_url(topic.homepage?.path || '/')}">`
     el += partial(topic)
     el += `</a>`
     el += `</div>`
@@ -18,9 +18,11 @@ function layout_topic_list(partial) {
 function layoutDiv() {
   var el = ''
   el += partial('_partial/main/navbar/nav_tabs_blog')
+  el += `<div class="post-list wiki topic">`;
   el += layout_topic_list(function(topic) {
     return partial('_partial/main/post_list/topic_card', {topic: topic})
   })
+    el += `</div>`
   return el
 }
 %>

package/layout/index_wiki.ejs

@@ -12,15 +12,15 @@ function layout_wiki_list(partial) {
     }
     if (page.filter === false) {
       // wikiList
-      el += `<div class="post-list wiki">`
-      el += `<a class="post-card wiki${scrollreveal(' ')}" href="${pretty_url(proj.homepage?.path || '/')}">`
+      el += `<div class="post-card-wrap${scrollreveal(' ')}">`
+      el += `<a class="post-card wiki" href="${pretty_url(proj.homepage?.path || '/')}">`
       el += partial(proj)
       el += `</a>`
       el += `</div>`
     } else if (proj.tags && proj.tags.includes(page.tagName) === true) {
       // filtered wikiList
-      el += `<div class="post-list wiki filter">`
-      el += `<a class="post-card wiki${scrollreveal(' ')}" href="${pretty_url(proj.homepage?.path || '/')}">`
+      el += `<div class="post-card-wrap${scrollreveal(' ')} filter">`
+      el += `<a class="post-card wiki" href="${pretty_url(proj.homepage?.path || '/')}">`
       el += partial(proj)
       el += `</a>`
       el += `</div>`
@@ -32,9 +32,11 @@ function layout_wiki_list(partial) {
 function layoutDiv() {
   var el = ''
   el += partial('_partial/main/navbar/nav_tabs_wiki')
+  el += `<div class="post-list wiki">`;
   el += layout_wiki_list(function(proj) {
     return partial('_partial/main/post_list/wiki_card', {proj: proj})
   })
+  el += `</div>`
   return el
 }
 %>

package/layout/layout.ejs

@@ -47,7 +47,7 @@ if (theme.style.prefers_theme === 'auto') {
   html += partial('_partial/head')
   html += `<body>`
     html += site_background
-    html += partial('_partial/cover/index')
+    html += `<div id="l_cover">${partial('_partial/cover/index').trim()}</div>`
     html += `<div class="l_body ${page_type}" id="start" layout="${page.layout}" type="${article_type}" ${indent ? 'text-indent' : ''}>`
       html += `<aside class="l_left">`
         html += `<div class="sidebg"></div>`
@@ -62,13 +62,14 @@ if (theme.style.prefers_theme === 'auto') {
         html += `<div class="main-mask" onclick="sidebar.dismiss()"></div>`
       html += `</div>`
       html += `<aside class="l_right">`
-        html += partial('_partial/sidebar/index_rightbar')
+        html += partial('_partial/sidebar/index_rightbar').trim()
       html += `</aside>`
       html += partial('_partial/menubtn')
     html += `</div>`
     html += `<div class="scripts">`
       html += partial('_partial/scripts')
     html += `</div>`
+    html += `<div class="page-loading-bar"><img src="${theme.default.loading}"></div>`
   html += `</body>`
 html += `</html>`
 %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-stellar",
-  "version": "1.33.0",
+  "version": "1.34.0",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "cheerio": "^1.1.0",
+    "glob": "^10.4.0",
     "hexo-renderer-ejs": "^2.0.0",
     "hexo-renderer-stylus": "^3.0.1",
     "probe-image-size": "^7.2.3"

package/scripts/commands/new-note.js

@@ -0,0 +1,49 @@
+const path = require('path');
+const fs = require('fs');
+
+hexo.extend.console.register('new-note', 'Create a new note', {
+  options: [
+    { name: '-n, --name', desc: 'Note name', required: true },
+    { name: '-bk, --book', desc: 'Notebook name', required: true },
+    { name: '-tag, --tag', desc: 'Tags (comma separated)', required: false }
+  ]
+}, function(args, callback) {
+  const name = args.name || args.n;
+  const book = args.book || args.bk || args.k;
+  const tagStr = args.tag ||args.g ||'';
+  if (!name || !book) {
+    console.log('Usage: hexo new-note -n "name" -bk "notebook" -tag "tag1,tag2/subtag1"');
+    return callback();
+  }
+
+  const date = new Date();
+  const filename = `${name}.md`;
+  const notebookDir = path.join(hexo.source_dir, 'notebooks', book);
+  if (!fs.existsSync(notebookDir)) {
+    fs.mkdirSync(notebookDir, { recursive: true });
+  }
+  const filePath = path.join(notebookDir, filename);
+  if (fs.existsSync(filePath)) {
+    console.log(`File ${filename} already exists in ${notebookDir}.`);
+    return callback();
+  }
+  // 处理标签
+  let tags = [];
+  if (tagStr) {
+    tags = tagStr.split(',').map(t => t.trim()).filter(Boolean);
+  }
+  // 生成表头
+  const frontMatter = [
+    '---',
+    `title: ${name}`,
+    `date: ${date.getFullYear()}-${String(date.getMonth()+1).padStart(2,'0')}-${String(date.getDate()).padStart(2,'0')} ${String(date.getHours()).padStart(2,'0')}:${String(date.getMinutes()).padStart(2,'0')}:${String(date.getSeconds()).padStart(2,'0')}`,
+    `tags: [${tags.map(t => '"'+t+'"').join(', ')}]`,
+    `notebook: ${book}`,
+    '---',
+    '',
+    ''
+  ].join('\n');
+  fs.writeFileSync(filePath, frontMatter);
+  console.log(`Created: ${filePath}`);
+  callback();
+}); 

package/scripts/filters/lib/img_onerror.js

@@ -5,8 +5,6 @@
 
 'use strict';
 
-const fs = require('hexo-fs');
-
 module.exports.processSite = function(htmlContent) {
   const default_image = this.theme.config.default.image;
   return htmlContent.replace(/<img(.*?)src="(.*?)"(.*?)>/gi, function(imgTag) {

package/scripts/helpers/json_ld.js

@@ -6,19 +6,22 @@
 'use strict';
 
 const util = require('hexo-util');
-  
+
 hexo.extend.helper.register('json_ld', function(args) {
   const page = this.page;
   const config = this.config;
   const structured_data = this.theme.structured_data;
   const authorEmail = config.email;
-  const authorImage = config.avatar || (authorEmail ? this.gravatar(authorEmail) : null);
+  let authorImage = config.avatar || (authorEmail ? this.gravatar(authorEmail) : null);
   const isPage = page.layout == 'page';
+  if (authorImage && authorImage.startsWith("/")) {
+    authorImage = config.url.endsWith("/") ? config.url + authorImage.slice(1) : config.url + authorImage
+  }
 
   const author = {
     '@type': 'Person',
     name: config.author,
-    sameAs: structured_data.sameAs || []
+    sameAs: structured_data.links || []
   };
   // Google does not accept `Person` as item type for the publisher property
   const publisher = Object.assign({}, author, {'@type': 'Organization'});
@@ -69,9 +72,9 @@ hexo.extend.helper.register('json_ld', function(args) {
 
     schema.thumbnailUrl = page.cover || page.banner;
     schema.image = images;
-  
+
   } else if (isPage || this.is_home()) {
-    
+
     const url = this.is_home() ? config.url : this.pretty_url(page.permalink);
     schema = {
       '@context': 'https://schema.org',
@@ -99,9 +102,9 @@ hexo.extend.helper.register('json_ld', function(args) {
       }
 
     }
-    
+
   } else {
-    
+
     // default to WebPage for other layouts
     schema = {
       '@context': 'https://schema.org',
@@ -112,7 +115,7 @@ hexo.extend.helper.register('json_ld', function(args) {
       description: config.description,
       url: config.url
     };
-    
+
   }
 
   return `<script type="application/ld+json">${JSON.stringify(schema)}</script>`;

package/scripts/helpers/pretty_url.js

@@ -1,6 +1,11 @@
 'use strict';
 
 hexo.extend.helper.register('pretty_url', function (path = '') {
+  if (path.startsWith('http://') || path.startsWith('https://')) {
+    // 如果是绝对 URL，直接返回
+    return path;
+  }
+  
   let url = this.url_for(path);
 
   // 替换 /index.html → /

package/scripts/tags/lib/chat.js

@@ -52,7 +52,11 @@ module.exports = ctx => function(args, content) {
   // users
   var arr = content.split(/<!--\s*([\s\S]*?)\s*-->/g).filter(item => item.trim().length > 0)
   if (arr.length > 0) {
-    var users = merge(ctx.theme.config.chat_users, ctx.render.renderSync({ text: (arr[0] || ''), engine: 'yaml' }))
+    // 避免用户在没有配置chat_users.yaml时出错
+    if (ctx.theme.config.chat_users){
+      var users = merge(ctx.theme.config.chat_users, ctx.render.renderSync({ text: (arr[0] || ''), engine: 'yaml' }));
+    }
+    var users = ctx.render.renderSync({ text: (arr[0] || ''), engine: 'yaml' });
   }
 
 
@@ -286,13 +290,16 @@ module.exports = ctx => function(args, content) {
       el += '<div class="user-main">'
 
       el += '<div class="header">'
-      if (!args.labelColorStyle || args.labelColorStyle == 'dynamic') {
-        el += `<span class="label dynamic-color" style="color:var(--chat-${chatIndex}-label-text-color-${userColorMap[cell['user']]});background:var(--chat-${chatIndex}-label-bg-${userColorMap[cell['user']]});">`
-      } else {
-        el += `<span class="label hand-color" style="color:${user['label']['textColor']};background:${user['label']['bgColor']};">`
+      // 防止徽章为空
+      if (user['label']){
+        if (!args.labelColorStyle || args.labelColorStyle == 'dynamic') {
+          el += `<span class="label dynamic-color" style="color:var(--chat-${chatIndex}-label-text-color-${userColorMap[cell['user']]});background:var(--chat-${chatIndex}-label-bg-${userColorMap[cell['user']]});">`
+        } else {
+          el += `<span class="label hand-color" style="color:${user['label']['textColor']};background:${user['label']['bgColor']};">`
+        }
+        el += user['label']['text']
+        el += '</span>'
       }
-      el += user['label']['text']
-      el += '</span>'
       el += '<span class="name">'
       el += user['name']
       el += '</span>'
@@ -429,7 +436,7 @@ module.exports = ctx => function(args, content) {
             </a>
           `
       } else if (cell['file']) {
-        el += ` file" url="${cell["file"]}">`
+        el += ` chat-file" url="${cell["file"]}">`
         el += `
           <div class="content">
             <div class="top">
@@ -508,4 +515,4 @@ module.exports = ctx => function(args, content) {
   el += '</div>'  // tag-plugin chat
 
   return el
-}
+}

package/scripts/tags/lib/frame.js

@@ -9,11 +9,12 @@
 
 module.exports = ctx => function(args) {
   args = ctx.args.map(args, ['focus', 'img', 'video'], ['device', 'alt'])
+  const escapeHTML = require('hexo-util').escapeHTML
   const img = args.img || ''
   const video = args.video || ''
   const device = args.device || ''
   const focus = args.focus || ''
-  const alt = args.alt || ''
+  const alt = escapeHTML(args.alt || '')
   if ((img.length == 0 && video.length == 0) || device.length == 0) {
     return
   }

package/scripts/tags/lib/image.js

@@ -37,13 +37,14 @@ module.exports = ctx => function(args) {
     }
   }
 
+  var safeAlt = require('hexo-util').escapeHTML(args.alt || '')
   function img(src, alt, style) {
     let a = '<a data-fancybox'
     let img = ''
     img += `<img class="lazy" src="${src}" data-src="${src}"`
-    if (alt) {
-      img += ` alt="${alt}"`
-      a += ` data-caption="${alt}"`
+    if (safeAlt) {
+      img += ` alt="${safeAlt}"`
+      a += ` data-caption="${safeAlt}"`
     }
     if (fancybox && !fancyboxHref) {
       img += ` data-fancybox="${fancybox}"`
@@ -101,9 +102,9 @@ module.exports = ctx => function(args) {
   }
   el += '</div>'
 
-  if (args.alt && args.alt.length > 0) {
+  if (safeAlt) {
     el += '<div class="image-meta">'
-    el += '<span class="image-caption center">' + args.alt + '</span>'
+    el += '<span class="image-caption center">' + safeAlt + '</span>'
     el += '</div>'
   }
 

package/scripts/tags/lib/link.js

@@ -9,11 +9,13 @@
 
 module.exports = ctx => function(args) {
   const full_url_for = require('hexo-util').full_url_for.bind(ctx)
+  const escapeHTML = require('hexo-util').escapeHTML
   args = ctx.args.map(args, ['icon', 'desc'], ['url', 'title'])
   if (args.url == null) {
     return '';
   }
   const url = full_url_for(args.url)
+  const safeTitle = escapeHTML(args.title || '')
   args.api = ctx.theme.config.data_services.siteinfo?.api
   if (args.api) {
     args.api = args.api.replace('{href}', url)
@@ -25,12 +27,12 @@ module.exports = ctx => function(args) {
   if (!args.icon) {
     autofill.push('icon')
   }
-  if (args.desc) {
+  if (args.desc !== 'true' && args.desc !== true && !args.desc) {
     autofill.push('desc')
   }
   var el = ''
   el += '<div class="tag-plugin link dis-select">'
-  el += '<a class="link-card' + (args.desc ? ' rich' : ' plain') + '" title="' + (args.title || '') + '" href="' + args.url + '"'
+  el += '<a class="link-card' + (args.desc ? ' rich' : ' plain') + '" title="' + safeTitle + '" href="' + args.url + '"'
   if (args.url.includes('://')) {
     el += ' target="_blank" rel="external nofollow noopener noreferrer"'
   }
@@ -49,10 +51,10 @@ module.exports = ctx => function(args) {
     return el
   }
   function loadTitle() {
-    return '<span class="title">' + (args.title || args.url) + '</span>'
+    return '<span class="title">' + (safeTitle || args.url) + '</span>'
   }
   function loadDesc() {
-    return '<span class="cap desc footnote"></span>'
+    return `<span class="cap desc footnote">${escapeHTML(args.desc)}</span>`
   }
   function loadLink() {
     return '<span class="cap link footnote">' + full_url_for(args.url) + '</span>'