@rspack-canary/test-tools 1.6.0-canary-2ccce257-20251016173648 → 1.6.0-canary-beafb11e-20251017173713

package/dist/case/cache.d.ts

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

package/dist/case/cache.js

@@ -11,7 +11,6 @@ const hot_update_1 = require("../helper/hot-update");
 const checkArrayExpectation_1 = __importDefault(require("../helper/legacy/checkArrayExpectation"));
 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 MAX_COMPILER_INDEX = 100;
@@ -161,8 +160,7 @@ function createRunner(context, name, file, env) {
     const dist = context.getDist();
     const updatePlugin = context.getValue(name, "hotUpdateContext");
     const getWebRunner = () => {
-        return new runner_1.WebRunner({
-            dom: context.getValue(name, "documentType") || type_1.EDocumentType.JSDOM,
+        return new runner_1.NodeRunner({
             env,
             stats: (0, runner_2.cachedStats)(context, name),
             cachable: false,

package/dist/case/common.js

@@ -26,7 +26,7 @@ async function config(context, name, configFiles, defaultOptions = {}) {
     const compiler = getCompiler(context, name);
     compiler.setOptions(defaultOptions);
     if (Array.isArray(configFiles)) {
-        const fileOptions = (0, helper_1.readConfigFile)(configFiles.map(i => context.getSource(i)))[0];
+        const fileOptions = (0, helper_1.readConfigFile)(configFiles.map(i => context.getSource(i)), context, defaultOptions)[0];
         compiler.mergeOptions(fileOptions);
     }
     return compiler.getOptions();
@@ -215,7 +215,7 @@ function findMultiCompilerBundle(context, name, multiFindBundle) {
 function configMultiCompiler(context, name, configFiles, defaultOptions, overrideOptions) {
     const multiCompilerOptions = [];
     const caseOptions = Array.isArray(configFiles)
-        ? (0, helper_1.readConfigFile)(configFiles.map(i => context.getSource(i)), configs => {
+        ? (0, helper_1.readConfigFile)(configFiles.map(i => context.getSource(i)), context, {}, configs => {
             return configs.flatMap(c => {
                 if (typeof c === "function") {
                     const options = {

package/dist/case/diagnostic.js

@@ -19,7 +19,7 @@ const creator = new creator_1.BasicCaseCreator({
             config: async (context) => {
                 const compiler = (0, common_1.getCompiler)(context, name);
                 let options = defaultOptions(context);
-                const custom = (0, helper_1.readConfigFile)(["rspack.config.js", "webpack.config.js"].map(i => context.getSource(i)))[0];
+                const custom = (0, helper_1.readConfigFile)(["rspack.config.js", "webpack.config.js"].map(i => context.getSource(i)), context, options)[0];
                 if (custom) {
                     options = (0, webpack_merge_1.default)(options, custom);
                 }

package/dist/case/hot-step.js

@@ -24,9 +24,6 @@ const SELF_HANDLER = (file, options) => {
     global.self[hotUpdateGlobalKey] = hotUpdateGlobal;
     require(file);
     delete global.self[hotUpdateGlobalKey];
-    if (!Object.keys(global.self).length) {
-        delete global.self;
-    }
     return res;
 };
 const NODE_HANDLER = (file) => {

package/dist/case/hot.js

@@ -175,67 +175,43 @@ function createHotRunner(context, name, file, env) {
     const source = context.getSource();
     const dist = context.getDist();
     const updatePlugin = context.getValue(name, "hotUpdatePlugin");
-    const next = async (callback) => {
-        const usePromise = typeof callback === "function";
-        try {
-            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 checker = context.getValue(name, jsonStats.errors?.length
-                ? "hotUpdateStepErrorChecker"
-                : "hotUpdateStepChecker");
-            if (checker) {
-                checker(updatePlugin.getUpdateIndex(), stats, runner.getGlobal("__HMR_UPDATED_RUNTIME__"));
-            }
-            await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${updatePlugin.getUpdateIndex()}`, "Error", compilerOptions);
-            await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updatePlugin.getUpdateIndex()}`, "Warning", compilerOptions);
-            if (usePromise) {
-                // old callback style hmr cases
-                callback(null, jsonStats);
-            }
-            else {
-                // new promise style hmr cases
-                return jsonStats;
-            }
+    const nextHMR = async (m, options) => {
+        await updatePlugin.goNext();
+        const stats = await compiler.build();
+        if (!stats) {
+            throw new Error("Should generate stats during build");
         }
-        catch (e) {
-            if (usePromise) {
-                callback(e);
-            }
-            else {
-                throw e;
-            }
+        const jsonStats = stats.toJson({
+        // errorDetails: true
+        });
+        const compilerOptions = compiler.getOptions();
+        const checker = context.getValue(name, jsonStats.errors?.length
+            ? "hotUpdateStepErrorChecker"
+            : "hotUpdateStepChecker");
+        if (checker) {
+            checker(updatePlugin.getUpdateIndex(), stats, runner.getGlobal("__HMR_UPDATED_RUNTIME__"));
         }
-    };
-    const nextHMR = async (m, options) => {
-        const jsonStats = await next();
+        await (0, checkArrayExpectation_1.default)(source, jsonStats, "error", `errors${updatePlugin.getUpdateIndex()}`, "Error", compilerOptions);
+        await (0, checkArrayExpectation_1.default)(source, jsonStats, "warning", `warnings${updatePlugin.getUpdateIndex()}`, "Warning", compilerOptions);
         const updatedModules = await m.hot.check(options || true);
         if (!updatedModules) {
             throw new Error("No update available");
         }
         return jsonStats;
     };
-    const runner = new runner_1.WebRunner({
-        dom: context.getValue(name, "documentType") || type_1.EDocumentType.JSDOM,
+    const commonOptions = {
         env,
         stats: (0, runner_2.cachedStats)(context, name),
         name: name,
         runInNewContext: false,
         testConfig: {
-            documentType: testConfig.documentType || type_1.EDocumentType.Fake,
+            documentType: testConfig.documentType || type_1.EDocumentType.JSDOM,
             ...testConfig,
             moduleScope(ms, stats, options) {
                 const moduleScope = ms;
                 if (typeof testConfig.moduleScope === "function") {
                     testConfig.moduleScope(moduleScope, stats, compilerOptions);
                 }
-                moduleScope.NEXT = next;
                 moduleScope.NEXT_HMR = nextHMR;
                 return moduleScope;
             }
@@ -244,6 +220,17 @@ function createHotRunner(context, name, file, env) {
         source,
         dist,
         compilerOptions
-    });
+    };
+    let runner;
+    if (compilerOptions.target === "web" ||
+        compilerOptions.target === "webworker") {
+        runner = new runner_1.WebRunner({
+            dom: context.getValue(name, "documentType") || type_1.EDocumentType.JSDOM,
+            ...commonOptions
+        });
+    }
+    else {
+        runner = new runner_1.NodeRunner(commonOptions);
+    }
     return runner;
 }

package/dist/case/incremental.js

@@ -17,7 +17,7 @@ function createHotIncrementalProcessor(name, src, temp, target, webpackCases) {
     const originalBefore = processor.before;
     processor.before = async (context) => {
         await originalBefore?.(context);
-        context.setValue(name, "documentType", webpackCases ? type_1.EDocumentType.Fake : type_1.EDocumentType.JSDOM);
+        context.setValue(name, "documentType", webpackCases ? type_1.EDocumentType.JSDOM : type_1.EDocumentType.JSDOM);
     };
     const originalAfterAll = processor.afterAll;
     processor.afterAll = async function (context) {

package/dist/case/runner.js

@@ -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.Fake
+            dom: context.getValue(name, "documentType") || type_1.EDocumentType.JSDOM
         });
     }
     return new runner_1.NodeRunner(runnerOptions);

package/dist/case/watch.js

@@ -35,7 +35,7 @@ function createWatchInitialProcessor(name, tempDir, step, watchState, { incremen
         config: async (context) => {
             const testConfig = context.getTestConfig();
             const multiCompilerOptions = [];
-            const caseOptions = (0, helper_1.readConfigFile)(["rspack.config.js", "webpack.config.js"].map(i => context.getSource(i)));
+            const caseOptions = (0, helper_1.readConfigFile)(["rspack.config.js", "webpack.config.js"].map(i => context.getSource(i)), context, {});
             for (const [index, options] of caseOptions.entries()) {
                 const compilerOptions = (0, webpack_merge_1.default)(defaultOptions({
                     incremental,
@@ -321,7 +321,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.Fake;
+    const documentType = context.getValue(name, "documentType") || type_1.EDocumentType.JSDOM;
     return new runner_1.WebRunner({
         dom: documentType,
         env,

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[], functionApply?: (config: (TCompilerOptions<T> | ((...args: unknown[]) => TCompilerOptions<T>))[]) => TCompilerOptions<T>[]): TCompilerOptions<T>[];
+import type { ECompilerType, ITestContext, TCompilerOptions } from "../type";
+export declare function readConfigFile<T extends ECompilerType>(files: string[], context: ITestContext, prevOption?: TCompilerOptions<T>, functionApply?: (config: (TCompilerOptions<T> | ((...args: unknown[]) => TCompilerOptions<T>))[]) => TCompilerOptions<T>[]): TCompilerOptions<T>[];

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

@@ -5,9 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readConfigFile = readConfigFile;
 const fs_extra_1 = __importDefault(require("fs-extra"));
-function readConfigFile(files, functionApply) {
+function readConfigFile(files, context, prevOption, functionApply) {
     const existsFile = files.find(i => fs_extra_1.default.existsSync(i));
-    const fileConfig = existsFile ? require(existsFile) : {};
+    let fileConfig = existsFile ? require(existsFile) : {};
+    if (typeof fileConfig === "function") {
+        fileConfig = fileConfig({ config: prevOption }, { testPath: context.getDist(), tempPath: context.getTemp() });
+    }
     const configArr = Array.isArray(fileConfig) ? fileConfig : [fileConfig];
     return functionApply ? functionApply(configArr) : configArr;
 }

package/dist/runner/node/index.js

@@ -164,6 +164,7 @@ class NodeRunner {
             Symbol,
             Buffer,
             setImmediate,
+            self: this.globalContext,
             __MODE__: this._options.compilerOptions.mode,
             __SNAPSHOT__: node_path_1.default.join(this._options.source, "__snapshot__"),
             Worker: (0, createFakeWorker_1.default)(this._options.env, {

package/dist/runner/web/fake.js

@@ -123,7 +123,6 @@ class FakeDocumentWebRunner extends node_1.NodeRunner {
     createBaseModuleScope() {
         const moduleScope = super.createBaseModuleScope();
         moduleScope.window = this.globalContext;
-        moduleScope.self = this.globalContext;
         moduleScope.globalThis = this.globalContext;
         moduleScope.document = this.globalContext.document;
         moduleScope.getComputedStyle = this.globalContext.getComputedStyle.bind(this.globalContext);

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

@@ -11,9 +11,9 @@ export declare class JSDOMWebRunner<T extends ECompilerType = ECompilerType.Rspa
             element: HTMLScriptElement;
         }): any;
     };
+    private urlToPath;
     protected createBaseModuleScope(): import("../../type").IModuleScope;
     protected getModuleContent(file: TRunnerFile): [
-        Record<string, unknown>,
         {
             exports: Record<string, unknown>;
         },

package/dist/runner/web/jsdom.js

@@ -17,8 +17,10 @@ class JSDOMWebRunner extends node_1.NodeRunner {
     constructor(_webOptions) {
         super(_webOptions);
         this._webOptions = _webOptions;
-        const virtualConsole = new jsdom_1.VirtualConsole();
-        virtualConsole.sendTo(console);
+        const virtualConsole = new jsdom_1.VirtualConsole({});
+        virtualConsole.sendTo(console, {
+            omitJSDOMErrors: true
+        });
         this.dom = new jsdom_1.JSDOM(`
       <!doctype html>
       <html>
@@ -67,18 +69,13 @@ class JSDOMWebRunner extends node_1.NodeRunner {
         return super.run(file);
     }
     getGlobal(name) {
-        return this.dom.window[name];
+        return this.globalContext[name];
     }
     createResourceLoader() {
-        const urlToPath = (url) => {
-            return node_path_1.default
-                .resolve(this._webOptions.dist, `./${url.startsWith("https://test.cases/path/") ? url.slice(24) : url}`)
-                .split("?")[0];
-        };
         const that = this;
         class CustomResourceLoader extends jsdom_1.ResourceLoader {
             fetch(url, _) {
-                const filePath = urlToPath(url);
+                const filePath = that.urlToPath(url);
                 let finalCode;
                 if (node_path_1.default.extname(filePath) === ".js") {
                     const currentDirectory = node_path_1.default.dirname(filePath);
@@ -86,13 +83,15 @@ class JSDOMWebRunner extends node_1.NodeRunner {
                     if (!file) {
                         throw new Error(`File not found: ${filePath}`);
                     }
-                    const [_scope, _m, code] = that.getModuleContent(file);
+                    const [_m, code] = that.getModuleContent(file);
                     finalCode = code;
                 }
                 else {
                     finalCode = node_fs_1.default.readFileSync(filePath);
                 }
                 try {
+                    that.dom.window["__LINK_SHEET__"] ??= {};
+                    that.dom.window["__LINK_SHEET__"][url] = finalCode.toString();
                     return Promise.resolve(finalCode);
                 }
                 catch (err) {
@@ -106,15 +105,17 @@ class JSDOMWebRunner extends node_1.NodeRunner {
         }
         return new CustomResourceLoader();
     }
+    urlToPath(url) {
+        return node_path_1.default
+            .resolve(this._webOptions.dist, `./${url.startsWith("https://test.cases/path/") ? url.slice(24) : url.startsWith("https://example.com/public/path/") ? url.slice(32) : url}`)
+            .split("?")[0];
+    }
     createBaseModuleScope() {
         const moduleScope = super.createBaseModuleScope();
         moduleScope.EventSource = EventSourceForNode_1.default;
-        const urlToPath = (url) => {
-            return node_path_1.default.resolve(this._webOptions.dist, `./${url.startsWith("https://test.cases/path/") ? url.slice(24) : url}`);
-        };
         moduleScope.fetch = async (url) => {
             try {
-                const buffer = await new Promise((resolve, reject) => node_fs_1.default.readFile(urlToPath(url), (err, b) => err ? reject(err) : resolve(b)));
+                const buffer = await new Promise((resolve, reject) => node_fs_1.default.readFile(this.urlToPath(url), (err, b) => err ? reject(err) : resolve(b)));
                 return {
                     status: 200,
                     ok: true,
@@ -136,8 +137,8 @@ class JSDOMWebRunner extends node_1.NodeRunner {
             this._options.env.expect(url).toMatch(/^https:\/\/test\.cases\/path\//);
             this.requirers.get("entry")(this._options.dist, (0, urlToRelativePath_1.default)(url));
         };
-        moduleScope.getComputedStyle = function () {
-            const computedStyle = this.dom.window.getComputedStyle(this.dom.window);
+        moduleScope.getComputedStyle = (element) => {
+            const computedStyle = this.dom.window.getComputedStyle(element);
             const getPropertyValue = computedStyle.getPropertyValue.bind(computedStyle);
             return {
                 ...computedStyle,
@@ -146,6 +147,8 @@ class JSDOMWebRunner extends node_1.NodeRunner {
                 }
             };
         };
+        moduleScope.window = this.dom.window;
+        moduleScope.document = this.dom.window.document;
         return moduleScope;
     }
     getModuleContent(file) {
@@ -156,14 +159,23 @@ class JSDOMWebRunner extends node_1.NodeRunner {
         if (this._options.testConfig.moduleScope) {
             this._options.testConfig.moduleScope(currentModuleScope, this._options.stats, this._options.compilerOptions);
         }
+        if (file.content.includes("__STATS__")) {
+            currentModuleScope.__STATS__ = this._options.stats?.();
+        }
+        if (file.content.includes("__STATS_I__")) {
+            const statsIndex = this._options.stats?.()?.__index__;
+            if (typeof statsIndex === "number") {
+                currentModuleScope.__STATS_I__ = statsIndex;
+            }
+        }
         const scopeKey = (0, helper_1.escapeSep)(file.path);
         const args = Object.keys(currentModuleScope).filter(arg => !["window", "self", "globalThis", "console"].includes(arg));
         const argValues = args
             .map(arg => `window["${scopeKey}"]["${arg}"]`)
             .join(", ");
         this.dom.window[scopeKey] = currentModuleScope;
+        this.dom.window["__GLOBAL_SHARED__"] = this.globalContext;
         return [
-            this.dom.window[scopeKey],
             m,
             `
 			// hijack document.currentScript for auto public path
@@ -182,11 +194,25 @@ class JSDOMWebRunner extends node_1.NodeRunner {
 						});
 					}
 					return Reflect.get(target, prop, receiver);
+				},
+			});
+			var $$self$$ = new Proxy(window, {
+				get(target, prop, receiver) {
+				  if (prop === "__HMR_UPDATED_RUNTIME__") {
+					  return window["__GLOBAL_SHARED__"]["__HMR_UPDATED_RUNTIME__"];
+					}
+					return Reflect.get(target, prop, receiver);
+				},
+				set(target, prop, value, receiver) {
+					if (prop === "__HMR_UPDATED_RUNTIME__") {
+						window["__GLOBAL_SHARED__"]["__HMR_UPDATED_RUNTIME__"] = value;
+					}
+					return Reflect.set(target, prop, value, receiver);
 				}
 			});
 			(function(window, self, globalThis, console, ${args.join(", ")}) {
 				${file.content}
-			})($$g$$, $$g$$, $$g$$, window["console"], ${argValues});
+			})($$g$$, $$self$$, $$g$$, window["console"], ${argValues});
 		`
         ];
     }
@@ -199,16 +225,7 @@ class JSDOMWebRunner extends node_1.NodeRunner {
             if (file.path in this.requireCache) {
                 return this.requireCache[file.path].exports;
             }
-            const [scope, m, code] = this.getModuleContent(file);
-            if (code.includes("__STATS__")) {
-                scope.__STATS__ = this._options.stats?.();
-            }
-            if (code.includes("__STATS_I__")) {
-                const statsIndex = this._options.stats?.()?.__index__;
-                if (typeof statsIndex === "number") {
-                    scope.__STATS_I__ = statsIndex;
-                }
-            }
+            const [m, code] = this.getModuleContent(file);
             this.preExecute(code, file);
             this.dom.window.eval(code);
             this.postExecute(m, file);

package/dist/test/tester.js

@@ -73,7 +73,12 @@ class Tester {
                 await i.afterAll(this.context);
             }
         }
-        await this.context.closeCompiler(this.config.name);
+        try {
+            await this.context.closeCompiler(this.config.name);
+        }
+        catch (e) {
+            console.warn(`Error occured while closing compilers of '${this.config.name}':\n${e.stack}`);
+        }
     }
     async runStepMethods(step, methods, force = false) {
         for (const i of methods) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-canary/test-tools",
-  "version": "1.6.0-canary-2ccce257-20251016173648",
+  "version": "1.6.0-canary-beafb11e-20251017173713",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -72,7 +72,7 @@
     "terser": "5.43.1",
     "typescript": "^5.9.3",
     "wast-loader": "^1.14.1",
-    "@rspack/core": "npm:@rspack-canary/core@1.6.0-canary-2ccce257-20251016173648"
+    "@rspack/core": "npm:@rspack-canary/core@1.6.0-canary-beafb11e-20251017173713"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"

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

@@ -1,2 +0,0 @@
-declare function _exports(done: any, options: any, callback: any): (err: any, stats: any) => any;
-export = _exports;

package/dist/helper/legacy/update.esm.d.ts

@@ -1 +0,0 @@
-export default function update(done: any, options: any, callback: any): (err: any, stats: any) => any;

package/dist/helper/legacy/update.esm.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-// @ts-nocheck
-function update(done, options, callback) {
-    return function (err, stats) {
-        if (err)
-            return done(err);
-        import.meta.webpackHot
-            .check(options || true)
-            .then(updatedModules => {
-            if (!updatedModules) {
-                return done(new Error("No update available"));
-            }
-            if (callback)
-                callback(stats);
-        })
-            .catch(err => {
-            done(err);
-        });
-    };
-}
-;

package/dist/helper/legacy/update.js

@@ -1,19 +0,0 @@
-"use strict";
-// @ts-nocheck
-module.exports = function (done, options, callback) {
-    return function (err, stats) {
-        if (err)
-            return done(err);
-        module.hot
-            .check(options || true)
-            .then(updatedModules => {
-            if (!updatedModules)
-                return done(new Error("No update available"));
-            if (callback)
-                callback(stats);
-        })
-            .catch(err => {
-            done(err);
-        });
-    };
-};