@rspack/test-tools 1.1.8 → 1.2.0-alpha.0

package/dist/case/cache.d.ts

@@ -0,0 +1,2 @@
+import { ECompilerType, type TCompilerOptions } from "../type";
+export declare function createCacheCase(name: string, src: string, dist: string, target: TCompilerOptions<ECompilerType.Rspack>["target"]): void;

package/dist/case/cache.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCacheCase = createCacheCase;
+const cache_1 = require("../processor/cache");
+const runner_1 = require("../runner");
+const creator_1 = require("../test/creator");
+const type_1 = require("../type");
+const creators = new Map();
+function getCreator(target) {
+    if (!creators.has(target)) {
+        creators.set(target, new creator_1.BasicCaseCreator({
+            clean: true,
+            describe: true,
+            target,
+            steps: ({ name, target }) => [
+                new cache_1.CacheProcessor({
+                    name,
+                    target: target,
+                    compilerType: type_1.ECompilerType.Rspack,
+                    configFiles: ["rspack.config.js", "webpack.config.js"]
+                })
+            ],
+            runner: runner_1.CacheRunnerFactory
+        }));
+    }
+    return creators.get(target);
+}
+function createCacheCase(name, src, dist, target) {
+    const creator = getCreator(target);
+    creator.create(name, src, dist);
+}

package/dist/case/diff.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDiffCase = createDiffCase;
 const node_path_1 = __importDefault(require("node:path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const rimraf_1 = __importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const createLazyTestEnv_1 = __importDefault(require("../helper/legacy/createLazyTestEnv"));
 const processor_1 = require("../processor");
 const tester_1 = require("../test/tester");
@@ -33,7 +33,7 @@ function createDiffCase(name, src, dist) {
         steps: [processor]
     });
     beforeAll(async () => {
-        rimraf_1.default.sync(dist);
+        (0, rimraf_1.rimrafSync)(dist);
         await tester.prepare();
     });
     do {

package/dist/case/index.d.ts

@@ -15,3 +15,4 @@ export * from "./stats-output";
 export * from "./treeshaking";
 export * from "./watch";
 export * from "./new-incremental";
+export * from "./cache";

package/dist/case/index.js

@@ -31,3 +31,4 @@ __exportStar(require("./stats-output"), exports);
 __exportStar(require("./treeshaking"), exports);
 __exportStar(require("./watch"), exports);
 __exportStar(require("./new-incremental"), exports);
+__exportStar(require("./cache"), exports);

package/dist/compare/format-code.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/helper/expect/placeholder.js

@@ -10,7 +10,10 @@ const path_serializer_1 = require("path-serializer");
 // 2. replace <RSPACK_ROOT> etc
 // 3. transform win32 sep
 const placeholderSerializer = (0, path_serializer_1.createSnapshotSerializer)({
-    root: node_path_1.default.resolve(__dirname, "../../../../../"),
+    root: __dirname.includes("node_modules")
+        ? // Use `process.cwd()` when using outside Rspack
+            process.cwd()
+        : node_path_1.default.resolve(__dirname, "../../../../../"),
     replace: [
         {
             match: node_path_1.default.resolve(__dirname, "../../../"),

package/dist/helper/expect/to-match-file-snapshot.js

@@ -11,7 +11,6 @@ const node_path_1 = __importDefault(require("node:path"));
 const chalk_1 = __importDefault(require("chalk"));
 const filenamify_1 = __importDefault(require("filenamify"));
 const jest_diff_1 = require("jest-diff");
-const mkdirp_1 = __importDefault(require("mkdirp"));
 /**
  * Check if 2 strings or buffer are equal
  */
@@ -62,7 +61,7 @@ function toMatchFileSnapshot(content, filepath, options = {}) {
             return { pass: true, message: () => "" };
         }
         if (snapshotState._updateSnapshot === "all") {
-            mkdirp_1.default.sync(node_path_1.default.dirname(filename));
+            node_fs_1.default.mkdirSync(node_path_1.default.dirname(filename), { recursive: true });
             node_fs_1.default.writeFileSync(filename, content);
             snapshotState.updated++;
             return { pass: true, message: () => "" };
@@ -83,7 +82,7 @@ function toMatchFileSnapshot(content, filepath, options = {}) {
     if (!isNot &&
         (snapshotState._updateSnapshot === "new" ||
             snapshotState._updateSnapshot === "all")) {
-        mkdirp_1.default.sync(node_path_1.default.dirname(filename));
+        node_fs_1.default.mkdirSync(node_path_1.default.dirname(filename), { recursive: true });
         node_fs_1.default.writeFileSync(filename, content);
         snapshotState.added++;
         return { pass: true, message: () => "" };

package/dist/helper/legacy/checkArrayExpectation.d.ts

@@ -1,2 +1,2 @@
-declare function _exports(testDirectory: any, object: any, kind: any, filename: any, upperCaseKind: any, done: any): true | undefined;
+declare function _exports(testDirectory: any, object: any, kind: any, filename: any, upperCaseKind: any, done: any): Promise<true | undefined>;
 export = _exports;

package/dist/helper/legacy/checkArrayExpectation.js

@@ -59,12 +59,11 @@ ${tooMuch.map(item => `${explain(item)}`).join("\n\n")}`);
     }
     return diff.join("\n\n");
 };
-module.exports = function checkArrayExpectation(testDirectory, object, kind, filename, upperCaseKind, done) {
-    if (!done) {
-        done = upperCaseKind;
-        upperCaseKind = filename;
-        filename = `${kind}s`;
-    }
+module.exports = async function checkArrayExpectation(testDirectory, object, kind, filename, upperCaseKind, done) {
+    const usePromise = typeof done === "function";
+    done = typeof done === "function" ? done : error => {
+        throw error;
+    };
     let array = object[`${kind}s`];
     if (Array.isArray(array)) {
         if (kind === "warning") {

package/dist/helper/legacy/copyDiff.js

@@ -2,7 +2,7 @@
 // @ts-nocheck
 const fs = require("node:fs");
 const path = require("node:path");
-const rimraf = require("rimraf");
+const { rimrafSync } = require("rimraf");
 module.exports = function copyDiff(src, dest, initial) {
     fs.mkdirSync(dest, { recursive: true });
     const files = fs.readdirSync(src);
@@ -19,7 +19,7 @@ module.exports = function copyDiff(src, dest, initial) {
                 fs.unlinkSync(destFile);
             }
             else if (/^DELETE_DIRECTORY\s*$/.test(content.toString("utf-8"))) {
-                rimraf.sync(destFile);
+                rimrafSync(destFile);
             }
             else {
                 fs.writeFileSync(destFile, content);

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

@@ -0,0 +1 @@
+export default function (this: any, c: string): string;

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

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+function default_1(c) {
+    let content = c;
+    if (content.includes("NEXT_HMR")) {
+        content = `
+			${content}
+			let __hmr_children__ = [...module.children];
+			let __hmr_used_exports__ = __hmr_children__.reduce((res, child) => {
+				res[child] = __webpack_module_cache__[child].exports;
+				return res;
+			}, {});
+			module.hot.accept(__hmr_children__, () => {
+				__hmr_children__.forEach((child) => {
+					const reexports = __webpack_require__(child);
+					for (let key in reexports) {
+						Object.defineProperty(__hmr_used_exports__[child], key, {
+							configurable: true,
+							enumerable: true,
+							get: () => reexports[key]
+						});
+					}
+				});
+			});
+		`;
+    }
+    content = content.replace(/NEXT_HMR/g, "NEXT_HMR.bind(null, module)");
+    const options = this.getOptions();
+    const items = content.split(/---+\r?\n/g);
+    if (items.length <= 1) {
+        return content;
+    }
+    options.totalUpdates = Math.max(options.totalUpdates, items.length);
+    options.changedFiles.push(this.resourcePath);
+    return items[options.updateIndex];
+}

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

@@ -0,0 +1,7 @@
+import type { Compiler } from "@rspack/core";
+import type { TUpdateOptions } from "../../type";
+export declare class TestHotUpdatePlugin {
+    private updateOptions;
+    constructor(updateOptions: TUpdateOptions);
+    apply(compiler: Compiler): void;
+}

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestHotUpdatePlugin = void 0;
+class TestHotUpdatePlugin {
+    constructor(updateOptions) {
+        this.updateOptions = updateOptions;
+    }
+    apply(compiler) {
+        compiler.hooks.beforeRun.tap("TestHotUpdatePlugin", () => {
+            compiler.modifiedFiles = new Set(this.updateOptions.changedFiles);
+            this.updateOptions.changedFiles = [];
+        });
+        compiler.hooks.compilation.tap("TestHotUpdatePlugin", compilation => {
+            compilation.hooks.additionalTreeRuntimeRequirements.tap("HMR_TEST_PLUGIN", (_chunk, set) => {
+                set.add(compiler.webpack.RuntimeGlobals.moduleCache);
+            });
+            compilation.hooks.runtimeModule.tap("HMR_TEST_PLUGIN", (module, _set) => {
+                if (module.constructorName === "DefinePropertyGettersRuntimeModule") {
+                    module.source.source = Buffer.from(`
+										__webpack_require__.d = function (exports, definition) {
+												for (var key in definition) {
+														if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+																Object.defineProperty(exports, key, { configurable: true, enumerable: true, get: definition[key] });
+														}
+												}
+										};
+										`, "utf-8");
+                }
+            });
+        });
+    }
+}
+exports.TestHotUpdatePlugin = TestHotUpdatePlugin;

package/dist/helper/plugins/index.d.ts

@@ -0,0 +1 @@
+export * from "./hot-update";

package/dist/helper/plugins/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./hot-update"), exports);

package/dist/helper/util/refreshModifyTime.d.ts

@@ -0,0 +1 @@
+export declare function refreshModifyTime(file: string): Promise<void>;

package/dist/helper/util/refreshModifyTime.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshModifyTime = refreshModifyTime;
+const fs_extra_1 = require("fs-extra");
+async function refreshModifyTime(file) {
+    const data = await (0, fs_extra_1.readFile)(file);
+    await (0, fs_extra_1.writeFile)(file, data);
+}

package/dist/processor/basic.js

@@ -110,14 +110,8 @@ class BasicProcessor {
                 warnings.push(...jsonStats.warnings);
             }
         }
-        await new Promise((resolve, reject) => {
-            (0, checkArrayExpectation_1.default)(context.getSource(), { errors }, "error", "Error", reject);
-            resolve();
-        });
-        await new Promise((resolve, reject) => {
-            (0, checkArrayExpectation_1.default)(context.getSource(), { warnings }, "warning", "Warning", reject);
-            resolve();
-        });
+        await (0, checkArrayExpectation_1.default)(context.getSource(), { errors }, "error", "errors", "Error");
+        await (0, checkArrayExpectation_1.default)(context.getSource(), { warnings }, "warning", "warnings", "Warning");
         // clear error if checked
         if (node_fs_1.default.existsSync(context.getSource("errors.js"))) {
             context.clearError(this._options.name);

package/dist/processor/cache.d.ts

@@ -0,0 +1,17 @@
+import { ECompilerType, type ITestContext, type ITestEnv, type ITestRunner, type TCompilerOptions, type TUpdateOptions } from "../type";
+import { BasicProcessor, type IBasicProcessorOptions } from "./basic";
+export interface ICacheProcessorOptions<T extends ECompilerType> extends Omit<IBasicProcessorOptions<T>, "runable"> {
+    target: TCompilerOptions<T>["target"];
+}
+export declare class CacheProcessor<T extends ECompilerType> extends BasicProcessor<T> {
+    protected _cacheOptions: ICacheProcessorOptions<T>;
+    protected updateOptions: TUpdateOptions;
+    protected runner: ITestRunner | null;
+    constructor(_cacheOptions: ICacheProcessorOptions<T>);
+    build(context: ITestContext): Promise<void>;
+    run(env: ITestEnv, context: ITestContext): Promise<void>;
+    static findBundle<T extends ECompilerType>(this: CacheProcessor<T>, context: ITestContext): string[];
+    afterAll(context: ITestContext): Promise<void>;
+    static defaultOptions<T extends ECompilerType>(this: CacheProcessor<T>, context: ITestContext): TCompilerOptions<T>;
+    static overrideOptions<T extends ECompilerType>(this: CacheProcessor<T>, context: ITestContext, options: TCompilerOptions<T>): void;
+}

package/dist/processor/cache.js

@@ -0,0 +1,140 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CacheProcessor = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const core_1 = require("@rspack/core");
+const fs_extra_1 = require("fs-extra");
+const plugins_1 = require("../helper/plugins");
+const type_1 = require("../type");
+const basic_1 = require("./basic");
+class CacheProcessor extends basic_1.BasicProcessor {
+    constructor(_cacheOptions) {
+        const fakeUpdateLoaderOptions = {
+            updateIndex: 0,
+            totalUpdates: 1,
+            changedFiles: []
+        };
+        super({
+            defaultOptions: CacheProcessor.defaultOptions,
+            overrideOptions: CacheProcessor.overrideOptions,
+            findBundle: CacheProcessor.findBundle,
+            runable: true,
+            ..._cacheOptions
+        });
+        this._cacheOptions = _cacheOptions;
+        this.runner = null;
+        this.updateOptions = fakeUpdateLoaderOptions;
+    }
+    async build(context) {
+        // clear cache directory first time.
+        const experiments = this.getCompiler(context).getOptions().experiments || {};
+        let directory = "";
+        if ("cache" in experiments &&
+            typeof experiments.cache === "object" &&
+            experiments.cache.type === "persistent") {
+            directory = experiments.cache.storage?.directory || directory;
+        }
+        (0, fs_extra_1.removeSync)(node_path_1.default.join(context.getSource(), directory || "node_modules/.cache"));
+        await super.build(context);
+    }
+    async run(env, context) {
+        context.setValue(this._options.name, "hotUpdateContext", this.updateOptions);
+        await super.run(env, context);
+    }
+    static findBundle(context) {
+        const files = [];
+        const prefiles = [];
+        const compiler = context.getCompiler(this._cacheOptions.name);
+        if (!compiler)
+            throw new Error("Compiler should exists when find bundle");
+        const stats = compiler.getStats();
+        if (!stats)
+            throw new Error("Stats should exists when find bundle");
+        const info = stats.toJson({ all: false, entrypoints: true });
+        if (this._cacheOptions.target === "web" ||
+            this._cacheOptions.target === "webworker") {
+            for (const file of info.entrypoints.main.assets) {
+                if (file.name.endsWith(".js")) {
+                    files.push(file.name);
+                }
+                else {
+                    prefiles.push(file.name);
+                }
+            }
+        }
+        else {
+            const assets = info.entrypoints.main.assets.filter(s => s.name.endsWith(".js"));
+            files.push(assets[assets.length - 1].name);
+        }
+        return [...prefiles, ...files];
+    }
+    async afterAll(context) {
+        await super.afterAll(context);
+        if (this.updateOptions.updateIndex + 1 !==
+            this.updateOptions.totalUpdates) {
+            throw new Error(`Should run all hot steps (${this.updateOptions.updateIndex + 1} / ${this.updateOptions.totalUpdates}): ${this._options.name}`);
+        }
+    }
+    static defaultOptions(context) {
+        const options = {
+            context: context.getSource(),
+            mode: "production",
+            cache: true,
+            devtool: false,
+            output: {
+                path: context.getDist(),
+                filename: "bundle.js",
+                chunkFilename: "[name].chunk.[fullhash].js",
+                publicPath: "https://test.cases/path/",
+                library: { type: "commonjs2" }
+            },
+            optimization: {
+                moduleIds: "named"
+            },
+            target: this._cacheOptions.target,
+            experiments: {
+                css: true,
+                rspackFuture: {
+                    bundlerInfo: {
+                        force: false
+                    }
+                }
+            }
+        };
+        if (this._cacheOptions.compilerType === type_1.ECompilerType.Rspack) {
+            options.plugins ??= [];
+            options.plugins.push(new core_1.rspack.HotModuleReplacementPlugin());
+        }
+        return options;
+    }
+    static overrideOptions(context, options) {
+        if (!options.entry) {
+            options.entry = "./index.js";
+        }
+        options.module ??= {};
+        for (const cssModuleType of ["css/auto", "css/module", "css"]) {
+            options.module.generator ??= {};
+            options.module.generator[cssModuleType] ??= {};
+            options.module.generator[cssModuleType].exportsOnly ??=
+                this._cacheOptions.target === "async-node";
+        }
+        options.module.rules ??= [];
+        options.module.rules.push({
+            test: /\.(js|css|json)/,
+            use: [
+                {
+                    loader: node_path_1.default.resolve(__dirname, "../helper/loaders/hot-update.js"),
+                    options: this.updateOptions
+                }
+            ]
+        });
+        if (this._cacheOptions.compilerType === type_1.ECompilerType.Rspack) {
+            options.plugins ??= [];
+            options.plugins.push(new plugins_1.TestHotUpdatePlugin(this.updateOptions));
+        }
+    }
+}
+exports.CacheProcessor = CacheProcessor;

package/dist/processor/hot-step.js

@@ -111,7 +111,9 @@ class HotSnapshotProcessor extends hot_1.HotProcessor {
         const title = `Case ${node_path_1.default.basename(this._options.name)}: Step ${step}`;
         const hotUpdateFile = [];
         const hotUpdateManifest = [];
-        const changedFiles = this.updateOptions.changedFiles.map((i) => (0, win_1.escapeSep)(node_path_1.default.relative(context.getSource(), i)));
+        const changedFiles = this.updateOptions.updateIndex === 0
+            ? []
+            : this.updateOptions.changedFiles.map((i) => (0, win_1.escapeSep)(node_path_1.default.relative(context.getSource(), i)));
         changedFiles.sort();
         const hashes = {
             [lastHash || "LAST_HASH"]: "LAST_HASH",

package/dist/processor/hot.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HotProcessor = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const core_1 = require("@rspack/core");
+const plugins_1 = require("../helper/plugins");
 const type_1 = require("../type");
 const basic_1 = require("./basic");
 class HotProcessor extends basic_1.BasicProcessor {
@@ -91,7 +92,7 @@ class HotProcessor extends basic_1.BasicProcessor {
         };
         if (this._hotOptions.compilerType === type_1.ECompilerType.Rspack) {
             options.plugins ??= [];
-            options.plugins.push(new core_1.rspack.HotModuleReplacementPlugin());
+            options.plugins.push(new core_1.rspack.HotModuleReplacementPlugin(), new plugins_1.TestHotUpdatePlugin(this.updateOptions));
         }
         return options;
     }
@@ -111,7 +112,7 @@ class HotProcessor extends basic_1.BasicProcessor {
             test: /\.(js|css|json)/,
             use: [
                 {
-                    loader: node_path_1.default.resolve(__dirname, "../helper/legacy/fake-update-loader.js"),
+                    loader: node_path_1.default.resolve(__dirname, "../helper/loaders/hot-update.js"),
                     options: this.updateOptions
                 }
             ]

package/dist/processor/index.d.ts

@@ -17,3 +17,4 @@ export * from "./snapshot";
 export * from "./stats";
 export * from "./stats-api";
 export * from "./watch";
+export * from "./cache";

package/dist/processor/index.js

@@ -33,3 +33,4 @@ __exportStar(require("./snapshot"), exports);
 __exportStar(require("./stats"), exports);
 __exportStar(require("./stats-api"), exports);
 __exportStar(require("./watch"), exports);
+__exportStar(require("./cache"), exports);

package/dist/processor/watch.js

@@ -83,14 +83,8 @@ class WatchProcessor extends multi_1.MultiTaskProcessor {
                 warnings.push(...jsonStats.warnings);
             }
         }
-        await new Promise((resolve, reject) => {
-            (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), { errors }, "error", "Error", reject);
-            resolve();
-        });
-        await new Promise((resolve, reject) => {
-            (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), { warnings }, "warning", "Warning", reject);
-            resolve();
-        });
+        await (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), { errors }, "error", "errors", "Error");
+        await (0, checkArrayExpectation_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), { warnings }, "warning", "warnings", "Warning");
         // clear error if checked
         if (node_fs_1.default.existsSync(context.getSource("errors.js"))) {
             context.clearError(this._options.name);

package/dist/runner/cache.d.ts

@@ -0,0 +1,5 @@
+import { type ECompilerType, type ITestEnv, type ITestRunner, type TCompilerOptions, type TCompilerStatsCompilation } from "../type";
+import { BasicRunnerFactory } from "./basic";
+export declare class CacheRunnerFactory<T extends ECompilerType> extends BasicRunnerFactory<T> {
+    protected createRunner(file: string, stats: TCompilerStatsCompilation<T>, compilerOptions: TCompilerOptions<T>, env: ITestEnv): ITestRunner;
+}

package/dist/runner/cache.js

@@ -0,0 +1,92 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CacheRunnerFactory = void 0;
+const checkArrayExpectation_1 = __importDefault(require("../helper/legacy/checkArrayExpectation"));
+const refreshModifyTime_1 = require("../helper/util/refreshModifyTime");
+const type_1 = require("../type");
+const basic_1 = require("./basic");
+const web_1 = require("./runner/web");
+const MAX_COMPILER_INDEX = 100;
+class CacheRunnerFactory extends basic_1.BasicRunnerFactory {
+    createRunner(file, stats, compilerOptions, env) {
+        const compiler = this.context.getCompiler(this.name);
+        let compilerIndex = 0;
+        const testConfig = this.context.getTestConfig();
+        const source = this.context.getSource();
+        const dist = this.context.getDist();
+        const hotUpdateContext = this.context.getValue(this.name, "hotUpdateContext");
+        const getWebRunner = () => {
+            return new web_1.WebRunner({
+                dom: this.context.getValue(this.name, "documentType") ||
+                    type_1.EDocumentType.JSDOM,
+                env,
+                stats,
+                name: this.name,
+                runInNewContext: false,
+                testConfig: {
+                    ...testConfig,
+                    moduleScope(ms, stats) {
+                        const moduleScope = typeof testConfig.moduleScope === "function"
+                            ? testConfig.moduleScope(ms, stats)
+                            : ms;
+                        moduleScope.COMPILER_INDEX = compilerIndex;
+                        moduleScope.NEXT_HMR = nextHmr;
+                        moduleScope.NEXT_START = nextStart;
+                        return moduleScope;
+                    }
+                },
+                source,
+                dist,
+                compilerOptions
+            });
+        };
+        const nextHmr = async (m, options) => {
+            hotUpdateContext.updateIndex++;
+            const stats = await compiler.build();
+            if (!stats) {
+                throw new Error("Should generate stats during build");
+            }
+            const jsonStats = stats.toJson({
+            // errorDetails: true
+            });
+            await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error");
+            await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning");
+            const updatedModules = await m.hot.check(options || true);
+            if (!updatedModules) {
+                throw new Error("No update available");
+            }
+            return jsonStats;
+        };
+        const nextStart = async () => {
+            await compiler.close();
+            compiler.createCompiler();
+            await Promise.all(hotUpdateContext.changedFiles.map(async (file) => {
+                await (0, refreshModifyTime_1.refreshModifyTime)(file);
+            }));
+            hotUpdateContext.changedFiles = [];
+            hotUpdateContext.updateIndex++;
+            const stats = await compiler.build();
+            if (!stats) {
+                throw new Error("Should generate stats during build");
+            }
+            const jsonStats = stats.toJson({
+            // errorDetails: true
+            });
+            await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error");
+            await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning");
+            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++;
+                return getWebRunner().run(file);
+            });
+            return jsonStats;
+        };
+        return getWebRunner();
+    }
+}
+exports.CacheRunnerFactory = CacheRunnerFactory;

package/dist/runner/hot-step.js

@@ -15,39 +15,48 @@ class HotStepRunnerFactory extends hot_1.HotRunnerFactory {
         const source = this.context.getSource();
         const dist = this.context.getDist();
         const hotUpdateContext = this.context.getValue(this.name, "hotUpdateContext");
-        const next = (callback) => {
-            hotUpdateContext.updateIndex++;
-            // TODO: find a better way to collect changed files from fake-update-loader
-            const changedFiles = new Map();
-            global.__CHANGED_FILES__ = changedFiles;
-            compiler
-                .build()
-                .then(stats => {
-                if (!stats)
-                    return callback(new Error("Should generate stats during build"));
+        const next = async (callback) => {
+            const usePromise = typeof callback === "function";
+            try {
+                hotUpdateContext.updateIndex++;
+                const stats = await compiler.build();
+                if (!stats) {
+                    throw new Error("Should generate stats during build");
+                }
                 const jsonStats = stats.toJson({
-                    errorDetails: true
+                // errorDetails: true
                 });
-                hotUpdateContext.totalUpdates = Math.max(hotUpdateContext.totalUpdates, ...changedFiles.values());
-                hotUpdateContext.changedFiles = [...changedFiles.keys()];
-                try {
-                    const checker = this.context.getValue(this.name, jsonStats.errors?.length
-                        ? "hotUpdateStepErrorChecker"
-                        : "hotUpdateStepChecker");
-                    checker(hotUpdateContext, stats, runner.getGlobal("__HMR_UPDATED_RUNTIME__"));
-                    if ((0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error", callback)) {
-                        return;
-                    }
-                    if ((0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning", callback)) {
-                        return;
-                    }
+                const checker = this.context.getValue(this.name, jsonStats.errors?.length
+                    ? "hotUpdateStepErrorChecker"
+                    : "hotUpdateStepChecker");
+                checker(hotUpdateContext, stats, runner.getGlobal("__HMR_UPDATED_RUNTIME__"));
+                await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error");
+                await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning");
+                if (usePromise) {
+                    // old callback style hmr cases
                     callback(null, jsonStats);
                 }
-                catch (e) {
+                else {
+                    // new promise style hmr cases
+                    return jsonStats;
+                }
+            }
+            catch (e) {
+                if (usePromise) {
                     callback(e);
                 }
-            })
-                .catch(callback);
+                else {
+                    throw e;
+                }
+            }
+        };
+        const nextHMR = async (m, options) => {
+            const jsonStats = await next();
+            const updatedModules = await m.hot.check(options || true);
+            if (!updatedModules) {
+                throw new Error("No update available");
+            }
+            return jsonStats;
         };
         const runner = new web_1.WebRunner({
             dom: this.context.getValue(this.name, "documentType") || type_1.EDocumentType.JSDOM,
@@ -62,6 +71,7 @@ class HotStepRunnerFactory extends hot_1.HotRunnerFactory {
                         ? testConfig.moduleScope(ms, stats)
                         : ms;
                     moduleScope.NEXT = next;
+                    moduleScope.NEXT_HMR = nextHMR;
                     return moduleScope;
                 }
             },

package/dist/runner/hot.js

@@ -15,30 +15,44 @@ class HotRunnerFactory extends basic_1.BasicRunnerFactory {
         const source = this.context.getSource();
         const dist = this.context.getDist();
         const hotUpdateContext = this.context.getValue(this.name, "hotUpdateContext");
-        const next = (callback) => {
-            hotUpdateContext.updateIndex++;
-            // TODO: find a better way to collect changed files from fake-update-loader
-            const changedFiles = new Map();
-            global.__CHANGED_FILES__ = changedFiles;
-            compiler
-                .build()
-                .then(stats => {
-                if (!stats)
-                    return callback(new Error("Should generate stats during build"));
+        const next = async (callback) => {
+            const usePromise = typeof callback === "function";
+            try {
+                hotUpdateContext.updateIndex++;
+                const stats = await compiler.build();
+                if (!stats) {
+                    throw new Error("Should generate stats during build");
+                }
                 const jsonStats = stats.toJson({
                 // errorDetails: true
                 });
-                hotUpdateContext.totalUpdates = Math.max(hotUpdateContext.totalUpdates, ...changedFiles.values());
-                hotUpdateContext.changedFiles = [...changedFiles.keys()];
-                if ((0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error", callback)) {
-                    return;
+                await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${hotUpdateContext.updateIndex}`, "Error");
+                await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning");
+                if (usePromise) {
+                    // old callback style hmr cases
+                    callback(null, jsonStats);
+                }
+                else {
+                    // new promise style hmr cases
+                    return jsonStats;
                 }
-                if ((0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${hotUpdateContext.updateIndex}`, "Warning", callback)) {
-                    return;
+            }
+            catch (e) {
+                if (usePromise) {
+                    callback(e);
                 }
-                callback(null, jsonStats);
-            })
-                .catch(callback);
+                else {
+                    throw e;
+                }
+            }
+        };
+        const nextHMR = async (m, options) => {
+            const jsonStats = await next();
+            const updatedModules = await m.hot.check(options || true);
+            if (!updatedModules) {
+                throw new Error("No update available");
+            }
+            return jsonStats;
         };
         return new web_1.WebRunner({
             dom: this.context.getValue(this.name, "documentType") || type_1.EDocumentType.JSDOM,
@@ -53,6 +67,7 @@ class HotRunnerFactory extends basic_1.BasicRunnerFactory {
                         ? testConfig.moduleScope(ms, stats)
                         : ms;
                     moduleScope.NEXT = next;
+                    moduleScope.NEXT_HMR = nextHMR;
                     return moduleScope;
                 }
             },

package/dist/runner/index.d.ts

@@ -6,3 +6,4 @@ export * from "./normal";
 export * from "./runner";
 export * from "./type";
 export * from "./watch";
+export * from "./cache";

package/dist/runner/index.js

@@ -22,3 +22,4 @@ __exportStar(require("./normal"), exports);
 __exportStar(require("./runner"), exports);
 __exportStar(require("./type"), exports);
 __exportStar(require("./watch"), exports);
+__exportStar(require("./cache"), exports);

package/dist/runner/runner/esm.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/test/creator.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicCaseCreator = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const rimraf_1 = __importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const createLazyTestEnv_1 = __importDefault(require("../helper/legacy/createLazyTestEnv"));
 const tester_1 = require("./tester");
 class BasicCaseCreator {
@@ -80,7 +80,7 @@ class BasicCaseCreator {
     }
     clean(folders) {
         for (const f of folders) {
-            rimraf_1.default.sync(f);
+            (0, rimraf_1.rimrafSync)(f);
             node_fs_1.default.mkdirSync(f, { recursive: true });
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "1.1.8",
+  "version": "1.2.0-alpha.0",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -42,15 +42,14 @@
     "deepmerge": "^4.3.1",
     "filenamify": "4.3.0",
     "fs-extra": "^11.2.0",
-    "glob": "^10.3.10",
+    "glob": "^11.0.0",
     "jest-diff": "^29.7.0",
     "jest-snapshot": "29.7.0",
     "jsdom": "^25.0.0",
     "memfs": "4.14.0",
-    "mkdirp": "0.5.6",
     "path-serializer": "0.3.4",
     "pretty-format": "29.7.0",
-    "rimraf": "3.0.2",
+    "rimraf": "^5.0.10",
     "webpack": "^5.94.0",
     "webpack-merge": "5.9.0",
     "webpack-sources": "3.2.3"
@@ -60,8 +59,8 @@
     "@monaco-editor/react": "^4.6.0",
     "@rspack/plugin-preact-refresh": "1.1.0",
     "@rspack/plugin-react-refresh": "1.0.0",
-    "@swc/helpers": "0.5.13",
-    "@swc/plugin-remove-console": "^5.0.0",
+    "@swc/helpers": "0.5.15",
+    "@swc/plugin-remove-console": "^6.0.2",
     "@types/babel__generator": "7.6.8",
     "@types/babel__traverse": "7.20.6",
     "@types/fs-extra": "11.0.4",
@@ -78,7 +77,7 @@
     "coffeescript": "^2.5.1",
     "copy-webpack-plugin": "5.1.2",
     "core-js": "3.38.1",
-    "css-loader": "^6.11.0",
+    "css-loader": "^7.1.2",
     "file-loader": "^6.2.0",
     "html-loader": "^5.0.0",
     "html-webpack-plugin": "^5.5.0",
@@ -99,11 +98,11 @@
     "source-map-loader": "^5.0.0",
     "style-loader": "^4.0.0",
     "terser": "5.36.0",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.2",
     "wast-loader": "^1.12.1",
     "worker-rspack-loader": "^3.1.2",
-    "@rspack/cli": "1.1.8",
-    "@rspack/core": "1.1.8"
+    "@rspack/cli": "1.2.0-alpha.0",
+    "@rspack/core": "1.2.0-alpha.0"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"

package/dist/helper/legacy/fake-update-loader.d.ts

@@ -1,2 +0,0 @@
-declare function _exports(content: any): void;
-export = _exports;

package/dist/helper/legacy/fake-update-loader.js

@@ -1,18 +0,0 @@
-"use strict";
-// @ts-nocheck
-const contentMap = {};
-module.exports = function (content) {
-    // CHANGE:
-    var idx = this.getOptions().updateIndex;
-    var items = content.split(/---+\r?\n/g);
-    var curIdx = items[idx] ? idx : items.length - 1;
-    var oldIdx = contentMap[this.resourcePath];
-    if (curIdx !== oldIdx && global.__CHANGED_FILES__) {
-        global.__CHANGED_FILES__.set(this.resourcePath, items.length);
-    }
-    contentMap[this.resourcePath] = curIdx;
-    if (items.length > 1) {
-        this.cacheable(false);
-    }
-    this.callback(null, items[curIdx]);
-};