@modern-js/plugin-i18n 3.9.3 → 3.10.1

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/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({
-    He (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__("He");
         return {
             navigate: useNavigate(),
             location: useLocation(),

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/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/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.3",
+  "version": "3.10.1",
   "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.8",
-    "i18next-http-backend": "^3.0.6",
+    "i18next-fs-backend": "^2.6.9",
+    "i18next-http-backend": "^4.0.4",
     "i18next-http-middleware": "^3.9.9",
-    "@modern-js/plugin": "3.9.3",
-    "@modern-js/server-core": "3.9.3",
-    "@modern-js/runtime-utils": "3.9.3",
-    "@modern-js/server-runtime": "3.9.3",
-    "@modern-js/types": "3.9.3",
-    "@modern-js/utils": "3.9.3"
+    "@modern-js/plugin": "3.10.1",
+    "@modern-js/runtime-utils": "3.10.1",
+    "@modern-js/server-core": "3.10.1",
+    "@modern-js/server-runtime": "3.10.1",
+    "@modern-js/types": "3.10.1",
+    "@modern-js/utils": "3.10.1"
   },
   "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.1"
   },
   "peerDependenciesMeta": {
     "i18next": {
@@ -108,17 +108,16 @@
     }
   },
   "devDependencies": {
-    "@rslib/core": "1.0.1",
     "@types/node": "^20",
-    "i18next": "25.7.4",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
+    "i18next": "25.10.10",
+    "react": "^19.3.1",
+    "react-dom": "^19.3.1",
     "react-i18next": "15.7.4",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/app-tools": "3.9.3",
+    "@modern-js/app-tools": "3.10.1",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/runtime": "3.9.3"
+    "@modern-js/runtime": "3.10.1"
   },
   "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/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/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/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/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);