@bleedingdev/modern-js-plugin-i18n 3.9.0-ultramodern.9 → 3.9.3-ultramodern.2

package/dist/esm/shared/detection.mjs

@@ -1 +1,85 @@
-import "../runtime/i18n/detection/config.mjs";
+import { DEFAULT_I18NEXT_DETECTION_OPTIONS, mergeDetectionOptions } from "../runtime/i18n/detection/config.mjs";
+function detectLanguageFromRequest(req, languages, detectionOptions) {
+    try {
+        const mergedDetection = detectionOptions ? mergeDetectionOptions(detectionOptions) : DEFAULT_I18NEXT_DETECTION_OPTIONS;
+        const order = (mergedDetection.order || []).filter((item)=>![
+                'path',
+                'localStorage',
+                'navigator',
+                'htmlTag',
+                'subdomain'
+            ].includes(item));
+        const detectionOrder = order.length > 0 ? order : [
+            'querystring',
+            'cookie',
+            'header'
+        ];
+        const getHeader = (name)=>{
+            const headers = req.headers;
+            if ('function' == typeof headers?.get) return headers.get(name);
+            const value = headers[name.toLowerCase()];
+            if (Array.isArray(value)) return value[0] ?? null;
+            return value ?? null;
+        };
+        for (const method of detectionOrder){
+            let detectedLang = null;
+            switch(method){
+                case 'querystring':
+                    {
+                        const lookupKey = mergedDetection.lookupQuerystring || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupQuerystring || 'lng';
+                        const host = getHeader('host') || 'localhost';
+                        const url = new URL(req.url, `http://${host}`);
+                        detectedLang = url.searchParams.get(lookupKey);
+                        break;
+                    }
+                case 'cookie':
+                    {
+                        const lookupKey = mergedDetection.lookupCookie || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupCookie || 'i18next';
+                        const cookieHeader = getHeader('Cookie');
+                        if (cookieHeader) {
+                            const cookies = cookieHeader.split(';').reduce((acc, item)=>{
+                                const [key, value] = item.trim().split('=');
+                                if (key && value) acc[key] = value;
+                                return acc;
+                            }, {});
+                            detectedLang = cookies[lookupKey] || null;
+                        }
+                        break;
+                    }
+                case 'header':
+                    {
+                        const lookupKey = mergedDetection.lookupHeader || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupHeader || 'accept-language';
+                        const acceptLanguage = getHeader(lookupKey);
+                        if (acceptLanguage) {
+                            const languagesList = acceptLanguage.split(',').map((lang)=>{
+                                const [code, q] = lang.trim().split(';');
+                                return {
+                                    code,
+                                    baseCode: code.split('-')[0],
+                                    quality: q ? parseFloat(q.split('=')[1]) : 1.0
+                                };
+                            }).sort((a, b)=>b.quality - a.quality);
+                            for (const lang of languagesList){
+                                if (0 === languages.length || languages.includes(lang.code)) {
+                                    detectedLang = lang.code;
+                                    break;
+                                }
+                                if (languages.includes(lang.baseCode)) {
+                                    detectedLang = lang.baseCode;
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+                    }
+            }
+            if (detectedLang && (0 === languages.length || languages.includes(detectedLang))) return detectedLang;
+            if (detectedLang) {
+                const baseLang = detectedLang.split('-')[0];
+                if (languages.includes(baseLang)) return baseLang;
+            }
+        }
+    } catch (error) {}
+    return null;
+}
+export { detectLanguageFromRequest };

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

@@ -52,7 +52,7 @@ const i18nPlugin = (options = {})=>({
             });
             api.modifyFileSystemRoutes(({ entrypoint, routes })=>({
                     entrypoint,
-                    routes: applyLocalisedRoutes(routes, localeDetection ? getLocaleDetectionOptions(entrypoint.entryName, localeDetection) : void 0)
+                    routes: applyLocalisedRoutes(routes, localeDetection ? getLocaleDetectionOptions(entrypoint.entryName, localeDetection) : void 0, entrypoint)
                 }));
             api._internalServerPlugins(({ plugins })=>{
                 const { serverRoutes, metaName } = api.getAppContext();

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

@@ -1,9 +1,10 @@
 import "node:module";
 import { applyLocalisedUrlsToRoutes, resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
-const applyLocalisedRoutes = (routes, localeDetection)=>{
+import { getEntrypointRoutesOwner } from "@modern-js/runtime/cli";
+const applyLocalisedRoutes = (routes, localeDetection, entrypoint)=>{
     const { localePathRedirect, languages = [], localisedUrls } = localeDetection ?? {};
     const resolved = resolveLocalisedUrlsConfig(localisedUrls);
     if (!localePathRedirect || !languages.length || !resolved.enabled) return routes;
-    return applyLocalisedUrlsToRoutes(routes, languages, resolved.map);
+    return applyLocalisedUrlsToRoutes(routes, languages, resolved.map, entrypoint && '@modern-js/plugin-tanstack' === getEntrypointRoutesOwner(entrypoint) ? 'canonical' : 'physical');
 };
 export { applyLocalisedRoutes };

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

@@ -1,18 +1,10 @@
 import "node:module";
 import { jsx } from "react/jsx-runtime";
 import { RuntimeComponentResolverContext } from "@modern-js/runtime/context";
-import { createContext, useCallback, useContext, useEffect, useMemo } from "react";
+import { useCallback, useContext, useEffect, useMemo } from "react";
 import { changeModernI18nLanguage, getPathLanguage, isI18nLanguageSupported, isI18nResourcesReady, translateI18n } from "./contextHelpers.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
-const modernI18nContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ModernI18nContext');
-const reactI18nextProviderContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/ReactI18nextProviderContext');
-const getGlobalContext = (key, defaultValue)=>{
-    const globalStore = globalThis;
-    globalStore[key] ??= /*#__PURE__*/ createContext(defaultValue);
-    return globalStore[key];
-};
-const ModernI18nContext = getGlobalContext(modernI18nContextKey, null);
-const ReactI18nextProviderContext = getGlobalContext(reactI18nextProviderContextKey, null);
+import { ModernI18nContext, ReactI18nextProviderContext } from "./sharedContexts.mjs";
 const ModernI18nProvider = ({ children, i18nextProvider, value })=>{
     const content = /*#__PURE__*/ jsx(ModernI18nContext.Provider, {
         value: value,

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

@@ -0,0 +1,6 @@
+import "node:module";
+import { createContext } from "react";
+const ModernI18nContext = createContext(null);
+const ReactI18nextProviderContext = createContext(null);
+const I18nNavigationContext = createContext(null);
+export { I18nNavigationContext, ModernI18nContext, ReactI18nextProviderContext };

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

@@ -1,6 +1,7 @@
 import "node:module";
 import { resolveMappedUrlStrategy } from "../shared/mappedUrlStrategy.mjs";
 import { asI18nUrlStrategy } from "../shared/urlStrategy.mjs";
+import { I18nRouterNavigationProvider, useIntegratedRouterAdapter } from "./navigation.mjs";
 import { setupI18nBeforeRender } from "./pluginSetup.mjs";
 import { createI18nRootWrapper } from "./providerComposition.mjs";
 import { resolveReactI18nextIntegration } from "./reactI18next.mjs";
@@ -40,7 +41,7 @@ const createI18nPlugin = (loadReactI18nextIntegration)=>(options)=>({
                     fallbackLanguage,
                     ignoreRedirectRoutes,
                     urlStrategy: resolvedUrlStrategy,
-                    NavigationProvider,
+                    NavigationProvider: NavigationProvider ?? I18nRouterNavigationProvider,
                     LanguageSynchronization,
                     getLatestI18nInstance: ()=>latestI18nInstance,
                     getI18nextProvider: ()=>I18nextProvider
@@ -53,4 +54,4 @@ export { I18nLink } from "./I18nLink.mjs";
 export { Link } from "./Link.mjs";
 export { useLocalizedLocation, useLocalizedPaths } from "./localizedPaths.mjs";
 export { splitUrlTarget } from "./utils.mjs";
-export { createI18nPlugin };
+export { I18nRouterNavigationProvider, createI18nPlugin, useIntegratedRouterAdapter };

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

@@ -12,7 +12,7 @@ const useI18nextLanguageDetector = (i18nInstance)=>{
     }
     return i18nInstance;
 };
-const readLanguageFromStorage = (detectionOptions)=>{
+const readLanguageFromStorage = (detectionOptions, _request, _languages)=>{
     try {
         const options = detectionOptions || {};
         const order = options.order || [

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

@@ -1,7 +1,16 @@
 import "node:module";
 import { LanguageDetector } from "i18next-http-middleware";
+import { detectLanguageFromRequest } from "../../../shared/detection.mjs";
+const isDetectionRequest = (request)=>{
+    if (!request || 'object' != typeof request) return false;
+    const { url, headers } = request;
+    return 'string' == typeof url && !!headers && 'object' == typeof headers;
+};
 const cacheUserLanguage = (_i18nInstance, _language, _detectionOptions)=>{};
-const readLanguageFromStorage = (_detectionOptions)=>{};
+const readLanguageFromStorage = (detectionOptions, request, languages = [])=>{
+    if (!isDetectionRequest(request)) return;
+    return detectLanguageFromRequest(request, languages, detectionOptions) ?? void 0;
+};
 const useI18nextLanguageDetector = (i18nInstance)=>{
     if (!i18nInstance.isInitialized) return i18nInstance.use(LanguageDetector);
     return i18nInstance;

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

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

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

@@ -0,0 +1,8 @@
+import "node:module";
+import { createI18nRouterNavigation } from "@modern-js/i18n-runtime-extensions/router-navigation";
+import { I18nNavigationProvider, useNativeI18nRouterAdapter } from "./routerAdapter.mjs";
+const { I18nRouterNavigationProvider: I18nRouterNavigationProvider, useIntegratedRouterAdapter: useIntegratedRouterAdapter } = createI18nRouterNavigation({
+    I18nNavigationProvider: I18nNavigationProvider,
+    useNativeI18nRouterAdapter: useNativeI18nRouterAdapter
+});
+export { I18nRouterNavigationProvider, useIntegratedRouterAdapter };

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

@@ -1,11 +1,9 @@
 import "node:module";
 import { jsx } from "react/jsx-runtime";
+import { I18nNavigationContext } from "@modern-js/plugin-i18n/runtime/contexts";
 import { RuntimeContext, isBrowser } from "@modern-js/runtime";
 import { InternalRuntimeContext } from "@modern-js/runtime/context";
-import { createContext, useContext } from "react";
-const navigationContextKey = Symbol.for('@modern-js/plugin-i18n/runtime/I18nNavigationContext');
-const contextStore = globalThis;
-const I18nNavigationContext = contextStore[navigationContextKey] ??= /*#__PURE__*/ createContext(null);
+import { useContext } from "react";
 const I18nNavigationProvider = ({ children, value })=>/*#__PURE__*/ jsx(I18nNavigationContext.Provider, {
         value: value,
         children: children

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

@@ -0,0 +1,2 @@
+import "node:module";
+export { ModernI18nContext, ReactI18nextProviderContext } from "@modern-js/plugin-i18n/runtime/contexts";

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

@@ -1,2 +1,86 @@
 import "node:module";
-import "../runtime/i18n/detection/config.mjs";
+import { DEFAULT_I18NEXT_DETECTION_OPTIONS, mergeDetectionOptions } from "../runtime/i18n/detection/config.mjs";
+function detectLanguageFromRequest(req, languages, detectionOptions) {
+    try {
+        const mergedDetection = detectionOptions ? mergeDetectionOptions(detectionOptions) : DEFAULT_I18NEXT_DETECTION_OPTIONS;
+        const order = (mergedDetection.order || []).filter((item)=>![
+                'path',
+                'localStorage',
+                'navigator',
+                'htmlTag',
+                'subdomain'
+            ].includes(item));
+        const detectionOrder = order.length > 0 ? order : [
+            'querystring',
+            'cookie',
+            'header'
+        ];
+        const getHeader = (name)=>{
+            const headers = req.headers;
+            if ('function' == typeof headers?.get) return headers.get(name);
+            const value = headers[name.toLowerCase()];
+            if (Array.isArray(value)) return value[0] ?? null;
+            return value ?? null;
+        };
+        for (const method of detectionOrder){
+            let detectedLang = null;
+            switch(method){
+                case 'querystring':
+                    {
+                        const lookupKey = mergedDetection.lookupQuerystring || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupQuerystring || 'lng';
+                        const host = getHeader('host') || 'localhost';
+                        const url = new URL(req.url, `http://${host}`);
+                        detectedLang = url.searchParams.get(lookupKey);
+                        break;
+                    }
+                case 'cookie':
+                    {
+                        const lookupKey = mergedDetection.lookupCookie || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupCookie || 'i18next';
+                        const cookieHeader = getHeader('Cookie');
+                        if (cookieHeader) {
+                            const cookies = cookieHeader.split(';').reduce((acc, item)=>{
+                                const [key, value] = item.trim().split('=');
+                                if (key && value) acc[key] = value;
+                                return acc;
+                            }, {});
+                            detectedLang = cookies[lookupKey] || null;
+                        }
+                        break;
+                    }
+                case 'header':
+                    {
+                        const lookupKey = mergedDetection.lookupHeader || DEFAULT_I18NEXT_DETECTION_OPTIONS.lookupHeader || 'accept-language';
+                        const acceptLanguage = getHeader(lookupKey);
+                        if (acceptLanguage) {
+                            const languagesList = acceptLanguage.split(',').map((lang)=>{
+                                const [code, q] = lang.trim().split(';');
+                                return {
+                                    code,
+                                    baseCode: code.split('-')[0],
+                                    quality: q ? parseFloat(q.split('=')[1]) : 1.0
+                                };
+                            }).sort((a, b)=>b.quality - a.quality);
+                            for (const lang of languagesList){
+                                if (0 === languages.length || languages.includes(lang.code)) {
+                                    detectedLang = lang.code;
+                                    break;
+                                }
+                                if (languages.includes(lang.baseCode)) {
+                                    detectedLang = lang.baseCode;
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+                    }
+            }
+            if (detectedLang && (0 === languages.length || languages.includes(detectedLang))) return detectedLang;
+            if (detectedLang) {
+                const baseLang = detectedLang.split('-')[0];
+                if (languages.includes(baseLang)) return baseLang;
+            }
+        }
+    } catch (error) {}
+    return null;
+}
+export { detectLanguageFromRequest };

package/dist/types/cli/localisedRoutes.d.ts

@@ -1,4 +1,5 @@
-import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
+import { getEntrypointRoutesOwner } from '@modern-js/runtime/cli';
+import type { Entrypoint, NestedRouteForCli, PageRoute } from '@modern-js/types';
 import type { BaseLocaleDetectionOptions } from '../shared/type.js';
 type FileSystemRoutes = (NestedRouteForCli | PageRoute)[];
 /**
@@ -14,5 +15,5 @@ type FileSystemRoutes = (NestedRouteForCli | PageRoute)[];
  * with `localePathRedirect` and `languages` but no map keeps plain
  * locale-prefix behaviour.
  */
-export declare const applyLocalisedRoutes: (routes: FileSystemRoutes, localeDetection: BaseLocaleDetectionOptions | undefined) => FileSystemRoutes;
+export declare const applyLocalisedRoutes: (routes: FileSystemRoutes, localeDetection: BaseLocaleDetectionOptions | undefined, entrypoint?: Entrypoint & Parameters<typeof getEntrypointRoutesOwner>[0]) => FileSystemRoutes;
 export {};

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

@@ -2,6 +2,7 @@ import type { ComponentType, FC, ReactNode } from 'react';
 import type { I18nUrlStrategy } from '../shared/urlStrategy.js';
 import type { I18nInstance } from './i18n/index.js';
 import type { Resources } from './i18n/instance.js';
+import { ModernI18nContext, ReactI18nextProviderContext } from './sharedContexts.js';
 export { getActualI18nextInstance } from './i18n/instance.js';
 export interface ModernI18nContextValue {
     language: string;
@@ -14,8 +15,7 @@ export interface ModernI18nContextValue {
     updateLanguage?: (newLang: string) => void;
     synchronizeLanguage?: (newLang: string) => void;
 }
-export declare const ModernI18nContext: import("react").Context<ModernI18nContextValue | null>;
-export declare const ReactI18nextProviderContext: import("react").Context<ComponentType<any> | null>;
+export { ModernI18nContext, ReactI18nextProviderContext };
 export interface ModernI18nProviderProps {
     children: ReactNode;
     i18nextProvider?: ComponentType<any> | null;

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

@@ -0,0 +1,6 @@
+import type { ComponentType } from 'react';
+import type { ModernI18nContextValue } from './context.js';
+import type { I18nRouterAdapter } from './routerAdapter.js';
+export declare const ModernI18nContext: import("react").Context<ModernI18nContextValue | null>;
+export declare const ReactI18nextProviderContext: import("react").Context<ComponentType<any> | null>;
+export declare const I18nNavigationContext: import("react").Context<I18nRouterAdapter | null>;

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

@@ -10,6 +10,7 @@ import './types.js';
 export type { I18nSdkLoader, I18nSdkLoadOptions } from '../shared/type.js';
 export type { I18nUrlStrategy } from '../shared/urlStrategy.js';
 export type { I18nInitOptions, I18nInstance, Resources, TranslateFn, } from './i18n/instance.js';
+export { I18nRouterNavigationProvider, useIntegratedRouterAdapter, } from './navigation.js';
 export type { LoadReactI18nextIntegration, ReactI18nextIntegration, } from './reactI18next.js';
 export { I18nNavigationProvider, type I18nRouterAdapter, type I18nRouterLinkTarget, useI18nRouterAdapter, useNativeI18nRouterAdapter, } from './routerAdapter.js';
 export interface I18nPluginOptions {

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

@@ -9,7 +9,7 @@ export declare const useI18nextLanguageDetector: (i18nInstance: I18nInstance) =>
  * Read language directly from localStorage/cookie
  * Fallback when detector is not available in services
  */
-export declare const readLanguageFromStorage: (detectionOptions?: LanguageDetectorOptions) => string | undefined;
+export declare const readLanguageFromStorage: (detectionOptions?: LanguageDetectorOptions, _request?: unknown, _languages?: string[]) => string | undefined;
 /**
  * Detect language using i18next-browser-languagedetector
  * For initialized instances without detector in services, manually create a detector instance

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

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

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

@@ -0,0 +1,10 @@
+import { type I18nRouterAdapter } from './routerAdapter.js';
+/**
+ * The seam, and only the seam. The selected-router navigation adapter is a
+ * fork subsystem, so it lives in the fork-owned
+ * `@modern-js/i18n-runtime-extensions` and is attached here through the
+ * `NavigationProvider` extension point this package already exposes. The
+ * factory takes this package's own primitives as arguments, so the fork
+ * package never imports back into it and the dependency stays one-way.
+ */
+export declare const I18nRouterNavigationProvider: ({ children, }: React.PropsWithChildren) => React.JSX.Element, useIntegratedRouterAdapter: () => I18nRouterAdapter;

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

@@ -0,0 +1 @@
+export { ModernI18nContext, ReactI18nextProviderContext, } from './contexts.js';

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

@@ -1 +1,11 @@
-export {};
+import type { LanguageDetectorOptions } from '../runtime/i18n/instance.js';
+/**
+ * Detect language from request using the same detection logic as i18next
+ * This ensures consistency between server-side and client-side detection
+ */
+export declare function detectLanguageFromRequest(req: {
+    url: string;
+    headers: Headers | {
+        get: (name: string) => string | null;
+    } | Record<string, string | string[] | undefined>;
+}, languages: string[], detectionOptions?: LanguageDetectorOptions): string | null;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@bleedingdev/modern-js-plugin-i18n",
   "description": "A Progressive React Framework for modern web development.",
-  "homepage": "https://github.com/BleedingDev/ultramodern.js#readme",
+  "homepage": "https://github.com/ultramodernjs/ultramodern.js#readme",
   "bugs": {
-    "url": "https://github.com/BleedingDev/ultramodern.js/issues"
+    "url": "https://github.com/ultramodernjs/ultramodern.js/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/BleedingDev/ultramodern.js.git",
+    "url": "git+https://github.com/ultramodernjs/ultramodern.js.git",
     "directory": "packages/runtime/plugin-i18n"
   },
   "license": "MIT",
@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.0-ultramodern.9",
+  "version": "3.9.3-ultramodern.2",
   "engines": {
     "node": ">=20"
   },
@@ -55,6 +55,13 @@
       },
       "default": "./dist/esm/runtime/context.mjs"
     },
+    "./runtime/contexts": {
+      "types": "./dist/types/runtime/contexts.d.ts",
+      "node": {
+        "module": "./dist/esm/runtime/contexts.mjs"
+      },
+      "default": "./dist/esm/runtime/contexts.mjs"
+    },
     "./runtime/no-react-i18next": {
       "types": "./dist/types/runtime/no-react-i18next.d.ts",
       "node": {
@@ -104,6 +111,9 @@
       "runtime/consumer": [
         "./dist/types/runtime/context.d.ts"
       ],
+      "runtime/contexts": [
+        "./dist/types/runtime/contexts.d.ts"
+      ],
       "runtime/no-react-i18next": [
         "./dist/types/runtime/no-react-i18next.d.ts"
       ],
@@ -122,23 +132,23 @@
     }
   },
   "dependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.9",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.9",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.9",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.9",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.9.0-ultramodern.9",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.9",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.9",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.3-ultramodern.2",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.3-ultramodern.2",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.3-ultramodern.2",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.3-ultramodern.2",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.9.3-ultramodern.2",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.3-ultramodern.2",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.3-ultramodern.2",
     "@swc/helpers": "^0.5.23",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-chained-backend": "^5.0.6",
-    "i18next-fs-backend": "^2.6.7",
+    "i18next-fs-backend": "^2.6.8",
     "i18next-http-backend": "^4.0.2",
-    "i18next-http-middleware": "^3.9.8"
+    "i18next-http-middleware": "^3.9.9"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.9.0-ultramodern.9",
-    "i18next": ">=25.7.4",
+    "@modern-js/runtime": "3.9.3-ultramodern.2",
+    "i18next": ">=25.10.10",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
     "react-i18next": ">=15.7.4"
@@ -152,26 +162,34 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.9",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.9",
-    "@rslib/core": "1.0.0",
-    "@types/node": "^26.4.1",
-    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.3-ultramodern.2",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.3-ultramodern.2",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.3-ultramodern.2",
+    "@rslib/core": "1.0.3",
+    "@scripts/rstest-config": "2.66.0",
+    "@types/node": "^26.6.3",
     "esbuild": "^0.28.2",
     "i18next": "26.4.2",
-    "react": "^19.2.8",
-    "react-dom": "^19.2.8",
-    "react-i18next": "17.0.13",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
+    "react-i18next": "17.0.15",
     "ts-node": "^10.9.2",
-    "typescript": "^7.0.2"
+    "typescript": "7.0.2"
   },
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
   },
+  "files": [
+    "dist",
+    "src"
+  ],
   "scripts": {
     "dev": "rslib build --watch",
     "build": "rslib build",
-    "test": "rstest --passWithNoTests"
+    "test": "rstest"
+  },
+  "ultramodern": {
+    "sourceName": "@modern-js/plugin-i18n"
   }
 }

package/src/cli/index.ts

@@ -174,6 +174,7 @@ export const i18nPlugin = (
         localeDetection
           ? getLocaleDetectionOptions(entrypoint.entryName, localeDetection)
           : undefined,
+        entrypoint,
       ) as typeof routes,
     }));
 

package/src/cli/localisedRoutes.ts

@@ -2,7 +2,12 @@ import {
   applyLocalisedUrlsToRoutes,
   resolveLocalisedUrlsConfig,
 } from '@modern-js/i18n-runtime-extensions';
-import type { NestedRouteForCli, PageRoute } from '@modern-js/types';
+import { getEntrypointRoutesOwner } from '@modern-js/runtime/cli';
+import type {
+  Entrypoint,
+  NestedRouteForCli,
+  PageRoute,
+} from '@modern-js/types';
 import type { BaseLocaleDetectionOptions } from '../shared/type';
 
 type FileSystemRoutes = (NestedRouteForCli | PageRoute)[];
@@ -23,6 +28,7 @@ type FileSystemRoutes = (NestedRouteForCli | PageRoute)[];
 export const applyLocalisedRoutes = (
   routes: FileSystemRoutes,
   localeDetection: BaseLocaleDetectionOptions | undefined,
+  entrypoint?: Entrypoint & Parameters<typeof getEntrypointRoutesOwner>[0],
 ): FileSystemRoutes => {
   const {
     localePathRedirect,
@@ -39,5 +45,9 @@ export const applyLocalisedRoutes = (
     routes,
     languages,
     resolved.map,
+    entrypoint &&
+      getEntrypointRoutesOwner(entrypoint) === '@modern-js/plugin-tanstack'
+      ? 'canonical'
+      : 'physical',
   ) as FileSystemRoutes;
 };