hexo-theme-shokax 0.5.0-dev-f96faf9 → 0.5.0-dev-0282edf

package/README.md

@@ -11,8 +11,8 @@
 - [ ] 重构 player (暂时移除)
 - [ ] 重构并修改代码块
 - [ ] 优化 menu 配置格式
-- [ ] 优化和异步化 Smart Bundle 技术
-- [ ] 优化 CSS 结构和加载
+- [x] 优化和异步化 Smart Bundle 技术
+- [x] 优化 CSS 结构和加载
 - [x] 修复/重置 fancybox
 - [ ] 修复模板长期遗留问题
 - [ ] 修复 images 遗留问题

package/layout/_mixin/card.pug

@@ -1,9 +1,8 @@
 mixin CardRender(item)
-    - cover = url_for(theme.statics + item.slug + this.getCoverExt(item.slug))
     - itemname = item.name
 
     section(class="item")
-        div(class="cover" data-background-image!=cover ? cover:"")
+        div(class="cover" data-background-image=`${theme.statics}${item.slug}/cover.${getCoverExt(item.slug)}`)
             h2(class="title")
                 != itemname
             - var temp = item?.top?.name

package/layout/_mixin/comment.pug

@@ -1,5 +1,4 @@
 mixin CommentRender()
-    != shokax_inject('comment')
     if page.comment !== false
         div(class="wrap" id="comments")
 

package/layout/_partials/footer.pug

@@ -37,7 +37,4 @@ div(class="status")
                 a(target="_blank" href=`https://beian.mps.gov.cn/#/query/webSearch?code=${RC}`)
                     img(loading="lazy" decoding="async" data-src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;" width="20" height="20" alt="备案")
                     != beianN
-    != shokax_inject('status')
-
-!= shokax_inject('footer')
 

package/layout/_partials/header.pug

@@ -14,5 +14,4 @@ nav(id="nav")
                 i(class="ic i-sun")
             li(class="item search")
                 i(class="ic i-search")
-            != shokax_inject('rightNav')
 

package/layout/_partials/layout.pug

@@ -21,7 +21,6 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                 link(rel="preload" href!=covers as="image" fetchpriority="high")
 
         != partial('_partials/head/head_com.pug')
-        != shokax_inject('head')
         block head
         title
             block title
@@ -140,6 +139,4 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
 
         != _js('siteInit.js')
 
-        != shokax_inject('bodyEnd')
-
 

package/layout/_partials/post/footer.pug

@@ -16,5 +16,3 @@ div(class="meta")
                 != __('post.edited') + __('symbol.space')
             time(title=__('post.modified') + __('symbol.colon') + full_date(post.updated) itemprop="dateModified" datetime=moment(post.updated).format())
                 != date(post.updated)
-
-    != shokax_inject('postMeta')

package/layout/_partials/post/post.pug

@@ -38,4 +38,3 @@ article(itemscope itemtype="http://schema.org/Article" class="post block" lang=t
             != partial('_partials/post/reward.pug', {}, {cache: true})
         if theme.creative_commons.license
             != partial('_partials/post/copyright.pug')
-    != shokax_inject('postBodyEnd')

package/layout/_partials/sidebar/overview.pug

@@ -36,7 +36,5 @@ div(class="social")
             - var sidebarIcon = '<i class="ic i-' + link.split('||')[1].trim() + '"></i>'
             != _url(sidebarURL, sidebarIcon, {title: sidebarURL, class: 'item ' + name})
 
-!= shokax_inject('sidebar')
-
 div(class="menu")
     != partial('_partials/sidebar/menu.pug')

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.5.0-dev-f96faf9",
+    "version": "0.5.0-dev-0282edf",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",

package/scripts/generaters/index.js

@@ -33,6 +33,7 @@ hexo.config.index_generator = Object.assign({
   order_by: "-date"
 }, hexo.config.index_generator);
 hexo.extend.helper.register("getCoverExt", function(path) {
+  const theme = hexo.theme.config;
   if (theme.homeConfig.cateCards.length > 0) {
     const cardMap = /* @__PURE__ */ new Map();
     theme.homeConfig.cateCards.forEach((card) => {
@@ -44,7 +45,7 @@ hexo.extend.helper.register("getCoverExt", function(path) {
     }
   }
 });
-hexo.extend.generator.register("index", function(locals) {
+hexo.extend.generator.register("index", async function(locals) {
   const covers = [];
   const catlist = [];
   let pages;
@@ -54,7 +55,7 @@ hexo.extend.generator.register("index", function(locals) {
   const paginationDir = config.pagination_dir || "page";
   const path = config.index_generator.path || "";
   const categories = locals.categories;
-  const theme2 = hexo.theme.config;
+  const theme = hexo.theme.config;
   const getTopcat = function(cat) {
     if (cat.parent) {
       const pCat = categories.findOne({ _id: cat.parent });
@@ -64,42 +65,44 @@ hexo.extend.generator.register("index", function(locals) {
     }
   };
   if (categories && categories.length) {
-    categories.forEach(async (cat) => {
-      const cover = `source/_posts/${cat.slug}`;
-      if (theme2.homeConfig.cateCards.length > 0) {
-        const cardMap = /* @__PURE__ */ new Map();
-        theme2.homeConfig.cateCards.forEach((card) => {
-          cardMap.set(card.slug, card.cover);
-        });
-        if (cardMap.has(cat.slug)) {
-          const cover2 = cardMap.get(cat.slug);
-          const coverData = await (0, import_promises.readFile)(`source/_posts/${cover2}`);
-          covers.push({
-            path: `${cat.slug}/cover.${getFileExtension(cover2)}`,
-            data: coverData
+    await Promise.all(
+      categories.map(async (cat) => {
+        const cover = `source/_posts/${cat.slug}`;
+        if (theme.homeConfig.cateCards.length > 0) {
+          const cardMap = /* @__PURE__ */ new Map();
+          theme.homeConfig.cateCards.forEach((card) => {
+            cardMap.set(card.slug, card.cover);
           });
-          const topcat = getTopcat(cat);
-          if (topcat._id !== cat._id) {
-            cat.top = topcat;
-          }
-          const child = categories.find({ parent: cat._id });
-          let pl = 6;
-          if (child.length !== 0) {
-            cat.child = child.length;
-            cat.subs = child.sort({ name: 1 }).limit(6).toArray();
-            pl = Math.max(0, pl - child.length);
-            if (pl > 0) {
-              cat.subs.push(...cat.posts.sort({ title: 1 }).filter(function(item, i) {
-                return item.categories.last()._id === cat._id;
-              }).limit(pl).toArray());
+          if (cardMap.has(cat.slug)) {
+            const cover2 = cardMap.get(cat.slug);
+            const coverData = await (0, import_promises.readFile)(`source/_posts/${cover2}`);
+            covers.push({
+              path: `${cat.slug}/cover.${getFileExtension(cover2)}`,
+              data: coverData
+            });
+            const topcat = getTopcat(cat);
+            if (topcat._id !== cat._id) {
+              cat.top = topcat;
+            }
+            const child = categories.find({ parent: cat._id });
+            let pl = 6;
+            if (child.length !== 0) {
+              cat.child = child.length;
+              cat.subs = child.sort({ name: 1 }).limit(6).toArray();
+              pl = Math.max(0, pl - child.length);
+              if (pl > 0) {
+                cat.subs.push(...cat.posts.sort({ title: 1 }).filter(function(item, i) {
+                  return item.categories.last()._id === cat._id;
+                }).limit(pl).toArray());
+              }
+            } else {
+              cat.subs = cat.posts.sort({ title: 1 }).limit(6).toArray();
             }
-          } else {
-            cat.subs = cat.posts.sort({ title: 1 }).limit(6).toArray();
+            catlist.push(cat);
           }
-          catlist.push(cat);
         }
-      }
-    });
+      })
+    );
   }
   if (posts.length > 0) {
     pages = (0, import_hexo_pagination.default)(path, posts, {

package/scripts/helpers/engine.js

@@ -156,6 +156,3 @@ hexo.extend.helper.register("random_color", function() {
   const [r, g, b] = arr;
   return `#${r.toString(16).length > 1 ? r.toString(16) : "0" + r.toString(16)}${g.toString(16).length > 1 ? g.toString(16) : "0" + g.toString(16)}${b.toString(16).length > 1 ? b.toString(16) : "0" + b.toString(16)}`;
 });
-hexo.extend.helper.register("shokax_inject", function(point) {
-  return hexo.theme.config.injects[point].map((item) => this.partial(item.layout, item.locals, item.options)).join("");
-});

package/source/js/_app/components/sidebar.ts

@@ -59,7 +59,8 @@ export const sideBarTab = () => {
     const text = document.createTextNode(element.getAttribute('data-title'))
     span.appendChild(text)
     tab.appendChild(span)
-    tab.classList.add(item + ' item')
+    tab.classList.add(item)
+    tab.classList.add('item')
 
     if (active) {
       element.classList.add(active)