clear

Author: fi3ework

e2e/watch/index.test.ts

@@ -28,7 +28,7 @@ describe('watch', () => {
     await cli.waitForStdout('Duration');
     expect(cli.stdout).toMatch('Tests 1 passed');
     expect(cli.stdout).not.toMatch('Test files to re-run:');
-    expect(cli.stdout).toMatch('Fully run test files.');
+    expect(cli.stdout).toMatch('Fully run test files for first run.');
 
     // create
     cli.resetStd();
@@ -61,7 +61,7 @@ describe('watch', () => {
     cli.resetStd();
     fs.delete('./fixtures-test-0/bar.test.ts');
     await cli.waitForStdout('Duration');
-    expect(cli.stdout).toMatch('Fully run test files.');
+    expect(cli.stdout).toMatch('No test files are re-run.');
     expect(cli.stdout).toMatch('Test Files 1 passed');
 
     cli.exec.kill();

e2e/watch/shortcuts.test.ts

@@ -37,7 +37,7 @@ describe('CLI shortcuts', () => {
     await cli.waitForStdout('Duration');
     expect(cli.stdout).toMatch('Tests 1 failed | 1 passed');
     await cli.waitForStdout('press h to show help');
-    expect(cli.stdout).toMatch('Fully run test files.');
+    expect(cli.stdout).toMatch('Fully run test files for first run.');
 
     cli.exec.process!.stdin!.write('h');
 
@@ -51,7 +51,7 @@ describe('CLI shortcuts', () => {
     cli.exec.process!.stdin!.write('a');
     await cli.waitForStdout('Duration');
     expect(cli.stdout).toMatch('Tests 1 failed | 1 passed');
-    expect(cli.stdout).toMatch('Fully run test files.');
+    expect(cli.stdout).toMatch('Run all tests.');
 
     cli.exec.kill();
   });
@@ -82,13 +82,14 @@ describe('CLI shortcuts', () => {
     await cli.waitForStdout('Duration');
     expect(cli.stdout).toMatch('Tests 1 failed | 1 passed');
     await cli.waitForStdout('press h to show help');
-    expect(cli.stdout).toMatch('Fully run test files.');
+    expect(cli.stdout).toMatch('Fully run test files for first run.');
     cli.resetStd();
 
     // rerun failed tests
     cli.exec.process!.stdin!.write('f');
     await cli.waitForStdout('Duration');
     expect(cli.stdout).toMatch('Tests 1 failed');
+    expect(cli.stdout).toMatch('Run all tests.');
 
     cli.exec.kill();
   });

packages/core/src/core/rsbuild.ts

@@ -20,7 +20,8 @@ import { pluginCacheControl } from './plugins/moduleCacheControl';
 
 type EntryToChunkHashes = {
   name: string;
-  chunks: Record<string, string>; // key is chunk name, value is chunk hash
+  /** key is chunk name, value is chunk hash */
+  chunks: Record<string, string>;
 }[];
 
 function parseInlineSourceMap(code: string) {
@@ -123,13 +124,14 @@ export const calcEntriesToRerun = (
   chunks: Rspack.StatsChunk[] | undefined,
   buildData: { entryToChunkHashes?: EntryToChunkHashes },
 ): {
-  affectedEntries: EntryInfo[] | undefined;
-  deletedEntries: string[] | undefined;
+  affectedEntries: EntryInfo[];
+  deletedEntries: string[];
 } => {
   const entryToChunkHashes: EntryToChunkHashes = [];
 
   for (const entry of entries || []) {
     for (const chunkName of entry.chunks || []) {
+      // Treat runtime chunk as invariant, sometimes it will change but we don't care.
       if (chunkName === 'runtime') {
         continue;
       }
@@ -155,14 +157,15 @@ export const calcEntriesToRerun = (
     }
   }
 
-  let affectedEntries: EntryInfo[] | undefined;
-  let deletedEntries: string[] | undefined;
+  let affectedEntries: EntryInfo[] = [];
+  let deletedEntries: string[] = [];
   if (buildData.entryToChunkHashes) {
     const prev = buildData.entryToChunkHashes;
     const deleted = prev?.filter(
       (p) => !entryToChunkHashes.find((e) => e.name === p.name),
     );
 
+    // deleted
     if (deleted.length) {
       deletedEntries = deleted.map((entry) => entry.name);
     }
@@ -197,7 +200,7 @@ export const calcEntriesToRerun = (
   }
 
   buildData.entryToChunkHashes = entryToChunkHashes;
-  let dedupeAffectedEntries: EntryInfo[] | undefined;
+  let dedupeAffectedEntries: EntryInfo[] = [];
 
   if (affectedEntries) {
     dedupeAffectedEntries = [];
@@ -233,8 +236,9 @@ export const createRsbuildServer = async ({
     assetFiles: Record<string, string>;
     sourceMaps: Record<string, SourceMapInput>;
     getSourcemap: (sourcePath: string) => SourceMapInput | null;
-    affectedEntries?: EntryInfo[]; // undefined means use full entries
-    deletedEntries?: string[]; // undefined means use full entries
+    isFirstRun: boolean;
+    affectedEntries: EntryInfo[];
+    deletedEntries: string[];
   }>;
   closeServer: () => Promise<void>;
 }> => {
@@ -282,11 +286,13 @@ export const createRsbuildServer = async ({
     );
   }
 
+  let runCount = 0;
   const buildData: { entryToChunkHashes?: EntryToChunkHashes } = {};
 
   const getRsbuildStats = async ({
     fileFilters,
   }: { fileFilters?: string[] } | undefined = {}) => {
+    runCount++;
     const stats = await devServer.environments[name]!.getStats();
 
     const manifest = devServer.environments[name]!.context
@@ -412,6 +418,7 @@ export const createRsbuildServer = async ({
     return {
       affectedEntries,
       deletedEntries,
+      isFirstRun: runCount === 1,
       hash,
       entries,
       setupEntries,

packages/core/src/core/runTests.ts

@@ -106,13 +106,13 @@ export async function runTests(context: Rstest): Promise<void> {
 
   let buildHash: string | undefined;
 
-  type RunMode = 'all-failed' | 'all' | 'on-demand';
+  type Mode = 'all' | 'on-demand';
   const run = async ({
     fileFilters,
-    mode: runMode = 'all',
+    mode = 'all',
   }: {
     fileFilters?: string[];
-    mode?: RunMode;
+    mode?: Mode;
   } = {}) => {
     const {
       entries,
@@ -122,25 +122,30 @@ export async function runTests(context: Rstest): Promise<void> {
       getSourcemap,
       buildTime,
       hash,
+      isFirstRun,
       affectedEntries,
       deletedEntries,
     } = await getRsbuildStats({ fileFilters });
     const testStart = Date.now();
 
     let finalEntries: EntryInfo[] = entries;
-    if (runMode === 'on-demand') {
-      if (affectedEntries?.length) {
-        logger.debug(
-          color.yellow('Test files to re-run:\n') +
-            affectedEntries.map((e) => e.testPath).join('\n') +
-            '\n',
-        );
-      } else if (affectedEntries?.length === 0) {
-        logger.debug(color.yellow('No test files are re-run.'));
+    if (mode === 'on-demand') {
+      if (isFirstRun) {
+        logger.debug(color.yellow('Fully run test files for first run.\n'));
       } else {
-        logger.debug(color.yellow('Fully run test files.\n'));
+        if (affectedEntries.length === 0) {
+          logger.debug(color.yellow('No test files are re-run.'));
+        } else {
+          logger.debug(
+            color.yellow('Test files to re-run:\n') +
+              affectedEntries.map((e) => e.testPath).join('\n') +
+              '\n',
+          );
+        }
+        finalEntries = affectedEntries;
       }
-      finalEntries = affectedEntries ?? entries;
+    } else {
+      logger.debug(color.yellow('Run all tests.\n'));
     }
 
     const { results, testResults } = await pool.runTests({
@@ -295,7 +300,7 @@ export async function runTests(context: Rstest): Promise<void> {
 
             snapshotManager.clear();
 
-            await run({ fileFilters: failedTests, mode: 'all-failed' });
+            await run({ fileFilters: failedTests, mode: 'all' });
             afterTestsWatchRun();
           },
           updateSnapshot: async () => {