@modern-js/plugin-i18n 3.3.0 → 3.5.0

package/src/runtime/i18n/backend/defaults.node.ts

@@ -1,3 +1,5 @@
+import fs from 'fs';
+
 export const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
   loadPath: './locales/{{lng}}/{{ns}}.json',
   addPath: './locales/{{lng}}/{{ns}}.json',
@@ -14,18 +16,85 @@ function convertPath(path: string | undefined): string | undefined {
   return path;
 }
 
-export function convertBackendOptions<
-  T extends { loadPath?: string; addPath?: string },
->(options: T): T {
+interface InternalBackendPathOptions {
+  loadPath?: string;
+  addPath?: string;
+  serverLoadPath?: string;
+  serverAddPath?: string;
+  serverLoadPaths?: string[];
+  serverAddPaths?: string[];
+  _detectedLoadPath?: string;
+  _detectedAddPath?: string;
+}
+
+function shouldUseServerPath(
+  currentPath: string | undefined,
+  detectedPath: string | undefined,
+): boolean {
+  return !detectedPath || currentPath === detectedPath;
+}
+
+function getResourceBasePath(resourcePath: string): string {
+  const markerIndex = resourcePath.indexOf('{{lng}}');
+  if (markerIndex < 0) {
+    return resourcePath;
+  }
+  return resourcePath.slice(0, markerIndex).replace(/[\\/]+$/, '');
+}
+
+function pathExists(resourcePath: string): boolean {
+  try {
+    return fs.existsSync(getResourceBasePath(resourcePath));
+  } catch {
+    return false;
+  }
+}
+
+function getServerPath(
+  pathCandidates: string[] | undefined,
+  fallbackPath: string | undefined,
+): string | undefined {
+  const candidates = Array.from(
+    new Set([...(pathCandidates || []), fallbackPath].filter(Boolean)),
+  ) as string[];
+
+  return candidates.find(pathExists) || candidates[0];
+}
+
+export function convertBackendOptions<T extends InternalBackendPathOptions>(
+  options: T,
+): T {
   if (!options) {
     return options;
   }
   const converted = { ...options };
-  if (converted.loadPath) {
+  if (
+    (converted.serverLoadPath || converted.serverLoadPaths) &&
+    shouldUseServerPath(converted.loadPath, converted._detectedLoadPath)
+  ) {
+    converted.loadPath = getServerPath(
+      converted.serverLoadPaths,
+      converted.serverLoadPath,
+    );
+  } else if (converted.loadPath) {
     converted.loadPath = convertPath(converted.loadPath);
   }
-  if (converted.addPath) {
+  if (
+    (converted.serverAddPath || converted.serverAddPaths) &&
+    shouldUseServerPath(converted.addPath, converted._detectedAddPath)
+  ) {
+    converted.addPath = getServerPath(
+      converted.serverAddPaths,
+      converted.serverAddPath,
+    );
+  } else if (converted.addPath) {
     converted.addPath = convertPath(converted.addPath);
   }
+  delete converted.serverLoadPath;
+  delete converted.serverAddPath;
+  delete converted.serverLoadPaths;
+  delete converted.serverAddPaths;
+  delete converted._detectedLoadPath;
+  delete converted._detectedAddPath;
   return converted;
 }

package/src/runtime/i18n/backend/defaults.ts

@@ -3,30 +3,34 @@ export const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
   addPath: '/locales/{{lng}}/{{ns}}.json',
 };
 
-declare global {
-  interface Window {
-    __assetPrefix__?: string;
-  }
-}
-
 function convertPath(path: string | undefined): string | undefined {
-  if (!path) {
-    return path;
-  }
-  // If it's an absolute path (starts with /), convert to relative path
-  if (path.startsWith('/')) {
-    return `${window.__assetPrefix__ || ''}${path}`;
-  }
   return path;
 }
 
-export function convertBackendOptions<
-  T extends { loadPath?: string; addPath?: string },
->(options: T): T {
+interface InternalBackendPathOptions {
+  loadPath?: string;
+  addPath?: string;
+  serverLoadPath?: string;
+  serverAddPath?: string;
+  serverLoadPaths?: string[];
+  serverAddPaths?: string[];
+  _detectedLoadPath?: string;
+  _detectedAddPath?: string;
+}
+
+export function convertBackendOptions<T extends InternalBackendPathOptions>(
+  options: T,
+): T {
   if (!options) {
     return options;
   }
   const converted = { ...options };
+  delete converted.serverLoadPath;
+  delete converted.serverAddPath;
+  delete converted.serverLoadPaths;
+  delete converted.serverAddPaths;
+  delete converted._detectedLoadPath;
+  delete converted._detectedAddPath;
   if (converted.loadPath) {
     converted.loadPath = convertPath(converted.loadPath);
   }

package/src/shared/type.ts

@@ -71,6 +71,26 @@ export interface BaseBackendOptions {
   enabled?: boolean;
   loadPath?: string;
   addPath?: string;
+  /**
+   * Internal file-system path used by the Node.js FS backend.
+   * Browser HTTP backend keeps using `loadPath`.
+   */
+  serverLoadPath?: string;
+  /**
+   * Internal file-system path candidates used by the Node.js FS backend.
+   * The first existing path under current cwd will be used.
+   */
+  serverLoadPaths?: string[];
+  /**
+   * Internal file-system path used by the Node.js FS backend.
+   * Browser HTTP backend keeps using `addPath`.
+   */
+  serverAddPath?: string;
+  /**
+   * Internal file-system path candidates used by the Node.js FS backend.
+   * The first existing path under current cwd will be used.
+   */
+  serverAddPaths?: string[];
   /**
    * Cache hit mode for chained backend (only effective when both `loadPath` and `sdk` are provided)
    *