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

package/dist/cjs/cli/index.js

@@ -84,7 +84,7 @@ const i18nPlugin = (options = {})=>({
             });
             api.modifyFileSystemRoutes(({ entrypoint, routes })=>({
                     entrypoint,
-                    routes: (0, external_localisedRoutes_js_namespaceObject.applyLocalisedRoutes)(routes, localeDetection ? (0, utils_js_namespaceObject.getLocaleDetectionOptions)(entrypoint.entryName, localeDetection) : void 0)
+                    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();

package/dist/cjs/cli/localisedRoutes.js

@@ -31,11 +31,12 @@ __webpack_require__.d(__webpack_exports__, {
     applyLocalisedRoutes: ()=>applyLocalisedRoutes
 });
 const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
-const applyLocalisedRoutes = (routes, localeDetection)=>{
+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);
+    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 === [

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,10 +31,12 @@ __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,
@@ -42,6 +44,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 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");
@@ -87,7 +90,7 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
                     fallbackLanguage,
                     ignoreRedirectRoutes,
                     urlStrategy: resolvedUrlStrategy,
-                    NavigationProvider,
+                    NavigationProvider: NavigationProvider ?? external_navigation_js_namespaceObject.I18nRouterNavigationProvider,
                     LanguageSynchronization,
                     getLatestI18nInstance: ()=>latestI18nInstance,
                     getI18nextProvider: ()=>I18nextProvider
@@ -97,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;
@@ -109,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/shared/detection.js

@@ -1,7 +1,123 @@
 "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__ = {};
-require("../runtime/i18n/detection/config.js");
-for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    detectLanguageFromRequest: ()=>detectLanguageFromRequest
+});
+const config_js_namespaceObject = require("../runtime/i18n/detection/config.js");
+function detectLanguageFromRequest(req, languages, detectionOptions) {
+    try {
+        const mergedDetection = detectionOptions ? (0, config_js_namespaceObject.mergeDetectionOptions)(detectionOptions) : config_js_namespaceObject.DEFAULT_I18NEXT_DETECTION_OPTIONS;
+        const order = (mergedDetection.order || []).filter((item)=>![
+                'path',
+                'localStorage',
+                'navigator',
+                'htmlTag',
+                'subdomain'
+            ].includes(item));
+        const detectionOrder = order.length > 0 ? order : [
+            'querystring',
+            'cookie',
+            'header'
+        ];
+        const getHeader = (name)=>{
+            const headers = req.headers;
+            if ('function' == typeof headers?.get) return headers.get(name);
+            const value = headers[name.toLowerCase()];
+            if (Array.isArray(value)) return value[0] ?? null;
+            return value ?? null;
+        };
+        for (const method of detectionOrder){
+            let detectedLang = null;
+            switch(method){
+                case 'querystring':
+                    {
+                        const lookupKey = mergedDetection.lookupQuerystring || config_js_namespaceObject.DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupQuerystring || 'lng';
+                        const host = getHeader('host') || 'localhost';
+                        const url = new URL(req.url, `http://${host}`);
+                        detectedLang = url.searchParams.get(lookupKey);
+                        break;
+                    }
+                case 'cookie':
+                    {
+                        const lookupKey = mergedDetection.lookupCookie || config_js_namespaceObject.DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupCookie || 'i18next';
+                        const cookieHeader = getHeader('Cookie');
+                        if (cookieHeader) {
+                            const cookies = cookieHeader.split(';').reduce((acc, item)=>{
+                                const [key, value] = item.trim().split('=');
+                                if (key && value) acc[key] = value;
+                                return acc;
+                            }, {});
+                            detectedLang = cookies[lookupKey] || null;
+                        }
+                        break;
+                    }
+                case 'header':
+                    {
+                        const lookupKey = mergedDetection.lookupHeader || config_js_namespaceObject.DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupHeader || 'accept-language';
+                        const acceptLanguage = getHeader(lookupKey);
+                        if (acceptLanguage) {
+                            const languagesList = acceptLanguage.split(',').map((lang)=>{
+                                const [code, q] = lang.trim().split(';');
+                                return {
+                                    code,
+                                    baseCode: code.split('-')[0],
+                                    quality: q ? parseFloat(q.split('=')[1]) : 1.0
+                                };
+                            }).sort((a, b)=>b.quality - a.quality);
+                            for (const lang of languagesList){
+                                if (0 === languages.length || languages.includes(lang.code)) {
+                                    detectedLang = lang.code;
+                                    break;
+                                }
+                                if (languages.includes(lang.baseCode)) {
+                                    detectedLang = lang.baseCode;
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+                    }
+            }
+            if (detectedLang && (0 === languages.length || languages.includes(detectedLang))) return detectedLang;
+            if (detectedLang) {
+                const baseLang = detectedLang.split('-')[0];
+                if (languages.includes(baseLang)) return baseLang;
+            }
+        }
+    } catch (error) {}
+    return null;
+}
+exports.detectLanguageFromRequest = __webpack_exports__.detectLanguageFromRequest;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "detectLanguageFromRequest"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true
 });

package/dist/esm/cli/index.mjs

@@ -51,7 +51,7 @@ const i18nPlugin = (options = {})=>({
             });
             api.modifyFileSystemRoutes(({ entrypoint, routes })=>({
                     entrypoint,
-                    routes: applyLocalisedRoutes(routes, localeDetection ? getLocaleDetectionOptions(entrypoint.entryName, localeDetection) : void 0)
+                    routes: applyLocalisedRoutes(routes, localeDetection ? getLocaleDetectionOptions(entrypoint.entryName, localeDetection) : void 0, entrypoint)
                 }));
             api._internalServerPlugins(({ plugins })=>{
                 const { serverRoutes, metaName } = api.getAppContext();

package/dist/esm/cli/localisedRoutes.mjs

@@ -1,8 +1,9 @@
 import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
-const applyLocalisedRoutes = (routes, localeDetection)=>{
+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);
+    return applyLocalisedUrlsToRoutes(routes, languages, resolved.map, entrypoint && '@modern-js/plugin-tanstack' === getEntrypointRoutesOwner(entrypoint) ? 'canonical' : 'physical');
 };
 export { applyLocalisedRoutes };

package/dist/esm/runtime/context.mjs

@@ -1,17 +1,9 @@
 import { jsx } from "react/jsx-runtime";
 import { RuntimeComponentResolverContext } from "@modern-js/runtime/context";
-import { createContext, useCallback, useContext, useEffect, useMemo } from "react";
+import { useCallback, useContext, useEffect, useMemo } from "react";
 import { changeModernI18nLanguage, getPathLanguage, isI18nLanguageSupported, isI18nResourcesReady, translateI18n } from "./contextHelpers.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,

package/dist/esm/runtime/contexts.mjs

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

package/dist/esm/runtime/core.mjs

@@ -1,5 +1,6 @@
 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";
@@ -39,7 +40,7 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
                     fallbackLanguage,
                     ignoreRedirectRoutes,
                     urlStrategy: resolvedUrlStrategy,
-                    NavigationProvider,
+                    NavigationProvider: NavigationProvider ?? I18nRouterNavigationProvider,
                     LanguageSynchronization,
                     getLatestI18nInstance: ()=>latestI18nInstance,
                     getI18nextProvider: ()=>I18nextProvider
@@ -52,4 +53,4 @@ export { I18nLink } from "./I18nLink.mjs";
 export { Link } from "./Link.mjs";
 export { useLocalizedLocation, useLocalizedPaths } from "./localizedPaths.mjs";
 export { splitUrlTarget } from "./utils.mjs";
-export { createI18nPlugin };
+export { I18nRouterNavigationProvider, createI18nPlugin, useIntegratedRouterAdapter };

package/dist/esm/runtime/i18n/detection/middleware.mjs

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

package/dist/esm/runtime/i18n/detection/middleware.node.mjs

@@ -1,6 +1,15 @@
 import { LanguageDetector } from "i18next-http-middleware";
+import { detectLanguageFromRequest } from "../../../shared/detection.mjs";
+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 detectLanguageFromRequest(request, languages, detectionOptions) ?? void 0;
+};
 const useI18nextLanguageDetector = (i18nInstance)=>{
     if (!i18nInstance.isInitialized) return i18nInstance.use(LanguageDetector);
     return i18nInstance;

package/dist/esm/runtime/i18n/detection/priority.mjs

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

package/dist/esm/runtime/navigation.mjs

@@ -0,0 +1,7 @@
+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/runtime/routerAdapter.mjs

@@ -1,10 +1,8 @@
 import { jsx } from "react/jsx-runtime";
+import { I18nNavigationContext } from "@modern-js/plugin-i18n/runtime/contexts";
 import { RuntimeContext, isBrowser } from "@modern-js/runtime";
 import { InternalRuntimeContext } from "@modern-js/runtime/context";
-import { createContext, useContext } from "react";
-const navigationContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/I18nNavigationContext');
-const contextStore = globalThis;
-const I18nNavigationContext = contextStore[navigationContextKey] ??= /*#__PURE__*/ createContext(null);
+import { useContext } from "react";
 const I18nNavigationProvider = ({ children, value })=>/*#__PURE__*/ jsx(I18nNavigationContext.Provider, {
         value: value,
         children: children

package/dist/esm/runtime/sharedContexts.mjs

@@ -0,0 +1 @@
+export { ModernI18nContext, ReactI18nextProviderContext } from "@modern-js/plugin-i18n/runtime/contexts";