@bleedingdev/modern-js-plugin-i18n 3.8.1-ultramodern.2 → 3.8.1-ultramodern.4

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

@@ -77,7 +77,7 @@ const detectLanguageFromI18nextDetector = async (i18nInstance, options)=>{
         }
         if (detectorInstance.isInitialized && detectorInstance.language) {
             const currentLang = detectorInstance.language;
-            if ((0, external_language_js_namespaceObject.isLanguageSupported)(currentLang, options.languages)) return currentLang;
+            if ((0, external_language_js_namespaceObject.getSupportedLanguage)(currentLang, options.languages)) return currentLang;
         }
     } catch (error) {} finally{
         if (isTemporary && detectorInstance !== i18nInstance) external_cache_js_namespaceObject.detectorInstanceCache.set(i18nInstance, {

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

@@ -28,29 +28,23 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    buildInitOptions: ()=>external_initOptions_js_namespaceObject.buildInitOptions,
     cacheUserLanguage: ()=>external_middleware_js_namespaceObject.cacheUserLanguage,
     detectLanguageWithPriority: ()=>external_priority_js_namespaceObject.detectLanguageWithPriority,
     exportServerLngToWindow: ()=>external_ssr_js_namespaceObject.exportServerLngToWindow,
-    getLanguageFromSSRData: ()=>external_ssr_js_namespaceObject.getLanguageFromSSRData,
     mergeDetectionOptions: ()=>external_initOptions_js_namespaceObject.mergeDetectionOptions
 });
 const external_initOptions_js_namespaceObject = require("./initOptions.js");
 const external_middleware_js_namespaceObject = require("./middleware.js");
 const external_priority_js_namespaceObject = require("./priority.js");
 const external_ssr_js_namespaceObject = require("./ssr.js");
-exports.buildInitOptions = __webpack_exports__.buildInitOptions;
 exports.cacheUserLanguage = __webpack_exports__.cacheUserLanguage;
 exports.detectLanguageWithPriority = __webpack_exports__.detectLanguageWithPriority;
 exports.exportServerLngToWindow = __webpack_exports__.exportServerLngToWindow;
-exports.getLanguageFromSSRData = __webpack_exports__.getLanguageFromSSRData;
 exports.mergeDetectionOptions = __webpack_exports__.mergeDetectionOptions;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "buildInitOptions",
     "cacheUserLanguage",
     "detectLanguageWithPriority",
     "exportServerLngToWindow",
-    "getLanguageFromSSRData",
     "mergeDetectionOptions"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

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

@@ -28,29 +28,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    buildInitOptions: ()=>buildInitOptions,
     mergeDetectionOptions: ()=>mergeDetectionOptions
 });
-const runtime_namespaceObject = require("@modern-js/runtime");
 const external_config_js_namespaceObject = require("./config.js");
-const buildInitOptions = (params)=>{
-    const { finalLanguage, fallbackLanguage, languages, userInitOptions, mergedDetection, mergeBackend } = params;
-    return {
-        ...userInitOptions || {},
-        lng: finalLanguage,
-        fallbackLng: fallbackLanguage,
-        supportedLngs: languages,
-        detection: mergedDetection,
-        backend: mergeBackend,
-        interpolation: {
-            ...userInitOptions?.interpolation || {},
-            escapeValue: userInitOptions?.interpolation?.escapeValue ?? false
-        },
-        react: {
-            useSuspense: (0, runtime_namespaceObject.isBrowser)()
-        }
-    };
-};
 const mergeDetectionOptions = (i18nextDetector, detection, localePathRedirect, userInitOptions)=>{
     let mergedDetection;
     mergedDetection = i18nextDetector ? (0, external_config_js_namespaceObject.mergeDetectionOptions)(detection, userInitOptions?.detection) : userInitOptions?.detection || {};
@@ -58,10 +38,8 @@ const mergeDetectionOptions = (i18nextDetector, detection, localePathRedirect, u
     if (localePathRedirect && mergedDetection.order) mergedDetection.order = mergedDetection.order.filter((item)=>'path' !== item);
     return mergedDetection;
 };
-exports.buildInitOptions = __webpack_exports__.buildInitOptions;
 exports.mergeDetectionOptions = __webpack_exports__.mergeDetectionOptions;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "buildInitOptions",
     "mergeDetectionOptions"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

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

@@ -28,18 +28,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 const normalizeLanguageCode = (language)=>{
-    if (!language) return language;
     const baseLang = language.split('-')[0];
     return baseLang;
 };
-const isLanguageSupported = (language, supportedLanguages)=>{
-    if (!language) return false;
-    if (0 === supportedLanguages.length) return true;
-    if (supportedLanguages.includes(language)) return true;
-    const baseLang = normalizeLanguageCode(language);
-    if (baseLang !== language && supportedLanguages.includes(baseLang)) return true;
-    return false;
-};
 const getSupportedLanguage = (language, supportedLanguages)=>{
     if (!language) return;
     if (0 === supportedLanguages.length) return language;
@@ -48,14 +39,11 @@ const getSupportedLanguage = (language, supportedLanguages)=>{
     if (baseLang !== language && supportedLanguages.includes(baseLang)) return baseLang;
 };
 __webpack_require__.d(__webpack_exports__, {}, {
-    getSupportedLanguage: getSupportedLanguage,
-    isLanguageSupported: isLanguageSupported
+    getSupportedLanguage: getSupportedLanguage
 });
 exports.getSupportedLanguage = __webpack_exports__.getSupportedLanguage;
-exports.isLanguageSupported = __webpack_exports__.isLanguageSupported;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "getSupportedLanguage",
-    "isLanguageSupported"
+    "getSupportedLanguage"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

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

@@ -48,7 +48,6 @@ const detectLanguageWithPriority = async (i18nInstance, options)=>{
         i18nextDetector,
         detection,
         userInitOptions,
-        mergedBackend: options.mergedBackend,
         ssrContext
     });
     const finalLanguage = detectedLanguage || userInitOptions?.lng || fallbackLanguage;

package/dist/cjs/runtime/pluginSetup.js

@@ -74,7 +74,6 @@ async function setupI18nBeforeRender(context, options) {
         i18nextDetector,
         detection,
         userInitOptions,
-        mergedBackend,
         pathname,
         ssrContext: context.ssrContext
     });

package/dist/cjs/server/detectorOptions.js

@@ -45,12 +45,6 @@ const convertToHonoLanguageDetectorOptions = (languages, fallbackLanguage, detec
         'cookie',
         'header'
     ];
-    const honoOrder = detectionOrder.map((item)=>{
-        if ('querystring' === item) return 'querystring';
-        if ('cookie' === item) return 'cookie';
-        if ('header' === item) return 'header';
-        return item;
-    });
     const caches = false === mergedDetection.caches ? false : Array.isArray(mergedDetection.caches) && !mergedDetection.caches.includes('cookie') ? false : [
         'cookie'
     ];
@@ -75,7 +69,7 @@ const convertToHonoLanguageDetectorOptions = (languages, fallbackLanguage, detec
             fallbackLanguage
         ],
         fallbackLanguage,
-        order: honoOrder,
+        order: detectionOrder,
         lookupQueryString: mergedDetection.lookupQuerystring || config_js_namespaceObject.DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupQuerystring || 'lng',
         lookupCookie: mergedDetection.lookupCookie || config_js_namespaceObject.DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupCookie || 'i18next',
         lookupFromHeaderKey: mergedDetection.lookupHeader || config_js_namespaceObject.DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupHeader || 'accept-language',

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

@@ -1,7 +1,7 @@
 import { isBrowser } from "@modern-js/runtime";
 import { buildDetectorConfigKey, createDetectorInstance, detectorInstanceCache, pickSafeDetectionOptions } from "./cache.mjs";
 import { mergeDetectionOptions } from "./initOptions.mjs";
-import { getSupportedLanguage, isLanguageSupported } from "./language.mjs";
+import { getSupportedLanguage } from "./language.mjs";
 import { detectLanguage, useI18nextLanguageDetector } from "./middleware.mjs";
 const initializeI18nForDetector = async (i18nInstance, options)=>{
     const mergedDetection = mergeDetectionOptions(options.i18nextDetector, options.detection, options.localePathRedirect, options.userInitOptions);
@@ -45,7 +45,7 @@ const detectLanguageFromI18nextDetector = async (i18nInstance, options)=>{
         }
         if (detectorInstance.isInitialized && detectorInstance.language) {
             const currentLang = detectorInstance.language;
-            if (isLanguageSupported(currentLang, options.languages)) return currentLang;
+            if (getSupportedLanguage(currentLang, options.languages)) return currentLang;
         }
     } catch (error) {} finally{
         if (isTemporary && detectorInstance !== i18nInstance) detectorInstanceCache.set(i18nInstance, {

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

@@ -1,4 +1,4 @@
-export { buildInitOptions, mergeDetectionOptions } from "./initOptions.mjs";
+export { mergeDetectionOptions } from "./initOptions.mjs";
 export { cacheUserLanguage } from "./middleware.mjs";
 export { detectLanguageWithPriority } from "./priority.mjs";
-export { exportServerLngToWindow, getLanguageFromSSRData } from "./ssr.mjs";
+export { exportServerLngToWindow } from "./ssr.mjs";

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

@@ -1,23 +1,4 @@
-import { isBrowser } from "@modern-js/runtime";
 import { mergeDetectionOptions } from "./config.mjs";
-const buildInitOptions = (params)=>{
-    const { finalLanguage, fallbackLanguage, languages, userInitOptions, mergedDetection, mergeBackend } = params;
-    return {
-        ...userInitOptions || {},
-        lng: finalLanguage,
-        fallbackLng: fallbackLanguage,
-        supportedLngs: languages,
-        detection: mergedDetection,
-        backend: mergeBackend,
-        interpolation: {
-            ...userInitOptions?.interpolation || {},
-            escapeValue: userInitOptions?.interpolation?.escapeValue ?? false
-        },
-        react: {
-            useSuspense: isBrowser()
-        }
-    };
-};
 const initOptions_mergeDetectionOptions = (i18nextDetector, detection, localePathRedirect, userInitOptions)=>{
     let mergedDetection;
     mergedDetection = i18nextDetector ? mergeDetectionOptions(detection, userInitOptions?.detection) : userInitOptions?.detection || {};
@@ -25,4 +6,4 @@ const initOptions_mergeDetectionOptions = (i18nextDetector, detection, localePat
     if (localePathRedirect && mergedDetection.order) mergedDetection.order = mergedDetection.order.filter((item)=>'path' !== item);
     return mergedDetection;
 };
-export { buildInitOptions, initOptions_mergeDetectionOptions as mergeDetectionOptions };
+export { initOptions_mergeDetectionOptions as mergeDetectionOptions };

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

@@ -1,16 +1,7 @@
 const normalizeLanguageCode = (language)=>{
-    if (!language) return language;
     const baseLang = language.split('-')[0];
     return baseLang;
 };
-const isLanguageSupported = (language, supportedLanguages)=>{
-    if (!language) return false;
-    if (0 === supportedLanguages.length) return true;
-    if (supportedLanguages.includes(language)) return true;
-    const baseLang = normalizeLanguageCode(language);
-    if (baseLang !== language && supportedLanguages.includes(baseLang)) return true;
-    return false;
-};
 const getSupportedLanguage = (language, supportedLanguages)=>{
     if (!language) return;
     if (0 === supportedLanguages.length) return language;
@@ -18,4 +9,4 @@ const getSupportedLanguage = (language, supportedLanguages)=>{
     const baseLang = normalizeLanguageCode(language);
     if (baseLang !== language && supportedLanguages.includes(baseLang)) return baseLang;
 };
-export { getSupportedLanguage, isLanguageSupported };
+export { getSupportedLanguage };

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

@@ -16,7 +16,6 @@ const detectLanguageWithPriority = async (i18nInstance, options)=>{
         i18nextDetector,
         detection,
         userInitOptions,
-        mergedBackend: options.mergedBackend,
         ssrContext
     });
     const finalLanguage = detectedLanguage || userInitOptions?.lng || fallbackLanguage;

package/dist/esm/runtime/pluginSetup.mjs

@@ -42,7 +42,6 @@ async function setupI18nBeforeRender(context, options) {
         i18nextDetector,
         detection,
         userInitOptions,
-        mergedBackend,
         pathname,
         ssrContext: context.ssrContext
     });

package/dist/esm/server/detectorOptions.mjs

@@ -13,12 +13,6 @@ const convertToHonoLanguageDetectorOptions = (languages, fallbackLanguage, detec
         'cookie',
         'header'
     ];
-    const honoOrder = detectionOrder.map((item)=>{
-        if ('querystring' === item) return 'querystring';
-        if ('cookie' === item) return 'cookie';
-        if ('header' === item) return 'header';
-        return item;
-    });
     const caches = false === mergedDetection.caches ? false : Array.isArray(mergedDetection.caches) && !mergedDetection.caches.includes('cookie') ? false : [
         'cookie'
     ];
@@ -43,7 +37,7 @@ const convertToHonoLanguageDetectorOptions = (languages, fallbackLanguage, detec
             fallbackLanguage
         ],
         fallbackLanguage,
-        order: honoOrder,
+        order: detectionOrder,
         lookupQueryString: mergedDetection.lookupQuerystring || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupQuerystring || 'lng',
         lookupCookie: mergedDetection.lookupCookie || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupCookie || 'i18next',
         lookupFromHeaderKey: mergedDetection.lookupHeader || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupHeader || 'accept-language',

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

@@ -2,7 +2,7 @@ import "node:module";
 import { isBrowser } from "@modern-js/runtime";
 import { buildDetectorConfigKey, createDetectorInstance, detectorInstanceCache, pickSafeDetectionOptions } from "./cache.mjs";
 import { mergeDetectionOptions } from "./initOptions.mjs";
-import { getSupportedLanguage, isLanguageSupported } from "./language.mjs";
+import { getSupportedLanguage } from "./language.mjs";
 import { detectLanguage, useI18nextLanguageDetector } from "./middleware.mjs";
 const initializeI18nForDetector = async (i18nInstance, options)=>{
     const mergedDetection = mergeDetectionOptions(options.i18nextDetector, options.detection, options.localePathRedirect, options.userInitOptions);
@@ -46,7 +46,7 @@ const detectLanguageFromI18nextDetector = async (i18nInstance, options)=>{
         }
         if (detectorInstance.isInitialized && detectorInstance.language) {
             const currentLang = detectorInstance.language;
-            if (isLanguageSupported(currentLang, options.languages)) return currentLang;
+            if (getSupportedLanguage(currentLang, options.languages)) return currentLang;
         }
     } catch (error) {} finally{
         if (isTemporary && detectorInstance !== i18nInstance) detectorInstanceCache.set(i18nInstance, {

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

@@ -1,5 +1,5 @@
 import "node:module";
-export { buildInitOptions, mergeDetectionOptions } from "./initOptions.mjs";
+export { mergeDetectionOptions } from "./initOptions.mjs";
 export { cacheUserLanguage } from "./middleware.mjs";
 export { detectLanguageWithPriority } from "./priority.mjs";
-export { exportServerLngToWindow, getLanguageFromSSRData } from "./ssr.mjs";
+export { exportServerLngToWindow } from "./ssr.mjs";

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

@@ -1,24 +1,5 @@
 import "node:module";
-import { isBrowser } from "@modern-js/runtime";
 import { mergeDetectionOptions } from "./config.mjs";
-const buildInitOptions = (params)=>{
-    const { finalLanguage, fallbackLanguage, languages, userInitOptions, mergedDetection, mergeBackend } = params;
-    return {
-        ...userInitOptions || {},
-        lng: finalLanguage,
-        fallbackLng: fallbackLanguage,
-        supportedLngs: languages,
-        detection: mergedDetection,
-        backend: mergeBackend,
-        interpolation: {
-            ...userInitOptions?.interpolation || {},
-            escapeValue: userInitOptions?.interpolation?.escapeValue ?? false
-        },
-        react: {
-            useSuspense: isBrowser()
-        }
-    };
-};
 const initOptions_mergeDetectionOptions = (i18nextDetector, detection, localePathRedirect, userInitOptions)=>{
     let mergedDetection;
     mergedDetection = i18nextDetector ? mergeDetectionOptions(detection, userInitOptions?.detection) : userInitOptions?.detection || {};
@@ -26,4 +7,4 @@ const initOptions_mergeDetectionOptions = (i18nextDetector, detection, localePat
     if (localePathRedirect && mergedDetection.order) mergedDetection.order = mergedDetection.order.filter((item)=>'path' !== item);
     return mergedDetection;
 };
-export { buildInitOptions, initOptions_mergeDetectionOptions as mergeDetectionOptions };
+export { initOptions_mergeDetectionOptions as mergeDetectionOptions };

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

@@ -1,17 +1,8 @@
 import "node:module";
 const normalizeLanguageCode = (language)=>{
-    if (!language) return language;
     const baseLang = language.split('-')[0];
     return baseLang;
 };
-const isLanguageSupported = (language, supportedLanguages)=>{
-    if (!language) return false;
-    if (0 === supportedLanguages.length) return true;
-    if (supportedLanguages.includes(language)) return true;
-    const baseLang = normalizeLanguageCode(language);
-    if (baseLang !== language && supportedLanguages.includes(baseLang)) return true;
-    return false;
-};
 const getSupportedLanguage = (language, supportedLanguages)=>{
     if (!language) return;
     if (0 === supportedLanguages.length) return language;
@@ -19,4 +10,4 @@ const getSupportedLanguage = (language, supportedLanguages)=>{
     const baseLang = normalizeLanguageCode(language);
     if (baseLang !== language && supportedLanguages.includes(baseLang)) return baseLang;
 };
-export { getSupportedLanguage, isLanguageSupported };
+export { getSupportedLanguage };

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

@@ -17,7 +17,6 @@ const detectLanguageWithPriority = async (i18nInstance, options)=>{
         i18nextDetector,
         detection,
         userInitOptions,
-        mergedBackend: options.mergedBackend,
         ssrContext
     });
     const finalLanguage = detectedLanguage || userInitOptions?.lng || fallbackLanguage;

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

@@ -43,7 +43,6 @@ async function setupI18nBeforeRender(context, options) {
         i18nextDetector,
         detection,
         userInitOptions,
-        mergedBackend,
         pathname,
         ssrContext: context.ssrContext
     });

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

@@ -14,12 +14,6 @@ const convertToHonoLanguageDetectorOptions = (languages, fallbackLanguage, detec
         'cookie',
         'header'
     ];
-    const honoOrder = detectionOrder.map((item)=>{
-        if ('querystring' === item) return 'querystring';
-        if ('cookie' === item) return 'cookie';
-        if ('header' === item) return 'header';
-        return item;
-    });
     const caches = false === mergedDetection.caches ? false : Array.isArray(mergedDetection.caches) && !mergedDetection.caches.includes('cookie') ? false : [
         'cookie'
     ];
@@ -44,7 +38,7 @@ const convertToHonoLanguageDetectorOptions = (languages, fallbackLanguage, detec
             fallbackLanguage
         ],
         fallbackLanguage,
-        order: honoOrder,
+        order: detectionOrder,
         lookupQueryString: mergedDetection.lookupQuerystring || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupQuerystring || 'lng',
         lookupCookie: mergedDetection.lookupCookie || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupCookie || 'i18next',
         lookupFromHeaderKey: mergedDetection.lookupHeader || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupHeader || 'accept-language',

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

@@ -1,5 +1,4 @@
-export { buildInitOptions, mergeDetectionOptions } from './initOptions';
+export { mergeDetectionOptions } from './initOptions';
 export { cacheUserLanguage } from './middleware';
 export { detectLanguageWithPriority } from './priority';
-export { exportServerLngToWindow, getLanguageFromSSRData } from './ssr';
-export type { BaseLanguageDetectionOptions, BuildInitOptionsParams, LanguageDetectionOptions, LanguageDetectionResult, } from './types';
+export { exportServerLngToWindow } from './ssr';

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

@@ -1,9 +1,4 @@
 import type { I18nInitOptions, LanguageDetectorOptions } from '../instance';
-import type { BuildInitOptionsParams } from './types';
-/**
- * Build i18n initialization options
- */
-export declare const buildInitOptions: (params: BuildInitOptionsParams) => I18nInitOptions;
 /**
  * Merge detection and backend options
  */

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

@@ -1,8 +1,3 @@
-/**
- * Check if a language is supported
- * Also checks the base language code (e.g., 'zh-CN' matches 'zh')
- */
-export declare const isLanguageSupported: (language: string | undefined, supportedLanguages: string[]) => boolean;
 /**
  * Get the supported language that matches the given language
  * Returns the exact match if available, otherwise returns the base language code match

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

@@ -1,4 +1,4 @@
-import type { BackendOptions, I18nInitOptions, LanguageDetectorOptions } from '../instance';
+import type { I18nInitOptions, LanguageDetectorOptions } from '../instance';
 export interface LanguageDetectionSsrContext {
     request?: unknown;
 }
@@ -9,7 +9,6 @@ export interface BaseLanguageDetectionOptions {
     i18nextDetector: boolean;
     detection?: LanguageDetectorOptions;
     userInitOptions?: I18nInitOptions;
-    mergedBackend?: BackendOptions;
 }
 export interface LanguageDetectionOptions extends BaseLanguageDetectionOptions {
     pathname: string;
@@ -19,14 +18,3 @@ export interface LanguageDetectionResult {
     detectedLanguage?: string;
     finalLanguage: string;
 }
-/**
- * Options for building i18n init options
- */
-export interface BuildInitOptionsParams {
-    finalLanguage: string;
-    fallbackLanguage: string;
-    languages: string[];
-    userInitOptions?: I18nInitOptions;
-    mergedDetection?: LanguageDetectorOptions;
-    mergeBackend?: BackendOptions;
-}

package/dist/types/server/detectorOptions.d.ts

@@ -5,7 +5,7 @@ import type { LanguageDetectorOptions } from '../runtime/i18n/instance';
 export declare const convertToHonoLanguageDetectorOptions: (languages: string[], fallbackLanguage: string, detectionOptions?: LanguageDetectorOptions) => {
     supportedLanguages: string[];
     fallbackLanguage: string;
-    order: ("cookie" | "header" | "path" | "querystring")[];
+    order: ('querystring' | 'cookie' | 'header' | 'path')[];
     lookupQueryString: string;
     lookupCookie: string;
     lookupFromHeaderKey: string;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.8.1-ultramodern.2",
+  "version": "3.8.1-ultramodern.4",
   "engines": {
     "node": ">=20"
   },
@@ -91,12 +91,12 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.1-ultramodern.2",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.1-ultramodern.2",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.8.1-ultramodern.2",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.8.1-ultramodern.2",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.1-ultramodern.2",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.1-ultramodern.2",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.1-ultramodern.4",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.1-ultramodern.4",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.8.1-ultramodern.4",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.8.1-ultramodern.4",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.1-ultramodern.4",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.1-ultramodern.4",
     "@swc/helpers": "^0.5.23",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-chained-backend": "^5.0.5",
@@ -105,7 +105,7 @@
     "i18next-http-middleware": "^3.9.7"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.8.1-ultramodern.2",
+    "@modern-js/runtime": "3.8.1-ultramodern.4",
     "i18next": ">=25.7.4",
     "react": ">=18",
     "react-dom": ">=18",
@@ -120,8 +120,8 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.1-ultramodern.2",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.1-ultramodern.2",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.1-ultramodern.4",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.1-ultramodern.4",
     "@rslib/core": "0.23.2",
     "@types/node": "^26.2.0",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",

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

@@ -10,7 +10,7 @@ import {
 
 import { mergeDetectionOptions } from './initOptions';
 
-import { getSupportedLanguage, isLanguageSupported } from './language';
+import { getSupportedLanguage } from './language';
 
 import { detectLanguage, useI18nextLanguageDetector } from './middleware';
 
@@ -136,7 +136,7 @@ export const detectLanguageFromI18nextDetector = async (
     // Fallback to instance's current language if detector didn't detect
     if (detectorInstance.isInitialized && detectorInstance.language) {
       const currentLang = detectorInstance.language;
-      if (isLanguageSupported(currentLang, options.languages)) {
+      if (getSupportedLanguage(currentLang, options.languages)) {
         return currentLang;
       }
     }

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

@@ -1,10 +1,4 @@
-export { buildInitOptions, mergeDetectionOptions } from './initOptions';
+export { mergeDetectionOptions } from './initOptions';
 export { cacheUserLanguage } from './middleware';
 export { detectLanguageWithPriority } from './priority';
-export { exportServerLngToWindow, getLanguageFromSSRData } from './ssr';
-export type {
-  BaseLanguageDetectionOptions,
-  BuildInitOptionsParams,
-  LanguageDetectionOptions,
-  LanguageDetectionResult,
-} from './types';
+export { exportServerLngToWindow } from './ssr';

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

@@ -1,42 +1,7 @@
-import { isBrowser } from '@modern-js/runtime';
 import type { I18nInitOptions, LanguageDetectorOptions } from '../instance';
 
 import { mergeDetectionOptions as mergeDetectionOptionsUtil } from './config';
 
-import type { BuildInitOptionsParams } from './types';
-
-/**
- * Build i18n initialization options
- */
-export const buildInitOptions = (
-  params: BuildInitOptionsParams,
-): I18nInitOptions => {
-  const {
-    finalLanguage,
-    fallbackLanguage,
-    languages,
-    userInitOptions,
-    mergedDetection,
-    mergeBackend,
-  } = params;
-
-  return {
-    ...(userInitOptions || {}),
-    lng: finalLanguage,
-    fallbackLng: fallbackLanguage,
-    supportedLngs: languages,
-    detection: mergedDetection,
-    backend: mergeBackend,
-    interpolation: {
-      ...(userInitOptions?.interpolation || {}),
-      escapeValue: userInitOptions?.interpolation?.escapeValue ?? false,
-    },
-    react: {
-      useSuspense: isBrowser(),
-    },
-  } as any;
-};
-
 /**
  * Merge detection and backend options
  */

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

@@ -2,40 +2,11 @@
  * Normalize language code (e.g., 'zh-CN' -> 'zh', 'en-US' -> 'en')
  */
 const normalizeLanguageCode = (language: string): string => {
-  if (!language) {
-    return language;
-  }
   // Extract base language code (before hyphen)
   const baseLang = language.split('-')[0];
   return baseLang;
 };
 
-/**
- * Check if a language is supported
- * Also checks the base language code (e.g., 'zh-CN' matches 'zh')
- */
-export const isLanguageSupported = (
-  language: string | undefined,
-  supportedLanguages: string[],
-): boolean => {
-  if (!language) {
-    return false;
-  }
-  if (supportedLanguages.length === 0) {
-    return true;
-  }
-  // Check exact match first
-  if (supportedLanguages.includes(language)) {
-    return true;
-  }
-  // Check base language code match (e.g., 'zh-CN' matches 'zh')
-  const baseLang = normalizeLanguageCode(language);
-  if (baseLang !== language && supportedLanguages.includes(baseLang)) {
-    return true;
-  }
-  return false;
-};
-
 /**
  * Get the supported language that matches the given language
  * Returns the exact match if available, otherwise returns the base language code match

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

@@ -68,7 +68,6 @@ export const detectLanguageWithPriority = async (
         i18nextDetector,
         detection,
         userInitOptions,
-        mergedBackend: options.mergedBackend,
         ssrContext,
       });
     }

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

@@ -1,8 +1,4 @@
-import type {
-  BackendOptions,
-  I18nInitOptions,
-  LanguageDetectorOptions,
-} from '../instance';
+import type { I18nInitOptions, LanguageDetectorOptions } from '../instance';
 
 export interface LanguageDetectionSsrContext {
   request?: unknown;
@@ -15,7 +11,6 @@ export interface BaseLanguageDetectionOptions {
   i18nextDetector: boolean;
   detection?: LanguageDetectorOptions;
   userInitOptions?: I18nInitOptions;
-  mergedBackend?: BackendOptions;
 }
 
 export interface LanguageDetectionOptions extends BaseLanguageDetectionOptions {
@@ -27,15 +22,3 @@ export interface LanguageDetectionResult {
   detectedLanguage?: string;
   finalLanguage: string;
 }
-
-/**
- * Options for building i18n init options
- */
-export interface BuildInitOptionsParams {
-  finalLanguage: string;
-  fallbackLanguage: string;
-  languages: string[];
-  userInitOptions?: I18nInitOptions;
-  mergedDetection?: LanguageDetectorOptions;
-  mergeBackend?: BackendOptions;
-}

package/src/runtime/pluginSetup.ts

@@ -138,7 +138,6 @@ export async function setupI18nBeforeRender(
     i18nextDetector,
     detection,
     userInitOptions,
-    mergedBackend,
     pathname,
     ssrContext: context.ssrContext,
   });

package/src/server/detectorOptions.ts

@@ -29,15 +29,6 @@ export const convertToHonoLanguageDetectorOptions = (
   const detectionOrder =
     order.length > 0 ? order : ['querystring', 'cookie', 'header'];
 
-  // Map i18next order to hono order
-  const honoOrder = detectionOrder.map(item => {
-    // Map 'querystring' to 'querystring', 'cookie' to 'cookie', 'header' to 'header'
-    if (item === 'querystring') return 'querystring';
-    if (item === 'cookie') return 'cookie';
-    if (item === 'header') return 'header';
-    return item;
-  }) as ('querystring' | 'cookie' | 'header' | 'path')[];
-
   // Determine caches option
   // hono languageDetector expects: false | "cookie"[] | undefined
   const caches: false | ['cookie'] | undefined =
@@ -85,7 +76,7 @@ export const convertToHonoLanguageDetectorOptions = (
   return {
     supportedLanguages: languages.length > 0 ? languages : [fallbackLanguage],
     fallbackLanguage,
-    order: honoOrder,
+    order: detectionOrder as ('querystring' | 'cookie' | 'header' | 'path')[],
     lookupQueryString:
       mergedDetection.lookupQuerystring ||
       DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupQuerystring ||