20f0db9 | website

git clone https://git.pyrossh.dev/website

木 Personal website of pyrossh. Built with astrojs, shiki, vite.

20f0db9 — pyrossh 2026-05-24T17:56:52+05:30

make everything server side

Generated files not shown: bun.lock

Files changed (17) hide show

package.json +7 -1
src/content.config.ts +0 -51
src/layouts/FileLayout.astro +2 -2
src/layouts/RepoLayout.astro +2 -2
src/pages/posts/[...postId]/index.astro +3 -6
src/pages/posts/index.astro +2 -4
src/pages/repos/[...repoId]/commits/[...hash]/index.astro +2 -3
src/pages/repos/[...repoId]/commits/index.astro +2 -3
src/pages/repos/[...repoId]/files/[...file]/blame/index.astro +2 -3
src/pages/repos/[...repoId]/files/[...file]/history/index.astro +2 -3
src/pages/repos/[...repoId]/files/[...file]/index.astro +2 -3
src/pages/repos/[...repoId]/files/index.astro +2 -3
src/pages/repos/[...repoId]/index.astro +4 -6
src/pages/repos/[...repoId]/issues/[...issueId]/index.astro +2 -9
src/pages/repos/[...repoId]/issues/index.astro +2 -7
src/pages/rss.xml.ts +2 -2
src/utils/content.ts +127 -0

package.json CHANGED Viewed

@@ -22,10 +22,16 @@
     "astro-color-scheme": "^1.1.6",
     "astro-expressive-code": "^0.42.0",
     "astro-icon": "^1.1.5",
+    "gray-matter": "^4.0.3",
     "pretty-bytes": "^7.1.0",
+    "rehype-expressive-code": "^0.42.0",
+    "rehype-stringify": "^10.0.1",
+    "remark-parse": "^11.0.0",
+    "remark-rehype": "^11.1.2",
     "simple-git": "^3.27.0",
     "spamscanner": "^6.1.5",
-    "timeago.js": "^4.0.2"
+    "timeago.js": "^4.0.2",
+    "unified": "^11.0.5"
   },
   "devDependencies": {
     "@astrojs/rss": "^4.0.18",

src/content.config.ts DELETED Viewed

@@ -1,51 +0,0 @@
-import fs from "fs/promises";
-import { glob } from 'astro/loaders';
-import { defineCollection, z } from 'astro:content';
-import { REPOS } from './consts';
-import { checkFileExists } from "./utils/files";
-export const collections = {
-  repos: defineCollection({
-    loader: {
-      name: "loader",
-      load: async ({ renderMarkdown, store }) => {
-        for (const r of REPOS) {
-          const repoPath = `/Users/pyrossh/Code/pyrossh/${r.title}`;
-          const readmePath = repoPath + "/README.md";
-          const readmeContent = await checkFileExists(readmePath) ? await renderMarkdown(await fs.readFile(readmePath, 'utf-8')) : {
-            html: '',
-            metadata: {},
-          }
-          store.set({
-            id: r.title,
-            data: {
-              title: r.title,
-              description: r.description,
-              tags: r.tags,
-              absolutePath: repoPath,
-            },
-            rendered: readmeContent,
-          });
-        }
-      },
-    },
-    schema: z.object({
-      title: z.string(),
-      description: z.string().max(80),
-      tags: z.array(z.string()),
-      absolutePath: z.string(),
-    }),
-  }),
-  content: defineCollection({
-    loader: glob({ base: './src/content', pattern: '**/*.{md,mdx}' }),
-    // Type-check frontmatter using a schema
-    schema: z.object({
-      title: z.string(),
-      description: z.string(),
-      // Transform string to Date object
-      pubDate: z.coerce.date(),
-      updatedDate: z.coerce.date().optional(),
-      heroImage: z.string().optional(),
-    }),
-  }),
-};

src/layouts/FileLayout.astro CHANGED Viewed

@@ -1,12 +1,12 @@
 ---
 import { Icon } from "astro-icon/components";
-import { type CollectionEntry } from "astro:content";
 import allIcons from "@iconify-json/vscode-icons/icons.json" assert { type: "json" };
 import RepoLayout from "@/layouts/RepoLayout.astro";
+import type { RuntimeRepo } from "@/utils/content";
 import { resolveFileIcon, type FileNode } from "@/utils/files";
 type Props = {
-  repo: CollectionEntry<"repos">;
+  repo: RuntimeRepo;
   file: FileNode;
 };

src/layouts/RepoLayout.astro CHANGED Viewed

@@ -1,10 +1,10 @@
 ---
-import { type CollectionEntry } from "astro:content";
 import { Icon } from "astro-icon/components";
 import Layout from "@/layouts/BaseLayout.astro";
+import type { RuntimeRepo } from "@/utils/content";
 type Props = {
-  repo: CollectionEntry<"repos">;
+  repo: RuntimeRepo;
 };
 const { repo } = Astro.props;

src/pages/posts/[...postId]/index.astro CHANGED Viewed

@@ -1,11 +1,9 @@
 ---
-import { getCollection } from "astro:content";
-import { render } from "astro:content";
 import Layout from "@/layouts/BaseLayout.astro";
 import FormattedDate from "@/components/FormattedDate.astro";
+import { getPost } from "@/utils/content";
-const posts = await getCollection("content");
+const post = await getPost(Astro.params.postId);
-const post = posts.find((item) => item.id === Astro.params.postId);
 if (!post) {
   return Astro.redirect("/404");
 }
@@ -13,7 +11,6 @@ if (!post) {
 const {
   data: { title, description, pubDate },
 } = post;
-const { Content } = await render(post);
 ---
 <Layout title={title} description={description}>
@@ -22,7 +19,7 @@ const { Content } = await render(post);
     <h2>{description}</h2>
     <FormattedDate date={pubDate} />
     <hr />
-    <Content />
+    <div set:html={post.html} />
   </article>
 </Layout>
 <style>

src/pages/posts/index.astro CHANGED Viewed

@@ -1,11 +1,9 @@
 ---
-import { getCollection } from "astro:content";
 import FormattedDate from "../../components/FormattedDate.astro";
 import Layout from "@/layouts/BaseLayout.astro";
+import { getPosts } from "@/utils/content";
-const posts = (await getCollection("content")).sort(
+const posts = await getPosts();
-  (a, b) => b.data.pubDate.valueOf() - a.data.pubDate.valueOf()
-);
 ---
 <Layout title="Posts" description="Posts">

src/pages/repos/[...repoId]/commits/[...hash]/index.astro CHANGED Viewed

@@ -1,12 +1,11 @@
 ---
-import { getCollection } from "astro:content";
 import RepoLayout from "@/layouts/RepoLayout.astro";
 import Commit from "@/components/Commit.astro";
 import { generateHTMLDiff, getCommits } from "@/utils/commit";
+import { getRepo } from "@/utils/content";
 import "diff2html/bundles/css/diff2html.min.css";
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }

src/pages/repos/[...repoId]/commits/index.astro CHANGED Viewed

@@ -1,11 +1,10 @@
 ---
-import { getCollection } from "astro:content";
 import RepoLayout from "@/layouts/RepoLayout.astro";
 import Commit from "@/components/Commit.astro";
 import { getCommits } from "@/utils/commit";
+import { getRepo } from "@/utils/content";
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }

src/pages/repos/[...repoId]/files/[...file]/blame/index.astro CHANGED Viewed

@@ -1,10 +1,9 @@
 ---
-import { getCollection } from "astro:content";
 import FileLayout from "@/layouts/FileLayout.astro";
 import { getFileHistory, getFiles } from "@/utils/commit";
+import { getRepo } from "@/utils/content";
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }

src/pages/repos/[...repoId]/files/[...file]/history/index.astro CHANGED Viewed

@@ -1,11 +1,10 @@
 ---
-import { getCollection } from "astro:content";
 import FileLayout from "@/layouts/FileLayout.astro";
 import Commit from "@/components/Commit.astro";
 import { getFileHistory, getFiles } from "@/utils/commit";
+import { getRepo } from "@/utils/content";
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }

src/pages/repos/[...repoId]/files/[...file]/index.astro CHANGED Viewed

@@ -1,12 +1,11 @@
 ---
 import fs from "fs/promises";
-import { getCollection } from "astro:content";
 import { Code } from "astro-expressive-code/components";
 import FileLayout from "@/layouts/FileLayout.astro";
 import { getFiles } from "@/utils/commit";
+import { getRepo } from "@/utils/content";
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }

src/pages/repos/[...repoId]/files/index.astro CHANGED Viewed

@@ -1,12 +1,11 @@
 ---
-import { getCollection } from "astro:content";
 import RepoLayout from "@/layouts/RepoLayout.astro";
 import RecursiveList from "@/components/RecursiveList.astro";
 import { getFiles } from "@/utils/commit";
+import { getRepo } from "@/utils/content";
 import { buildFileTree, sortChildren } from "@/utils/files";
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }

src/pages/repos/[...repoId]/index.astro CHANGED Viewed

@@ -1,20 +1,18 @@
 ---
-import { getCollection } from "astro:content";
-import { render } from "astro:content";
 import RepoLayout from "@/layouts/RepoLayout.astro";
+import { getRepo, getRepoReadmeHtml } from "@/utils/content";
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }
-const { Content } = await render(repo);
+const readmeHtml = await getRepoReadmeHtml(repo);
 ---
 <RepoLayout repo={repo}>
   <article>
-    <Content />
+    <div set:html={readmeHtml} />
   </article>
 </RepoLayout>
 <style>

src/pages/repos/[...repoId]/issues/[...issueId]/index.astro CHANGED Viewed

@@ -1,22 +1,15 @@
 ---
-import { type CollectionEntry, getCollection } from "astro:content";
 import { actions } from "astro:actions";
 import RepoLayout from "@/layouts/RepoLayout.astro";
 import Issue from "@/components/Issue.astro";
 import TimeAgo from "@/components/TimeAgo.astro";
+import { getRepo } from "@/utils/content";
 import {
   getGitBugIssue,
   getGitBugIssues,
-  type GitBugIssue,
 } from "@/utils/gitBug";
-type Props = {
-  repo: CollectionEntry<"repos">;
-  issue: GitBugIssue;
-};
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }

src/pages/repos/[...repoId]/issues/index.astro CHANGED Viewed

@@ -1,16 +1,11 @@
 ---
-import { type CollectionEntry, getCollection } from "astro:content";
 import { actions } from "astro:actions";
 import RepoLayout from "@/layouts/RepoLayout.astro";
 import Issue from "@/components/Issue.astro";
+import { getRepo } from "@/utils/content";
 import { getGitBugIssues } from "@/utils/gitBug";
-type Props = {
-  repo: CollectionEntry<"repos">;
-};
-const repos = await getCollection("repos");
-const repo = repos.find((item) => item.id === Astro.params.repoId);
+const repo = getRepo(Astro.params.repoId);
 if (!repo) {
   return Astro.redirect("/404");
 }

src/pages/rss.xml.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import type { APIRoute } from 'astro';
-import { getCollection } from 'astro:content';
 import rss from '@astrojs/rss';
 import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
+import { getPosts } from '../utils/content';
 export const GET: APIRoute = async ({ site }) => {
-  const posts = await getCollection('content');
+  const posts = await getPosts();
   return rss({
     title: SITE_TITLE,
     description: SITE_DESCRIPTION,

src/utils/content.ts ADDED Viewed

@@ -0,0 +1,127 @@
+import fs from "fs/promises";
+import path from "path";
+import matter from "gray-matter";
+import rehypeExpressiveCode from "rehype-expressive-code";
+import rehypeStringify from "rehype-stringify";
+import remarkParse from "remark-parse";
+import remarkRehype from "remark-rehype";
+import { unified } from "unified";
+import { REPOS } from "@/consts";
+import ecConfig from "../../ec.config.mjs";
+export interface RuntimeRepo {
+  id: string;
+  data: {
+    title: string;
+    description: string;
+    tags: string[];
+    absolutePath: string;
+  };
+}
+export interface RuntimePost {
+  id: string;
+  data: {
+    title: string;
+    description: string;
+    pubDate: Date;
+    updatedDate?: Date;
+    heroImage?: string;
+  };
+  body: string;
+  html: string;
+}
+const contentDir = path.resolve("src/content");
+const renderMarkdown = async (markdown: string) => {
+  const file = await unified()
+    .use(remarkParse)
+    .use(remarkRehype)
+    .use(rehypeExpressiveCode, ecConfig)
+    .use(rehypeStringify)
+    .process(markdown);
+  return String(file);
+};
+const toDate = (value: unknown) => {
+  if (value instanceof Date) {
+    return value;
+  }
+  return new Date(String(value));
+};
+const readMarkdownFiles = async (dir: string): Promise<string[]> => {
+  const entries = await fs.readdir(dir, { withFileTypes: true });
+  const files = await Promise.all(
+    entries.map(async (entry) => {
+      const itemPath = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        return await readMarkdownFiles(itemPath);
+      }
+      return /\.(md|mdx)$/.test(entry.name) ? [itemPath] : [];
+    }),
+  );
+  return files.flat();
+};
+export const getRepos = (): RuntimeRepo[] =>
+  REPOS.map((repo) => ({
+    id: repo.title,
+    data: {
+      ...repo,
+      absolutePath: `/Users/pyrossh/Code/pyrossh/${repo.title}`,
+    },
+  }));
+export const getRepo = (repoId?: string) =>
+  getRepos().find((repo) => repo.id === repoId);
+export const getRepoReadmeHtml = async (repo: RuntimeRepo) => {
+  try {
+    const readme = await fs.readFile(
+      path.join(repo.data.absolutePath, "README.md"),
+      "utf-8",
+    );
+    return await renderMarkdown(readme);
+  } catch {
+    return "";
+  }
+};
+export const getPosts = async (): Promise<RuntimePost[]> => {
+  const files = await readMarkdownFiles(contentDir);
+  const posts = await Promise.all(
+    files.map(async (filePath) => {
+      const source = await fs.readFile(filePath, "utf-8");
+      const parsed = matter(source);
+      const relativePath = path.relative(contentDir, filePath);
+      const id = relativePath.replace(/\.(md|mdx)$/, "");
+      return {
+        id,
+        data: {
+          title: String(parsed.data.title ?? ""),
+          description: String(parsed.data.description ?? ""),
+          pubDate: toDate(parsed.data.pubDate),
+          updatedDate: parsed.data.updatedDate
+            ? toDate(parsed.data.updatedDate)
+            : undefined,
+          heroImage: parsed.data.heroImage
+            ? String(parsed.data.heroImage)
+            : undefined,
+        },
+        body: parsed.content,
+        html: await renderMarkdown(parsed.content),
+      };
+    }),
+  );
+  return posts.sort((a, b) => b.data.pubDate.valueOf() - a.data.pubDate.valueOf());
+};
+export const getPost = async (postId?: string) => {
+  const posts = await getPosts();
+  return posts.find((post) => post.id === postId);
+};