@modern-js/plugin-i18n 3.9.2 → 3.10.0

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

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

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,13 @@ __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 cacheUserLanguage = (_i18nInstance, _language, _detectionOptions)=>{};
-const readLanguageFromStorage = (_detectionOptions)=>{};
+const readLanguageFromStorage = (detectionOptions, request, languages = [])=>{
+    if (!request) return;
+    const detectedLanguage = (0, detection_js_namespaceObject.detectLanguageFromRequest)(request, languages, detectionOptions);
+    return detectedLanguage ?? void 0;
+};
 const useI18nextLanguageDetector = (i18nInstance)=>{
     if (!i18nInstance.isInitialized) return i18nInstance.use(external_i18next_http_middleware_namespaceObject.LanguageDetector);
     return i18nInstance;

package/dist/cjs/runtime/i18n/instance.js

@@ -69,14 +69,6 @@ async function createI18nextInstance() {
         return null;
     }
 }
-async function tryImportReactI18next() {
-    try {
-        const reactI18next = await import("react-i18next");
-        return reactI18next;
-    } catch (error) {
-        return null;
-    }
-}
 function getI18nextInstanceForProvider(instance) {
     if (isI18nWrapperInstance(instance)) {
         const i18nextInstance = getI18nWrapperI18nextInstance(instance);
@@ -94,14 +86,20 @@ async function getI18nInstance(userInstance) {
     throw new Error('No i18n instance found');
 }
 async function getInitReactI18next() {
-    const reactI18nextModule = await tryImportReactI18next();
-    if (reactI18nextModule) return reactI18nextModule.initReactI18next;
-    return null;
+    try {
+        const { initReactI18next } = await import("react-i18next");
+        return initReactI18next;
+    } catch (error) {
+        return null;
+    }
 }
 async function getI18nextProvider() {
-    const reactI18nextModule = await tryImportReactI18next();
-    if (reactI18nextModule) return reactI18nextModule.I18nextProvider;
-    return null;
+    try {
+        const { I18nextProvider } = await import("react-i18next");
+        return I18nextProvider;
+    } catch (error) {
+        return null;
+    }
 }
 __webpack_require__.d(__webpack_exports__, {
     getActualI18nextInstance: ()=>getActualI18nextInstance,

package/dist/cjs/runtime/utils.js

@@ -1,19 +1,5 @@
 "use strict";
-var __webpack_modules__ = {
-    "@modern-js/runtime/router" (module) {
-        module.exports = require("@modern-js/runtime/router");
-    }
-};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
+var __webpack_require__ = {};
 (()=>{
     __webpack_require__.d = (exports1, getters, values)=>{
         var define = (defs, kind)=>{
@@ -40,85 +26,83 @@ function __webpack_require__(moduleId) {
     };
 })();
 var __webpack_exports__ = {};
-(()=>{
-    __webpack_require__.r(__webpack_exports__);
-    __webpack_require__.d(__webpack_exports__, {
-        buildLocalizedUrl: ()=>buildLocalizedUrl,
-        detectLanguageFromPath: ()=>detectLanguageFromPath,
-        getEntryPath: ()=>getEntryPath,
-        getLanguageFromPath: ()=>getLanguageFromPath,
-        getPathname: ()=>getPathname,
-        shouldIgnoreRedirect: ()=>shouldIgnoreRedirect,
-        useRouterHooks: ()=>useRouterHooks
-    });
-    const runtime_namespaceObject = require("@modern-js/runtime");
-    const context_namespaceObject = require("@modern-js/runtime/context");
-    const getPathname = (context)=>{
-        if ((0, runtime_namespaceObject.isBrowser)()) return window.location.pathname;
-        return context.ssrContext?.request?.pathname || '/';
-    };
-    const getEntryPath = ()=>{
-        const basename = (0, context_namespaceObject.getGlobalBasename)();
-        if (basename) return '/' === basename ? '' : basename;
-        return '';
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    buildLocalizedUrl: ()=>buildLocalizedUrl,
+    detectLanguageFromPath: ()=>detectLanguageFromPath,
+    getEntryPath: ()=>getEntryPath,
+    getLanguageFromPath: ()=>getLanguageFromPath,
+    getPathname: ()=>getPathname,
+    shouldIgnoreRedirect: ()=>shouldIgnoreRedirect,
+    useRouterHooks: ()=>useRouterHooks
+});
+const runtime_namespaceObject = require("@modern-js/runtime");
+const context_namespaceObject = require("@modern-js/runtime/context");
+const router_namespaceObject = require("@modern-js/runtime/router");
+const getPathname = (context)=>{
+    if ((0, runtime_namespaceObject.isBrowser)()) return window.location.pathname;
+    return context.ssrContext?.request?.pathname || '/';
+};
+const getEntryPath = ()=>{
+    const basename = (0, context_namespaceObject.getGlobalBasename)();
+    if (basename) return '/' === basename ? '' : basename;
+    return '';
+};
+const getLanguageFromPath = (pathname, languages, fallbackLanguage)=>{
+    const segments = pathname.split('/').filter(Boolean);
+    const firstSegment = segments[0];
+    if (languages.includes(firstSegment)) return firstSegment;
+    return fallbackLanguage;
+};
+const buildLocalizedUrl = (pathname, language, languages)=>{
+    const segments = pathname.split('/').filter(Boolean);
+    if (segments.length > 0 && languages.includes(segments[0])) segments[0] = language;
+    else segments.unshift(language);
+    return `/${segments.join('/')}`;
+};
+const detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
+    if (!localePathRedirect) return {
+        detected: false
     };
-    const getLanguageFromPath = (pathname, languages, fallbackLanguage)=>{
-        const segments = pathname.split('/').filter(Boolean);
-        const firstSegment = segments[0];
-        if (languages.includes(firstSegment)) return firstSegment;
-        return fallbackLanguage;
+    const entryPath = getEntryPath();
+    const relativePath = pathname.replace(entryPath, '');
+    const segments = relativePath.split('/').filter(Boolean);
+    const segmentsToCheck = !entryPath && segments.length > 1 && segments[0] && !languages.includes(segments[0]) ? segments.slice(1) : segments;
+    const firstSegment = segmentsToCheck[0];
+    if (firstSegment && languages.includes(firstSegment)) return {
+        detected: true,
+        language: firstSegment
     };
-    const buildLocalizedUrl = (pathname, language, languages)=>{
-        const segments = pathname.split('/').filter(Boolean);
-        if (segments.length > 0 && languages.includes(segments[0])) segments[0] = language;
-        else segments.unshift(language);
-        return `/${segments.join('/')}`;
+    return {
+        detected: false
     };
-    const detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
-        if (!localePathRedirect) return {
-            detected: false
-        };
-        const entryPath = getEntryPath();
-        const relativePath = pathname.replace(entryPath, '');
-        const segments = relativePath.split('/').filter(Boolean);
-        const segmentsToCheck = !entryPath && segments.length > 1 && segments[0] && !languages.includes(segments[0]) ? segments.slice(1) : segments;
-        const firstSegment = segmentsToCheck[0];
-        if (firstSegment && languages.includes(firstSegment)) return {
-            detected: true,
-            language: firstSegment
+};
+const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>{
+    if (!ignoreRedirectRoutes) return false;
+    const segments = pathname.split('/').filter(Boolean);
+    let pathWithoutLang = pathname;
+    if (segments.length > 0 && languages.includes(segments[0])) pathWithoutLang = `/${segments.slice(1).join('/')}`;
+    const normalizedPath = pathWithoutLang.startsWith('/') ? pathWithoutLang : `/${pathWithoutLang}`;
+    if ('function' == typeof ignoreRedirectRoutes) return ignoreRedirectRoutes(normalizedPath);
+    return ignoreRedirectRoutes.some((pattern)=>normalizedPath === pattern || normalizedPath.startsWith(`${pattern}/`));
+};
+const useRouterHooks = ()=>{
+    try {
+        return {
+            navigate: (0, router_namespaceObject.useNavigate)(),
+            location: (0, router_namespaceObject.useLocation)(),
+            params: (0, router_namespaceObject.useParams)(),
+            hasRouter: true
         };
+    } catch (error) {
         return {
-            detected: false
+            navigate: null,
+            location: null,
+            params: {},
+            hasRouter: false
         };
-    };
-    const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>{
-        if (!ignoreRedirectRoutes) return false;
-        const segments = pathname.split('/').filter(Boolean);
-        let pathWithoutLang = pathname;
-        if (segments.length > 0 && languages.includes(segments[0])) pathWithoutLang = `/${segments.slice(1).join('/')}`;
-        const normalizedPath = pathWithoutLang.startsWith('/') ? pathWithoutLang : `/${pathWithoutLang}`;
-        if ('function' == typeof ignoreRedirectRoutes) return ignoreRedirectRoutes(normalizedPath);
-        return ignoreRedirectRoutes.some((pattern)=>normalizedPath === pattern || normalizedPath.startsWith(`${pattern}/`));
-    };
-    const useRouterHooks = ()=>{
-        try {
-            const { useLocation, useNavigate, useParams } = __webpack_require__("@modern-js/runtime/router");
-            return {
-                navigate: useNavigate(),
-                location: useLocation(),
-                params: useParams(),
-                hasRouter: true
-            };
-        } catch (error) {
-            return {
-                navigate: null,
-                location: null,
-                params: {},
-                hasRouter: false
-            };
-        }
-    };
-})();
+    }
+};
 exports.buildLocalizedUrl = __webpack_exports__.buildLocalizedUrl;
 exports.detectLanguageFromPath = __webpack_exports__.detectLanguageFromPath;
 exports.getEntryPath = __webpack_exports__.getEntryPath;

package/dist/cjs/shared/detection.js

@@ -47,8 +47,11 @@ function detectLanguageFromRequest(req, languages, detectionOptions) {
             'header'
         ];
         const getHeader = (name)=>{
-            req.headers, Headers;
-            return req.headers.get(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;
@@ -83,19 +86,30 @@ function detectLanguageFromRequest(req, languages, detectionOptions) {
                             const languagesList = acceptLanguage.split(',').map((lang)=>{
                                 const [code, q] = lang.trim().split(';');
                                 return {
-                                    code: code.split('-')[0],
+                                    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;
+                            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;

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

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

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,11 @@
 import { LanguageDetector } from "i18next-http-middleware";
+import { detectLanguageFromRequest } from "../../../shared/detection.mjs";
 const cacheUserLanguage = (_i18nInstance, _language, _detectionOptions)=>{};
-const readLanguageFromStorage = (_detectionOptions)=>{};
+const readLanguageFromStorage = (detectionOptions, request, languages = [])=>{
+    if (!request) return;
+    const detectedLanguage = detectLanguageFromRequest(request, languages, detectionOptions);
+    return detectedLanguage ?? void 0;
+};
 const useI18nextLanguageDetector = (i18nInstance)=>{
     if (!i18nInstance.isInitialized) return i18nInstance.use(LanguageDetector);
     return i18nInstance;

package/dist/esm/runtime/i18n/instance.mjs

@@ -40,14 +40,6 @@ async function createI18nextInstance() {
         return null;
     }
 }
-async function tryImportReactI18next() {
-    try {
-        const reactI18next = await import("react-i18next");
-        return reactI18next;
-    } catch (error) {
-        return null;
-    }
-}
 function getI18nextInstanceForProvider(instance) {
     if (isI18nWrapperInstance(instance)) {
         const i18nextInstance = getI18nWrapperI18nextInstance(instance);
@@ -65,13 +57,19 @@ async function getI18nInstance(userInstance) {
     throw new Error('No i18n instance found');
 }
 async function getInitReactI18next() {
-    const reactI18nextModule = await tryImportReactI18next();
-    if (reactI18nextModule) return reactI18nextModule.initReactI18next;
-    return null;
+    try {
+        const { initReactI18next } = await import("react-i18next");
+        return initReactI18next;
+    } catch (error) {
+        return null;
+    }
 }
 async function getI18nextProvider() {
-    const reactI18nextModule = await tryImportReactI18next();
-    if (reactI18nextModule) return reactI18nextModule.I18nextProvider;
-    return null;
+    try {
+        const { I18nextProvider } = await import("react-i18next");
+        return I18nextProvider;
+    } catch (error) {
+        return null;
+    }
 }
 export { getActualI18nextInstance, getI18nInstance, getI18nWrapperI18nextInstance, getI18nextInstanceForProvider, getI18nextProvider, getInitReactI18next, isI18nInstance, isI18nWrapperInstance };

package/dist/esm/runtime/utils.mjs

@@ -1,11 +1,6 @@
 import { isBrowser } from "@modern-js/runtime";
 import { getGlobalBasename } from "@modern-js/runtime/context";
-import { __webpack_require__ } from "../rslib-runtime~1.mjs";
-__webpack_require__.add({
-    4734 (module) {
-        module.exports = require("@modern-js/runtime/router");
-    }
-});
+import { useLocation, useNavigate, useParams } from "@modern-js/runtime/router";
 const getPathname = (context)=>{
     if (isBrowser()) return window.location.pathname;
     return context.ssrContext?.request?.pathname || '/';
@@ -55,7 +50,6 @@ const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>{
 };
 const useRouterHooks = ()=>{
     try {
-        const { useLocation, useNavigate, useParams } = __webpack_require__(4734);
         return {
             navigate: useNavigate(),
             location: useLocation(),

package/dist/esm/shared/detection.mjs

@@ -15,8 +15,11 @@ function detectLanguageFromRequest(req, languages, detectionOptions) {
             'header'
         ];
         const getHeader = (name)=>{
-            req.headers, Headers;
-            return req.headers.get(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;
@@ -51,19 +54,30 @@ function detectLanguageFromRequest(req, languages, detectionOptions) {
                             const languagesList = acceptLanguage.split(',').map((lang)=>{
                                 const [code, q] = lang.trim().split(';');
                                 return {
-                                    code: code.split('-')[0],
+                                    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;
+                            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;

package/dist/esm-node/runtime/i18n/detection/index.mjs

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

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

@@ -12,7 +12,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-node/runtime/i18n/detection/middleware.node.mjs

@@ -1,7 +1,12 @@
 import "node:module";
 import { LanguageDetector } from "i18next-http-middleware";
+import { detectLanguageFromRequest } from "../../../shared/detection.mjs";
 const cacheUserLanguage = (_i18nInstance, _language, _detectionOptions)=>{};
-const readLanguageFromStorage = (_detectionOptions)=>{};
+const readLanguageFromStorage = (detectionOptions, request, languages = [])=>{
+    if (!request) return;
+    const detectedLanguage = detectLanguageFromRequest(request, languages, detectionOptions);
+    return detectedLanguage ?? void 0;
+};
 const useI18nextLanguageDetector = (i18nInstance)=>{
     if (!i18nInstance.isInitialized) return i18nInstance.use(LanguageDetector);
     return i18nInstance;

package/dist/esm-node/runtime/i18n/instance.mjs

@@ -41,14 +41,6 @@ async function createI18nextInstance() {
         return null;
     }
 }
-async function tryImportReactI18next() {
-    try {
-        const reactI18next = await import("react-i18next");
-        return reactI18next;
-    } catch (error) {
-        return null;
-    }
-}
 function getI18nextInstanceForProvider(instance) {
     if (isI18nWrapperInstance(instance)) {
         const i18nextInstance = getI18nWrapperI18nextInstance(instance);
@@ -66,13 +58,19 @@ async function getI18nInstance(userInstance) {
     throw new Error('No i18n instance found');
 }
 async function getInitReactI18next() {
-    const reactI18nextModule = await tryImportReactI18next();
-    if (reactI18nextModule) return reactI18nextModule.initReactI18next;
-    return null;
+    try {
+        const { initReactI18next } = await import("react-i18next");
+        return initReactI18next;
+    } catch (error) {
+        return null;
+    }
 }
 async function getI18nextProvider() {
-    const reactI18nextModule = await tryImportReactI18next();
-    if (reactI18nextModule) return reactI18nextModule.I18nextProvider;
-    return null;
+    try {
+        const { I18nextProvider } = await import("react-i18next");
+        return I18nextProvider;
+    } catch (error) {
+        return null;
+    }
 }
 export { getActualI18nextInstance, getI18nInstance, getI18nWrapperI18nextInstance, getI18nextInstanceForProvider, getI18nextProvider, getInitReactI18next, isI18nInstance, isI18nWrapperInstance };

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

@@ -1,14 +1,7 @@
 import "node:module";
 import { isBrowser } from "@modern-js/runtime";
 import { getGlobalBasename } from "@modern-js/runtime/context";
-import { __webpack_require__ } from "../rslib-runtime~0.mjs";
-import { createRequire as __rspack_createRequire } from "node:module";
-const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
-__webpack_require__.add({
-    "@modern-js/runtime/router?a7f7" (module) {
-        module.exports = __rspack_createRequire_require("@modern-js/runtime/router");
-    }
-});
+import { useLocation, useNavigate, useParams } from "@modern-js/runtime/router";
 const getPathname = (context)=>{
     if (isBrowser()) return window.location.pathname;
     return context.ssrContext?.request?.pathname || '/';
@@ -58,7 +51,6 @@ const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>{
 };
 const useRouterHooks = ()=>{
     try {
-        const { useLocation, useNavigate, useParams } = __webpack_require__("@modern-js/runtime/router?a7f7");
         return {
             navigate: useNavigate(),
             location: useLocation(),

package/dist/esm-node/shared/detection.mjs

@@ -16,8 +16,11 @@ function detectLanguageFromRequest(req, languages, detectionOptions) {
             'header'
         ];
         const getHeader = (name)=>{
-            req.headers, Headers;
-            return req.headers.get(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;
@@ -52,19 +55,30 @@ function detectLanguageFromRequest(req, languages, detectionOptions) {
                             const languagesList = acceptLanguage.split(',').map((lang)=>{
                                 const [code, q] = lang.trim().split(';');
                                 return {
-                                    code: code.split('-')[0],
+                                    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;
+                            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;

package/dist/types/runtime/i18n/detection/middleware.d.ts

@@ -1,4 +1,5 @@
-import type { I18nInstance } from '../instance.js';
+import type { detectLanguageFromRequest } from '../../../shared/detection.js';
+import type { I18nInstance, LanguageDetectorOptions } from '../instance.js';
 /**
  * Register LanguageDetector plugin to i18n instance
  * Must be called before init() to properly register the detector
@@ -9,7 +10,7 @@ export declare const useI18nextLanguageDetector: (i18nInstance: I18nInstance) =>
  * Read language directly from localStorage/cookie
  * Fallback when detector is not available in services
  */
-export declare const readLanguageFromStorage: (detectionOptions?: any) => string | undefined;
+export declare const readLanguageFromStorage: (detectionOptions?: LanguageDetectorOptions, _request?: Parameters<typeof detectLanguageFromRequest>[0], _languages?: string[]) => string | undefined;
 /**
  * Detect language using i18next-browser-languagedetector
  * For initialized instances without detector in services, manually create a detector instance

package/dist/types/runtime/i18n/detection/middleware.node.d.ts

@@ -1,10 +1,7 @@
-import type { I18nInstance } from '../instance.js';
+import { detectLanguageFromRequest } from '../../../shared/detection.js';
+import type { I18nInstance, LanguageDetectorOptions } from '../instance.js';
 export declare const cacheUserLanguage: (_i18nInstance: I18nInstance, _language: string, _detectionOptions?: any) => void;
-/**
- * Read language directly from storage (localStorage/cookie)
- * Not available in Node.js environment, returns undefined
- */
-export declare const readLanguageFromStorage: (_detectionOptions?: any) => string | undefined;
+export declare const readLanguageFromStorage: (detectionOptions?: LanguageDetectorOptions, request?: Parameters<typeof detectLanguageFromRequest>[0], languages?: string[]) => string | undefined;
 /**
  * Register LanguageDetector plugin to i18n instance
  * Must be called before init() to properly register the detector

package/dist/types/runtime/i18n/index.d.ts

@@ -1,3 +1,3 @@
-export type { I18nInstance, I18nInitOptions, } from './instance.js';
+export type { I18nInstance, I18nInitOptions } from './instance.js';
 export { isI18nInstance, getI18nInstance } from './instance.js';
 export { assertI18nInstance } from './utils.js';

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

@@ -26,8 +26,13 @@ export declare const detectLanguageFromPath: (pathname: string, languages: strin
  */
 export declare const shouldIgnoreRedirect: (pathname: string, languages: string[], ignoreRedirectRoutes?: string[] | ((pathname: string) => boolean)) => boolean;
 export declare const useRouterHooks: () => {
-    navigate: any;
-    location: any;
-    params: any;
+    navigate: import("@modern-js/runtime/router").NavigateFunction;
+    location: import("@modern-js/runtime/router").Location<any>;
+    params: Readonly<import("@modern-js/runtime/router").Params<string>>;
+    hasRouter: boolean;
+} | {
+    navigate: null;
+    location: null;
+    params: {};
     hasRouter: boolean;
 };

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

@@ -5,7 +5,7 @@ import type { LanguageDetectorOptions } from '../runtime/i18n/instance.js';
  */
 export declare function detectLanguageFromRequest(req: {
     url: string;
-    headers: {
+    headers: Headers | {
         get: (name: string) => string | null;
-    } | Headers;
+    } | Record<string, string | string[] | undefined>;
 }, languages: string[], detectionOptions?: LanguageDetectorOptions): string | null;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.2",
+  "version": "3.10.0",
   "engines": {
     "node": ">=20"
   },
@@ -82,22 +82,22 @@
     "@swc/helpers": "^0.5.17",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-chained-backend": "^4.6.3",
-    "i18next-fs-backend": "^2.6.7",
-    "i18next-http-backend": "^3.0.6",
-    "i18next-http-middleware": "^3.9.8",
-    "@modern-js/plugin": "3.9.2",
-    "@modern-js/runtime-utils": "3.9.2",
-    "@modern-js/server-core": "3.9.2",
-    "@modern-js/server-runtime": "3.9.2",
-    "@modern-js/types": "3.9.2",
-    "@modern-js/utils": "3.9.2"
+    "i18next-fs-backend": "^2.6.8",
+    "i18next-http-backend": "^4.0.2",
+    "i18next-http-middleware": "^3.9.9",
+    "@modern-js/plugin": "3.10.0",
+    "@modern-js/server-core": "3.10.0",
+    "@modern-js/runtime-utils": "3.10.0",
+    "@modern-js/server-runtime": "3.10.0",
+    "@modern-js/types": "3.10.0",
+    "@modern-js/utils": "3.10.0"
   },
   "peerDependencies": {
     "react": ">=18.3.1",
     "react-dom": ">=18.3.1",
-    "i18next": ">=25.7.4",
+    "i18next": ">=25.10.10",
     "react-i18next": ">=15.7.4",
-    "@modern-js/runtime": "^3.9.2"
+    "@modern-js/runtime": "^3.10.0"
   },
   "peerDependenciesMeta": {
     "i18next": {
@@ -108,17 +108,16 @@
     }
   },
   "devDependencies": {
-    "@rslib/core": "1.0.0",
     "@types/node": "^20",
-    "i18next": "25.7.4",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
+    "i18next": "25.10.10",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
     "react-i18next": "15.7.4",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/app-tools": "3.9.2",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/runtime": "3.9.2"
+    "@modern-js/runtime": "3.10.0",
+    "@modern-js/app-tools": "3.10.0"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -126,8 +125,8 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "rslib build --watch",
-    "build": "rslib build",
+    "dev": "rs lib --watch",
+    "build": "rs lib",
     "test": "rstest"
   }
 }

package/rstack.config.mts

@@ -0,0 +1,4 @@
+import { rslibConfig } from '@modern-js/rslib';
+import { define } from 'rstack';
+
+define.lib(rslibConfig);

package/rstest.config.mts

@@ -0,0 +1,7 @@
+import { withTestPreset } from '@scripts/rstest-config';
+
+export default withTestPreset({
+  root: __dirname,
+  testEnvironment: 'node',
+  globals: true,
+});

package/src/runtime/i18n/backend/sdk-event.ts

@@ -34,6 +34,5 @@ export function getI18nSdkBackendId(target: unknown): string | undefined {
   }
 
   return (target as Record<string, unknown>)[I18N_SDK_BACKEND_ID_KEY] as
-    | string
-    | undefined;
+    string | undefined;
 }

package/src/runtime/i18n/detection/index.ts

@@ -538,6 +538,8 @@ export const detectLanguageWithPriority = async (
           localePathRedirect,
           userInitOptions,
         ),
+        ssrContext?.request,
+        languages,
       );
     } else {
       detectedLanguage = await detectLanguageFromI18nextDetector(i18nInstance, {

package/src/runtime/i18n/detection/middleware.node.ts

@@ -1,5 +1,6 @@
 import { LanguageDetector } from 'i18next-http-middleware';
-import type { I18nInstance } from '../instance';
+import { detectLanguageFromRequest } from '../../../shared/detection.js';
+import type { I18nInstance, LanguageDetectorOptions } from '../instance';
 
 export const cacheUserLanguage = (
   _i18nInstance: I18nInstance,
@@ -9,15 +10,21 @@ export const cacheUserLanguage = (
   return;
 };
 
-/**
- * Read language directly from storage (localStorage/cookie)
- * Not available in Node.js environment, returns undefined
- */
 export const readLanguageFromStorage = (
-  _detectionOptions?: any,
+  detectionOptions?: LanguageDetectorOptions,
+  request?: Parameters<typeof detectLanguageFromRequest>[0],
+  languages: string[] = [],
 ): string | undefined => {
-  // In Node.js environment, storage-based detection is not available
-  return undefined;
+  if (!request) {
+    return undefined;
+  }
+
+  const detectedLanguage = detectLanguageFromRequest(
+    request,
+    languages,
+    detectionOptions,
+  );
+  return detectedLanguage ?? undefined;
 };
 /**
  * Register LanguageDetector plugin to i18n instance

package/src/runtime/i18n/detection/middleware.ts

@@ -1,6 +1,7 @@
 import { isBrowser } from '@modern-js/runtime';
 import LanguageDetector from 'i18next-browser-languagedetector';
-import type { I18nInstance } from '../instance';
+import type { detectLanguageFromRequest } from '../../../shared/detection.js';
+import type { I18nInstance, LanguageDetectorOptions } from '../instance';
 import { getActualI18nextInstance, isI18nWrapperInstance } from '../instance';
 
 /**
@@ -27,7 +28,9 @@ export const useI18nextLanguageDetector = (i18nInstance: I18nInstance) => {
  * Fallback when detector is not available in services
  */
 export const readLanguageFromStorage = (
-  detectionOptions?: any,
+  detectionOptions?: LanguageDetectorOptions,
+  _request?: Parameters<typeof detectLanguageFromRequest>[0],
+  _languages?: string[],
 ): string | undefined => {
   try {
     const options = detectionOptions || {};

package/src/runtime/i18n/index.ts

@@ -1,7 +1,4 @@
-export type {
-  I18nInstance,
-  I18nInitOptions,
-} from './instance';
+export type { I18nInstance, I18nInitOptions } from './instance';
 
 export { isI18nInstance, getI18nInstance } from './instance';
 

package/src/runtime/i18n/instance.ts

@@ -167,15 +167,6 @@ async function createI18nextInstance(): Promise<I18nInstance | null> {
   }
 }
 
-async function tryImportReactI18next() {
-  try {
-    const reactI18next = await import('react-i18next');
-    return reactI18next;
-  } catch (error) {
-    return null;
-  }
-}
-
 export function getI18nextInstanceForProvider(
   instance: I18nInstance | any,
 ): any {
@@ -211,17 +202,19 @@ export async function getI18nInstance(
 }
 
 export async function getInitReactI18next() {
-  const reactI18nextModule = await tryImportReactI18next();
-  if (reactI18nextModule) {
-    return reactI18nextModule.initReactI18next;
+  try {
+    const { initReactI18next } = await import('react-i18next');
+    return initReactI18next;
+  } catch (error) {
+    return null;
   }
-  return null;
 }
 
 export async function getI18nextProvider() {
-  const reactI18nextModule = await tryImportReactI18next();
-  if (reactI18nextModule) {
-    return reactI18nextModule.I18nextProvider;
+  try {
+    const { I18nextProvider } = await import('react-i18next');
+    return I18nextProvider;
+  } catch (error) {
+    return null;
   }
-  return null;
 }

package/src/runtime/utils.ts

@@ -3,6 +3,7 @@ import {
   type TInternalRuntimeContext,
   getGlobalBasename,
 } from '@modern-js/runtime/context';
+import { useLocation, useNavigate, useParams } from '@modern-js/runtime/router';
 
 export const getPathname = (context: TInternalRuntimeContext): string => {
   if (isBrowser()) {
@@ -141,11 +142,6 @@ export const shouldIgnoreRedirect = (
 // Safe hook wrapper to handle cases where router context is not available
 export const useRouterHooks = () => {
   try {
-    const {
-      useLocation,
-      useNavigate,
-      useParams,
-    } = require('@modern-js/runtime/router');
     return {
       navigate: useNavigate(),
       location: useLocation(),

package/src/shared/detection.ts

@@ -12,10 +12,9 @@ export function detectLanguageFromRequest(
   req: {
     url: string;
     headers:
-      | {
-          get: (name: string) => string | null;
-        }
-      | Headers;
+      | Headers
+      | { get: (name: string) => string | null }
+      | Record<string, string | string[] | undefined>;
   },
   languages: string[],
   detectionOptions?: LanguageDetectorOptions,
@@ -39,11 +38,21 @@ export function detectLanguageFromRequest(
       order.length > 0 ? order : ['querystring', 'cookie', 'header'];
 
     // Helper to get header value
+    // req.headers is a Fetch API Headers instance when the caller passes the raw
+    // Request (e.g. ssrContext.request.raw), but modern.js's own SSR request object
+    // (ssrContext.request) carries headers as a plain, lower-cased key/value object.
     const getHeader = (name: string): string | null => {
-      if (req.headers instanceof Headers) {
-        return req.headers.get(name);
+      const headers = req.headers;
+      if (typeof (headers as Headers)?.get === 'function') {
+        return (headers as Headers).get(name);
+      }
+      const value = (headers as Record<string, string | string[] | undefined>)[
+        name.toLowerCase()
+      ];
+      if (Array.isArray(value)) {
+        return value[0] ?? null;
       }
-      return req.headers.get(name);
+      return value ?? null;
     };
 
     // Try each detection method in order
@@ -94,7 +103,8 @@ export function detectLanguageFromRequest(
               .map((lang: string) => {
                 const [code, q] = lang.trim().split(';');
                 return {
-                  code: code.split('-')[0], // Extract base language code
+                  code,
+                  baseCode: code.split('-')[0],
                   quality: q ? parseFloat(q.split('=')[1]) : 1.0,
                 };
               })
@@ -103,12 +113,17 @@ export function detectLanguageFromRequest(
                   b.quality - a.quality,
               );
 
-            // Find first matching language
+            // Find first matching language, preferring an exact tag match
+            // (e.g. 'zh-Hant-TW') over the base language code (e.g. 'zh')
             for (const lang of languagesList) {
               if (languages.length === 0 || languages.includes(lang.code)) {
                 detectedLang = lang.code;
                 break;
               }
+              if (languages.includes(lang.baseCode)) {
+                detectedLang = lang.baseCode;
+                break;
+              }
             }
           }
           break;
@@ -122,6 +137,15 @@ export function detectLanguageFromRequest(
       ) {
         return detectedLang;
       }
+
+      // Match query and cookie values like header values: exact tag first,
+      // then the supported base language (e.g. 'zh-CN' -> 'zh').
+      if (detectedLang) {
+        const baseLang = detectedLang.split('-')[0];
+        if (languages.includes(baseLang)) {
+          return baseLang;
+        }
+      }
     }
   } catch (error) {
     // Silently ignore errors

package/src/shared/utils.ts

@@ -11,8 +11,7 @@ export function getEntryConfig<T extends Record<string, any>>(
   entryKey: string,
 ): T | undefined {
   const entryConfigMap = (config as any)[entryKey] as
-    | Record<string, T>
-    | undefined;
+    Record<string, T> | undefined;
   return entryConfigMap?.[entryName];
 }
 

package/tests/detection.test.ts

@@ -0,0 +1,37 @@
+import { detectLanguageFromRequest } from '../src/shared/detection';
+
+// A later English header must not override a supported query/cookie language.
+const requests = [
+  {
+    source: 'query',
+    url: '/?lng=zh-Hant-TW',
+    headers: { 'accept-language': 'en' },
+  },
+  {
+    source: 'cookie',
+    url: '/',
+    headers: { cookie: 'i18next=zh-Hant-TW', 'accept-language': 'en' },
+  },
+];
+
+test.each(requests)('$source falls back to a supported base language', req => {
+  expect(detectLanguageFromRequest(req, ['en', 'zh'])).toBe('zh');
+});
+
+test.each(requests)(
+  '$source prefers the full tag when both are supported',
+  req => {
+    expect(detectLanguageFromRequest(req, ['en', 'zh', 'zh-Hant-TW'])).toBe(
+      'zh-Hant-TW',
+    );
+  },
+);
+
+test('skips an unsupported query language and matches the cookie base language', () => {
+  expect(
+    detectLanguageFromRequest(
+      { url: '/?lng=fr-FR', headers: { cookie: 'i18next=zh-CN' } },
+      ['en', 'zh'],
+    ),
+  ).toBe('zh');
+});

package/dist/esm/rslib-runtime~1.mjs

@@ -1,18 +0,0 @@
-var __webpack_modules__ = {};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };

package/dist/esm-node/rslib-runtime~0.mjs

@@ -1,19 +0,0 @@
-import "node:module";
-var __webpack_modules__ = {};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };

package/rslib.config.mts

@@ -1,4 +0,0 @@
-import { rslibConfig } from '@modern-js/rslib';
-import { defineConfig } from '@rslib/core';
-
-export default defineConfig(rslibConfig);