Merge branch 'master' of http://192.168.2.32:3000/ld/ld-site

package.json

@@ -3,23 +3,23 @@
   "type": "module",
   "version": "0.0.1",
   "scripts": {
-    "dev": "astro dev --host",
-    "start": "astro dev --host",
+    "dev": "astro dev",
+    "start": "astro dev",
     "build": "astro check && astro build",
     "preview": "astro preview",
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/check": "^0.9.4",
-    "@astrojs/sitemap": "^3.6.0",
-    "@astrojs/vue": "^5.1.3",
-    "astro": "^5.15.9",
-    "bignumber.js": "^9.3.1",
-    "pinyin-pro": "^3.27.0",
-    "prettier": "^3.7.4",
+    "@astrojs/check": "^0.7.0",
+    "@astrojs/sitemap": "^3.1.5",
+    "@astrojs/vue": "^4.5.0",
+    "astro": "^4.9.2",
+    "bignumber.js": "^9.1.2",
+    "pinyin-pro": "^3.22.0",
+    "prettier": "^3.3.3",
     "prettier-plugin-astro": "^0.14.1",
     "remark-toc": "^9.0.0",
-    "typescript": "^5.8.2",
-    "vue": "^3.5.13"
+    "typescript": "^5.4.5",
+    "vue": "^3.4.29"
   }
 }

script/build_on_linux.sh

@@ -2,8 +2,7 @@
 # cron
 # 0 4 * * * . /etc/profile; /bin/sh /opt/ld-site/script/build_on_linux.sh >/dev/null 2>&1
 
-NVM_DIR="/opt/dev_tools/nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+export PATH=$PATH:/opt/dev_tools/node-v20.12.2-linux-x64/bin
 
 script_path="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 original_article_home="/home/ld/Documents/ld_article"

src/components/article/CategorySummary.astro

@@ -14,8 +14,7 @@ const { collectionName, categoryName, posts } = Astro.props;
   {
     posts.map((post) => (
       <li>
-        {/* Hide .md extension from URL */}
-        <a href={`/article/${collectionName}/${post.id.replace(".md", "")}`} target="_blank">
+        <a href={`/article/${collectionName}/${post.slug}`} target="_blank">
           {post.data.title}
         </a>
       </li>

src/components/article/CollectionSummary.astro

@@ -1,5 +1,5 @@
 ---
-import type { CollectionEntry } from "astro:content";
+import type { CollectionEntry, ContentEntryMap } from "astro:content";
 import { getCollection, type CollectionKey } from "astro:content";
 import CategorySummary from "./CategorySummary.astro";
 
@@ -57,9 +57,9 @@ const categoriedPostList: Array<CategoriedPosts> = allCategories.map((key) => {
   } else if (sortByArticleTitle) {
     // sort article by title
     // get articles with titles started in Chinese or the alphabet
-    let postWithAlphabetStartedTitle: CollectionEntry<CollectionKey>[] =
+    let postWithAlphabetStartedTitle: CollectionEntry<keyof ContentEntryMap>[] =
       object[key].filter((post) => /^[a-zA-Z]/.test(post.data.title));
-    let postWithChineseStartedTitle: CollectionEntry<CollectionKey>[] =
+    let postWithChineseStartedTitle: CollectionEntry<keyof ContentEntryMap>[] =
       object[key].filter((post) => /^[^a-zA-Z]/.test(post.data.title));
     // sort two Array by article title
     postWithAlphabetStartedTitle.sort((postA, postB) =>

src/components/article/article_body/ArticleBodyContent.astro

@@ -1,19 +1,15 @@
 ---
-import { getCollection, type CollectionEntry } from "astro:content";
-import { render, type CollectionKey } from "astro:content";
+import { getEntry, type CollectionKey } from "astro:content";
 
 interface Props {
-  articleId: string;
+  articleSlug: string;
   collectionName: CollectionKey;
 }
-const { articleId, collectionName } = Astro.props;
+const { articleSlug, collectionName } = Astro.props;
 
-const articles = await getCollection(collectionName);
-const article = articles.find(
-  (post: CollectionEntry<CollectionKey>) => post.id === articleId
-);
-const { Content } = await render(article!);
-const articlePrettyName = article!.data.title;
+const article = await getEntry(collectionName, articleSlug);
+const { Content } = await article!.render();
+const articlePrettyName = article!.id.split("/").pop()!.replace(".md", "");
 ---
 
 <div class="article">

src/components/article/article_body/ArticleBodyWrapper.astro

@@ -4,15 +4,15 @@ import ArticleBody from "./ArticleBody.astro";
 import ArticleBodyContent from "./ArticleBodyContent.astro";
 
 interface Props {
-  articleId: string;
+  articleSlug: string;
   collectionName: CollectionKey;
 }
-const { articleId, collectionName } = Astro.props;
+const { articleSlug, collectionName } = Astro.props;
 ---
 
 <ArticleBody>
   <ArticleBodyContent
-    articleId={articleId}
     collectionName={collectionName}
+    articleSlug={articleSlug}
   />
 </ArticleBody>

src/content/config.ts

@@ -1,8 +1,7 @@
 import { z, defineCollection } from 'astro:content';
-import { glob } from 'astro/loaders';
 
 const blogCollection = defineCollection({
-  loader: glob({ pattern: '**/[^_]*.{md,mdx}', base: "./src/content/blog" }),
+  type: 'content',
   schema: z.object({
     title: z.string(),
     description: z.string(),
@@ -11,7 +10,7 @@ const blogCollection = defineCollection({
   }),
 });
 const noteCollection = defineCollection({
-  loader: glob({ pattern: '**/[^_]*.{md,mdx}', base: "./src/content/note" }),
+  type: 'content',
   schema: z.object({
     title: z.string(),
     description: z.string(),
@@ -20,7 +19,7 @@ const noteCollection = defineCollection({
   }),
 });
 const translationCollection = defineCollection({
-  loader: glob({ pattern: '**/[^_]*.{md,mdx}', base: "./src/content/translation" }),
+  type: 'content',
   schema: z.object({
     title: z.string(),
     description: z.string(),

src/pages/404.astro

@@ -7,6 +7,6 @@ import ArticleBodyWrapper from "../components/article/article_body/ArticleBodyWr
 
 <DefaultLayout title="404">
   <Nav />
-  <ArticleBodyWrapper collectionName="site" articleId="404.md" />
+  <ArticleBodyWrapper collectionName="site" articleSlug="404" />
   <Footer />
 </DefaultLayout>

src/pages/article/blog/[...blog].astro

@@ -1,6 +1,10 @@
 ---
 import { getCollection } from "astro:content";
-import type { CollectionEntry, CollectionKey } from "astro:content";
+import type {
+  CollectionEntry,
+  CollectionKey,
+  ContentEntryMap,
+} from "astro:content";
 import Footer from "../../../components/Footer.astro";
 import Nav from "../../../components/Nav.astro";
 import ArticleBodyWrapper from "../../../components/article/article_body/ArticleBodyWrapper.astro";
@@ -9,23 +13,22 @@ import DefaultLayout from "../../../layouts/DefaultLayout.astro";
 export async function getStaticPaths() {
   const collectionName: CollectionKey = "blog";
   const blogEntries = await getCollection(collectionName);
-  return blogEntries.map((post: CollectionEntry<CollectionKey>) => ({
-    // Hide .md extension from URL
-    params: { blog: post.id.replace(".md", "") },
-    props: { post },
+  return blogEntries.map((entry) => ({
+    params: { blog: entry.slug },
+    props: { entry },
   }));
 }
 
 interface Props {
-  post: CollectionEntry<CollectionKey>;
+  entry: CollectionEntry<keyof ContentEntryMap>;
 }
-const { post } = Astro.props;
+const { entry } = Astro.props;
 
-const articlePrettyName: string = post.data.title;
+const articlePrettyName: string = entry.id.split("/").pop()!.replace(".md", "");
 ---
 
 <DefaultLayout title=`${articlePrettyName} - 李守中`>
   <Nav />
-  <ArticleBodyWrapper collectionName="blog" articleId={post.id} />
+  <ArticleBodyWrapper collectionName="blog" articleSlug={entry.slug} />
   <Footer />
 </DefaultLayout>

src/pages/article/note/[...note].astro

@@ -1,6 +1,10 @@
 ---
 import { getCollection } from "astro:content";
-import type { CollectionEntry, CollectionKey } from "astro:content";
+import type {
+  CollectionEntry,
+  CollectionKey,
+  ContentEntryMap,
+} from "astro:content";
 import Footer from "../../../components/Footer.astro";
 import Nav from "../../../components/Nav.astro";
 import ArticleBodyWrapper from "../../../components/article/article_body/ArticleBodyWrapper.astro";
@@ -9,22 +13,22 @@ import DefaultLayout from "../../../layouts/DefaultLayout.astro";
 export async function getStaticPaths() {
   const collectionName: CollectionKey = "note";
   const blogEntries = await getCollection(collectionName);
-  return blogEntries.map((post: CollectionEntry<CollectionKey>) => ({
-    params: { note: post.id.replace(".md", "") },
-    props: { post },
+  return blogEntries.map((entry) => ({
+    params: { note: entry.slug },
+    props: { entry },
   }));
 }
 
 interface Props {
-  post: CollectionEntry<CollectionKey>;
+  entry: CollectionEntry<keyof ContentEntryMap>;
 }
-const { post } = Astro.props;
+const { entry } = Astro.props;
 
-const articlePrettyName: string = post.data.title;
+const articlePrettyName: string = entry.id.split("/").pop()!.replace(".md", "");
 ---
 
 <DefaultLayout title=`${articlePrettyName} - 李守中`>
   <Nav />
-  <ArticleBodyWrapper collectionName="note" articleId={post.id} />
+  <ArticleBodyWrapper collectionName="note" articleSlug={entry.slug} />
   <Footer />
 </DefaultLayout>

src/pages/index.astro

@@ -7,6 +7,6 @@ import ArticleBodyWrapper from "../components/article/article_body/ArticleBodyWr
 
 <DefaultLayout title="李守中">
   <Nav />
-  <ArticleBodyWrapper collectionName="site" articleId="关于本站.md" />
+  <ArticleBodyWrapper collectionName="site" articleSlug="关于本站" />
   <Footer />
 </DefaultLayout>

src/styles/global.css

@@ -32,7 +32,7 @@ body {
     "Noto Color Emoji";
   font-size: 1em;
   margin: auto;
-  padding: 0 8px 0 8px;
+  overflow-y: scroll;
   min-height: 100%;
   line-height: 1.5;
 }

tsconfig.json

@@ -1,7 +1,5 @@
 {
   "extends": "astro/tsconfigs/strict",
-  "include": [".astro/types.d.ts", "**/*"],
-  "exclude": ["dist"],
   "compilerOptions": {
     "jsx": "preserve"
   }