@modern-js/plugin-i18n 3.3.0 → 3.5.0

package/dist/cjs/cli/index.js

@@ -1,14 +1,5 @@
 "use strict";
 var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.n = (module)=>{
-        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
-        __webpack_require__.d(getter, {
-            a: getter
-        });
-        return getter;
-    };
-})();
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -40,43 +31,10 @@ __webpack_require__.d(__webpack_exports__, {
     default: ()=>cli,
     i18nPlugin: ()=>i18nPlugin
 });
-const external_fs_namespaceObject = require("fs");
-var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);
-const external_path_namespaceObject = require("path");
-var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const server_core_namespaceObject = require("@modern-js/server-core");
 const utils_js_namespaceObject = require("../shared/utils.js");
+const external_locales_js_namespaceObject = require("./locales.js");
 require("../runtime/types.js");
-function hasJsonFiles(dirPath) {
-    try {
-        if (!external_fs_default().existsSync(dirPath) || !external_fs_default().statSync(dirPath).isDirectory()) return false;
-        const entries = external_fs_default().readdirSync(dirPath);
-        for (const entry of entries){
-            const entryPath = external_path_default().join(dirPath, entry);
-            const stat = external_fs_default().statSync(entryPath);
-            if (stat.isFile() && entry.endsWith('.json')) return true;
-            if (stat.isDirectory()) {
-                if (hasJsonFiles(entryPath)) return true;
-            }
-        }
-        return false;
-    } catch  {
-        return false;
-    }
-}
-function detectLocalesDirectory(appDirectory, normalizedConfig) {
-    const rootLocalesPath = external_path_default().join(appDirectory, 'locales');
-    if (hasJsonFiles(rootLocalesPath)) return true;
-    const configPublicPath = external_path_default().join(appDirectory, 'config', 'public', 'locales');
-    if (hasJsonFiles(configPublicPath)) return true;
-    const publicDir = normalizedConfig?.server?.publicDir;
-    if (publicDir) {
-        const publicDirPath = Array.isArray(publicDir) ? publicDir[0] : publicDir;
-        const localesPath = external_path_default().isAbsolute(publicDirPath) ? external_path_default().join(publicDirPath, 'locales') : external_path_default().join(appDirectory, publicDirPath, 'locales');
-        if (hasJsonFiles(localesPath)) return true;
-    }
-    return false;
-}
 const i18nPlugin = (options = {})=>({
         name: '@modern-js/plugin-i18n',
         setup: (api)=>{
@@ -86,26 +44,16 @@ const i18nPlugin = (options = {})=>({
                 let backendOptions;
                 const { appDirectory } = api.getAppContext();
                 const normalizedConfig = api.getNormalizedConfig();
+                const detectedLocales = (0, external_locales_js_namespaceObject.detectLocalesDirectory)(appDirectory, normalizedConfig);
                 if (backend) {
                     const entryBackendOptions = (0, utils_js_namespaceObject.getBackendOptions)(entrypoint.entryName, backend);
-                    if (entryBackendOptions?.enabled === false) backendOptions = entryBackendOptions;
-                    else if (entryBackendOptions?.loadPath || entryBackendOptions?.addPath) backendOptions = {
+                    backendOptions = entryBackendOptions?.enabled === false ? entryBackendOptions : detectedLocales ? (0, external_locales_js_namespaceObject.applyDetectedBackendPaths)(entryBackendOptions, detectedLocales) : entryBackendOptions?.loadPath || entryBackendOptions?.addPath ? {
                         ...entryBackendOptions,
                         enabled: true
-                    };
-                    else if (entryBackendOptions?.enabled !== true) {
-                        const hasLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
-                        backendOptions = hasLocales ? {
-                            ...entryBackendOptions,
-                            enabled: true
-                        } : entryBackendOptions;
-                    } else backendOptions = entryBackendOptions;
-                } else {
-                    const hasLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
-                    if (hasLocales) backendOptions = (0, utils_js_namespaceObject.getBackendOptions)(entrypoint.entryName, {
-                        enabled: true
-                    });
-                }
+                    } : entryBackendOptions;
+                } else if (detectedLocales) backendOptions = (0, external_locales_js_namespaceObject.applyDetectedBackendPaths)((0, utils_js_namespaceObject.getBackendOptions)(entrypoint.entryName, {
+                    enabled: true
+                }), detectedLocales);
                 const { metaName } = api.getAppContext();
                 let extendedConfig = restOptions;
                 if (transformRuntimeConfig) extendedConfig = transformRuntimeConfig(restOptions, entrypoint);

package/dist/cjs/cli/locales.js

@@ -0,0 +1,132 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    applyDetectedBackendPaths: ()=>applyDetectedBackendPaths,
+    detectLocalesDirectory: ()=>detectLocalesDirectory
+});
+const external_fs_namespaceObject = require("fs");
+var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);
+const external_path_namespaceObject = require("path");
+var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+const server_core_namespaceObject = require("@modern-js/server-core");
+const LOCALES_RESOURCE_PATTERN = '{{lng}}/{{ns}}.json';
+function hasJsonFiles(dirPath) {
+    try {
+        if (!external_fs_default().existsSync(dirPath) || !external_fs_default().statSync(dirPath).isDirectory()) return false;
+        const entries = external_fs_default().readdirSync(dirPath);
+        for (const entry of entries){
+            const entryPath = external_path_default().join(dirPath, entry);
+            const stat = external_fs_default().statSync(entryPath);
+            if (stat.isFile() && entry.endsWith('.json')) return true;
+            if (stat.isDirectory() && hasJsonFiles(entryPath)) return true;
+        }
+        return false;
+    } catch  {
+        return false;
+    }
+}
+function toPosixPath(filePath) {
+    return filePath.split(external_path_default().sep).join(external_path_default().posix.sep);
+}
+function getPublicDirOutputPath(publicDir) {
+    return (0, server_core_namespaceObject.normalizePublicDirPath)(publicDir);
+}
+function buildDetectedLocalesDirectory(clientBasePath, serverBasePath, serverBasePathCandidates = [
+    serverBasePath
+]) {
+    const normalizedClientBasePath = clientBasePath.startsWith('/') ? clientBasePath : `/${clientBasePath}`;
+    const normalizedServerBasePath = toPosixPath(serverBasePath).replace(/\/$/, '');
+    const normalizedServerBasePathCandidates = Array.from(new Set(serverBasePathCandidates.map((candidate)=>toPosixPath(candidate).replace(/\/$/, ''))));
+    const serverLoadPaths = normalizedServerBasePathCandidates.map((candidate)=>`${candidate}/${LOCALES_RESOURCE_PATTERN}`);
+    const serverAddPaths = normalizedServerBasePathCandidates.map((candidate)=>`${candidate}/${LOCALES_RESOURCE_PATTERN}`);
+    return {
+        loadPath: `${normalizedClientBasePath}/${LOCALES_RESOURCE_PATTERN}`,
+        addPath: `${normalizedClientBasePath}/${LOCALES_RESOURCE_PATTERN}`,
+        serverLoadPath: `${normalizedServerBasePath}/${LOCALES_RESOURCE_PATTERN}`,
+        serverAddPath: `${normalizedServerBasePath}/${LOCALES_RESOURCE_PATTERN}`,
+        serverLoadPaths,
+        serverAddPaths
+    };
+}
+function detectLocalesDirectory(appDirectory, normalizedConfig) {
+    const publicDirs = (0, server_core_namespaceObject.normalizePublicDir)(normalizedConfig?.server?.publicDir);
+    const publicDirPrefixes = (0, server_core_namespaceObject.getPublicDirRoutePrefixes)(normalizedConfig?.server?.publicDir);
+    for(let index = 0; index < publicDirs.length; index++){
+        const publicDir = publicDirs[index];
+        if (external_path_default().isAbsolute(publicDir)) continue;
+        const publicDirPath = external_path_default().join(appDirectory, publicDir);
+        const publicDirPrefix = publicDirPrefixes[index] || `/${(0, server_core_namespaceObject.normalizePublicDirPath)(publicDir)}`;
+        const publicDirOutputPath = getPublicDirOutputPath(publicDir);
+        if ('locales' === external_path_default().basename((0, server_core_namespaceObject.normalizePublicDirPath)(publicDir)) && hasJsonFiles(publicDirPath)) return buildDetectedLocalesDirectory(publicDirPrefix, `./${publicDirOutputPath}`);
+        const localesPath = external_path_default().join(publicDirPath, 'locales');
+        if (hasJsonFiles(localesPath)) return buildDetectedLocalesDirectory(`${publicDirPrefix}/locales`, `./${publicDirOutputPath}/locales`);
+    }
+    const configPublicPath = external_path_default().join(appDirectory, 'config', 'public', 'locales');
+    if (hasJsonFiles(configPublicPath)) return buildDetectedLocalesDirectory('/locales', './public/locales', [
+        './config/public/locales',
+        './public/locales'
+    ]);
+    const rootLocalesPath = external_path_default().join(appDirectory, 'locales');
+    if (hasJsonFiles(rootLocalesPath)) return buildDetectedLocalesDirectory('/locales', './locales');
+}
+function applyDetectedBackendPaths(backendOptions, detectedLocales) {
+    if (!detectedLocales) return backendOptions;
+    const backendWithDetectedPaths = {
+        ...backendOptions,
+        enabled: true,
+        loadPath: backendOptions.loadPath ?? detectedLocales.loadPath,
+        addPath: backendOptions.addPath ?? detectedLocales.addPath,
+        serverLoadPath: backendOptions.serverLoadPath ?? detectedLocales.serverLoadPath,
+        serverLoadPaths: backendOptions.serverLoadPath || backendOptions.serverLoadPaths ? backendOptions.serverLoadPaths : detectedLocales.serverLoadPaths,
+        serverAddPath: backendOptions.serverAddPath ?? detectedLocales.serverAddPath,
+        serverAddPaths: backendOptions.serverAddPath || backendOptions.serverAddPaths ? backendOptions.serverAddPaths : detectedLocales.serverAddPaths,
+        _detectedLoadPath: detectedLocales.loadPath,
+        _detectedAddPath: detectedLocales.addPath
+    };
+    return backendWithDetectedPaths;
+}
+exports.applyDetectedBackendPaths = __webpack_exports__.applyDetectedBackendPaths;
+exports.detectLocalesDirectory = __webpack_exports__.detectLocalesDirectory;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "applyDetectedBackendPaths",
+    "detectLocalesDirectory"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/i18n/backend/defaults.js

@@ -32,8 +32,6 @@ const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
     addPath: '/locales/{{lng}}/{{ns}}.json'
 };
 function convertPath(path) {
-    if (!path) return path;
-    if (path.startsWith('/')) return `${window.__assetPrefix__ || ''}${path}`;
     return path;
 }
 function convertBackendOptions(options) {
@@ -41,6 +39,12 @@ function convertBackendOptions(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);
     if (converted.addPath) converted.addPath = convertPath(converted.addPath);
     return converted;

package/dist/cjs/runtime/i18n/backend/defaults.node.js

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -27,6 +36,12 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    DEFAULT_I18NEXT_BACKEND_OPTIONS: ()=>DEFAULT_I18NEXT_BACKEND_OPTIONS,
+    convertBackendOptions: ()=>convertBackendOptions
+});
+const external_fs_namespaceObject = require("fs");
+var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);
 const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
     loadPath: './locales/{{lng}}/{{ns}}.json',
     addPath: './locales/{{lng}}/{{ns}}.json'
@@ -36,20 +51,45 @@ function convertPath(path) {
     if (path.startsWith('/')) return `.${path}`;
     return path;
 }
+function shouldUseServerPath(currentPath, detectedPath) {
+    return !detectedPath || currentPath === detectedPath;
+}
+function getResourceBasePath(resourcePath) {
+    const markerIndex = resourcePath.indexOf('{{lng}}');
+    if (markerIndex < 0) return resourcePath;
+    return resourcePath.slice(0, markerIndex).replace(/[\\/]+$/, '');
+}
+function pathExists(resourcePath) {
+    try {
+        return external_fs_default().existsSync(getResourceBasePath(resourcePath));
+    } catch  {
+        return false;
+    }
+}
+function getServerPath(pathCandidates, fallbackPath) {
+    const candidates = Array.from(new Set([
+        ...pathCandidates || [],
+        fallbackPath
+    ].filter(Boolean)));
+    return candidates.find(pathExists) || candidates[0];
+}
 function convertBackendOptions(options) {
     if (!options) return options;
     const converted = {
         ...options
     };
-    if (converted.loadPath) converted.loadPath = convertPath(converted.loadPath);
-    if (converted.addPath) converted.addPath = convertPath(converted.addPath);
+    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.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;
 }
-__webpack_require__.d(__webpack_exports__, {
-    convertBackendOptions: ()=>convertBackendOptions
-}, {
-    DEFAULT_I18NEXT_BACKEND_OPTIONS: DEFAULT_I18NEXT_BACKEND_OPTIONS
-});
 exports.DEFAULT_I18NEXT_BACKEND_OPTIONS = __webpack_exports__.DEFAULT_I18NEXT_BACKEND_OPTIONS;
 exports.convertBackendOptions = __webpack_exports__.convertBackendOptions;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/esm/cli/index.mjs

@@ -1,38 +1,7 @@
-import fs from "fs";
-import path from "path";
 import { getPublicDirRoutePrefixes } from "@modern-js/server-core";
 import { getBackendOptions, getLocaleDetectionOptions } from "../shared/utils.mjs";
+import { applyDetectedBackendPaths, detectLocalesDirectory } from "./locales.mjs";
 import "../runtime/types.mjs";
-function hasJsonFiles(dirPath) {
-    try {
-        if (!fs.existsSync(dirPath) || !fs.statSync(dirPath).isDirectory()) return false;
-        const entries = fs.readdirSync(dirPath);
-        for (const entry of entries){
-            const entryPath = path.join(dirPath, entry);
-            const stat = fs.statSync(entryPath);
-            if (stat.isFile() && entry.endsWith('.json')) return true;
-            if (stat.isDirectory()) {
-                if (hasJsonFiles(entryPath)) return true;
-            }
-        }
-        return false;
-    } catch  {
-        return false;
-    }
-}
-function detectLocalesDirectory(appDirectory, normalizedConfig) {
-    const rootLocalesPath = path.join(appDirectory, 'locales');
-    if (hasJsonFiles(rootLocalesPath)) return true;
-    const configPublicPath = path.join(appDirectory, 'config', 'public', 'locales');
-    if (hasJsonFiles(configPublicPath)) return true;
-    const publicDir = normalizedConfig?.server?.publicDir;
-    if (publicDir) {
-        const publicDirPath = Array.isArray(publicDir) ? publicDir[0] : publicDir;
-        const localesPath = path.isAbsolute(publicDirPath) ? path.join(publicDirPath, 'locales') : path.join(appDirectory, publicDirPath, 'locales');
-        if (hasJsonFiles(localesPath)) return true;
-    }
-    return false;
-}
 const i18nPlugin = (options = {})=>({
         name: '@modern-js/plugin-i18n',
         setup: (api)=>{
@@ -42,26 +11,16 @@ const i18nPlugin = (options = {})=>({
                 let backendOptions;
                 const { appDirectory } = api.getAppContext();
                 const normalizedConfig = api.getNormalizedConfig();
+                const detectedLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
                 if (backend) {
                     const entryBackendOptions = getBackendOptions(entrypoint.entryName, backend);
-                    if (entryBackendOptions?.enabled === false) backendOptions = entryBackendOptions;
-                    else if (entryBackendOptions?.loadPath || entryBackendOptions?.addPath) backendOptions = {
+                    backendOptions = entryBackendOptions?.enabled === false ? entryBackendOptions : detectedLocales ? applyDetectedBackendPaths(entryBackendOptions, detectedLocales) : entryBackendOptions?.loadPath || entryBackendOptions?.addPath ? {
                         ...entryBackendOptions,
                         enabled: true
-                    };
-                    else if (entryBackendOptions?.enabled !== true) {
-                        const hasLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
-                        backendOptions = hasLocales ? {
-                            ...entryBackendOptions,
-                            enabled: true
-                        } : entryBackendOptions;
-                    } else backendOptions = entryBackendOptions;
-                } else {
-                    const hasLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
-                    if (hasLocales) backendOptions = getBackendOptions(entrypoint.entryName, {
-                        enabled: true
-                    });
-                }
+                    } : entryBackendOptions;
+                } else if (detectedLocales) backendOptions = applyDetectedBackendPaths(getBackendOptions(entrypoint.entryName, {
+                    enabled: true
+                }), detectedLocales);
                 const { metaName } = api.getAppContext();
                 let extendedConfig = restOptions;
                 if (transformRuntimeConfig) extendedConfig = transformRuntimeConfig(restOptions, entrypoint);

package/dist/esm/cli/locales.mjs

@@ -0,0 +1,80 @@
+import fs from "fs";
+import path from "path";
+import { getPublicDirRoutePrefixes, normalizePublicDir, normalizePublicDirPath } from "@modern-js/server-core";
+const LOCALES_RESOURCE_PATTERN = '{{lng}}/{{ns}}.json';
+function hasJsonFiles(dirPath) {
+    try {
+        if (!fs.existsSync(dirPath) || !fs.statSync(dirPath).isDirectory()) return false;
+        const entries = fs.readdirSync(dirPath);
+        for (const entry of entries){
+            const entryPath = path.join(dirPath, entry);
+            const stat = fs.statSync(entryPath);
+            if (stat.isFile() && entry.endsWith('.json')) return true;
+            if (stat.isDirectory() && hasJsonFiles(entryPath)) return true;
+        }
+        return false;
+    } catch  {
+        return false;
+    }
+}
+function toPosixPath(filePath) {
+    return filePath.split(path.sep).join(path.posix.sep);
+}
+function getPublicDirOutputPath(publicDir) {
+    return normalizePublicDirPath(publicDir);
+}
+function buildDetectedLocalesDirectory(clientBasePath, serverBasePath, serverBasePathCandidates = [
+    serverBasePath
+]) {
+    const normalizedClientBasePath = clientBasePath.startsWith('/') ? clientBasePath : `/${clientBasePath}`;
+    const normalizedServerBasePath = toPosixPath(serverBasePath).replace(/\/$/, '');
+    const normalizedServerBasePathCandidates = Array.from(new Set(serverBasePathCandidates.map((candidate)=>toPosixPath(candidate).replace(/\/$/, ''))));
+    const serverLoadPaths = normalizedServerBasePathCandidates.map((candidate)=>`${candidate}/${LOCALES_RESOURCE_PATTERN}`);
+    const serverAddPaths = normalizedServerBasePathCandidates.map((candidate)=>`${candidate}/${LOCALES_RESOURCE_PATTERN}`);
+    return {
+        loadPath: `${normalizedClientBasePath}/${LOCALES_RESOURCE_PATTERN}`,
+        addPath: `${normalizedClientBasePath}/${LOCALES_RESOURCE_PATTERN}`,
+        serverLoadPath: `${normalizedServerBasePath}/${LOCALES_RESOURCE_PATTERN}`,
+        serverAddPath: `${normalizedServerBasePath}/${LOCALES_RESOURCE_PATTERN}`,
+        serverLoadPaths,
+        serverAddPaths
+    };
+}
+function detectLocalesDirectory(appDirectory, normalizedConfig) {
+    const publicDirs = normalizePublicDir(normalizedConfig?.server?.publicDir);
+    const publicDirPrefixes = getPublicDirRoutePrefixes(normalizedConfig?.server?.publicDir);
+    for(let index = 0; index < publicDirs.length; index++){
+        const publicDir = publicDirs[index];
+        if (path.isAbsolute(publicDir)) continue;
+        const publicDirPath = path.join(appDirectory, publicDir);
+        const publicDirPrefix = publicDirPrefixes[index] || `/${normalizePublicDirPath(publicDir)}`;
+        const publicDirOutputPath = getPublicDirOutputPath(publicDir);
+        if ('locales' === path.basename(normalizePublicDirPath(publicDir)) && hasJsonFiles(publicDirPath)) return buildDetectedLocalesDirectory(publicDirPrefix, `./${publicDirOutputPath}`);
+        const localesPath = path.join(publicDirPath, 'locales');
+        if (hasJsonFiles(localesPath)) return buildDetectedLocalesDirectory(`${publicDirPrefix}/locales`, `./${publicDirOutputPath}/locales`);
+    }
+    const configPublicPath = path.join(appDirectory, 'config', 'public', 'locales');
+    if (hasJsonFiles(configPublicPath)) return buildDetectedLocalesDirectory('/locales', './public/locales', [
+        './config/public/locales',
+        './public/locales'
+    ]);
+    const rootLocalesPath = path.join(appDirectory, 'locales');
+    if (hasJsonFiles(rootLocalesPath)) return buildDetectedLocalesDirectory('/locales', './locales');
+}
+function applyDetectedBackendPaths(backendOptions, detectedLocales) {
+    if (!detectedLocales) return backendOptions;
+    const backendWithDetectedPaths = {
+        ...backendOptions,
+        enabled: true,
+        loadPath: backendOptions.loadPath ?? detectedLocales.loadPath,
+        addPath: backendOptions.addPath ?? detectedLocales.addPath,
+        serverLoadPath: backendOptions.serverLoadPath ?? detectedLocales.serverLoadPath,
+        serverLoadPaths: backendOptions.serverLoadPath || backendOptions.serverLoadPaths ? backendOptions.serverLoadPaths : detectedLocales.serverLoadPaths,
+        serverAddPath: backendOptions.serverAddPath ?? detectedLocales.serverAddPath,
+        serverAddPaths: backendOptions.serverAddPath || backendOptions.serverAddPaths ? backendOptions.serverAddPaths : detectedLocales.serverAddPaths,
+        _detectedLoadPath: detectedLocales.loadPath,
+        _detectedAddPath: detectedLocales.addPath
+    };
+    return backendWithDetectedPaths;
+}
+export { applyDetectedBackendPaths, detectLocalesDirectory };

package/dist/esm/runtime/i18n/backend/defaults.mjs

@@ -3,8 +3,6 @@ const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
     addPath: '/locales/{{lng}}/{{ns}}.json'
 };
 function convertPath(path) {
-    if (!path) return path;
-    if (path.startsWith('/')) return `${window.__assetPrefix__ || ''}${path}`;
     return path;
 }
 function convertBackendOptions(options) {
@@ -12,6 +10,12 @@ function convertBackendOptions(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);
     if (converted.addPath) converted.addPath = convertPath(converted.addPath);
     return converted;

package/dist/esm/runtime/i18n/backend/defaults.node.mjs

@@ -1,3 +1,4 @@
+import fs from "fs";
 const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
     loadPath: './locales/{{lng}}/{{ns}}.json',
     addPath: './locales/{{lng}}/{{ns}}.json'
@@ -7,13 +8,43 @@ function convertPath(path) {
     if (path.startsWith('/')) return `.${path}`;
     return path;
 }
+function shouldUseServerPath(currentPath, detectedPath) {
+    return !detectedPath || currentPath === detectedPath;
+}
+function getResourceBasePath(resourcePath) {
+    const markerIndex = resourcePath.indexOf('{{lng}}');
+    if (markerIndex < 0) return resourcePath;
+    return resourcePath.slice(0, markerIndex).replace(/[\\/]+$/, '');
+}
+function pathExists(resourcePath) {
+    try {
+        return fs.existsSync(getResourceBasePath(resourcePath));
+    } catch  {
+        return false;
+    }
+}
+function getServerPath(pathCandidates, fallbackPath) {
+    const candidates = Array.from(new Set([
+        ...pathCandidates || [],
+        fallbackPath
+    ].filter(Boolean)));
+    return candidates.find(pathExists) || candidates[0];
+}
 function convertBackendOptions(options) {
     if (!options) return options;
     const converted = {
         ...options
     };
-    if (converted.loadPath) converted.loadPath = convertPath(converted.loadPath);
-    if (converted.addPath) converted.addPath = convertPath(converted.addPath);
+    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.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;
 }
 export { DEFAULT_I18NEXT_BACKEND_OPTIONS, convertBackendOptions };

package/dist/esm/runtime/utils.mjs

@@ -3,7 +3,7 @@ import { getGlobalBasename } from "@modern-js/runtime/context";
 import { __webpack_require__ } from "../rslib-runtime.mjs";
 import * as __rspack_external__modern_js_runtime_router_2dfd0c78 from "@modern-js/runtime/router";
 __webpack_require__.add({
-    "@modern-js/runtime/router?644e" (module) {
+    7296 (module) {
         module.exports = __rspack_external__modern_js_runtime_router_2dfd0c78;
     }
 });
@@ -56,7 +56,7 @@ const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>{
 };
 const useRouterHooks = ()=>{
     try {
-        const { useLocation, useNavigate, useParams } = __webpack_require__("@modern-js/runtime/router?644e");
+        const { useLocation, useNavigate, useParams } = __webpack_require__(7296);
         return {
             navigate: useNavigate(),
             location: useLocation(),

package/dist/esm-node/cli/index.mjs

@@ -1,39 +1,8 @@
 import "node:module";
-import fs from "fs";
-import path from "path";
 import { getPublicDirRoutePrefixes } from "@modern-js/server-core";
 import { getBackendOptions, getLocaleDetectionOptions } from "../shared/utils.mjs";
+import { applyDetectedBackendPaths, detectLocalesDirectory } from "./locales.mjs";
 import "../runtime/types.mjs";
-function hasJsonFiles(dirPath) {
-    try {
-        if (!fs.existsSync(dirPath) || !fs.statSync(dirPath).isDirectory()) return false;
-        const entries = fs.readdirSync(dirPath);
-        for (const entry of entries){
-            const entryPath = path.join(dirPath, entry);
-            const stat = fs.statSync(entryPath);
-            if (stat.isFile() && entry.endsWith('.json')) return true;
-            if (stat.isDirectory()) {
-                if (hasJsonFiles(entryPath)) return true;
-            }
-        }
-        return false;
-    } catch  {
-        return false;
-    }
-}
-function detectLocalesDirectory(appDirectory, normalizedConfig) {
-    const rootLocalesPath = path.join(appDirectory, 'locales');
-    if (hasJsonFiles(rootLocalesPath)) return true;
-    const configPublicPath = path.join(appDirectory, 'config', 'public', 'locales');
-    if (hasJsonFiles(configPublicPath)) return true;
-    const publicDir = normalizedConfig?.server?.publicDir;
-    if (publicDir) {
-        const publicDirPath = Array.isArray(publicDir) ? publicDir[0] : publicDir;
-        const localesPath = path.isAbsolute(publicDirPath) ? path.join(publicDirPath, 'locales') : path.join(appDirectory, publicDirPath, 'locales');
-        if (hasJsonFiles(localesPath)) return true;
-    }
-    return false;
-}
 const i18nPlugin = (options = {})=>({
         name: '@modern-js/plugin-i18n',
         setup: (api)=>{
@@ -43,26 +12,16 @@ const i18nPlugin = (options = {})=>({
                 let backendOptions;
                 const { appDirectory } = api.getAppContext();
                 const normalizedConfig = api.getNormalizedConfig();
+                const detectedLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
                 if (backend) {
                     const entryBackendOptions = getBackendOptions(entrypoint.entryName, backend);
-                    if (entryBackendOptions?.enabled === false) backendOptions = entryBackendOptions;
-                    else if (entryBackendOptions?.loadPath || entryBackendOptions?.addPath) backendOptions = {
+                    backendOptions = entryBackendOptions?.enabled === false ? entryBackendOptions : detectedLocales ? applyDetectedBackendPaths(entryBackendOptions, detectedLocales) : entryBackendOptions?.loadPath || entryBackendOptions?.addPath ? {
                         ...entryBackendOptions,
                         enabled: true
-                    };
-                    else if (entryBackendOptions?.enabled !== true) {
-                        const hasLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
-                        backendOptions = hasLocales ? {
-                            ...entryBackendOptions,
-                            enabled: true
-                        } : entryBackendOptions;
-                    } else backendOptions = entryBackendOptions;
-                } else {
-                    const hasLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
-                    if (hasLocales) backendOptions = getBackendOptions(entrypoint.entryName, {
-                        enabled: true
-                    });
-                }
+                    } : entryBackendOptions;
+                } else if (detectedLocales) backendOptions = applyDetectedBackendPaths(getBackendOptions(entrypoint.entryName, {
+                    enabled: true
+                }), detectedLocales);
                 const { metaName } = api.getAppContext();
                 let extendedConfig = restOptions;
                 if (transformRuntimeConfig) extendedConfig = transformRuntimeConfig(restOptions, entrypoint);