@bleedingdev/modern-js-plugin-i18n 3.8.2-ultramodern.9 → 3.8.3-ultramodern.2

package/dist/cjs/cli/index.js

@@ -31,8 +31,8 @@ __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 localisedUrls_js_namespaceObject = require("../shared/localisedUrls.js");
 const utils_js_namespaceObject = require("../shared/utils.js");
 const external_locales_js_namespaceObject = require("./locales.js");
 require("../runtime/types.js");
@@ -87,14 +87,14 @@ const i18nPlugin = (options = {})=>({
                     entrypoint,
                     routes
                 };
-                const localisedUrlsConfig = (0, localisedUrls_js_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
+                const localisedUrlsConfig = (0, i18n_runtime_extensions_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
                 if (!localisedUrlsConfig.enabled) return {
                     entrypoint,
                     routes
                 };
                 return {
                     entrypoint,
-                    routes: (0, localisedUrls_js_namespaceObject.applyLocalisedUrlsToRoutes)(routes, languages, localisedUrlsConfig.map)
+                    routes: (0, i18n_runtime_extensions_namespaceObject.applyLocalisedUrlsToRoutes)(routes, languages, localisedUrlsConfig.map)
                 };
             });
             api._internalServerPlugins(({ plugins })=>{

package/dist/cjs/runtime/context.js

@@ -38,18 +38,27 @@ 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 modernI18nContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ModernI18nContext');
-const getModernI18nContext = ()=>{
+const reactI18nextProviderContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ReactI18nextProviderContext');
+const getGlobalContext = (key, defaultValue)=>{
     const globalStore = globalThis;
-    globalStore[modernI18nContextKey] ??= /*#__PURE__*/ (0, external_react_namespaceObject.createContext)(null);
-    return globalStore[modernI18nContextKey];
+    globalStore[key] ??= /*#__PURE__*/ (0, external_react_namespaceObject.createContext)(defaultValue);
+    return globalStore[key];
 };
-const ModernI18nContext = getModernI18nContext();
-const ModernI18nProvider = ({ children, value })=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ModernI18nContext.Provider, {
+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, {
         value: value,
         children: children
     });
+    return void 0 === i18nextProvider ? content : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ReactI18nextProviderContext.Provider, {
+        value: i18nextProvider,
+        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)(()=>{
@@ -96,10 +105,14 @@ const FederatedI18nBoundary = ({ children, defaultNamespace, fallbackLanguage, r
         parent,
         scopedInstance
     ]);
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ModernI18nProvider, {
+    const scopedContent = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ModernI18nProvider, {
         value: value,
         children: children
     });
+    return I18nextProvider ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(I18nextProvider, {
+        i18n: scopedInstance,
+        children: scopedContent
+    }) : scopedContent;
 };
 const useModernI18n = ()=>{
     const context = (0, external_react_namespaceObject.useContext)(ModernI18nContext);

package/dist/cjs/runtime/hooks.js

@@ -114,7 +114,7 @@ function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
     ]);
 }
 function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls) {
-    const hasRedirectedRef = (0, external_react_namespaceObject.useRef)(false);
+    const urlRef = (0, external_react_namespaceObject.useRef)('');
     const { navigate, location, hasRouter } = (0, external_routerAdapter_js_namespaceObject.useI18nRouterAdapter)();
     (0, external_react_namespaceObject.useEffect)(()=>{
         if ('browser' !== process.env.MODERN_TARGET) return;
@@ -123,7 +123,7 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
             const ssrData = window._SSR_DATA;
             if (ssrData) return;
         } catch  {}
-        if (hasRedirectedRef.current) return;
+        if (urlRef.current === (location?.pathname || window.location.pathname)) return;
         if (!i18nInstance.isInitialized) return;
         const currentPathname = hasRouter && location ? location.pathname : window.location.pathname;
         const currentSearch = hasRouter && location ? location.search : window.location.search;
@@ -132,17 +132,14 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         const relativePath = currentPathname.replace(entryPath, '');
         if ((0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages, ignoreRedirectRoutes)) return;
         const pathDetection = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(currentPathname, languages, localePathRedirect);
-        if (pathDetection.detected) return;
-        const targetLanguage = i18nInstance.language || fallbackLanguage || languages[0] || 'en';
+        const targetLanguage = pathDetection.language || i18nInstance.language || fallbackLanguage || languages[0] || 'en';
         const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, targetLanguage, languages, localisedUrls);
         const newUrl = entryPath + newPath + currentSearch + currentHash;
-        if (newUrl !== currentPathname + currentSearch + currentHash) {
-            hasRedirectedRef.current = true;
-            if (hasRouter && navigate && location) navigate(newUrl, {
-                replace: true
-            });
-            else window.location.replace(newUrl);
-        }
+        urlRef.current = currentPathname;
+        if (newUrl !== currentPathname + currentSearch + currentHash) if (hasRouter && navigate && location) navigate(newUrl, {
+            replace: true
+        });
+        else window.location.replace(newUrl);
     }, [
         navigate,
         location,

package/dist/cjs/runtime/localizedPaths.js

@@ -33,15 +33,15 @@ __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 localisedUrls_js_namespaceObject = require("../shared/localisedUrls.js");
 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 canonicalPath = (target, config)=>{
     const { pathname, search, hash } = (0, external_utils_js_namespaceObject.splitUrlTarget)(target);
-    const resolvedPath = (0, localisedUrls_js_namespaceObject.canonicalTargetPathname)(pathname, config.languages, config.localisedUrls);
+    const resolvedPath = (0, i18n_runtime_extensions_namespaceObject.canonicalTargetPathname)(pathname, config.languages, config.localisedUrls);
     return `${resolvedPath}${search}${hash}`;
 };
 const useLocalizedPaths = ()=>{

package/dist/cjs/runtime/providerComposition.js

@@ -31,6 +31,7 @@ __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");
@@ -64,7 +65,7 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                 lang
             ]);
             (0, external_hooks_js_namespaceObject.useSdkResourcesLoader)(i18nInstance, setForceUpdate);
-            const synchronizeLanguage = (0, external_hooks_js_namespaceObject.useLanguageSync)(i18nInstance, localePathRedirect, languages, location?.pathname, prevLangRef, setLang);
+            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), [
                 lang,
@@ -99,6 +100,7 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                         }
                     }),
                     /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_context_js_namespaceObject.ModernI18nProvider, {
+                        i18nextProvider: I18nextProvider,
                         value: contextValue,
                         children: appContent
                     })

package/dist/cjs/runtime/utils.js

@@ -36,9 +36,9 @@ __webpack_require__.d(__webpack_exports__, {
     shouldIgnoreRedirect: ()=>shouldIgnoreRedirect,
     splitUrlTarget: ()=>splitUrlTarget
 });
+const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
 const runtime_namespaceObject = require("@modern-js/runtime");
 const context_namespaceObject = require("@modern-js/runtime/context");
-const localisedUrls_js_namespaceObject = require("../shared/localisedUrls.js");
 const getPathname = (context)=>{
     if ((0, runtime_namespaceObject.isBrowser)()) return window.location.pathname;
     return context.ssrContext?.request?.pathname || '/';
@@ -69,7 +69,7 @@ const splitUrlTarget = (target)=>{
 };
 const buildLocalizedUrl = (target, language, languages, localisedUrls)=>{
     const { pathname, search, hash } = splitUrlTarget(target);
-    const localizedPathname = (0, localisedUrls_js_namespaceObject.localiseTargetPathname)(pathname, language, languages, localisedUrls);
+    const localizedPathname = (0, i18n_runtime_extensions_namespaceObject.localiseTargetPathname)(pathname, language, languages, localisedUrls);
     return `${localizedPathname}${search}${hash}`;
 };
 const detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
@@ -89,7 +89,7 @@ const detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
         detected: false
     };
 };
-const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>(0, localisedUrls_js_namespaceObject.shouldSkipLocaleRedirect)(pathname, languages, ignoreRedirectRoutes);
+const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>(0, i18n_runtime_extensions_namespaceObject.shouldSkipLocaleRedirect)(pathname, languages, ignoreRedirectRoutes);
 exports.buildLocalizedUrl = __webpack_exports__.buildLocalizedUrl;
 exports.detectLanguageFromPath = __webpack_exports__.detectLanguageFromPath;
 exports.getEntryPath = __webpack_exports__.getEntryPath;

package/dist/cjs/server/index.js

@@ -33,8 +33,8 @@ __webpack_require__.d(__webpack_exports__, {
     i18nServerPlugin: ()=>i18nServerPlugin,
     matchesApiPrefix: ()=>external_apiPrefix_js_namespaceObject.matchesApiPrefix
 });
+const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
 const hono_namespaceObject = require("@modern-js/server-core/hono");
-const localisedUrls_js_namespaceObject = require("../shared/localisedUrls.js");
 const utils_js_namespaceObject = require("../shared/utils.js");
 const external_apiPrefix_js_namespaceObject = require("./apiPrefix.js");
 const external_detectorOptions_js_namespaceObject = require("./detectorOptions.js");
@@ -110,7 +110,7 @@ const i18nServerPlugin = (options)=>({
                                     const localizedUrl = (0, external_redirectPolicy_js_namespaceObject.buildLocalizedUrl)(c.req, originUrlPath, targetLanguage, languages, localisedUrls);
                                     return (0, external_redirectPolicy_js_namespaceObject.createLocaleRedirectResponse)(localizedUrl);
                                 }
-                                const localisedUrlsConfig = (0, localisedUrls_js_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
+                                const localisedUrlsConfig = (0, i18n_runtime_extensions_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
                                 if (localisedUrlsConfig.enabled) {
                                     const expectedUrl = (0, external_redirectPolicy_js_namespaceObject.buildLocalizedUrl)(c.req, originUrlPath, language, languages, localisedUrls);
                                     if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return (0, external_redirectPolicy_js_namespaceObject.createLocaleRedirectResponse)(expectedUrl);

package/dist/cjs/server/redirectPolicy.js

@@ -34,7 +34,7 @@ __webpack_require__.d(__webpack_exports__, {
     isStaticResourceRequest: ()=>isStaticResourceRequest,
     shouldIgnoreRedirect: ()=>shouldIgnoreRedirect
 });
-const localisedUrls_js_namespaceObject = require("../shared/localisedUrls.js");
+const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
 const stripUrlPathPrefix = (pathname, urlPath)=>{
     const basePath = urlPath.replace('/*', '');
     if (!basePath || '/' === basePath) return pathname;
@@ -43,13 +43,13 @@ const stripUrlPathPrefix = (pathname, urlPath)=>{
 };
 const shouldIgnoreRedirect = (pathname, urlPath, ignoreRedirectRoutes)=>{
     const remainingPath = stripUrlPathPrefix(pathname, urlPath);
-    return (0, localisedUrls_js_namespaceObject.shouldSkipLocaleRedirect)(remainingPath, [], ignoreRedirectRoutes);
+    return (0, i18n_runtime_extensions_namespaceObject.shouldSkipLocaleRedirect)(remainingPath, [], ignoreRedirectRoutes);
 };
 const isStaticResourceRequest = (pathname, staticRoutePrefixes, languages = [])=>{
-    if ((0, localisedUrls_js_namespaceObject.isDefaultLocaleRedirectSkipPath)(pathname, languages)) return true;
-    const matchesStaticRoutePrefix = (targetPathname)=>staticRoutePrefixes.some((prefix)=>(0, localisedUrls_js_namespaceObject.matchesPathPrefix)(targetPathname, prefix));
+    if ((0, i18n_runtime_extensions_namespaceObject.isDefaultLocaleRedirectSkipPath)(pathname, languages)) return true;
+    const matchesStaticRoutePrefix = (targetPathname)=>staticRoutePrefixes.some((prefix)=>(0, i18n_runtime_extensions_namespaceObject.matchesPathPrefix)(targetPathname, prefix));
     if (matchesStaticRoutePrefix(pathname)) return true;
-    const pathWithoutLanguage = (0, localisedUrls_js_namespaceObject.stripLanguagePrefix)(pathname, languages);
+    const pathWithoutLanguage = (0, i18n_runtime_extensions_namespaceObject.stripLanguagePrefix)(pathname, languages);
     return pathWithoutLanguage !== pathname && matchesStaticRoutePrefix(pathWithoutLanguage);
 };
 const getLanguageFromPath = (req, urlPath, languages)=>{
@@ -66,7 +66,7 @@ const buildLocalizedUrl = (req, urlPath, language, languages, localisedUrls)=>{
     const pathname = url.pathname;
     const basePath = urlPath.replace('/*', '');
     const remainingPath = stripUrlPathPrefix(pathname, urlPath);
-    const newPathname = (0, localisedUrls_js_namespaceObject.localiseTargetPathname)(remainingPath, language, languages, localisedUrls);
+    const newPathname = (0, i18n_runtime_extensions_namespaceObject.localiseTargetPathname)(remainingPath, language, languages, localisedUrls);
     const suffix = `${url.search}${url.hash}`;
     const localizedUrl = '/' === basePath ? newPathname + suffix : basePath + newPathname + suffix;
     return localizedUrl;

package/dist/esm/cli/index.mjs

@@ -1,5 +1,5 @@
+import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
 import { getPublicDirRoutePrefixes } from "@modern-js/server-core";
-import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "../shared/localisedUrls.mjs";
 import { getBackendOptions, getLocaleDetectionOptions } from "../shared/utils.mjs";
 import { applyDetectedBackendPaths, detectLocalesDirectory } from "./locales.mjs";
 import "../runtime/types.mjs";

package/dist/esm/runtime/context.mjs

@@ -4,18 +4,27 @@ import { changeModernI18nLanguage, getPathLanguage, isI18nLanguageSupported, isI
 import { getActualI18nextInstance } from "./i18n/instance.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
 const modernI18nContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ModernI18nContext');
-const getModernI18nContext = ()=>{
+const reactI18nextProviderContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ReactI18nextProviderContext');
+const getGlobalContext = (key, defaultValue)=>{
     const globalStore = globalThis;
-    globalStore[modernI18nContextKey] ??= /*#__PURE__*/ createContext(null);
-    return globalStore[modernI18nContextKey];
+    globalStore[key] ??= /*#__PURE__*/ createContext(defaultValue);
+    return globalStore[key];
 };
-const ModernI18nContext = getModernI18nContext();
-const ModernI18nProvider = ({ children, value })=>/*#__PURE__*/ jsx(ModernI18nContext.Provider, {
+const ModernI18nContext = getGlobalContext(modernI18nContextKey, null);
+const ReactI18nextProviderContext = getGlobalContext(reactI18nextProviderContextKey, null);
+const ModernI18nProvider = ({ children, i18nextProvider, value })=>{
+    const content = /*#__PURE__*/ jsx(ModernI18nContext.Provider, {
         value: value,
         children: children
     });
+    return void 0 === i18nextProvider ? content : /*#__PURE__*/ jsx(ReactI18nextProviderContext.Provider, {
+        value: i18nextProvider,
+        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(()=>{
@@ -62,10 +71,14 @@ const FederatedI18nBoundary = ({ children, defaultNamespace, fallbackLanguage, r
         parent,
         scopedInstance
     ]);
-    return /*#__PURE__*/ jsx(ModernI18nProvider, {
+    const scopedContent = /*#__PURE__*/ jsx(ModernI18nProvider, {
         value: value,
         children: children
     });
+    return I18nextProvider ? /*#__PURE__*/ jsx(I18nextProvider, {
+        i18n: scopedInstance,
+        children: scopedContent
+    }) : scopedContent;
 };
 const useModernI18n = ()=>{
     const context = useContext(ModernI18nContext);

package/dist/esm/runtime/hooks.mjs

@@ -79,7 +79,7 @@ function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
     ]);
 }
 function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls) {
-    const hasRedirectedRef = useRef(false);
+    const urlRef = useRef('');
     const { navigate, location, hasRouter } = useI18nRouterAdapter();
     useEffect(()=>{
         if ('browser' !== process.env.MODERN_TARGET) return;
@@ -88,7 +88,7 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
             const ssrData = window._SSR_DATA;
             if (ssrData) return;
         } catch  {}
-        if (hasRedirectedRef.current) return;
+        if (urlRef.current === (location?.pathname || window.location.pathname)) return;
         if (!i18nInstance.isInitialized) return;
         const currentPathname = hasRouter && location ? location.pathname : window.location.pathname;
         const currentSearch = hasRouter && location ? location.search : window.location.search;
@@ -97,17 +97,14 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         const relativePath = currentPathname.replace(entryPath, '');
         if (shouldIgnoreRedirect(relativePath, languages, ignoreRedirectRoutes)) return;
         const pathDetection = detectLanguageFromPath(currentPathname, languages, localePathRedirect);
-        if (pathDetection.detected) return;
-        const targetLanguage = i18nInstance.language || fallbackLanguage || languages[0] || 'en';
+        const targetLanguage = pathDetection.language || i18nInstance.language || fallbackLanguage || languages[0] || 'en';
         const newPath = buildLocalizedUrl(relativePath, targetLanguage, languages, localisedUrls);
         const newUrl = entryPath + newPath + currentSearch + currentHash;
-        if (newUrl !== currentPathname + currentSearch + currentHash) {
-            hasRedirectedRef.current = true;
-            if (hasRouter && navigate && location) navigate(newUrl, {
-                replace: true
-            });
-            else window.location.replace(newUrl);
-        }
+        urlRef.current = currentPathname;
+        if (newUrl !== currentPathname + currentSearch + currentHash) if (hasRouter && navigate && location) navigate(newUrl, {
+            replace: true
+        });
+        else window.location.replace(newUrl);
     }, [
         navigate,
         location,

package/dist/esm/runtime/localizedPaths.mjs

@@ -1,5 +1,5 @@
+import { canonicalTargetPathname } from "@modern-js/i18n-runtime-extensions";
 import { useMemo } from "react";
-import { canonicalTargetPathname } from "../shared/localisedUrls.mjs";
 import { useModernI18n } from "./context.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
 import { buildLocalizedUrl, splitUrlTarget } from "./utils.mjs";

package/dist/esm/runtime/providerComposition.mjs

@@ -1,9 +1,10 @@
 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, useLanguageSync, useSdkResourcesLoader } from "./hooks.mjs";
+import { createContextValue, useClientSideRedirect, useSdkResourcesLoader } from "./hooks.mjs";
 import { getI18nextInstanceForProvider } from "./i18n/instance.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
 const createI18nRootWrapper = (options)=>(App)=>(props)=>{
@@ -67,6 +68,7 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                         }
                     }),
                     /*#__PURE__*/ jsx(ModernI18nProvider, {
+                        i18nextProvider: I18nextProvider,
                         value: contextValue,
                         children: appContent
                     })

package/dist/esm/runtime/utils.mjs

@@ -1,6 +1,6 @@
+import { localiseTargetPathname, shouldSkipLocaleRedirect } from "@modern-js/i18n-runtime-extensions";
 import { isBrowser } from "@modern-js/runtime";
 import { getGlobalBasename } from "@modern-js/runtime/context";
-import { localiseTargetPathname, shouldSkipLocaleRedirect } from "../shared/localisedUrls.mjs";
 const getPathname = (context)=>{
     if (isBrowser()) return window.location.pathname;
     return context.ssrContext?.request?.pathname || '/';

package/dist/esm/server/index.mjs

@@ -1,4 +1,4 @@
-import { resolveLocalisedUrlsConfig } from "../shared/localisedUrls.mjs";
+import { resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
 import { getLocaleDetectionOptions } from "../shared/utils.mjs";
 import { collectApiPrefixes, matchesApiPrefix } from "./apiPrefix.mjs";
 import { convertToHonoLanguageDetectorOptions } from "./detectorOptions.mjs";

package/dist/esm/server/redirectPolicy.mjs

@@ -1,4 +1,4 @@
-import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "../shared/localisedUrls.mjs";
+import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "@modern-js/i18n-runtime-extensions";
 const stripUrlPathPrefix = (pathname, urlPath)=>{
     const basePath = urlPath.replace('/*', '');
     if (!basePath || '/' === basePath) return pathname;

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

@@ -1,6 +1,6 @@
 import "node:module";
+import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
 import { getPublicDirRoutePrefixes } from "@modern-js/server-core";
-import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "../shared/localisedUrls.mjs";
 import { getBackendOptions, getLocaleDetectionOptions } from "../shared/utils.mjs";
 import { applyDetectedBackendPaths, detectLocalesDirectory } from "./locales.mjs";
 import "../runtime/types.mjs";

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

@@ -5,18 +5,27 @@ import { changeModernI18nLanguage, getPathLanguage, isI18nLanguageSupported, isI
 import { getActualI18nextInstance } from "./i18n/instance.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
 const modernI18nContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ModernI18nContext');
-const getModernI18nContext = ()=>{
+const reactI18nextProviderContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ReactI18nextProviderContext');
+const getGlobalContext = (key, defaultValue)=>{
     const globalStore = globalThis;
-    globalStore[modernI18nContextKey] ??= /*#__PURE__*/ createContext(null);
-    return globalStore[modernI18nContextKey];
+    globalStore[key] ??= /*#__PURE__*/ createContext(defaultValue);
+    return globalStore[key];
 };
-const ModernI18nContext = getModernI18nContext();
-const ModernI18nProvider = ({ children, value })=>/*#__PURE__*/ jsx(ModernI18nContext.Provider, {
+const ModernI18nContext = getGlobalContext(modernI18nContextKey, null);
+const ReactI18nextProviderContext = getGlobalContext(reactI18nextProviderContextKey, null);
+const ModernI18nProvider = ({ children, i18nextProvider, value })=>{
+    const content = /*#__PURE__*/ jsx(ModernI18nContext.Provider, {
         value: value,
         children: children
     });
+    return void 0 === i18nextProvider ? content : /*#__PURE__*/ jsx(ReactI18nextProviderContext.Provider, {
+        value: i18nextProvider,
+        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(()=>{
@@ -63,10 +72,14 @@ const FederatedI18nBoundary = ({ children, defaultNamespace, fallbackLanguage, r
         parent,
         scopedInstance
     ]);
-    return /*#__PURE__*/ jsx(ModernI18nProvider, {
+    const scopedContent = /*#__PURE__*/ jsx(ModernI18nProvider, {
         value: value,
         children: children
     });
+    return I18nextProvider ? /*#__PURE__*/ jsx(I18nextProvider, {
+        i18n: scopedInstance,
+        children: scopedContent
+    }) : scopedContent;
 };
 const useModernI18n = ()=>{
     const context = useContext(ModernI18nContext);

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

@@ -80,7 +80,7 @@ function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
     ]);
 }
 function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls) {
-    const hasRedirectedRef = useRef(false);
+    const urlRef = useRef('');
     const { navigate, location, hasRouter } = useI18nRouterAdapter();
     useEffect(()=>{
         if ('browser' !== process.env.MODERN_TARGET) return;
@@ -89,7 +89,7 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
             const ssrData = window._SSR_DATA;
             if (ssrData) return;
         } catch  {}
-        if (hasRedirectedRef.current) return;
+        if (urlRef.current === (location?.pathname || window.location.pathname)) return;
         if (!i18nInstance.isInitialized) return;
         const currentPathname = hasRouter && location ? location.pathname : window.location.pathname;
         const currentSearch = hasRouter && location ? location.search : window.location.search;
@@ -98,17 +98,14 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         const relativePath = currentPathname.replace(entryPath, '');
         if (shouldIgnoreRedirect(relativePath, languages, ignoreRedirectRoutes)) return;
         const pathDetection = detectLanguageFromPath(currentPathname, languages, localePathRedirect);
-        if (pathDetection.detected) return;
-        const targetLanguage = i18nInstance.language || fallbackLanguage || languages[0] || 'en';
+        const targetLanguage = pathDetection.language || i18nInstance.language || fallbackLanguage || languages[0] || 'en';
         const newPath = buildLocalizedUrl(relativePath, targetLanguage, languages, localisedUrls);
         const newUrl = entryPath + newPath + currentSearch + currentHash;
-        if (newUrl !== currentPathname + currentSearch + currentHash) {
-            hasRedirectedRef.current = true;
-            if (hasRouter && navigate && location) navigate(newUrl, {
-                replace: true
-            });
-            else window.location.replace(newUrl);
-        }
+        urlRef.current = currentPathname;
+        if (newUrl !== currentPathname + currentSearch + currentHash) if (hasRouter && navigate && location) navigate(newUrl, {
+            replace: true
+        });
+        else window.location.replace(newUrl);
     }, [
         navigate,
         location,

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

@@ -1,6 +1,6 @@
 import "node:module";
+import { canonicalTargetPathname } from "@modern-js/i18n-runtime-extensions";
 import { useMemo } from "react";
-import { canonicalTargetPathname } from "../shared/localisedUrls.mjs";
 import { useModernI18n } from "./context.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
 import { buildLocalizedUrl, splitUrlTarget } from "./utils.mjs";

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

@@ -1,10 +1,11 @@
 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, useLanguageSync, useSdkResourcesLoader } from "./hooks.mjs";
+import { createContextValue, useClientSideRedirect, useSdkResourcesLoader } from "./hooks.mjs";
 import { getI18nextInstanceForProvider } from "./i18n/instance.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
 const createI18nRootWrapper = (options)=>(App)=>(props)=>{
@@ -68,6 +69,7 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                         }
                     }),
                     /*#__PURE__*/ jsx(ModernI18nProvider, {
+                        i18nextProvider: I18nextProvider,
                         value: contextValue,
                         children: appContent
                     })

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

@@ -1,7 +1,7 @@
 import "node:module";
+import { localiseTargetPathname, shouldSkipLocaleRedirect } from "@modern-js/i18n-runtime-extensions";
 import { isBrowser } from "@modern-js/runtime";
 import { getGlobalBasename } from "@modern-js/runtime/context";
-import { localiseTargetPathname, shouldSkipLocaleRedirect } from "../shared/localisedUrls.mjs";
 const getPathname = (context)=>{
     if (isBrowser()) return window.location.pathname;
     return context.ssrContext?.request?.pathname || '/';

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

@@ -1,5 +1,5 @@
 import "node:module";
-import { resolveLocalisedUrlsConfig } from "../shared/localisedUrls.mjs";
+import { resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
 import { getLocaleDetectionOptions } from "../shared/utils.mjs";
 import { collectApiPrefixes, matchesApiPrefix } from "./apiPrefix.mjs";
 import { convertToHonoLanguageDetectorOptions } from "./detectorOptions.mjs";

package/dist/esm-node/server/redirectPolicy.mjs

@@ -1,5 +1,5 @@
 import "node:module";
-import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "../shared/localisedUrls.mjs";
+import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "@modern-js/i18n-runtime-extensions";
 const stripUrlPathPrefix = (pathname, urlPath)=>{
     const basePath = urlPath.replace('/*', '');
     if (!basePath || '/' === basePath) return pathname;

package/dist/types/runtime/context.d.ts

@@ -1,5 +1,5 @@
-import type { FC, ReactNode } from 'react';
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
+import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
+import type { ComponentType, FC, ReactNode } from 'react';
 import type { I18nInstance } from './i18n';
 import type { Resources } from './i18n/instance';
 interface ModernI18nContextValue {
@@ -15,6 +15,7 @@ interface ModernI18nContextValue {
 }
 interface ModernI18nProviderProps {
     children: ReactNode;
+    i18nextProvider?: ComponentType<any> | null;
     value: ModernI18nContextValue;
 }
 export declare const ModernI18nProvider: FC<ModernI18nProviderProps>;

package/dist/types/runtime/contextHelpers.d.ts

@@ -1,4 +1,4 @@
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
+import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 import type { I18nInstance } from './i18n';
 type Navigate = (url: string, options?: {
     replace?: boolean;

package/dist/types/runtime/hooks.d.ts

@@ -1,5 +1,5 @@
+import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 import type React from 'react';
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
 import type { I18nInstance } from './i18n';
 export declare function createContextValue(lang: string, i18nInstance: I18nInstance | undefined, entryName: string | undefined, languages: string[], localePathRedirect: boolean, ignoreRedirectRoutes: string[] | ((pathname: string) => boolean) | undefined, localisedUrls: LocalisedUrlsOption | undefined, setLang: (lang: string) => void, synchronizeLanguage: (lang: string) => void): {
     language: string;

package/dist/types/runtime/localizedPaths.d.ts

@@ -1,4 +1,4 @@
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
+import { type LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 export interface LocalizedPathsConfig {
     languages: string[];
     localisedUrls?: LocalisedUrlsOption;

package/dist/types/runtime/utils.d.ts

@@ -1,4 +1,4 @@
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
+import { type LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 export declare const getPathname: (context: {
     ssrContext?: {
         request?: {

package/dist/types/shared/type.d.ts

@@ -1,5 +1,5 @@
+import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 import type { LanguageDetectorOptions, Resources } from '../runtime/i18n/instance';
-import type { LocalisedUrlsOption } from './localisedUrls';
 export interface BaseLocaleDetectionOptions {
     localePathRedirect?: boolean;
     i18nextDetector?: boolean;