@bleedingdev/modern-js-plugin-i18n 3.9.0-ultramodern.6 → 3.9.0-ultramodern.7

package/package.json

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

package/rstest.config.mts

@@ -29,7 +29,6 @@ export default {
       include: [
         'tests/i18nUtils.test.ts',
         'tests/localisedUrls.test.ts',
-        'tests/linkTypes.test.ts',
         'tests/backendDefaults.test.ts',
         'tests/redirectPolicy.test.ts',
         'tests/reactI18nextRuntimeBoundary.test.ts',

package/src/runtime/i18n/instance.ts

@@ -74,8 +74,7 @@ export type TranslateFn = (
 // declares a top-level `[key: string]: any` and overloaded call-signature
 // properties; both make i18next's `i18n` structurally unassignable to this
 // type, so the documented `i18nInstance: i18next` usage does not typecheck.
-// Do NOT restore upstream's shape when resolving a sync merge — the guard is
-// tests/type-fixture/i18nInstanceTypes.fixture.ts.
+// Do NOT restore upstream's shape when resolving a sync merge.
 export interface I18nInstance {
   language: string;
   isInitialized?: boolean;

package/tests/backendDefaults.test.ts

@@ -1,11 +1,8 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { afterEach, describe, expect, test } from '@rstest/core';
-import {
-  DEFAULT_I18NEXT_BACKEND_OPTIONS,
-  resolveDefaultLocalesDir,
-} from '../src/runtime/i18n/backend/defaults.node';
+import { describe, expect, test } from '@rstest/core';
+import { resolveDefaultLocalesDir } from '../src/runtime/i18n/backend/defaults.node';
 
 const makeTempDir = (...dirs: string[]): string => {
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'i18n-defaults-'));
@@ -16,12 +13,6 @@ const makeTempDir = (...dirs: string[]): string => {
 };
 
 describe('node backend default loadPath', () => {
-  const originalCwd = process.cwd();
-
-  afterEach(() => {
-    process.chdir(originalCwd);
-  });
-
   test('prefers the project-root ./locales convention (the detection root)', () => {
     const root = makeTempDir('locales', 'config/public/locales');
     expect(resolveDefaultLocalesDir(root)).toBe('./locales');
@@ -36,16 +27,4 @@ describe('node backend default loadPath', () => {
     const root = makeTempDir();
     expect(resolveDefaultLocalesDir(root)).toBe('./locales');
   });
-
-  test('DEFAULT_I18NEXT_BACKEND_OPTIONS resolves against the working directory', () => {
-    const root = makeTempDir('locales');
-    process.chdir(root);
-
-    expect(DEFAULT_I18NEXT_BACKEND_OPTIONS.loadPath).toBe(
-      './locales/{{lng}}/{{ns}}.json',
-    );
-    expect(DEFAULT_I18NEXT_BACKEND_OPTIONS.addPath).toBe(
-      './locales/{{lng}}/{{ns}}.json',
-    );
-  });
 });

package/tests/federatedI18nBoundaryResolver.test.tsx

@@ -14,12 +14,6 @@ const props: FederatedI18nBoundaryProps = {
 };
 
 describe('native federation resolver wrapper', () => {
-  test('reports missing integration when no resolver is installed', () => {
-    expect(() =>
-      renderToStaticMarkup(<FederatedI18nBoundary {...props} />),
-    ).toThrow(/requires the @modern-js\/i18n-integration runtime plugin/);
-  });
-
   test('retains the actionable fallback when a resolver does not handle i18n', () => {
     expect(() =>
       renderToStaticMarkup(

package/tests/routerAdapter.test.tsx

@@ -3,13 +3,11 @@ import {
   RuntimeContext,
 } from '@modern-js/runtime/context';
 import type React from 'react';
-import type { ComponentType, PropsWithChildren } from 'react';
-import { act, useEffect, useState } from 'react';
+import type { PropsWithChildren } from 'react';
+import { act, useEffect } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
-import { i18nPlugin } from '../src/runtime';
 import { ModernI18nProvider, useModernI18n } from '../src/runtime/context';
 import type { I18nInstance } from '../src/runtime/i18n';
-import { getReactI18nextIntegration } from '../src/runtime/i18n/react-i18next';
 import { Link } from '../src/runtime/Link';
 import {
   createI18nRootWrapper,
@@ -44,29 +42,6 @@ function createI18nInstance(language = 'en'): I18nInstance {
   };
 }
 
-function collectI18nWrapRoot() {
-  let wrapRoot: ((App: ComponentType<any>) => ComponentType<any>) | undefined;
-
-  i18nPlugin({
-    reactI18next: false,
-    localeDetection: {
-      fallbackLanguage: 'en',
-    },
-  }).setup?.({
-    getRuntimeConfig: () => ({}),
-    onBeforeRender: () => undefined,
-    wrapRoot: (callback: (App: ComponentType<any>) => ComponentType<any>) => {
-      wrapRoot = callback;
-    },
-  } as any);
-
-  if (!wrapRoot) {
-    throw new Error('Expected i18n runtime plugin to register wrapRoot');
-  }
-
-  return wrapRoot;
-}
-
 async function renderI18nRoot(node: React.ReactNode) {
   const container = document.createElement('div');
   document.body.appendChild(container);
@@ -113,38 +88,6 @@ describe('i18n runtime wrapRoot', () => {
     window.history.replaceState(null, '', '/');
   });
 
-  test('renders children when no root App exists yet', async () => {
-    const wrapRoot = collectI18nWrapRoot();
-    const I18nRoot = wrapRoot(undefined as unknown as ComponentType<any>);
-
-    rendered = await renderI18nRoot(
-      <I18nRoot>
-        <main>router content</main>
-      </I18nRoot>,
-    );
-
-    expect(rendered.container.textContent).toContain('router content');
-  });
-
-  test('preserves App props and children', async () => {
-    const wrapRoot = collectI18nWrapRoot();
-    const App = ({ children, label }: PropsWithChildren<{ label: string }>) => (
-      <main data-label={label}>{children}</main>
-    );
-    const I18nRoot = wrapRoot(App);
-
-    rendered = await renderI18nRoot(
-      <I18nRoot label="root">
-        <span>router content</span>
-      </I18nRoot>,
-    );
-
-    expect(
-      rendered.container.querySelector('main')?.getAttribute('data-label'),
-    ).toBe('root');
-    expect(rendered.container.textContent).toContain('router content');
-  });
-
   test('keeps the optional i18next provider inside Modern i18n context', async () => {
     const i18nInstance = createI18nInstance('cs');
     const observedLanguages: string[] = [];
@@ -172,62 +115,6 @@ describe('i18n runtime wrapRoot', () => {
     expect(observedLanguages).toEqual(['cs:cs']);
     expect(rendered.container.textContent).toContain('router content');
   });
-
-  test('keeps the i18next provider instance stable across unrelated parent renders', async () => {
-    const i18nInstance = createI18nInstance('cs');
-    const providerInstances: I18nInstance[] = [];
-    const I18nextProvider = ({
-      children,
-      i18n,
-    }: PropsWithChildren<{ i18n: I18nInstance }>) => {
-      providerInstances.push(i18n);
-      return <>{children}</>;
-    };
-    const App = () => <main>router content</main>;
-    const I18nRoot = createI18nRootWrapper({
-      htmlLangAttr: false,
-      localePathRedirect: false,
-      languages: ['en', 'cs'],
-      fallbackLanguage: 'en',
-      getLatestI18nInstance: () => i18nInstance,
-      getI18nextProvider: () => I18nextProvider,
-    })(App);
-    const Parent = () => {
-      const [renderVersion, setRenderVersion] = useState(0);
-      return (
-        <>
-          <button
-            type="button"
-            onClick={() => setRenderVersion(version => version + 1)}
-          >
-            Render {renderVersion}
-          </button>
-          <I18nRoot renderVersion={renderVersion} />
-        </>
-      );
-    };
-
-    rendered = await renderI18nRoot(<Parent />);
-    const initialProviderInstance = providerInstances.at(-1);
-
-    await act(async () => {
-      rendered?.container
-        .querySelector('button')
-        ?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
-    });
-
-    expect(providerInstances.length).toBeGreaterThan(1);
-    expect(providerInstances.at(-1)).toBe(initialProviderInstance);
-  });
-});
-
-describe('i18n react-i18next integration', () => {
-  test('loads the bundled react-i18next integration', async () => {
-    const integration = await getReactI18nextIntegration();
-
-    expect(integration.I18nextProvider).toEqual(expect.any(Function));
-    expect(integration.initReactI18next).toBeDefined();
-  });
 });
 
 describe('native navigation extension contract', () => {

package/tests/linkTypes.test.ts

@@ -1,68 +0,0 @@
-import { execFileSync } from 'node:child_process';
-import fs from 'node:fs';
-import path from 'node:path';
-
-const fixtureDir = path.resolve(__dirname, 'type-fixture');
-
-function resolveTsgoBin() {
-  const pkgPath = require.resolve('@typescript/native-preview/package.json');
-  const pkgDir = path.dirname(pkgPath);
-  const pkg = require(pkgPath) as {
-    bin?:
-      | string
-      | {
-          tsgo?: string;
-        };
-  };
-  const binEntry = typeof pkg.bin === 'string' ? pkg.bin : pkg.bin?.tsgo;
-  return path.resolve(pkgDir, binEntry ?? 'bin/tsgo.js');
-}
-
-const tsgoBin = resolveTsgoBin();
-for (const artifact of [
-  'dist/types/runtime/context.d.ts',
-  'dist/cjs/cli/index.js',
-  'dist/cjs/shared/utils.js',
-]) {
-  if (!fs.existsSync(path.resolve(__dirname, '..', artifact))) {
-    throw new Error(
-      `Missing plugin-i18n build artifact ${artifact}. Run pnpm build:required before unit tests.`,
-    );
-  }
-}
-
-describe('Link type-level tests', () => {
-  test('fixture type-checks correctly: valid uses compile, invalid uses are rejected', () => {
-    try {
-      execFileSync(
-        process.execPath,
-        [tsgoBin, '--noEmit', '-p', 'tsconfig.json'],
-        {
-          cwd: fixtureDir,
-          stdio: 'pipe',
-        },
-      );
-    } catch (e: any) {
-      const stdout = e?.stdout ? String(e.stdout) : '';
-      const stderr = e?.stderr ? String(e.stderr) : '';
-      throw new Error(`TypeScript type-check failed:\n${stdout}\n${stderr}`);
-    }
-  }, 60_000);
-
-  test('consumer declarations avoid toolchain internals', () => {
-    const output = execFileSync(process.execPath, [
-      tsgoBin,
-      '--ignoreConfig',
-      '--listFilesOnly',
-      '--module',
-      'preserve',
-      '--moduleResolution',
-      'bundler',
-      path.resolve(__dirname, '../dist/types/runtime/context.d.ts'),
-    ]);
-    const files = output.toString().replaceAll('\\', '/');
-    expect(files).not.toMatch(
-      /\/packages\/(cli|runtime\/plugin-runtime\/dist\/types|solutions\/app-tools|toolkit\/(types|utils))\//u,
-    );
-  }, 60_000);
-});

package/tests/localisedUrlRewriteMatrix.fork.test.ts

@@ -1,55 +0,0 @@
-import { describe, expect, test } from '@rstest/core';
-import {
-  interpolateRouteParams,
-  normalizeSearch,
-} from '../src/runtime/linkHelpers';
-
-describe('native link target normalization', () => {
-  test('splat params preserve separators and percent-encode each segment', () => {
-    expect(
-      interpolateRouteParams('/files/*', { '*': 'resume drafts/Q1 deck.pdf' }),
-    ).toBe('/files/resume%20drafts/Q1%20deck.pdf');
-  });
-  const searchScenarios: Array<{
-    name: string;
-    search: Parameters<typeof normalizeSearch>[0];
-    searchFromTo: string;
-    expected: ReturnType<typeof normalizeSearch>;
-  }> = [
-    {
-      name: 'object array values are preserved',
-      search: { tag: ['boots', 'sale'], page: 2 },
-      searchFromTo: '?ignored=1',
-      expected: {
-        searchString: '?tag=boots&tag=sale&page=2',
-        searchObject: { tag: ['boots', 'sale'], page: '2' },
-      },
-    },
-    {
-      name: 'target query arrays are preserved',
-      search: undefined,
-      searchFromTo: '?tag=boots&tag=sale&page=2',
-      expected: {
-        searchString: '?tag=boots&tag=sale&page=2',
-        searchObject: { tag: ['boots', 'sale'], page: '2' },
-      },
-    },
-    {
-      name: 'empty search clears the target query',
-      search: '',
-      searchFromTo: '?tag=boots&tag=sale',
-      expected: {
-        searchString: '',
-        searchObject: undefined,
-      },
-    },
-  ];
-
-  for (const scenario of searchScenarios) {
-    test(`normalizes search: ${scenario.name}`, () => {
-      expect(normalizeSearch(scenario.search, scenario.searchFromTo)).toEqual(
-        scenario.expected,
-      );
-    });
-  }
-});

package/tests/type-fixture/fixture-globals.d.ts

@@ -1,11 +0,0 @@
-// The Window._SSR_DATA augmentation lives in @modern-js/runtime's internal
-// core/types module, which this fixture's isolated program never pulls in.
-interface Window {
-  _SSR_DATA?: {
-    data?: {
-      i18nData?: {
-        lng?: string;
-      };
-    };
-  };
-}

package/tests/type-fixture/i18nInstanceTypes.fixture.ts

@@ -1,29 +0,0 @@
-import {
-  type I18nInstance,
-  useModernI18n,
-} from '@modern-js/plugin-i18n/runtime';
-import i18next, { type i18n } from 'i18next';
-
-// WRITE direction — this is what had zero coverage and was broken before the
-// top-level index signature was removed from `I18nInstance`. Eight integration
-// fixtures (tests/integration/i18n/*/src/modern.runtime.tsx) write exactly
-// this and none of them is ever typechecked; this file is the guard.
-export const w1: I18nInstance = i18next.createInstance();
-export const w2: I18nInstance = i18next;
-
-// READ direction.
-declare const inst: I18nInstance;
-export const s: string = inst.t('k');
-export const b: boolean = inst.exists!('k');
-export const langs: readonly string[] = inst.languages!;
-export const fixed: string = inst.getFixedT!('en')('k');
-
-// W2 generic, both with and without an explicit type argument.
-type StarlingLike = i18n & { setLang?: (l: string) => void | Promise<void> };
-export function useTyped() {
-  const r = useModernI18n<StarlingLike>();
-  return r.i18nInstance.t('k') satisfies string;
-}
-export function useDefault() {
-  return useModernI18n().i18nInstance.t('k') satisfies string;
-}

package/tests/type-fixture/linkTypes.fixture.tsx

@@ -1,51 +0,0 @@
-import { Link } from '@modern-js/plugin-i18n/runtime';
-
-declare module '@modern-js/plugin-i18n/runtime' {
-  interface UltramodernCanonicalRoutes {
-    '/': Record<string, never>;
-    '/talks': Record<string, never>;
-    '/talks/$slug': { slug: string };
-  }
-}
-
-// --- valid uses ---
-
-// Known route with required params: must compile.
-const _a = <Link to="/talks/$slug" params={{ slug: 'x' }} />;
-
-// Known route without params: must compile.
-const _b = <Link to="/talks" />;
-
-// Root route: must compile.
-const _c = <Link to="/" />;
-
-// Canonical path with hash suffix: must compile.
-const _d = <Link to="/#work-with-me" />;
-
-// Canonical path with query and hash: must compile.
-const _e = <Link to="/talks?tag=x#abstract" />;
-
-// Bare hash: must compile.
-const _f = <Link to="#hash" />;
-
-// External HTTPS URL: must compile.
-const _g = <Link to="https://example.com" />;
-
-// Dynamic (computed) value — escape hatch: must compile.
-declare function compute(): string;
-const dynamic: string = compute();
-const _h = <Link to={dynamic} />;
-
-// --- invalid uses (each preceded by @ts-expect-error) ---
-
-// Unknown route.
-// @ts-expect-error
-const _i = <Link to="/talkz" />;
-
-// Known param route but params prop is missing.
-// @ts-expect-error
-const _j = <Link to="/talks/$slug" />;
-
-// Known route without params but params are provided (forbidden).
-// @ts-expect-error
-const _k = <Link to="/talks" params={{ slug: 'x' }} />;

package/tests/type-fixture/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "strict": true,
-    "moduleResolution": "Bundler",
-    "module": "Preserve",
-    "noEmit": true,
-    "skipLibCheck": true,
-    "lib": ["ESNext", "DOM"],
-    "types": ["node"],
-    "paths": {
-      "@modern-js/plugin-i18n/runtime": ["../../src/runtime/index.tsx"]
-    }
-  },
-  "include": ["*.tsx", "*.ts"]
-}