@rspack/test-tools 0.4.4 → 0.4.5

package/dist/compare/comparator.d.ts

@@ -0,0 +1,16 @@
+import { ITestReporter, TCompareModules } from "../type";
+import { IFormatCodeOptions } from "./format-code";
+export interface IDiffComparatorOptions {
+    rspackDist: string;
+    webpackDist: string;
+    files: string[];
+    modules?: TCompareModules;
+    runtimeModules?: TCompareModules;
+    reporters: ITestReporter<unknown>[];
+    formatOptions?: IFormatCodeOptions;
+}
+export declare class DiffComparator {
+    private options;
+    constructor(options: IDiffComparatorOptions);
+    compare(): Promise<void>;
+}

package/dist/compare/comparator.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DiffComparator = void 0;
+const compare_1 = require("./compare");
+const replace_runtime_module_name_1 = require("./replace-runtime-module-name");
+const path_1 = __importDefault(require("path"));
+const deepmerge_1 = __importDefault(require("deepmerge"));
+class DiffComparator {
+    constructor(options) {
+        this.options = options;
+    }
+    async compare() {
+        for (let file of this.options.files) {
+            try {
+                const result = (0, compare_1.compareFile)(path_1.default.join(this.options.rspackDist, file), path_1.default.join(this.options.webpackDist, file), {
+                    modules: this.options.modules,
+                    runtimeModules: this.options.runtimeModules,
+                    format: (0, deepmerge_1.default)({
+                        replacements: {},
+                        ignorePropertyQuotationMark: true,
+                        ignoreModuleId: true,
+                        ignoreModuleArguments: true,
+                        ignoreBlockOnlyStatement: true,
+                        ignoreSwcHelpersPath: true,
+                        ignoreObjectPropertySequence: true,
+                        ignoreCssFilePath: true
+                    }, this.options.formatOptions || {}),
+                    renameModule: replace_runtime_module_name_1.replaceRuntimeModuleName
+                });
+                for (let reporter of this.options.reporters) {
+                    reporter.increment(file, result.modules["modules"] || []);
+                }
+                for (let reporter of this.options.reporters) {
+                    reporter.increment(file, result.modules["runtimeModules"] || []);
+                }
+            }
+            catch (e) {
+                for (let reporter of this.options.reporters) {
+                    reporter.failure(file);
+                }
+            }
+        }
+        await Promise.all(this.options.reporters.map(r => r.output()));
+    }
+}
+exports.DiffComparator = DiffComparator;

package/dist/compare/index.d.ts

@@ -2,3 +2,4 @@ export * from "./replace-module-argument";
 export * from "./replace-runtime-module-name";
 export * from "./format-code";
 export * from "./compare";
+export * from "./comparator";

package/dist/compare/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./replace-module-argument"), exports);
 __exportStar(require("./replace-runtime-module-name"), exports);
 __exportStar(require("./format-code"), exports);
 __exportStar(require("./compare"), exports);
+__exportStar(require("./comparator"), exports);

package/dist/index.d.ts

@@ -2,3 +2,5 @@ export * from "./type";
 export * from "./test/tester";
 export * from "./processor";
 export * from "./reporter";
+export * from "./compare";
+export * from "./plugin";

package/dist/index.js

@@ -18,3 +18,5 @@ __exportStar(require("./type"), exports);
 __exportStar(require("./test/tester"), exports);
 __exportStar(require("./processor"), exports);
 __exportStar(require("./reporter"), exports);
+__exportStar(require("./compare"), exports);
+__exportStar(require("./plugin"), exports);

package/dist/plugin/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./rspack-diff-config-plugin";
+export * from "./webpack-diff-config-plugin";

package/dist/plugin/index.js

@@ -0,0 +1,18 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./rspack-diff-config-plugin"), exports);
+__exportStar(require("./webpack-diff-config-plugin"), exports);

package/dist/plugin/rspack-diff-config-plugin.d.ts

@@ -0,0 +1,7 @@
+import { Compiler, RspackPluginInstance } from "@rspack/core";
+export declare class RspackDiffConfigPlugin implements RspackPluginInstance {
+    private rspackPath;
+    name: string;
+    constructor(rspackPath: string);
+    apply(compiler: Compiler): void;
+}

package/dist/plugin/rspack-diff-config-plugin.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RspackDiffConfigPlugin = void 0;
+const PLUGIN_NAME = "RspackDiffConfigPlugin";
+class RspackDiffConfigPlugin {
+    constructor(rspackPath) {
+        this.rspackPath = rspackPath;
+        this.name = PLUGIN_NAME;
+        process.env["RSPACK_DIFF"] = "true"; // enable rspack diff
+    }
+    apply(compiler) {
+        var _a, _b, _c;
+        var _d;
+        const { options } = compiler;
+        options.mode = "development";
+        options.devtool = false;
+        (_a = options.optimization) !== null && _a !== void 0 ? _a : (options.optimization = {});
+        options.optimization.minimize = false;
+        options.optimization.chunkIds = "named";
+        options.optimization.moduleIds = "named";
+        options.optimization.mangleExports = false;
+        (_b = options.experiments) !== null && _b !== void 0 ? _b : (options.experiments = {});
+        (_c = (_d = options.experiments).rspackFuture) !== null && _c !== void 0 ? _c : (_d.rspackFuture = {});
+        options.experiments.rspackFuture.disableTransformByDefault = true;
+    }
+}
+exports.RspackDiffConfigPlugin = RspackDiffConfigPlugin;

package/dist/plugin/webpack-diff-config-plugin.d.ts

@@ -0,0 +1,7 @@
+import { Compiler } from "webpack";
+export declare class WebpackDiffConfigPlugin {
+    private webpackPath;
+    name: string;
+    constructor(webpackPath: string);
+    apply(compiler: Compiler): void;
+}

package/dist/plugin/webpack-diff-config-plugin.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebpackDiffConfigPlugin = void 0;
+const webpack_module_placeholder_plugin_1 = require("./webpack-module-placeholder-plugin");
+const PLUGIN_NAME = "WebpackDiffConfigPlugin";
+class WebpackDiffConfigPlugin {
+    constructor(webpackPath) {
+        this.webpackPath = webpackPath;
+        this.name = PLUGIN_NAME;
+    }
+    apply(compiler) {
+        var _a, _b, _c;
+        var _d;
+        const { options } = compiler;
+        options.mode = "development";
+        options.devtool = false;
+        (_a = options.optimization) !== null && _a !== void 0 ? _a : (options.optimization = {});
+        options.optimization.minimize = false;
+        options.optimization.chunkIds = "named";
+        options.optimization.moduleIds = "named";
+        options.optimization.mangleExports = false;
+        options.optimization.concatenateModules = false;
+        (_b = options.output) !== null && _b !== void 0 ? _b : (options.output = {});
+        options.output.pathinfo = false;
+        (_c = (_d = options.output).environment) !== null && _c !== void 0 ? _c : (_d.environment = {});
+        options.output.environment.arrowFunction = false;
+        options.output.environment.bigIntLiteral = false;
+        options.output.environment.const = false;
+        options.output.environment.destructuring = false;
+        options.output.environment.dynamicImport = false;
+        options.output.environment.dynamicImportInWorker = false;
+        options.output.environment.forOf = false;
+        options.output.environment.globalThis = false;
+        options.output.environment.module = false;
+        options.output.environment.optionalChaining = false;
+        options.output.environment.templateLiteral = false;
+        new webpack_module_placeholder_plugin_1.WebpackModulePlaceholderPlugin(this.webpackPath).apply(compiler);
+    }
+}
+exports.WebpackDiffConfigPlugin = WebpackDiffConfigPlugin;

package/dist/plugin/webpack-module-placeholder-plugin.d.ts

@@ -0,0 +1,5 @@
+export declare class WebpackModulePlaceholderPlugin {
+    private webpackPath;
+    constructor(webpackPath: string);
+    apply(compiler: any): void;
+}

package/dist/plugin/webpack-module-placeholder-plugin.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebpackModulePlaceholderPlugin = void 0;
+// @ts-nocheck
+const { ConcatSource, RawSource, CachedSource, PrefixSource } = require("webpack-sources");
+const path = require("path");
+function createRenderRuntimeModulesFn(Template) {
+    return function renderRuntimeModules(runtimeModules, renderContext) {
+        const source = new ConcatSource();
+        for (const module of runtimeModules) {
+            const codeGenerationResults = renderContext.codeGenerationResults;
+            let runtimeSource;
+            if (codeGenerationResults) {
+                runtimeSource = codeGenerationResults.getSource(module, renderContext.chunk.runtime, "runtime");
+            }
+            else {
+                const codeGenResult = module.codeGeneration({
+                    chunkGraph: renderContext.chunkGraph,
+                    dependencyTemplates: renderContext.dependencyTemplates,
+                    moduleGraph: renderContext.moduleGraph,
+                    runtimeTemplate: renderContext.runtimeTemplate,
+                    runtime: renderContext.chunk.runtime,
+                    codeGenerationResults
+                });
+                if (!codeGenResult)
+                    continue;
+                runtimeSource = codeGenResult.sources.get("runtime");
+            }
+            if (runtimeSource) {
+                let identifier = module.identifier();
+                source.add(Template.toNormalComment(`start::${identifier}`) + "\n");
+                if (!module.shouldIsolate()) {
+                    source.add(runtimeSource);
+                    source.add("\n\n");
+                }
+                else if (renderContext.runtimeTemplate.supportsArrowFunction()) {
+                    source.add("(() => {\n");
+                    source.add(new PrefixSource("\t", runtimeSource));
+                    source.add("\n})();\n\n");
+                }
+                else {
+                    source.add("!function() {\n");
+                    source.add(new PrefixSource("\t", runtimeSource));
+                    source.add("\n}();\n\n");
+                }
+                source.add(Template.toNormalComment(`end::${identifier}`) + "\n");
+            }
+        }
+        return source;
+    };
+}
+const caches = new WeakMap();
+class WebpackModulePlaceholderPlugin {
+    constructor(webpackPath) {
+        this.webpackPath = webpackPath;
+        const Template = require(path.join(path.dirname(this.webpackPath), "Template.js"));
+        Template.renderRuntimeModules = createRenderRuntimeModulesFn(Template);
+    }
+    apply(compiler) {
+        const JavascriptModulesPlugin = require(path.join(path.dirname(this.webpackPath), "javascript/JavascriptModulesPlugin.js"));
+        compiler.hooks.compilation.tap("RuntimeDiffPlugin", compilation => {
+            const hooks = JavascriptModulesPlugin.getCompilationHooks(compilation);
+            hooks.inlineInRuntimeBailout.tap("RuntimeDiffPlugin", () => "not allow inline startup");
+            hooks.renderModulePackage.tap("RuntimeDiffPlugin", (moduleSource, module, { chunk, chunkGraph, moduleGraph, runtimeTemplate }) => {
+                const { requestShortener } = runtimeTemplate;
+                let cacheEntry;
+                let cache = caches.get(requestShortener);
+                if (cache === undefined) {
+                    caches.set(requestShortener, (cache = new WeakMap()));
+                    cache.set(module, (cacheEntry = {
+                        header: undefined,
+                        footer: undefined,
+                        full: new WeakMap()
+                    }));
+                }
+                else {
+                    cacheEntry = cache.get(module);
+                    if (cacheEntry === undefined) {
+                        cache.set(module, (cacheEntry = {
+                            header: undefined,
+                            footer: undefined,
+                            full: new WeakMap()
+                        }));
+                    }
+                    else {
+                        const cachedSource = cacheEntry.full.get(moduleSource);
+                        if (cachedSource !== undefined)
+                            return cachedSource;
+                    }
+                }
+                const source = new ConcatSource();
+                let header = cacheEntry.header;
+                let footer = cacheEntry.footer;
+                if (header === undefined) {
+                    const req = module.readableIdentifier(requestShortener);
+                    let reqStr = req.replace(/\*\//g, "*_/");
+                    // handle css module identifier
+                    if (reqStr.startsWith("css ")) {
+                        reqStr = reqStr.replace(/^css[\s]+/, "").trim();
+                    }
+                    header = new RawSource(`\n/* start::${reqStr} */\n`);
+                    footer = new RawSource(`\n/* end::${reqStr} */\n`);
+                    cacheEntry.header = header;
+                    cacheEntry.footer = footer;
+                }
+                source.add(header);
+                source.add(moduleSource);
+                source.add(footer);
+                const cachedSource = new CachedSource(source);
+                cacheEntry.full.set(moduleSource, cachedSource);
+                return cachedSource;
+            });
+        });
+    }
+}
+exports.WebpackModulePlaceholderPlugin = WebpackModulePlaceholderPlugin;

package/dist/processor/diff.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiffProcessor = void 0;
 const type_1 = require("../type");
 const path_1 = __importDefault(require("path"));
-const module_placeholder_plugin_1 = require("../webpack/module-placeholder-plugin");
 const compare_1 = require("../compare");
 const helper_1 = require("../helper");
 const deepmerge_1 = __importDefault(require("deepmerge"));
+const plugin_1 = require("../plugin");
 class DiffProcessor {
     constructor(options) {
         this.options = options;
@@ -67,59 +67,19 @@ class DiffProcessor {
             entry: path_1.default.join(src, "./src/index.js"),
             context: src,
             output: {
+                path: dist,
                 filename: "bundle.js",
                 chunkFilename: "[name].chunk.js"
             },
-            mode: "development",
-            devtool: false,
-            optimization: {
-                chunkIds: "named",
-                moduleIds: "named"
-            }
+            plugins: [
+                type === type_1.ECompilerType.Webpack &&
+                    new plugin_1.WebpackDiffConfigPlugin(this.options.webpackPath),
+                type === type_1.ECompilerType.Rspack &&
+                    new plugin_1.RspackDiffConfigPlugin(this.options.rspackPath)
+            ].filter(Boolean)
+        }, {
+            arrayMerge: (a, b) => [...a, ...b]
         });
-        if (type === type_1.ECompilerType.Webpack) {
-            result = (0, deepmerge_1.default)(result, {
-                output: {
-                    pathinfo: false,
-                    environment: {
-                        arrowFunction: false,
-                        bigIntLiteral: false,
-                        const: false,
-                        destructuring: false,
-                        dynamicImport: false,
-                        dynamicImportInWorker: false,
-                        forOf: false,
-                        globalThis: false,
-                        module: false,
-                        optionalChaining: false,
-                        templateLiteral: false
-                    },
-                    path: dist
-                },
-                optimization: {
-                    mangleExports: false,
-                    concatenateModules: false
-                },
-                plugins: [(0, module_placeholder_plugin_1.createModulePlaceholderPlugin)(this.options.webpackPath)]
-            }, {
-                arrayMerge: (a, b) => [...a, ...b]
-            });
-        }
-        if (type === type_1.ECompilerType.Rspack) {
-            result = (0, deepmerge_1.default)(result, {
-                output: {
-                    path: dist
-                },
-                optimization: {
-                    mangleExports: false
-                },
-                experiments: {
-                    rspackFuture: {
-                        disableTransformByDefault: true
-                    }
-                }
-            });
-        }
         return result;
     }
     createFormatOptions() {

package/dist/reporter/diff-html.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiffHtmlReporter = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const VIEWER_DIR = path_1.default.join(__dirname, "../viewer");
+const VIEWER_DIR = path_1.default.join(__dirname, "../../template");
 const DIFF_STATS_PLACEHOLDER = "$$RSPACK_DIFF_STATS_PLACEHOLDER$$";
 const DEFAULT_IGNORE = /node_modules/;
 class DiffHtmlReporter {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -13,7 +13,8 @@
   },
   "files": [
     "client",
-    "dist"
+    "dist",
+    "template"
   ],
   "publishConfig": {
     "access": "public"
@@ -37,7 +38,7 @@
     "fs-extra": "^11.1.1",
     "jest-diff": "^29.7.0",
     "webpack-sources": "3.2.3",
-    "@rspack/core": "0.4.4"
+    "@rspack/core": "0.4.5"
   },
   "devDependencies": {
     "@arco-design/web-react": "^2.56.1",
@@ -56,7 +57,7 @@
     "react-refresh": "0.13.0",
     "typescript": "5.1.6",
     "webpack": "5.89.0",
-    "@rspack/cli": "0.4.4"
+    "@rspack/cli": "0.4.5"
   },
   "peerDependenciesMeta": {},
   "jest": {
@@ -67,7 +68,7 @@
     "testEnvironment": "../../scripts/test/patch-node-env.cjs"
   },
   "scripts": {
-    "build": "rimraf dist/ && tsc -b ./tsconfig.build.json --force",
+    "build": "tsc -b ./tsconfig.build.json",
     "build:viewer": "rspack build",
     "dev:viewer": "rspack serve",
     "dev": "tsc -b -w"