fix: should run watch cases test in build assets (#7897)

packages/rspack-test-tools/etc/api.md

@@ -1496,8 +1496,12 @@ export class WatchProcessor<T extends ECompilerType> extends MultiTaskProcessor<
     // (undocumented)
     compiler(context: ITestContext): Promise<void>;
     // (undocumented)
+    config(context: ITestContext): Promise<void>;
+    // (undocumented)
     protected currentTriggerFilename: string | null;
     // (undocumented)
+    static findBundle<T extends ECompilerType>(index: number, context: ITestContext, options: TCompilerOptions<T>): string | string[];
+    // (undocumented)
     protected lastHash: string | null;
     // (undocumented)
     static overrideOptions<T extends ECompilerType>({ tempDir, name, experiments, optimization }: IWatchProcessorOptions<T>): (index: number, context: ITestContext, options: TCompilerOptions<ECompilerType>) => void;

packages/rspack-test-tools/src/processor/watch.ts

@@ -1,15 +1,16 @@
 import fs from "node:fs";
 import path from "node:path";
+import { merge } from "webpack-merge";
 
 import { ECompilerEvent } from "../compiler";
+import { readConfigFile } from "../helper";
 import copyDiff from "../helper/legacy/copyDiff";
 import type {
 	ECompilerType,
 	ITestContext,
 	ITestEnv,
 	TCompilerOptions
 } from "../type";
-import { ConfigProcessor } from "./config";
 import { type IMultiTaskProcessorOptions, MultiTaskProcessor } from "./multi";
 
 // This file is used to port step number to rspack.config.js/webpack.config.js
@@ -38,7 +39,7 @@ export class WatchProcessor<
 	constructor(protected _watchOptions: IWatchProcessorOptions<T>) {
 		super({
 			overrideOptions: WatchProcessor.overrideOptions<T>(_watchOptions),
-			findBundle: ConfigProcessor.findBundle<T>,
+			findBundle: WatchProcessor.findBundle<T>,
 			..._watchOptions
 		});
 	}
@@ -93,6 +94,39 @@ export class WatchProcessor<
 		);
 	}
 
+	async config(context: ITestContext) {
+		this.multiCompilerOptions = [];
+		const caseOptions: TCompilerOptions<T>[] = Array.isArray(
+			this._multiOptions.configFiles
+		)
+			? readConfigFile(
+					this._multiOptions.configFiles!.map(i => context.getSource(i))
+				)
+			: [{}];
+
+		for (const [index, options] of caseOptions.entries()) {
+			const compilerOptions = merge(
+				typeof this._multiOptions.defaultOptions === "function"
+					? this._multiOptions.defaultOptions!(index, context)
+					: {},
+				options
+			);
+
+			if (typeof this._multiOptions.overrideOptions === "function") {
+				this._multiOptions.overrideOptions!(index, context, compilerOptions);
+			}
+
+			this.multiCompilerOptions.push(compilerOptions);
+		}
+
+		const compilerOptions =
+			this.multiCompilerOptions.length === 1
+				? this.multiCompilerOptions[0]
+				: this.multiCompilerOptions;
+		const compiler = this.getCompiler(context);
+		compiler.setOptions(compilerOptions as any);
+	}
+
 	static overrideOptions<T extends ECompilerType>({
 		tempDir,
 		name,
@@ -108,6 +142,7 @@ export class WatchProcessor<
 			if (!options.context) options.context = tempDir;
 			if (!options.entry) options.entry = "./index.js";
 			if (!options.target) options.target = "async-node";
+			if (!options.devtool) options.devtool = false;
 			if (!options.output) options.output = {};
 			if (!options.output.path) options.output.path = context.getDist();
 			if (typeof options.output.pathinfo === "undefined")
@@ -151,6 +186,19 @@ export class WatchProcessor<
 			).experiments!.rspackFuture!.bundlerInfo!.force ??= false;
 		};
 	}
+
+	static findBundle<T extends ECompilerType>(
+		index: number,
+		context: ITestContext,
+		options: TCompilerOptions<T>
+	) {
+		const testConfig = context.getTestConfig();
+
+		if (typeof testConfig.findBundle === "function") {
+			return testConfig.findBundle!(index, options);
+		}
+		return "./bundle.js";
+	}
 }
 
 export interface IWatchStepProcessorOptions<T extends ECompilerType>

packages/rspack-test-tools/src/runner/runner/watch.ts

@@ -33,6 +33,7 @@ export class WatchRunner<
 		moduleScope.document = this.globalContext!.document;
 		moduleScope.STATE = this.state;
 		moduleScope.WATCH_STEP = this._watchOptions.stepName;
+		moduleScope.STATS_JSON = this._options.stats;
 		return moduleScope;
 	}
 

packages/rspack-test-tools/tests/NewIncremental.test.js

@@ -110,5 +110,6 @@ describeByWalk(v("watch (webpack-test)"), (name, src, dist) => {
 		/caching-inner-source/,
 		/production/,
 		/warnings-contribute-to-hash/,
+		/issue-8766/,
 	]
 });

packages/rspack-test-tools/tests/watchCases/compiler/multiply-compiler/0/entry1.js

@@ -1,5 +1,5 @@
 import module from "./file";
 
-it("should watch for multiply compiler", function () {
+it("should watch for multiply compiler (entry1)", function () {
 	expect(module).toBe(WATCH_STEP);
 });

packages/rspack-test-tools/tests/watchCases/compiler/multiply-compiler/0/entry2.js

@@ -1,5 +1,5 @@
 import module from "./file";
 
-it("should watch for multiply compiler", function () {
+it("should watch for multiply compiler (entry2)", function () {
 	expect(module).toBe(WATCH_STEP);
 });

packages/rspack-test-tools/tests/watchCases/compiler/multiply-compiler/rspack.config.js

@@ -3,11 +3,17 @@ module.exports = [
 	{
 		entry: {
 			entry1: "./entry1.js"
+		},
+		output: {
+			filename: "./bundle1.js",
 		}
 	},
 	{
 		entry: {
 			entry2: "./entry2.js"
+		},
+		output: {
+			filename: "./bundle2.js",
 		}
 	}
 ];

packages/rspack-test-tools/tests/watchCases/compiler/multiply-compiler/test.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+	findBundle(i) {
+		switch (i) {
+			case 0:
+				return `bundle1.js`
+			case 1:
+				return `bundle2.js`
+		}
+	}
+}

packages/rspack-test-tools/tests/watchCases/context/out-of-context/test.config.js

@@ -1,6 +1,6 @@
 module.exports = {
 	documentType: 'fake',
-	findBundle() {
-		return ['bundle.css', 'bundle.js']
+	findBundle(i) {
+		return ["bundle.css", "bundle.js"]
 	}
 }

packages/rspack-test-tools/tests/watchCases/side-effects/basic/0/index.js

@@ -0,0 +1,5 @@
+import {value} from "./module";
+
+it("should have correct export from re-exports", function () {
+	expect(value).toBe("foo");
+});

packages/rspack-test-tools/tests/watchCases/side-effects/basic/0/module.js

@@ -0,0 +1,3 @@
+import {v} from './reexports'
+// ...
+export const value = '' + v;

packages/rspack-test-tools/tests/watchCases/side-effects/basic/1/module.js

@@ -0,0 +1,2 @@
+import {v} from './reexports'
+export const value = '' + v;

packages/rspack-test-tools/tests/hotCases/newTreeshaking/re-export-optimization-for-inaffected-module/rspack.config.js → packages/rspack-test-tools/tests/watchCases/side-effects/basic/rspack.config.js

@@ -3,10 +3,5 @@ module.exports = {
 	optimization: {
 		sideEffects: true,
 		providedExports: true,
-	},
-	experiments: {
-		rspackFuture: {
-			newIncremental: true
-		}
 	}
 };