minearm-website 0.1.3 → 0.2.1

package/README.md

@@ -1,9 +1,9 @@
 # Minearm & Website
 # 本主题是从[HusBlog](https://github.com/KraHsu/HsuBlog.git)改进而来的
-最新的正式版是0.1.3
+最新的正式版是0.2.1
 最新的测试版是0.0.3-beta.4
 
-但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.1.2
+但是Minearm & Website做出了很大的改变，比如修复了scss警告和升级astro版本到5.5.4
 
 # 效果
 ![Minearm](https://portal.astro.build/_image?href=https%3A%2F%2Fstorage.googleapis.com%2Fdev-portal-bucket%2Fkotpt1ztaalrk5frua5pnwdvoh185ylgg0rio9.webp)

package/astro.config.ts

@@ -1,38 +1,75 @@
-import { defineConfig } from "astro/config";
-import sitemap from "@astrojs/sitemap";
-import { markdownDirectives, remarkFrontmatter, rehypeFrontmatter, remarkRestyling, rehypeRestyling } from "./src/utils/md";
-import remarkGfm from "remark-gfm";
-import remarkMath from "remark-math";
-import rehypeKatex from "rehype-katex";
-import rehypeMathjax from "rehype-mathjax";
-import remarkDirective from "remark-directive";
-import vue from "@astrojs/vue";
-import { SiteConfig } from "./src/site_config";
-import { generateSearchData } from "./src/utils/generateSearchData.ts";
-//import netlify from "@astrojs/netlify";
-const remarkPlugins: any = [remarkFrontmatter, remarkGfm, SiteConfig.markdownMath !== false && remarkMath, remarkRestyling, remarkDirective, markdownDirectives, SiteConfig.localSearch && generateSearchData].filter(Boolean);
-const rehypePlugins: any = [rehypeFrontmatter, rehypeRestyling, SiteConfig.markdownMath === "Katex" && rehypeKatex, SiteConfig.markdownMath === "Mathjax" && rehypeMathjax].filter(Boolean);
-// https://astro.build/config
-export default defineConfig({
-  site: SiteConfig.site,
-  integrations: [sitemap(), vue()],
-  output: "static",
-
-  build: {
-    format: "directory"
-  },
-
-  markdown: {
-    syntaxHighlight: "shiki",
-    shikiConfig: {
-      theme: "css-variables",
-      langs: [],
-      wrap: false
-    },
-    remarkPlugins: remarkPlugins,
-    rehypePlugins: rehypePlugins
-  },
-
-  trailingSlash: "ignore",
- // adapter: netlify()
-});
+import { defineConfig } from "astro/config";
+import sitemap from "@astrojs/sitemap";
+import { markdownDirectives, remarkFrontmatter, rehypeFrontmatter, remarkRestyling, rehypeRestyling } from "./src/utils/md";
+import remarkGfm from "remark-gfm";
+import remarkMath from "remark-math";
+import rehypeKatex from "rehype-katex";
+import rehypeMathjax from "rehype-mathjax";
+import remarkDirective from "remark-directive";
+import vue from "@astrojs/vue";
+import { SiteConfig } from "./src/site_config";
+import { generateSearchData } from "./src/utils/generateSearchData.ts";
+import type { Plugin } from "unified";
+
+// 定义 remark 插件数组类型
+type RemarkPluginArray = Array<Plugin | false | null | undefined>;
+// 定义 rehype 插件数组类型
+type RehypePluginArray = Array<Plugin | false | null | undefined>;
+
+// 生成 remark 插件数组
+const generateRemarkPlugins = (): RemarkPluginArray => [
+  remarkFrontmatter,
+  remarkGfm,
+  SiteConfig.markdownMath === true && remarkMath,
+  remarkRestyling,
+  remarkDirective,
+  markdownDirectives,
+  SiteConfig.localSearch && generateSearchData,
+].filter(Boolean);
+
+// 生成 rehype 插件数组
+const generateRehypePlugins = (): RehypePluginArray => [
+  rehypeFrontmatter,
+  rehypeRestyling,
+  SiteConfig.markdownMath === "Katex" && rehypeKatex,
+  SiteConfig.markdownMath === "Mathjax" && rehypeMathjax,
+].filter(Boolean);
+
+// 定义 markdown 配置
+const markdownConfig = {
+  syntaxHighlight: "shiki",
+  shikiConfig: {
+    theme: "css-variables",
+    langs: [],
+    wrap: false,
+  },
+  remarkPlugins: generateRemarkPlugins(),
+  rehypePlugins: generateRehypePlugins(),
+};
+
+// 定义 build 配置
+const buildConfig = {
+  format: "directory",
+};
+
+// 定义 collections 配置
+const collectionsConfig = [
+  {
+    name: "blog",
+    label: "Blog Posts",
+    path: "src/pages/blog",
+    sort: (a, b) => new Date(b.data.date).getTime() - new Date(a.data.date).getTime(),
+  },
+  // ... 其他集合
+];
+
+export default defineConfig({
+  site: SiteConfig.site,
+  integrations: [sitemap(), vue()],
+  output: "static",
+  build: buildConfig,
+  collections: collectionsConfig,
+  markdown: markdownConfig,
+  edgeMiddleware: true,
+});
+    

package/minearm.ts

@@ -126,9 +126,7 @@ const addAbbrlinkToFile = async (filepath: string) => {
       const pubDateStr = parsedMatter.data.pubDate;
       const pubDate = new Date(pubDateStr);
       const abbrlink = pubDate.getTime().toString(36);
-
       parsedMatter.data.abbrlink = abbrlink;
-
       const fileContent = matter.stringify(content, parsedMatter.data);
       await writeFileAsync(filepath, fileContent);
       console.log(`Permalink added: ${filepath}`);

package/package.json

@@ -1,63 +1,75 @@
-{
-  "name": "minearm-website",
-  "description": "Welcome to Minearm & Website.",
-  "version": "0.1.3",
-  "homepage": "https://github.com/Minearm-RPM/minearm",
-  "type": "module",
-  "license": "MIT",
-  "scripts": {
-    "dev": "astro dev",
-    "start": "astro dev",
-    "build": "astro build",
-    "preview": "astro preview",
-    "astro": "astro",
-    "new": "ts-node ./minearm.ts new",
-    "abbr": "ts-node ./minearm.ts abbr",
-    "newpage": "ts-node ./minearm.ts newPage",
-    "help": "ts-node ./minearm.ts help",
-    "pu": "ts-node ./pu.ts"
-  },
-  "dependencies": {
-    "@astrojs/markdown-remark": "^6.0.1",
-    "@astrojs/mdx": "^4.0.3",
-    "@astrojs/rss": "^4.0.11",
-    "@duannx/vue-client-only": "^1.0.3",
-    "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@fortawesome/free-solid-svg-icons": "^6.4.0",
-    "@iconify-json/tabler": "^1.2.8",
-    "astro": "^5.1.2",
-    "astro-i18next": "^1.0.0-beta.21",
-    "astro-icon": "^1.1.2",
-    "fuse.js": "^6.6.2",
-    "glob": "^10.3.3",
-    "hastscript": "^7.2.0",
-    "html-loader": "^5.1.0",
-    "markdown-loader": "^8.0.0",
-    "marked": "^15.0.0",
-    "mdast-util-to-string": "^4.0.0",
-    "pnpm": "^9.14.2",
-    "reading-time": "^1.5.0",
-    "rehype-katex": "7.0.1",
-    "rehype-mathjax": "6.0.0",
-    "remark-directive": "3.0.0",
-    "remark-gfm": "4.0.0",
-    "remark-math": "6.0.0",
-    "showdown": "^2.1.0",
-    "yargs": "^17.7.2"
-  },
-  "devDependencies": {
-    "@astrojs/sitemap": "^3.2.1",
-    "@astrojs/vue": "^5.0.4",
-    "@types/yargs": "^17.0.24",
-    "sass": "1.70.0",
-    "scss": "^0.2.4",
-    "ts-node": "10.9.2",
-    "vue": "^3.5.13"
-  },
-  "keywords": [
-    "astro-component",
-    "withastro"
-  ],
-  "main": "index.js",
-  "author": ""
-}
+{
+  "name": "minearm-website",
+  "description": "Welcome to Minearm & Website.",
+  "version": "0.2.1",
+  "homepage": "https://github.com/Minearm-RPM/minearm",
+  "type": "module",
+  "license": "MIT",
+  "scripts": {
+    "dev": "astro dev",
+    "start": "astro dev",
+    "build": "astro build",
+    "preview": "astro preview",
+    "astro": "astro",
+    "new": "ts-node ./minearm.ts new",
+    "abbr": "ts-node ./minearm.ts abbr",
+    "newpage": "ts-node ./minearm.ts newPage",
+    "help": "ts-node ./minearm.ts help",
+    "pu": "ts-node ./pu.ts"
+  },
+  "dependencies": {
+    "@astrojs/markdown-remark": "^6.3.1",
+    "@astrojs/mdx": "^4.2.1",
+    "@astrojs/rss": "4.0.11",
+    "@duannx/vue-client-only": "1.0.3",
+    "@fortawesome/fontawesome-svg-core": "6.7.2",
+    "@fortawesome/free-solid-svg-icons": "6.7.2",
+    "@iconify-json/tabler": "1.2.15",
+    "astro": "^5.5.4",
+    "astro-i18next": "1.0.0-beta.21",
+    "astro-icon": "1.1.5",
+    "fuse.js": "7.0.0",
+    "glob": "11.0.1",
+    "gray-matter": "4.0.3",
+    "hastscript": "9.0.0",
+    "html-loader": "5.1.0",
+    "markdown-loader": "8.0.0",
+    "marked": "15.0.6",
+    "mdast-util-to-string": "4.0.0",
+    "pnpm": "10.3.0",
+    "reading-time": "1.5.0",
+    "rehype-katex": "7.0.1",
+    "rehype-mathjax": "6.0.0",
+    "remark-directive": "3.0.1",
+    "remark-gfm": "4.0.0",
+    "remark-math": "6.0.0",
+    "showdown": "2.1.0",
+    "yargs": "17.7.2"
+  },
+  "devDependencies": {
+    "@astrojs/sitemap": "3.2.1",
+    "@astrojs/vue": "5.0.6",
+    "@types/yargs": "17.0.33",
+    "@waline/api": "^1.0.0",
+    "@waline/client": "^3.5.6",
+    "recaptcha-v3": "^1.11.3",
+    "sass": "1.70.0",
+    "scss": "0.2.4",
+    "ts-node": "10.9.2",
+    "vue": "^3.5.13"
+  },
+  "keywords": [
+    "astro-component",
+    "withastro"
+  ],
+  "main": "index.js",
+  "author": "",
+  "pnpm": {
+    "ignoredBuiltDependencies": [
+      "esbuild",
+      "esbuild",
+      "sharp",
+      "sharp"
+    ]
+  }
+}

package/public/scripts/mdata.json

@@ -1,4 +1,4 @@
-{
-  "totalWordCounts": 896,
-  "totalPostCounts": 2
+{
+  "totalWordCounts": 117580,
+  "totalPostCounts": 12
 }