@bleedingdev/modern-js-plugin-i18n 3.5.0-ultramodern.100 → 3.5.0-ultramodern.101

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0-ultramodern.100",
+  "version": "3.5.0-ultramodern.101",
   "engines": {
     "node": ">=20"
   },
@@ -91,12 +91,12 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.100",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.100",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.100",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.5.0-ultramodern.100",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.100",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.100",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.101",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.101",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.101",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.5.0-ultramodern.101",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.101",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.101",
     "@swc/helpers": "^0.5.23",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-chained-backend": "^5.0.5",
@@ -105,7 +105,7 @@
     "i18next-http-middleware": "^3.9.7"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.5.0-ultramodern.100",
+    "@modern-js/runtime": "3.5.0-ultramodern.101",
     "i18next": ">=26.3.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
@@ -120,11 +120,12 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.100",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.100",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.101",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.101",
     "@rslib/core": "0.23.2",
     "@types/node": "^26.1.1",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "esbuild": "^0.28.1",
     "i18next": "26.3.6",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",

package/tests/localisedUrls.test.ts

@@ -1,5 +1,3 @@
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
-import path from 'node:path';
 import type { NestedRouteForCli } from '@modern-js/types';
 import { describe, expect, test } from '@rstest/core';
 import { i18nPlugin as i18nCliPlugin } from '../src/cli';
@@ -19,12 +17,6 @@ import {
   validateLocalisedUrls,
 } from '../src/shared/localisedUrls';
 
-const localisedRoutesGoldenPath = path.join(
-  __dirname,
-  'fixtures',
-  'localised-routes.golden.json',
-);
-
 const createRoute = (
   path: string,
   children?: NestedRouteForCli[],
@@ -45,9 +37,6 @@ const createRequestContext = (pathname: string) =>
     },
   }) as any;
 
-const serializeRoutesForGolden = (routes: unknown): string =>
-  `${JSON.stringify(routes, null, 2)}\n`;
-
 describe('resolveLocalisedUrlsConfig', () => {
   test('is opt-in: only a non-empty map enables the feature', () => {
     const map = { '/about': { en: '/about', cs: '/o-nas' } };
@@ -119,7 +108,7 @@ describe('cli modifyFileSystemRoutes', () => {
     return modifyRoutes!;
   };
 
-  const generateLocalisedRoutesGolden = (): string => {
+  const generateLocalisedRoutes = () => {
     const modifyRoutes = setupModifyRoutes({
       localePathRedirect: true,
       languages: ['en', 'cs', 'de'],
@@ -164,23 +153,53 @@ describe('cli modifyFileSystemRoutes', () => {
       routes,
     });
 
-    return serializeRoutesForGolden(result.routes);
+    return result.routes;
   };
 
-  test('matches checked-in localised routes golden output', async () => {
-    const localisedRoutes = generateLocalisedRoutesGolden();
-    const repeatedLocalisedRoutes = generateLocalisedRoutesGolden();
+  test('creates deterministic localized aliases with canonical route identity', () => {
+    const localisedRoutes = generateLocalisedRoutes();
+    expect(generateLocalisedRoutes()).toEqual(localisedRoutes);
 
-    expect(repeatedLocalisedRoutes).toBe(localisedRoutes);
-
-    if (process.env.UPDATE_I18N_LOCALISED_ROUTES_GOLDEN === '1') {
-      await mkdir(path.dirname(localisedRoutesGoldenPath), { recursive: true });
-      await writeFile(localisedRoutesGoldenPath, localisedRoutes);
+    const [localeLayout] = localisedRoutes;
+    expect(localeLayout.children?.map(route => route.path)).toEqual([
+      'about',
+      'o-nas',
+      'ueber-uns',
+      'products',
+      'produkty',
+      'produkte',
+      'docs',
+      'dokumenty',
+      'dokumente',
+    ]);
+    expect(localeLayout.children?.slice(0, 3)).toMatchObject([
+      {
+        _component: 'about.tsx',
+        modernCanonicalPath: '/about',
+        path: 'about',
+      },
+      {
+        _component: 'about.tsx',
+        modernCanonicalPath: '/about',
+        path: 'o-nas',
+      },
+      {
+        _component: 'about.tsx',
+        modernCanonicalPath: '/about',
+        path: 'ueber-uns',
+      },
+    ]);
+    for (const productRoute of localeLayout.children?.slice(3, 6) ?? []) {
+      expect(productRoute).toMatchObject({
+        _component: 'products.tsx',
+        modernCanonicalPath: '/products',
+      });
+      expect(productRoute.children?.[0]).toMatchObject({
+        _component: ':slug.tsx',
+        modernCanonicalPath: '/products/:slug',
+        path: ':slug',
+      });
     }
-
-    await expect(readFile(localisedRoutesGoldenPath, 'utf8')).resolves.toBe(
-      localisedRoutes,
-    );
   });
 
   test('upstream-style configs without a map keep routes untouched', () => {

package/tests/reactI18nextRuntimeBoundary.test.ts

@@ -1,48 +1,170 @@
-import { readFileSync } from 'node:fs';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { basename, resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
 import { describe, expect, test } from '@rstest/core';
+import { build } from 'esbuild';
+import i18next from 'i18next';
+import { createElement } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { i18nPlugin as noReactI18nextPlugin } from '../src/runtime/no-react-i18next';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
 const runtimeRoot = resolve(__dirname, '../src/runtime');
 
-const readRuntimeSource = (file: string) =>
-  readFileSync(resolve(runtimeRoot, file), 'utf8').replace(/\r\n/gu, '\n');
-
 describe('react-i18next runtime boundary', () => {
-  test('keeps the disabled runtime entry free of the optional adapter edge', () => {
-    const noReactEntry = readRuntimeSource('no-react-i18next.tsx');
-    const core = readRuntimeSource('core.tsx');
-
-    expect(noReactEntry).not.toContain('./i18n/react-i18next');
-    expect(core).not.toContain('./i18n/react-i18next');
-    expect(core).not.toContain("import('react-i18next')");
+  test('bundles the disabled runtime entry when react-i18next is unavailable', async () => {
+    await expect(
+      build({
+        bundle: true,
+        entryPoints: [resolve(runtimeRoot, 'no-react-i18next.tsx')],
+        format: 'esm',
+        packages: 'external',
+        platform: 'node',
+        plugins: [
+          {
+            name: 'reject-react-i18next',
+            setup(buildApi) {
+              buildApi.onResolve({ filter: /^react-i18next$/ }, () => {
+                throw new Error(
+                  'disabled runtime entry reached optional react-i18next',
+                );
+              });
+            },
+          },
+        ],
+        write: false,
+      }),
+    ).resolves.toBeDefined();
   });
 
-  test('keeps the runtime plugin factory entry synchronous for federation', () => {
-    const core = readRuntimeSource('core.tsx');
-    const pluginSetup = readRuntimeSource('pluginSetup.ts');
+  test('bundles the default runtime entry with the react-i18next adapter', async () => {
+    let adapterResolutions = 0;
+    await build({
+      bundle: true,
+      entryPoints: [resolve(runtimeRoot, 'index.tsx')],
+      format: 'esm',
+      packages: 'external',
+      platform: 'node',
+      plugins: [
+        {
+          name: 'observe-react-i18next',
+          setup(buildApi) {
+            buildApi.onResolve({ filter: /^react-i18next$/ }, args => {
+              adapterResolutions += 1;
+              return { external: true, path: args.path };
+            });
+          },
+        },
+      ],
+      write: false,
+    });
 
-    expect(core).not.toContain("from './i18n/backend/middleware'");
-    expect(core).not.toContain("from './i18n/utils'");
-    expect(pluginSetup).not.toContain("from './i18n/backend/middleware'");
-    expect(pluginSetup).not.toContain("from './i18n/utils'");
-    expect(pluginSetup).toContain("import('./i18n/backend/middleware')");
-    expect(pluginSetup).toContain("import('./i18n/utils')");
+    expect(adapterResolutions).toBeGreaterThan(0);
   });
 
-  test('keeps the Modern i18n context stable across federated runtime copies', () => {
-    const context = readRuntimeSource('context.tsx');
+  test('keeps expensive lifecycle helpers behind asynchronous bundle edges', async () => {
+    const result = await build({
+      bundle: true,
+      entryPoints: [resolve(runtimeRoot, 'pluginSetup.ts')],
+      format: 'esm',
+      metafile: true,
+      outdir: 'out',
+      packages: 'external',
+      platform: 'node',
+      splitting: true,
+      write: false,
+    });
+
+    const entryOutput = Object.values(result.metafile.outputs).find(output =>
+      output.entryPoint?.endsWith('/pluginSetup.ts'),
+    );
+    if (!entryOutput) {
+      throw new Error('pluginSetup entry output was not generated');
+    }
+    const dynamicOutputNames = entryOutput.imports
+      .filter(moduleImport => moduleImport.kind === 'dynamic-import')
+      .map(moduleImport => basename(moduleImport.path));
+    const dynamicOutputs = Object.entries(result.metafile.outputs)
+      .filter(([outputPath]) =>
+        dynamicOutputNames.includes(basename(outputPath)),
+      )
+      .map(([, output]) => output);
+    const dynamicEntries = dynamicOutputs.map(output =>
+      basename(output.entryPoint ?? ''),
+    );
 
-    expect(context).toContain(
-      "Symbol.for(\n  '@modern-js/plugin-i18n/runtime/ModernI18nContext'",
+    expect(dynamicEntries).toEqual(
+      expect.arrayContaining(['middleware.ts', 'utils.ts']),
     );
-    expect(context).toContain('globalStore[modernI18nContextKey] ??=');
   });
 
-  test('keeps the default runtime entry wired to react-i18next integration', () => {
-    const defaultEntry = readRuntimeSource('index.tsx');
+  test('registers plugin lifecycle hooks synchronously', () => {
+    let beforeRender: unknown;
+    let rootWrapper: unknown;
+    const plugin = noReactI18nextPlugin({ reactI18next: false });
+    const setupResult = plugin.setup?.({
+      getRuntimeConfig: () => ({}),
+      onBeforeRender: hook => {
+        beforeRender = hook;
+      },
+      wrapRoot: wrapper => {
+        rootWrapper = wrapper;
+      },
+    } as any);
+
+    expect(setupResult).toBeUndefined();
+    expect(typeof beforeRender).toBe('function');
+    expect(typeof rootWrapper).toBe('function');
+  });
+
+  test('shares Modern i18n context across independently bundled runtime copies', async () => {
+    const tempDir = await mkdtemp(
+      resolve(__dirname, '.modern-i18n-runtime-boundary-'),
+    );
+    try {
+      const contextEntry = resolve(runtimeRoot, 'context.tsx');
+      const copies = await Promise.all(
+        ['copy-a.mjs', 'copy-b.mjs'].map(async filename => {
+          const outfile = resolve(tempDir, filename);
+          await build({
+            bundle: true,
+            entryPoints: [contextEntry],
+            format: 'esm',
+            jsx: 'automatic',
+            outfile,
+            packages: 'external',
+            platform: 'node',
+          });
+          return import(pathToFileURL(outfile).href);
+        }),
+      );
+      const [copyA, copyB] = copies;
+      const instance = i18next.createInstance();
+      await instance.init({
+        initImmediate: false,
+        lng: 'cs',
+        resources: { cs: { translation: { language: 'Jazyk' } } },
+      });
+      const Consumer = () =>
+        createElement('span', null, copyB.useModernI18n().language);
+
+      const html = renderToStaticMarkup(
+        createElement(
+          copyA.ModernI18nProvider,
+          {
+            value: {
+              i18nInstance: instance,
+              language: 'cs',
+              languages: ['en', 'cs'],
+            },
+          },
+          createElement(Consumer),
+        ),
+      );
 
-    expect(defaultEntry).toContain('./i18n/react-i18next');
+      expect(html).toBe('<span>cs</span>');
+    } finally {
+      await rm(tempDir, { force: true, recursive: true });
+    }
   });
 });

package/tests/fixtures/localised-routes.golden.json

@@ -1,156 +0,0 @@
-[
-  {
-    "id": ":lang",
-    "path": ":lang",
-    "type": "nested",
-    "origin": "file-system",
-    "routeType": "layout",
-    "_component": ":lang.tsx",
-    "children": [
-      {
-        "id": "about",
-        "path": "about",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "page",
-        "_component": "about.tsx",
-        "modernCanonicalPath": "/about"
-      },
-      {
-        "id": "about__localised_o-nas",
-        "path": "o-nas",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "page",
-        "_component": "about.tsx",
-        "modernCanonicalPath": "/about"
-      },
-      {
-        "id": "about__localised_ueber-uns",
-        "path": "ueber-uns",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "page",
-        "_component": "about.tsx",
-        "modernCanonicalPath": "/about"
-      },
-      {
-        "id": "products",
-        "path": "products",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "layout",
-        "_component": "products.tsx",
-        "children": [
-          {
-            "id": ":slug",
-            "path": ":slug",
-            "type": "nested",
-            "origin": "file-system",
-            "routeType": "page",
-            "_component": ":slug.tsx",
-            "modernCanonicalPath": "/products/:slug"
-          }
-        ],
-        "modernCanonicalPath": "/products"
-      },
-      {
-        "id": "products__localised_produkty",
-        "path": "produkty",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "layout",
-        "_component": "products.tsx",
-        "children": [
-          {
-            "id": ":slug__localised_produkty",
-            "path": ":slug",
-            "type": "nested",
-            "origin": "file-system",
-            "routeType": "page",
-            "_component": ":slug.tsx",
-            "modernCanonicalPath": "/products/:slug"
-          }
-        ],
-        "modernCanonicalPath": "/products"
-      },
-      {
-        "id": "products__localised_produkte",
-        "path": "produkte",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "layout",
-        "_component": "products.tsx",
-        "children": [
-          {
-            "id": ":slug__localised_produkte",
-            "path": ":slug",
-            "type": "nested",
-            "origin": "file-system",
-            "routeType": "page",
-            "_component": ":slug.tsx",
-            "modernCanonicalPath": "/products/:slug"
-          }
-        ],
-        "modernCanonicalPath": "/products"
-      },
-      {
-        "id": "docs",
-        "path": "docs",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "layout",
-        "_component": "docs.tsx",
-        "children": [
-          {
-            "id": "*",
-            "path": "*",
-            "type": "nested",
-            "origin": "file-system",
-            "routeType": "page",
-            "_component": "*.tsx"
-          }
-        ],
-        "modernCanonicalPath": "/docs"
-      },
-      {
-        "id": "docs__localised_dokumenty",
-        "path": "dokumenty",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "layout",
-        "_component": "docs.tsx",
-        "children": [
-          {
-            "id": "*__localised_dokumenty",
-            "path": "*",
-            "type": "nested",
-            "origin": "file-system",
-            "routeType": "page",
-            "_component": "*.tsx"
-          }
-        ],
-        "modernCanonicalPath": "/docs"
-      },
-      {
-        "id": "docs__localised_dokumente",
-        "path": "dokumente",
-        "type": "nested",
-        "origin": "file-system",
-        "routeType": "layout",
-        "_component": "docs.tsx",
-        "children": [
-          {
-            "id": "*__localised_dokumente",
-            "path": "*",
-            "type": "nested",
-            "origin": "file-system",
-            "routeType": "page",
-            "_component": "*.tsx"
-          }
-        ],
-        "modernCanonicalPath": "/docs"
-      }
-    ]
-  }
-]