@bleedingdev/modern-js-plugin-i18n 3.2.0-ultramodern.98 → 3.4.0-ultramodern.0

package/dist/cjs/shared/detection.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __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");
     };
 })();
 (()=>{

package/dist/cjs/shared/localisedUrls.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __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");
     };
 })();
 (()=>{
@@ -23,24 +27,18 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    applyLocalisedUrlsToRoutes: ()=>applyLocalisedUrlsToRoutes,
-    normalisePathPattern: ()=>normalisePathPattern,
-    resolveLocalisedPath: ()=>resolveLocalisedPath,
-    resolveLocalisedUrlsConfig: ()=>resolveLocalisedUrlsConfig,
-    validateLocalisedUrls: ()=>validateLocalisedUrls
-});
 const LOCALE_PARAM_NAMES = new Set([
     'lang',
     'locale',
     'language'
 ]);
-const normalisePathPattern = (path)=>{
+const normaliseSlashes = (path)=>{
     const withoutDuplicateSlashes = path.replace(/\/+/g, '/');
     const withLeadingSlash = withoutDuplicateSlashes.startsWith('/') ? withoutDuplicateSlashes : `/${withoutDuplicateSlashes}`;
-    const withoutTrailingSlash = withLeadingSlash.length > 1 ? withLeadingSlash.replace(/\/+$/, '') : withLeadingSlash;
-    return withoutTrailingSlash.replace(/\[(.+?)\]/g, ':$1');
+    return withLeadingSlash.length > 1 ? withLeadingSlash.replace(/\/+$/, '') : withLeadingSlash;
 };
+const normalisePathPattern = (path)=>normaliseSlashes(path).replace(/\[(.+?)\]/g, ':$1');
+const normalisePathname = (pathname)=>normaliseSlashes(pathname);
 const normaliseRoutePath = (path)=>{
     const normalized = normalisePathPattern(path);
     return '/' === normalized ? '' : normalized.slice(1);
@@ -66,16 +64,12 @@ const getLeadingLocaleParam = (path)=>{
     return getLocaleParamSegment(segments[0] || '');
 };
 const resolveLocalisedUrlsConfig = (option)=>{
-    if (false === option) return {
-        enabled: false,
-        map: {}
-    };
-    if (option && 'object' == typeof option) return {
+    if (option && 'object' == typeof option && Object.keys(option).length > 0) return {
         enabled: true,
         map: option
     };
     return {
-        enabled: true,
+        enabled: false,
         map: {}
     };
 };
@@ -132,7 +126,7 @@ const transformLocalisedRoute = (route, parentCanonicalPath, parentLocalisedPath
     if (!localisedUrlEntry) return [
         baseRoute
     ];
-    return getLocalisedRoutePaths(canonicalPath, parentLocalisedPaths, languages, localisedUrlEntry).map((localisedPath, index)=>cloneRouteWithLocalisedPath(baseRoute, localisedPath, index));
+    return getLocalisedRoutePaths(canonicalPath, parentLocalisedPaths, languages, localisedUrlEntry).map((localisedPath, index)=>cloneRouteWithLocalisedPath(baseRoute, localisedPath, index, canonicalPath));
 };
 const legalRouteIdPart = (value)=>value.replace(/[^a-zA-Z0-9_$-]+/g, '_').replace(/^_+|_+$/g, '') || 'index';
 const suffixRouteIds = (route, suffix)=>{
@@ -147,13 +141,14 @@ const suffixRouteIds = (route, suffix)=>{
         } : {}
     };
 };
-const cloneRouteWithLocalisedPath = (route, path, index)=>{
+const cloneRouteWithLocalisedPath = (route, path, index, canonicalPath)=>{
     const leadingLocaleParam = getLeadingLocaleParam(route.path);
     const localisedPath = leadingLocaleParam ? normaliseRoutePath(`${leadingLocaleParam}/${path}`) : path;
     const routeWithPath = {
         ...route,
         path: localisedPath
     };
+    routeWithPath.modernCanonicalPath = canonicalPath;
     return 0 === index ? routeWithPath : suffixRouteIds(routeWithPath, legalRouteIdPart(localisedPath));
 };
 const applyLocalisedUrlsToRoutes = (routes, languages, localisedUrls)=>{
@@ -166,9 +161,13 @@ const applyLocalisedUrlsToRoutes = (routes, languages, localisedUrls)=>{
 };
 const escapeRegExp = (value)=>value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 const getParamName = (segment)=>segment.slice(1).replace(/\?$/, '');
+const compiledPathPatternCache = new Map();
 const compilePathPattern = (pattern)=>{
+    const normalizedPattern = normalisePathPattern(pattern);
+    const cached = compiledPathPatternCache.get(normalizedPattern);
+    if (cached) return cached;
     const names = [];
-    const segments = normalisePathPattern(pattern).split('/').filter(Boolean);
+    const segments = normalizedPattern.split('/').filter(Boolean);
     const source = segments.map((segment)=>{
         if (segment.startsWith(':')) {
             names.push(getParamName(segment));
@@ -181,19 +180,55 @@ const compilePathPattern = (pattern)=>{
         }
         return `/${escapeRegExp(segment)}`;
     }).join('');
-    return {
+    const compiled = {
         names,
         regexp: new RegExp(`^${source || '/'}$`)
     };
+    compiledPathPatternCache.set(normalizedPattern, compiled);
+    return compiled;
+};
+const getPatternSpecificity = (pattern)=>{
+    const segments = normalisePathPattern(pattern).split('/').filter(Boolean);
+    let staticSegments = 0;
+    let dynamicSegments = 0;
+    let splatSegments = 0;
+    for (const segment of segments)if ('*' === segment) splatSegments++;
+    else if (segment.startsWith(':')) dynamicSegments++;
+    else staticSegments++;
+    return {
+        staticSegments,
+        dynamicSegments,
+        splatSegments,
+        totalSegments: segments.length
+    };
+};
+const comparePatternSpecificity = (left, right)=>{
+    const a = getPatternSpecificity(left);
+    const b = getPatternSpecificity(right);
+    return b.staticSegments - a.staticSegments || b.totalSegments - a.totalSegments || a.splatSegments - b.splatSegments || a.dynamicSegments - b.dynamicSegments;
+};
+const sortPatternsBySpecificity = (patterns)=>patterns.map((pattern, index)=>({
+            pattern,
+            index
+        })).sort((left, right)=>comparePatternSpecificity(left.pattern.pattern, right.pattern.pattern) || left.index - right.index).map(({ pattern })=>pattern);
+const decodePathParam = (value)=>{
+    try {
+        return decodeURIComponent(value);
+    } catch  {
+        return null;
+    }
 };
 const matchPathPattern = (pathname, pattern)=>{
     const { names, regexp } = compilePathPattern(pattern);
-    const match = regexp.exec(normalisePathPattern(pathname));
+    const match = regexp.exec(normalisePathname(pathname));
     if (!match) return null;
-    return names.reduce((params, name, index)=>{
-        params[name] = decodeURIComponent(match[index + 1] || '');
-        return params;
-    }, {});
+    const params = {};
+    for(let index = 0; index < names.length; index++){
+        const decoded = decodePathParam(match[index + 1] || '');
+        if (null === decoded) return null;
+        params[names[index]] = decoded;
+    }
+    return params;
 };
 const buildPathFromPattern = (pattern, params)=>{
     const segments = normalisePathPattern(pattern).split('/').filter(Boolean);
@@ -208,26 +243,105 @@ const buildPathFromPattern = (pattern, params)=>{
     return `/${path}`;
 };
 const resolveLocalisedPath = (pathname, targetLanguage, languages, localisedUrls)=>{
-    const normalizedPathname = normalisePathPattern(pathname);
-    for (const localisedUrlEntry of Object.values(localisedUrls)){
+    const normalizedPathname = normalisePathname(pathname);
+    const canonicalCandidates = sortPatternsBySpecificity(Object.entries(localisedUrls).map(([canonicalPattern, localisedUrlEntry])=>({
+            pattern: canonicalPattern,
+            canonicalPattern,
+            localisedUrlEntry
+        })));
+    for (const { canonicalPattern, localisedUrlEntry } of canonicalCandidates){
         const targetPattern = localisedUrlEntry[targetLanguage];
-        if (targetPattern) for (const language of languages){
+        if (!targetPattern) continue;
+        const params = matchPathPattern(normalizedPathname, canonicalPattern);
+        if (params) return buildPathFromPattern(targetPattern, params);
+    }
+    const localisedCandidates = sortPatternsBySpecificity(Object.values(localisedUrls).flatMap((localisedUrlEntry)=>{
+        const targetPattern = localisedUrlEntry[targetLanguage];
+        if (!targetPattern) return [];
+        return languages.map((language)=>localisedUrlEntry[language]).filter((sourcePattern)=>Boolean(sourcePattern)).map((sourcePattern)=>({
+                pattern: sourcePattern,
+                sourcePattern,
+                targetPattern
+            }));
+    }));
+    for (const { sourcePattern, targetPattern } of localisedCandidates){
+        const params = matchPathPattern(normalizedPathname, sourcePattern);
+        if (params) return buildPathFromPattern(targetPattern, params);
+    }
+    return normalizedPathname;
+};
+const resolveCanonicalLocalisedPath = (pathname, languages, localisedUrls)=>{
+    const normalizedPathname = normalisePathname(pathname);
+    const canonicalCandidates = sortPatternsBySpecificity(Object.entries(localisedUrls).map(([canonicalPattern, localisedUrlEntry])=>({
+            pattern: canonicalPattern,
+            canonicalPattern,
+            localisedUrlEntry
+        })));
+    for (const { canonicalPattern, localisedUrlEntry } of canonicalCandidates){
+        const canonicalParams = matchPathPattern(normalizedPathname, canonicalPattern);
+        if (canonicalParams) return buildPathFromPattern(canonicalPattern, canonicalParams);
+        for (const language of languages){
             const sourcePattern = localisedUrlEntry[language];
             if (!sourcePattern) continue;
             const params = matchPathPattern(normalizedPathname, sourcePattern);
-            if (params) return buildPathFromPattern(targetPattern, params);
+            if (params) return buildPathFromPattern(canonicalPattern, params);
         }
     }
     return normalizedPathname;
 };
+const stripLanguagePrefix = (pathname, languages)=>{
+    const segments = pathname.split('/').filter(Boolean);
+    if (segments.length > 0 && languages.includes(segments[0])) return `/${segments.slice(1).join('/')}`;
+    return pathname || '/';
+};
+const localiseTargetPathname = (pathname, language, languages, localisedUrls)=>{
+    const pathWithoutLanguage = stripLanguagePrefix(pathname, languages);
+    const localisedUrlsConfig = resolveLocalisedUrlsConfig(localisedUrls);
+    const resolvedPath = localisedUrlsConfig.enabled ? resolveLocalisedPath(pathWithoutLanguage, language, languages, localisedUrlsConfig.map) : pathWithoutLanguage;
+    const resolvedSegments = resolvedPath.split('/').filter(Boolean);
+    return `/${[
+        language,
+        ...resolvedSegments
+    ].join('/')}`;
+};
+const canonicalTargetPathname = (pathname, languages, localisedUrls)=>{
+    const pathWithoutLanguage = stripLanguagePrefix(pathname, languages);
+    const localisedUrlsConfig = resolveLocalisedUrlsConfig(localisedUrls);
+    return localisedUrlsConfig.enabled ? resolveCanonicalLocalisedPath(pathWithoutLanguage, languages, localisedUrlsConfig.map) : pathWithoutLanguage;
+};
+__webpack_require__.d(__webpack_exports__, {}, {
+    applyLocalisedUrlsToRoutes: applyLocalisedUrlsToRoutes,
+    buildPathFromPattern: buildPathFromPattern,
+    canonicalTargetPathname: canonicalTargetPathname,
+    localiseTargetPathname: localiseTargetPathname,
+    matchPathPattern: matchPathPattern,
+    normalisePathPattern: normalisePathPattern,
+    normalisePathname: normalisePathname,
+    resolveCanonicalLocalisedPath: resolveCanonicalLocalisedPath,
+    resolveLocalisedPath: resolveLocalisedPath,
+    resolveLocalisedUrlsConfig: resolveLocalisedUrlsConfig,
+    validateLocalisedUrls: validateLocalisedUrls
+});
 exports.applyLocalisedUrlsToRoutes = __webpack_exports__.applyLocalisedUrlsToRoutes;
+exports.buildPathFromPattern = __webpack_exports__.buildPathFromPattern;
+exports.canonicalTargetPathname = __webpack_exports__.canonicalTargetPathname;
+exports.localiseTargetPathname = __webpack_exports__.localiseTargetPathname;
+exports.matchPathPattern = __webpack_exports__.matchPathPattern;
 exports.normalisePathPattern = __webpack_exports__.normalisePathPattern;
+exports.normalisePathname = __webpack_exports__.normalisePathname;
+exports.resolveCanonicalLocalisedPath = __webpack_exports__.resolveCanonicalLocalisedPath;
 exports.resolveLocalisedPath = __webpack_exports__.resolveLocalisedPath;
 exports.resolveLocalisedUrlsConfig = __webpack_exports__.resolveLocalisedUrlsConfig;
 exports.validateLocalisedUrls = __webpack_exports__.validateLocalisedUrls;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "applyLocalisedUrlsToRoutes",
+    "buildPathFromPattern",
+    "canonicalTargetPathname",
+    "localiseTargetPathname",
+    "matchPathPattern",
     "normalisePathPattern",
+    "normalisePathname",
+    "resolveCanonicalLocalisedPath",
     "resolveLocalisedPath",
     "resolveLocalisedUrlsConfig",
     "validateLocalisedUrls"

package/dist/cjs/shared/utils.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __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");
     };
 })();
 (()=>{
@@ -23,12 +27,6 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    getBackendOptions: ()=>getBackendOptions,
-    getEntryConfig: ()=>getEntryConfig,
-    getLocaleDetectionOptions: ()=>getLocaleDetectionOptions,
-    removeEntryConfigKey: ()=>removeEntryConfigKey
-});
 function getEntryConfig(entryName, config, entryKey) {
     const entryConfigMap = config[entryKey];
     return entryConfigMap?.[entryName];
@@ -63,6 +61,12 @@ function getBackendOptions(entryName, backend) {
     if ('backendOptionsByEntry' in fullConfig) return removeEntryConfigKey(fullConfig, 'backendOptionsByEntry');
     return backend;
 }
+__webpack_require__.d(__webpack_exports__, {
+    getBackendOptions: ()=>getBackendOptions,
+    getEntryConfig: ()=>getEntryConfig,
+    getLocaleDetectionOptions: ()=>getLocaleDetectionOptions,
+    removeEntryConfigKey: ()=>removeEntryConfigKey
+});
 exports.getBackendOptions = __webpack_exports__.getBackendOptions;
 exports.getEntryConfig = __webpack_exports__.getEntryConfig;
 exports.getLocaleDetectionOptions = __webpack_exports__.getLocaleDetectionOptions;

package/dist/esm/cli/index.mjs

@@ -1,38 +1,8 @@
 import { getPublicDirRoutePrefixes } from "@modern-js/server-core";
-import fs from "fs";
-import path from "path";
 import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "../shared/localisedUrls.mjs";
 import { getBackendOptions, getLocaleDetectionOptions } from "../shared/utils.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;
-}
+import { applyDetectedBackendPaths, detectLocalesDirectory } from "./locales.mjs";
+import "../runtime/types.mjs";
 const i18nPlugin = (options = {})=>({
         name: '@modern-js/plugin-i18n',
         setup: (api)=>{
@@ -42,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);

package/dist/esm/cli/locales.mjs

@@ -0,0 +1,80 @@
+import { getPublicDirRoutePrefixes, normalizePublicDir, normalizePublicDirPath } from "@modern-js/server-core";
+import fs from "fs";
+import path from "path";
+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/I18nLink.mjs

@@ -1,20 +1,13 @@
 import { jsx } from "react/jsx-runtime";
-import { useModernI18n } from "./context.mjs";
-import { useI18nRouterAdapter } from "./routerAdapter.mjs";
-import { buildLocalizedUrl } from "./utils.mjs";
+import { Link } from "./Link.mjs";
+let warnedDeprecation = false;
 const I18nLink = ({ to, children, ...props })=>{
-    const { Link, params, hasRouter } = useI18nRouterAdapter();
-    const { language, supportedLanguages, localisedUrls } = useModernI18n();
-    const currentLang = language;
-    const localizedTo = buildLocalizedUrl(to, currentLang, supportedLanguages, localisedUrls);
-    if ('development' === process.env.NODE_ENV && hasRouter && !params.lang) console.warn("I18nLink is being used outside of a :lang dynamic route context. This may cause unexpected behavior. Please ensure I18nLink is used within a route that has a :lang parameter.");
-    if (!hasRouter || !Link) return /*#__PURE__*/ jsx("a", {
-        href: localizedTo,
-        ...props,
-        children: children
-    });
+    if ('development' === process.env.NODE_ENV && !warnedDeprecation) {
+        warnedDeprecation = true;
+        console.warn("[plugin-i18n] I18nLink is deprecated. Import { Link } from '@modern-js/plugin-i18n/runtime' instead — it accepts the same language-agnostic `to` values.");
+    }
     return /*#__PURE__*/ jsx(Link, {
-        to: localizedTo,
+        to: to,
         ...props,
         children: children
     });