@rspack-canary/test-tools 1.6.0-canary-e3199f44-20251020173943 → 1.6.0-canary-0eb13821-20251021173640

package/dist/case/common.js

@@ -166,13 +166,14 @@ 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);
     }
 }

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"];
                     }

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/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) {
@@ -396,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.js

@@ -7,11 +7,13 @@ exports.WebRunner = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_url_1 = require("node:url");
+const node_vm_1 = require("node:vm");
 const jsdom_1 = require("jsdom");
 const helper_1 = require("../../helper");
 const EventSourceForNode_1 = __importDefault(require("../../helper/legacy/EventSourceForNode"));
 const urlToRelativePath_1 = __importDefault(require("../../helper/legacy/urlToRelativePath"));
 const node_1 = require("../node");
+const EVAL_LOCATION_REGEX = /<anonymous>:(\d+)/;
 // Compatibility code to suppress iconv-lite warnings
 require("iconv-lite").skipDecodeWarning = true;
 const FAKE_HOSTS = [
@@ -193,6 +195,39 @@ class WebRunner extends node_1.NodeRunner {
                 currentModuleScope.__STATS_I__ = statsIndex;
             }
         }
+        const createLocatedError = (e, file) => {
+            const match = (e.stack || e.message).match(EVAL_LOCATION_REGEX);
+            if (match) {
+                const [, line] = match;
+                const realLine = Number(line) - 34;
+                const codeLines = file.content.split("\n");
+                const lineContents = [
+                    ...codeLines
+                        .slice(Math.max(0, realLine - 3), Math.max(0, realLine - 1))
+                        .map(line => `│  ${line}`),
+                    `│> ${codeLines[realLine - 1]}`,
+                    ...codeLines.slice(realLine, realLine + 2).map(line => `│  ${line}`)
+                ];
+                const message = `Error in JSDOM when running file '${file.path}' at line ${realLine}: ${e.message}\n${lineContents.join("\n")}`;
+                const finalError = new Error(message);
+                finalError.stack = undefined;
+                return finalError;
+            }
+            else {
+                return e;
+            }
+        };
+        const originIt = currentModuleScope.it;
+        currentModuleScope.it = (description, fn) => {
+            originIt(description, async () => {
+                try {
+                    await fn();
+                }
+                catch (err) {
+                    throw createLocatedError(err, file);
+                }
+            });
+        };
         const scopeKey = (0, helper_1.escapeSep)(file.path);
         const args = Object.keys(currentModuleScope).filter(arg => !["window", "self", "globalThis", "console"].includes(arg));
         const argValues = args
@@ -200,10 +235,11 @@ class WebRunner extends node_1.NodeRunner {
             .join(", ");
         this.dom.window[scopeKey] = currentModuleScope;
         this.dom.window["__GLOBAL_SHARED__"] = this.globalContext;
+        this.dom.window["__FILE__"] = file;
+        this.dom.window["__CREATE_LOCATED_ERROR__"] = createLocatedError;
         return [
             m,
-            `
-			// hijack document.currentScript for auto public path
+            `// hijack document.currentScript for auto public path
 			var $$g$$ = new Proxy(window, {
 				get(target, prop, receiver) {
 					if (prop === "document") {
@@ -236,9 +272,12 @@ class WebRunner extends node_1.NodeRunner {
 				}
 			});
 			(function(window, self, globalThis, console, ${args.join(", ")}) {
-				${file.content}
-			})($$g$$, $$self$$, $$g$$, window["console"], ${argValues});
-		`
+				try {
+				  ${file.content}
+				} catch (err) {
+					throw __CREATE_LOCATED_ERROR__(err, __FILE__);
+				}
+			})($$g$$, $$self$$, $$g$$, window["console"], ${argValues});`
         ];
     }
     createJSDOMRequirer() {
@@ -252,7 +291,9 @@ class WebRunner extends node_1.NodeRunner {
             }
             const [m, code] = this.getModuleContent(file);
             this.preExecute(code, file);
-            this.dom.window.eval(code);
+            const script = new node_vm_1.Script(code);
+            const vmContext = this.dom.getInternalVMContext();
+            script.runInContext(vmContext);
             this.postExecute(m, file);
             this.requireCache[file.path] = m;
             return m.exports;

package/dist/test/creator.js

@@ -217,8 +217,11 @@ class BasicCaseCreator {
                     try {
                         await runFn(fn);
                     }
-                    catch (e) {
-                        throw new Error(`Error: ${description} failed\n${e.stack}`);
+                    catch (err) {
+                        const e = err;
+                        const message = `Error: ${description} failed:\n${e.message}`;
+                        e.message = message;
+                        throw e;
                     }
                     for (const after of afterTasks) {
                         await runFn(after);

package/dist/type.d.ts

@@ -149,6 +149,9 @@ export type TTestConfig<T extends ECompilerType> = {
     snapshotContent?(content: string): string;
     checkSteps?: boolean;
     ignoreNotFriendlyForIncrementalWarnings?: boolean;
+    esmLibPluginOptions?: {
+        preserveModules?: string;
+    };
 };
 export type TTestFilter<T extends ECompilerType> = (creatorConfig: Record<string, unknown>, testConfig: TTestConfig<T>) => boolean | string;
 export interface ITestRunner {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-canary/test-tools",
-  "version": "1.6.0-canary-e3199f44-20251020173943",
+  "version": "1.6.0-canary-0eb13821-20251021173640",
   "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-e3199f44-20251020173943"
+    "@rspack/core": "npm:@rspack-canary/core@1.6.0-canary-0eb13821-20251021173640"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"