@rspack/test-tools 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/compare/replace-runtime-module-name.d.ts

@@ -1 +1 @@
-export declare function replaceRuntimeModuleName(raw: string): string;
+export declare function replaceRuntimeModuleName(name: string): string;

package/dist/compare/replace-runtime-module-name.js

@@ -53,17 +53,14 @@ const RUNTIME_MODULE_PARAM_REGEX = {
     "webpack/runtime/get_main_filename": /webpack\/runtime\/get_main_filename\/([\w.\-_\s]+)(\*\/)?/g,
     "webpack/runtime/chunk_prefetch_function": /webpack\/runtime\/chunk_prefetch_function\/([\w.\-_\s]+)(\*\/)?/g
 };
-function replaceRuntimeModuleName(raw) {
-    for (const [rspackName, webpackName] of Object.entries(RUNTIME_MODULE_NAME_MAPPING)) {
+function replaceRuntimeModuleName(name) {
+    return Object.entries(RUNTIME_MODULE_NAME_MAPPING).reduce((name, [rspackName, webpackName]) => {
         if (RUNTIME_MODULE_PARAM_REGEX[rspackName]) {
-            raw = raw.replace(RUNTIME_MODULE_PARAM_REGEX[rspackName], (full, $1, $2) => {
+            return name.replace(RUNTIME_MODULE_PARAM_REGEX[rspackName], (_, $1, $2) => {
                 return webpackName.replace("$1", $1.trim()) + ($2 ? " */" : "");
             });
         }
-        else {
-            raw = raw.split(rspackName).join(webpackName);
-        }
-    }
-    return raw;
+        return name.split(rspackName).join(webpackName);
+    }, name);
 }
 exports.replaceRuntimeModuleName = replaceRuntimeModuleName;

package/dist/helper/expect/to-match-file-snapshot.d.ts

@@ -1,12 +1,24 @@
+/// <reference types="node" />
+import type { FileMatcherOptions } from "../../../jest";
 /**
  * Match given content against content of the specified file.
  *
- * @param {string | Buffer} content Output content to match
- * @param {string} [filepath] Path to the file to match against
- * @param {{ diff?: import('jest-diff').DiffOptions }} options Additional options for matching
- * @this {{ testPath: string, currentTestName: string, assertionCalls: number, isNot: boolean, snapshotState: { added: number, updated: number, unmatched: number, _updateSnapshot: 'none' | 'new' | 'all' } }}
+ * @param content Output content to match
+ * @param filepath Path to the file to match against
+ * @param options Additional options for matching
  */
-export declare function toMatchFileSnapshot(content: any, filepath: any, options?: {}): {
-    pass: any;
+export declare function toMatchFileSnapshot(this: {
+    testPath: string;
+    currentTestName: string;
+    assertionCalls: number;
+    isNot: boolean;
+    snapshotState: {
+        added: number;
+        updated: number;
+        unmatched: number;
+        _updateSnapshot: "none" | "new" | "all";
+    };
+}, content: string | Buffer, filepath: string, options?: FileMatcherOptions): {
+    pass: boolean;
     message: () => string;
 };

package/dist/helper/expect/to-match-file-snapshot.js

@@ -14,8 +14,6 @@ const jest_diff_1 = require("jest-diff");
 const mkdirp_1 = __importDefault(require("mkdirp"));
 /**
  * Check if 2 strings or buffer are equal
- * @param {string | Buffer} a
- * @param {string | Buffer} b
  */
 const isEqual = (a, b) => {
     // @ts-ignore: TypeScript gives error if we pass string to buffer.equals
@@ -24,10 +22,9 @@ const isEqual = (a, b) => {
 /**
  * Match given content against content of the specified file.
  *
- * @param {string | Buffer} content Output content to match
- * @param {string} [filepath] Path to the file to match against
- * @param {{ diff?: import('jest-diff').DiffOptions }} options Additional options for matching
- * @this {{ testPath: string, currentTestName: string, assertionCalls: number, isNot: boolean, snapshotState: { added: number, updated: number, unmatched: number, _updateSnapshot: 'none' | 'new' | 'all' } }}
+ * @param content Output content to match
+ * @param filepath Path to the file to match against
+ * @param options Additional options for matching
  */
 function toMatchFileSnapshot(content, filepath, options = {}) {
     const { isNot, snapshotState } = this;
@@ -37,14 +34,6 @@ function toMatchFileSnapshot(content, filepath, options = {}) {
                 replacement: "-"
             }).replace(/\s/g, "-")}-${this.assertionCalls}`)
         : filepath;
-    options = {
-        // Options for jest-diff
-        diff: Object.assign({
-            expand: false,
-            contextLines: 5,
-            aAnnotation: "Snapshot"
-        }, options.diff || {})
-    };
     if (snapshotState._updateSnapshot === "none" && !node_fs_1.default.existsSync(filename)) {
         // We're probably running in CI environment
         snapshotState.unmatched++;
@@ -81,7 +70,11 @@ function toMatchFileSnapshot(content, filepath, options = {}) {
         snapshotState.unmatched++;
         const difference = Buffer.isBuffer(content) || Buffer.isBuffer(output)
             ? ""
-            : `\n\n${(0, jest_diff_1.diff)(output, content, options.diff)}`;
+            : `\n\n${(0, jest_diff_1.diff)(output, content, Object.assign({
+                expand: false,
+                contextLines: 5,
+                aAnnotation: "Snapshot"
+            }, options.diff || {}))}`;
         return {
             pass: false,
             message: () => `Received content ${chalk_1.default.red("doesn't match")} the file ${chalk_1.default.blue(node_path_1.default.basename(filename))}.${difference}`

package/dist/helper/replace-paths.js

@@ -10,16 +10,16 @@ const serializer = require("jest-serializer-path");
 const normalizePaths = serializer.normalizePaths;
 const rspackPath = node_path_1.default.resolve(__dirname, "../../../rspack");
 function replacePaths(input) {
+    const paths = input.split("\\\\").join("\\");
     const rspackRoot = normalizePaths(rspackPath);
-    input = input.split("\\\\").join("\\");
     if (node_os_1.default.platform() === "win32") {
         const winRspackRoot = rspackRoot.split("\\\\").join(node_path_1.default.win32.sep);
-        return normalizePaths(input)
+        return normalizePaths(paths)
             .split(rspackRoot)
             .join("<RSPACK_ROOT>")
             .split(winRspackRoot)
             .join("<RSPACK_ROOT>");
     }
-    return normalizePaths(input).split(rspackRoot).join("<RSPACK_ROOT>");
+    return normalizePaths(paths).split(rspackRoot).join("<RSPACK_ROOT>");
 }
 exports.replacePaths = replacePaths;

package/dist/helper/util/identifier.js

@@ -311,20 +311,20 @@ exports.parseResourceWithoutFragment = makeCacheable(_parseResourceWithoutFragme
 exports.getUndoPath = (filename, outputPath, enforceRelative) => {
     let depth = -1;
     let append = "";
-    outputPath = outputPath.replace(/[\\/]$/, "");
+    let path = outputPath.replace(/[\\/]$/, "");
     for (const part of filename.split(/[/\\]+/)) {
         if (part === "..") {
             if (depth > -1) {
                 depth--;
             }
             else {
-                const i = outputPath.lastIndexOf("/");
-                const j = outputPath.lastIndexOf("\\");
+                const i = path.lastIndexOf("/");
+                const j = path.lastIndexOf("\\");
                 const pos = i < 0 ? j : j < 0 ? i : Math.max(i, j);
                 if (pos < 0)
-                    return `${outputPath}/`;
-                append = `${outputPath.slice(pos + 1)}/${append}`;
-                outputPath = outputPath.slice(0, pos);
+                    return `${path}/`;
+                append = `${path.slice(pos + 1)}/${append}`;
+                path = path.slice(0, pos);
             }
         }
         else if (part !== ".") {

package/dist/processor/defaults.js

@@ -13,15 +13,16 @@ const cwdRegExp = new RegExp(`${quoteMeta(CURRENT_CWD)}((?:\\\\)?(?:[a-zA-Z.\\-_
 const escapedCwd = JSON.stringify(CURRENT_CWD).slice(1, -1);
 const escapedCwdRegExp = new RegExp(`${quoteMeta(escapedCwd)}((?:\\\\\\\\)?(?:[a-zA-Z.\\-_]+\\\\\\\\)*)`, "g");
 const normalize = (str) => {
+    let normalizedStr;
     if (CURRENT_CWD.startsWith("/")) {
-        str = str.replace(new RegExp(quoteMeta(CURRENT_CWD), "g"), "<cwd>");
+        normalizedStr = str.replace(new RegExp(quoteMeta(CURRENT_CWD), "g"), "<cwd>");
     }
     else {
-        str = str.replace(cwdRegExp, (m, g) => `<cwd>${g.replace(/\\/g, "/")}`);
-        str = str.replace(escapedCwdRegExp, (m, g) => `<cwd>${g.replace(/\\\\/g, "/")}`);
+        normalizedStr = str.replace(cwdRegExp, (_, g) => `<cwd>${g.replace(/\\/g, "/")}`);
+        normalizedStr = normalizedStr.replace(escapedCwdRegExp, (_, g) => `<cwd>${g.replace(/\\\\/g, "/")}`);
     }
-    str = str.replace(/@@ -\d+,\d+ \+\d+,\d+ @@/g, "@@ ... @@");
-    return str;
+    normalizedStr = normalizedStr.replace(/@@ -\d+,\d+ \+\d+,\d+ @@/g, "@@ ... @@");
+    return normalizedStr;
 };
 class Diff {
     constructor(value) {
@@ -71,12 +72,13 @@ class DefaultsConfigProcessor extends simple_1.SimpleTaskProcessor {
     static getDefaultConfig(cwd, config) {
         process.chdir(cwd);
         const { applyWebpackOptionsDefaults, getNormalizedWebpackOptions } = require("@rspack/core").config;
-        config = getNormalizedWebpackOptions(config);
-        applyWebpackOptionsDefaults(config);
+        const normalizedConfig = getNormalizedWebpackOptions(config);
+        applyWebpackOptionsDefaults(normalizedConfig);
         // make snapshot stable
-        config.experiments.rspackFuture.bundlerInfo.version = "$version$";
+        normalizedConfig.experiments.rspackFuture.bundlerInfo.version =
+            "$version$";
         process.chdir(CURRENT_CWD);
-        return config;
+        return normalizedConfig;
     }
     static addSnapshotSerializer(expectImpl) {
         expectImpl.addSnapshotSerializer({

package/dist/processor/error.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="jest" />
 /// <reference types="../jest.d.ts" />
-import type { StatsError, StatsWarnings } from "@rspack/core";
+import type { StatsError } from "@rspack/core";
 import type { ECompilerType, ITestContext, ITestEnv, TCompiler, TCompilerOptions } from "../type";
 import { SimpleTaskProcessor } from "./simple";
 type TStatsDiagnostics = {
     errors: StatsError[];
-    warnings: StatsWarnings[];
+    warnings: StatsError[];
 };
 export interface IErrorProcessorOptions<T extends ECompilerType> {
     name: string;

package/dist/processor/hook.js

@@ -106,14 +106,14 @@ class HookCasesContext extends context_1.TestContext {
      * @internal
      */
     _addSnapshot(content, name, group) {
-        content = Buffer.isBuffer(content)
+        const normalizedContent = Buffer.isBuffer(content)
             ? content
             : serialize(content, undefined, {
                 escapeString: true,
                 printBasicPrototype: true
             }).replace(/\r\n/g, "\n");
         (this.snapshots[group] = this.snapshots[group] || []).push([
-            content,
+            normalizedContent,
             name
         ]);
         if (!this.snapshotsList.includes(group)) {
@@ -133,11 +133,9 @@ class HookCasesContext extends context_1.TestContext {
             const block = this.snapshots[group || index].reduce((acc, [content, name]) => {
                 name = `## ${name || `test: ${index}`}\n\n`;
                 const block = `\`\`\`javascript\n${content}\n\`\`\`\n`;
-                return (acc += `${name + block}\n`);
+                return `${acc}${name + block}\n`;
             }, "");
-            group = Number.isInteger(group) ? `Group: ${index}` : group;
-            group = `# ${group}\n\n`;
-            return (acc += group + block);
+            return `${acc}# ${Number.isInteger(group) ? `Group: ${index}` : group}\n\n${block}`;
         }, "");
         env
             .expect(snapshots)

package/dist/processor/hot-step.js

@@ -134,21 +134,19 @@ class HotSnapshotProcessor extends hot_1.HotProcessor {
             }
         }
         const replaceContent = (str) => {
-            for (const [raw, replacement] of Object.entries(hashes)) {
-                str = str.split(raw).join(replacement);
-            }
-            // handle timestamp in css-extract
-            str = str.replace(/\/\/ (\d+)\s+(?=var cssReload)/, "");
-            return (0, helper_1.replacePaths)(str);
+            return (0, helper_1.replacePaths)(Object.entries(hashes)
+                .reduce((str, [raw, replacement]) => {
+                return str.split(raw).join(replacement);
+            }, str)
+                .replace(/\/\/ (\d+)\s+(?=var cssReload)/, ""));
         };
         const replaceFileName = (str) => {
-            for (const [raw, replacement] of Object.entries({
+            return Object.entries({
                 ...hashes,
                 ...runtimes
-            })) {
-                str = str.split(raw).join(replacement);
-            }
-            return str;
+            }).reduce((str, [raw, replacement]) => {
+                return str.split(raw).join(replacement);
+            }, str);
         };
         const fileList = stats
             .assets.map(i => {

package/dist/runner/hot-step.js

@@ -58,11 +58,11 @@ class HotStepRunnerFactory extends hot_1.HotRunnerFactory {
             testConfig: {
                 ...testConfig,
                 moduleScope(ms, stats) {
-                    if (typeof testConfig.moduleScope === "function") {
-                        ms = testConfig.moduleScope(ms, stats);
-                    }
-                    ms.NEXT = next;
-                    return ms;
+                    const moduleScope = typeof testConfig.moduleScope === "function"
+                        ? testConfig.moduleScope(ms, stats)
+                        : ms;
+                    moduleScope.NEXT = next;
+                    return moduleScope;
                 }
             },
             source,

package/dist/runner/hot.js

@@ -49,11 +49,11 @@ class HotRunnerFactory extends basic_1.BasicRunnerFactory {
             testConfig: {
                 ...testConfig,
                 moduleScope(ms, stats) {
-                    if (typeof testConfig.moduleScope === "function") {
-                        ms = testConfig.moduleScope(ms, stats);
-                    }
-                    ms.NEXT = next;
-                    return ms;
+                    const moduleScope = typeof testConfig.moduleScope === "function"
+                        ? testConfig.moduleScope(ms, stats)
+                        : ms;
+                    moduleScope.NEXT = next;
+                    return moduleScope;
                 }
             },
             source,

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

@@ -38,9 +38,7 @@ class FakeDocumentWebRunner extends cjs_1.CommonJsRunner {
         globalContext.document = this.document;
         globalContext.getComputedStyle = this.document.getComputedStyle.bind(this.document);
         const urlToPath = (url) => {
-            if (url.startsWith("https://test.cases/path/"))
-                url = url.slice(24);
-            return node_path_1.default.resolve(this._options.dist, `./${url}`);
+            return node_path_1.default.resolve(this._options.dist, `./${url.startsWith("https://test.cases/path/") ? url.slice(24) : url}`);
         };
         globalContext.fetch = async (url) => {
             try {

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

@@ -70,9 +70,9 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
     }
     createResourceLoader() {
         const urlToPath = (url) => {
-            if (url.startsWith("https://test.cases/path/"))
-                url = url.slice(24);
-            return node_path_1.default.resolve(this._webOptions.dist, `./${url}`).split("?")[0];
+            return node_path_1.default
+                .resolve(this._webOptions.dist, `./${url.startsWith("https://test.cases/path/") ? url.slice(24) : url}`)
+                .split("?")[0];
         };
         class CustomResourceLoader extends jsdom_1.ResourceLoader {
             fetch(url, _) {
@@ -97,9 +97,7 @@ class JSDOMWebRunner extends cjs_1.CommonJsRunner {
             outputDirectory: this._options.dist
         });
         const urlToPath = (url) => {
-            if (url.startsWith("https://test.cases/path/"))
-                url = url.slice(24);
-            return node_path_1.default.resolve(this._webOptions.dist, `./${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 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -93,14 +93,15 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-refresh": "^0.14.0",
-    "sass-loader": "14.2.1",
+    "sass-embedded": "^1.77.8",
+    "sass-loader": "^16.0.0",
     "style-loader": "^3.3.3",
     "source-map-loader": "^5.0.0",
     "terser": "5.27.2",
     "typescript": "5.0.2",
     "wast-loader": "^1.12.1",
-    "@rspack/core": "1.0.0-beta.2",
-    "@rspack/cli": "1.0.0-beta.2"
+    "@rspack/cli": "1.0.0-beta.3",
+    "@rspack/core": "1.0.0-beta.3"
   },
   "peerDependencies": {
     "@rspack/core": ">=0.7.0"