@rspack-canary/test-tools 1.6.0-canary-beafb11e-20251019174144 → 1.6.0-canary-0eb13821-20251021173640

package/dist/case/cache.js

@@ -40,6 +40,9 @@ function createCacheProcessor(name, src, temp, target) {
         check: async (env, context) => {
             await (0, common_1.check)(env, context, name);
         },
+        after: async (context) => {
+            await (0, common_1.afterExecute)(context, name);
+        },
         afterAll: async (context) => {
             const updateIndex = updatePlugin.getUpdateIndex();
             const totalUpdates = updatePlugin.getTotalUpdates();

package/dist/case/common.d.ts

@@ -6,5 +6,6 @@ export declare function build<T extends ECompilerType = ECompilerType.Rspack>(co
 export declare function run<T extends ECompilerType = ECompilerType.Rspack>(env: ITestEnv, context: ITestContext, name: string, findBundle: (context: ITestContext, options: TCompilerOptions<T>) => string[] | string | void): Promise<void>;
 export declare function check<T extends ECompilerType = ECompilerType.Rspack>(env: ITestEnv, context: ITestContext, name: string): Promise<void>;
 export declare function checkSnapshot<T extends ECompilerType = ECompilerType.Rspack>(env: ITestEnv, context: ITestContext, name: string, snapshot: string, filter?: (file: string) => boolean): Promise<void>;
+export declare function afterExecute(context: ITestContext, name: string): Promise<void>;
 export declare function findMultiCompilerBundle<T extends ECompilerType = ECompilerType.Rspack>(context: ITestContext, name: string, multiFindBundle: (index: number, context: ITestContext, options: TCompilerOptions<T>) => string[] | string | void): string[];
 export declare function configMultiCompiler<T extends ECompilerType = ECompilerType.Rspack>(context: ITestContext, name: string, configFiles: string[], defaultOptions: (index: number, context: ITestContext) => TCompilerOptions<T>, overrideOptions: (index: number, context: ITestContext, options: TCompilerOptions<T>) => void): void;

package/dist/case/common.js

@@ -10,6 +10,7 @@ exports.build = build;
 exports.run = run;
 exports.check = check;
 exports.checkSnapshot = checkSnapshot;
+exports.afterExecute = afterExecute;
 exports.findMultiCompilerBundle = findMultiCompilerBundle;
 exports.configMultiCompiler = configMultiCompiler;
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -45,9 +46,6 @@ async function run(env, context, name, findBundle) {
     const testConfig = context.getTestConfig();
     if (testConfig.noTests)
         return;
-    if (testConfig.documentType) {
-        context.setValue(name, "documentType", testConfig.documentType);
-    }
     const compiler = getCompiler(context, name);
     if (typeof testConfig.beforeExecute === "function") {
         testConfig.beforeExecute(compiler.getOptions());
@@ -80,13 +78,6 @@ async function run(env, context, name, findBundle) {
     }
     const results = context.getValue(name, "modules") || [];
     await Promise.all(results);
-    if (typeof testConfig.afterExecute === "function") {
-        let options = compiler.getOptions();
-        if (Array.isArray(options) && options.length === 1) {
-            options = options[0];
-        }
-        testConfig.afterExecute(options);
-    }
 }
 async function check(env, context, name) {
     const testConfig = context.getTestConfig();
@@ -175,16 +166,28 @@ async function checkSnapshot(env, context, name, snapshot, filter) {
             if (testConfig.snapshotContent) {
                 content = testConfig.snapshotContent(content);
             }
-            return `\`\`\`${tag} title=${file}\n${content}\n\`\`\``;
+            const filePath = file.replaceAll(path_1.default.sep, "/");
+            return `\`\`\`${tag} title=${filePath}\n${content}\n\`\`\``;
         });
         fileContents.sort();
         const content = fileContents.join("\n\n");
         const snapshotPath = path_1.default.isAbsolute(snapshot)
             ? snapshot
-            : path_1.default.resolve(context.getSource(), `./__snapshots__/${snapshot}${total > 1 ? `-${i}` : ""}`);
+            : path_1.default.resolve(context.getSource(), path_1.default.join("__snapshots__", `${snapshot}${total > 1 ? `-${i}` : ""}`));
         env.expect(content).toMatchFileSnapshot(snapshotPath);
     }
 }
+async function afterExecute(context, name) {
+    const compiler = getCompiler(context, name);
+    const testConfig = context.getTestConfig();
+    if (typeof testConfig.afterExecute === "function") {
+        let options = compiler.getOptions();
+        if (Array.isArray(options) && options.length === 1) {
+            options = options[0];
+        }
+        testConfig.afterExecute(options);
+    }
+}
 function findMultiCompilerBundle(context, name, multiFindBundle) {
     if (typeof multiFindBundle !== "function") {
         return [];

package/dist/case/config.js

@@ -30,6 +30,9 @@ function createConfigProcessor(name) {
         },
         check: async (env, context) => {
             await (0, common_1.check)(env, context, name);
+        },
+        after: async (context) => {
+            await (0, common_1.afterExecute)(context, name);
         }
     };
 }
@@ -115,7 +118,7 @@ function findBundle(index, context, options) {
                 options.output?.cssFilename) ||
                 `bundle${index}.css`);
             if (fs_extra_1.default.existsSync(cssOutputPath)) {
-                bundlePath.push(`./bundle${index}.css`);
+                bundlePath.push(path_1.default.relative(options.output.path, cssOutputPath));
             }
         }
         bundlePath.push(`./bundle${index}${ext}`);

package/dist/case/esm-output.js

@@ -25,7 +25,26 @@ const creator = new creator_1.BasicCaseCreator({
     steps: ({ name }) => [
         {
             config: async (context) => {
-                (0, common_1.configMultiCompiler)(context, name, ["rspack.config.cjs", "rspack.config.js", "webpack.config.js"], defaultOptions, () => { });
+                (0, common_1.configMultiCompiler)(context, name, ["rspack.config.cjs", "rspack.config.js", "webpack.config.js"], defaultOptions, (_index, context, options) => {
+                    const testConfig = context.getTestConfig();
+                    if (testConfig.esmLibPluginOptions) {
+                        let target;
+                        const otherPlugins = options.plugins?.filter(plugin => {
+                            const isTarget = plugin instanceof core_1.default.experiments.EsmLibraryPlugin;
+                            if (isTarget) {
+                                target = plugin;
+                            }
+                            return !isTarget;
+                        });
+                        options.plugins = [
+                            ...otherPlugins,
+                            new core_1.default.experiments.EsmLibraryPlugin({
+                                ...target.options,
+                                ...testConfig.esmLibPluginOptions
+                            })
+                        ];
+                    }
+                });
             },
             compiler: async (context) => {
                 await (0, common_1.compiler)(context, name);
@@ -34,7 +53,11 @@ const creator = new creator_1.BasicCaseCreator({
                 await (0, common_1.build)(context, name);
             },
             run: async (env, context) => {
-                await (0, common_1.run)(env, context, name, (context) => (0, common_1.findMultiCompilerBundle)(context, name, (_index, _context, options) => {
+                await (0, common_1.run)(env, context, name, (context) => (0, common_1.findMultiCompilerBundle)(context, name, (_index, context, options) => {
+                    const testConfig = context.getTestConfig();
+                    if (typeof testConfig.findBundle === "function") {
+                        return testConfig.findBundle(_index, options);
+                    }
                     if (options.output?.filename === "[name].mjs") {
                         return ["main.mjs"];
                     }
@@ -46,6 +69,9 @@ const creator = new creator_1.BasicCaseCreator({
             check: async (env, context) => {
                 await (0, common_1.check)(env, context, name);
                 await (0, common_1.checkSnapshot)(env, context, name, "esm.snap.txt");
+            },
+            after: async (context) => {
+                await (0, common_1.afterExecute)(context, name);
             }
         }
     ],

package/dist/case/hot.d.ts

@@ -1,5 +1,5 @@
 import { HotUpdatePlugin } from "../helper/hot-update/plugin";
-import { type ECompilerType, type ITestContext, type ITestEnv, type ITestProcessor, type ITestRunner, type TCompilerOptions } from "../type";
+import type { ECompilerType, ITestContext, ITestEnv, ITestProcessor, ITestRunner, TCompilerOptions } from "../type";
 type TTarget = TCompilerOptions<ECompilerType.Rspack>["target"];
 export declare function createHotProcessor(name: string, src: string, temp: string, target: TTarget, incremental?: boolean): THotProcessor;
 export declare function createHotCase(name: string, src: string, dist: string, temp: string, target: TCompilerOptions<ECompilerType.Rspack>["target"]): void;

package/dist/case/hot.js

@@ -14,7 +14,6 @@ const checkArrayExpectation_1 = __importDefault(require("../helper/legacy/checkA
 const plugin_2 = require("../plugin");
 const runner_1 = require("../runner");
 const creator_1 = require("../test/creator");
-const type_1 = require("../type");
 const common_1 = require("./common");
 const runner_2 = require("./runner");
 const creators = new Map();
@@ -48,6 +47,9 @@ function createHotProcessor(name, src, temp, target, incremental = false) {
         check: async (env, context) => {
             await (0, common_1.check)(env, context, name);
         },
+        after: async (context) => {
+            await (0, common_1.afterExecute)(context, name);
+        },
         afterAll: async (context) => {
             if (context.getTestConfig().checkSteps === false) {
                 return;
@@ -205,7 +207,6 @@ function createHotRunner(context, name, file, env) {
         name: name,
         runInNewContext: false,
         testConfig: {
-            documentType: testConfig.documentType || type_1.EDocumentType.JSDOM,
             ...testConfig,
             moduleScope(ms, stats, options) {
                 const moduleScope = ms;
@@ -225,7 +226,7 @@ function createHotRunner(context, name, file, env) {
     if (compilerOptions.target === "web" ||
         compilerOptions.target === "webworker") {
         runner = new runner_1.WebRunner({
-            dom: context.getValue(name, "documentType") || type_1.EDocumentType.JSDOM,
+            location: testConfig.location || "https://test.cases/path/index.html",
             ...commonOptions
         });
     }

package/dist/case/incremental.d.ts

@@ -1,4 +1,4 @@
-import { type ECompilerType, type TCompilerOptions } from "../type";
+import type { ECompilerType, TCompilerOptions } from "../type";
 export declare function createHotIncrementalCase(name: string, src: string, dist: string, temp: string, target: TCompilerOptions<ECompilerType.Rspack>["target"], webpackCases: boolean): void;
 export type WatchIncrementalOptions = {
     ignoreNotFriendlyForIncrementalWarnings?: boolean;

package/dist/case/incremental.js

@@ -8,30 +8,11 @@ exports.createWatchIncrementalCase = createWatchIncrementalCase;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const creator_1 = require("../test/creator");
-const type_1 = require("../type");
 const hot_1 = require("./hot");
 const watch_1 = require("./watch");
 const hotCreators = new Map();
 function createHotIncrementalProcessor(name, src, temp, target, webpackCases) {
-    const processor = (0, hot_1.createHotProcessor)(name, src, temp, target, true);
-    const originalBefore = processor.before;
-    processor.before = async (context) => {
-        await originalBefore?.(context);
-        context.setValue(name, "documentType", webpackCases ? type_1.EDocumentType.JSDOM : type_1.EDocumentType.JSDOM);
-    };
-    const originalAfterAll = processor.afterAll;
-    processor.afterAll = async function (context) {
-        try {
-            await originalAfterAll?.(context);
-        }
-        catch (e) {
-            const isFake = context.getValue(name, "documentType") === type_1.EDocumentType.Fake;
-            if (isFake && /Should run all hot steps/.test(e.message))
-                return;
-            throw e;
-        }
-    };
-    return processor;
+    return (0, hot_1.createHotProcessor)(name, src, temp, target, true);
 }
 function getHotCreator(target, webpackCases) {
     const key = JSON.stringify({ target, webpackCases });

package/dist/case/normal.js

@@ -40,6 +40,9 @@ const createCaseOptions = (hot, mode) => {
                 },
                 check: async (env, context) => {
                     await (0, common_1.check)(env, context, name);
+                },
+                after: async (context) => {
+                    await (0, common_1.afterExecute)(context, name);
                 }
             }
         ],

package/dist/case/runner.d.ts

@@ -1,4 +1,4 @@
-import { type ECompilerType, type ITestContext, type ITestEnv, type ITestRunner, type TCompilerStatsCompilation } from "../type";
+import type { ECompilerType, ITestContext, ITestEnv, ITestRunner, TCompilerStatsCompilation } from "../type";
 export type THotStepRuntimeLangData = {
     outdatedModules: string[];
     outdatedDependencies: Record<string, string[]>;

package/dist/case/runner.js

@@ -5,7 +5,6 @@ exports.createRunner = createRunner;
 exports.getMultiCompilerRunnerKey = getMultiCompilerRunnerKey;
 exports.createMultiCompilerRunner = createMultiCompilerRunner;
 const runner_1 = require("../runner");
-const type_1 = require("../type");
 const common_1 = require("./common");
 function cachedStats(context, name) {
     const compiler = context.getCompiler(name);
@@ -25,6 +24,7 @@ function cachedStats(context, name) {
 }
 function createRunner(context, name, file, env) {
     const compiler = (0, common_1.getCompiler)(context, name);
+    const testConfig = context.getTestConfig();
     const compilerOptions = compiler.getOptions();
     const runnerOptions = {
         runInNewContext: false,
@@ -42,7 +42,7 @@ function createRunner(context, name, file, env) {
         return new runner_1.WebRunner({
             ...runnerOptions,
             runInNewContext: true,
-            dom: context.getValue(name, "documentType") || type_1.EDocumentType.JSDOM
+            location: testConfig.location || "https://test.cases/path/index.html"
         });
     }
     return new runner_1.NodeRunner(runnerOptions);
@@ -69,6 +69,7 @@ function getMultiCompilerRunnerKey(context, name, file) {
     return `${name}-${index}[${seq}]`;
 }
 function createMultiCompilerRunner(context, name, file, env) {
+    const testConfig = context.getTestConfig();
     const { getIndex, flagIndex } = getFileIndexHandler(context, name, file);
     const multiCompilerOptions = context.getValue(name, "multiCompilerOptions") || [];
     const [index] = getIndex();
@@ -97,7 +98,7 @@ function createMultiCompilerRunner(context, name, file, env) {
         runner = new runner_1.WebRunner({
             ...runnerOptions,
             runInNewContext: true,
-            dom: context.getValue(name, "documentType") || type_1.EDocumentType.Fake
+            location: testConfig.location || "https://test.cases/path/index.html"
         });
     }
     else {

package/dist/case/watch.d.ts

@@ -1,4 +1,4 @@
-import { type ECompilerType, type ITestContext, type ITestEnv, type ITestRunner } from "../type";
+import type { ECompilerType, ITestContext, ITestEnv, ITestRunner } from "../type";
 export declare function createWatchInitialProcessor(name: string, tempDir: string, step: string, watchState: Record<string, any>, { incremental, nativeWatcher }?: {
     incremental?: boolean | undefined;
     nativeWatcher?: boolean | undefined;
@@ -9,6 +9,7 @@ export declare function createWatchInitialProcessor(name: string, tempDir: strin
     build: (context: ITestContext) => Promise<void>;
     run: (env: ITestEnv, context: ITestContext) => Promise<void>;
     check: <T extends ECompilerType.Rspack>(env: ITestEnv, context: ITestContext) => Promise<void>;
+    after: (context: ITestContext) => Promise<void>;
 };
 export declare function createWatchStepProcessor(name: string, tempDir: string, step: string, watchState: Record<string, any>, { incremental, nativeWatcher }?: {
     incremental?: boolean | undefined;
@@ -20,6 +21,7 @@ export declare function createWatchStepProcessor(name: string, tempDir: string,
     build: (context: ITestContext) => Promise<void>;
     run: (env: ITestEnv, context: ITestContext) => Promise<void>;
     check: <T extends ECompilerType.Rspack>(env: ITestEnv, context: ITestContext) => Promise<void>;
+    after: (context: ITestContext) => Promise<void>;
 };
 export declare function createWatchCase(name: string, src: string, dist: string, temp: string): void;
 export declare function getWatchRunnerKey(context: ITestContext, name: string, file: string): string;

package/dist/case/watch.js

@@ -17,7 +17,6 @@ const checkArrayExpectation_1 = __importDefault(require("../helper/legacy/checkA
 const copyDiff_1 = __importDefault(require("../helper/legacy/copyDiff"));
 const runner_1 = require("../runner");
 const creator_1 = require("../test/creator");
-const type_1 = require("../type");
 const common_1 = require("./common");
 function createWatchInitialProcessor(name, tempDir, step, watchState, { incremental = false, nativeWatcher = false } = {}) {
     const watchContext = {
@@ -158,6 +157,9 @@ function createWatchInitialProcessor(name, tempDir, step, watchState, { incremen
             if (testConfig.writeStatsJson) {
                 node_fs_1.default.renameSync(node_path_1.default.join(context.getDist(), "stats.json"), node_path_1.default.join(context.getDist(), `stats.${watchContext.step}.json`));
             }
+        },
+        after: async (context) => {
+            await (0, common_1.afterExecute)(context, name);
         }
     };
 }
@@ -321,9 +323,7 @@ function createWatchRunner(context, name, file, env) {
         : compilerOptions.target === "web" ||
             compilerOptions.target === "webworker";
     const testConfig = context.getTestConfig();
-    const documentType = context.getValue(name, "documentType") || type_1.EDocumentType.JSDOM;
     return new runner_1.WebRunner({
-        dom: documentType,
         env,
         stats: cachedWatchStats(context, name),
         name: name,
@@ -342,6 +342,7 @@ function createWatchRunner(context, name, file, env) {
         },
         source: context.getSource(),
         dist: context.getDist(),
-        compilerOptions
+        compilerOptions,
+        location: testConfig.location || "https://test.cases/path/index.html"
     });
 }

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

@@ -49,7 +49,7 @@ class HotUpdatePlugin {
             const { content, command } = this.getContent(filePath, this.updateIndex);
             // match command
             if (command === "delete") {
-                await fs_extra_1.default.unlink(filePath);
+                await fs_extra_1.default.remove(filePath);
                 return;
             }
             if (command === "force_write") {

package/dist/helper/legacy/asModule.js

@@ -18,8 +18,6 @@ module.exports = async (something, context, unlinked) => {
     if (unlinked)
         return m;
     await m.link(() => { });
-    if (m.instantiate)
-        m.instantiate();
     await m.evaluate();
     return m;
 };

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

@@ -6,5 +6,6 @@ declare function _exports(globalTimeout?: number, nameSuffix?: string): {
     afterEach(...args: any[]): void;
     expect: jest.Expect;
     jest: typeof jest;
+    rstest: typeof jest;
 };
 export = _exports;

package/dist/helper/legacy/createLazyTestEnv.js

@@ -110,6 +110,8 @@ module.exports = (globalTimeout = 2000, nameSuffix = "") => {
             });
         },
         expect,
-        jest
+        jest,
+        // Compatible with rstest
+        rstest: global.rstest || global.jest
     };
 };

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

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

package/dist/helper/legacy/supportsTextDecoder.js

@@ -0,0 +1,9 @@
+"use strict";
+module.exports = function supportsTextDecoder() {
+    try {
+        return typeof TextDecoder !== "undefined";
+    }
+    catch (_err) {
+        return false;
+    }
+};

package/dist/helper/setup-env.js

@@ -6,6 +6,21 @@ const path = require("node:path");
 if (process.env.RSPACK_BINDING_BUILDER_TESTING) {
     process.env.RSPACK_BINDING = path.resolve(__dirname, "../../node_modules/@rspack/binding-testing");
 }
+if (process.env.RSTEST) {
+    global.printLogger ??= process.env.printLogger === "true";
+    global.__TEST_FIXTURES_PATH__ ??= process.env.__TEST_FIXTURES_PATH__;
+    global.updateSnapshot ??= process.env.updateSnapshot === "true";
+    global.testFilter ??= process.env.testFilter;
+    global.__TEST_PATH__ ??= process.env.__TEST_PATH__;
+    global.__TEST_DIST_PATH__ ??= process.env.__TEST_DIST_PATH__;
+    global.__ROOT_PATH__ ??= process.env.__ROOT_PATH__;
+    global.__RSPACK_PATH__ ??= process.env.__RSPACK_PATH__;
+    global.__RSPACK_TEST_TOOLS_PATH__ ??= process.env.__RSPACK_TEST_TOOLS_PATH__;
+}
+else {
+    // Compatible with wasm tests (lazyTestEnv)
+    global.rstest = jest;
+}
 if (process.env.ALTERNATIVE_SORT) {
     const oldSort = Array.prototype.sort;
     Array.prototype.sort = function (cmp) {

package/dist/runner/node/index.js

@@ -308,7 +308,7 @@ class NodeRunner {
             };
             this.requireCache[file.path] = m;
             if (!this._options.runInNewContext) {
-                file.content = `Object.assign(global, _globalAssign);\n ${file.content}`;
+                file.content = `Object.assign(global, _globalAssign);${file.content}`;
             }
             const currentModuleScope = this.createModuleScope(this.getRequire(), m, file);
             if (this._options.testConfig.moduleScope) {
@@ -357,6 +357,12 @@ class NodeRunner {
             if (file.content.includes("__STATS__")) {
                 esmContext.__STATS__ = this._options.stats?.();
             }
+            if (file.content.includes("__STATS_I__")) {
+                const statsIndex = this._options.stats?.()?.__index__;
+                if (typeof statsIndex === "number") {
+                    esmContext.__STATS_I__ = statsIndex;
+                }
+            }
             let esm = esmCache.get(file.path);
             if (!esm) {
                 esm = new node_vm_1.SourceTextModule(file.content, {
@@ -390,8 +396,6 @@ class NodeRunner {
                         }), referencingModule.context, true);
                     });
                 }
-                if (esm.instantiate)
-                    esm.instantiate();
                 await esm.evaluate();
                 if (context.esmMode === type_1.EEsmMode.Evaluated) {
                     return esm;

package/dist/runner/web/index.d.ts

@@ -1,14 +1,27 @@
-import { type ECompilerType, EDocumentType, type ITestRunner } from "../../type";
-import type { INodeRunnerOptions, NodeRunner } from "../node";
+import type { ECompilerType, TRunnerFile, TRunnerRequirer } from "../../type";
+import { type INodeRunnerOptions, NodeRunner } from "../node";
 export interface IWebRunnerOptions<T extends ECompilerType = ECompilerType.Rspack> extends INodeRunnerOptions<T> {
-    dom: EDocumentType;
+    location: string;
 }
-export declare class WebRunner<T extends ECompilerType = ECompilerType.Rspack> implements ITestRunner {
+export declare class WebRunner<T extends ECompilerType = ECompilerType.Rspack> extends NodeRunner<T> {
     protected _webOptions: IWebRunnerOptions<T>;
-    protected originMethods: Partial<NodeRunner<T>>;
-    private implement;
+    private dom;
     constructor(_webOptions: IWebRunnerOptions<T>);
     run(file: string): Promise<unknown>;
-    getRequire(): import("../../type").TRunnerRequirer;
     getGlobal(name: string): unknown;
+    protected createResourceLoader(): {
+        fetch(url: string, _: {
+            element: HTMLScriptElement;
+        }): any;
+    };
+    private urlToPath;
+    protected createBaseModuleScope(): import("../../type").IModuleScope;
+    protected getModuleContent(file: TRunnerFile): [
+        {
+            exports: Record<string, unknown>;
+        },
+        string
+    ];
+    protected createJSDOMRequirer(): TRunnerRequirer;
+    protected createRunner(): void;
 }