Merge pull request #859 from eintim/main

fix(i18n): support both string and object forms of i18n.sourceLocale

Author: manfredsteyer

libs/native-federation/src/builders/build/builder.ts

@@ -154,10 +154,15 @@ export async function* runBuilder(
 
   const localeFilter = getLocaleFilter(options, runServer);
 
+  const sourceLocaleSegment =
+    typeof i18n?.sourceLocale === 'string'
+      ? i18n.sourceLocale
+      : i18n?.sourceLocale?.subPath || i18n?.sourceLocale?.code || '';
+
   const browserOutputPath = path.join(
     outputOptions.base,
     outputOptions.browser,
-    options.localize ? i18n?.sourceLocale || '' : ''
+    options.localize ? sourceLocaleSegment : ''
   );
 
   const differentDevServerOutputPath =

libs/native-federation/src/utils/i18n.ts

@@ -10,10 +10,16 @@ export type WorkspaceConfig = {
 };
 
 export type I18nConfig = {
-  sourceLocale: string;
+  sourceLocale: string | SourceLocaleObject;
   locales: Record<string, string>;
 };
 
+export type SourceLocaleObject = {
+  code: string;
+  baseHref?: string;
+  subPath?: string;
+};
+
 export async function getI18nConfig(
   context: BuilderContext
 ): Promise<I18nConfig | undefined> {
@@ -52,7 +58,10 @@ export async function translateFederationArtefacts(
 
   const targetLocales = locales.join(' ');
 
-  const sourceLocale = i18n.sourceLocale;
+  const sourceLocale =
+    typeof i18n.sourceLocale === 'string'
+      ? i18n.sourceLocale
+      : i18n.sourceLocale.code;
 
   const translationOutPath = path.join(outputPath, 'browser', '{{LOCALE}}');