@rspack/test-tools 1.4.10 → 1.5.0-beta.0

package/dist/case/builtin.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBuiltinCase = createBuiltinCase;
 const node_path_1 = __importDefault(require("node:path"));
+const helper_1 = require("../helper");
 const processor_1 = require("../processor");
 const creator_1 = require("../test/creator");
 const type_1 = require("../type");
 const FILTERS = {
     "plugin-css": (file) => file.endsWith(".css"),
-    "plugin-css-modules": (file) => file.endsWith(".css") ||
-        (file.endsWith(".js") && !file.includes("runtime")),
+    "plugin-css-modules": (file) => file.endsWith(".css") || ((0, helper_1.isJavaScript)(file) && !file.includes("runtime")),
     "plugin-html": (file) => file.endsWith(".html")
 };
 const creator = new creator_1.BasicCaseCreator({

package/dist/case/index.d.ts

@@ -11,7 +11,7 @@ export * from "./hook";
 export * from "./hot";
 export * from "./hot-step";
 export * from "./incremental";
-export * from "./nativeWatcher";
+export * from "./native-watcher";
 export * from "./normal";
 export * from "./serial";
 export * from "./stats-api";

package/dist/case/index.js

@@ -27,7 +27,7 @@ __exportStar(require("./hook"), exports);
 __exportStar(require("./hot"), exports);
 __exportStar(require("./hot-step"), exports);
 __exportStar(require("./incremental"), exports);
-__exportStar(require("./nativeWatcher"), exports);
+__exportStar(require("./native-watcher"), exports);
 __exportStar(require("./normal"), exports);
 __exportStar(require("./serial"), exports);
 __exportStar(require("./stats-api"), exports);

package/dist/case/{nativeWatcher.js → native-watcher.js}

@@ -44,11 +44,11 @@ const creator = new creator_1.BasicCaseCreator({
                 tempDir: temp,
                 runable: true,
                 compilerType: type_1.ECompilerType.Rspack,
-                configFiles: ["rspack.config.js", "webpack.config.js"]
+                configFiles: ["rspack.config.js", "webpack.config.js"],
+                nativeWatcher: true
             }, watchState));
     },
-    // TODO: support more concurrency
-    concurrent: 4
+    concurrent: true
 });
 function createNativeWatcher(name, src, dist, temp) {
     creator.create(name, src, dist, temp);

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

@@ -60,7 +60,7 @@ class HotUpdatePlugin {
             }
             // default
             const { content: oldContent } = this.getContent(filePath, this.updateIndex - 1);
-            if (content === oldContent) {
+            if (this.updateIndex !== 0 && content === oldContent) {
                 return;
             }
             await promises_1.default.writeFile(filePath, content);

package/dist/helper/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./directory";
+export * from "./is";
 export * from "./legacy/supportsImportFn";
 export * from "./parse-modules";
 export * from "./read-config-file";

package/dist/helper/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./directory"), exports);
+__exportStar(require("./is"), exports);
 __exportStar(require("./legacy/supportsImportFn"), exports);
 __exportStar(require("./parse-modules"), exports);
 __exportStar(require("./read-config-file"), exports);

package/dist/helper/is.d.ts

@@ -0,0 +1,2 @@
+export declare function isJavaScript(filePath: string): boolean;
+export declare function isCss(filePath: string): boolean;

package/dist/helper/is.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isJavaScript = isJavaScript;
+exports.isCss = isCss;
+const node_path_1 = __importDefault(require("node:path"));
+function isJavaScript(filePath) {
+    const ext = node_path_1.default.extname(filePath).toLowerCase();
+    return ext === ".js" || ext === ".mjs";
+}
+function isCss(filePath) {
+    return node_path_1.default.extname(filePath).toLowerCase() === ".css";
+}

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

@@ -5,7 +5,7 @@ declare function _exports(env: any, { outputDirectory }: {
         url: any;
         worker: import("worker_threads").Worker;
         _onmessage: ((data: any) => void) | undefined;
-        onmessage: any;
+        set onmessage(value: any);
         postMessage(data: any): void;
         terminate(): Promise<number>;
     };

package/dist/processor/cache.js

@@ -6,6 +6,7 @@ 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 helper_1 = require("../helper");
 const hot_update_1 = require("../helper/hot-update");
 const type_1 = require("../type");
 const basic_1 = require("./basic");
@@ -46,7 +47,7 @@ class CacheProcessor extends basic_1.BasicProcessor {
         if (this._cacheOptions.target === "web" ||
             this._cacheOptions.target === "webworker") {
             for (const file of info.entrypoints.main.assets) {
-                if (file.name.endsWith(".js")) {
+                if ((0, helper_1.isJavaScript)(file.name)) {
                     files.push(file.name);
                 }
                 else {
@@ -55,7 +56,7 @@ class CacheProcessor extends basic_1.BasicProcessor {
             }
         }
         else {
-            const assets = info.entrypoints.main.assets.filter(s => s.name.endsWith(".js"));
+            const assets = info.entrypoints.main.assets.filter(s => (0, helper_1.isJavaScript)(s.name));
             files.push(assets[assets.length - 1].name);
         }
         return [...prefiles, ...files];
@@ -82,7 +83,8 @@ class CacheProcessor extends basic_1.BasicProcessor {
                 library: { type: "commonjs2" }
             },
             optimization: {
-                moduleIds: "named"
+                moduleIds: "named",
+                emitOnErrors: true
             },
             target: this._cacheOptions.target,
             experiments: {

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 helper_1 = require("../helper");
 const plugins_1 = require("../helper/plugins");
 const plugin_1 = require("../plugin");
 const type_1 = require("../type");
@@ -45,7 +46,7 @@ class HotProcessor extends basic_1.BasicProcessor {
         if (this._hotOptions.target === "web" ||
             this._hotOptions.target === "webworker") {
             for (const file of info.entrypoints.main.assets) {
-                if (file.name.endsWith(".js")) {
+                if ((0, helper_1.isJavaScript)(file.name)) {
                     files.push(file.name);
                 }
                 else {
@@ -54,7 +55,7 @@ class HotProcessor extends basic_1.BasicProcessor {
             }
         }
         else {
-            const assets = info.entrypoints.main.assets.filter(s => s.name.endsWith(".js"));
+            const assets = info.entrypoints.main.assets.filter(s => (0, helper_1.isJavaScript)(s.name));
             files.push(assets[assets.length - 1].name);
         }
         return [...prefiles, ...files];

package/dist/processor/watch.js

@@ -233,10 +233,16 @@ class WatchStepProcessor extends WatchProcessor {
             });
         });
         // wait compiler to ready watch the files and diretories
-        // TODO: native watcher will call ignored js function in rust
-        // but it will block the watch step processor. Then, native watcher maybe spend more time.
-        // So we need to wait a while to ensure the files and directories are ready.
-        const timeout = this._watchOptions.nativeWatcher ? 500 : 100;
+        // Native Watcher using [notify](https://github.com/notify-rs/notify) to watch files.
+        // After tests, notify will cost many milliseconds to watch in windows OS when jest run concurrently.
+        // So we need to wait a while to ensure the watcher is ready.
+        // If we don't wait, copyDiff will happen before the watcher is ready,
+        // which will cause the compiler not rebuild when the files change.
+        // The timeout is set to 400ms for windows OS and 100ms for other OS.
+        // TODO: This is a workaround, we can remove it when notify support windows better.
+        const timeout = this._watchOptions.nativeWatcher && process.platform === "win32"
+            ? 400
+            : 100;
         await new Promise(resolve => setTimeout(resolve, timeout));
         (0, copyDiff_1.default)(node_path_1.default.join(context.getSource(), this._watchOptions.stepName), this._watchOptions.tempDir, false);
         await task;

package/dist/runner/runner/basic.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicRunner = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const urlToRelativePath_1 = __importDefault(require("../../helper/legacy/urlToRelativePath"));
 const isRelativePath = (p) => /^\.\.?\//.test(p);
 const getSubPath = (p) => {
     const lastSlash = p.lastIndexOf("/");
@@ -91,6 +92,15 @@ class BasicRunner {
                 subPath: "absolute_path"
             };
         }
+        else if (modulePath.startsWith("https://test.cases/path/")) {
+            const relativePath = (0, urlToRelativePath_1.default)(modulePath);
+            const absPath = node_path_1.default.join(currentDirectory, relativePath);
+            res = {
+                path: absPath,
+                content: node_fs_1.default.readFileSync(absPath, "utf-8"),
+                subPath: ""
+            };
+        }
         if (this._options.cachable && res) {
             cached.set(cacheKey, res);
         }

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

@@ -1,5 +1,5 @@
 import type { ECompilerType } from "../../../type";
-import type { TBasicRunnerFile, TRunnerRequirer } from "../../type";
+import { type TBasicRunnerFile, type TRunnerRequirer } from "../../type";
 import type { IBasicRunnerOptions } from "../basic";
 import { CommonJsRunner } from "../cjs";
 export declare class FakeDocumentWebRunner<T extends ECompilerType = ECompilerType.Rspack> extends CommonJsRunner<T> {
@@ -15,4 +15,5 @@ export declare class FakeDocumentWebRunner<T extends ECompilerType = ECompilerTy
     protected createRunner(): void;
     protected preExecute(_: string, file: TBasicRunnerFile): void;
     protected postExecute(_: Object, file: TBasicRunnerFile): void;
+    private createESMRequirer;
 }

package/dist/runner/runner/web/fake.js

@@ -1,4 +1,37 @@
 "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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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 };
 };
@@ -6,11 +39,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FakeDocumentWebRunner = 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 = __importStar(require("node:vm"));
+const helper_1 = require("../../../helper");
+const asModule_1 = __importDefault(require("../../../helper/legacy/asModule"));
 const createFakeWorker_1 = __importDefault(require("../../../helper/legacy/createFakeWorker"));
 const currentScript_1 = __importDefault(require("../../../helper/legacy/currentScript"));
 const EventSourceForNode_1 = __importDefault(require("../../../helper/legacy/EventSourceForNode"));
 const FakeDocument_1 = __importDefault(require("../../../helper/legacy/FakeDocument"));
 const urlToRelativePath_1 = __importDefault(require("../../../helper/legacy/urlToRelativePath"));
+const type_1 = require("../../type");
 const cjs_1 = require("../cjs");
 class FakeDocumentWebRunner extends cjs_1.CommonJsRunner {
     constructor(_webOptions) {
@@ -24,7 +62,7 @@ class FakeDocumentWebRunner extends cjs_1.CommonJsRunner {
         });
     }
     run(file) {
-        if (!file.endsWith(".js")) {
+        if ((0, helper_1.isCss)(file)) {
             const cssElement = this.document.createElement("link");
             cssElement.href = file;
             cssElement.rel = "stylesheet";
@@ -118,6 +156,7 @@ class FakeDocumentWebRunner extends cjs_1.CommonJsRunner {
     createRunner() {
         super.createRunner();
         this.requirers.set("cjs", this.getRequire());
+        this.requirers.set("mjs", this.createESMRequirer());
         this.requirers.set("json", this.createJsonRequirer());
         this.requirers.set("entry", (_, modulePath, context) => {
             if (Array.isArray(modulePath)) {
@@ -126,6 +165,9 @@ class FakeDocumentWebRunner extends cjs_1.CommonJsRunner {
             if (modulePath.endsWith(".json")) {
                 return this.requirers.get("json")(this._options.dist, modulePath, context);
             }
+            else if (modulePath.endsWith(".mjs")) {
+                return this.requirers.get("mjs")(this._options.dist, modulePath, context);
+            }
             return this.requirers.get("cjs")(this._options.dist, modulePath, context);
         });
     }
@@ -139,5 +181,63 @@ class FakeDocumentWebRunner extends cjs_1.CommonJsRunner {
         this.document.currentScript = this.oldCurrentScript;
         this.oldCurrentScript = null;
     }
+    createESMRequirer() {
+        const esmContext = node_vm_1.default.createContext({
+            ...this.baseModuleScope,
+            ...this.globalContext
+        }, {
+            name: "context for esm"
+        });
+        const esmCache = new Map();
+        return (currentDirectory, modulePath, context = {}) => {
+            const esmIdentifier = `esm-${currentDirectory}-${modulePath}`;
+            if (!node_vm_1.SourceTextModule) {
+                throw new Error("Running this test requires '--experimental-vm-modules'.\nRun with 'node --experimental-vm-modules node_modules/jest-cli/bin/jest'.");
+            }
+            const _require = this.getRequire();
+            const file = context.file || this.getFile(modulePath, currentDirectory);
+            if (!file) {
+                return this.requirers.get("miss")(currentDirectory, modulePath);
+            }
+            let esm = esmCache.get(file.path);
+            if (!esm) {
+                esm = new node_vm_1.SourceTextModule(file.content, {
+                    identifier: `${esmIdentifier}-${file.path}`,
+                    // no attribute
+                    url: `${(0, node_url_1.pathToFileURL)(file.path).href}?${esmIdentifier}`,
+                    context: esmContext,
+                    initializeImportMeta: (meta, _) => {
+                        meta.url = (0, node_url_1.pathToFileURL)(file.path).href;
+                    },
+                    importModuleDynamically: async (specifier, module) => {
+                        const result = await _require(node_path_1.default.dirname(file.path), specifier, {
+                            esmMode: type_1.EEsmMode.Evaluated
+                        });
+                        return await (0, asModule_1.default)(result, module.context);
+                    }
+                });
+                esmCache.set(file.path, esm);
+            }
+            if (context.esmMode === type_1.EEsmMode.Unlinked)
+                return esm;
+            return (async () => {
+                await esm.link(async (specifier, referencingModule) => {
+                    return await (0, asModule_1.default)(await _require(node_path_1.default.dirname(referencingModule.identifier
+                        ? referencingModule.identifier.slice(esmIdentifier.length + 1)
+                        : (0, node_url_1.fileURLToPath)(referencingModule.url)), specifier, {
+                        esmMode: type_1.EEsmMode.Unlinked
+                    }), referencingModule.context, true);
+                });
+                if (esm.instantiate)
+                    esm.instantiate();
+                await esm.evaluate();
+                if (context.esmMode === type_1.EEsmMode.Evaluated) {
+                    return esm;
+                }
+                const ns = esm.namespace;
+                return ns.default && ns.default instanceof Promise ? ns.default : ns;
+            })();
+        };
+    }
 }
 exports.FakeDocumentWebRunner = FakeDocumentWebRunner;

package/dist/runner/runner/web/jsdom.js

@@ -59,7 +59,7 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
         vmContext.global = {};
     }
     run(file) {
-        if (!file.endsWith(".js")) {
+        if (!file.endsWith(".js") && !file.endsWith(".mjs")) {
             const cssElement = this.dom.window.document.createElement("link");
             cssElement.href = file;
             cssElement.rel = "stylesheet";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "1.4.10",
+  "version": "1.5.0-beta.0",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -35,7 +35,7 @@
     "@babel/generator": "7.28.0",
     "@babel/parser": "7.28.0",
     "@babel/traverse": "7.28.0",
-    "@babel/types": "7.28.1",
+    "@babel/types": "7.28.2",
     "cross-env": "^7.0.3",
     "csv-to-markdown-table": "^1.5.0",
     "deepmerge": "^4.3.1",
@@ -47,12 +47,12 @@
     "jest-diff": "^29.7.0",
     "jest-snapshot": "29.7.0",
     "jsdom": "^26.1.0",
-    "memfs": "4.17.2",
+    "memfs": "4.36.0",
     "loader-utils": "^2.0.4",
     "path-serializer": "0.5.0",
     "pretty-format": "29.7.0",
     "rimraf": "^5.0.10",
-    "source-map": "^0.7.4",
+    "source-map": "^0.7.6",
     "terser-webpack-plugin": "^5.3.14",
     "webpack": "5.99.9",
     "webpack-merge": "6.0.1",
@@ -62,7 +62,7 @@
     "@rspack/plugin-preact-refresh": "1.1.2",
     "@rspack/plugin-react-refresh": "^1.4.3",
     "@swc/helpers": "0.5.17",
-    "@swc/plugin-remove-console": "^7.0.4",
+    "@swc/plugin-remove-console": "^9.0.0",
     "@types/babel__generator": "7.27.0",
     "@types/babel__traverse": "7.20.7",
     "@types/fs-extra": "11.0.4",
@@ -89,17 +89,17 @@
     "react-dom": "^19.1.0",
     "react-refresh": "^0.17.0",
     "sass-loader": "^16.0.5",
-    "source-map": "^0.7.4",
+    "source-map": "^0.7.6",
     "source-map-loader": "^5.0.0",
     "style-loader": "^4.0.0",
     "terser": "5.43.1",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "wast-loader": "^1.14.1",
     "worker-rspack-loader": "^3.1.2",
-    "@rspack/cli": "1.4.10",
-    "@rspack/binding-testing": "1.4.1",
-    "@rspack/test-tools": "1.4.10",
-    "@rspack/core": "1.4.10"
+    "@rspack/cli": "1.5.0-beta.0",
+    "@rspack/core": "1.5.0-beta.0",
+    "@rspack/test-tools": "1.5.0-beta.0",
+    "@rspack/binding-testing": "1.4.1"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"