@rspack/test-tools 0.6.3 → 0.6.4

package/dist/processor/stats.js

@@ -10,6 +10,7 @@ const multi_1 = require("./multi");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const captureStdio_1 = __importDefault(require("../helper/legacy/captureStdio"));
+const helper_1 = require("../helper");
 const REG_ERROR_CASE = /error$/;
 const quoteMeta = (str) => {
     return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
@@ -47,7 +48,7 @@ class RspackStatsProcessor extends multi_1.MultiTaskProcessor {
                             return callback(err);
                         if (!/\.(js|json|txt)$/.test(args[0]))
                             return callback(null, result);
-                        callback(null, result.toString("utf-8").replace(/\r/g, ""));
+                        callback(null, (0, helper_1.escapeEOL)(result.toString("utf-8")));
                     }
                 ]));
             };

package/dist/processor/watch.js

@@ -10,7 +10,8 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const copyDiff_1 = __importDefault(require("../helper/legacy/copyDiff"));
 const compiler_1 = require("../compiler");
-const currentWatchStepModulePath = path_1.default.resolve(__dirname, "../../../rspack/tests/helpers/currentWatchStep");
+// This file is used to port step number to webpack.config.js
+const currentWatchStepModulePath = path_1.default.resolve(__dirname, "../helper/util/currentWatchStep");
 class RspackWatchProcessor extends multi_1.MultiTaskProcessor {
     constructor(_watchOptions) {
         super({
@@ -72,9 +73,8 @@ class RspackWatchProcessor extends multi_1.MultiTaskProcessor {
                 options.output = {};
             if (!options.output.path)
                 options.output.path = context.getDist();
-            // CHANGE: The pathinfo is currently not supported in rspack
-            // if (typeof options.output.pathinfo === "undefined")
-            // 	options.output.pathinfo = true;
+            if (typeof options.output.pathinfo === "undefined")
+                options.output.pathinfo = true;
             if (!options.output.filename)
                 options.output.filename = "bundle.js";
             if (options.cache && options.cache.type === "filesystem") {

package/dist/runner/hot-step.js

@@ -25,7 +25,7 @@ class HotStepRunnerFactory extends hot_1.HotRunnerFactory {
                     const checker = this.context.getValue(this.name, ((_a = jsonStats.errors) === null || _a === void 0 ? void 0 : _a.length)
                         ? "hotUpdateStepErrorChecker"
                         : "hotUpdateStepChecker");
-                    checker(hotUpdateContext, stats);
+                    checker(hotUpdateContext, stats, runner.getGlobal("__HMR_UPDATED_RUNTIME__"));
                     callback(null, jsonStats);
                 }
                 catch (e) {
@@ -34,7 +34,7 @@ class HotStepRunnerFactory extends hot_1.HotRunnerFactory {
             })
                 .catch(callback);
         };
-        return new web_1.WebRunner({
+        const runner = new web_1.WebRunner({
             dom: "jsdom",
             env,
             stats,
@@ -54,6 +54,7 @@ class HotStepRunnerFactory extends hot_1.HotRunnerFactory {
             dist,
             compilerOptions
         });
+        return runner;
     }
 }
 exports.HotStepRunnerFactory = HotStepRunnerFactory;

package/dist/runner/runner/basic.d.ts

@@ -18,6 +18,7 @@ export declare abstract class BasicRunner<T extends ECompilerType = ECompilerTyp
     constructor(_options: IBasicRunnerOptions<T>);
     run(file: string): Promise<unknown>;
     getRequire(): TRunnerRequirer;
+    getGlobal(name: string): unknown;
     protected abstract createGlobalContext(): IBasicGlobalContext;
     protected abstract createBaseModuleScope(): IBasicModuleScope;
     protected abstract createModuleScope(requireFn: TRunnerRequirer, m: TModuleObject, file: TBasicRunnerFile): IBasicModuleScope;

package/dist/runner/runner/basic.js

@@ -49,6 +49,9 @@ class BasicRunner {
     getRequire() {
         return this.requirers.get("entry");
     }
+    getGlobal(name) {
+        return (this.globalContext || {})[name];
+    }
     getFile(modulePath, currentDirectory) {
         if (Array.isArray(modulePath)) {
             return {

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

@@ -7,6 +7,7 @@ export declare class JSDOMWebRunner<T extends ECompilerType = ECompilerType.Rspa
     private dom;
     constructor(_webOptions: IBasicRunnerOptions<T>);
     run(file: string): Promise<unknown>;
+    getGlobal(name: string): unknown;
     protected createResourceLoader(): {
         fetch(url: string, _: {
             element: HTMLScriptElement;

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

@@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path"));
 const EventSourceForNode_1 = __importDefault(require("../../../helper/legacy/EventSourceForNode"));
 const urlToRelativePath_1 = __importDefault(require("../../../helper/legacy/urlToRelativePath"));
 const cjs_1 = require("../cjs");
+const helper_1 = require("../../../helper");
 class JSDOMWebRunner extends cjs_1.CommonJsRunner {
     constructor(_webOptions) {
         super(_webOptions);
@@ -29,6 +30,7 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
             runScripts: "dangerously",
             virtualConsole
         });
+        this.dom.window.console = console;
         // compat with FakeDocument
         this.dom.window.eval(`
       Object.defineProperty(document.head, "_children", {
@@ -63,6 +65,9 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
         }
         return super.run(file);
     }
+    getGlobal(name) {
+        return this.dom.window[name];
+    }
     createResourceLoader() {
         const urlToPath = (url) => {
             if (url.startsWith("https://test.cases/path/"))
@@ -141,9 +146,10 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
             if (this._options.testConfig.moduleScope) {
                 this._options.testConfig.moduleScope(currentModuleScope);
             }
+            const scopeKey = (0, helper_1.escapeSep)(file.path);
             const args = Object.keys(currentModuleScope);
             const argValues = args
-                .map(arg => `window["${file.path}"]["${arg}"]`)
+                .map(arg => `window["${scopeKey}"]["${arg}"]`)
                 .join(", ");
             const code = `
         // hijack document.currentScript for auto public path
@@ -154,7 +160,7 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
                 get(target, prop, receiver) {
                   if (prop === "currentScript") {
                     var script = target.createElement("script");
-                    script.src = "https://test.cases/path/${file.subPath}index.js";
+                    script.src = "https://test.cases/path/${(0, helper_1.escapeSep)(file.subPath)}index.js";
                     return script;
                   }
                   return Reflect.get(target, prop, receiver);
@@ -164,12 +170,12 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
             return Reflect.get(target, prop, receiver);
           }
         });
-        (function(window, self, globalThis, ${args.join(", ")}) {
+        (function(window, self, globalThis, console, ${args.join(", ")}) {
           ${file.content}
-        })($$g$$, $$g$$, $$g$$, ${argValues});
+        })($$g$$, $$g$$, $$g$$, window["console"], ${argValues});
       `;
             this.preExecute(code, file);
-            this.dom.window[file.path] = currentModuleScope;
+            this.dom.window[scopeKey] = currentModuleScope;
             this.dom.window.eval(code);
             this.postExecute(m, file);
             return m.exports;

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

@@ -11,4 +11,5 @@ export declare class WebRunner<T extends ECompilerType = ECompilerType.Rspack> i
     constructor(_webOptions: IWebRunnerOptions<T>);
     run(file: string): Promise<unknown>;
     getRequire(): import("..").TRunnerRequirer;
+    getGlobal(name: string): unknown;
 }

package/dist/runner/runner/web.js

@@ -24,5 +24,8 @@ class WebRunner {
     getRequire() {
         return this.implement.getRequire();
     }
+    getGlobal(name) {
+        return this.implement.getGlobal(name);
+    }
 }
 exports.WebRunner = WebRunner;

package/dist/runner/type.d.ts

@@ -30,3 +30,16 @@ export interface IBasicGlobalContext {
 export type TModuleObject = {
     exports: unknown;
 };
+export type THotStepRuntimeLangData = {
+    outdatedModules: string[];
+    outdatedDependencies: Record<string, string[]>;
+    updatedModules: string[];
+    updatedRuntime: string[];
+    acceptedModules: string[];
+    disposedModules: string[];
+};
+export type THotStepRuntimeData = {
+    javascript: THotStepRuntimeLangData;
+    css: THotStepRuntimeLangData;
+    statusPath: string[];
+};

package/dist/test/simple.d.ts

@@ -0,0 +1,5 @@
+import { ITestContext, ITestEnv, ITestProcessor } from "../type";
+export declare function getSimpleProcessorRunner(src: string, dist: string, options?: {
+    env?: () => ITestEnv;
+    context?: (src: string, dist: string) => ITestContext;
+}): (name: string, processor: ITestProcessor) => Promise<void>;

package/dist/test/simple.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSimpleProcessorRunner = void 0;
+const context_1 = require("./context");
+const CONTEXT_MAP = new Map();
+function getSimpleProcessorRunner(src, dist, options = {}) {
+    const createEnv = options.env || (() => ({ it, beforeEach, afterEach }));
+    const createContext = options.context ||
+        ((src, dist) => new context_1.TestContext({ src, dist }));
+    const key = `src: ${src}, dist: ${dist}`;
+    if (!CONTEXT_MAP.has(key)) {
+        const context = createContext(src, dist);
+        const runner = async function run(name, processor) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            try {
+                await ((_a = processor.beforeAll) === null || _a === void 0 ? void 0 : _a.call(processor, context));
+                await ((_b = processor.before) === null || _b === void 0 ? void 0 : _b.call(processor, context));
+                await ((_c = processor.config) === null || _c === void 0 ? void 0 : _c.call(processor, context));
+                await ((_d = processor.compiler) === null || _d === void 0 ? void 0 : _d.call(processor, context));
+                await ((_e = processor.build) === null || _e === void 0 ? void 0 : _e.call(processor, context));
+            }
+            catch (e) {
+                context.emitError(name, e);
+            }
+            finally {
+                await ((_f = processor.run) === null || _f === void 0 ? void 0 : _f.call(processor, createEnv(), context));
+                await ((_g = processor.check) === null || _g === void 0 ? void 0 : _g.call(processor, createEnv(), context));
+                await ((_h = processor.after) === null || _h === void 0 ? void 0 : _h.call(processor, context));
+                await ((_j = processor.afterAll) === null || _j === void 0 ? void 0 : _j.call(processor, context));
+            }
+        };
+        CONTEXT_MAP.set(key, runner);
+    }
+    return CONTEXT_MAP.get(key);
+}
+exports.getSimpleProcessorRunner = getSimpleProcessorRunner;

package/dist/type.d.ts

@@ -139,6 +139,7 @@ export type TTestFilter<T extends ECompilerType> = (creatorConfig: Record<string
 export interface ITestRunner {
     run(file: string): Promise<unknown>;
     getRequire(): TRunnerRequirer;
+    getGlobal(name: string): unknown;
 }
 export type TCompilerFactory<T extends ECompilerType> = (options: TCompilerOptions<T> | TCompilerOptions<T>[]) => TCompiler<T>;
 export interface TRunnerFactory<T extends ECompilerType> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -44,7 +44,7 @@
     "webpack-merge": "5.9.0",
     "webpack-sources": "3.2.3",
     "which-module": "2.0.1",
-    "@rspack/core": "0.6.3"
+    "@rspack/core": "0.6.4"
   },
   "devDependencies": {
     "@arco-design/web-react": "^2.56.1",
@@ -56,6 +56,8 @@
     "@types/webpack": "5.28.5",
     "@types/webpack-sources": "3.2.3",
     "core-js": "3.36.1",
+    "filenamify": "4.3.0",
+    "mkdirp": "0.5.6",
     "monaco-editor": "0.47.0",
     "monaco-editor-webpack-plugin": "7.1.0",
     "normalize.css": "^8.0.0",
@@ -63,16 +65,19 @@
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "react-refresh": "0.14.0",
-    "@rspack/cli": "0.6.3"
+    "@rspack/cli": "0.6.4",
+    "@rspack/plugin-minify": "0.6.4"
   },
   "scripts": {
     "build": "tsc -b ./tsconfig.build.json",
     "build:viewer": "rspack build",
     "dev:viewer": "rspack serve",
     "dev": "tsc -b -w",
-    "test": "cross-env NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --config ./jest.config.compat.js",
-    "test:ng": "cross-env SNAPSHOT=legacy NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --config ./jest.config.legacy.js",
-    "test:diff": "cross-env RSPACK_DIFF=true NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --config ./jest.config.diff.js",
+    "test": "sh -c 'run-s \"test:* -- $*\"' sh",
+    "testu": "sh -c 'run-s \"test:* -- $*\"' sh -u",
+    "test:base": "cross-env NODE_OPTIONS=--openssl-legacy-provider NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --config ./jest.config.js --passWithNoTests",
+    "test:hot": "cross-env RSPACK_HOT_TEST=true NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --config ./jest.config.hot.js --passWithNoTests",
+    "test:diff": "cross-env RSPACK_DIFF=true NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --logHeapUsage --config ./jest.config.diff.js --passWithNoTests",
     "api-extractor": "api-extractor run --verbose",
     "api-extractor:ci": "api-extractor run --verbose || diff temp/api.md etc/api.md"
   }

package/dist/case/stats.d.ts

@@ -1 +0,0 @@
-export declare function createStatsCase(name: string, src: string, dist: string): void;