@rspack-canary/test-tools 1.6.7-canary-545fe05f-20251203071712 → 1.6.7-canary-39f82ff6-20251203173928

package/dist/case/cache.js

@@ -13,7 +13,6 @@ const runner_1 = require("../runner");
 const creator_1 = require("../test/creator");
 const common_1 = require("./common");
 const runner_2 = require("./runner");
-const MAX_COMPILER_INDEX = 100;
 function createCacheProcessor(name, src, temp, target) {
     const updatePlugin = new hot_update_1.HotUpdatePlugin(src, temp);
     return {
@@ -23,9 +22,7 @@ function createCacheProcessor(name, src, temp, target) {
         },
         config: async (context) => {
             const compiler = context.getCompiler();
-            let options = defaultOptions(context, temp, target);
-            options = await (0, common_1.config)(context, name, ["rspack.config.js", "webpack.config.js"].map(i => node_path_1.default.resolve(temp, i)), options);
-            overrideOptions(options, temp, target, updatePlugin);
+            const options = await generateOptions(context, temp, target, updatePlugin);
             compiler.setOptions(options);
         },
         compiler: async (context) => {
@@ -75,8 +72,8 @@ function createCacheCase(name, src, dist, target, temp) {
     creator.create(name, src, dist, temp);
 }
 const creators = new Map();
-function defaultOptions(context, temp, target) {
-    const options = {
+async function generateOptions(context, temp, target, updatePlugin) {
+    let options = {
         context: temp,
         mode: "production",
         cache: true,
@@ -105,9 +102,8 @@ function defaultOptions(context, temp, target) {
     };
     options.plugins ??= [];
     options.plugins.push(new core_1.default.HotModuleReplacementPlugin());
-    return options;
-}
-function overrideOptions(options, temp, target, updatePlugin) {
+    options = await (0, common_1.config)(context, "cacheCase", ["rspack.config.js", "webpack.config.js"].map(i => node_path_1.default.resolve(temp, i)), options);
+    // overwrite
     if (!options.entry) {
         options.entry = "./index.js";
     }
@@ -127,6 +123,7 @@ function overrideOptions(options, temp, target, updatePlugin) {
             level: "error"
         };
     }
+    return options;
 }
 function findBundle(name, target, context) {
     const files = [];
@@ -181,6 +178,7 @@ function createRunner(context, name, file, env) {
                     moduleScope.COMPILER_INDEX = compilerIndex;
                     moduleScope.NEXT_HMR = nextHmr;
                     moduleScope.NEXT_START = nextStart;
+                    moduleScope.NEXT_MOVE_DIR_START = nextMoveDirStart;
                     return moduleScope;
                 }
             },
@@ -189,19 +187,19 @@ function createRunner(context, name, file, env) {
             compilerOptions: options
         });
     };
+    const checkStats = async (stats) => {
+        const compilerOptions = compiler.getOptions();
+        const updateIndex = updatePlugin.getUpdateIndex();
+        await (0, checkArrayExpectation_1.default)(source, stats, "error", `errors${updateIndex}`, "Error", compilerOptions);
+        await (0, checkArrayExpectation_1.default)(source, stats, "warning", `warnings${updateIndex}`, "Warning", compilerOptions);
+    };
     const nextHmr = async (m, options) => {
         await updatePlugin.goNext();
         const stats = await compiler.build();
-        if (!stats) {
-            throw new Error("Should generate stats during build");
-        }
         const jsonStats = stats.toJson({
         // errorDetails: true
         });
-        const compilerOptions = compiler.getOptions();
-        const updateIndex = updatePlugin.getUpdateIndex();
-        await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${updateIndex}`, "Error", compilerOptions);
-        await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updateIndex}`, "Warning", compilerOptions);
+        await checkStats(jsonStats);
         const updatedModules = await m.hot.check(options || true);
         if (!updatedModules) {
             throw new Error("No update available");
@@ -210,24 +208,33 @@ function createRunner(context, name, file, env) {
     };
     const nextStart = async () => {
         await compiler.close();
+        await updatePlugin.goNext();
+        compilerIndex++;
         compiler.createCompiler();
+        const stats = await compiler.build();
+        const jsonStats = stats.toJson({
+        // errorDetails: true
+        });
+        await checkStats(jsonStats);
+        env.it(`NEXT_START run with compilerIndex==${compilerIndex}`, async () => {
+            return getWebRunner().run(file);
+        });
+        return jsonStats;
+    };
+    const nextMoveDirStart = async () => {
+        await compiler.close();
+        const tempDir = await updatePlugin.moveTempDir();
+        const options = await generateOptions(context, tempDir, compiler.getOptions().target, updatePlugin);
+        compiler.setOptions(options);
         await updatePlugin.goNext();
+        compilerIndex++;
+        compiler.createCompiler();
         const stats = await compiler.build();
-        if (!stats) {
-            throw new Error("Should generate stats during build");
-        }
         const jsonStats = stats.toJson({
         // errorDetails: true
         });
-        const compilerOptions = compiler.getOptions();
-        const updateIndex = updatePlugin.getUpdateIndex();
-        await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${updateIndex}`, "Error", compilerOptions);
-        await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updateIndex}`, "Warning", compilerOptions);
-        env.it(`NEXT_START run with compilerIndex==${compilerIndex + 1}`, async () => {
-            if (compilerIndex > MAX_COMPILER_INDEX) {
-                throw new Error("NEXT_START has been called more than the maximum times");
-            }
-            compilerIndex++;
+        await checkStats(jsonStats);
+        env.it(`NEXT_MOVE_DIR_START run with compilerIndex==${compilerIndex}`, async () => {
             return getWebRunner().run(file);
         });
         return jsonStats;

package/dist/helper/hot-update/plugin.d.ts

@@ -13,5 +13,6 @@ export declare class HotUpdatePlugin {
     getUpdateIndex(): number;
     getTotalUpdates(): number;
     goNext(): Promise<void>;
+    moveTempDir(): Promise<string>;
     apply(compiler: Compiler): void;
 }

package/dist/helper/hot-update/plugin.js

@@ -22,6 +22,7 @@ async function loopFile(dir, callback) {
     }));
 }
 const PLUGIN_NAME = "HotUpdatePlugin";
+const MAX_UPDATE_INDEX = 100;
 class HotUpdatePlugin {
     constructor(projectDir, tempDir) {
         this.projectDir = projectDir;
@@ -91,9 +92,29 @@ class HotUpdatePlugin {
         }, 1);
     }
     async goNext() {
+        if (this.updateIndex > MAX_UPDATE_INDEX) {
+            throw new Error("NEXT_* has been called more than the maximum times");
+        }
         this.updateIndex++;
         await this.updateFiles();
     }
+    async moveTempDir() {
+        // generate next temp dir path.
+        const nextTempDir = this.tempDir.replace(/(___[0-9]+)?[/\\]*$/, "") +
+            "___" +
+            this.updateIndex;
+        // update this.files.
+        for (const key of Object.keys(this.files)) {
+            const nextKey = key.replace(this.tempDir, nextTempDir);
+            this.files[nextKey] = this.files[key];
+            delete this.files[key];
+        }
+        // move files.
+        (0, rimraf_1.rimrafSync)(nextTempDir);
+        fs_extra_1.default.renameSync(this.tempDir, nextTempDir);
+        this.tempDir = nextTempDir;
+        return this.tempDir;
+    }
     apply(compiler) {
         const options = compiler.options;
         options.context = this.tempDir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-canary/test-tools",
-  "version": "1.6.7-canary-545fe05f-20251203071712",
+  "version": "1.6.7-canary-39f82ff6-20251203173928",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -65,7 +65,7 @@
     "@types/jsdom": "^21.1.7",
     "typescript": "^5.9.3",
     "wast-loader": "^1.14.1",
-    "@rspack/core": "npm:@rspack-canary/core@1.6.7-canary-545fe05f-20251203071712"
+    "@rspack/core": "npm:@rspack-canary/core@1.6.7-canary-39f82ff6-20251203173928"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"