Use English as root locale, re-enable newsroom

ChefKissInc · Aug 17, 2024 · c06de3e · c06de3e
1 parent 315a5b6
commit c06de3e
Show file tree

Hide file tree

Showing 32 changed files with 171 additions and 85 deletions.
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -2,39 +2,43 @@ import { defineConfig } from "astro/config";
 import embeds from "astro-embed/integration";
 import starlight from "@astrojs/starlight";
 import starlightImageZoom from "starlight-image-zoom";
-// import starlightBlog from "starlight-blog";
+import starlightBlog from "starlight-blog";
 import starlightLinksValidator from "starlight-links-validator";
 import tailwind from "@astrojs/tailwind";
 import icon from "astro-icon";
 
 export default defineConfig({
   site: "https://chefkissinc.github.io",
+  trailingSlash: "always",
   integrations: [
     embeds({
       services: {
         LinkPreview: false,
       },
     }),
     starlight({
-      defaultLocale: "en",
+      defaultLocale: "root",
       locales: {
-        en: { label: "English" },
+        root: { label: "English", lang: "en" },
       },
       plugins: [
         starlightImageZoom(),
-        // starlightBlog({
-        //   title: "Newsroom",
-        //   prefix: "newsroom",
-        //   authors: {
-        //     visual: {
-        //       name: "Visual Ehrmanntraut",
-        //       title: "CEO",
-        //       picture: "/Avatars/Visual.png",
-        //       url: "https://github.com/VisualEhrmanntraut",
-        //     },
-        //   },
-        // }),
-        starlightLinksValidator(),
+        starlightBlog({
+          title: "Newsroom",
+          prefix: "newsroom",
+          authors: {
+            visual: {
+              name: "Visual Ehrmanntraut",
+              title: "CEO",
+              picture: "/Avatars/Visual.png",
+              url: "https://github.com/VisualEhrmanntraut",
+            },
+          },
+        }),
+        starlightLinksValidator({
+          errorOnFallbackPages: false,
+          errorOnInconsistentLocale: true,
+        }),
       ],
       title: "ChefKiss",
       logo: {
@@ -48,7 +52,7 @@ export default defineConfig({
       customCss: ["~/base.css"],
       components: {
         Head: "~/components/starlight/Head.astro",
-        // MarkdownContent: "~/components/starlight/MarkdownContent.astro",
+        MarkdownContent: "~/components/starlight/MarkdownContent.astro",
         ThemeProvider: "~/components/starlight/ThemeProvider.astro",
         ThemeSelect: "~/components/starlight/ThemeSelect.astro",
         SocialIcons: "~/components/starlight/SocialIcons.astro",

diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "astro-vtbot": "^1.8.6",
     "canvaskit-wasm": "^0.39.1",
     "sharp": "^0.33.5",
+    "starlight-blog": "^0.12.0",
     "starlight-image-zoom": "^0.7.0",
     "starlight-links-validator": "^0.10.1",
     "tailwindcss": "^3.4.10",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/en/PatchMerge_ReplaceConfig.mp4 → public/PatchMerge_ReplaceConfig.mp4 b/public/en/PatchMerge_ReplaceConfig.mp4 → public/PatchMerge_ReplaceConfig.mp4
diff --git a/src/components/starlight/MarkdownContent.astro b/src/components/starlight/MarkdownContent.astro
@@ -0,0 +1,9 @@
+---
+import StarlightBlogMarkdownContent from "starlight-blog/overrides/MarkdownContent.astro";
+import type { Props } from "@astrojs/starlight/props";
+
+import ImageZoom from "starlight-image-zoom/components/ImageZoom.astro";
+---
+
+<ImageZoom />
+<StarlightBlogMarkdownContent {...Astro.props}><slot /></StarlightBlogMarkdownContent>
diff --git a/src/components/starlight/SocialIcons.astro b/src/components/starlight/SocialIcons.astro
@@ -9,7 +9,7 @@ type SocialConfig = NonNullable<NonNullable<typeof config.social>[Platform]>;
 const links = Object.entries(config.social || {}) as [Platform, SocialConfig][];
 ---
 
-<a href="/newsroom" rel="me" class="sl-flex">
+<a href="/newsroom/" rel="me" class="sl-flex">
 	<span class="sr-only">Newsroom</span>
 	<Icon name={"ph:newspaper-duotone"} />
 </a>

diff --git a/src/content/config.ts b/src/content/config.ts
@@ -1,8 +1,9 @@
 import { defineCollection } from "astro:content";
 import { docsSchema } from "@astrojs/starlight/schema";
+import { blogSchema } from "starlight-blog/schema";
 
 export const collections = {
   docs: defineCollection({
-    schema: docsSchema(),
+    schema: docsSchema({ extend: (context) => blogSchema(context) }),
   }),
 };
diff --git a/...tent/docs/en/applehax/forgedinvariant.mdx → ...content/docs/applehax/forgedinvariant.mdx b/...tent/docs/en/applehax/forgedinvariant.mdx → ...content/docs/applehax/forgedinvariant.mdx
@@ -11,7 +11,7 @@ hero:
       variant: primary
 next: false
 prev:
-  link: /en/applehax
+  link: /applehax/
   label: AppleHax
 ---
 

diff --git a/src/content/docs/en/applehax/index.mdx → src/content/docs/applehax/index.mdx b/src/content/docs/en/applehax/index.mdx → src/content/docs/applehax/index.mdx
@@ -6,16 +6,16 @@ hero:
   tagline: Our Apple-related projects.
 next: false
 prev:
-  link: /en/
+  link: /
   label: Home
 ---
 
 import { LinkCard, CardGrid } from '@astrojs/starlight/components';
 
 <CardGrid>
-  <LinkCard title="QEMU Apple Silicon" description="Apple Silicon emulation based on QEMU." href="/en/applehax/qemu-as" />
-  <LinkCard title="NootedRed" description="The AMD Vega iGPU support kext." href="/en/applehax/nootedred" />
-  <LinkCard title="NootRX" description="The unsupported AMD rDNA 2 dGPU kext." href="/en/applehax/nootrx" />
-  <LinkCard title="SMCRadeonSensors" description="The AMD GPU temperature reading VirtualSMC plug-in." href="/en/applehax/smcrs" />
-  <LinkCard title="ForgedInvariant" description="The Intel & AMD CPU TSC sync kext." href="/en/applehax/forgedinvariant" />
+  <LinkCard title="QEMU Apple Silicon" description="Apple Silicon emulation based on QEMU." href="/applehax/qemu-as/" />
+  <LinkCard title="NootedRed" description="The AMD Vega iGPU support kext." href="/applehax/nootedred/" />
+  <LinkCard title="NootRX" description="The unsupported AMD rDNA 2 dGPU kext." href="/applehax/nootrx/" />
+  <LinkCard title="SMCRadeonSensors" description="The AMD GPU temperature reading VirtualSMC plug-in." href="/applehax/smcrs/" />
+  <LinkCard title="ForgedInvariant" description="The Intel & AMD CPU TSC sync kext." href="/applehax/forgedinvariant/" />
 </CardGrid>
diff --git a/src/content/docs/en/applehax/nootedred.mdx → src/content/docs/applehax/nootedred.mdx b/src/content/docs/en/applehax/nootedred.mdx → src/content/docs/applehax/nootedred.mdx
@@ -11,7 +11,7 @@ hero:
       variant: primary
 next: false
 prev:
-  link: /en/applehax
+  link: /applehax/
   label: AppleHax
 ---
 

diff --git a/src/content/docs/en/applehax/nootrx.mdx → src/content/docs/applehax/nootrx.mdx b/src/content/docs/en/applehax/nootrx.mdx → src/content/docs/applehax/nootrx.mdx
@@ -11,7 +11,7 @@ hero:
       variant: primary
 next: false
 prev:
-  link: /en/applehax
+  link: /applehax/
   label: AppleHax
 ---
 

diff --git a/src/content/docs/en/applehax/qemu-as.mdx → src/content/docs/applehax/qemu-as.mdx b/src/content/docs/en/applehax/qemu-as.mdx → src/content/docs/applehax/qemu-as.mdx
@@ -11,6 +11,6 @@ hero:
       variant: primary
 next: false
 prev:
-  link: /en/applehax
+  link: /applehax/
   label: AppleHax
 ---
diff --git a/src/content/docs/en/applehax/smcrs.mdx → src/content/docs/applehax/smcrs.mdx b/src/content/docs/en/applehax/smcrs.mdx → src/content/docs/applehax/smcrs.mdx
@@ -11,6 +11,6 @@ hero:
       variant: primary
 next: false
 prev:
-  link: /en/applehax
+  link: /applehax/
   label: AppleHax
 ---