@rspack/test-tools 2.0.1 → 2.0.2

package/dist/case/builtin.js

@@ -7,7 +7,7 @@ exports.createBuiltinCase = createBuiltinCase;
 exports.defaultOptions = defaultOptions;
 const node_path_1 = __importDefault(require("node:path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const webpack_merge_1 = require("webpack-merge");
+const rspack_merge_1 = require("rspack-merge");
 const helper_1 = require("../helper");
 const creator_1 = require("../test/creator");
 const common_1 = require("./common");
@@ -158,7 +158,7 @@ function defaultOptions(context) {
         if (caseOptions.entry) {
             delete defaultOptions.entry;
         }
-        defaultOptions = (0, webpack_merge_1.merge)(defaultOptions, caseOptions);
+        defaultOptions = (0, rspack_merge_1.merge)(defaultOptions, caseOptions);
     }
     if (!global.printLogger) {
         defaultOptions.infrastructureLogging = {

package/dist/case/cache.js

@@ -7,6 +7,7 @@ exports.createCacheCase = createCacheCase;
 const node_path_1 = __importDefault(require("node:path"));
 const core_1 = __importDefault(require("@rspack/core"));
 const helper_1 = require("../helper");
+const placeholder_1 = require("../helper/expect/placeholder");
 const hot_update_1 = require("../helper/hot-update");
 const checkArrayExpectation_1 = __importDefault(require("../helper/legacy/checkArrayExpectation"));
 const runner_1 = require("../runner");
@@ -36,6 +37,10 @@ function createCacheProcessor(name, src, temp, target) {
         },
         check: async (env, context) => {
             await (0, common_1.check)(env, context, name);
+            const stats = context.getCompiler().getStats();
+            if (stats) {
+                matchStatsSnapshot(env, context.getSource(), updatePlugin.getUpdateIndex(), stats);
+            }
         },
         after: async (context) => {
             await (0, common_1.afterExecute)(context, name);
@@ -72,6 +77,19 @@ function createCacheCase(name, src, dist, target, temp) {
     creator.create(name, src, dist, temp);
 }
 const creators = new Map();
+function matchStatsSnapshot(env, source, updateIndex, stats) {
+    const content = (0, placeholder_1.normalizePlaceholder)(stats.toString({
+        all: false,
+        logging: 'info',
+        colors: false,
+    })).trim();
+    if (!content.includes('rspack.persistentCache')) {
+        return;
+    }
+    env
+        .expect(content)
+        .toMatchFileSnapshotSync(node_path_1.default.resolve(source, '__snapshots__', `stats-${updateIndex}.txt`));
+}
 async function generateOptions(context, temp, target, updatePlugin) {
     let options = {
         context: temp,
@@ -181,14 +199,7 @@ function createRunner(context, name, file, env) {
         });
     };
     const checkStats = async (stats) => {
-        const compilerOptions = compiler.getOptions();
-        const updateIndex = updatePlugin.getUpdateIndex();
-        await (0, checkArrayExpectation_1.default)(source, stats, 'error', `errors${updateIndex}`, 'Error', compilerOptions);
-        await (0, checkArrayExpectation_1.default)(source, stats, 'warning', `warnings${updateIndex}`, 'Warning', compilerOptions);
-    };
-    const nextHmr = async (m, options) => {
-        await updatePlugin.goNext();
-        const stats = await compiler.build();
+        matchStatsSnapshot(env, source, updatePlugin.getUpdateIndex(), stats);
         const jsonStats = stats.toJson({
             assets: true,
             chunks: true,
@@ -198,7 +209,16 @@ function createRunner(context, name, file, env) {
             chunkGroups: true,
             // errorDetails: true
         });
-        await checkStats(jsonStats);
+        const compilerOptions = compiler.getOptions();
+        const updateIndex = updatePlugin.getUpdateIndex();
+        await (0, checkArrayExpectation_1.default)(source, jsonStats, 'error', `errors${updateIndex}`, 'Error', compilerOptions);
+        await (0, checkArrayExpectation_1.default)(source, jsonStats, 'warning', `warnings${updateIndex}`, 'Warning', compilerOptions);
+        return jsonStats;
+    };
+    const nextHmr = async (m, options) => {
+        await updatePlugin.goNext();
+        const stats = await compiler.build();
+        const jsonStats = await checkStats(stats);
         const updatedModules = await m.hot.check(options || true);
         if (!updatedModules) {
             throw new Error('No update available');
@@ -211,14 +231,7 @@ function createRunner(context, name, file, env) {
         compilerIndex++;
         compiler.createCompiler();
         const stats = await compiler.build();
-        const jsonStats = stats.toJson({
-            assets: true,
-            chunks: true,
-            entrypoints: true,
-            chunkGroups: true,
-            // errorDetails: true
-        });
-        await checkStats(jsonStats);
+        const jsonStats = await checkStats(stats);
         env.it(`NEXT_START run with compilerIndex==${compilerIndex}`, async () => {
             return getWebRunner().run(file);
         });
@@ -233,14 +246,7 @@ function createRunner(context, name, file, env) {
         compilerIndex++;
         compiler.createCompiler();
         const stats = await compiler.build();
-        const jsonStats = stats.toJson({
-            assets: true,
-            chunks: true,
-            entrypoints: true,
-            chunkGroups: true,
-            // errorDetails: true
-        });
-        await checkStats(jsonStats);
+        const jsonStats = await checkStats(stats);
         env.it(`NEXT_MOVE_DIR_START run with compilerIndex==${compilerIndex}`, async () => {
             return getWebRunner().run(file);
         });

package/dist/case/common.js

@@ -14,7 +14,7 @@ exports.findMultiCompilerBundle = findMultiCompilerBundle;
 exports.configMultiCompiler = configMultiCompiler;
 const node_path_1 = __importDefault(require("node:path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const webpack_merge_1 = __importDefault(require("webpack-merge"));
+const rspack_merge_1 = __importDefault(require("rspack-merge"));
 const helper_1 = require("../helper");
 const placeholder_1 = require("../helper/expect/placeholder");
 const checkArrayExpectation_1 = __importDefault(require("../helper/legacy/checkArrayExpectation"));
@@ -245,7 +245,7 @@ function configMultiCompiler(context, name, configFiles, defaultOptions, overrid
         })
         : [{}];
     for (const [index, options] of caseOptions.entries()) {
-        const compilerOptions = (0, webpack_merge_1.default)(typeof defaultOptions === 'function'
+        const compilerOptions = (0, rspack_merge_1.default)(typeof defaultOptions === 'function'
             ? defaultOptions(index, context)
             : {}, options);
         if (typeof overrideOptions === 'function') {

package/dist/case/diagnostic.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDiagnosticCase = createDiagnosticCase;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_path_1 = __importDefault(require("node:path"));
-const webpack_merge_1 = __importDefault(require("webpack-merge"));
+const rspack_merge_1 = __importDefault(require("rspack-merge"));
 const helper_1 = require("../helper");
 const placeholder_1 = require("../helper/expect/placeholder");
 const creator_1 = require("../test/creator");
@@ -20,7 +20,7 @@ const creator = new creator_1.BasicCaseCreator({
                 let options = defaultOptions(context);
                 const custom = (0, helper_1.readConfigFile)(['rspack.config.js', 'webpack.config.js'].map((i) => context.getSource(i)), context, options)[0];
                 if (custom) {
-                    options = (0, webpack_merge_1.default)(options, custom);
+                    options = (0, rspack_merge_1.default)(options, custom);
                 }
                 if (!global.printLogger) {
                     options.infrastructureLogging = {

package/dist/case/error.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createErrorCase = createErrorCase;
 const node_path_1 = __importDefault(require("node:path"));
-const webpack_merge_1 = __importDefault(require("webpack-merge"));
+const rspack_merge_1 = __importDefault(require("rspack-merge"));
 const creator_1 = require("../test/creator");
 let addedSerializer = false;
 const creator = new creator_1.BasicCaseCreator({
@@ -93,7 +93,7 @@ function options(context, custom) {
         },
     };
     if (typeof custom === 'function') {
-        options = (0, webpack_merge_1.default)(options, custom(context, options));
+        options = (0, rspack_merge_1.default)(options, custom(context, options));
     }
     if (options.mode === 'production') {
         if (options.optimization)

package/dist/case/hook.js

@@ -10,7 +10,7 @@ const core_1 = require("@rspack/core");
 const jest_snapshot_1 = require("jest-snapshot");
 const path_serializer_1 = require("path-serializer");
 const pretty_format_1 = require("pretty-format");
-const webpack_merge_1 = __importDefault(require("webpack-merge"));
+const rspack_merge_1 = __importDefault(require("rspack-merge"));
 const context_1 = require("../test/context");
 const creator_1 = require("../test/creator");
 const common_1 = require("./common");
@@ -221,7 +221,7 @@ function defaultOptions(context, custom) {
         },
     };
     if (custom) {
-        defaultOptions = (0, webpack_merge_1.default)(defaultOptions, custom(context));
+        defaultOptions = (0, rspack_merge_1.default)(defaultOptions, custom(context));
     }
     return defaultOptions;
 }

package/dist/case/watch.js

@@ -10,7 +10,7 @@ exports.getWatchRunnerKey = getWatchRunnerKey;
 exports.createWatchRunner = createWatchRunner;
 const node_path_1 = __importDefault(require("node:path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const webpack_merge_1 = __importDefault(require("webpack-merge"));
+const rspack_merge_1 = __importDefault(require("rspack-merge"));
 const compiler_1 = require("../compiler");
 const helper_1 = require("../helper");
 const checkArrayExpectation_1 = __importDefault(require("../helper/legacy/checkArrayExpectation"));
@@ -36,7 +36,7 @@ function createWatchInitialProcessor(name, tempDir, step, watchState, { incremen
             const multiCompilerOptions = [];
             const caseOptions = (0, helper_1.readConfigFile)(['rspack.config.js', 'webpack.config.js'].map((i) => context.getSource(i)), context, {});
             for (const [index, options] of caseOptions.entries()) {
-                const compilerOptions = (0, webpack_merge_1.default)(defaultOptions({
+                const compilerOptions = (0, rspack_merge_1.default)(defaultOptions({
                     incremental,
                     ignoreNotFriendlyForIncrementalWarnings: testConfig.ignoreNotFriendlyForIncrementalWarnings,
                 }), options);

package/dist/compiler.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestCompilerManager = exports.ECompilerEvent = void 0;
 const node_events_1 = __importDefault(require("node:events"));
 const core_1 = require("@rspack/core");
-const webpack_merge_1 = __importDefault(require("webpack-merge"));
+const rspack_merge_1 = __importDefault(require("rspack-merge"));
 const debug_1 = require("./test/debug");
 var ECompilerEvent;
 (function (ECompilerEvent) {
@@ -32,7 +32,7 @@ class TestCompilerManager {
         return this.compilerOptions;
     }
     mergeOptions(newOptions) {
-        this.compilerOptions = (0, webpack_merge_1.default)(this.compilerOptions, newOptions);
+        this.compilerOptions = (0, rspack_merge_1.default)(this.compilerOptions, newOptions);
         this.emitter.emit(ECompilerEvent.Option, this.compilerOptions);
         return this.compilerOptions;
     }

package/dist/helper/util/checkStats.js

@@ -17,7 +17,7 @@ exports.checkChunkModules = function checkChunkModules(statsJson, chunkModulesMa
     return true;
 };
 function getChunk(statsJson, id) {
-    const chunk = statsJson.chunks.find((chunk) => chunk.id.includes(id));
+    const chunk = statsJson.chunks.find((chunk) => String(chunk.id).includes(String(id)));
     if (!chunk) {
         throw new Error(`cannot find chunk with id: ${id}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/test-tools",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "MIT",
   "description": "Test tools for rspack",
   "main": "dist/index.js",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@babel/generator": "7.29.1",
-    "@babel/parser": "7.29.2",
+    "@babel/parser": "7.29.3",
     "@babel/traverse": "7.29.0",
     "@babel/types": "7.29.0",
     "chalk": "^4.1.2",
@@ -50,15 +50,15 @@
     "jest-diff": "^30.3.0",
     "jest-snapshot": "29.7.0",
     "jsdom": "^26.1.0",
-    "memfs": "4.53.0",
+    "memfs": "4.57.2",
     "path-serializer": "0.6.0",
     "pretty-format": "30.3.0",
     "rimraf": "^5.0.10",
     "source-map": "^0.7.6",
-    "terser-webpack-plugin": "^5.4.0",
+    "rspack-merge": "0.1.1",
+    "terser-webpack-plugin": "^5.5.0",
     "wast-loader": "^1.14.1",
     "webpack": "5.104.1",
-    "webpack-merge": "6.0.1",
     "webpack-sources": "3.3.4"
   },
   "devDependencies": {
@@ -67,7 +67,7 @@
     "@types/fs-extra": "11.0.4",
     "@types/jsdom": "^21.1.7",
     "typescript": "^6.0.3",
-    "@rspack/core": "2.0.1"
+    "@rspack/core": "2.0.2"
   },
   "peerDependencies": {
     "@rspack/core": ">=1.0.0"