@bleedingdev/modern-js-plugin-i18n 3.9.0-ultramodern.8 → 3.9.3-ultramodern.1

package/dist/cjs/cli/index.js

@@ -32,8 +32,11 @@ __webpack_require__.d(__webpack_exports__, {
     i18nPlugin: ()=>i18nPlugin
 });
 const server_core_namespaceObject = require("@modern-js/server-core");
+const utils_namespaceObject = require("@modern-js/utils");
+const urlStrategy_js_namespaceObject = require("../shared/urlStrategy.js");
 const utils_js_namespaceObject = require("../shared/utils.js");
 const external_locales_js_namespaceObject = require("./locales.js");
+const external_localisedRoutes_js_namespaceObject = require("./localisedRoutes.js");
 require("../runtime/types.js");
 const i18nPlugin = (options = {})=>({
         name: '@modern-js/plugin-i18n',
@@ -63,6 +66,10 @@ const i18nPlugin = (options = {})=>({
                     backend: backendOptions,
                     ...extendedConfig
                 };
+                if ((0, urlStrategy_js_namespaceObject.isUnusableI18nUrlStrategy)(config.urlStrategy)) {
+                    delete config.urlStrategy;
+                    utils_namespaceObject.logger.warn("[i18n] `urlStrategy` cannot be passed through `modern.config.ts`: the generated runtime registration carries plugin options as JSON, which drops its methods. Configure `localeDetection.localisedUrls` instead — the runtime and the server both derive the URL policy from it — or register a runtime plugin that supplies the strategy directly.");
+                }
                 const { reactI18next } = extendedConfig;
                 const runtimePluginPath = customPlugin?.runtime?.path || (false === reactI18next ? `@${metaName}/plugin-i18n/runtime/no-react-i18next` : `@${metaName}/plugin-i18n/runtime`);
                 plugins.push({
@@ -75,6 +82,10 @@ const i18nPlugin = (options = {})=>({
                     plugins
                 };
             });
+            api.modifyFileSystemRoutes(({ entrypoint, routes })=>({
+                    entrypoint,
+                    routes: (0, external_localisedRoutes_js_namespaceObject.applyLocalisedRoutes)(routes, localeDetection ? (0, utils_js_namespaceObject.getLocaleDetectionOptions)(entrypoint.entryName, localeDetection) : void 0, entrypoint)
+                }));
             api._internalServerPlugins(({ plugins })=>{
                 const { serverRoutes, metaName } = api.getAppContext();
                 const normalizedConfig = api.getNormalizedConfig();

package/dist/cjs/cli/localisedRoutes.js

@@ -0,0 +1,47 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __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__, {
+    applyLocalisedRoutes: ()=>applyLocalisedRoutes
+});
+const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
+const cli_namespaceObject = require("@modern-js/runtime/cli");
+const applyLocalisedRoutes = (routes, localeDetection, entrypoint)=>{
+    const { localePathRedirect, languages = [], localisedUrls } = localeDetection ?? {};
+    const resolved = (0, i18n_runtime_extensions_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
+    if (!localePathRedirect || !languages.length || !resolved.enabled) return routes;
+    return (0, i18n_runtime_extensions_namespaceObject.applyLocalisedUrlsToRoutes)(routes, languages, resolved.map, entrypoint && '@modern-js/plugin-tanstack' === (0, cli_namespaceObject.getEntrypointRoutesOwner)(entrypoint) ? 'canonical' : 'physical');
+};
+exports.applyLocalisedRoutes = __webpack_exports__.applyLocalisedRoutes;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "applyLocalisedRoutes"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/context.js

@@ -29,9 +29,9 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     FederatedI18nBoundary: ()=>FederatedI18nBoundary,
-    ModernI18nContext: ()=>ModernI18nContext,
+    ModernI18nContext: ()=>external_sharedContexts_js_namespaceObject.ModernI18nContext,
     ModernI18nProvider: ()=>ModernI18nProvider,
-    ReactI18nextProviderContext: ()=>ReactI18nextProviderContext,
+    ReactI18nextProviderContext: ()=>external_sharedContexts_js_namespaceObject.ReactI18nextProviderContext,
     getActualI18nextInstance: ()=>instance_js_namespaceObject.getActualI18nextInstance,
     useModernI18n: ()=>useModernI18n
 });
@@ -40,22 +40,14 @@ const context_namespaceObject = require("@modern-js/runtime/context");
 const external_react_namespaceObject = require("react");
 const external_contextHelpers_js_namespaceObject = require("./contextHelpers.js");
 const external_routerAdapter_js_namespaceObject = require("./routerAdapter.js");
+const external_sharedContexts_js_namespaceObject = require("./sharedContexts.js");
 const instance_js_namespaceObject = require("./i18n/instance.js");
-const modernI18nContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ModernI18nContext');
-const reactI18nextProviderContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ReactI18nextProviderContext');
-const getGlobalContext = (key, defaultValue)=>{
-    const globalStore = globalThis;
-    globalStore[key] ??= /*#__PURE__*/ (0, external_react_namespaceObject.createContext)(defaultValue);
-    return globalStore[key];
-};
-const ModernI18nContext = getGlobalContext(modernI18nContextKey, null);
-const ReactI18nextProviderContext = getGlobalContext(reactI18nextProviderContextKey, null);
 const ModernI18nProvider = ({ children, i18nextProvider, value })=>{
-    const content = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ModernI18nContext.Provider, {
+    const content = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_sharedContexts_js_namespaceObject.ModernI18nContext.Provider, {
         value: value,
         children: children
     });
-    return void 0 === i18nextProvider ? content : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ReactI18nextProviderContext.Provider, {
+    return void 0 === i18nextProvider ? content : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_sharedContexts_js_namespaceObject.ReactI18nextProviderContext.Provider, {
         value: i18nextProvider,
         children: content
     });
@@ -74,7 +66,7 @@ const FederatedI18nBoundary = (props)=>{
     });
 };
 const useModernI18n = ()=>{
-    const context = (0, external_react_namespaceObject.useContext)(ModernI18nContext);
+    const context = (0, external_react_namespaceObject.useContext)(external_sharedContexts_js_namespaceObject.ModernI18nContext);
     if (!context) throw new Error('useModernI18n must be used within ModernI18nProvider');
     const { language: contextLanguage, i18nInstance, languages, localePathRedirect, ignoreRedirectRoutes, urlStrategy, updateLanguage, synchronizeLanguage } = context;
     const { navigate, location, hasRouter } = (0, external_routerAdapter_js_namespaceObject.useI18nRouterAdapter)();

package/dist/cjs/runtime/contexts.js

@@ -0,0 +1,49 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __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__, {
+    I18nNavigationContext: ()=>I18nNavigationContext,
+    ModernI18nContext: ()=>ModernI18nContext,
+    ReactI18nextProviderContext: ()=>ReactI18nextProviderContext
+});
+const external_react_namespaceObject = require("react");
+const ModernI18nContext = (0, external_react_namespaceObject.createContext)(null);
+const ReactI18nextProviderContext = (0, external_react_namespaceObject.createContext)(null);
+const I18nNavigationContext = (0, external_react_namespaceObject.createContext)(null);
+exports.I18nNavigationContext = __webpack_exports__.I18nNavigationContext;
+exports.ModernI18nContext = __webpack_exports__.ModernI18nContext;
+exports.ReactI18nextProviderContext = __webpack_exports__.ReactI18nextProviderContext;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "I18nNavigationContext",
+    "ModernI18nContext",
+    "ReactI18nextProviderContext"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/core.js

@@ -31,15 +31,20 @@ __webpack_require__.d(__webpack_exports__, {
     FederatedI18nBoundary: ()=>external_context_js_namespaceObject.FederatedI18nBoundary,
     I18nLink: ()=>external_I18nLink_js_namespaceObject.I18nLink,
     I18nNavigationProvider: ()=>external_routerAdapter_js_namespaceObject.I18nNavigationProvider,
+    I18nRouterNavigationProvider: ()=>external_navigation_js_namespaceObject.I18nRouterNavigationProvider,
     Link: ()=>external_Link_js_namespaceObject.Link,
     createI18nPlugin: ()=>createI18nPlugin,
     splitUrlTarget: ()=>external_utils_js_namespaceObject.splitUrlTarget,
     useI18nRouterAdapter: ()=>external_routerAdapter_js_namespaceObject.useI18nRouterAdapter,
+    useIntegratedRouterAdapter: ()=>external_navigation_js_namespaceObject.useIntegratedRouterAdapter,
     useLocalizedLocation: ()=>external_localizedPaths_js_namespaceObject.useLocalizedLocation,
     useLocalizedPaths: ()=>external_localizedPaths_js_namespaceObject.useLocalizedPaths,
     useModernI18n: ()=>external_context_js_namespaceObject.useModernI18n,
     useNativeI18nRouterAdapter: ()=>external_routerAdapter_js_namespaceObject.useNativeI18nRouterAdapter
 });
+const mappedUrlStrategy_js_namespaceObject = require("../shared/mappedUrlStrategy.js");
+const urlStrategy_js_namespaceObject = require("../shared/urlStrategy.js");
+const external_navigation_js_namespaceObject = require("./navigation.js");
 const external_pluginSetup_js_namespaceObject = require("./pluginSetup.js");
 const external_providerComposition_js_namespaceObject = require("./providerComposition.js");
 const external_reactI18next_js_namespaceObject = require("./reactI18next.js");
@@ -56,6 +61,7 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
                 const { entryName, i18nInstance: userI18nInstance, initOptions, localeDetection, backend, htmlLangAttr = false, reactI18next = true, urlStrategy, NavigationProvider, LanguageSynchronization } = options;
                 const { localePathRedirect = false, i18nextDetector = true, languages = [], fallbackLanguage = 'en', detection, ignoreRedirectRoutes } = localeDetection || {};
                 const { enabled: backendEnabled = false } = backend || {};
+                const resolvedUrlStrategy = (0, urlStrategy_js_namespaceObject.asI18nUrlStrategy)(urlStrategy) ?? (0, mappedUrlStrategy_js_namespaceObject.resolveMappedUrlStrategy)(localeDetection);
                 let latestI18nInstance;
                 let I18nextProvider;
                 api.onBeforeRender(async (context)=>{
@@ -83,8 +89,8 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
                     languages,
                     fallbackLanguage,
                     ignoreRedirectRoutes,
-                    urlStrategy,
-                    NavigationProvider,
+                    urlStrategy: resolvedUrlStrategy,
+                    NavigationProvider: NavigationProvider ?? external_navigation_js_namespaceObject.I18nRouterNavigationProvider,
                     LanguageSynchronization,
                     getLatestI18nInstance: ()=>latestI18nInstance,
                     getI18nextProvider: ()=>I18nextProvider
@@ -94,10 +100,12 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
 exports.FederatedI18nBoundary = __webpack_exports__.FederatedI18nBoundary;
 exports.I18nLink = __webpack_exports__.I18nLink;
 exports.I18nNavigationProvider = __webpack_exports__.I18nNavigationProvider;
+exports.I18nRouterNavigationProvider = __webpack_exports__.I18nRouterNavigationProvider;
 exports.Link = __webpack_exports__.Link;
 exports.createI18nPlugin = __webpack_exports__.createI18nPlugin;
 exports.splitUrlTarget = __webpack_exports__.splitUrlTarget;
 exports.useI18nRouterAdapter = __webpack_exports__.useI18nRouterAdapter;
+exports.useIntegratedRouterAdapter = __webpack_exports__.useIntegratedRouterAdapter;
 exports.useLocalizedLocation = __webpack_exports__.useLocalizedLocation;
 exports.useLocalizedPaths = __webpack_exports__.useLocalizedPaths;
 exports.useModernI18n = __webpack_exports__.useModernI18n;
@@ -106,10 +114,12 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "FederatedI18nBoundary",
     "I18nLink",
     "I18nNavigationProvider",
+    "I18nRouterNavigationProvider",
     "Link",
     "createI18nPlugin",
     "splitUrlTarget",
     "useI18nRouterAdapter",
+    "useIntegratedRouterAdapter",
     "useLocalizedLocation",
     "useLocalizedPaths",
     "useModernI18n",

package/dist/cjs/runtime/i18n/detection/middleware.js

@@ -56,7 +56,7 @@ const useI18nextLanguageDetector = (i18nInstance)=>{
     }
     return i18nInstance;
 };
-const readLanguageFromStorage = (detectionOptions)=>{
+const readLanguageFromStorage = (detectionOptions, _request, _languages)=>{
     try {
         const options = detectionOptions || {};
         const order = options.order || [

package/dist/cjs/runtime/i18n/detection/middleware.node.js

@@ -34,8 +34,17 @@ __webpack_require__.d(__webpack_exports__, {
     useI18nextLanguageDetector: ()=>useI18nextLanguageDetector
 });
 const external_i18next_http_middleware_namespaceObject = require("i18next-http-middleware");
+const detection_js_namespaceObject = require("../../../shared/detection.js");
+const isDetectionRequest = (request)=>{
+    if (!request || 'object' != typeof request) return false;
+    const { url, headers } = request;
+    return 'string' == typeof url && !!headers && 'object' == typeof headers;
+};
 const cacheUserLanguage = (_i18nInstance, _language, _detectionOptions)=>{};
-const readLanguageFromStorage = (_detectionOptions)=>{};
+const readLanguageFromStorage = (detectionOptions, request, languages = [])=>{
+    if (!isDetectionRequest(request)) return;
+    return (0, detection_js_namespaceObject.detectLanguageFromRequest)(request, languages, detectionOptions) ?? void 0;
+};
 const useI18nextLanguageDetector = (i18nInstance)=>{
     if (!i18nInstance.isInitialized) return i18nInstance.use(external_i18next_http_middleware_namespaceObject.LanguageDetector);
     return i18nInstance;

package/dist/cjs/runtime/i18n/detection/priority.js

@@ -41,7 +41,7 @@ const detectLanguageWithPriority = async (i18nInstance, options)=>{
     let detectedLanguage;
     detectedLanguage = (0, external_path_js_namespaceObject.detectLanguageFromPathPriority)(pathname, languages, localePathRedirect);
     if (!detectedLanguage) detectedLanguage = (0, external_ssr_js_namespaceObject.detectLanguageFromSSR)(languages);
-    if (!detectedLanguage && i18nextDetector) detectedLanguage = (0, external_instance_js_namespaceObject.isI18nWrapperInstance)(i18nInstance) ? (0, external_middleware_js_namespaceObject.readLanguageFromStorage)((0, external_initOptions_js_namespaceObject.mergeDetectionOptions)(i18nextDetector, detection, localePathRedirect, userInitOptions)) : await (0, external_detector_js_namespaceObject.detectLanguageFromI18nextDetector)(i18nInstance, {
+    if (!detectedLanguage && i18nextDetector) detectedLanguage = (0, external_instance_js_namespaceObject.isI18nWrapperInstance)(i18nInstance) ? (0, external_middleware_js_namespaceObject.readLanguageFromStorage)((0, external_initOptions_js_namespaceObject.mergeDetectionOptions)(i18nextDetector, detection, localePathRedirect, userInitOptions), ssrContext?.request, languages) : await (0, external_detector_js_namespaceObject.detectLanguageFromI18nextDetector)(i18nInstance, {
         languages,
         fallbackLanguage,
         localePathRedirect,

package/dist/cjs/runtime/navigation.js

@@ -0,0 +1,48 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __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__, {
+    I18nRouterNavigationProvider: ()=>I18nRouterNavigationProvider,
+    useIntegratedRouterAdapter: ()=>useIntegratedRouterAdapter
+});
+const router_navigation_namespaceObject = require("@modern-js/i18n-runtime-extensions/router-navigation");
+const external_routerAdapter_js_namespaceObject = require("./routerAdapter.js");
+const { I18nRouterNavigationProvider, useIntegratedRouterAdapter } = (0, router_navigation_namespaceObject.createI18nRouterNavigation)({
+    I18nNavigationProvider: external_routerAdapter_js_namespaceObject.I18nNavigationProvider,
+    useNativeI18nRouterAdapter: external_routerAdapter_js_namespaceObject.useNativeI18nRouterAdapter
+});
+exports.I18nRouterNavigationProvider = __webpack_exports__.I18nRouterNavigationProvider;
+exports.useIntegratedRouterAdapter = __webpack_exports__.useIntegratedRouterAdapter;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "I18nRouterNavigationProvider",
+    "useIntegratedRouterAdapter"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/routerAdapter.js

@@ -33,13 +33,11 @@ __webpack_require__.d(__webpack_exports__, {
     useNativeI18nRouterAdapter: ()=>useNativeI18nRouterAdapter
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const contexts_namespaceObject = require("@modern-js/plugin-i18n/runtime/contexts");
 const runtime_namespaceObject = require("@modern-js/runtime");
 const context_namespaceObject = require("@modern-js/runtime/context");
 const external_react_namespaceObject = require("react");
-const navigationContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/I18nNavigationContext');
-const contextStore = globalThis;
-const I18nNavigationContext = contextStore[navigationContextKey] ??= /*#__PURE__*/ (0, external_react_namespaceObject.createContext)(null);
-const I18nNavigationProvider = ({ children, value })=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(I18nNavigationContext.Provider, {
+const I18nNavigationProvider = ({ children, value })=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(contexts_namespaceObject.I18nNavigationContext.Provider, {
         value: value,
         children: children
     });
@@ -66,7 +64,7 @@ const useNativeI18nRouterAdapter = ()=>{
     };
 };
 const useI18nRouterAdapter = ()=>{
-    const provided = (0, external_react_namespaceObject.useContext)(I18nNavigationContext);
+    const provided = (0, external_react_namespaceObject.useContext)(contexts_namespaceObject.I18nNavigationContext);
     const native = useNativeI18nRouterAdapter();
     return provided ?? native;
 };

package/dist/cjs/runtime/sharedContexts.js

@@ -0,0 +1,43 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __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__, {
+    ModernI18nContext: ()=>contexts_namespaceObject.ModernI18nContext,
+    ReactI18nextProviderContext: ()=>contexts_namespaceObject.ReactI18nextProviderContext
+});
+const contexts_namespaceObject = require("@modern-js/plugin-i18n/runtime/contexts");
+exports.ModernI18nContext = __webpack_exports__.ModernI18nContext;
+exports.ReactI18nextProviderContext = __webpack_exports__.ReactI18nextProviderContext;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "ModernI18nContext",
+    "ReactI18nextProviderContext"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/utils.js

@@ -39,6 +39,8 @@ __webpack_require__.d(__webpack_exports__, {
 const runtime_namespaceObject = require("@modern-js/runtime");
 const context_namespaceObject = require("@modern-js/runtime/context");
 const url_namespaceObject = require("@modern-js/runtime-utils/url");
+const mappedUrlStrategy_js_namespaceObject = require("../shared/mappedUrlStrategy.js");
+const urlStrategy_js_namespaceObject = require("../shared/urlStrategy.js");
 const getPathname = (context)=>{
     if ((0, runtime_namespaceObject.isBrowser)()) return window.location.pathname;
     return context.ssrContext?.request?.pathname || '/';
@@ -56,7 +58,8 @@ const getLanguageFromPath = (pathname, languages, fallbackLanguage)=>{
 };
 const buildLocalizedUrl = (target, language, languages, urlStrategy)=>{
     const { pathname, search, hash } = (0, url_namespaceObject.splitUrlTarget)(target);
-    if (urlStrategy) return `${urlStrategy.localizePathname(pathname, language, languages)}${search}${hash}`;
+    const strategy = (0, urlStrategy_js_namespaceObject.asI18nUrlStrategy)(urlStrategy);
+    if (strategy) return `${strategy.localizePathname(pathname, language, languages)}${search}${hash}`;
     const segments = pathname.split('/').filter(Boolean);
     if (segments[0] && languages.some((item)=>item.toLowerCase() === segments[0].toLowerCase())) segments[0] = language;
     else segments.unshift(language);
@@ -81,7 +84,8 @@ const detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
     };
 };
 const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes, urlStrategy)=>{
-    if (urlStrategy?.shouldSkipRedirect?.(pathname, languages)) return true;
+    if ((0, mappedUrlStrategy_js_namespaceObject.isDefaultLocaleRedirectSkipPath)(pathname, languages)) return true;
+    if ((0, urlStrategy_js_namespaceObject.asI18nUrlStrategy)(urlStrategy)?.shouldSkipRedirect?.(pathname, languages)) return true;
     if (!ignoreRedirectRoutes) return false;
     const segments = pathname.split('/').filter(Boolean);
     if (segments[0] && languages.some((item)=>item.toLowerCase() === segments[0].toLowerCase())) segments.shift();

package/dist/cjs/server/defaultUrlStrategy.js

@@ -0,0 +1,48 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __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__, {
+    createDefaultUrlStrategy: ()=>createDefaultUrlStrategy,
+    resolveDefaultUrlStrategy: ()=>resolveDefaultUrlStrategy
+});
+const external_mappedUrlStrategy_js_namespaceObject = require("./mappedUrlStrategy.js");
+const createDefaultUrlStrategy = (localisedUrls)=>(0, external_mappedUrlStrategy_js_namespaceObject.createMappedUrlStrategy)(localisedUrls);
+const resolveDefaultUrlStrategy = (localisedUrls)=>{
+    if (!localisedUrls || 'object' != typeof localisedUrls || 0 === Object.keys(localisedUrls).length) return;
+    return createDefaultUrlStrategy(localisedUrls);
+};
+exports.createDefaultUrlStrategy = __webpack_exports__.createDefaultUrlStrategy;
+exports.resolveDefaultUrlStrategy = __webpack_exports__.resolveDefaultUrlStrategy;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createDefaultUrlStrategy",
+    "resolveDefaultUrlStrategy"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/server/index.js

@@ -34,8 +34,10 @@ __webpack_require__.d(__webpack_exports__, {
     matchesApiPrefix: ()=>external_apiPrefix_js_namespaceObject.matchesApiPrefix
 });
 const hono_namespaceObject = require("@modern-js/server-core/hono");
+const urlStrategy_js_namespaceObject = require("../shared/urlStrategy.js");
 const utils_js_namespaceObject = require("../shared/utils.js");
 const external_apiPrefix_js_namespaceObject = require("./apiPrefix.js");
+const external_defaultUrlStrategy_js_namespaceObject = require("./defaultUrlStrategy.js");
 const external_detectorOptions_js_namespaceObject = require("./detectorOptions.js");
 const external_redirectPolicy_js_namespaceObject = require("./redirectPolicy.js");
 const { languageDetector } = hono_namespaceObject;
@@ -61,8 +63,7 @@ const i18nServerPlugin = (options)=>({
                     const entryLocaleDetection = (0, utils_js_namespaceObject.getLocaleDetectionOptions)(entryName, options.localeDetection);
                     const { localePathRedirect, i18nextDetector = true, languages = [], fallbackLanguage = 'en', detection, ignoreRedirectRoutes } = entryLocaleDetection;
                     const legacyLocalisedUrls = Reflect.get(entryLocaleDetection, 'localisedUrls');
-                    const urlStrategy = options.resolveUrlStrategy?.(entryName);
-                    if (legacyLocalisedUrls && 'object' == typeof legacyLocalisedUrls && Object.keys(legacyLocalisedUrls).length > 0 && !urlStrategy) throw new Error('Mapped locale URLs require a URL strategy. Use the i18n integration server plugin or supply resolveUrlStrategy.');
+                    const urlStrategy = (0, urlStrategy_js_namespaceObject.asI18nUrlStrategy)(options.resolveUrlStrategy?.(entryName)) ?? (0, external_defaultUrlStrategy_js_namespaceObject.resolveDefaultUrlStrategy)(legacyLocalisedUrls);
                     const staticRoutePrefixes = options.staticRoutePrefixes;
                     const originUrlPath = route.urlPath;
                     const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;

package/dist/cjs/server/mappedUrlStrategy.js

@@ -0,0 +1,43 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __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__, {
+    createMappedUrlStrategy: ()=>mappedUrlStrategy_js_namespaceObject.createMappedUrlStrategy,
+    resolveMappedUrlStrategy: ()=>mappedUrlStrategy_js_namespaceObject.resolveMappedUrlStrategy
+});
+const mappedUrlStrategy_js_namespaceObject = require("../shared/mappedUrlStrategy.js");
+exports.createMappedUrlStrategy = __webpack_exports__.createMappedUrlStrategy;
+exports.resolveMappedUrlStrategy = __webpack_exports__.resolveMappedUrlStrategy;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createMappedUrlStrategy",
+    "resolveMappedUrlStrategy"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/server/redirectPolicy.js

@@ -27,6 +27,15 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    buildLocalizedUrl: ()=>buildLocalizedUrl,
+    createLocaleRedirectResponse: ()=>createLocaleRedirectResponse,
+    getLanguageFromPath: ()=>getLanguageFromPath,
+    isStaticResourceRequest: ()=>isStaticResourceRequest,
+    shouldIgnoreRedirect: ()=>shouldIgnoreRedirect
+});
+const mappedUrlStrategy_js_namespaceObject = require("../shared/mappedUrlStrategy.js");
+const urlStrategy_js_namespaceObject = require("../shared/urlStrategy.js");
 const stripUrlPathPrefix = (pathname, urlPath)=>{
     const basePath = urlPath.replace('/*', '');
     if (!basePath || '/' === basePath) return pathname;
@@ -34,7 +43,8 @@ const stripUrlPathPrefix = (pathname, urlPath)=>{
 };
 const shouldIgnoreRedirect = (pathname, urlPath, ignoreRedirectRoutes, urlStrategy, languages = [])=>{
     const remainingPath = stripUrlPathPrefix(pathname, urlPath);
-    if (urlStrategy?.shouldSkipRedirect?.(remainingPath, languages)) return true;
+    if ((0, mappedUrlStrategy_js_namespaceObject.isDefaultLocaleRedirectSkipPath)(remainingPath, languages)) return true;
+    if ((0, urlStrategy_js_namespaceObject.asI18nUrlStrategy)(urlStrategy)?.shouldSkipRedirect?.(remainingPath, languages)) return true;
     if (!ignoreRedirectRoutes) return false;
     const segments = remainingPath.split('/').filter(Boolean);
     if (segments[0] && languages.some((language)=>language.toLowerCase() === segments[0].toLowerCase())) segments.shift();
@@ -66,7 +76,8 @@ const buildLocalizedUrl = (req, urlPath, language, languages, urlStrategy)=>{
     const segments = remainingPath.split('/').filter(Boolean);
     if (segments[0] && languages.some((item)=>item.toLowerCase() === segments[0].toLowerCase())) segments[0] = language;
     else segments.unshift(language);
-    const pathname = urlStrategy ? urlStrategy.localizePathname(remainingPath, language, languages) : `/${segments.join('/')}`;
+    const strategy = (0, urlStrategy_js_namespaceObject.asI18nUrlStrategy)(urlStrategy);
+    const pathname = strategy ? strategy.localizePathname(remainingPath, language, languages) : `/${segments.join('/')}`;
     return `${'/' === basePath ? '' : basePath}${pathname}${url.search}${url.hash}`;
 };
 const createLocaleRedirectResponse = (location)=>new Response(null, {
@@ -77,13 +88,6 @@ const createLocaleRedirectResponse = (location)=>new Response(null, {
             Vary: 'Accept-Language, Cookie'
         }
     });
-__webpack_require__.d(__webpack_exports__, {}, {
-    buildLocalizedUrl: buildLocalizedUrl,
-    createLocaleRedirectResponse: createLocaleRedirectResponse,
-    getLanguageFromPath: getLanguageFromPath,
-    isStaticResourceRequest: isStaticResourceRequest,
-    shouldIgnoreRedirect: shouldIgnoreRedirect
-});
 exports.buildLocalizedUrl = __webpack_exports__.buildLocalizedUrl;
 exports.createLocaleRedirectResponse = __webpack_exports__.createLocaleRedirectResponse;
 exports.getLanguageFromPath = __webpack_exports__.getLanguageFromPath;