chore(deps): bump @pierre/diffs from 1.5.1 to 1.6.1

web/package.json

@@ -36,7 +36,9 @@
     "@codemirror/view": "^6.43.15",
     "@lezer/highlight": "^1.2.5",
     "@lobehub/icons-static-svg": "^1.98.0",
-    "@pierre/diffs": "^1.5.1",
+    "@pierre/diffs": "^1.6.1",
+    "@pierre/highlights": "0.2.0",
+    "@pierre/theme": "2.0.0",
     "@radix-ui/react-popover": "^1.3.1",
     "@shikijs/core": "^4.5.0",
     "@shikijs/langs": "^4.5.0",

web/src/diffHighlightsThemes.ts

@@ -0,0 +1,5 @@
+// Keep the optional Highlights backend aligned with the diff viewer's themes.
+export const themes = {
+  "pierre-dark": () => import("@pierre/highlights/themes/pierre-dark"),
+  "pierre-light": () => import("@pierre/highlights/themes/pierre-light"),
+};

web/src/diffThemes.test.ts

@@ -0,0 +1,43 @@
+import { expect, test } from "bun:test";
+import { DEFAULT_THEMES } from "@pierre/diffs";
+import { themes as highlightsThemes } from "./diffHighlightsThemes";
+import { themes } from "./diffThemes";
+import config from "../vite.config";
+
+test("diff bundles use curated language and theme catalogs", () => {
+  const aliases = config.resolve?.alias;
+  expect(Array.isArray(aliases)).toBe(true);
+  if (!Array.isArray(aliases))
+    throw new Error("Expected explicit Vite aliases");
+  const replacement = (specifier: string) =>
+    aliases.find(({ find }) =>
+      typeof find === "string" ? find === specifier : find.test(specifier),
+    )?.replacement;
+  expect(replacement("shiki")).toEndWith("/src/shiki.ts");
+  expect(replacement("shiki/langs")).toBe(replacement("shiki"));
+  expect(replacement("shiki/core")).toBeUndefined();
+  expect(replacement("shiki/wasm")).toBeUndefined();
+  expect(replacement("@pierre/theming/themes")).toEndWith("/src/diffThemes.ts");
+  expect(replacement("@pierre/highlights/themes/loader")).toEndWith(
+    "/src/diffHighlightsThemes.ts",
+  );
+});
+
+test("curated diff catalogs load both default theme formats", async () => {
+  expect(Object.keys(highlightsThemes).sort()).toEqual(
+    Object.values(DEFAULT_THEMES).sort(),
+  );
+  for (const name of Object.values(DEFAULT_THEMES)) {
+    const descriptor = themes.getTheme(name);
+    expect(descriptor).toBeDefined();
+    const textmate = (await descriptor!.load()).default;
+    expect(textmate.name).toBe(name);
+    const zed = (
+      await highlightsThemes[name as keyof typeof highlightsThemes]()
+    ).default;
+    expect(zed.appearance).toBe(textmate.type);
+    expect(zed.style).toBeDefined();
+  }
+  expect(themes.getTheme("toString")).toBeUndefined();
+  expect(themes.getTheme("github-dark")).toBeUndefined();
+});

web/src/diffThemes.ts

@@ -0,0 +1,12 @@
+// Keep the catalog limited to the two themes exposed by the diff viewer.
+const loaders = {
+  "pierre-dark": () => import("@pierre/theme/pierre-dark"),
+  "pierre-light": () => import("@pierre/theme/pierre-light"),
+};
+
+export const themes = {
+  getTheme(name: string) {
+    if (!Object.prototype.hasOwnProperty.call(loaders, name)) return undefined;
+    return { load: loaders[name as keyof typeof loaders] };
+  },
+};

web/vite.config.ts

@@ -8,8 +8,21 @@ export default defineConfig({
   plugins: [react()],
   resolve: {
     alias: [
+      // Diff viewers expose only Pierre light/dark, not the full theme catalogs.
       {
-        find: /^shiki$/,
+        find: /^@pierre\/theming\/themes$/,
+        replacement: fileURLToPath(
+          new URL("./src/diffThemes.ts", import.meta.url),
+        ),
+      },
+      {
+        find: /^@pierre\/highlights\/themes\/loader$/,
+        replacement: fileURLToPath(
+          new URL("./src/diffHighlightsThemes.ts", import.meta.url),
+        ),
+      },
+      {
+        find: /^shiki(?:\/langs)?$/,
         replacement: fileURLToPath(new URL("./src/shiki.ts", import.meta.url)),
       },
     ],