@bleedingdev/modern-js-plugin-i18n 3.9.0-ultramodern.4 → 3.9.0-ultramodern.6

package/dist/cjs/cli/index.js

@@ -31,7 +31,6 @@ __webpack_require__.d(__webpack_exports__, {
     default: ()=>cli,
     i18nPlugin: ()=>i18nPlugin
 });
-const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
 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");
@@ -76,27 +75,6 @@ const i18nPlugin = (options = {})=>({
                     plugins
                 };
             });
-            api.modifyFileSystemRoutes(({ entrypoint, routes })=>{
-                if (!localeDetection) return {
-                    entrypoint,
-                    routes
-                };
-                const localeDetectionOptions = (0, utils_js_namespaceObject.getLocaleDetectionOptions)(entrypoint.entryName, localeDetection);
-                const { localePathRedirect, languages = [], localisedUrls } = localeDetectionOptions;
-                if (!localePathRedirect || 0 === languages.length) return {
-                    entrypoint,
-                    routes
-                };
-                const localisedUrlsConfig = (0, i18n_runtime_extensions_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
-                if (!localisedUrlsConfig.enabled) return {
-                    entrypoint,
-                    routes
-                };
-                return {
-                    entrypoint,
-                    routes: (0, i18n_runtime_extensions_namespaceObject.applyLocalisedUrlsToRoutes)(routes, languages, localisedUrlsConfig.map)
-                };
-            });
             api._internalServerPlugins(({ plugins })=>{
                 const { serverRoutes, metaName } = api.getAppContext();
                 const normalizedConfig = api.getNormalizedConfig();

package/dist/cjs/runtime/Link.js

@@ -43,10 +43,10 @@ const EXTERNAL_TARGET_RE = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
 const Link = (props)=>{
     const { to, params, children, hash: hashProp, search: searchProp, hashScrollIntoView, activeOptions, activeProps, prefetch, preload, ...rest } = props;
     const adapter = (0, external_routerAdapter_js_namespaceObject.useI18nRouterAdapter)();
-    const { language, supportedLanguages, localisedUrls } = (0, external_context_js_namespaceObject.useModernI18n)();
+    const { language, supportedLanguages, urlStrategy } = (0, external_context_js_namespaceObject.useModernI18n)();
     const config = {
         languages: supportedLanguages,
-        localisedUrls
+        urlStrategy
     };
     const isExternal = EXTERNAL_TARGET_RE.test(to);
     const isBareHash = to.startsWith('#');
@@ -56,7 +56,7 @@ const Link = (props)=>{
         const interpolated = (0, external_linkHelpers_js_namespaceObject.interpolateRouteParams)(pathname || '/', params);
         const firstSegment = interpolated.split('/').filter(Boolean)[0];
         if (firstSegment && supportedLanguages.includes(firstSegment)) (0, external_linkHelpers_js_namespaceObject.warnOnce)(`lang-prefix:${to}`, `[plugin-i18n] <Link to="${to}"> starts with a language prefix. Write language-agnostic canonical paths; the Link localizes them automatically.`);
-        const localizedPathname = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(interpolated, language, supportedLanguages, localisedUrls);
+        const localizedPathname = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(interpolated, language, supportedLanguages, urlStrategy);
         const hash = hashProp ?? (hashFromTo ? hashFromTo.slice(1) : '');
         const { searchString, searchObject } = (0, external_linkHelpers_js_namespaceObject.normalizeSearch)(searchProp, searchFromTo);
         return {
@@ -76,7 +76,7 @@ const Link = (props)=>{
         isBareHash,
         language,
         supportedLanguages,
-        localisedUrls
+        urlStrategy
     ]);
     const isActive = (0, external_react_namespaceObject.useMemo)(()=>{
         if (!target || !adapter.location) return false;
@@ -91,7 +91,7 @@ const Link = (props)=>{
         adapter.location,
         activeOptions?.exact,
         supportedLanguages,
-        localisedUrls
+        urlStrategy
     ]);
     const resolvedActiveProps = (0, external_linkHelpers_js_namespaceObject.splitActiveProps)(isActive, activeProps);
     const activeAttributes = isActive ? {
@@ -106,7 +106,7 @@ const Link = (props)=>{
             children: children
         });
     }
-    const { Link: RouterLink, hasRouter, framework } = adapter;
+    const { Link: RouterLink, hasRouter } = adapter;
     if (!hasRouter || !RouterLink) {
         const { replace: _replace, ...anchorProps } = rest;
         const { className: activeClassName, style: activeStyle, ...activeRest } = resolvedActiveProps;
@@ -129,38 +129,25 @@ const Link = (props)=>{
         ...rest.style,
         ...activeStyle
     };
-    if ('tanstack' === framework) {
-        const tanstackPreload = void 0 !== preload ? preload : void 0 === prefetch ? void 0 : 'none' === prefetch ? false : prefetch;
-        return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(RouterLink, {
-            to: target.localizedPathname,
-            ...target.searchObject ? {
-                search: target.searchObject
-            } : {},
-            ...target.hash ? {
-                hash: target.hash
-            } : {},
-            ...void 0 === hashScrollIntoView ? {} : {
-                hashScrollIntoView
-            },
-            ...void 0 === tanstackPreload ? {} : {
-                preload: tanstackPreload
-            },
-            ...rest,
-            ...activeRest,
-            ...activeAttributes,
-            className: mergedClassName,
-            style: mergedStyle,
-            children: children
-        });
-    }
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(RouterLink, {
+    const routerProps = adapter.createLinkProps?.({
+        pathname: target.localizedPathname,
+        href: target.href,
+        search: target.searchObject,
+        hash: target.hash,
+        hashScrollIntoView,
+        prefetch,
+        preload
+    }) ?? {
         to: target.href,
         ...void 0 === prefetch ? {} : {
             prefetch
         },
         ...void 0 === preload ? {} : {
             preload
-        },
+        }
+    };
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(RouterLink, {
+        ...routerProps,
         ...rest,
         ...activeRest,
         ...activeAttributes,

package/dist/cjs/runtime/context.js

@@ -29,14 +29,18 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     FederatedI18nBoundary: ()=>FederatedI18nBoundary,
+    ModernI18nContext: ()=>ModernI18nContext,
     ModernI18nProvider: ()=>ModernI18nProvider,
+    ReactI18nextProviderContext: ()=>ReactI18nextProviderContext,
+    getActualI18nextInstance: ()=>instance_js_namespaceObject.getActualI18nextInstance,
     useModernI18n: ()=>useModernI18n
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const context_namespaceObject = require("@modern-js/runtime/context");
 const external_react_namespaceObject = require("react");
 const external_contextHelpers_js_namespaceObject = require("./contextHelpers.js");
-const instance_js_namespaceObject = require("./i18n/instance.js");
 const external_routerAdapter_js_namespaceObject = require("./routerAdapter.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)=>{
@@ -56,68 +60,23 @@ const ModernI18nProvider = ({ children, i18nextProvider, value })=>{
         children: content
     });
 };
-const FederatedI18nBoundary = ({ children, defaultNamespace, fallbackLanguage, resources, supportedLanguages })=>{
-    const parent = (0, external_react_namespaceObject.useContext)(ModernI18nContext);
-    const I18nextProvider = (0, external_react_namespaceObject.useContext)(ReactI18nextProviderContext);
-    if (!parent) throw new Error('FederatedI18nBoundary must be used within ModernI18nProvider');
-    const languages = supportedLanguages ?? parent.languages ?? Object.keys(resources);
-    const scopedInstance = (0, external_react_namespaceObject.useMemo)(()=>{
-        const parentInstance = (0, instance_js_namespaceObject.getActualI18nextInstance)(parent.i18nInstance);
-        const clone = parentInstance.cloneInstance?.({
-            defaultNS: defaultNamespace,
-            fallbackLng: fallbackLanguage ?? languages[0] ?? parent.language,
-            forkResourceStore: true,
-            initImmediate: false,
-            lng: parent.language,
-            ns: [
-                defaultNamespace
-            ],
-            resources,
-            supportedLngs: languages
-        });
-        if (!clone) throw new Error('FederatedI18nBoundary requires an i18n instance with cloneInstance support');
-        const resourceStore = clone.store;
-        const parentResourceStore = parentInstance.store;
-        const sharesNestedResourceState = Object.entries(resourceStore?.data ?? {}).some(([language, namespaces])=>{
-            const parentNamespaces = parentResourceStore?.data?.[language];
-            return namespaces === parentNamespaces || Object.entries(namespaces).some(([namespace, resource])=>null !== resource && 'object' == typeof resource && resource === parentNamespaces?.[namespace]);
-        });
-        if (clone === parentInstance || resourceStore === parentResourceStore || resourceStore?.data === parentResourceStore?.data || sharesNestedResourceState) throw new Error('FederatedI18nBoundary cloneInstance did not isolate the host resource store');
-        if (!resourceStore?.addResourceBundle || !clone.removeResourceBundle || !resourceStore.data) throw new Error('FederatedI18nBoundary requires an isolated mutable i18n resource store');
-        for (const [language, namespaces] of Object.entries(resourceStore.data))for (const namespace of Object.keys(namespaces))clone.removeResourceBundle(language, namespace);
-        for (const [language, namespaces] of Object.entries(resources))for (const [namespace, resource] of Object.entries(namespaces))resourceStore.addResourceBundle(language, namespace, resource, true, true);
-        return clone;
-    }, [
-        defaultNamespace,
-        fallbackLanguage,
-        languages,
-        parent.i18nInstance,
-        parent.language,
-        resources
-    ]);
-    const value = (0, external_react_namespaceObject.useMemo)(()=>({
-            ...parent,
-            i18nInstance: scopedInstance,
-            language: parent.language,
-            languages
-        }), [
-        languages,
-        parent,
-        scopedInstance
-    ]);
-    const scopedContent = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ModernI18nProvider, {
-        value: value,
-        children: children
+const MissingFederatedI18nBoundary = ()=>{
+    throw new Error('FederatedI18nBoundary requires the @modern-js/i18n-integration runtime plugin');
+};
+const FederatedI18nBoundary = (props)=>{
+    const resolveComponent = (0, external_react_namespaceObject.useContext)(context_namespaceObject.RuntimeComponentResolverContext);
+    const Boundary = resolveComponent?.(MissingFederatedI18nBoundary, {
+        name: 'i18n.FederatedI18nBoundary'
+    }) ?? MissingFederatedI18nBoundary;
+    if (Boundary === FederatedI18nBoundary) throw new Error('FederatedI18nBoundary resolver returned its own wrapper');
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Boundary, {
+        ...props
     });
-    return I18nextProvider ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(I18nextProvider, {
-        i18n: scopedInstance,
-        children: scopedContent
-    }) : scopedContent;
 };
 const useModernI18n = ()=>{
     const context = (0, external_react_namespaceObject.useContext)(ModernI18nContext);
     if (!context) throw new Error('useModernI18n must be used within ModernI18nProvider');
-    const { language: contextLanguage, i18nInstance, languages, localePathRedirect, ignoreRedirectRoutes, localisedUrls, updateLanguage, synchronizeLanguage } = context;
+    const { language: contextLanguage, i18nInstance, languages, localePathRedirect, ignoreRedirectRoutes, urlStrategy, updateLanguage, synchronizeLanguage } = context;
     const { navigate, location, hasRouter } = (0, external_routerAdapter_js_namespaceObject.useI18nRouterAdapter)();
     const pathLanguage = (0, external_react_namespaceObject.useMemo)(()=>(0, external_contextHelpers_js_namespaceObject.getPathLanguage)(location?.pathname, languages, localePathRedirect), [
         languages,
@@ -136,7 +95,7 @@ const useModernI18n = ()=>{
             updateLanguage,
             localePathRedirect,
             ignoreRedirectRoutes,
-            localisedUrls,
+            urlStrategy,
             languages,
             hasRouter,
             navigate,
@@ -146,7 +105,7 @@ const useModernI18n = ()=>{
         updateLanguage,
         localePathRedirect,
         ignoreRedirectRoutes,
-        localisedUrls,
+        urlStrategy,
         languages,
         hasRouter,
         navigate,
@@ -169,17 +128,23 @@ const useModernI18n = ()=>{
         t,
         i18nInstance: i18nInstance,
         supportedLanguages: languages || [],
-        localisedUrls,
+        urlStrategy,
         isLanguageSupported,
         isResourcesReady
     };
 };
 exports.FederatedI18nBoundary = __webpack_exports__.FederatedI18nBoundary;
+exports.ModernI18nContext = __webpack_exports__.ModernI18nContext;
 exports.ModernI18nProvider = __webpack_exports__.ModernI18nProvider;
+exports.ReactI18nextProviderContext = __webpack_exports__.ReactI18nextProviderContext;
+exports.getActualI18nextInstance = __webpack_exports__.getActualI18nextInstance;
 exports.useModernI18n = __webpack_exports__.useModernI18n;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "FederatedI18nBoundary",
+    "ModernI18nContext",
     "ModernI18nProvider",
+    "ReactI18nextProviderContext",
+    "getActualI18nextInstance",
     "useModernI18n"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/runtime/contextHelpers.js

@@ -55,7 +55,7 @@ async function changeI18nInstanceLanguage(i18nInstance, language) {
     else await i18nInstance.changeLanguage?.(language);
 }
 async function changeModernI18nLanguage(newLang, options) {
-    const { i18nInstance, updateLanguage, localePathRedirect, ignoreRedirectRoutes, localisedUrls, languages, hasRouter, navigate, location } = options;
+    const { i18nInstance, updateLanguage, localePathRedirect, ignoreRedirectRoutes, urlStrategy, languages, hasRouter, navigate, location } = options;
     try {
         if (!newLang || 'string' != typeof newLang) throw new Error('Language must be non-empty string');
         await changeI18nInstanceLanguage(i18nInstance, newLang);
@@ -66,8 +66,8 @@ async function changeModernI18nLanguage(newLang, options) {
             const relativePath = currentPath.replace(entryPath, '');
             const pathLanguage = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(currentPath, languages || [], localePathRedirect);
             if (pathLanguage.detected && pathLanguage.language === newLang) return void updateLanguage?.(newLang);
-            if (!(0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages || [], ignoreRedirectRoutes)) {
-                const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, newLang, languages || [], localisedUrls);
+            if (!(0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages || [], ignoreRedirectRoutes, urlStrategy)) {
+                const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, newLang, languages || [], urlStrategy);
                 const newUrl = entryPath + newPath + location.search + location.hash;
                 await navigate(newUrl, {
                     replace: true
@@ -79,8 +79,8 @@ async function changeModernI18nLanguage(newLang, options) {
             const relativePath = currentPath.replace(entryPath, '');
             const pathLanguage = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(currentPath, languages || [], localePathRedirect);
             if (pathLanguage.detected && pathLanguage.language === newLang) return void updateLanguage?.(newLang);
-            if (!(0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages || [], ignoreRedirectRoutes)) {
-                const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, newLang, languages || [], localisedUrls);
+            if (!(0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages || [], ignoreRedirectRoutes, urlStrategy)) {
+                const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, newLang, languages || [], urlStrategy);
                 const newUrl = entryPath + newPath + window.location.search + window.location.hash;
                 window.history.pushState(null, '', newUrl);
             }

package/dist/cjs/runtime/core.js

@@ -30,20 +30,21 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     FederatedI18nBoundary: ()=>external_context_js_namespaceObject.FederatedI18nBoundary,
     I18nLink: ()=>external_I18nLink_js_namespaceObject.I18nLink,
+    I18nNavigationProvider: ()=>external_routerAdapter_js_namespaceObject.I18nNavigationProvider,
     Link: ()=>external_Link_js_namespaceObject.Link,
-    buildLocalizedUrl: ()=>external_utils_js_namespaceObject.buildLocalizedUrl,
-    canonicalPath: ()=>external_localizedPaths_js_namespaceObject.canonicalPath,
     createI18nPlugin: ()=>createI18nPlugin,
-    localizePath: ()=>external_localizedPaths_js_namespaceObject.localizePath,
     splitUrlTarget: ()=>external_utils_js_namespaceObject.splitUrlTarget,
+    useI18nRouterAdapter: ()=>external_routerAdapter_js_namespaceObject.useI18nRouterAdapter,
     useLocalizedLocation: ()=>external_localizedPaths_js_namespaceObject.useLocalizedLocation,
     useLocalizedPaths: ()=>external_localizedPaths_js_namespaceObject.useLocalizedPaths,
-    useModernI18n: ()=>external_context_js_namespaceObject.useModernI18n
+    useModernI18n: ()=>external_context_js_namespaceObject.useModernI18n,
+    useNativeI18nRouterAdapter: ()=>external_routerAdapter_js_namespaceObject.useNativeI18nRouterAdapter
 });
 const external_pluginSetup_js_namespaceObject = require("./pluginSetup.js");
 const external_providerComposition_js_namespaceObject = require("./providerComposition.js");
 const external_reactI18next_js_namespaceObject = require("./reactI18next.js");
 require("./types.js");
+const external_routerAdapter_js_namespaceObject = require("./routerAdapter.js");
 const external_context_js_namespaceObject = require("./context.js");
 const external_I18nLink_js_namespaceObject = require("./I18nLink.js");
 const external_Link_js_namespaceObject = require("./Link.js");
@@ -52,8 +53,8 @@ const external_utils_js_namespaceObject = require("./utils.js");
 const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
             name: '@modern-js/plugin-i18n',
             setup: (api)=>{
-                const { entryName, i18nInstance: userI18nInstance, initOptions, localeDetection, backend, htmlLangAttr = false, reactI18next = true } = options;
-                const { localePathRedirect = false, i18nextDetector = true, languages = [], fallbackLanguage = 'en', detection, ignoreRedirectRoutes, localisedUrls } = localeDetection || {};
+                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 || {};
                 let latestI18nInstance;
                 let I18nextProvider;
@@ -82,7 +83,9 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
                     languages,
                     fallbackLanguage,
                     ignoreRedirectRoutes,
-                    localisedUrls,
+                    urlStrategy,
+                    NavigationProvider,
+                    LanguageSynchronization,
                     getLatestI18nInstance: ()=>latestI18nInstance,
                     getI18nextProvider: ()=>I18nextProvider
                 }));
@@ -90,27 +93,27 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
         });
 exports.FederatedI18nBoundary = __webpack_exports__.FederatedI18nBoundary;
 exports.I18nLink = __webpack_exports__.I18nLink;
+exports.I18nNavigationProvider = __webpack_exports__.I18nNavigationProvider;
 exports.Link = __webpack_exports__.Link;
-exports.buildLocalizedUrl = __webpack_exports__.buildLocalizedUrl;
-exports.canonicalPath = __webpack_exports__.canonicalPath;
 exports.createI18nPlugin = __webpack_exports__.createI18nPlugin;
-exports.localizePath = __webpack_exports__.localizePath;
 exports.splitUrlTarget = __webpack_exports__.splitUrlTarget;
+exports.useI18nRouterAdapter = __webpack_exports__.useI18nRouterAdapter;
 exports.useLocalizedLocation = __webpack_exports__.useLocalizedLocation;
 exports.useLocalizedPaths = __webpack_exports__.useLocalizedPaths;
 exports.useModernI18n = __webpack_exports__.useModernI18n;
+exports.useNativeI18nRouterAdapter = __webpack_exports__.useNativeI18nRouterAdapter;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "FederatedI18nBoundary",
     "I18nLink",
+    "I18nNavigationProvider",
     "Link",
-    "buildLocalizedUrl",
-    "canonicalPath",
     "createI18nPlugin",
-    "localizePath",
     "splitUrlTarget",
+    "useI18nRouterAdapter",
     "useLocalizedLocation",
     "useLocalizedPaths",
-    "useModernI18n"
+    "useModernI18n",
+    "useNativeI18nRouterAdapter"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/runtime/hooks.js

@@ -53,7 +53,7 @@ function createMinimalI18nInstance(language) {
     };
     return minimalInstance;
 }
-function createContextValue(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, localisedUrls, setLang, synchronizeLanguage) {
+function createContextValue(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, setLang, urlStrategy) {
     const instance = i18nInstance || createMinimalI18nInstance(lang);
     return {
         language: lang,
@@ -62,9 +62,8 @@ function createContextValue(lang, i18nInstance, entryName, languages, localePath
         languages,
         localePathRedirect,
         ignoreRedirectRoutes,
-        localisedUrls,
-        updateLanguage: setLang,
-        synchronizeLanguage
+        urlStrategy,
+        updateLanguage: setLang
     };
 }
 function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
@@ -113,7 +112,7 @@ function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
         setForceUpdate
     ]);
 }
-function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls) {
+function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, urlStrategy) {
     const urlRef = (0, external_react_namespaceObject.useRef)('');
     const { navigate, location, hasRouter } = (0, external_routerAdapter_js_namespaceObject.useI18nRouterAdapter)();
     (0, external_react_namespaceObject.useEffect)(()=>{
@@ -130,10 +129,10 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         const currentHash = hasRouter && location ? location.hash : window.location.hash;
         const entryPath = (0, external_utils_js_namespaceObject.getEntryPath)();
         const relativePath = currentPathname.replace(entryPath, '');
-        if ((0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages, ignoreRedirectRoutes)) return;
+        if ((0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages, ignoreRedirectRoutes, urlStrategy)) return;
         const pathDetection = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(currentPathname, languages, localePathRedirect);
         const targetLanguage = pathDetection.language || i18nInstance.language || fallbackLanguage || languages[0] || 'en';
-        const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, targetLanguage, languages, localisedUrls);
+        const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, targetLanguage, languages, urlStrategy);
         const newUrl = entryPath + newPath + currentSearch + currentHash;
         urlRef.current = currentPathname;
         if (newUrl !== currentPathname + currentSearch + currentHash) if (hasRouter && navigate && location) navigate(newUrl, {
@@ -149,7 +148,7 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         languages,
         fallbackLanguage,
         ignoreRedirectRoutes,
-        localisedUrls
+        urlStrategy
     ]);
 }
 function useLanguageSync(i18nInstance, localePathRedirect, languages, pathname, prevLangRef, setLang) {

package/dist/cjs/runtime/localizedPaths.js

@@ -33,23 +33,25 @@ __webpack_require__.d(__webpack_exports__, {
     useLocalizedLocation: ()=>useLocalizedLocation,
     useLocalizedPaths: ()=>useLocalizedPaths
 });
-const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
 const external_react_namespaceObject = require("react");
 const external_context_js_namespaceObject = require("./context.js");
 const external_routerAdapter_js_namespaceObject = require("./routerAdapter.js");
 const external_utils_js_namespaceObject = require("./utils.js");
-const localizePath = (pathname, language, config)=>(0, external_utils_js_namespaceObject.buildLocalizedUrl)(pathname, language, config.languages, config.localisedUrls);
+const localizePath = (pathname, language, config)=>(0, external_utils_js_namespaceObject.buildLocalizedUrl)(pathname, language, config.languages, config.urlStrategy);
 const canonicalPath = (target, config)=>{
     const { pathname, search, hash } = (0, external_utils_js_namespaceObject.splitUrlTarget)(target);
-    const resolvedPath = (0, i18n_runtime_extensions_namespaceObject.canonicalTargetPathname)(pathname, config.languages, config.localisedUrls);
+    if (config.urlStrategy) return `${config.urlStrategy.canonicalPathname(pathname, config.languages)}${search}${hash}`;
+    const segments = pathname.split('/').filter(Boolean);
+    if (segments[0] && config.languages.some((language)=>language.toLowerCase() === segments[0].toLowerCase())) segments.shift();
+    const resolvedPath = `/${segments.join('/')}`;
     return `${resolvedPath}${search}${hash}`;
 };
 const useLocalizedPaths = ()=>{
-    const { supportedLanguages, localisedUrls } = (0, external_context_js_namespaceObject.useModernI18n)();
+    const { supportedLanguages, urlStrategy } = (0, external_context_js_namespaceObject.useModernI18n)();
     return (0, external_react_namespaceObject.useMemo)(()=>{
         const config = {
             languages: supportedLanguages,
-            localisedUrls
+            urlStrategy
         };
         return {
             localizePath: (pathname, language)=>localizePath(pathname, language, config),
@@ -57,11 +59,11 @@ const useLocalizedPaths = ()=>{
         };
     }, [
         supportedLanguages,
-        localisedUrls
+        urlStrategy
     ]);
 };
 const useLocalizedLocation = ()=>{
-    const { language, supportedLanguages, localisedUrls } = (0, external_context_js_namespaceObject.useModernI18n)();
+    const { language, supportedLanguages, urlStrategy } = (0, external_context_js_namespaceObject.useModernI18n)();
     const { location } = (0, external_routerAdapter_js_namespaceObject.useI18nRouterAdapter)();
     const pathname = location?.pathname ?? '/';
     const search = location?.search ?? '';
@@ -69,7 +71,7 @@ const useLocalizedLocation = ()=>{
     return (0, external_react_namespaceObject.useMemo)(()=>{
         const config = {
             languages: supportedLanguages,
-            localisedUrls
+            urlStrategy
         };
         const alternates = {};
         for (const supportedLanguage of supportedLanguages)alternates[supportedLanguage] = `${localizePath(pathname, supportedLanguage, config)}${search}${hash}`;
@@ -81,7 +83,7 @@ const useLocalizedLocation = ()=>{
     }, [
         language,
         supportedLanguages,
-        localisedUrls,
+        urlStrategy,
         pathname,
         search,
         hash

package/dist/cjs/runtime/providerComposition.js

@@ -31,7 +31,6 @@ __webpack_require__.d(__webpack_exports__, {
     createI18nRootWrapper: ()=>createI18nRootWrapper
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
-const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
 const runtime_namespaceObject = require("@modern-js/runtime");
 const head_namespaceObject = require("@modern-js/runtime/head");
 const external_react_namespaceObject = require("react");
@@ -39,8 +38,14 @@ const external_context_js_namespaceObject = require("./context.js");
 const external_hooks_js_namespaceObject = require("./hooks.js");
 const instance_js_namespaceObject = require("./i18n/instance.js");
 const external_routerAdapter_js_namespaceObject = require("./routerAdapter.js");
-const createI18nRootWrapper = (options)=>(App)=>(props)=>{
-            const { entryName, htmlLangAttr, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls, getLatestI18nInstance, getI18nextProvider } = options;
+const NativeLanguageSynchronization = ({ i18nInstance, localePathRedirect, languages, pathname, prevLangRef, setLang, children })=>{
+    const synchronizeLanguage = (0, external_hooks_js_namespaceObject.useLanguageSync)(i18nInstance, localePathRedirect, languages, pathname, prevLangRef, setLang);
+    return children(synchronizeLanguage);
+};
+const createI18nRootWrapper = (options)=>(App)=>{
+        const LanguageSynchronization = options.LanguageSynchronization ?? NativeLanguageSynchronization;
+        const I18nRoot = (props)=>{
+            const { entryName, htmlLangAttr, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, urlStrategy, getLatestI18nInstance, getI18nextProvider } = options;
             const runtimeContext = (0, external_react_namespaceObject.useContext)(runtime_namespaceObject.RuntimeContext);
             const i18nInstance = runtimeContext.i18nInstance || getLatestI18nInstance();
             const initialLang = (0, external_react_namespaceObject.useMemo)(()=>i18nInstance?.language || fallbackLanguage, [
@@ -65,18 +70,16 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                 lang
             ]);
             (0, external_hooks_js_namespaceObject.useSdkResourcesLoader)(i18nInstance, setForceUpdate);
-            const synchronizeLanguage = (0, i18n_runtime_extensions_namespaceObject.useLanguageSync)(i18nInstance, localePathRedirect, languages, location?.pathname, prevLangRef, setLang);
-            (0, external_hooks_js_namespaceObject.useClientSideRedirect)(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls);
-            const contextValue = (0, external_react_namespaceObject.useMemo)(()=>(0, external_hooks_js_namespaceObject.createContextValue)(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, localisedUrls, setLang, synchronizeLanguage), [
+            (0, external_hooks_js_namespaceObject.useClientSideRedirect)(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, urlStrategy);
+            const contextValue = (0, external_react_namespaceObject.useMemo)(()=>(0, external_hooks_js_namespaceObject.createContextValue)(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, setLang, urlStrategy), [
                 lang,
                 i18nInstance,
                 entryName,
                 languages,
                 localePathRedirect,
                 ignoreRedirectRoutes,
-                localisedUrls,
-                forceUpdate,
-                synchronizeLanguage
+                urlStrategy,
+                forceUpdate
             ]);
             const I18nextProvider = getI18nextProvider();
             const i18nextInstanceForProvider = (0, external_react_namespaceObject.useMemo)(()=>i18nInstance ? (0, instance_js_namespaceObject.getI18nextInstanceForProvider)(i18nInstance, lang) : void 0, [
@@ -99,14 +102,35 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                             lang
                         }
                     }),
-                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_context_js_namespaceObject.ModernI18nProvider, {
-                        i18nextProvider: I18nextProvider,
-                        value: contextValue,
-                        children: appContent
+                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(LanguageSynchronization, {
+                        i18nInstance: i18nInstance,
+                        localePathRedirect: localePathRedirect,
+                        languages: languages,
+                        pathname: location?.pathname,
+                        prevLangRef: prevLangRef,
+                        setLang: setLang,
+                        children: (synchronizeLanguage)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_context_js_namespaceObject.ModernI18nProvider, {
+                                i18nextProvider: I18nextProvider,
+                                value: {
+                                    ...contextValue,
+                                    synchronizeLanguage
+                                },
+                                children: appContent
+                            })
                     })
                 ]
             });
         };
+        const { NavigationProvider } = options;
+        if (!NavigationProvider) return I18nRoot;
+        return function(props) {
+            return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(NavigationProvider, {
+                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(I18nRoot, {
+                    ...props
+                })
+            });
+        };
+    };
 exports.createI18nRootWrapper = __webpack_exports__.createI18nRootWrapper;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createI18nRootWrapper"