fix(admin): use import.meta.glob for locale catalog resolution (#499)

ascorbic · Copilot · emdashbot[bot] · web-flow · commit 0b4e61b059e4 · 2026-04-12T22:10:17.000+01:00
* fix(admin): use import.meta.glob for locale catalog resolution The dynamic import in admin.astro used a template literal to load locale catalogs cross-package, which failed in non-monorepo installs because Vite's SSR module runner couldn't resolve the path. The Vite alias entry intended to fix this used `*` in the find string, which is treated as a literal character, not a wildcard. Moves locale loading into the admin package via `loadMessages()` using `import.meta.glob`, so Vite resolves catalogs at build time with reliable relative paths. Removes the no-op Vite alias. * fix(locales): use Messages type from @lingui/core and DEFAULT_LOCALE for fallback Agent-Logs-Url: https://github.com/emdash-cms/emdash/sessions/c16c31e9-70d6-4dcc-9a07-27184ed47cd8 Co-authored-by: ascorbic <213306+ascorbic@users.noreply.github.com> * style: format --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: ascorbic <213306+ascorbic@users.noreply.github.com> Co-authored-by: emdashbot[bot] <emdashbot[bot]@users.noreply.github.com>
diff --git a/.changeset/rich-drinks-hug.md b/.changeset/rich-drinks-hug.md
@@ -0,0 +1,6 @@
+---
+"emdash": patch
+"@emdash-cms/admin": patch
+---
+
+Fixes admin failing to load when installed from npm due to broken locale catalog resolution.
diff --git a/packages/admin/src/locales/index.ts b/packages/admin/src/locales/index.ts
@@ -1,3 +1,7 @@
+import type { Messages } from "@lingui/core";
+
+import { DEFAULT_LOCALE } from "./config.js";
+
 export { useLocale } from "./useLocale.js";
 export {
 	SUPPORTED_LOCALES,
@@ -7,3 +11,18 @@ export {
 	resolveLocale,
 } from "./config.js";
 export type { SupportedLocale } from "./config.js";
+
+const LOCALE_LOADERS = import.meta.glob<{ messages: Messages }>("./**/messages.mjs");
+
+export async function loadMessages(locale: string): Promise<Messages> {
+	const key = `./${locale}/messages.mjs`;
+	const fallbackKey = `./${DEFAULT_LOCALE}/messages.mjs`;
+	const loader = LOCALE_LOADERS[key] ?? LOCALE_LOADERS[fallbackKey];
+	if (!loader) {
+		throw new Error(
+			`No locale catalog found for "${locale}" or "${DEFAULT_LOCALE}". Run \`pnpm locale:compile\` to generate catalogs.`,
+		);
+	}
+	const { messages } = await loader();
+	return messages;
+}
diff --git a/packages/admin/tests/lib/locales.test.ts b/packages/admin/tests/lib/locales.test.ts
@@ -0,0 +1,17 @@
+import { expect, test } from "vitest";
+
+import { loadMessages, SUPPORTED_LOCALES } from "../../src/locales/index.js";
+
+for (const { code } of SUPPORTED_LOCALES) {
+	test(`loadMessages resolves catalog for supported locale "${code}"`, async () => {
+		const messages = await loadMessages(code);
+		expect(messages).toBeDefined();
+		expect(typeof messages).toBe("object");
+		expect(Object.keys(messages).length).toBeGreaterThan(0);
+	});
+}
+
+test("loadMessages falls back to English for unknown locale", async () => {
+	const [fallback, english] = await Promise.all([loadMessages("xx"), loadMessages("en")]);
+	expect(fallback).toEqual(english);
+});
diff --git a/packages/core/src/astro/integration/vite-config.ts b/packages/core/src/astro/integration/vite-config.ts
@@ -293,10 +293,6 @@ export function createViteConfig(
 			// "@emdash-cms/admin/styles.css" through the source directory.
 			alias: [
 				{ find: "@emdash-cms/admin/styles.css", replacement: resolve(adminDistPath, "styles.css") },
-				{
-					find: "@emdash-cms/admin/locales/*",
-					replacement: resolve(adminDistPath, "locales", "*"),
-				},
 				{ find: "@emdash-cms/admin", replacement: useSource ? adminSourcePath : adminDistPath },
 			],
 		},
diff --git a/packages/core/src/astro/routes/admin.astro b/packages/core/src/astro/routes/admin.astro
@@ -12,10 +12,10 @@ import AdminWrapper from "emdash/routes/PluginRegistry";
 
 export const prerender = false;
 
-import { resolveLocale } from "@emdash-cms/admin/locales";
+import { resolveLocale, loadMessages } from "@emdash-cms/admin/locales";
 
 const resolvedLocale = resolveLocale(Astro.request);
-const { messages } = await import(`@emdash-cms/admin/locales/${resolvedLocale}/messages.mjs`);
+const messages = await loadMessages(resolvedLocale);
 ---
 
 <!doctype html>
