@rspack/test-tools 1.0.5 → 1.0.7

package/dist/case/new-incremental.js

@@ -64,8 +64,14 @@ const watchCreator = new creator_1.BasicCaseCreator({
                 compilerType: type_1.ECompilerType.Rspack,
                 configFiles: ["rspack.config.js", "webpack.config.js"],
                 experiments: {
-                    rspackFuture: {
-                        newIncremental: true
+                    incremental: {
+                        make: true,
+                        emitAssets: true,
+                        inferAsyncModules: true,
+                        providedExports: true,
+                        moduleHashes: true,
+                        moduleCodegen: true,
+                        moduleRuntimeRequirements: true
                     }
                 }
             })

package/dist/helper/read-config-file.d.ts

@@ -1,2 +1,2 @@
 import type { ECompilerType, TCompilerOptions } from "../type";
-export declare function readConfigFile<T extends ECompilerType>(files: string[]): TCompilerOptions<T>[];
+export declare function readConfigFile<T extends ECompilerType>(files: string[], functionApply?: (config: (TCompilerOptions<T> | ((...args: unknown[]) => TCompilerOptions<T>))[]) => TCompilerOptions<T>[]): TCompilerOptions<T>[];

package/dist/helper/read-config-file.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readConfigFile = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
-function readConfigFile(files) {
+function readConfigFile(files, functionApply) {
     const existsFile = files.find(i => fs_extra_1.default.existsSync(i));
     const fileConfig = existsFile ? require(existsFile) : {};
-    return Array.isArray(fileConfig) ? fileConfig : [fileConfig];
+    const configArr = Array.isArray(fileConfig) ? fileConfig : [fileConfig];
+    return functionApply ? functionApply(configArr) : configArr;
 }
 exports.readConfigFile = readConfigFile;

package/dist/processor/hot-new-incremental.js

@@ -29,8 +29,15 @@ class HotNewIncrementalProcessor extends hot_1.HotProcessor {
         if (this._hotOptions.compilerType === type_1.ECompilerType.Rspack) {
             const rspackOptions = options;
             rspackOptions.experiments ??= {};
-            rspackOptions.experiments.rspackFuture ??= {};
-            rspackOptions.experiments.rspackFuture.newIncremental = true;
+            rspackOptions.experiments.incremental ??= {
+                make: true,
+                emitAssets: true,
+                inferAsyncModules: true,
+                providedExports: true,
+                moduleHashes: true,
+                moduleCodegen: true,
+                moduleRuntimeRequirements: true
+            };
         }
         else {
             throw new Error("HotNewIncrementalProcessor should only used for Rspack.");

package/dist/processor/multi.js

@@ -43,7 +43,18 @@ class MultiTaskProcessor extends basic_1.BasicProcessor {
     async config(context) {
         this.multiCompilerOptions = [];
         const caseOptions = Array.isArray(this._multiOptions.configFiles)
-            ? (0, helper_1.readConfigFile)(this._multiOptions.configFiles.map(i => context.getSource(i)))
+            ? (0, helper_1.readConfigFile)(this._multiOptions.configFiles.map(i => context.getSource(i)), configs => {
+                return configs.flatMap(c => {
+                    if (typeof c === "function") {
+                        const options = {
+                            testPath: context.getDist(),
+                            env: undefined
+                        };
+                        return c(options.env, options);
+                    }
+                    return c;
+                });
+            })
             : [{}];
         for (const [index, options] of caseOptions.entries()) {
             const compilerOptions = (0, webpack_merge_1.merge)(typeof this._multiOptions.defaultOptions === "function"

package/dist/processor/watch.d.ts

@@ -17,7 +17,9 @@ export declare class WatchProcessor<T extends ECompilerType> extends MultiTaskPr
     build(context: ITestContext): Promise<void>;
     run(env: ITestEnv, context: ITestContext): Promise<void>;
     check(env: ITestEnv, context: ITestContext): Promise<void>;
+    config(context: ITestContext): Promise<void>;
     static overrideOptions<T extends ECompilerType>({ tempDir, name, experiments, optimization }: IWatchProcessorOptions<T>): (index: number, context: ITestContext, options: TCompilerOptions<ECompilerType>) => void;
+    static findBundle<T extends ECompilerType>(index: number, context: ITestContext, options: TCompilerOptions<T>): string | string[];
 }
 export interface IWatchStepProcessorOptions<T extends ECompilerType> extends Omit<IWatchProcessorOptions<T>, "experiments" | "optimization"> {
 }

package/dist/processor/watch.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WatchStepProcessor = exports.WatchProcessor = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const webpack_merge_1 = require("webpack-merge");
 const compiler_1 = require("../compiler");
+const helper_1 = require("../helper");
 const copyDiff_1 = __importDefault(require("../helper/legacy/copyDiff"));
-const config_1 = require("./config");
 const multi_1 = require("./multi");
 // This file is used to port step number to rspack.config.js/webpack.config.js
 const currentWatchStepModulePath = node_path_1.default.resolve(__dirname, "../helper/util/currentWatchStep");
@@ -16,7 +17,7 @@ class WatchProcessor extends multi_1.MultiTaskProcessor {
     constructor(_watchOptions) {
         super({
             overrideOptions: WatchProcessor.overrideOptions(_watchOptions),
-            findBundle: (config_1.ConfigProcessor.findBundle),
+            findBundle: (WatchProcessor.findBundle),
             ..._watchOptions
         });
         this._watchOptions = _watchOptions;
@@ -56,6 +57,26 @@ class WatchProcessor extends multi_1.MultiTaskProcessor {
         node_fs_1.default.renameSync(node_path_1.default.join(context.getDist(), "stats.txt"), node_path_1.default.join(context.getDist(), `stats.${this._watchOptions.stepName}.txt`));
         node_fs_1.default.renameSync(node_path_1.default.join(context.getDist(), "stats.json"), node_path_1.default.join(context.getDist(), `stats.${this._watchOptions.stepName}.json`));
     }
+    async config(context) {
+        this.multiCompilerOptions = [];
+        const caseOptions = Array.isArray(this._multiOptions.configFiles)
+            ? (0, helper_1.readConfigFile)(this._multiOptions.configFiles.map(i => context.getSource(i)))
+            : [{}];
+        for (const [index, options] of caseOptions.entries()) {
+            const compilerOptions = (0, webpack_merge_1.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);
+    }
     static overrideOptions({ tempDir, name, experiments, optimization }) {
         return (index, context, options) => {
             if (!options.mode)
@@ -66,6 +87,8 @@ class WatchProcessor extends multi_1.MultiTaskProcessor {
                 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)
@@ -103,6 +126,13 @@ class WatchProcessor extends multi_1.MultiTaskProcessor {
             options.experiments.rspackFuture.bundlerInfo.force ??= false;
         };
     }
+    static findBundle(index, context, options) {
+        const testConfig = context.getTestConfig();
+        if (typeof testConfig.findBundle === "function") {
+            return testConfig.findBundle(index, options);
+        }
+        return "./bundle.js";
+    }
 }
 exports.WatchProcessor = WatchProcessor;
 class WatchStepProcessor extends WatchProcessor {

package/dist/runner/runner/watch.js

@@ -18,6 +18,7 @@ class WatchRunner extends fake_1.FakeDocumentWebRunner {
         moduleScope.document = this.globalContext.document;
         moduleScope.STATE = this.state;
         moduleScope.WATCH_STEP = this._watchOptions.stepName;
+        moduleScope.STATS_JSON = this._options.stats;
         return moduleScope;
     }
     run(file) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -102,8 +102,8 @@
     "terser": "5.27.2",
     "typescript": "5.0.2",
     "wast-loader": "^1.12.1",
-    "@rspack/cli": "1.0.5",
-    "@rspack/core": "1.0.5"
+    "@rspack/cli": "1.0.7",
+    "@rspack/core": "1.0.7"
   },
   "peerDependencies": {
     "@rspack/core": ">=0.7.0"
@@ -114,7 +114,7 @@
     "dev:viewer": "rspack serve",
     "dev": "tsc -b -w",
     "test": "sh -c 'run-s \"test:* -- $*\"' sh",
-    "testu": "sh -c 'run-s \"test:* -u -- $*\"' sh",
+    "testu": "sh -c 'run-s \"test:* -- -u $*\"' sh",
     "test:base": "cross-env NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --colors --config ./jest.config.js --passWithNoTests",
     "test:hot": "cross-env RSPACK_HOT_TEST=true NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --colors --config ./jest.config.hot.js --passWithNoTests",
     "test:diff": "cross-env RSPACK_DIFF=true NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --colors --config ./jest.config.diff.js --passWithNoTests",