From 62a0ed6a209d254e436303fbee485b42d2b0d21d Mon Sep 17 00:00:00 2001
From: Renjie Li <renjie_li@outlook.com>
Date: Tue, 16 Jun 2026 22:27:18 +0800
Subject: [PATCH] fix: preserve locale casing in content collection entry IDs
 after Astro 6 upgrade

---
 src/content/banner/config.ts           | 7 ++++++-
 src/content/contributor-docs/config.ts | 7 ++++++-
 src/content/events/config.ts           | 7 ++++++-
 src/content/examples/config.ts         | 4 +++-
 src/content/homepage/config.ts         | 7 ++++++-
 src/content/libraries/config.ts        | 8 ++++++--
 src/content/pages/config.ts            | 7 ++++++-
 src/content/people/config.ts           | 7 ++++++-
 src/content/reference/config.ts        | 8 ++++++--
 src/content/shared.ts                  | 9 +++++++++
 src/content/text-detail/config.ts      | 7 ++++++-
 src/content/tutorials/config.ts        | 8 ++++++--
 12 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/src/content/banner/config.ts b/src/content/banner/config.ts
index cb2fe3efd3..5abdc23964 100644
--- a/src/content/banner/config.ts
+++ b/src/content/banner/config.ts
@@ -1,9 +1,14 @@
 import { defineCollection } from "astro:content";
 import { glob } from "astro/loaders";
 import { z } from "astro/zod";
+import { generateEntryId } from "../shared";
 
 export const bannerCollection = defineCollection({
-  loader: glob({ pattern: '**/*.mdx', base: "./src/content/banner" }),
+  loader: glob({
+    pattern: '**/*.mdx',
+    base: "./src/content/banner",
+    generateId: generateEntryId,
+  }),
   schema: () =>
     z.object({
       title: z.string(),
diff --git a/src/content/contributor-docs/config.ts b/src/content/contributor-docs/config.ts
index 8ef7c2179c..cb6331997c 100644
--- a/src/content/contributor-docs/config.ts
+++ b/src/content/contributor-docs/config.ts
@@ -1,12 +1,17 @@
 import { defineCollection } from "astro:content";
 import { glob } from "astro/loaders";
 import { z } from "astro/zod";
+import { generateEntryId } from "../shared";
 
 /**
  * Content collection for the Contribute section of the site.
  */
 export const contributorDocsCollection = defineCollection({
-  loader: glob({ pattern: '**/*.mdx', base: "./src/content/contributor-docs" }),
+  loader: glob({
+    pattern: '**/*.mdx',
+    base: "./src/content/contributor-docs",
+    generateId: generateEntryId,
+  }),
   schema: z.object({
     title: z.string(),
     description: z.string(),
diff --git a/src/content/events/config.ts b/src/content/events/config.ts
index 19706eb37e..b68dcb8c9e 100644
--- a/src/content/events/config.ts
+++ b/src/content/events/config.ts
@@ -1,9 +1,14 @@
 import { defineCollection, reference } from "astro:content";
 import { glob } from "astro/loaders";
 import { z } from "astro/zod";
+import { generateEntryId } from "../shared";
 
 export const eventsCollection = defineCollection({
-  loader: glob({ pattern: '**/*.mdx', base: "./src/content/events" }),
+  loader: glob({
+    pattern: '**/*.mdx',
+    base: "./src/content/events",
+    generateId: generateEntryId,
+  }),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
diff --git a/src/content/examples/config.ts b/src/content/examples/config.ts
index ed732447ad..be0ac2405b 100644
--- a/src/content/examples/config.ts
+++ b/src/content/examples/config.ts
@@ -1,6 +1,7 @@
 import { defineCollection, reference } from "astro:content";
 import { glob } from "astro/loaders";
 import { z } from "astro/zod";
+import { generateEntryId } from "../shared";
 
 /**
  * Content collection for the Examples section of the site.
@@ -9,7 +10,8 @@ import { z } from "astro/zod";
 export const examplesCollection = defineCollection({
   loader: glob({
     pattern: '**/*.mdx',
-    base: "./src/content/examples"
+    base: "./src/content/examples",
+    generateId: generateEntryId,
   }),
   schema: ({ image }) =>
     z.object({
diff --git a/src/content/homepage/config.ts b/src/content/homepage/config.ts
index a1d86aa6f0..fa66a8aa88 100644
--- a/src/content/homepage/config.ts
+++ b/src/content/homepage/config.ts
@@ -1,9 +1,14 @@
 import { defineCollection } from "astro:content";
 import { glob } from "astro/loaders";
 import { z } from "astro/zod";
+import { generateEntryId } from "../shared";
 
 export const homepageCollection = defineCollection({
-  loader: glob({ pattern: '**/*.yaml', base: "./src/content/homepage" }),
+  loader: glob({
+    pattern: '**/*.yaml',
+    base: "./src/content/homepage",
+    generateId: generateEntryId,
+  }),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
diff --git a/src/content/libraries/config.ts b/src/content/libraries/config.ts
index 5b1b785947..bfce45c4a0 100644
--- a/src/content/libraries/config.ts
+++ b/src/content/libraries/config.ts
@@ -1,7 +1,7 @@
 import { defineCollection } from "astro:content";
 import { z } from "astro/zod";
 import { glob } from "astro/loaders";
-import { author } from "../shared";
+import { author, generateEntryId } from "../shared";
 
 export const categories = [
   "drawing",
@@ -29,7 +29,11 @@ export const categories = [
  * Content collection for the Libraries section of the site.
  */
 export const librariesCollection = defineCollection({
-  loader: glob({ pattern: '**/*.yaml', base: "./src/content/libraries" }),
+  loader: glob({
+    pattern: '**/*.yaml',
+    base: "./src/content/libraries",
+    generateId: generateEntryId,
+  }),
   schema: ({ image }) =>
     z.object({
       // Name of the library
diff --git a/src/content/pages/config.ts b/src/content/pages/config.ts
index 9b5c6f0723..1d8348ed6c 100644
--- a/src/content/pages/config.ts
+++ b/src/content/pages/config.ts
@@ -1,9 +1,14 @@
 import { defineCollection } from "astro:content";
 import { z } from "astro/zod";
 import { glob } from "astro/loaders";
+import { generateEntryId } from "../shared";
 
 export const pagesCollection = defineCollection({
-  loader: glob({ pattern: '**/*.mdx', base: "./src/content/pages" }),
+  loader: glob({
+    pattern: '**/*.mdx',
+    base: "./src/content/pages",
+    generateId: generateEntryId,
+  }),
   schema: () => z.object({
     title: z.string(),
   }),
diff --git a/src/content/people/config.ts b/src/content/people/config.ts
index 20755a727a..999c17255a 100644
--- a/src/content/people/config.ts
+++ b/src/content/people/config.ts
@@ -1,6 +1,7 @@
 import { defineCollection } from "astro:content";
 import { z } from "astro/zod";
 import { glob } from "astro/loaders";
+import { generateEntryId } from "../shared";
 
 const peopleCategories = ["lead", "mentor", "alumni", "contributor"] as const;
 
@@ -9,7 +10,11 @@ const peopleCategories = ["lead", "mentor", "alumni", "contributor"] as const;
  *
  */
 export const peopleCollection = defineCollection({
-  loader: glob({ pattern: '**/*.yaml', base: "./src/content/people" }),
+  loader: glob({
+    pattern: '**/*.yaml',
+    base: "./src/content/people",
+    generateId: generateEntryId,
+  }),
   schema: ({ image }) =>
     z
       .object({
diff --git a/src/content/reference/config.ts b/src/content/reference/config.ts
index 2c1522ac65..3d13ba3f78 100644
--- a/src/content/reference/config.ts
+++ b/src/content/reference/config.ts
@@ -1,7 +1,7 @@
 import { defineCollection } from "astro:content";
 import { z } from "astro/zod";
 import { glob } from "astro/loaders";
-import { relatedContent } from "../shared";
+import { generateEntryId, relatedContent } from "../shared";
 
 // Categories, ordered in a (rough) general-to-specific sequence for easier
 // reading. Some bits that we haven't finished revising are moved lower down
@@ -93,6 +93,10 @@ export const referenceSchema = z.object({
 });
 
 export const referenceCollection = defineCollection({
-  loader: glob({ pattern: '**/*.mdx', base: "./src/content/reference" }),
+  loader: glob({
+    pattern: '**/*.mdx',
+    base: "./src/content/reference",
+    generateId: generateEntryId,
+  }),
   schema: referenceSchema,
 });
diff --git a/src/content/shared.ts b/src/content/shared.ts
index a522cbcbc5..460414256b 100644
--- a/src/content/shared.ts
+++ b/src/content/shared.ts
@@ -1,6 +1,15 @@
 import { reference } from "astro:content";
 import { z } from "astro/zod";
 
+/**
+ * Generates an entry ID that preserves the original file path casing.
+ * Astro's default glob() loader lowercases IDs via github-slugger, which
+ * breaks locale matching for codes like "zh-Hans". Using the raw path
+ * (without extension) keeps IDs consistent with the folder structure.
+ */
+export const generateEntryId = ({ entry }: { entry: string }): string =>
+  entry.replace(/\.(mdx|yaml)$/, "");
+
 /*
  * A zod type for an author.
  * has a name and an optional URL to link to
diff --git a/src/content/text-detail/config.ts b/src/content/text-detail/config.ts
index 12835c79f9..5202311c3d 100644
--- a/src/content/text-detail/config.ts
+++ b/src/content/text-detail/config.ts
@@ -1,9 +1,14 @@
 import { defineCollection } from "astro:content";
 import { z } from "astro/zod";
 import { glob } from "astro/loaders";
+import { generateEntryId } from "../shared";
 
 export const textDetailCollection = defineCollection({
-  loader: glob({ pattern: '**/*.mdx', base: "./src/content/text-detail" }),
+  loader: glob({
+    pattern: '**/*.mdx',
+    base: "./src/content/text-detail",
+    generateId: generateEntryId,
+  }),
   schema: ({ image }) =>
     z.object({
       title: z.string(),
diff --git a/src/content/tutorials/config.ts b/src/content/tutorials/config.ts
index 9b66dc20cd..3f4a52af9f 100644
--- a/src/content/tutorials/config.ts
+++ b/src/content/tutorials/config.ts
@@ -1,7 +1,7 @@
 import { defineCollection } from "astro:content";
 import { z } from "astro/zod";
 import { glob } from "astro/loaders";
-import { relatedContent } from "../shared";
+import { generateEntryId, relatedContent } from "../shared";
 
 export const categories = [
   "2.0",
@@ -19,7 +19,11 @@ export const categories = [
  * Content collection for the Sketches showcase section of the site.
  */
 export const tutorialsCollection = defineCollection({
-  loader: glob({ pattern: '**/*.mdx', base: "./src/content/tutorials" }),
+  loader: glob({
+    pattern: '**/*.mdx',
+    base: "./src/content/tutorials",
+    generateId: generateEntryId,
+  }),
   schema: ({ image }) =>
     z
       .object({