@modern-js/plugin-i18n 3.0.0-alpha.1 → 3.0.0

package/dist/cjs/cli/{index.cjs → index.js}

@@ -41,7 +41,7 @@ var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namesp
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const server_core_namespaceObject = require("@modern-js/server-core");
-const utils_cjs_namespaceObject = require("../shared/utils.cjs");
+const utils_js_namespaceObject = require("../shared/utils.js");
 function hasJsonFiles(dirPath) {
     try {
         if (!external_fs_default().existsSync(dirPath) || !external_fs_default().statSync(dirPath).isDirectory()) return false;
@@ -77,12 +77,12 @@ const i18nPlugin = (options = {})=>({
         setup: (api)=>{
             const { localeDetection, backend, transformRuntimeConfig, customPlugin, ...restOptions } = options;
             api._internalRuntimePlugins(({ entrypoint, plugins })=>{
-                const localeDetectionOptions = localeDetection ? (0, utils_cjs_namespaceObject.getLocaleDetectionOptions)(entrypoint.entryName, localeDetection) : void 0;
+                const localeDetectionOptions = localeDetection ? (0, utils_js_namespaceObject.getLocaleDetectionOptions)(entrypoint.entryName, localeDetection) : void 0;
                 let backendOptions;
                 const { appDirectory } = api.getAppContext();
                 const normalizedConfig = api.getNormalizedConfig();
                 if (backend) {
-                    const entryBackendOptions = (0, utils_cjs_namespaceObject.getBackendOptions)(entrypoint.entryName, backend);
+                    const entryBackendOptions = (0, utils_js_namespaceObject.getBackendOptions)(entrypoint.entryName, backend);
                     if (entryBackendOptions?.enabled === false) backendOptions = entryBackendOptions;
                     else if (entryBackendOptions?.loadPath || entryBackendOptions?.addPath) backendOptions = {
                         ...entryBackendOptions,
@@ -97,7 +97,7 @@ const i18nPlugin = (options = {})=>({
                     } else backendOptions = entryBackendOptions;
                 } else {
                     const hasLocales = detectLocalesDirectory(appDirectory, normalizedConfig);
-                    if (hasLocales) backendOptions = (0, utils_cjs_namespaceObject.getBackendOptions)(entrypoint.entryName, {
+                    if (hasLocales) backendOptions = (0, utils_js_namespaceObject.getBackendOptions)(entrypoint.entryName, {
                         enabled: true
                     });
                 }

package/dist/cjs/runtime/{I18nLink.cjs → I18nLink.js}

@@ -29,8 +29,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const router_namespaceObject = require("@modern-js/runtime/router");
-const external_context_cjs_namespaceObject = require("./context.cjs");
-const external_utils_cjs_namespaceObject = require("./utils.cjs");
+const external_context_js_namespaceObject = require("./context.js");
+const external_utils_js_namespaceObject = require("./utils.js");
 const useRouterHooks = ()=>{
     const inRouter = (0, router_namespaceObject.useInRouterContext)();
     return {
@@ -41,9 +41,9 @@ const useRouterHooks = ()=>{
 };
 const I18nLink = ({ to, children, ...props })=>{
     const { Link, params, hasRouter } = useRouterHooks();
-    const { language, supportedLanguages } = (0, external_context_cjs_namespaceObject.useModernI18n)();
+    const { language, supportedLanguages } = (0, external_context_js_namespaceObject.useModernI18n)();
     const currentLang = language;
-    const localizedTo = (0, external_utils_cjs_namespaceObject.buildLocalizedUrl)(to, currentLang, supportedLanguages);
+    const localizedTo = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(to, currentLang, supportedLanguages);
     if ('development' === process.env.NODE_ENV && hasRouter && !params.lang) console.warn("I18nLink is being used outside of a :lang dynamic route context. This may cause unexpected behavior. Please ensure I18nLink is used within a route that has a :lang parameter.");
     if (!hasRouter || !Link) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("a", {
         href: localizedTo,

package/dist/cjs/runtime/{context.cjs → context.js}

@@ -30,8 +30,8 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const runtime_namespaceObject = require("@modern-js/runtime");
 const external_react_namespaceObject = require("react");
-const index_cjs_namespaceObject = require("./i18n/detection/index.cjs");
-const external_utils_cjs_namespaceObject = require("./utils.cjs");
+const index_js_namespaceObject = require("./i18n/detection/index.js");
+const external_utils_js_namespaceObject = require("./utils.js");
 const ModernI18nContext = /*#__PURE__*/ (0, external_react_namespaceObject.createContext)(null);
 const ModernI18nProvider = ({ children, value })=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ModernI18nContext.Provider, {
         value: value,
@@ -41,7 +41,7 @@ const useModernI18n = ()=>{
     const context = (0, external_react_namespaceObject.useContext)(ModernI18nContext);
     if (!context) throw new Error('useModernI18n must be used within a ModernI18nProvider');
     const { language: contextLanguage, i18nInstance, languages, localePathRedirect, ignoreRedirectRoutes, updateLanguage } = context;
-    const { navigate, location, hasRouter } = (0, external_utils_cjs_namespaceObject.useRouterHooks)();
+    const { navigate, location, hasRouter } = (0, external_utils_js_namespaceObject.useRouterHooks)();
     const currentLanguage = contextLanguage;
     const changeLanguage = (0, external_react_namespaceObject.useCallback)(async (newLang)=>{
         try {
@@ -50,14 +50,16 @@ const useModernI18n = ()=>{
             await i18nInstance?.changeLanguage?.(newLang);
             if ((0, runtime_namespaceObject.isBrowser)()) {
                 const detectionOptions = i18nInstance.options?.detection;
-                (0, index_cjs_namespaceObject.cacheUserLanguage)(i18nInstance, newLang, detectionOptions);
+                (0, index_js_namespaceObject.cacheUserLanguage)(i18nInstance, newLang, detectionOptions);
             }
             if (localePathRedirect && (0, runtime_namespaceObject.isBrowser)() && hasRouter && navigate && location) {
                 const currentPath = location.pathname;
-                const entryPath = (0, external_utils_cjs_namespaceObject.getEntryPath)();
+                const entryPath = (0, external_utils_js_namespaceObject.getEntryPath)();
                 const relativePath = currentPath.replace(entryPath, '');
-                if (!(0, external_utils_cjs_namespaceObject.shouldIgnoreRedirect)(relativePath, languages || [], ignoreRedirectRoutes)) {
-                    const newPath = (0, external_utils_cjs_namespaceObject.buildLocalizedUrl)(relativePath, newLang, languages || []);
+                const pathLanguage = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(currentPath, languages || [], localePathRedirect);
+                if (pathLanguage.detected && pathLanguage.language === newLang) return;
+                if (!(0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages || [], ignoreRedirectRoutes)) {
+                    const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, newLang, languages || []);
                     const newUrl = entryPath + newPath + location.search + location.hash;
                     await navigate(newUrl, {
                         replace: true
@@ -65,10 +67,12 @@ const useModernI18n = ()=>{
                 }
             } else if (localePathRedirect && (0, runtime_namespaceObject.isBrowser)() && !hasRouter) {
                 const currentPath = window.location.pathname;
-                const entryPath = (0, external_utils_cjs_namespaceObject.getEntryPath)();
+                const entryPath = (0, external_utils_js_namespaceObject.getEntryPath)();
                 const relativePath = currentPath.replace(entryPath, '');
-                if (!(0, external_utils_cjs_namespaceObject.shouldIgnoreRedirect)(relativePath, languages || [], ignoreRedirectRoutes)) {
-                    const newPath = (0, external_utils_cjs_namespaceObject.buildLocalizedUrl)(relativePath, newLang, languages || []);
+                const pathLanguage = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(currentPath, languages || [], localePathRedirect);
+                if (pathLanguage.detected && pathLanguage.language === newLang) return;
+                if (!(0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages || [], ignoreRedirectRoutes)) {
+                    const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, newLang, languages || []);
                     const newUrl = entryPath + newPath + window.location.search + window.location.hash;
                     window.history.pushState(null, '', newUrl);
                 }

package/dist/cjs/runtime/{hooks.cjs → hooks.js}

@@ -31,8 +31,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const runtime_namespaceObject = require("@modern-js/runtime");
 const external_react_namespaceObject = require("react");
-const index_cjs_namespaceObject = require("./i18n/detection/index.cjs");
-const external_utils_cjs_namespaceObject = require("./utils.cjs");
+const index_js_namespaceObject = require("./i18n/detection/index.js");
+const external_utils_js_namespaceObject = require("./utils.js");
 function createMinimalI18nInstance(language) {
     const minimalInstance = {
         language,
@@ -100,7 +100,7 @@ function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
 }
 function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes) {
     const hasRedirectedRef = (0, external_react_namespaceObject.useRef)(false);
-    const { navigate, location, hasRouter } = (0, external_utils_cjs_namespaceObject.useRouterHooks)();
+    const { navigate, location, hasRouter } = (0, external_utils_js_namespaceObject.useRouterHooks)();
     (0, external_react_namespaceObject.useEffect)(()=>{
         if ('browser' !== process.env.MODERN_TARGET) return;
         if (!localePathRedirect || !i18nInstance) return;
@@ -113,13 +113,13 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         const currentPathname = hasRouter && location ? location.pathname : window.location.pathname;
         const currentSearch = hasRouter && location ? location.search : window.location.search;
         const currentHash = hasRouter && location ? location.hash : window.location.hash;
-        const entryPath = (0, external_utils_cjs_namespaceObject.getEntryPath)();
+        const entryPath = (0, external_utils_js_namespaceObject.getEntryPath)();
         const relativePath = currentPathname.replace(entryPath, '');
-        if ((0, external_utils_cjs_namespaceObject.shouldIgnoreRedirect)(relativePath, languages, ignoreRedirectRoutes)) return;
-        const pathDetection = (0, external_utils_cjs_namespaceObject.detectLanguageFromPath)(currentPathname, languages, localePathRedirect);
+        if ((0, external_utils_js_namespaceObject.shouldIgnoreRedirect)(relativePath, languages, ignoreRedirectRoutes)) return;
+        const pathDetection = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(currentPathname, languages, localePathRedirect);
         if (pathDetection.detected) return;
         const targetLanguage = i18nInstance.language || fallbackLanguage || languages[0] || 'en';
-        const newPath = (0, external_utils_cjs_namespaceObject.buildLocalizedUrl)(relativePath, targetLanguage, languages);
+        const newPath = (0, external_utils_js_namespaceObject.buildLocalizedUrl)(relativePath, targetLanguage, languages);
         const newUrl = entryPath + newPath + currentSearch + currentHash;
         if (newUrl !== currentPathname + currentSearch + currentHash) {
             hasRedirectedRef.current = true;
@@ -143,8 +143,8 @@ function useLanguageSync(i18nInstance, localePathRedirect, languages, runtimeCon
     (0, external_react_namespaceObject.useEffect)(()=>{
         if (!i18nInstance) return;
         if (localePathRedirect) {
-            const currentPathname = (0, external_utils_cjs_namespaceObject.getPathname)(runtimeContextRef.current);
-            const pathDetection = (0, external_utils_cjs_namespaceObject.detectLanguageFromPath)(currentPathname, languages, localePathRedirect);
+            const currentPathname = (0, external_utils_js_namespaceObject.getPathname)(runtimeContextRef.current);
+            const pathDetection = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(currentPathname, languages, localePathRedirect);
             if (pathDetection.detected && pathDetection.language) {
                 const currentLang = pathDetection.language;
                 if (currentLang !== prevLangRef.current) {
@@ -154,7 +154,7 @@ function useLanguageSync(i18nInstance, localePathRedirect, languages, runtimeCon
                     i18nInstance.changeLanguage?.(currentLang);
                     if ((0, runtime_namespaceObject.isBrowser)()) {
                         const detectionOptions = i18nInstance.options?.detection;
-                        (0, index_cjs_namespaceObject.cacheUserLanguage)(i18nInstance, currentLang, detectionOptions);
+                        (0, index_js_namespaceObject.cacheUserLanguage)(i18nInstance, currentLang, detectionOptions);
                     }
                 }
             }

package/dist/cjs/runtime/i18n/backend/{config.cjs → config.js}

@@ -26,9 +26,9 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     mergeBackendOptions: ()=>mergeBackendOptions
 });
-const deepMerge_cjs_namespaceObject = require("../../../shared/deepMerge.cjs");
+const deepMerge_js_namespaceObject = require("../../../shared/deepMerge.js");
 function mergeBackendOptions(defaultOptions, cliOptions = {}, userOptions) {
-    return (0, deepMerge_cjs_namespaceObject.deepMerge)((0, deepMerge_cjs_namespaceObject.deepMerge)(defaultOptions, cliOptions), userOptions ?? {});
+    return (0, deepMerge_js_namespaceObject.deepMerge)((0, deepMerge_js_namespaceObject.deepMerge)(defaultOptions, cliOptions), userOptions ?? {});
 }
 exports.mergeBackendOptions = __webpack_exports__.mergeBackendOptions;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/runtime/i18n/backend/{index.cjs → index.js}

@@ -26,8 +26,8 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     mergeBackendOptions: ()=>mergeBackendOptions
 });
-const external_config_cjs_namespaceObject = require("./config.cjs");
-const external_defaults_cjs_namespaceObject = require("./defaults.cjs");
+const external_config_js_namespaceObject = require("./config.js");
+const external_defaults_js_namespaceObject = require("./defaults.js");
 function hasSdkFunction(backend, userInitOptions) {
     return 'function' == typeof userInitOptions?.backend?.sdk || !!backend?.enabled && !!backend?.sdk && 'function' == typeof backend.sdk;
 }
@@ -42,27 +42,27 @@ function hasLoadPath(backend, userInitOptions) {
 }
 function ensureDefaultLoadPath(merged, backend, isExplicitLoadPath = false) {
     if (backend?.enabled && !isExplicitLoadPath && !merged.loadPath) {
-        merged.loadPath = external_defaults_cjs_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS.loadPath;
-        merged.addPath = external_defaults_cjs_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS.addPath;
+        merged.loadPath = external_defaults_js_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS.loadPath;
+        merged.addPath = external_defaults_js_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS.addPath;
     }
 }
 function getFinalLoadPath(mergedOptions, backend, userInitOptions) {
-    return mergedOptions?.loadPath || userInitOptions?.backend?.loadPath || (backend?.enabled ? external_defaults_cjs_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS.loadPath : void 0);
+    return mergedOptions?.loadPath || userInitOptions?.backend?.loadPath || (backend?.enabled ? external_defaults_js_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS.loadPath : void 0);
 }
 function getFinalSdk(mergedOptions, backend, userInitOptions) {
     return mergedOptions?.sdk || userInitOptions?.backend?.sdk || (backend?.sdk && 'function' == typeof backend.sdk ? backend.sdk : void 0);
 }
 function buildChainedBackendConfig(backend, userInitOptions) {
-    const merged = (0, external_config_cjs_namespaceObject.mergeBackendOptions)(external_defaults_cjs_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS, backend, userInitOptions?.backend);
+    const merged = (0, external_config_js_namespaceObject.mergeBackendOptions)(external_defaults_js_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS, backend, userInitOptions?.backend);
     const { isExplicit } = hasLoadPath(backend, userInitOptions);
     ensureDefaultLoadPath(merged, backend, isExplicit);
-    const mergedOptions = (0, external_defaults_cjs_namespaceObject.convertBackendOptions)(merged);
+    const mergedOptions = (0, external_defaults_js_namespaceObject.convertBackendOptions)(merged);
     const finalLoadPath = getFinalLoadPath(mergedOptions, backend, userInitOptions);
     const finalSdk = getFinalSdk(mergedOptions, backend, userInitOptions);
     const chainedBackendOptions = [
         {
             loadPath: finalLoadPath,
-            addPath: mergedOptions?.addPath || external_defaults_cjs_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS.addPath
+            addPath: mergedOptions?.addPath || external_defaults_js_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS.addPath
         },
         {
             sdk: finalSdk
@@ -80,17 +80,17 @@ function buildChainedBackendConfig(backend, userInitOptions) {
     };
 }
 function buildSdkOnlyBackendConfig(backend, userInitOptions) {
-    const merged = (0, external_config_cjs_namespaceObject.mergeBackendOptions)({}, backend, userInitOptions?.backend);
-    return (0, external_defaults_cjs_namespaceObject.convertBackendOptions)(merged) || {};
+    const merged = (0, external_config_js_namespaceObject.mergeBackendOptions)({}, backend, userInitOptions?.backend);
+    return (0, external_defaults_js_namespaceObject.convertBackendOptions)(merged) || {};
 }
 function buildHttpFsBackendConfig(backend, userInitOptions) {
     if (!backend?.enabled && !userInitOptions?.backend) return;
-    const mergedBackend = backend?.enabled ? (0, external_config_cjs_namespaceObject.mergeBackendOptions)(external_defaults_cjs_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS, backend, userInitOptions?.backend) : userInitOptions?.backend;
+    const mergedBackend = backend?.enabled ? (0, external_config_js_namespaceObject.mergeBackendOptions)(external_defaults_js_namespaceObject.DEFAULT_I18NEXT_BACKEND_OPTIONS, backend, userInitOptions?.backend) : userInitOptions?.backend;
     if (mergedBackend) {
         const { isExplicit } = hasLoadPath(backend, userInitOptions);
         ensureDefaultLoadPath(mergedBackend, backend, isExplicit);
     }
-    return (0, external_defaults_cjs_namespaceObject.convertBackendOptions)(mergedBackend) || {};
+    return (0, external_defaults_js_namespaceObject.convertBackendOptions)(mergedBackend) || {};
 }
 const mergeBackendOptions = (backend, userInitOptions)=>{
     const sdkFunction = hasSdkFunction(backend, userInitOptions);

package/dist/cjs/runtime/i18n/backend/{middleware.common.cjs → middleware.common.js}

@@ -37,8 +37,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_i18next_chained_backend_namespaceObject = require("i18next-chained-backend");
 var external_i18next_chained_backend_default = /*#__PURE__*/ __webpack_require__.n(external_i18next_chained_backend_namespaceObject);
-const external_instance_cjs_namespaceObject = require("../instance.cjs");
-const external_sdk_backend_cjs_namespaceObject = require("./sdk-backend.cjs");
+const external_instance_js_namespaceObject = require("../instance.js");
+const external_sdk_backend_js_namespaceObject = require("./sdk-backend.js");
 function checkBackendConfig(backend) {
     const hasSdk = backend?.sdk && 'function' == typeof backend.sdk;
     const hasLoadPath = !!backend?.loadPath;
@@ -54,7 +54,7 @@ function buildChainedBackendConfig(backend, BackendWithSave) {
     if (backend._chainedBackendConfig) return {
         backends: [
             BackendWithSave,
-            external_sdk_backend_cjs_namespaceObject.SdkBackend
+            external_sdk_backend_js_namespaceObject.SdkBackend
         ],
         backendOptions: backend._chainedBackendConfig.backendOptions,
         cacheHitMode
@@ -62,7 +62,7 @@ function buildChainedBackendConfig(backend, BackendWithSave) {
     return {
         backends: [
             BackendWithSave,
-            external_sdk_backend_cjs_namespaceObject.SdkBackend
+            external_sdk_backend_js_namespaceObject.SdkBackend
         ],
         backendOptions: [
             {
@@ -78,7 +78,7 @@ function buildChainedBackendConfig(backend, BackendWithSave) {
 }
 function setupChainedBackend(i18nInstance, backend, BackendWithSave) {
     i18nInstance.use(external_i18next_chained_backend_default());
-    const actualInstance = (0, external_instance_cjs_namespaceObject.getActualI18nextInstance)(i18nInstance);
+    const actualInstance = (0, external_instance_js_namespaceObject.getActualI18nextInstance)(i18nInstance);
     if (actualInstance?.options) actualInstance.options.backend = buildChainedBackendConfig(backend, BackendWithSave);
     if (i18nInstance.options) i18nInstance.options.backend = buildChainedBackendConfig(backend, BackendWithSave);
 }
@@ -90,8 +90,8 @@ function useI18nextBackendCommon(i18nInstance, BackendWithSave, BackendBase, bac
     if (!backend) return i18nInstance.use(BackendBase);
     const { hasSdk, hasLoadPath, useChained } = checkBackendConfig(backend);
     if (useChained || hasLoadPath && hasSdk) return void setupChainedBackend(i18nInstance, backend, BackendWithSave);
-    if (hasSdk) return i18nInstance.use(external_sdk_backend_cjs_namespaceObject.SdkBackend);
-    const actualInstance = (0, external_instance_cjs_namespaceObject.getActualI18nextInstance)(i18nInstance);
+    if (hasSdk) return i18nInstance.use(external_sdk_backend_js_namespaceObject.SdkBackend);
+    const actualInstance = (0, external_instance_js_namespaceObject.getActualI18nextInstance)(i18nInstance);
     if (actualInstance?.options) actualInstance.options.backend = cleanBackendConfig(backend);
     if (i18nInstance.options) i18nInstance.options.backend = cleanBackendConfig(backend);
     return i18nInstance.use(BackendBase);

package/dist/cjs/runtime/i18n/backend/{middleware.cjs → middleware.js}

@@ -38,11 +38,11 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_i18next_http_backend_namespaceObject = require("i18next-http-backend");
 var external_i18next_http_backend_default = /*#__PURE__*/ __webpack_require__.n(external_i18next_http_backend_namespaceObject);
-const external_middleware_common_cjs_namespaceObject = require("./middleware.common.cjs");
+const external_middleware_common_js_namespaceObject = require("./middleware.common.js");
 class HttpBackendWithSave extends external_i18next_http_backend_default() {
     save(_language, _namespace, _data) {}
 }
-const useI18nextBackend = (i18nInstance, backend)=>(0, external_middleware_common_cjs_namespaceObject.useI18nextBackendCommon)(i18nInstance, HttpBackendWithSave, external_i18next_http_backend_default(), backend);
+const useI18nextBackend = (i18nInstance, backend)=>(0, external_middleware_common_js_namespaceObject.useI18nextBackendCommon)(i18nInstance, HttpBackendWithSave, external_i18next_http_backend_default(), backend);
 exports.HttpBackendWithSave = __webpack_exports__.HttpBackendWithSave;
 exports.useI18nextBackend = __webpack_exports__.useI18nextBackend;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/runtime/i18n/backend/{middleware.node.cjs → middleware.node.js}

@@ -39,12 +39,12 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_i18next_fs_backend_namespaceObject = require("i18next-fs-backend");
 var external_i18next_fs_backend_default = /*#__PURE__*/ __webpack_require__.n(external_i18next_fs_backend_namespaceObject);
-const external_middleware_common_cjs_namespaceObject = require("./middleware.common.cjs");
+const external_middleware_common_js_namespaceObject = require("./middleware.common.js");
 class FsBackendWithSave extends external_i18next_fs_backend_default() {
     save(_language, _namespace, _data) {}
 }
 const HttpBackendWithSave = FsBackendWithSave;
-const useI18nextBackend = (i18nInstance, backend)=>(0, external_middleware_common_cjs_namespaceObject.useI18nextBackendCommon)(i18nInstance, FsBackendWithSave, external_i18next_fs_backend_default(), backend);
+const useI18nextBackend = (i18nInstance, backend)=>(0, external_middleware_common_js_namespaceObject.useI18nextBackendCommon)(i18nInstance, FsBackendWithSave, external_i18next_fs_backend_default(), backend);
 exports.FsBackendWithSave = __webpack_exports__.FsBackendWithSave;
 exports.HttpBackendWithSave = __webpack_exports__.HttpBackendWithSave;
 exports.useI18nextBackend = __webpack_exports__.useI18nextBackend;

package/dist/cjs/runtime/i18n/detection/{config.cjs → config.js}

@@ -27,7 +27,7 @@ __webpack_require__.d(__webpack_exports__, {
     mergeDetectionOptions: ()=>mergeDetectionOptions,
     DEFAULT_I18NEXT_DETECTION_OPTIONS: ()=>DEFAULT_I18NEXT_DETECTION_OPTIONS
 });
-const deepMerge_cjs_namespaceObject = require("../../../shared/deepMerge.cjs");
+const deepMerge_js_namespaceObject = require("../../../shared/deepMerge.js");
 const DEFAULT_I18NEXT_DETECTION_OPTIONS = {
     caches: [
         'cookie',
@@ -50,7 +50,7 @@ const DEFAULT_I18NEXT_DETECTION_OPTIONS = {
     lookupHeader: 'accept-language'
 };
 function mergeDetectionOptions(cliOptions, userOptions, defaultOptions = DEFAULT_I18NEXT_DETECTION_OPTIONS) {
-    return (0, deepMerge_cjs_namespaceObject.deepMerge)((0, deepMerge_cjs_namespaceObject.deepMerge)(defaultOptions, cliOptions ?? {}), userOptions ?? {});
+    return (0, deepMerge_js_namespaceObject.deepMerge)((0, deepMerge_js_namespaceObject.deepMerge)(defaultOptions, cliOptions ?? {}), userOptions ?? {});
 }
 exports.DEFAULT_I18NEXT_DETECTION_OPTIONS = __webpack_exports__.DEFAULT_I18NEXT_DETECTION_OPTIONS;
 exports.mergeDetectionOptions = __webpack_exports__.mergeDetectionOptions;

package/dist/cjs/runtime/i18n/detection/{index.cjs → index.js}

@@ -29,13 +29,13 @@ __webpack_require__.d(__webpack_exports__, {
     mergeDetectionOptions: ()=>mergeDetectionOptions,
     getLanguageFromSSRData: ()=>getLanguageFromSSRData,
     detectLanguageWithPriority: ()=>detectLanguageWithPriority,
-    cacheUserLanguage: ()=>external_middleware_cjs_namespaceObject.cacheUserLanguage
+    cacheUserLanguage: ()=>external_middleware_js_namespaceObject.cacheUserLanguage
 });
 const runtime_namespaceObject = require("@modern-js/runtime");
-const external_utils_cjs_namespaceObject = require("../../utils.cjs");
-const external_instance_cjs_namespaceObject = require("../instance.cjs");
-const external_config_cjs_namespaceObject = require("./config.cjs");
-const external_middleware_cjs_namespaceObject = require("./middleware.cjs");
+const external_utils_js_namespaceObject = require("../../utils.js");
+const external_instance_js_namespaceObject = require("../instance.js");
+const external_config_js_namespaceObject = require("./config.js");
+const external_middleware_js_namespaceObject = require("./middleware.js");
 const detectorInstanceCache = new WeakMap();
 const DETECTOR_SAFE_OPTION_KEYS = [
     'lowerCaseLng',
@@ -146,7 +146,7 @@ const detectLanguageFromPathPriority = (pathname, languages, localePathRedirect)
     if (!languages || 0 === languages.length) return;
     if (!pathname || '' === pathname.trim()) return;
     try {
-        const pathDetection = (0, external_utils_cjs_namespaceObject.detectLanguageFromPath)(pathname, languages, localePathRedirect);
+        const pathDetection = (0, external_utils_js_namespaceObject.detectLanguageFromPath)(pathname, languages, localePathRedirect);
         if (true === pathDetection.detected && pathDetection.language) return pathDetection.language;
     } catch (error) {}
 };
@@ -207,7 +207,7 @@ const initializeI18nForDetector = async (i18nInstance, options)=>{
             useSuspense: false
         }
     };
-    (0, external_middleware_cjs_namespaceObject.useI18nextLanguageDetector)(instance);
+    (0, external_middleware_js_namespaceObject.useI18nextLanguageDetector)(instance);
     if (instance.isInitialized) {
         if (isTemporary) await instance.init(initOptions);
     } else await instance.init(initOptions);
@@ -223,7 +223,7 @@ const detectLanguageFromI18nextDetector = async (i18nInstance, options)=>{
     try {
         const request = options.ssrContext?.request;
         if (!(0, runtime_namespaceObject.isBrowser)() && !request) return;
-        const detectorLang = (0, external_middleware_cjs_namespaceObject.detectLanguage)(detectorInstance, request, mergedDetection);
+        const detectorLang = (0, external_middleware_js_namespaceObject.detectLanguage)(detectorInstance, request, mergedDetection);
         if (detectorLang) {
             const supportedLang = getSupportedLanguage(detectorLang, options.languages);
             if (supportedLang) return supportedLang;
@@ -249,7 +249,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_cjs_namespaceObject.isI18nWrapperInstance)(i18nInstance) ? (0, external_middleware_cjs_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)) : await detectLanguageFromI18nextDetector(i18nInstance, {
         languages,
         fallbackLanguage,
         localePathRedirect,
@@ -285,7 +285,7 @@ const buildInitOptions = (params)=>{
 };
 const mergeDetectionOptions = (i18nextDetector, detection, localePathRedirect, userInitOptions)=>{
     let mergedDetection;
-    mergedDetection = i18nextDetector ? (0, external_config_cjs_namespaceObject.mergeDetectionOptions)(detection, userInitOptions?.detection) : userInitOptions?.detection || {};
+    mergedDetection = i18nextDetector ? (0, external_config_js_namespaceObject.mergeDetectionOptions)(detection, userInitOptions?.detection) : userInitOptions?.detection || {};
     if (!mergedDetection || 'object' != typeof mergedDetection) mergedDetection = {};
     if (localePathRedirect && mergedDetection.order) mergedDetection.order = mergedDetection.order.filter((item)=>'path' !== item);
     return mergedDetection;

package/dist/cjs/runtime/i18n/detection/{middleware.cjs → middleware.js}

@@ -41,11 +41,11 @@ __webpack_require__.d(__webpack_exports__, {
 const runtime_namespaceObject = require("@modern-js/runtime");
 const external_i18next_browser_languagedetector_namespaceObject = require("i18next-browser-languagedetector");
 var external_i18next_browser_languagedetector_default = /*#__PURE__*/ __webpack_require__.n(external_i18next_browser_languagedetector_namespaceObject);
-const external_instance_cjs_namespaceObject = require("../instance.cjs");
+const external_instance_js_namespaceObject = require("../instance.js");
 const useI18nextLanguageDetector = (i18nInstance)=>{
     if (!i18nInstance.isInitialized) {
-        if ((0, external_instance_cjs_namespaceObject.isI18nWrapperInstance)(i18nInstance)) {
-            const actualInstance = (0, external_instance_cjs_namespaceObject.getActualI18nextInstance)(i18nInstance);
+        if ((0, external_instance_js_namespaceObject.isI18nWrapperInstance)(i18nInstance)) {
+            const actualInstance = (0, external_instance_js_namespaceObject.getActualI18nextInstance)(i18nInstance);
             if (actualInstance && !actualInstance.isInitialized) actualInstance.use(external_i18next_browser_languagedetector_default());
         }
         return i18nInstance.use(external_i18next_browser_languagedetector_default());
@@ -111,7 +111,7 @@ const readLanguageFromStorage = (detectionOptions)=>{
 };
 const detectLanguage = (i18nInstance, _request, detectionOptions)=>{
     try {
-        const actualInstance = (0, external_instance_cjs_namespaceObject.isI18nWrapperInstance)(i18nInstance) ? (0, external_instance_cjs_namespaceObject.getActualI18nextInstance)(i18nInstance) : i18nInstance;
+        const actualInstance = (0, external_instance_js_namespaceObject.isI18nWrapperInstance)(i18nInstance) ? (0, external_instance_js_namespaceObject.getActualI18nextInstance)(i18nInstance) : i18nInstance;
         const isInitialized = i18nInstance.isInitialized || actualInstance?.isInitialized;
         const detector = actualInstance?.services?.languageDetector || i18nInstance.services?.languageDetector;
         if (detector && 'function' == typeof detector.detect) {
@@ -143,7 +143,7 @@ const detectLanguage = (i18nInstance, _request, detectionOptions)=>{
 const cacheUserLanguage = (i18nInstance, language, detectionOptions)=>{
     if ("u" < typeof window) return;
     try {
-        const actualInstance = (0, external_instance_cjs_namespaceObject.isI18nWrapperInstance)(i18nInstance) ? (0, external_instance_cjs_namespaceObject.getActualI18nextInstance)(i18nInstance) : i18nInstance;
+        const actualInstance = (0, external_instance_js_namespaceObject.isI18nWrapperInstance)(i18nInstance) ? (0, external_instance_js_namespaceObject.getActualI18nextInstance)(i18nInstance) : i18nInstance;
         const detector = actualInstance?.services?.languageDetector || i18nInstance.services?.languageDetector;
         if (detector && 'function' == typeof detector.cacheUserLanguage) try {
             detector.cacheUserLanguage(language);

package/dist/cjs/runtime/i18n/{index.cjs → index.js}

@@ -24,12 +24,12 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    getI18nInstance: ()=>external_instance_cjs_namespaceObject.getI18nInstance,
-    isI18nInstance: ()=>external_instance_cjs_namespaceObject.isI18nInstance,
-    assertI18nInstance: ()=>external_utils_cjs_namespaceObject.assertI18nInstance
+    getI18nInstance: ()=>external_instance_js_namespaceObject.getI18nInstance,
+    isI18nInstance: ()=>external_instance_js_namespaceObject.isI18nInstance,
+    assertI18nInstance: ()=>external_utils_js_namespaceObject.assertI18nInstance
 });
-const external_instance_cjs_namespaceObject = require("./instance.cjs");
-const external_utils_cjs_namespaceObject = require("./utils.cjs");
+const external_instance_js_namespaceObject = require("./instance.js");
+const external_utils_js_namespaceObject = require("./utils.js");
 exports.assertI18nInstance = __webpack_exports__.assertI18nInstance;
 exports.getI18nInstance = __webpack_exports__.getI18nInstance;
 exports.isI18nInstance = __webpack_exports__.isI18nInstance;

package/dist/cjs/runtime/i18n/{instance.cjs → instance.js}

@@ -68,7 +68,7 @@ async function createI18nextInstance() {
     try {
         const i18next = await tryImportI18next();
         if (!i18next) return null;
-        return i18next.createInstance({
+        return i18next.createInstance?.({
             initImmediate: false
         });
     } catch (error) {

package/dist/cjs/runtime/i18n/{utils.cjs → utils.js}

@@ -32,13 +32,13 @@ __webpack_require__.d(__webpack_exports__, {
     ensureLanguageMatch: ()=>ensureLanguageMatch
 });
 const runtime_namespaceObject = require("@modern-js/runtime");
-const index_cjs_namespaceObject = require("./backend/index.cjs");
-const middleware_cjs_namespaceObject = require("./backend/middleware.cjs");
-const sdk_backend_cjs_namespaceObject = require("./backend/sdk-backend.cjs");
-const external_detection_index_cjs_namespaceObject = require("./detection/index.cjs");
-const external_instance_cjs_namespaceObject = require("./instance.cjs");
+const index_js_namespaceObject = require("./backend/index.js");
+const middleware_js_namespaceObject = require("./backend/middleware.js");
+const sdk_backend_js_namespaceObject = require("./backend/sdk-backend.js");
+const external_detection_index_js_namespaceObject = require("./detection/index.js");
+const external_instance_js_namespaceObject = require("./instance.js");
 function assertI18nInstance(obj) {
-    if (!(0, external_instance_cjs_namespaceObject.isI18nInstance)(obj)) throw new Error('Object does not implement I18nInstance interface');
+    if (!(0, external_instance_js_namespaceObject.isI18nInstance)(obj)) throw new Error('Object does not implement I18nInstance interface');
 }
 const buildInitOptions = async (finalLanguage, fallbackLanguage, languages, mergedDetection, mergedBackend, userInitOptions, useSuspense, i18nInstance)=>{
     const defaultUseSuspense = void 0 !== useSuspense ? useSuspense : (0, runtime_namespaceObject.isBrowser)() ? userInitOptions?.react?.useSuspense ?? true : false;
@@ -71,8 +71,8 @@ const buildInitOptions = async (finalLanguage, fallbackLanguage, languages, merg
             HttpBackend = i18nInstance.options.backend.backends[0];
             SdkBackendClass = i18nInstance.options.backend.backends[1];
         } else {
-            HttpBackend = middleware_cjs_namespaceObject.HttpBackendWithSave;
-            SdkBackendClass = sdk_backend_cjs_namespaceObject.SdkBackend;
+            HttpBackend = middleware_js_namespaceObject.HttpBackendWithSave;
+            SdkBackendClass = sdk_backend_js_namespaceObject.SdkBackend;
         }
         initOptions.backend = {
             backends: [
@@ -101,18 +101,18 @@ const changeI18nLanguage = async (i18nInstance, newLang, options)=>{
     await i18nInstance.changeLanguage?.(newLang);
     if ((0, runtime_namespaceObject.isBrowser)()) {
         const detectionOptions = options?.detectionOptions || i18nInstance.options?.detection;
-        (0, external_detection_index_cjs_namespaceObject.cacheUserLanguage)(i18nInstance, newLang, detectionOptions);
+        (0, external_detection_index_js_namespaceObject.cacheUserLanguage)(i18nInstance, newLang, detectionOptions);
     }
 };
 const initializeI18nInstance = async (i18nInstance, finalLanguage, fallbackLanguage, languages, mergedDetection, mergedBackend, userInitOptions, useSuspense)=>{
     if (!i18nInstance.isInitialized) {
         const initOptions = await buildInitOptions(finalLanguage, fallbackLanguage, languages, mergedDetection, mergedBackend, userInitOptions, useSuspense, i18nInstance);
-        const actualInstance = (0, external_instance_cjs_namespaceObject.getActualI18nextInstance)(i18nInstance);
+        const actualInstance = (0, external_instance_js_namespaceObject.getActualI18nextInstance)(i18nInstance);
         const savedBackendConfig = actualInstance?.options?.backend || i18nInstance.options?.backend;
         const isChainedBackendFromSaved = savedBackendConfig?.backends && Array.isArray(savedBackendConfig.backends);
         await i18nInstance.init(initOptions);
         if (mergedBackend) {
-            if ((0, external_instance_cjs_namespaceObject.isI18nWrapperInstance)(i18nInstance) && actualInstance?.options) {
+            if ((0, external_instance_js_namespaceObject.isI18nWrapperInstance)(i18nInstance) && actualInstance?.options) {
                 if (isChainedBackendFromSaved && initOptions.backend) actualInstance.options.backend = {
                     ...initOptions.backend,
                     backends: savedBackendConfig.backends
@@ -138,7 +138,7 @@ const initializeI18nInstance = async (i18nInstance, finalLanguage, fallbackLangu
             const ns = Array.isArray(defaultNS) ? defaultNS[0] : defaultNS;
             let retries = 20;
             while(retries > 0){
-                const actualInstance = (0, external_instance_cjs_namespaceObject.getActualI18nextInstance)(i18nInstance);
+                const actualInstance = (0, external_instance_js_namespaceObject.getActualI18nextInstance)(i18nInstance);
                 const store = actualInstance.store;
                 if (store?.data?.[finalLanguage]?.[ns]) break;
                 await new Promise((resolve)=>setTimeout(resolve, 100));
@@ -151,17 +151,17 @@ function hasOptions(instance) {
     return void 0 !== instance.options && null !== instance.options;
 }
 const setupClonedInstance = async (i18nInstance, finalLanguage, fallbackLanguage, languages, backendEnabled, backend, i18nextDetector, detection, localePathRedirect, userInitOptions)=>{
-    const mergedBackend = (0, index_cjs_namespaceObject.mergeBackendOptions)(backend, userInitOptions);
+    const mergedBackend = (0, index_js_namespaceObject.mergeBackendOptions)(backend, userInitOptions);
     const hasSdkConfig = 'function' == typeof userInitOptions?.backend?.sdk || mergedBackend?.sdk && 'function' == typeof mergedBackend.sdk;
     if (backendEnabled || hasSdkConfig) {
-        (0, middleware_cjs_namespaceObject.useI18nextBackend)(i18nInstance, mergedBackend);
+        (0, middleware_js_namespaceObject.useI18nextBackend)(i18nInstance, mergedBackend);
         if (mergedBackend && hasOptions(i18nInstance)) i18nInstance.options.backend = {
             ...i18nInstance.options.backend,
             ...mergedBackend
         };
         if (i18nInstance.isInitialized) await ensureLanguageMatch(i18nInstance, finalLanguage);
         else {
-            const mergedDetection = (0, external_detection_index_cjs_namespaceObject.mergeDetectionOptions)(i18nextDetector, detection, localePathRedirect, userInitOptions);
+            const mergedDetection = (0, external_detection_index_js_namespaceObject.mergeDetectionOptions)(i18nextDetector, detection, localePathRedirect, userInitOptions);
             await initializeI18nInstance(i18nInstance, finalLanguage, fallbackLanguage, languages, mergedDetection, mergedBackend, userInitOptions, false);
         }
     } else await ensureLanguageMatch(i18nInstance, finalLanguage);