revert i18n manifest

withastro · Jan 23, 2024 · 054460e · 054460e
1 parent c8f614b
commit 054460e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
@@ -1,4 +1,5 @@
 import type {
+	Locales,
 	AstroConfig,
 	MiddlewareHandler,
 	RouteData,
@@ -54,10 +55,17 @@ export type SSRManifest = {
 	componentMetadata: SSRResult['componentMetadata'];
 	pageModule?: SinglePageBuiltModule;
 	pageMap?: Map<ComponentPath, ImportComponentInstance>;
-	i18n: AstroConfig["i18n"];
+	i18n: SSRManifestI18n | undefined;
 	middleware: MiddlewareHandler;
 };
 
+export type SSRManifestI18n = {
+	fallback?: Record<string, string>;
+	routing?: RoutingStrategies;
+	locales: Locales;
+	defaultLocale: string;
+};
+
 export type SerializedSSRManifest = Omit<
 	SSRManifest,
 	'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'clientDirectives'

diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -5,6 +5,7 @@ import { type Plugin as VitePlugin } from 'vite';
 import { runHookBuildSsr } from '../../../integrations/index.js';
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from '../../../vite-plugin-scripts/index.js';
 import type {
+	SSRManifestI18n,
 	SerializedRouteInfo,
 	SerializedSSRManifest,
 } from '../../app/types.js';
@@ -235,6 +236,16 @@ function buildManifest(
 		// Set this to an empty string so that the runtime knows not to try and load this.
 		entryModules[BEFORE_HYDRATION_SCRIPT_ID] = '';
 	}
+	let i18nManifest: SSRManifestI18n | undefined = undefined;
+	if (settings.config.i18n) {
+		i18nManifest = {
+			fallback: settings.config.i18n.fallback,
+			routing: settings.config.i18n.routing,
+			locales: settings.config.i18n.locales,
+			defaultLocale: settings.config.i18n.defaultLocale,
+		};
+	}
+
 	return {
 		adapterName: opts.settings.adapter?.name ?? '',
 		routes,
@@ -248,7 +259,7 @@ function buildManifest(
 		clientDirectives: Array.from(settings.clientDirectives),
 		entryModules,
 		assets: staticFiles.map(prefixAssetPath),
-		i18n: settings.config.i18n,
+		i18n: i18nManifest,
 		buildFormat: settings.config.build.format,
 	};
 }
diff --git a/packages/astro/src/vite-plugin-astro-server/plugin.ts b/packages/astro/src/vite-plugin-astro-server/plugin.ts
@@ -1,6 +1,7 @@
 import type fs from 'node:fs';
 import type * as vite from 'vite';
 import type { AstroSettings, ManifestData, SSRManifest } from '../@types/astro.js';
+import type { SSRManifestI18n } from '../core/app/types.js';
 import { patchOverlay } from '../core/errors/overlay.js';
 import type { Logger } from '../core/logger/core.js';
 import { createViteLoader } from '../core/module-loader/index.js';
@@ -113,6 +114,15 @@ export default function createVitePluginAstroServer({
  * @param renderers
  */
 export function createDevelopmentManifest(settings: AstroSettings): SSRManifest {
+	let i18nManifest: SSRManifestI18n | undefined = undefined;
+	if (settings.config.i18n) {
+		i18nManifest = {
+			fallback: settings.config.i18n.fallback,
+			routing: settings.config.i18n.routing,
+			defaultLocale: settings.config.i18n.defaultLocale,
+			locales: settings.config.i18n.locales,
+		};
+	}
 	return {
 		trailingSlash: settings.config.trailingSlash,
 		buildFormat: settings.config.build.format,
@@ -129,7 +139,7 @@ export function createDevelopmentManifest(settings: AstroSettings): SSRManifest
 			? new URL(settings.config.base, settings.config.site).toString()
 			: settings.config.site,
 		componentMetadata: new Map(),
-		i18n: settings.config.i18n,
+		i18n: i18nManifest,
 		middleware(_, next) {
 			return next()
 		}