fix: i18n test case (#7778)

caohuilin · web-flow · commit cbce7df10864 · 2025-10-22T14:02:33.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ node_modules/
 .eslintcache
 
 dist/
+dist-ssg/
 doc_build/
 !**/compiled/**/dist
 coverage/
diff --git a/tests/integration/i18n/app-csr/tests/index.test.ts b/tests/integration/i18n/app-csr/tests/index.test.ts
@@ -39,7 +39,7 @@ describe('app-csr-i18n', () => {
     const targetText = await page.evaluate(el => el?.textContent, root);
     expect(targetText?.trim()).toEqual('Hello World');
     await page.click('#zh-button');
-    await new Promise(resolve => setTimeout(resolve, 3000));
+    await new Promise(resolve => setTimeout(resolve, 5000));
     const targetTextZh = await page.evaluate(el => el?.textContent, root);
     expect(targetTextZh?.trim()).toEqual('你好，世界');
   });
@@ -54,7 +54,7 @@ describe('app-csr-i18n', () => {
     );
     expect(targetTextAbout?.trim()).toEqual('About');
     await page.click('#zh-button');
-    await new Promise(resolve => setTimeout(resolve, 3000));
+    await new Promise(resolve => setTimeout(resolve, 5000));
     const targetTextAboutZh = await page.evaluate(
       el => el?.textContent,
       rootAbout,
diff --git a/tests/integration/i18n/app-ssr/modern.ssg.config.ts b/tests/integration/i18n/app-ssr/modern.ssg.config.ts
@@ -7,6 +7,9 @@ export default defineConfig({
     ssr: process.env.NODE_ENV === 'development',
   },
   output: {
+    distPath: {
+      root: 'dist-ssg',
+    },
     ssg: {
       routes: ['/zh', '/en'],
     },
diff --git a/tests/integration/i18n/app-ssr/tests/index.test.ts b/tests/integration/i18n/app-ssr/tests/index.test.ts
@@ -50,11 +50,17 @@ describe('app-ssr-i18n', () => {
     const text = await page.$('#key');
     const targetText = await page.evaluate(el => el?.textContent, text);
     expect(targetText?.trim()).toEqual('你好，世界');
-    page.click('#en-button');
-    await new Promise(resolve => setTimeout(resolve, 3000));
-    const textEn = await page.$('#key');
-    const targetTextEn = await page.evaluate(el => el?.textContent, textEn);
-    expect(targetTextEn?.trim()).toEqual('Hello World');
+    await page.click('#en-button');
+    await new Promise(resolve => setTimeout(resolve, 5000));
+    await page.waitForFunction(
+      () => {
+        const el = document.querySelector('#key');
+        return (
+          el && el.textContent !== null && el.textContent === 'Hello World'
+        );
+      },
+      { timeout: 10000 },
+    );
   });
   test('page-en', async () => {
     const response = await page.goto(`http://localhost:${appPort}/en`, {
@@ -65,10 +71,14 @@ describe('app-ssr-i18n', () => {
     const text = await page.$('#key');
     const targetText = await page.evaluate(el => el?.textContent, text);
     expect(targetText?.trim()).toEqual('Hello World');
-    page.click('#zh-button');
-    await new Promise(resolve => setTimeout(resolve, 3000));
-    const textZh = await page.$('#key');
-    const targetTextZh = await page.evaluate(el => el?.textContent, textZh);
-    expect(targetTextZh?.trim()).toEqual('你好，世界');
+    await page.click('#zh-button');
+    await new Promise(resolve => setTimeout(resolve, 5000));
+    await page.waitForFunction(
+      () => {
+        const el = document.querySelector('#key');
+        return el && el.textContent !== null && el.textContent === '你好，世界';
+      },
+      { timeout: 10000 },
+    );
   });
 });
diff --git a/tests/integration/i18n/app-ssr/tests/ssg.test.ts b/tests/integration/i18n/app-ssr/tests/ssg.test.ts
@@ -11,8 +11,8 @@ describe('ssg', () => {
     const appDir = projectDir;
     await modernBuild(appDir, ['--config', 'modern.ssg.config.ts']);
 
-    const zhHtmlPath = path.join(appDir, './dist/html/main/zh/index.html');
-    const enHtmlPath = path.join(appDir, './dist/html/main/en/index.html');
+    const zhHtmlPath = path.join(appDir, './dist-ssg/html/main/zh/index.html');
+    const enHtmlPath = path.join(appDir, './dist-ssg/html/main/en/index.html');
     const zhContent = fs.readFileSync(zhHtmlPath, 'utf-8');
     const enContent = fs.readFileSync(enHtmlPath, 'utf-8');
     expect(zhContent).toMatch('你好，世界');
diff --git a/tests/integration/i18n/routes-csr/test/index.test.ts b/tests/integration/i18n/routes-csr/test/index.test.ts
@@ -72,8 +72,8 @@ describe('router-csr-i18n', () => {
     const text = await page.$('#about');
     const targetText = await page.evaluate(el => el?.textContent, text);
     expect(targetText?.trim()).toEqual('关于');
-    page.click('#en-button');
-    await new Promise(resolve => setTimeout(resolve, 3000));
+    await page.click('#en-button');
+    await new Promise(resolve => setTimeout(resolve, 5000));
     const textEn = await page.$('#about');
     const targetTextEn = await page.evaluate(el => el?.textContent, textEn);
     expect(targetTextEn?.trim()).toEqual('About');
@@ -85,8 +85,8 @@ describe('router-csr-i18n', () => {
     const text = await page.$('#about');
     const targetText = await page.evaluate(el => el?.textContent, text);
     expect(targetText?.trim()).toEqual('About');
-    page.click('#zh-button');
-    await new Promise(resolve => setTimeout(resolve, 3000));
+    await page.click('#zh-button');
+    await new Promise(resolve => setTimeout(resolve, 5000));
     const textZh = await page.$('#about');
     const targetTextZh = await page.evaluate(el => el?.textContent, textZh);
     expect(targetTextZh?.trim()).toEqual('关于');
diff --git a/tests/integration/i18n/routes-ssr/modern.ssg.config.ts b/tests/integration/i18n/routes-ssr/modern.ssg.config.ts
@@ -7,6 +7,9 @@ export default defineConfig({
     ssr: process.env.NODE_ENV === 'development',
   },
   output: {
+    distPath: {
+      root: 'dist-ssg',
+    },
     ssg: {
       routes: ['/zh/about', '/en/about', '/en', '/zh'],
     },
diff --git a/tests/integration/i18n/routes-ssr/src/i18n.ts b/tests/integration/i18n/routes-ssr/src/i18n.ts
@@ -2,4 +2,23 @@ import originalI18next from 'i18next';
 
 const i18next = originalI18next.createInstance();
 
-export { i18next };
+i18next.init({
+  lng: 'en',
+  fallbackLng: 'en',
+  resources: {
+    en: {
+      translation: {
+        key: 'Hello World',
+        about: 'About',
+      },
+    },
+    zh: {
+      translation: {
+        key: '你好，世界',
+        about: '关于',
+      },
+    },
+  },
+});
+
+export default i18next;
diff --git a/tests/integration/i18n/routes-ssr/src/modern.runtime.tsx b/tests/integration/i18n/routes-ssr/src/modern.runtime.tsx
@@ -1,24 +1,8 @@
 import { defineRuntimeConfig } from '@modern-js/runtime';
-import { i18next } from './i18n';
+import i18next from './i18n';
 
 export default defineRuntimeConfig({
   i18n: {
     i18nInstance: i18next,
-    initOptions: {
-      resources: {
-        en: {
-          translation: {
-            key: 'Hello World',
-            about: 'About',
-          },
-        },
-        zh: {
-          translation: {
-            key: '你好，世界',
-            about: '关于',
-          },
-        },
-      },
-    },
   },
 });
diff --git a/tests/integration/i18n/routes-ssr/src/routes/[lang]/page.data.ts b/tests/integration/i18n/routes-ssr/src/routes/[lang]/page.data.ts
@@ -1,4 +1,4 @@
-import { i18next } from '../../i18n';
+import i18next from '../../i18n';
 export interface ProfileData {
   /*  some types */
   data: string;
diff --git a/tests/integration/i18n/routes-ssr/src/routes/[lang]/page.tsx b/tests/integration/i18n/routes-ssr/src/routes/[lang]/page.tsx
@@ -3,9 +3,9 @@ import type { ProfileData } from './page.data';
 
 export default () => {
   const profileData = useLoaderData() as ProfileData;
-  return (
-    <>
-      <div id="key">{profileData.data}</div>
-    </>
-  );
+  const data = profileData.data;
+  if (typeof data !== 'string') {
+    return <div>Loading...</div>;
+  }
+  return <div id="key">{data}</div>;
 };
diff --git a/tests/integration/i18n/routes-ssr/test/index.test.ts b/tests/integration/i18n/routes-ssr/test/index.test.ts
@@ -9,7 +9,7 @@ import {
 
 const projectDir = path.resolve(__dirname, '..');
 
-describe('router-csr-i18n', () => {
+describe('router-ssr-i18n', () => {
   let app: unknown;
   let page: Page;
   let browser: Browser;
@@ -78,11 +78,15 @@ describe('router-csr-i18n', () => {
     const text = await page.$('#about');
     const targetText = await page.evaluate(el => el?.textContent, text);
     expect(targetText?.trim()).toEqual('关于');
-    page.click('#en-button');
-    await new Promise(resolve => setTimeout(resolve, 3000));
-    const textEn = await page.$('#about');
-    const targetTextEn = await page.evaluate(el => el?.textContent, textEn);
-    expect(targetTextEn?.trim()).toEqual('About');
+    await page.click('#en-button');
+    await new Promise(resolve => setTimeout(resolve, 5000));
+    await page.waitForFunction(
+      () => {
+        const el = document.querySelector('#about');
+        return el && el.textContent !== null && el.textContent === 'About';
+      },
+      { timeout: 10000 },
+    );
   });
   test('page-en-about', async () => {
     const response = await page.goto(`http://localhost:${appPort}/en/about`, {
@@ -93,10 +97,14 @@ describe('router-csr-i18n', () => {
     const text = await page.$('#about');
     const targetText = await page.evaluate(el => el?.textContent, text);
     expect(targetText?.trim()).toEqual('About');
-    page.click('#zh-button');
-    await new Promise(resolve => setTimeout(resolve, 3000));
-    const textZh = await page.$('#about');
-    const targetTextZh = await page.evaluate(el => el?.textContent, textZh);
-    expect(targetTextZh?.trim()).toEqual('关于');
+    await page.click('#zh-button');
+    await new Promise(resolve => setTimeout(resolve, 5000));
+    await page.waitForFunction(
+      () => {
+        const el = document.querySelector('#about');
+        return el && el.textContent !== null && el.textContent === '关于';
+      },
+      { timeout: 10000 },
+    );
   });
 });
diff --git a/tests/integration/i18n/routes-ssr/test/ssg.test.ts b/tests/integration/i18n/routes-ssr/test/ssg.test.ts
@@ -13,11 +13,11 @@ describe('ssg', () => {
 
     const zhAboutHtmlPath = path.join(
       appDir,
-      './dist/html/main/zh/about/index.html',
+      './dist-ssg/html/main/zh/about/index.html',
     );
     const enAboutHtmlPath = path.join(
       appDir,
-      './dist/html/main/en/about/index.html',
+      './dist-ssg/html/main/en/about/index.html',
     );
     const zhAboutContent = fs.readFileSync(zhAboutHtmlPath, 'utf-8');
     const enAboutContent = fs.readFileSync(enAboutHtmlPath, 'utf-8');

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { i18next } from '../../i18n';`
	`1`	`+import i18next from '../../i18n';`
`2`	`2`	`export interface ProfileData {`
`3`	`3`	`/* some types */`
`4`	`4`	`data: string;`