@bleedingdev/modern-js-plugin-i18n 3.9.0-ultramodern.2 → 3.9.0-ultramodern.21

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

@@ -1,8 +1,10 @@
 import "node:module";
-import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
 import { getPublicDirRoutePrefixes } from "@modern-js/server-core";
+import { logger } from "@modern-js/utils";
+import { isUnusableI18nUrlStrategy } from "../shared/urlStrategy.mjs";
 import { getBackendOptions, getLocaleDetectionOptions } from "../shared/utils.mjs";
 import { applyDetectedBackendPaths, detectLocalesDirectory } from "./locales.mjs";
+import { applyLocalisedRoutes } from "./localisedRoutes.mjs";
 import "../runtime/types.mjs";
 const i18nPlugin = (options = {})=>({
         name: '@modern-js/plugin-i18n',
@@ -32,6 +34,10 @@ const i18nPlugin = (options = {})=>({
                     backend: backendOptions,
                     ...extendedConfig
                 };
+                if (isUnusableI18nUrlStrategy(config.urlStrategy)) {
+                    delete config.urlStrategy;
+                    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({
@@ -44,27 +50,10 @@ const i18nPlugin = (options = {})=>({
                     plugins
                 };
             });
-            api.modifyFileSystemRoutes(({ entrypoint, routes })=>{
-                if (!localeDetection) return {
+            api.modifyFileSystemRoutes(({ entrypoint, routes })=>({
                     entrypoint,
-                    routes
-                };
-                const localeDetectionOptions = getLocaleDetectionOptions(entrypoint.entryName, localeDetection);
-                const { localePathRedirect, languages = [], localisedUrls } = localeDetectionOptions;
-                if (!localePathRedirect || 0 === languages.length) return {
-                    entrypoint,
-                    routes
-                };
-                const localisedUrlsConfig = resolveLocalisedUrlsConfig(localisedUrls);
-                if (!localisedUrlsConfig.enabled) return {
-                    entrypoint,
-                    routes
-                };
-                return {
-                    entrypoint,
-                    routes: applyLocalisedUrlsToRoutes(routes, languages, localisedUrlsConfig.map)
-                };
-            });
+                    routes: applyLocalisedRoutes(routes, localeDetection ? getLocaleDetectionOptions(entrypoint.entryName, localeDetection) : void 0, entrypoint)
+                }));
             api._internalServerPlugins(({ plugins })=>{
                 const { serverRoutes, metaName } = api.getAppContext();
                 const normalizedConfig = api.getNormalizedConfig();

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

@@ -0,0 +1,10 @@
+import "node:module";
+import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
+import { getEntrypointRoutesOwner } from "@modern-js/runtime/cli";
+const applyLocalisedRoutes = (routes, localeDetection, entrypoint)=>{
+    const { localePathRedirect, languages = [], localisedUrls } = localeDetection ?? {};
+    const resolved = resolveLocalisedUrlsConfig(localisedUrls);
+    if (!localePathRedirect || !languages.length || !resolved.enabled) return routes;
+    return applyLocalisedUrlsToRoutes(routes, languages, resolved.map, entrypoint && '@modern-js/plugin-tanstack' === getEntrypointRoutesOwner(entrypoint) ? 'canonical' : 'physical');
+};
+export { applyLocalisedRoutes };

package/dist/esm-node/runtime/Link.mjs

@@ -10,10 +10,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 = useI18nRouterAdapter();
-    const { language, supportedLanguages, localisedUrls } = useModernI18n();
+    const { language, supportedLanguages, urlStrategy } = useModernI18n();
     const config = {
         languages: supportedLanguages,
-        localisedUrls
+        urlStrategy
     };
     const isExternal = EXTERNAL_TARGET_RE.test(to);
     const isBareHash = to.startsWith('#');
@@ -23,7 +23,7 @@ const Link = (props)=>{
         const interpolated = interpolateRouteParams(pathname || '/', params);
         const firstSegment = interpolated.split('/').filter(Boolean)[0];
         if (firstSegment && supportedLanguages.includes(firstSegment)) 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 = buildLocalizedUrl(interpolated, language, supportedLanguages, localisedUrls);
+        const localizedPathname = buildLocalizedUrl(interpolated, language, supportedLanguages, urlStrategy);
         const hash = hashProp ?? (hashFromTo ? hashFromTo.slice(1) : '');
         const { searchString, searchObject } = normalizeSearch(searchProp, searchFromTo);
         return {
@@ -43,7 +43,7 @@ const Link = (props)=>{
         isBareHash,
         language,
         supportedLanguages,
-        localisedUrls
+        urlStrategy
     ]);
     const isActive = useMemo(()=>{
         if (!target || !adapter.location) return false;
@@ -58,7 +58,7 @@ const Link = (props)=>{
         adapter.location,
         activeOptions?.exact,
         supportedLanguages,
-        localisedUrls
+        urlStrategy
     ]);
     const resolvedActiveProps = splitActiveProps(isActive, activeProps);
     const activeAttributes = isActive ? {
@@ -73,7 +73,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;
@@ -96,38 +96,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__*/ 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__*/ 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__*/ jsx(RouterLink, {
+        ...routerProps,
         ...rest,
         ...activeRest,
         ...activeAttributes,

package/dist/esm-node/runtime/context.mjs

@@ -1,18 +1,10 @@
 import "node:module";
 import { jsx } from "react/jsx-runtime";
-import { createContext, useCallback, useContext, useEffect, useMemo } from "react";
+import { RuntimeComponentResolverContext } from "@modern-js/runtime/context";
+import { useCallback, useContext, useEffect, useMemo } from "react";
 import { changeModernI18nLanguage, getPathLanguage, isI18nLanguageSupported, isI18nResourcesReady, translateI18n } from "./contextHelpers.mjs";
-import { getActualI18nextInstance } from "./i18n/instance.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
-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__*/ createContext(defaultValue);
-    return globalStore[key];
-};
-const ModernI18nContext = getGlobalContext(modernI18nContextKey, null);
-const ReactI18nextProviderContext = getGlobalContext(reactI18nextProviderContextKey, null);
+import { ModernI18nContext, ReactI18nextProviderContext } from "./sharedContexts.mjs";
 const ModernI18nProvider = ({ children, i18nextProvider, value })=>{
     const content = /*#__PURE__*/ jsx(ModernI18nContext.Provider, {
         value: value,
@@ -23,68 +15,23 @@ const ModernI18nProvider = ({ children, i18nextProvider, value })=>{
         children: content
     });
 };
-const FederatedI18nBoundary = ({ children, defaultNamespace, fallbackLanguage, resources, supportedLanguages })=>{
-    const parent = useContext(ModernI18nContext);
-    const I18nextProvider = useContext(ReactI18nextProviderContext);
-    if (!parent) throw new Error('FederatedI18nBoundary must be used within ModernI18nProvider');
-    const languages = supportedLanguages ?? parent.languages ?? Object.keys(resources);
-    const scopedInstance = useMemo(()=>{
-        const parentInstance = 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 = useMemo(()=>({
-            ...parent,
-            i18nInstance: scopedInstance,
-            language: parent.language,
-            languages
-        }), [
-        languages,
-        parent,
-        scopedInstance
-    ]);
-    const scopedContent = /*#__PURE__*/ 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 = useContext(RuntimeComponentResolverContext);
+    const Boundary = resolveComponent?.(MissingFederatedI18nBoundary, {
+        name: 'i18n.FederatedI18nBoundary'
+    }) ?? MissingFederatedI18nBoundary;
+    if (Boundary === FederatedI18nBoundary) throw new Error('FederatedI18nBoundary resolver returned its own wrapper');
+    return /*#__PURE__*/ jsx(Boundary, {
+        ...props
     });
-    return I18nextProvider ? /*#__PURE__*/ jsx(I18nextProvider, {
-        i18n: scopedInstance,
-        children: scopedContent
-    }) : scopedContent;
 };
 const useModernI18n = ()=>{
     const context = 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 } = useI18nRouterAdapter();
     const pathLanguage = useMemo(()=>getPathLanguage(location?.pathname, languages, localePathRedirect), [
         languages,
@@ -103,7 +50,7 @@ const useModernI18n = ()=>{
             updateLanguage,
             localePathRedirect,
             ignoreRedirectRoutes,
-            localisedUrls,
+            urlStrategy,
             languages,
             hasRouter,
             navigate,
@@ -113,7 +60,7 @@ const useModernI18n = ()=>{
         updateLanguage,
         localePathRedirect,
         ignoreRedirectRoutes,
-        localisedUrls,
+        urlStrategy,
         languages,
         hasRouter,
         navigate,
@@ -136,9 +83,10 @@ const useModernI18n = ()=>{
         t,
         i18nInstance: i18nInstance,
         supportedLanguages: languages || [],
-        localisedUrls,
+        urlStrategy,
         isLanguageSupported,
         isResourcesReady
     };
 };
-export { FederatedI18nBoundary, ModernI18nProvider, useModernI18n };
+export { getActualI18nextInstance } from "./i18n/instance.mjs";
+export { FederatedI18nBoundary, ModernI18nContext, ModernI18nProvider, ReactI18nextProviderContext, useModernI18n };

package/dist/esm-node/runtime/contextHelpers.mjs

@@ -18,7 +18,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);
@@ -29,8 +29,8 @@ async function changeModernI18nLanguage(newLang, options) {
             const relativePath = currentPath.replace(entryPath, '');
             const pathLanguage = detectLanguageFromPath(currentPath, languages || [], localePathRedirect);
             if (pathLanguage.detected && pathLanguage.language === newLang) return void updateLanguage?.(newLang);
-            if (!shouldIgnoreRedirect(relativePath, languages || [], ignoreRedirectRoutes)) {
-                const newPath = buildLocalizedUrl(relativePath, newLang, languages || [], localisedUrls);
+            if (!shouldIgnoreRedirect(relativePath, languages || [], ignoreRedirectRoutes, urlStrategy)) {
+                const newPath = buildLocalizedUrl(relativePath, newLang, languages || [], urlStrategy);
                 const newUrl = entryPath + newPath + location.search + location.hash;
                 await navigate(newUrl, {
                     replace: true
@@ -42,8 +42,8 @@ async function changeModernI18nLanguage(newLang, options) {
             const relativePath = currentPath.replace(entryPath, '');
             const pathLanguage = detectLanguageFromPath(currentPath, languages || [], localePathRedirect);
             if (pathLanguage.detected && pathLanguage.language === newLang) return void updateLanguage?.(newLang);
-            if (!shouldIgnoreRedirect(relativePath, languages || [], ignoreRedirectRoutes)) {
-                const newPath = buildLocalizedUrl(relativePath, newLang, languages || [], localisedUrls);
+            if (!shouldIgnoreRedirect(relativePath, languages || [], ignoreRedirectRoutes, urlStrategy)) {
+                const newPath = buildLocalizedUrl(relativePath, newLang, languages || [], urlStrategy);
                 const newUrl = entryPath + newPath + window.location.search + window.location.hash;
                 window.history.pushState(null, '', newUrl);
             }

package/dist/esm-node/runtime/contexts.mjs

@@ -0,0 +1,6 @@
+import "node:module";
+import { createContext } from "react";
+const ModernI18nContext = createContext(null);
+const ReactI18nextProviderContext = createContext(null);
+const I18nNavigationContext = createContext(null);
+export { I18nNavigationContext, ModernI18nContext, ReactI18nextProviderContext };

package/dist/esm-node/runtime/core.mjs

@@ -1,4 +1,7 @@
 import "node:module";
+import { resolveMappedUrlStrategy } from "../shared/mappedUrlStrategy.mjs";
+import { asI18nUrlStrategy } from "../shared/urlStrategy.mjs";
+import { I18nRouterNavigationProvider, useIntegratedRouterAdapter } from "./navigation.mjs";
 import { setupI18nBeforeRender } from "./pluginSetup.mjs";
 import { createI18nRootWrapper } from "./providerComposition.mjs";
 import { resolveReactI18nextIntegration } from "./reactI18next.mjs";
@@ -6,9 +9,10 @@ import "./types.mjs";
 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 || {};
+                const resolvedUrlStrategy = asI18nUrlStrategy(urlStrategy) ?? resolveMappedUrlStrategy(localeDetection);
                 let latestI18nInstance;
                 let I18nextProvider;
                 api.onBeforeRender(async (context)=>{
@@ -36,15 +40,18 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
                     languages,
                     fallbackLanguage,
                     ignoreRedirectRoutes,
-                    localisedUrls,
+                    urlStrategy: resolvedUrlStrategy,
+                    NavigationProvider: NavigationProvider ?? I18nRouterNavigationProvider,
+                    LanguageSynchronization,
                     getLatestI18nInstance: ()=>latestI18nInstance,
                     getI18nextProvider: ()=>I18nextProvider
                 }));
             }
         });
+export { I18nNavigationProvider, useI18nRouterAdapter, useNativeI18nRouterAdapter } from "./routerAdapter.mjs";
 export { FederatedI18nBoundary, useModernI18n } from "./context.mjs";
 export { I18nLink } from "./I18nLink.mjs";
 export { Link } from "./Link.mjs";
-export { canonicalPath, localizePath, useLocalizedLocation, useLocalizedPaths } from "./localizedPaths.mjs";
-export { buildLocalizedUrl, splitUrlTarget } from "./utils.mjs";
-export { createI18nPlugin };
+export { useLocalizedLocation, useLocalizedPaths } from "./localizedPaths.mjs";
+export { splitUrlTarget } from "./utils.mjs";
+export { I18nRouterNavigationProvider, createI18nPlugin, useIntegratedRouterAdapter };

package/dist/esm-node/runtime/hooks.mjs

@@ -19,7 +19,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,
@@ -28,9 +28,8 @@ function createContextValue(lang, i18nInstance, entryName, languages, localePath
         languages,
         localePathRedirect,
         ignoreRedirectRoutes,
-        localisedUrls,
-        updateLanguage: setLang,
-        synchronizeLanguage
+        urlStrategy,
+        updateLanguage: setLang
     };
 }
 function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
@@ -79,7 +78,7 @@ function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
         setForceUpdate
     ]);
 }
-function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls) {
+function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, urlStrategy) {
     const urlRef = useRef('');
     const { navigate, location, hasRouter } = useI18nRouterAdapter();
     useEffect(()=>{
@@ -96,10 +95,10 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         const currentHash = hasRouter && location ? location.hash : window.location.hash;
         const entryPath = getEntryPath();
         const relativePath = currentPathname.replace(entryPath, '');
-        if (shouldIgnoreRedirect(relativePath, languages, ignoreRedirectRoutes)) return;
+        if (shouldIgnoreRedirect(relativePath, languages, ignoreRedirectRoutes, urlStrategy)) return;
         const pathDetection = detectLanguageFromPath(currentPathname, languages, localePathRedirect);
         const targetLanguage = pathDetection.language || i18nInstance.language || fallbackLanguage || languages[0] || 'en';
-        const newPath = buildLocalizedUrl(relativePath, targetLanguage, languages, localisedUrls);
+        const newPath = 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, {
@@ -115,7 +114,7 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         languages,
         fallbackLanguage,
         ignoreRedirectRoutes,
-        localisedUrls
+        urlStrategy
     ]);
 }
 function useLanguageSync(i18nInstance, localePathRedirect, languages, pathname, prevLangRef, setLang) {

package/dist/esm-node/runtime/localizedPaths.mjs

@@ -1,21 +1,23 @@
 import "node:module";
-import { canonicalTargetPathname } from "@modern-js/i18n-runtime-extensions";
 import { useMemo } from "react";
 import { useModernI18n } from "./context.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
 import { buildLocalizedUrl, splitUrlTarget } from "./utils.mjs";
-const localizePath = (pathname, language, config)=>buildLocalizedUrl(pathname, language, config.languages, config.localisedUrls);
+const localizePath = (pathname, language, config)=>buildLocalizedUrl(pathname, language, config.languages, config.urlStrategy);
 const canonicalPath = (target, config)=>{
     const { pathname, search, hash } = splitUrlTarget(target);
-    const resolvedPath = 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 } = useModernI18n();
+    const { supportedLanguages, urlStrategy } = useModernI18n();
     return useMemo(()=>{
         const config = {
             languages: supportedLanguages,
-            localisedUrls
+            urlStrategy
         };
         return {
             localizePath: (pathname, language)=>localizePath(pathname, language, config),
@@ -23,11 +25,11 @@ const useLocalizedPaths = ()=>{
         };
     }, [
         supportedLanguages,
-        localisedUrls
+        urlStrategy
     ]);
 };
 const useLocalizedLocation = ()=>{
-    const { language, supportedLanguages, localisedUrls } = useModernI18n();
+    const { language, supportedLanguages, urlStrategy } = useModernI18n();
     const { location } = useI18nRouterAdapter();
     const pathname = location?.pathname ?? '/';
     const search = location?.search ?? '';
@@ -35,7 +37,7 @@ const useLocalizedLocation = ()=>{
     return useMemo(()=>{
         const config = {
             languages: supportedLanguages,
-            localisedUrls
+            urlStrategy
         };
         const alternates = {};
         for (const supportedLanguage of supportedLanguages)alternates[supportedLanguage] = `${localizePath(pathname, supportedLanguage, config)}${search}${hash}`;
@@ -47,7 +49,7 @@ const useLocalizedLocation = ()=>{
     }, [
         language,
         supportedLanguages,
-        localisedUrls,
+        urlStrategy,
         pathname,
         search,
         hash

package/dist/esm-node/runtime/navigation.mjs

@@ -0,0 +1,8 @@
+import "node:module";
+import { createI18nRouterNavigation } from "@modern-js/i18n-runtime-extensions/router-navigation";
+import { I18nNavigationProvider, useNativeI18nRouterAdapter } from "./routerAdapter.mjs";
+const { I18nRouterNavigationProvider: I18nRouterNavigationProvider, useIntegratedRouterAdapter: useIntegratedRouterAdapter } = createI18nRouterNavigation({
+    I18nNavigationProvider: I18nNavigationProvider,
+    useNativeI18nRouterAdapter: useNativeI18nRouterAdapter
+});
+export { I18nRouterNavigationProvider, useIntegratedRouterAdapter };

package/dist/esm-node/runtime/providerComposition.mjs

@@ -1,15 +1,20 @@
 import "node:module";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useLanguageSync } from "@modern-js/i18n-runtime-extensions";
 import { RuntimeContext } from "@modern-js/runtime";
 import { Helmet } from "@modern-js/runtime/head";
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { ModernI18nProvider } from "./context.mjs";
-import { createContextValue, useClientSideRedirect, useSdkResourcesLoader } from "./hooks.mjs";
+import { createContextValue, useClientSideRedirect, useLanguageSync, useSdkResourcesLoader } from "./hooks.mjs";
 import { getI18nextInstanceForProvider } from "./i18n/instance.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
-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 = 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 = useContext(RuntimeContext);
             const i18nInstance = runtimeContext.i18nInstance || getLatestI18nInstance();
             const initialLang = useMemo(()=>i18nInstance?.language || fallbackLanguage, [
@@ -34,18 +39,16 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                 lang
             ]);
             useSdkResourcesLoader(i18nInstance, setForceUpdate);
-            const synchronizeLanguage = useLanguageSync(i18nInstance, localePathRedirect, languages, location?.pathname, prevLangRef, setLang);
-            useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls);
-            const contextValue = useMemo(()=>createContextValue(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, localisedUrls, setLang, synchronizeLanguage), [
+            useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, urlStrategy);
+            const contextValue = useMemo(()=>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 = useMemo(()=>i18nInstance ? getI18nextInstanceForProvider(i18nInstance, lang) : void 0, [
@@ -68,12 +71,33 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                             lang
                         }
                     }),
-                    /*#__PURE__*/ jsx(ModernI18nProvider, {
-                        i18nextProvider: I18nextProvider,
-                        value: contextValue,
-                        children: appContent
+                    /*#__PURE__*/ jsx(LanguageSynchronization, {
+                        i18nInstance: i18nInstance,
+                        localePathRedirect: localePathRedirect,
+                        languages: languages,
+                        pathname: location?.pathname,
+                        prevLangRef: prevLangRef,
+                        setLang: setLang,
+                        children: (synchronizeLanguage)=>/*#__PURE__*/ jsx(ModernI18nProvider, {
+                                i18nextProvider: I18nextProvider,
+                                value: {
+                                    ...contextValue,
+                                    synchronizeLanguage
+                                },
+                                children: appContent
+                            })
                     })
                 ]
             });
         };
+        const { NavigationProvider } = options;
+        if (!NavigationProvider) return I18nRoot;
+        return function(props) {
+            return /*#__PURE__*/ jsx(NavigationProvider, {
+                children: /*#__PURE__*/ jsx(I18nRoot, {
+                    ...props
+                })
+            });
+        };
+    };
 export { createI18nRootWrapper };