@bleedingdev/modern-js-plugin-i18n 3.5.0-ultramodern.4 → 3.5.0-ultramodern.41

package/tests/redirectPolicy.test.ts

@@ -0,0 +1,43 @@
+import { describe, expect, test } from '@rstest/core';
+import { shouldIgnoreRedirect as shouldIgnoreRuntimeRedirect } from '../src/runtime/utils';
+import {
+  isStaticResourceRequest,
+  shouldIgnoreRedirect as shouldIgnoreServerRedirect,
+} from '../src/server/redirectPolicy';
+
+const languages = ['en', 'cs'];
+
+const defaultSkippedPaths = [
+  '/mf-manifest.json',
+  '/mf-stats.json',
+  '/remoteEntry.js',
+  '/static/app.js',
+  '/upload/avatar.png',
+];
+
+describe('locale redirect default skip policy', () => {
+  test('skips ADR-0002 Module Federation and static endpoints on the server', () => {
+    for (const pathname of defaultSkippedPaths) {
+      expect(isStaticResourceRequest(pathname, [], languages)).toBe(true);
+      expect(shouldIgnoreServerRedirect(pathname, '/', undefined)).toBe(true);
+    }
+  });
+
+  test('skips language-prefixed static and upload endpoints', () => {
+    expect(isStaticResourceRequest('/cs/static/app.js', [], languages)).toBe(
+      true,
+    );
+    expect(
+      isStaticResourceRequest('/en/upload/avatar.png', [], languages),
+    ).toBe(true);
+  });
+
+  test('uses the same default skip policy in runtime redirects', () => {
+    for (const pathname of defaultSkippedPaths) {
+      expect(shouldIgnoreRuntimeRedirect(pathname, languages)).toBe(true);
+      expect(shouldIgnoreRuntimeRedirect(`/cs${pathname}`, languages)).toBe(
+        true,
+      );
+    }
+  });
+});

package/tests/routerAdapter.test.tsx

@@ -12,6 +12,7 @@ import { ModernI18nProvider, useModernI18n } from '../src/runtime/context';
 import { I18nLink } from '../src/runtime/I18nLink';
 import type { I18nInstance } from '../src/runtime/i18n';
 import { getReactI18nextIntegration } from '../src/runtime/i18n/react-i18next';
+import { createI18nRootWrapper } from '../src/runtime/providerComposition';
 
 (
   globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
@@ -228,6 +229,34 @@ describe('i18n runtime wrapRoot', () => {
     ).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[] = [];
+    const I18nextProvider = ({
+      children,
+      i18n,
+    }: PropsWithChildren<{ i18n: I18nInstance }>) => {
+      const { language } = useModernI18n();
+      observedLanguages.push(`${language}:${i18n.language}`);
+
+      return <section data-testid="i18next-provider">{children}</section>;
+    };
+    const App = () => <main>router content</main>;
+    const I18nRoot = createI18nRootWrapper({
+      htmlLangAttr: false,
+      localePathRedirect: false,
+      languages: ['en', 'cs'],
+      fallbackLanguage: 'en',
+      getLatestI18nInstance: () => i18nInstance,
+      getI18nextProvider: () => I18nextProvider,
+    })(App);
+
+    rendered = await renderI18nRoot(<I18nRoot />);
+
+    expect(observedLanguages).toEqual(['cs:cs']);
+    expect(rendered.container.textContent).toContain('router content');
+  });
 });
 
 describe('i18n react-i18next integration', () => {
@@ -399,6 +428,62 @@ describe('i18n router adapter', () => {
     });
   });
 
+  test('updates provider language when target locale is already in URL', async () => {
+    window.history.replaceState(null, '', '/cs/podminky-pouzivani');
+
+    const router = createTanstackRouter('/cs/podminky-pouzivani', 'cs');
+    const i18nInstance = createI18nInstance('en');
+    const updateLanguage = rstest.fn();
+    let changeLanguagePromise: Promise<void> | undefined;
+
+    const Harness = () => {
+      const { changeLanguage } = useModernI18n();
+      return (
+        <button
+          type="button"
+          onClick={() => {
+            changeLanguagePromise = changeLanguage('cs');
+          }}
+        >
+          Change language
+        </button>
+      );
+    };
+
+    rendered = await renderWithRuntime(
+      <ModernI18nProvider
+        value={{
+          language: 'en',
+          i18nInstance,
+          languages: ['en', 'cs'],
+          localePathRedirect: true,
+          localisedUrls,
+          updateLanguage,
+        }}
+      >
+        <Harness />
+      </ModernI18nProvider>,
+      createTanstackRuntimeContext(router),
+    );
+
+    const button = rendered.container.querySelector('button');
+    updateLanguage.mockClear();
+
+    await act(async () => {
+      button?.dispatchEvent(
+        new MouseEvent('click', {
+          bubbles: true,
+          cancelable: true,
+          button: 0,
+        }),
+      );
+      await changeLanguagePromise;
+    });
+
+    expect(updateLanguage).toHaveBeenCalledWith('cs');
+    expect(router.navigate).not.toHaveBeenCalled();
+  });
+
   test('keeps React Router positional replacement when changeLanguage updates the URL', async () => {
     window.history.replaceState(null, '', '/en/terms-of-service');
 

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

@@ -0,0 +1,11 @@
+// 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/tsconfig.json

@@ -7,6 +7,7 @@
     "noEmit": true,
     "skipLibCheck": true,
     "lib": ["ESNext", "DOM"],
+    "types": ["node"],
     "paths": {
       "@modern-js/plugin-i18n/runtime": ["../../src/runtime/index.tsx"]
     }