@bleedingdev/modern-js-plugin-i18n 3.9.0-ultramodern.11 → 3.9.0-ultramodern.12

package/dist/cjs/cli/index.js

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

package/dist/cjs/cli/localisedRoutes.js

@@ -31,11 +31,12 @@ __webpack_require__.d(__webpack_exports__, {
     applyLocalisedRoutes: ()=>applyLocalisedRoutes
 });
 const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
-const applyLocalisedRoutes = (routes, localeDetection)=>{
+const cli_namespaceObject = require("@modern-js/runtime/cli");
+const applyLocalisedRoutes = (routes, localeDetection, entrypoint)=>{
     const { localePathRedirect, languages = [], localisedUrls } = localeDetection ?? {};
     const resolved = (0, i18n_runtime_extensions_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
     if (!localePathRedirect || !languages.length || !resolved.enabled) return routes;
-    return (0, i18n_runtime_extensions_namespaceObject.applyLocalisedUrlsToRoutes)(routes, languages, resolved.map);
+    return (0, i18n_runtime_extensions_namespaceObject.applyLocalisedUrlsToRoutes)(routes, languages, resolved.map, entrypoint && '@modern-js/plugin-tanstack' === (0, cli_namespaceObject.getEntrypointRoutesOwner)(entrypoint) ? 'canonical' : 'physical');
 };
 exports.applyLocalisedRoutes = __webpack_exports__.applyLocalisedRoutes;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/esm/cli/index.mjs

@@ -51,7 +51,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/cli/localisedRoutes.mjs

@@ -1,8 +1,9 @@
 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/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/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/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.0-ultramodern.11",
+  "version": "3.9.0-ultramodern.12",
   "engines": {
     "node": ">=20"
   },
@@ -122,13 +122,13 @@
     }
   },
   "dependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.11",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.11",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.11",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.11",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.9.0-ultramodern.11",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.11",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.11",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.12",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.12",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.12",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.12",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.9.0-ultramodern.12",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.12",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.12",
     "@swc/helpers": "^0.5.23",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-chained-backend": "^5.0.6",
@@ -137,7 +137,7 @@
     "i18next-http-middleware": "^3.9.8"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.9.0-ultramodern.11",
+    "@modern-js/runtime": "3.9.0-ultramodern.12",
     "i18next": ">=25.7.4",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
@@ -152,9 +152,9 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.11",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.11",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.11",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.12",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.12",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.12",
     "@rslib/core": "1.0.0",
     "@types/node": "^26.4.1",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",

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;
 };

package/tests/localisedRouteGeneration.test.ts

@@ -100,6 +100,47 @@ describe('native localised route generation', () => {
     expect(paths).toContain('produkty/:slug');
   });
 
+  test('keeps one source identity for TanStack entries while validating locale mappings', async () => {
+    const modifyRoutes = await createNativeOnlyHarness({
+      localeDetection: {
+        localePathRedirect: true,
+        languages: ['en', 'cs'],
+        localisedUrls,
+      },
+    });
+    const result = await modifyRoutes({
+      entrypoint: {
+        ...entrypoint,
+        __modernRoutesOwner: '@modern-js/plugin-tanstack',
+      },
+      routes: [
+        createRoute(':lang', [
+          createRoute('about'),
+          createRoute('products/:slug'),
+        ]),
+      ],
+    });
+    expect(result.routes[0].children).toMatchObject([
+      {
+        id: 'about',
+        path: 'about',
+        modernLocalisedRoute: {
+          canonicalPath: '/about',
+          paths: localisedUrls['/about'],
+        },
+      },
+      {
+        id: 'products/:slug',
+        path: 'products/:slug',
+        modernLocalisedRoute: {
+          canonicalPath: '/products/:slug',
+          paths: localisedUrls['/products/:slug'],
+        },
+      },
+    ]);
+    expect(result.routes[0].children).toHaveLength(2);
+  });
+
   test('leaves routes untouched when no map is declared', async () => {
     const modifyRoutes = await createNativeOnlyHarness({
       localeDetection: {

package/tests/navigation.test.tsx

@@ -42,27 +42,30 @@ function createI18nInstance(language = 'en'): I18nInstance {
   };
 }
 
-/** A TanStack-shaped router whose location store can be republished. */
+/** A provider capability whose location can be republished. */
 function createMutableTanstackRouter(pathname: string) {
-  let location = { pathname, searchStr: '', hash: '' };
-  let matches = [{ params: { lang: pathname.split('/')[1] ?? '' } }];
+  let snapshot = {
+    location: { pathname, search: '', hash: '' },
+    params: { lang: pathname.split('/')[1] ?? '' },
+  };
   const listeners = new Set<() => void>();
 
   return {
     navigate: rstest.fn(async () => undefined),
-    stores: {
-      location: {
-        get: () => location,
-        subscribe: (listener: () => void) => {
-          listeners.add(listener);
-          return () => listeners.delete(listener);
-        },
+    navigation: {
+      getSnapshot: () => snapshot,
+      Link: TanstackLink,
+      navigate: rstest.fn(async () => undefined),
+      subscribe: (listener: () => void) => {
+        listeners.add(listener);
+        return () => listeners.delete(listener);
       },
-      matches: { get: () => matches },
     },
     publishPathname(nextPathname: string) {
-      location = { pathname: nextPathname, searchStr: '', hash: '' };
-      matches = [{ params: { lang: nextPathname.split('/')[1] ?? '' } }];
+      snapshot = {
+        location: { pathname: nextPathname, search: '', hash: '' },
+        params: { lang: nextPathname.split('/')[1] ?? '' },
+      };
       for (const listener of listeners) {
         listener();
       }
@@ -129,6 +132,7 @@ function createTanstackRuntimeContext(
   applyRouterRuntimeState(runtimeContext, {
     framework: 'tanstack',
     instance: router,
+    navigation: router.navigation,
   } as any);
   return runtimeContext;
 }
@@ -270,7 +274,8 @@ describe('bare plugin-i18n navigation adapter', () => {
     await act(async () => {
       applyRouterRuntimeState(runtimeContext, {
         framework: 'tanstack',
-        instance: createMutableTanstackRouter('/en/terms-of-service'),
+        navigation: createMutableTanstackRouter('/en/terms-of-service')
+          .navigation,
       } as any);
     });
 
@@ -329,13 +334,46 @@ describe('bare plugin-i18n navigation adapter', () => {
     await act(async () => {
       applyRouterRuntimeState(runtimeContext, {
         framework: 'tanstack',
-        instance: createMutableTanstackRouter('/cs/obchodni-podminky'),
+        navigation: createMutableTanstackRouter('/cs/obchodni-podminky')
+          .navigation,
       } as any);
     });
 
     expect(anchor()?.getAttribute('data-router-link')).toBe('tanstack');
   });
 
+  test('replaces providers and stops observing the previous router', async () => {
+    const first = createMutableTanstackRouter('/en/products/shoe');
+    const second = createMutableTanstackRouter('/cs/produkty/bota');
+    const runtimeContext = createTanstackRuntimeContext(first);
+    const App = () => {
+      const adapter = useIntegratedRouterAdapter();
+      return <span data-testid="path">{adapter.location?.pathname}</span>;
+    };
+    rendered = await renderBareRuntime(
+      App,
+      runtimeContext,
+      createI18nInstance('en'),
+    );
+    await act(async () => {
+      applyRouterRuntimeState(runtimeContext, {
+        framework: 'custom-provider',
+        navigation: second.navigation,
+      });
+    });
+    expect(
+      rendered.container.querySelector('[data-testid="path"]')?.textContent,
+    ).toBe('/cs/produkty/bota');
+    await act(async () => first.publishPathname('/en/stale'));
+    expect(
+      rendered.container.querySelector('[data-testid="path"]')?.textContent,
+    ).toBe('/cs/produkty/bota');
+    await act(async () => second.publishPathname('/en/current'));
+    expect(
+      rendered.container.querySelector('[data-testid="path"]')?.textContent,
+    ).toBe('/en/current');
+  });
+
   test('follows the router location so the language tracks a client navigation', async () => {
     const router = createMutableTanstackRouter('/en/products/shoe');
     const App = () => {