Merge branch 'feature/update-stella-1.33.1'

Author: calfzhou

Makefile

@@ -9,18 +9,18 @@ list:
 install:
 	pnpm install
 
+clean:
+	pnpm run clean
+
 build:
 	pnpm run build
 
-generate: build
-
-clean:
-	pnpm run clean
+generate: clean build
 
 server:
 	pnpm run server
 
-s: server
+s: clean server
 
 slug :=
 title :=
@@ -34,15 +34,13 @@ ifndef title
 endif
 
 note: check-slug-and-title
-	hexo new note -p "../notes/$(slug)" "$(title)"
-	mv "source/notes/$(slug)" "source/notes/assets/$(slug)"
+	hexo new note -p "../notes/$(slug)/index.md" "$(title)"
 
 post: check-slug-and-title
 	hexo new post -p "$(shell date '+%Y')/$(slug)" "$(title)"
 
 coding: check-slug-and-title
-	hexo new coding -p "../coding/$(slug)" "$(title)"
+	hexo new coding -p "../coding/$(slug)/index.md" "$(title)"
 	cp scaffolds/coding/* "source/coding/$(slug)/"
-	mv "source/coding/$(slug)" "source/coding/assets/$(slug)"
 
 .PHONY: list install build generate clean server s note post coding

_config.stellar.yml

@@ -41,6 +41,25 @@ inject:
     - <link rel="stylesheet" href="/css/gocalf.css?v=20251221">
     - <link rel="stylesheet" href="/css/callouts.css?v=20250517">
 
+######## Main ########
+site_tree:
+  post:
+    leftbar: welcome, related, recent
+  index_wiki:
+    leftbar: welcome, related, recent
+  wiki:
+    leftbar: welcome, tree, related, recent
+  notebooks:
+    leftbar: welcome, recent
+  notes:
+    leftbar: welcome, tagtree, recent_long
+  note:
+    leftbar: welcome, tagtree, recent_long
+  error_page:
+    leftbar: welcome, recent, timeline
+  page:
+    leftbar: welcome, recent
+
 ######## Notebook ########
 notebook:
   tagcons:
@@ -91,34 +110,41 @@ footer:
       icon: default:theme
       onclick: 'switchTheme()'
   sitemap:
-    'GoCalf':
-      - '[主页](/)'
-      - '[关于](/about/)'
-      - '[PGP 信息](/pgp/)'
-      - '[旧站](https://blog.gocalf.com/)'
-    '内容':
-      - '[笔记<span class="dot"></span>杂七杂八](/notes/)'
-      - '[笔记<span class="dot"></span>Coding](/coding/)'
-      - '[博客<span class="dot"></span>近期发布](/)'
-      - '[博客<span class="dot"></span>归档](/blog/archives/)'
-      - '[所有 Wiki 项目](/wiki/)'
-      - '[所有笔记本](/notebooks/)'
-    '联系我':
-      - '[给我发邮件](mailto:calf.zhou@gmail.com)'
-      - '[GitHub](https://github.com/calfzhou)'
-      - '[Facebook](https://www.facebook.com/calfzhou)'
-      - '[Telegram](https://t.me/calfzhou)'
-    '特别感谢':
-      - '[Hexo](https://hexo.io/)'
-      - '[Hexo Stellar](https://xaoxuu.com/wiki/stellar/)'
-      - '[霞鹜文楷](https://github.com/lxgw/LxgwWenKai)'
-      - '[今日诗词](https://www.jinrishici.com/)'
+    - title: GoCalf
+      items:
+        - '[主页](/)'
+        - '[关于](/about/)'
+        - '[PGP 信息](/pgp/)'
+        - '[旧站](https://blog.gocalf.com/)'
+    - title: 内容
+      items:
+        - '[笔记<span class="dot"></span>杂七杂八](/notes/)'
+        - '[笔记<span class="dot"></span>Coding](/coding/)'
+        - '[博客<span class="dot"></span>近期发布](/)'
+        - '[博客<span class="dot"></span>归档](/blog/archives/)'
+        - '[所有 Wiki 项目](/wiki/)'
+        - '[所有笔记本](/notebooks/)'
+    - title: 联系我
+      items:
+        - '[给我发邮件](mailto:calf.zhou@gmail.com)'
+        - '[GitHub](https://github.com/calfzhou)'
+        - '[Facebook](https://www.facebook.com/calfzhou)'
+        - '[Telegram](https://t.me/calfzhou)'
+    - title: 特别感谢
+      items:
+        - '[Hexo](https://hexo.io/)'
+        - '[Hexo Stellar](https://xaoxuu.com/wiki/stellar/)'
+        - '[霞鹜文楷](https://github.com/lxgw/LxgwWenKai)'
+        - '[今日诗词](https://www.jinrishici.com/)'
   content: |
     本站所有文章除特别声明外，均采用 [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/) 许可协议，转载请注明出处。
     本站由 [Hexo](https://hexo.io/)、[{theme.name} {theme.version}]({theme.tree}) 和 [GitHub Pages](https://pages.github.com/) 强力驱动。
     Copyright © 2011-2024 [gocalf.com](/) 保留所有权利。
-    <span class="jinrishici-sentence"></span>
-    <script src="https://sdk.jinrishici.com/v2/browser/jinrishici.js" charset="utf-8"></script>
+
+data_services:
+  contributors:
+    edit_this_page: # 从开头开始匹配替换
+      '': https://github.com/calfzhou/gocalf.com/blob/main/source/
 
 plugins:
   katex:

_config.yml

@@ -40,6 +40,12 @@ code_dir: downloads/code
 i18n_dir: :lang
 skip_render:
 
+# TODO
+# 如果要把 posts 目录调整成 `slug/index.md` 形式，要修改：
+#   new_post_name: :year/:title/index.md
+#   Makefile 里 post 命令的 -p 参数相应调整
+# 问题是 assets 只能放到 `slug/index/` 目录下，否则无法被拷贝到 public 目录。
+
 # Writing
 new_post_name: :year/:title.md # File name of new posts
 default_layout: post
@@ -75,6 +81,7 @@ markdown: # https://github.com/hexojs/hexo-renderer-markdown-it
     permalink: true
     permalinkClass: 'headerlink'
     permalinkSymbol: ''
+    separator: ' '
   plugins:
     - name: '@traptitech/markdown-it-katex'
       options: # see https://katex.org/docs/options.html
@@ -116,14 +123,11 @@ pagination_dir: page
 
 # Include / Exclude file(s)
 ## include:/exclude: options only apply to the 'source/' folder
+# Hidden files and files/folders with a name that starts with an underscore, are ignored by default.
 include: []
-exclude: []
-ignore:
-  - __pycache__/**
-  - .pytest_cache/**
-  - .obsidian/**
-  - _templates/**
-  - .trash/**
+exclude:
+  - consistency-report.md
+ignore: []
 
 # Extensions
 ## Plugins: https://hexo.io/plugins/

package.json

@@ -7,7 +7,7 @@
     "pnpm": "^9.0"
   },
   "scripts": {
-    "postinstall": "cp ./patch/hexo/plugins/console/list/common.js ./node_modules/.pnpm/hexo@8.1.1_chokidar@3.6.0/node_modules/hexo/dist/plugins/console/list/common.js; cp ./patch/hexo-theme-stellar/scripts/filters/pretty_urls.js ./node_modules/hexo-theme-stellar/scripts/filters/pretty_urls.js; cp ./patch/hexo-theme-stellar/scripts/helpers/pretty_url.js ./node_modules/hexo-theme-stellar/scripts/helpers/pretty_url.js",
+    "postinstall": "cp ./patch/hexo/plugins/console/list/common.js ./node_modules/.pnpm/hexo@8.1.1_chokidar@3.6.0/node_modules/hexo/dist/plugins/console/list/common.js",
     "build": "hexo generate",
     "clean": "hexo clean",
     "deploy": "hexo deploy",
@@ -40,7 +40,7 @@
     "hexo-renderer-markdown-it": "^7.1.1",
     "hexo-renderer-stylus": "^3.0.1",
     "hexo-server": "^3.0.0",
-    "hexo-theme-stellar": "1.30.0",
+    "hexo-theme-stellar": "1.33.1",
     "markdown-it-obsidian-callouts": "^0.3.3",
     "markdown-it-obsidian-imgsize": "^0.1.1",
     "postcss": "^8.5.6",