chore(deps): bump Rspack and Rsbuild to v1.1

e2e/package.json

@@ -15,23 +15,23 @@
     "vue": "^3.5.12"
   },
   "devDependencies": {
-    "webpack": "^5.95.0",
     "@playwright/test": "1.33.0",
+    "@rsdoctor/cli": "workspace:*",
     "@rsdoctor/core": "workspace:*",
     "@rsdoctor/rspack-plugin": "workspace:*",
     "@rsdoctor/sdk": "workspace:*",
     "@rsdoctor/types": "workspace:*",
     "@rsdoctor/utils": "workspace:*",
     "@rsdoctor/webpack-plugin": "workspace:*",
-    "@rsdoctor/cli": "workspace:*",
-    "@rspack/core": "1.0.14",
+    "@rspack/core": "^1.1.1",
     "@types/lodash": "^4.17.13",
     "@types/node": "^16",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "fast-glob": "^3.3.2",
     "loader-utils": "^2.0.4",
     "playwright": "1.33.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "webpack": "^5.95.0"
   }
 }

examples/modern-minimal/package.json

@@ -15,9 +15,9 @@
     "react-dom": "^18"
   },
   "devDependencies": {
+    "@modern-js/app-tools": "^2.60.3",
     "@modern-js/runtime": "^2.60.3",
     "@rsdoctor/webpack-plugin": "workspace:*",
-    "@modern-js/app-tools": "^2.60.3",
     "@types/node": "^16",
     "@types/react": "^18",
     "@types/react-dom": "^18",

examples/multiple-minimal/package.json

@@ -16,11 +16,11 @@
   "devDependencies": {
     "@arco-design/web-react": "2.29.2",
     "@arco-plugins/webpack-react": "1.4.9-beta.2",
+    "@rsdoctor/tsconfig": "workspace:*",
+    "@rsdoctor/webpack-plugin": "workspace:*",
     "@types/node": "^16",
     "@types/react": "^18",
     "@types/react-dom": "18.0.8",
-    "@rsdoctor/tsconfig": "workspace:*",
-    "@rsdoctor/webpack-plugin": "workspace:*",
     "css-loader": "6.7.3",
     "eslint": "8.22.0",
     "less-loader": "11.1.0",

examples/rsbuild-minimal/package.json

@@ -21,8 +21,8 @@
     "semver7": "npm:[email protected]"
   },
   "devDependencies": {
-    "@rsbuild/core": "0.7.5",
-    "@rsbuild/plugin-react": "0.7.5",
+    "@rsbuild/core": "^1.1.1",
+    "@rsbuild/plugin-react": "^1.0.7",
     "@rsdoctor/core": "workspace:*",
     "@rsdoctor/rspack-plugin": "workspace:*",
     "@types/react": "^18",

examples/rspack-banner-minimal/package.json

@@ -18,14 +18,14 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "tsm": "2.3.0",
     "@rsdoctor/rspack-plugin": "workspace:*",
-    "@rspack/cli": "1.0.0",
-    "@rspack/core": "1.0.0",
+    "@rspack/cli": "^1.1.1",
+    "@rspack/core": "^1.1.1",
     "@rspack/plugin-react-refresh": "1.0.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "react-refresh": "^0.14.0",
+    "tsm": "2.3.0",
     "web-vitals": "^2.1.4"
   },
   "browserslist": {

examples/rspack-minimal/package.json

@@ -20,14 +20,14 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "tsm": "2.3.0",
     "@rsdoctor/rspack-plugin": "workspace:*",
-    "@rspack/cli": "1.0.0",
-    "@rspack/core": "1.0.0",
+    "@rspack/cli": "^1.1.1",
+    "@rspack/core": "^1.1.1",
     "@rspack/plugin-react-refresh": "1.0.0",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.8",
     "react-refresh": "^0.14.0",
+    "tsm": "2.3.0",
     "web-vitals": "^2.1.4"
   },
   "browserslist": {

packages/client/package.json

@@ -28,11 +28,11 @@
     "dist/"
   ],
   "devDependencies": {
-    "@rsbuild/core": "0.7.10",
-    "@rsbuild/plugin-node-polyfill": "0.7.10",
-    "@rsbuild/plugin-react": "0.7.10",
-    "@rsbuild/plugin-sass": "0.7.10",
-    "@rsbuild/plugin-type-check": "0.7.10",
+    "@rsbuild/core": "^1.1.1",
+    "@rsbuild/plugin-node-polyfill": "^1.2.0",
+    "@rsbuild/plugin-react": "^1.0.7",
+    "@rsbuild/plugin-sass": "^1.1.0",
+    "@rsbuild/plugin-type-check": "^1.0.1",
     "@rsdoctor/components": "workspace:*",
     "@rsdoctor/types": "workspace:*",
     "@types/node": "^16",

packages/client/rsbuild.config.ts

@@ -181,10 +181,10 @@ export default defineConfig(({ env }) => {
     server: {
       port: PortForWeb,
       historyApiFallback: true,
+      open: ENABLE_CLIENT_SERVER ? undefined : true,
     },
 
     dev: {
-      startUrl: ENABLE_CLIENT_SERVER ? undefined : true,
       setupMiddlewares: [
         (middlewares) => {
           if (fs.existsSync(WebpackRsdoctorDirPath)) {

packages/core/package.json

@@ -83,7 +83,7 @@
     "webpack-bundle-analyzer": "^4.10.2"
   },
   "devDependencies": {
-    "@rspack/core": "1.0.14",
+    "@rspack/core": "^1.1.1",
     "@scripts/test-helper": "workspace:*",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.13",

packages/core/src/inner-plugins/utils/config.ts

@@ -1,10 +1,13 @@
 import { Common, Linter, Plugin, SDK } from '@rsdoctor/types';
 import assert from 'assert';
-import type { RuleSetCondition as RspackRuleSetCondition } from '@rspack/core';
+import type {
+  RuleSetCondition as RspackRuleSetCondition,
+  RuleSetRule as RspackRuleSetRule,
+} from '@rspack/core';
 import {
-  RuleSetCondition,
-  RuleSetConditionAbsolute,
-  RuleSetRule,
+  RuleSetCondition as WebpackRuleSetCondition,
+  RuleSetConditionAbsolute as WebpackRuleSetConditionAbsolute,
+  RuleSetRule as WebpackRuleSetRule,
 } from 'webpack';
 import {
   RsdoctorWebpackPluginOptions,
@@ -119,9 +122,9 @@ export function normalizeUserConfig<Rules extends Linter.ExtendRuleData[]>(
 
 export function makeRuleSetSerializable(
   item:
-    | RuleSetConditionAbsolute
-    | RuleSetCondition
     | RspackRuleSetCondition
+    | WebpackRuleSetConditionAbsolute
+    | WebpackRuleSetCondition
     | void,
 ) {
   if (!item) return;
@@ -139,7 +142,10 @@ export function makeRuleSetSerializable(
 }
 
 export function makeRulesSerializable(
-  rules: Plugin.RuleSetRule[] | RuleSetRule['oneOf'],
+  rules:
+    | Plugin.RuleSetRule[]
+    | RspackRuleSetRule['oneOf']
+    | WebpackRuleSetRule['oneOf'],
 ) {
   if (!Array.isArray(rules)) return;
 

packages/document/package.json

@@ -25,6 +25,7 @@
   },
   "devDependencies": {
     "@rsdoctor/types": "workspace:*",
+    "@rspress/plugin-rss": "^1.33.1",
     "@types/node": "^16",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
@@ -34,12 +35,11 @@
     "rsbuild-plugin-open-graph": "^1.0.2",
     "rspress-plugin-font-open-sans": "^1.0.0",
     "rspress-plugin-sitemap": "^1.1.1",
-    "@rspress/plugin-rss": "^1.33.1",
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "react-markdown": "^9.0.1",
     "@rstack-dev/doc-ui": "1.5.3",
+    "react-markdown": "^9.0.1",
     "rspress": "^1.33.1"
   }
 }

packages/rspack-plugin/package.json

@@ -22,12 +22,12 @@
     "@rsdoctor/core": "workspace:*",
     "@rsdoctor/graph": "workspace:*",
     "@rsdoctor/sdk": "workspace:*",
+    "@rsdoctor/types": "workspace:*",
     "@rsdoctor/utils": "workspace:*",
-    "lodash": "^4.17.21",
-    "@rsdoctor/types": "workspace:*"
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@rspack/core": "1.0.14",
+    "@rspack/core": "^1.1.1",
     "@types/lodash": "^4.17.13",
     "@types/node": "^16",
     "@types/tapable": "2.2.7",

packages/sdk/src/sdk/sdk/index.ts

@@ -563,7 +563,7 @@ export class RsdoctorSDK<
     // Extract scripts and links from the HTML
     const scriptSrcs = Array.from(
       htmlContent.matchAll(
-        /<script\s+defer="defer"\s+src=["'](.+?)["']><\/script>/g,
+        /<script\s+(?:defer="defer"|defer)\s+src=["'](.+?)["']><\/script>/g,
       ),
       (m) => m[1],
     );

packages/types/package.json

@@ -24,11 +24,11 @@
     "source-map": "^0.7.4"
   },
   "devDependencies": {
+    "@rspack/core": "^1.1.1",
     "@types/node": "^16",
     "@types/react": "^18.3.12",
     "tslib": "2.7.0",
-    "typescript": "^5.2.2",
-    "@rspack/core": "1.0.14"
+    "typescript": "^5.2.2"
   },
   "peerDependencies": {
     "@rspack/core": "*",

packages/webpack-plugin/package.json

@@ -20,21 +20,21 @@
   },
   "dependencies": {
     "@rsdoctor/core": "workspace:*",
-    "@rsdoctor/sdk": "workspace:*",
     "@rsdoctor/graph": "workspace:*",
-    "@rsdoctor/utils": "workspace:*",
+    "@rsdoctor/sdk": "workspace:*",
     "@rsdoctor/types": "workspace:*",
+    "@rsdoctor/utils": "workspace:*",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "webpack": "^5.95.0",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.13",
     "@types/node": "^16",
     "@types/tapable": "2.2.7",
     "tslib": "2.7.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "webpack": "^5.95.0"
   },
   "peerDependencies": {
     "webpack": "5.x"