@bleedingdev/modern-js-plugin-i18n 3.8.2-ultramodern.9 → 3.8.3-ultramodern.2

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.8.2-ultramodern.9",
+  "version": "3.8.3-ultramodern.2",
   "engines": {
     "node": ">=20"
   },
@@ -48,6 +48,13 @@
       },
       "default": "./dist/esm/runtime/index.mjs"
     },
+    "./runtime/consumer": {
+      "types": "./dist/types/runtime/context.d.ts",
+      "node": {
+        "module": "./dist/esm/runtime/context.mjs"
+      },
+      "default": "./dist/esm/runtime/context.mjs"
+    },
     "./runtime/no-react-i18next": {
       "types": "./dist/types/runtime/no-react-i18next.d.ts",
       "node": {
@@ -55,6 +62,13 @@
       },
       "default": "./dist/esm/runtime/no-react-i18next.mjs"
     },
+    "./runtime/no-react-i18next/consumer": {
+      "types": "./dist/types/runtime/context.d.ts",
+      "node": {
+        "module": "./dist/esm/runtime/context.mjs"
+      },
+      "default": "./dist/esm/runtime/context.mjs"
+    },
     "./server": {
       "types": "./dist/types/server/index.d.ts",
       "node": {
@@ -79,9 +93,15 @@
       "runtime": [
         "./dist/types/runtime/index.d.ts"
       ],
+      "runtime/consumer": [
+        "./dist/types/runtime/context.d.ts"
+      ],
       "runtime/no-react-i18next": [
         "./dist/types/runtime/no-react-i18next.d.ts"
       ],
+      "runtime/no-react-i18next/consumer": [
+        "./dist/types/runtime/context.d.ts"
+      ],
       "server": [
         "./dist/types/server/index.d.ts"
       ],
@@ -91,12 +111,13 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.2-ultramodern.9",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.2-ultramodern.9",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.8.2-ultramodern.9",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.8.2-ultramodern.9",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.2-ultramodern.9",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.2-ultramodern.9",
+    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.8.3-ultramodern.2",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.8.3-ultramodern.2",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.8.3-ultramodern.2",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.8.3-ultramodern.2",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.8.3-ultramodern.2",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.8.3-ultramodern.2",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.8.3-ultramodern.2",
     "@swc/helpers": "^0.5.23",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-chained-backend": "^5.0.5",
@@ -105,7 +126,7 @@
     "i18next-http-middleware": "^3.9.8"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.8.2-ultramodern.9",
+    "@modern-js/runtime": "3.8.3-ultramodern.2",
     "i18next": ">=25.7.4",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
@@ -120,8 +141,8 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.2-ultramodern.9",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.2-ultramodern.9",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.8.3-ultramodern.2",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.8.3-ultramodern.2",
     "@rslib/core": "0.23.2",
     "@types/node": "^26.2.0",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
@@ -139,7 +160,7 @@
   },
   "scripts": {
     "dev": "rslib build --watch",
-    "build": "rslib build && pnpm -w tsgo:dts \"$PWD\"",
+    "build": "rslib build",
     "test": "rstest --passWithNoTests"
   }
 }

package/src/cli/index.ts

@@ -1,16 +1,16 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
+import {
+  applyLocalisedUrlsToRoutes,
+  resolveLocalisedUrlsConfig,
+} from '@modern-js/i18n-runtime-extensions';
 import { getPublicDirRoutePrefixes } from '@modern-js/server-core';
 import type {
   Entrypoint,
   NestedRouteForCli,
   PageRoute,
 } from '@modern-js/types';
-import {
-  applyLocalisedUrlsToRoutes,
-  resolveLocalisedUrlsConfig,
-} from '../shared/localisedUrls';
 import type { BackendOptions, LocaleDetectionOptions } from '../shared/type';
 import { getBackendOptions, getLocaleDetectionOptions } from '../shared/utils';
 import { applyDetectedBackendPaths, detectLocalesDirectory } from './locales';

package/src/runtime/context.tsx

@@ -1,4 +1,5 @@
-import type { FC, ReactNode } from 'react';
+import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
+import type { ComponentType, FC, ReactNode } from 'react';
 import {
   createContext,
   useCallback,
@@ -6,7 +7,6 @@ import {
   useEffect,
   useMemo,
 } from 'react';
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
 import {
   changeModernI18nLanguage,
   getPathLanguage,
@@ -36,36 +36,52 @@ interface ModernI18nContextValue {
 const modernI18nContextKey = Symbol.for(
   '@modern-js/plugin-i18n/runtime/ModernI18nContext',
 );
+const reactI18nextProviderContextKey = Symbol.for(
+  '@modern-js/plugin-i18n/runtime/ReactI18nextProviderContext',
+);
 
-type ModernI18nGlobal = typeof globalThis & {
-  [key: symbol]:
-    | ReturnType<typeof createContext<ModernI18nContextValue | null>>
-    | undefined;
+type GlobalContextStore<T> = typeof globalThis & {
+  [key: symbol]: ReturnType<typeof createContext<T>> | undefined;
 };
 
-const getModernI18nContext = () => {
-  const globalStore = globalThis as ModernI18nGlobal;
-  globalStore[modernI18nContextKey] ??=
-    createContext<ModernI18nContextValue | null>(null);
-  return globalStore[modernI18nContextKey];
+const getGlobalContext = <T,>(key: symbol, defaultValue: T) => {
+  const globalStore = globalThis as GlobalContextStore<T>;
+  globalStore[key] ??= createContext<T>(defaultValue);
+  return globalStore[key];
 };
 
-const ModernI18nContext = getModernI18nContext();
+const ModernI18nContext = getGlobalContext<ModernI18nContextValue | null>(
+  modernI18nContextKey,
+  null,
+);
+const ReactI18nextProviderContext = getGlobalContext<ComponentType<any> | null>(
+  reactI18nextProviderContextKey,
+  null,
+);
 
 interface ModernI18nProviderProps {
   children: ReactNode;
+  i18nextProvider?: ComponentType<any> | null;
   value: ModernI18nContextValue;
 }
 
 export const ModernI18nProvider: FC<ModernI18nProviderProps> = ({
   children,
+  i18nextProvider,
   value,
 }) => {
-  return (
+  const content = (
     <ModernI18nContext.Provider value={value}>
       {children}
     </ModernI18nContext.Provider>
   );
+  return i18nextProvider === undefined ? (
+    content
+  ) : (
+    <ReactI18nextProviderContext.Provider value={i18nextProvider}>
+      {content}
+    </ReactI18nextProviderContext.Provider>
+  );
 };
 
 export interface FederatedI18nBoundaryProps {
@@ -89,6 +105,7 @@ export const FederatedI18nBoundary: FC<FederatedI18nBoundaryProps> = ({
   supportedLanguages,
 }) => {
   const parent = useContext(ModernI18nContext);
+  const I18nextProvider = useContext(ReactI18nextProviderContext);
   if (!parent) {
     throw new Error(
       'FederatedI18nBoundary must be used within ModernI18nProvider',
@@ -184,7 +201,14 @@ export const FederatedI18nBoundary: FC<FederatedI18nBoundaryProps> = ({
     [languages, parent, scopedInstance],
   );
 
-  return <ModernI18nProvider value={value}>{children}</ModernI18nProvider>;
+  const scopedContent = (
+    <ModernI18nProvider value={value}>{children}</ModernI18nProvider>
+  );
+  return I18nextProvider ? (
+    <I18nextProvider i18n={scopedInstance}>{scopedContent}</I18nextProvider>
+  ) : (
+    scopedContent
+  );
 };
 
 export interface UseModernI18nReturn<

package/src/runtime/contextHelpers.ts

@@ -1,5 +1,5 @@
+import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 import { isBrowser } from '@modern-js/runtime';
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
 import type { I18nInstance } from './i18n';
 import type { SdkBackend } from './i18n/backend/sdk-backend';
 import { cacheUserLanguage } from './i18n/detection';

package/src/runtime/hooks.ts

@@ -1,7 +1,7 @@
+import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 import { isBrowser } from '@modern-js/runtime';
 import type React from 'react';
 import { useCallback, useEffect, useRef } from 'react';
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
 import {
   cacheI18nLanguage,
   changeI18nInstanceLanguage,
@@ -181,7 +181,7 @@ export function useClientSideRedirect(
   ignoreRedirectRoutes?: string[] | ((pathname: string) => boolean),
   localisedUrls?: LocalisedUrlsOption,
 ) {
-  const hasRedirectedRef = useRef(false);
+  const urlRef = useRef('');
   const { navigate, location, hasRouter } = useI18nRouterAdapter();
 
   useEffect(() => {
@@ -201,7 +201,7 @@ export function useClientSideRedirect(
       // Ignore errors when checking SSR data
     }
 
-    if (hasRedirectedRef.current) {
+    if (urlRef.current === (location?.pathname || window.location.pathname)) {
       return;
     }
 
@@ -230,12 +230,12 @@ export function useClientSideRedirect(
       localePathRedirect,
     );
 
-    if (pathDetection.detected) {
-      return;
-    }
-
     const targetLanguage =
-      i18nInstance.language || fallbackLanguage || languages[0] || 'en';
+      pathDetection.language ||
+      i18nInstance.language ||
+      fallbackLanguage ||
+      languages[0] ||
+      'en';
 
     const newPath = buildLocalizedUrl(
       relativePath,
@@ -245,9 +245,8 @@ export function useClientSideRedirect(
     );
     const newUrl = entryPath + newPath + currentSearch + currentHash;
 
+    urlRef.current = currentPathname;
     if (newUrl !== currentPathname + currentSearch + currentHash) {
-      hasRedirectedRef.current = true;
-
       // Use navigate if router is available (similar to changeLanguage implementation)
       if (hasRouter && navigate && location) {
         navigate(newUrl, { replace: true });

package/src/runtime/localizedPaths.ts

@@ -1,6 +1,8 @@
+import {
+  canonicalTargetPathname,
+  type LocalisedUrlsOption,
+} from '@modern-js/i18n-runtime-extensions';
 import { useMemo } from 'react';
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
-import { canonicalTargetPathname } from '../shared/localisedUrls';
 import { useModernI18n } from './context';
 import { useI18nRouterAdapter } from './routerAdapter';
 import { buildLocalizedUrl, splitUrlTarget } from './utils';

package/src/runtime/providerComposition.tsx

@@ -1,3 +1,4 @@
+import { useLanguageSync } from '@modern-js/i18n-runtime-extensions';
 import { RuntimeContext } from '@modern-js/runtime';
 import { Helmet } from '@modern-js/runtime/head';
 import type React from 'react';
@@ -7,7 +8,6 @@ import { ModernI18nProvider } from './context';
 import {
   createContextValue,
   useClientSideRedirect,
-  useLanguageSync,
   useSdkResourcesLoader,
 } from './hooks';
 import type { I18nInstance } from './i18n';
@@ -140,7 +140,10 @@ export const createI18nRootWrapper =
       return (
         <>
           {Boolean(htmlLangAttr) && <Helmet htmlAttributes={{ lang }} />}
-          <ModernI18nProvider value={contextValue}>
+          <ModernI18nProvider
+            i18nextProvider={I18nextProvider}
+            value={contextValue}
+          >
             {appContent}
           </ModernI18nProvider>
         </>

package/src/runtime/utils.ts

@@ -1,10 +1,10 @@
-import { isBrowser } from '@modern-js/runtime';
-import { getGlobalBasename } from '@modern-js/runtime/context';
-import type { LocalisedUrlsOption } from '../shared/localisedUrls';
 import {
+  type LocalisedUrlsOption,
   localiseTargetPathname,
   shouldSkipLocaleRedirect,
-} from '../shared/localisedUrls';
+} from '@modern-js/i18n-runtime-extensions';
+import { isBrowser } from '@modern-js/runtime';
+import { getGlobalBasename } from '@modern-js/runtime/context';
 
 // Structural parameter: hooks.ts passes a public-TRuntimeContext-based
 // context while core.tsx passes the internal one; both carry the request

package/src/server/index.ts

@@ -1,9 +1,9 @@
+import { resolveLocalisedUrlsConfig } from '@modern-js/i18n-runtime-extensions';
 import * as honoPkg from '@modern-js/server-core/hono';
 
 const { languageDetector } = honoPkg;
 
 import type { Context, Next, ServerPlugin } from '@modern-js/server-runtime';
-import { resolveLocalisedUrlsConfig } from '../shared/localisedUrls.js';
 import type { LocaleDetectionOptions } from '../shared/type';
 import { getLocaleDetectionOptions } from '../shared/utils.js';
 import { collectApiPrefixes, matchesApiPrefix } from './apiPrefix.js';

package/src/server/redirectPolicy.ts

@@ -4,7 +4,7 @@ import {
   matchesPathPrefix,
   shouldSkipLocaleRedirect,
   stripLanguagePrefix,
-} from '../shared/localisedUrls.js';
+} from '@modern-js/i18n-runtime-extensions';
 import type { LocaleDetectionOptions } from '../shared/type';
 
 interface LocaleRedirectRequest {

package/src/shared/type.ts

@@ -1,8 +1,8 @@
+import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 import type {
   LanguageDetectorOptions,
   Resources,
 } from '../runtime/i18n/instance';
-import type { LocalisedUrlsOption } from './localisedUrls';
 
 export interface BaseLocaleDetectionOptions {
   localePathRedirect?: boolean;

package/tests/federatedI18nBoundary.client.test.tsx

@@ -3,6 +3,7 @@ import i18next, { type i18n } from 'i18next';
 import { act, useState } from 'react';
 import { hydrateRoot } from 'react-dom/client';
 import { renderToString } from 'react-dom/server';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 import { ModernI18nProvider } from '../src/runtime/context';
 import { FederatedI18nBoundary, useModernI18n } from '../src/runtime/core';
 
@@ -21,9 +22,19 @@ const remoteResources = {
 };
 
 function InventoryCopy() {
-  const { t } = useModernI18n();
+  const modernI18n = useModernI18n<i18n>();
+  const reactI18n = useTranslation('inventory');
+  const reactI18nInstance = reactI18n.i18n as i18n & { __original?: i18n };
+  const sharesScopedInstance =
+    reactI18nInstance === modernI18n.i18nInstance ||
+    reactI18nInstance.__original === modernI18n.i18nInstance;
 
-  return <p data-testid="inventory-copy">{t('inventory.widgetBody')}</p>;
+  return (
+    <p data-testid="inventory-copy">
+      {modernI18n.t('inventory.widgetBody')}|
+      {reactI18n.t('inventory.widgetBody')}|{String(sharesScopedInstance)}
+    </p>
+  );
 }
 
 function Host({ hostI18n }: { hostI18n: i18n }) {
@@ -31,6 +42,7 @@ function Host({ hostI18n }: { hostI18n: i18n }) {
 
   return (
     <ModernI18nProvider
+      i18nextProvider={I18nextProvider}
       value={{
         i18nInstance: hostI18n,
         language,
@@ -97,14 +109,19 @@ test('hydrates remote-owned copy and follows the host language', async () => {
   await act(async () => undefined);
   expect(
     container.querySelector('[data-testid="inventory-copy"]')?.textContent,
-  ).toBe('C1 inventory surface owned by the MicroVertical.');
+  ).toBe(
+    'C1 inventory surface owned by the MicroVertical.|C1 inventory surface owned by the MicroVertical.|true',
+  );
 
   await act(async () => {
     (container.querySelector('button') as HTMLButtonElement).click();
   });
   expect(
     container.querySelector('[data-testid="inventory-copy"]')?.textContent,
-  ).toBe('C1 skladová plocha vlastněná MicroVerticalem.');
+  ).toBe(
+    'C1 skladová plocha vlastněná MicroVerticalem.|C1 skladová plocha vlastněná MicroVerticalem.|true',
+  );
+  expect(clientI18n.t('inventory.widgetBody')).toBe('stale host Czech copy');
   expect(hydrationErrors).toEqual([]);
 
   await act(async () => root.unmount());

package/tests/federatedI18nBoundary.test.tsx

@@ -1,6 +1,7 @@
 import { describe, expect, test } from '@rstest/core';
-import i18next from 'i18next';
+import i18next, { type i18n } from 'i18next';
 import { renderToStaticMarkup } from 'react-dom/server';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 import { ModernI18nProvider } from '../src/runtime/context';
 import { FederatedI18nBoundary, useModernI18n } from '../src/runtime/core';
 
@@ -11,11 +12,19 @@ const HOST_ONLY_INVENTORY_COPY = 'inventory copy owned only by the shell';
 const HOST_ONLY_SHELL_COPY = 'private shell copy';
 
 function InventoryCopy() {
-  const { t } = useModernI18n();
+  const modernI18n = useModernI18n<i18n>();
+  const reactI18n = useTranslation('inventory');
+  const reactI18nInstance = reactI18n.i18n as i18n & { __original?: i18n };
+  const sharesScopedInstance =
+    reactI18nInstance === modernI18n.i18nInstance ||
+    reactI18nInstance.__original === modernI18n.i18nInstance;
 
   return (
     <p>
-      {t('inventory.widgetBody')}|{t('inventory.hostOnly')}|{t('shell:private')}
+      {modernI18n.t('inventory.widgetBody')}|
+      {reactI18n.t('inventory.widgetBody')}|{String(sharesScopedInstance)}|
+      {modernI18n.t('inventory.hostOnly')}|{modernI18n.t('shell:private')}|
+      {reactI18n.t('inventory.hostOnly')}|{reactI18n.t('shell:private')}
     </p>
   );
 }
@@ -45,6 +54,7 @@ describe('FederatedI18nBoundary', () => {
 
     const html = renderToStaticMarkup(
       <ModernI18nProvider
+        i18nextProvider={I18nextProvider}
         value={{
           i18nInstance: hostI18n,
           language: 'en',
@@ -68,6 +78,7 @@ describe('FederatedI18nBoundary', () => {
 
     expect(html).toContain(C1_COPY);
     expect(html).not.toContain(C0_COPY);
+    expect(html).toContain(`${C1_COPY}|${C1_COPY}|true`);
     expect(html).not.toContain(HOST_ONLY_INVENTORY_COPY);
     expect(html).not.toContain(HOST_ONLY_SHELL_COPY);
     expect(hostI18n.t('inventory.widgetBody')).toBe(C0_COPY);
@@ -94,6 +105,7 @@ describe('FederatedI18nBoundary', () => {
     expect(() =>
       renderToStaticMarkup(
         <ModernI18nProvider
+          i18nextProvider={I18nextProvider}
           value={{
             i18nInstance: hostI18n,
             language: 'en',

package/tests/linkTypes.test.ts

@@ -18,6 +18,9 @@ function resolveTsgoBin() {
 }
 
 const tsgoBin = resolveTsgoBin();
+const useShell = process.platform === 'win32';
+const execOptions = { cwd: path.dirname(__dirname), shell: useShell };
+execFileSync('pnpm', ['build'], execOptions);
 
 describe('Link type-level tests', () => {
   test('fixture type-checks correctly: valid uses compile, invalid uses are rejected', () => {
@@ -36,4 +39,21 @@ describe('Link type-level tests', () => {
       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,3 +1,4 @@
+import type { LocalisedUrlsMap } from '@modern-js/i18n-runtime-extensions';
 import { describe, expect, test } from '@rstest/core';
 import {
   interpolateRouteParams,
@@ -5,7 +6,6 @@ import {
 } from '../src/runtime/linkHelpers';
 import { canonicalPath, localizePath } from '../src/runtime/localizedPaths';
 import { buildLocalizedUrl } from '../src/runtime/utils';
-import type { LocalisedUrlsMap } from '../src/shared/localisedUrls';
 
 const languages = ['en', 'cs'];