emdash 1.3.0 → 1.3.1

package/src/api/handlers/bulk-tag.ts

@@ -6,7 +6,7 @@ import { ContentRepository } from "../../database/repositories/content.js";
 import { TaxonomyRepository } from "../../database/repositories/taxonomy.js";
 import type { ContentItem } from "../../database/repositories/types.js";
 import type { Database } from "../../database/types.js";
-import { getI18nConfig } from "../../i18n/config.js";
+import { getI18nConfig, resolveConfiguredLocale } from "../../i18n/config.js";
 import { localizePath, resolveLocalizedContentRoutePath } from "../../i18n/resolve.js";
 import { SchemaRegistry } from "../../schema/registry.js";
 import { compileUrlPattern } from "../../schema/url-pattern.js";
@@ -155,7 +155,9 @@ export async function handleBulkTag(
 		for (const [key, group] of slugNeeds) {
 			bySlug.set(
 				key,
-				await content.findManyBySlugsInLocale(group.collection, [...group.slugs], group.locale),
+				await content.findManyBySlugsInLocale(group.collection, [...group.slugs], group.locale, {
+					publishedOnly: true,
+				}),
 			);
 		}
 		const prepared: Array<{
@@ -175,7 +177,13 @@ export async function handleBulkTag(
 							: bySlug
 									.get(`${candidate.collection.slug}:${candidate.locale}`)
 									?.get(candidate.identifier);
-					if (!item || item.locale !== candidate.locale || item.status !== "published") continue;
+					if (
+						!item ||
+						item.locale === null ||
+						resolveConfiguredLocale(item.locale) !== resolveConfiguredLocale(candidate.locale) ||
+						item.status !== "published"
+					)
+						continue;
 					const canonical = await resolveLocalizedContentRoutePath({
 						pattern: candidate.collection.urlPattern ?? `/${candidate.collection.slug}/{slug}`,
 						collection: candidate.collection.slug,

package/src/api/handlers/bylines.ts

@@ -31,7 +31,7 @@ function bylineFixedFieldsMatch(
 		norm(existing.websiteUrl) === norm(input.websiteUrl) &&
 		norm(existing.userId) === norm(input.userId) &&
 		existing.isGuest === (input.isGuest ?? false) &&
-		existing.locale === effectiveLocale
+		resolveConfiguredLocale(existing.locale) === resolveConfiguredLocale(effectiveLocale)
 	);
 }
 
@@ -176,7 +176,11 @@ export async function handleBylineCreate(
 		// net; this is the friendly error.
 		if (sourceGroup) {
 			const siblings = await repo.findByTranslationGroup(sourceGroup);
-			if (siblings.some((b) => b.locale === effectiveLocale)) {
+			if (
+				siblings.some(
+					(b) => resolveConfiguredLocale(b.locale) === resolveConfiguredLocale(effectiveLocale),
+				)
+			) {
 				return {
 					success: false,
 					error: {

package/src/api/handlers/content.ts

@@ -26,6 +26,7 @@ import { TaxonomyRepository } from "../../database/repositories/taxonomy.js";
 import {
 	ContentCollectionNotFoundError,
 	ContentMutationConflictError,
+	ContentSlugConflictError,
 	EmDashValidationError,
 	ScheduledNotDueError,
 	InvalidCursorError,
@@ -43,6 +44,7 @@ import { withTransaction } from "../../database/transaction.js";
 import type { Database } from "../../database/types.js";
 import { validateIdentifier } from "../../database/validate.js";
 import { getI18nConfig, isI18nEnabled, resolveConfiguredLocale } from "../../i18n/config.js";
+import { interpolateUrlPattern } from "../../i18n/resolve.js";
 import {
 	scheduledPolicyRejectionKey,
 	type ScheduledPolicyRejection,
@@ -811,6 +813,45 @@ async function createSlugChangeRedirect(
 	return redirect !== null;
 }
 
+/**
+ * Remove any auto-redirect whose source is the URL a newly published entry
+ * now occupies. This prevents an earlier slug-change redirect from shadowing
+ * the new live page, because the redirect middleware runs before routing.
+ */
+async function removeShadowingAutoRedirect(
+	db: Kysely<Database>,
+	collection: string,
+	slug: string | null | undefined,
+	contentId: string,
+	publishedAt: string | null | undefined,
+): Promise<boolean> {
+	if (!slug) return false;
+	validateIdentifier(collection, "collection slug");
+
+	const collectionRow = await db
+		.selectFrom("_emdash_collections")
+		.select("url_pattern")
+		.where("slug", "=", collection)
+		.executeTakeFirst();
+
+	const url = interpolateUrlPattern({
+		pattern: collectionRow?.url_pattern ?? null,
+		collection,
+		slug,
+		id: contentId,
+		date: publishedAt,
+	});
+
+	const result = await db
+		.deleteFrom("_emdash_redirects")
+		.where("source", "=", url)
+		.where("auto", "=", 1)
+		.executeTakeFirst();
+	const removed = BigInt(result.numDeletedRows ?? 0n) > 0n;
+	if (removed) invalidateRedirectCache();
+	return removed;
+}
+
 /** Whether a row other than `contentId` still holds `slug` in this collection. */
 async function slugStillTaken(
 	db: Kysely<Database>,
@@ -1250,6 +1291,7 @@ export async function handleContentCreate(
 		if (!requiredReferences.success) return requiredReferences;
 
 		// Wrap content + SEO writes in a transaction for atomicity
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const bylineRepo = new BylineRepository(trx);
@@ -1390,8 +1432,19 @@ export async function handleContentCreate(
 				}
 			}
 
+			if (created.status === "published") {
+				redirectChanged = await removeShadowingAutoRedirect(
+					trx,
+					collection,
+					created.slug,
+					created.id,
+					created.publishedAt,
+				);
+			}
+
 			return created;
 		});
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 
 		return {
 			success: true,
@@ -1415,6 +1468,18 @@ export async function handleContentCreate(
 				},
 			};
 		}
+		if (error instanceof ContentMutationConflictError) {
+			return { success: false, error: { code: "CONFLICT", message: error.message } };
+		}
+		if (error instanceof ContentSlugConflictError) {
+			return {
+				success: false,
+				error: {
+					code: "SLUG_CONFLICT",
+					message: `Slug '${body.slug ?? "(auto-generated)"}' already exists in collection '${collection}'`,
+				},
+			};
+		}
 		if (error instanceof EmDashValidationError) {
 			if (error.message === "Translation source content not found") {
 				return {
@@ -1542,7 +1607,7 @@ export async function handleContentUpdate(
 		// Wrap content + SEO writes in a transaction for atomicity.
 		// The _rev check is inside the transaction so the read-then-write
 		// is atomic -- no concurrent write can slip between the check and update.
-		let redirectCreated = false;
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const trxRepo = new ContentRepository(trx);
 			const bylineRepo = new BylineRepository(trx);
@@ -1610,12 +1675,17 @@ export async function handleContentUpdate(
 				}
 			}
 
+			// Collections without revisions save to the columns, and reads show any
+			// draft revision over them, so no draft pointer may outlive a save.
+			const { supportsRevisions } = await getCollectionPublishConfig(trx, collection);
 			const updated = await trxRepo.update(collection, resolvedId, {
 				data: body.data,
 				slug: body.slug,
+				locale: existing?.locale ?? body.locale,
 				status: body.status,
 				authorId: body.authorId,
 				publishedAt: body.publishedAt,
+				...(supportsRevisions ? {} : { draftRevisionId: null }),
 			});
 
 			if (body.bylines !== undefined) {
@@ -1632,7 +1702,7 @@ export async function handleContentUpdate(
 			// pre-update date (the URL that was actually live) and the new URL
 			// the post-update one.
 			if (oldSlug && body.slug) {
-				redirectCreated = await createSlugChangeRedirect(
+				redirectChanged = await createSlugChangeRedirect(
 					trx,
 					collection,
 					oldSlug,
@@ -1685,9 +1755,20 @@ export async function handleContentUpdate(
 				await writeReferenceSelection(trx, write);
 			}
 
+			if (updated.status === "published") {
+				redirectChanged =
+					(await removeShadowingAutoRedirect(
+						trx,
+						collection,
+						updated.slug,
+						updated.id,
+						updated.publishedAt,
+					)) || redirectChanged;
+			}
+
 			return updated;
 		});
-		if (redirectCreated) after(() => publishRedirectChanges(db));
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 
 		return {
 			success: true,
@@ -1717,6 +1798,15 @@ export async function handleContentUpdate(
 				error: { code: "VALIDATION_ERROR", message: error.message },
 			};
 		}
+		if (error instanceof ContentSlugConflictError) {
+			return {
+				success: false,
+				error: {
+					code: "SLUG_CONFLICT",
+					message: `Slug '${body.slug ?? id}' already exists in collection '${collection}'`,
+				},
+			};
+		}
 		const message = error instanceof Error ? error.message.toLowerCase() : "";
 		if (message.includes("unique constraint failed") || message.includes("duplicate key")) {
 			if (message.includes("slug")) {
@@ -2352,7 +2442,7 @@ export async function handleContentPublish(
 ): Promise<ApiResult<ContentResponse>> {
 	try {
 		const expectedRevision = decodeRevisionPrecondition(options._rev);
-		let redirectCreated = false;
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const resolvedId = (await resolveId(repo, collection, id)) ?? id;
@@ -2472,7 +2562,7 @@ export async function handleContentPublish(
 				published.slug &&
 				existing.slug !== published.slug
 			) {
-				redirectCreated = await createSlugChangeRedirect(
+				redirectChanged = await createSlugChangeRedirect(
 					trx,
 					collection,
 					existing.slug,
@@ -2483,9 +2573,18 @@ export async function handleContentPublish(
 				);
 			}
 
+			redirectChanged =
+				(await removeShadowingAutoRedirect(
+					trx,
+					collection,
+					published.slug,
+					published.id,
+					published.publishedAt,
+				)) || redirectChanged;
+
 			return published;
 		});
-		if (redirectCreated) after(() => publishRedirectChanges(db));
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 
 		const hasSeo = await collectionHasSeo(db, collection);
 		await hydrateSeo(db, collection, item, hasSeo);
@@ -2583,7 +2682,8 @@ export async function handleContentUnpublish(
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const resolvedId = (await resolveId(repo, collection, id)) ?? id;
-			return repo.unpublish(collection, resolvedId, expectedRevision);
+			const { supportsRevisions } = await getCollectionPublishConfig(trx, collection);
+			return repo.unpublish(collection, resolvedId, expectedRevision, supportsRevisions);
 		});
 
 		const hasSeo = await collectionHasSeo(db, collection);

package/src/api/handlers/dashboard.ts

@@ -47,8 +47,10 @@ export interface RecentItem {
 
 export interface DashboardStats {
 	collections: CollectionStats[];
-	mediaCount: number;
-	userCount: number;
+	/** Omitted for callers without `media:read`. */
+	mediaCount?: number;
+	/** Omitted for callers without `users:read`. */
+	userCount?: number;
 	recentItems: RecentItem[];
 	schedulerHealth: SchedulerHealth;
 	policyRejectedScheduled: number;
@@ -65,11 +67,16 @@ const POLICY_REJECTION_PREVIEW_LIMIT = 20;
  *
  * Without `includeDrafts` (callers lacking `content:read_drafts`), only
  * published entries are counted or listed, and scheduled-publication policy
- * rejections are omitted.
+ * rejections are omitted. Without `includeMediaCount` / `includeUserCount`,
+ * `mediaCount` / `userCount` are omitted.
  */
 export async function handleDashboardStats(
 	db: Kysely<Database>,
-	{ includeDrafts }: { includeDrafts: boolean },
+	{
+		includeDrafts,
+		includeMediaCount,
+		includeUserCount,
+	}: { includeDrafts: boolean; includeMediaCount: boolean; includeUserCount: boolean },
 	now = new Date(),
 ): Promise<ApiResult<DashboardStats>> {
 	try {
@@ -119,8 +126,8 @@ export async function handleDashboardStats(
 			policyRejectedScheduled,
 			versionedPolicyRejectionOptions,
 		] = await Promise.all([
-			mediaRepo.count(),
-			userRepo.count(),
+			includeMediaCount ? mediaRepo.count() : undefined,
+			includeUserCount ? userRepo.count() : undefined,
 			getSchedulerHealth(db, now),
 			includeDrafts ? optionsRepo.countByPrefix(SCHEDULED_POLICY_REJECTION_PREFIX) : 0,
 			includeDrafts

package/src/api/handlers/menus.ts

@@ -15,6 +15,7 @@ import type { Kysely } from "kysely";
 
 import {
 	MenuGoneError,
+	MenuItemParentError,
 	MenuRepository,
 	type CreateMenuItemInput as CreateMenuItemRepoInput,
 	type Menu,
@@ -25,7 +26,7 @@ import {
 	type UpdateMenuItemInput as UpdateMenuItemRepoInput,
 } from "../../database/repositories/menu.js";
 import type { Database } from "../../database/types.js";
-import { getI18nConfig, resolveConfiguredLocale } from "../../i18n/config.js";
+import { getI18nConfig, getLocaleRank, resolveConfiguredLocale } from "../../i18n/config.js";
 import type { ApiResult } from "../types.js";
 
 // Re-export entity types so route files and tests can import them from the
@@ -100,16 +101,20 @@ async function resolveMenu(
 			},
 		};
 	}
-	if (matches.length > 1) {
+	const canonicalLocales = new Set(matches.map((match) => resolveConfiguredLocale(match.locale)));
+	if (locale === undefined && canonicalLocales.size > 1) {
 		return {
 			success: false,
-			error: ambiguousMenuLocaleError(
-				name,
-				matches.map((m) => m.locale),
-			).error,
+			error: ambiguousMenuLocaleError(name, [...canonicalLocales]).error,
 		};
 	}
-	return { success: true, menu: matches[0] };
+	const preferredLocale = locale ?? resolveConfiguredLocale(matches[0].locale);
+	const menu = matches.toSorted(
+		(a, b) =>
+			getLocaleRank(a.locale, preferredLocale) - getLocaleRank(b.locale, preferredLocale) ||
+			a.id.localeCompare(b.id),
+	)[0];
+	return { success: true, menu };
 }
 
 // ---------------------------------------------------------------------------
@@ -369,7 +374,10 @@ export async function handleMenuItemCreate(
 
 		const item = await repo.createItem(resolved.menu.id, resolved.menu.locale, input);
 		return { success: true, data: item };
-	} catch {
+	} catch (error) {
+		if (error instanceof MenuItemParentError) {
+			return { success: false, error: { code: "VALIDATION_ERROR", message: error.message } };
+		}
 		return {
 			success: false,
 			error: { code: "MENU_ITEM_CREATE_ERROR", message: "Failed to create menu item" },
@@ -400,7 +408,10 @@ export async function handleMenuItemUpdate(
 			};
 		}
 		return { success: true, data: updated };
-	} catch {
+	} catch (error) {
+		if (error instanceof MenuItemParentError) {
+			return { success: false, error: { code: "VALIDATION_ERROR", message: error.message } };
+		}
 		return {
 			success: false,
 			error: { code: "MENU_ITEM_UPDATE_ERROR", message: "Failed to update menu item" },
@@ -528,7 +539,10 @@ export async function handleMenuItemReorder(
 
 		const updated = await repo.reorderItems(resolved.menu.id, items);
 		return { success: true, data: updated };
-	} catch {
+	} catch (error) {
+		if (error instanceof MenuItemParentError) {
+			return { success: false, error: { code: "VALIDATION_ERROR", message: error.message } };
+		}
 		return {
 			success: false,
 			error: { code: "MENU_REORDER_ERROR", message: "Failed to reorder menu items" },

package/src/api/handlers/relations.ts

@@ -13,6 +13,7 @@ import { InvalidCursorError } from "../../database/repositories/types.js";
 import type { ContentItem } from "../../database/repositories/types.js";
 import { withTransaction } from "../../database/transaction.js";
 import type { Database } from "../../database/types.js";
+import { getLocaleCandidates, getLocaleRank } from "../../i18n/config.js";
 import { invalidateCollectionCache } from "../../object-cache/index.js";
 import {
 	pageStagedGroups,
@@ -378,7 +379,20 @@ async function resolveRelation(
  * `locale` so callers never mistake a fallback for the requested locale.
  */
 function pickVariant(items: ContentItem[], locale: string | null): ContentItem | undefined {
-	return items.find((i) => i.locale === locale) ?? items[0];
+	if (locale === null) return items[0];
+
+	const candidates = getLocaleCandidates(locale);
+	let best: ContentItem | undefined;
+	let bestRank = candidates.length;
+	for (const item of items) {
+		if (item.locale === null) continue;
+		const rank = getLocaleRank(item.locale, locale);
+		if (rank < bestRank) {
+			best = item;
+			bestRank = rank;
+		}
+	}
+	return best ?? items[0];
 }
 
 /**

package/src/api/handlers/taxonomies.ts

@@ -24,7 +24,8 @@ import {
 import { TaxonomyRepository, type SiblingPosition } from "../../database/repositories/taxonomy.js";
 import { withTransaction } from "../../database/transaction.js";
 import type { Database, TaxonomyDefTable } from "../../database/types.js";
-import { getI18nConfig, resolveConfiguredLocale } from "../../i18n/config.js";
+import { getI18nConfig, getLocaleChainRank, resolveConfiguredLocale } from "../../i18n/config.js";
+import { localeMatches } from "../../i18n/query.js";
 import { invalidateTaxonomyDefsCache, invalidateTermCache } from "../../taxonomies/index.js";
 import { fetchVisibleTermCounts } from "../../taxonomies/term-counts.js";
 import type { ApiResult } from "../types.js";
@@ -181,9 +182,11 @@ async function requireTaxonomyDef(
 	name: string,
 	locale?: string,
 ): Promise<TaxonomyDefLookup> {
-	let query = selectTaxonomyDefs(db).where("d.name", "=", name);
-	if (locale !== undefined) query = query.where("d.locale", "=", locale);
-	const def = await query.orderBy("d.locale", "asc").orderBy("d.id", "asc").executeTakeFirst();
+	const def = await selectTaxonomyDefs(db, locale)
+		.where("d.name", "=", name)
+		.orderBy("d.locale", "asc")
+		.orderBy("d.id", "asc")
+		.executeTakeFirst();
 	return def ? { success: true, def } : taxonomyDefNotFound(name, locale);
 }
 
@@ -196,16 +199,19 @@ async function requireTaxonomyDefWithFallback(
 	name: string,
 	locale?: string,
 ): Promise<TaxonomyDefLookup> {
-	const defs = await selectTaxonomyDefs(db)
-		.where("d.name", "=", name)
-		.orderBy("d.locale", "asc")
-		.orderBy("d.id", "asc")
-		.execute();
+	const defs = await selectTaxonomyDefs(db).where("d.name", "=", name).execute();
 	const defaultLocale = getI18nConfig()?.defaultLocale;
-	const def =
-		(locale ? defs.find((candidate) => candidate.locale === locale) : undefined) ??
-		(defaultLocale ? defs.find((candidate) => candidate.locale === defaultLocale) : undefined) ??
-		defs[0];
+	const chain = locale
+		? [locale, ...(defaultLocale && defaultLocale !== locale ? [defaultLocale] : [])]
+		: defaultLocale
+			? [defaultLocale]
+			: [];
+	const def = defs.toSorted(
+		(a, b) =>
+			getLocaleChainRank(a.locale, chain) - getLocaleChainRank(b.locale, chain) ||
+			a.locale.localeCompare(b.locale) ||
+			a.id.localeCompare(b.id),
+	)[0];
 	return def ? { success: true, def } : taxonomyDefNotFound(name, locale);
 }
 
@@ -298,8 +304,7 @@ export async function handleTaxonomyList(
 ): Promise<ApiResult<TaxonomyListResponse>> {
 	try {
 		const locale = options.locale ? resolveConfiguredLocale(options.locale) : undefined;
-		let query = selectTaxonomyDefs(db);
-		if (locale !== undefined) query = query.where("d.locale", "=", locale);
+		const query = selectTaxonomyDefs(db, locale);
 		const [rows, collectionRows] = await Promise.all([
 			query.execute(),
 			db.selectFrom("_emdash_collections").select("slug").execute(),
@@ -418,7 +423,7 @@ export async function handleTaxonomyCreate(
 			.selectFrom("_emdash_taxonomy_defs")
 			.select("id")
 			.where("name", "=", input.name)
-			.where("locale", "=", locale)
+			.where(localeMatches("locale", locale))
 			.executeTakeFirst();
 		if (existing) {
 			return {
@@ -1019,7 +1024,12 @@ export async function handleTermCreate(
 			}
 			selfGroup = source.translationGroup ?? source.id;
 			const translations = await repo.findTranslations(selfGroup);
-			if (translations.some((translation) => translation.locale === locale)) {
+			if (
+				translations.some(
+					(translation) =>
+						resolveConfiguredLocale(translation.locale) === resolveConfiguredLocale(locale),
+				)
+			) {
 				return {
 					success: false,
 					error: {

package/src/astro/image-endpoint.ts

@@ -82,15 +82,26 @@ export const GET: APIRoute = async (ctx) => {
 	const service = await getConfiguredImageService();
 	if (!("transform" in service)) return genericGET(ctx);
 
+	// An unread download retains its storage connection even for a bodyless response.
+	let unusedBody: ReadableStream<Uint8Array> | undefined;
 	try {
 		const source = await storage.download(key);
+		unusedBody = source.body;
 
 		// Only raster images are transformable; serve anything else unchanged.
 		if (!source.contentType.startsWith("image/")) {
 			if (isNotModified(ctx.request, source.size, source.lastModified)) {
 				return notModifiedResponse(source.contentType, source.size, source.lastModified);
 			}
-			return streamOriginal(source.body, source.contentType, source.size, source.lastModified);
+			const response = streamOriginal(
+				source.body,
+				source.contentType,
+				source.size,
+				source.lastModified,
+			);
+			if (ctx.request.method === "HEAD") return new Response(null, response);
+			unusedBody = undefined;
+			return response;
 		}
 
 		const transform = await service.parseURL(url, imageConfig);
@@ -98,7 +109,15 @@ export const GET: APIRoute = async (ctx) => {
 			if (isNotModified(ctx.request, source.size, source.lastModified)) {
 				return notModifiedResponse(source.contentType, source.size, source.lastModified);
 			}
-			return streamOriginal(source.body, source.contentType, source.size, source.lastModified);
+			const response = streamOriginal(
+				source.body,
+				source.contentType,
+				source.size,
+				source.lastModified,
+			);
+			if (ctx.request.method === "HEAD") return new Response(null, response);
+			unusedBody = undefined;
+			return response;
 		}
 
 		const fingerprint = getTransformFingerprint(url.searchParams);
@@ -122,5 +141,7 @@ export const GET: APIRoute = async (ctx) => {
 		if (isNotFound(error)) return new Response("Not Found", { status: 404 });
 		console.error("[emdash] image transform failed:", error);
 		return new Response("Internal Server Error", { status: 500 });
+	} finally {
+		if (unusedBody && !unusedBody.locked) await unusedBody.cancel().catch(() => undefined);
 	}
 };

package/src/astro/integration/vite-config.ts

@@ -408,6 +408,9 @@ export function createViteConfig(
 	command: "dev" | "build" | "preview" | "sync",
 ): NonNullable<AstroConfig["vite"]> {
 	const adminDistPath = resolveAdminDist();
+	const adminRequire = createRequire(resolve(adminDistPath, "index.js"));
+	const adminLinguiReactPath = dirname(adminRequire.resolve("@lingui/react/package.json"));
+	const adminLinguiCorePath = dirname(adminRequire.resolve("@lingui/core/package.json"));
 	const cloudflare = isCloudflareAdapter(options.astroConfig);
 	const isDev = command === "dev";
 	const projectRoot = fileURLToPath(options.astroConfig.root);
@@ -440,15 +443,20 @@ export function createViteConfig(
 		},
 		resolve: {
 			dedupe: ["@emdash-cms/admin", "react", "react-dom"],
-			// Array form so more-specific entries are checked first.
-			// The styles.css alias must come before the package alias, otherwise
-			// Vite's prefix matching on "@emdash-cms/admin" would resolve
-			// "@emdash-cms/admin/styles.css" through the source directory.
-			// Regex (not string) so the `?url` variant — admin.astro imports the
-			// stylesheet as `?url` to keep it out of the page CSS graph — also
-			// resolves to dist; a string `find` only matches on a `/` or end
-			// boundary, so `styles.css?url` would slip through to the source alias.
+			// Admin and auth providers must share Lingui's React context. In pnpm
+			// installs, resolving each package from its importer can otherwise load
+			// separate copies even when the versions match.
 			alias: [
+				{ find: "@lingui/react", replacement: adminLinguiReactPath },
+				{ find: "@lingui/core", replacement: adminLinguiCorePath },
+				// Array form so more-specific entries are checked first. The styles.css
+				// alias must come before the package alias, otherwise Vite's prefix
+				// matching on "@emdash-cms/admin" would resolve
+				// "@emdash-cms/admin/styles.css" through the source directory.
+				// Regex (not string) so the `?url` variant — admin.astro imports the
+				// stylesheet as `?url` to keep it out of the page CSS graph — also
+				// resolves to dist; a string `find` only matches on a `/` or end
+				// boundary, so `styles.css?url` would slip through to the source alias.
 				{ find: ADMIN_STYLES_ALIAS, replacement: resolve(adminDistPath, "styles.css") },
 				{ find: "@emdash-cms/admin", replacement: useSource ? adminSourcePath : adminDistPath },
 				// `use-sync-external-store/shim` is a React <18 polyfill that ships