chore: resolve conflict

.github/renovate.json5

@@ -62,6 +62,11 @@
 		"socket.io-client",
 		"react-router-dom",
 		"tsx",
-		"@types/estree"
+		"@types/estree",
+		"playwright",
+		"@babel/code-frame",
+		"get-port",
+		"chalk",
+		"deep-eql"
 	]
 }

.husky/post-checkout

@@ -1,5 +1,4 @@
 #!/bin/sh
-HUSKY_SCRIPT="$(dirname "$0")/_/husky.sh"
 
 if [ -f "$HUSKY_SCRIPT" ]; then
     . "$HUSKY_SCRIPT"

.husky/pre-commit

@@ -1,4 +1,3 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 
 npx --no-install nano-staged

e2e/cases/doctor-webpack/plugins/multi-plugin-brief.test.ts

@@ -0,0 +1,56 @@
+import { expect, test } from '@playwright/test';
+import { getSDK } from '@rsdoctor/core/plugins';
+import { compileByWebpack5 } from '@scripts/test-helper';
+import path from 'path';
+import { Compiler } from 'webpack';
+import { createRsdoctorMultiPlugin } from '../test-utils';
+
+async function webpack(tapName: string, compile: typeof compileByWebpack5) {
+  const file = path.resolve(__dirname, '../fixtures/a.js');
+  const loader = path.resolve(__dirname, '../fixtures/loaders/comment.js');
+  const res = await compile(file, {
+    module: {
+      rules: [
+        {
+          test: /\.js/,
+          use: loader,
+        },
+      ],
+    },
+    plugins: [
+      createRsdoctorMultiPlugin({
+        mode: 'brief',
+        brief: {
+          reportHtmlName: '111.html',
+          writeDataJson: false,
+        },
+      }),
+      {
+        name: tapName,
+        apply(compiler: Compiler) {
+          compiler.hooks.done.tapPromise(tapName, async () => {
+            // nothing
+          });
+          compiler.hooks.thisCompilation.tap(tapName, (compilation) => {
+            compilation.hooks.seal.tap(tapName, () => {
+              return 'seal end';
+            });
+          });
+        },
+      },
+    ],
+  });
+  return res;
+}
+
+test('rsdoctor webpack5 multi-plugins options tests', async () => {
+  const tapName = 'Foo';
+  await webpack(tapName, compileByWebpack5);
+  const sdk = getSDK();
+  expect(sdk.type).toBe(0);
+  expect(sdk.extraConfig?.mode).toBe('brief');
+  expect(sdk.extraConfig?.brief).toMatchObject({
+    reportHtmlName: '111.html',
+    writeDataJson: false,
+  });
+});

e2e/cases/doctor-webpack/test-utils.ts

@@ -1,5 +1,8 @@
 import { RsdoctorWebpackPluginOptions } from '@rsdoctor/core/types';
-import { RsdoctorWebpackPlugin } from '@rsdoctor/webpack-plugin';
+import {
+  RsdoctorWebpackPlugin,
+  RsdoctorWebpackMultiplePlugin,
+} from '@rsdoctor/webpack-plugin';
 import { Linter } from '@rsdoctor/types';
 import { File } from '@rsdoctor/utils/build';
 import { tmpdir } from 'os';
@@ -35,3 +38,34 @@ export function createRsdoctorPlugin<T extends Linter.ExtendRuleData[]>(
 
   return plugin;
 }
+
+export function createRsdoctorMultiPlugin<T extends Linter.ExtendRuleData[]>(
+  options: RsdoctorWebpackPluginOptions<T> = {},
+) {
+  const plugin = new RsdoctorWebpackMultiplePlugin({
+    ...options,
+    disableClientServer:
+      typeof options.disableClientServer === 'boolean'
+        ? options.disableClientServer
+        : true,
+  });
+
+  const outdir = path.resolve(
+    tmpdir(),
+    `./${Date.now()}/web_doctor_webpack_plugin_test`,
+  );
+
+  plugin.sdk.hooks.afterSaveManifest.tapPromise(
+    { name: 'REMOVE_TMP_DIR', stage: -9999 },
+    async () => {
+      plugin.sdk.setOutputDir(outdir);
+      try {
+        await File.fse.remove(plugin.sdk.outputDir);
+      } catch (e) {
+        console.error(e);
+      }
+    },
+  );
+
+  return plugin;
+}

e2e/package.json

@@ -23,7 +23,7 @@
     "@rsdoctor/types": "workspace:*",
     "@rsdoctor/utils": "workspace:*",
     "@rsdoctor/webpack-plugin": "workspace:*",
-    "@rspack/core": "^1.1.1",
+    "@rspack/core": "^1.1.4",
     "@types/lodash": "^4.17.13",
     "@types/node": "^16",
     "@types/react": "^18.3.12",

e2e/playwright.config.ts

@@ -2,4 +2,5 @@ import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
   testMatch: ['/cases/**/**.test.ts'],
+  timeout: 60000,
 });

examples/rspack-banner-minimal/rspack.config.js

@@ -83,7 +83,7 @@ const config = {
     new ReactRefreshPlugin(),
     new RsdoctorRspackPlugin({
       disableClientServer: process.env.ENABLE_CLIENT_SERVER === 'false',
-      features: ['bundle', 'plugins', 'loader'],
+      features: ['bundle', 'plugins', 'loader', 'treeShaking', 'resolver'],
     }),
     new rspack.BannerPlugin({
       test: /\.js/,

package.json

@@ -16,7 +16,7 @@
     "dev:doc": "cd document && pnpm run dev",
     "e2e": "cd ./e2e && cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm test",
     "lint": "biome lint . --diagnostic-level=error",
-    "prepare": "pnpm run build && husky install",
+    "prepare": "pnpm run build && husky",
     "test": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm run ut",
     "test:all": "pnpm run test && pnpm run e2e",
     "sort-package-json": "npx sort-package-json \"packages/*/package.json\"",
@@ -33,14 +33,14 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.5.1",
-    "@changesets/cli": "^2.27.9",
-    "@modern-js/module-tools": "^2.62.0",
+    "@changesets/cli": "^2.27.10",
+    "@modern-js/module-tools": "^2.63.0",
     "@rsdoctor/tsconfig": "workspace:*",
     "@scripts/test-helper": "workspace:*",
     "check-dependency-version-consistency": "^4.1.0",
     "cross-env": "^7.0.3",
     "cspell-ban-words": "^0.0.4",
-    "husky": "^8.0.3",
+    "husky": "^9.1.7",
     "nano-staged": "^0.8.0",
     "nx": "^17.3.2",
     "prettier": "^3.3.3",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/cli",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -32,10 +32,10 @@
     "@rsdoctor/sdk": "workspace:*",
     "@rsdoctor/types": "workspace:*",
     "@rsdoctor/utils": "workspace:*",
-    "axios": "^1.7.7",
+    "axios": "^1.7.8",
     "ora": "^5.4.1",
     "picocolors": "^1.1.1",
-    "tslib": "2.7.0",
+    "tslib": "2.8.1",
     "yargs": "17.7.2"
   },
   "publishConfig": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/client",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "main": "dist/index.html",
   "repository": {
     "type": "git",
@@ -28,11 +28,11 @@
     "dist/"
   ],
   "devDependencies": {
-    "@rsbuild/core": "^1.1.3",
+    "@rsbuild/core": "^1.1.7",
     "@rsbuild/plugin-node-polyfill": "^1.2.0",
     "@rsbuild/plugin-react": "^1.0.7",
     "@rsbuild/plugin-sass": "^1.1.1",
-    "@rsbuild/plugin-type-check": "^1.0.1",
+    "@rsbuild/plugin-type-check": "^1.1.0",
     "@rsdoctor/components": "workspace:*",
     "@rsdoctor/types": "workspace:*",
     "@types/node": "^16",

packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/components",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "main": "./dist/index.js",
   "license": "MIT",
   "module": "dist/index.js",
@@ -50,8 +50,8 @@
     "dist/"
   ],
   "devDependencies": {
+    "@ant-design/icons": "5.5.2",
     "@rsbuild/plugin-check-syntax": "1.2.0-beta.1",
-    "@ant-design/icons": "5.5.1",
     "@monaco-editor/react": "4.6.0",
     "@rsdoctor/graph": "workspace:*",
     "@rsdoctor/types": "workspace:*",
@@ -64,7 +64,7 @@
     "@types/url-parse": "1.4.11",
     "ansi-to-react": "6.1.6",
     "antd": "5.15.3",
-    "axios": "^1.7.7",
+    "axios": "^1.7.8",
     "dayjs": "1.11.13",
     "echarts": "^5.5.1",
     "echarts-for-react": "^3.0.2",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -72,7 +72,7 @@
     "@rsdoctor/sdk": "workspace:*",
     "@rsdoctor/types": "workspace:*",
     "@rsdoctor/utils": "workspace:*",
-    "axios": "^1.7.7",
+    "axios": "^1.7.8",
     "enhanced-resolve": "5.12.0",
     "filesize": "^10.1.6",
     "fs-extra": "^11.1.1",
@@ -85,7 +85,7 @@
     "browserslist-load-config": "^1.0.0"
   },
   "devDependencies": {
-    "@rspack/core": "^1.1.1",
+    "@rspack/core": "^1.1.4",
     "@scripts/test-helper": "workspace:*",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.13",
@@ -97,7 +97,7 @@
     "babel-loader": "9.1.3",
     "string-loader": "0.0.1",
     "ts-loader": "^9.5.1",
-    "tslib": "2.7.0",
+    "tslib": "2.8.1",
     "typescript": "^5.2.2",
     "webpack": "^5.95.0"
   },

packages/core/src/build-utils/common/webpack/compatible.ts

@@ -45,12 +45,12 @@ export function isExternalModule(mod: Module): mod is ExternalModule {
 export function getModuleSource(mod: NormalModule): string {
   return isExternalModule(mod)
     ? ''
-    : mod.originalSource?.()?.source().toString() ?? '';
+    : (mod.originalSource?.()?.source().toString() ?? '');
 }
 
 export function getResolveModule(dep: Dependency, graph?: ModuleGraph) {
   // webpack5
-  if (graph) {
+  if (graph && 'getResolvedModule' in graph) {
     return graph.getResolvedModule(dep);
   }
 

packages/core/src/inner-plugins/plugins/ensureModulesChunkGraph.ts

@@ -3,7 +3,7 @@ import { RsdoctorPluginInstance } from '@/types';
 import { ModuleGraph } from '@rsdoctor/graph';
 import { Linter, Plugin, Constants, Manifest } from '@rsdoctor/types';
 import { Process } from '@rsdoctor/utils/build';
-import { debug } from '@rsdoctor/utils/logger';
+import { chalk, debug, logger } from '@rsdoctor/utils/logger';
 import fse from 'fs-extra';
 import {
   Chunks as ChunksBuildUtils,
@@ -37,8 +37,7 @@ export const ensureModulesChunksGraphFn = (
     internalPluginTapPreOptions('moduleGraph'),
     async (_stats: any) => {
       const stats = _stats as Plugin.Stats;
-      const statsJson = stats.toJson();
-
+      const statsJson = stats.toJson(); // TODO: need optimize this stats.toJSON 's stats options.
       debug(Process.getMemoryUsageMessage, '[Before Generate ModuleGraph]');
 
       _this.chunkGraph = ChunksBuildUtils.chunkTransform(new Map(), statsJson);
@@ -57,6 +56,15 @@ export const ensureModulesChunksGraphFn = (
 
       /** Tree Shaking */
       if (_this.options.features.treeShaking) {
+        if ('rspackVersion' in compiler.webpack) {
+          logger.info(
+            chalk.yellow(
+              'Rspack currently does not support treeShaking capabilities.',
+            ),
+          );
+          return;
+        }
+
         _this.modulesGraph =
           ModuleGraphBuildUtils.appendTreeShaking(
             _this.modulesGraph,

packages/document/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/docs",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "scripts": {
     "dev": "rspress dev",
     "build": "rspress build",
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@rsdoctor/types": "workspace:*",
-    "@rspress/plugin-rss": "^1.36.0",
+    "@rspress/plugin-rss": "^1.37.3",
     "@types/node": "^16",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
@@ -40,6 +40,6 @@
   "dependencies": {
     "@rstack-dev/doc-ui": "1.5.4",
     "react-markdown": "^9.0.1",
-    "rspress": "^1.36.0"
+    "rspress": "^1.37.3"
   }
 }

packages/graph/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/graph",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -32,7 +32,7 @@
     "@types/lodash": "^4.17.13",
     "@types/node": "^16",
     "fs-extra": "^11.1.1",
-    "tslib": "2.7.0",
+    "tslib": "2.8.1",
     "typescript": "^5.2.2"
   },
   "publishConfig": {

packages/rspack-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/rspack-plugin",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -27,11 +27,11 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@rspack/core": "^1.1.1",
+    "@rspack/core": "^1.1.4",
     "@types/lodash": "^4.17.13",
     "@types/node": "^16",
     "@types/tapable": "2.2.7",
-    "tslib": "2.7.0",
+    "tslib": "2.8.1",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {