Skip to content

Commit 29262f1

Browse files
caohuilincaohuilin
committed
fix: resolve pnpm install for rsbuild update
1 parent 2539089 commit 29262f1

15 files changed

Lines changed: 684 additions & 1129 deletions

File tree

‎package.json‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -89,36 +89,5 @@
8989
"nx": "^22.4.2",
9090
"rimraf": "^6.0.1",
9191
"vitest": "^3.0.0"
92-
},
93-
"pnpm": {
94-
"overrides": {
95-
"h3": "^1.15.9",
96-
"tar": "^7.5.10",
97-
"micromatch": "^4.0.8",
98-
"debug": "^4.3.7",
99-
"diff": "^5.1.0",
100-
"tmp": "^0.2.6",
101-
"read-yaml-file>js-yaml": "3.14.2"
102-
},
103-
"peerDependencyRules": {
104-
"allowedVersions": {
105-
"@mdx-js/react@^1.6.22>react": "18"
106-
}
107-
},
108-
"allowedDeprecatedVersions": {
109-
"@babel/plugin-proposal-object-rest-spread": "7.12.1 || 7.20.7",
110-
"@babel/plugin-proposal-private-property-in-object": "7.21.0",
111-
"@financial-times/polyfill-useragent-normaliser": "1.10.2",
112-
"formidable": "1.2.6",
113-
"sourcemap-codec": "1.4.8",
114-
"js-polyfills": "0.1.43",
115-
"picturefill": "3.0.3",
116-
"querystring": "0.2.0",
117-
"string-similarity": "4.0.4",
118-
"source-map-resolve": "0.6.0 || 0.5.3",
119-
"@formatjs/intl-utils": "3.8.4",
120-
"uuid": "3.4.0",
121-
"trim": "0.0.1"
122-
}
12392
}
12493
}

‎packages/cli/plugin-bff/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
"memfs": "^3.5.3",
108108
"ts-jest": "^29.1.0",
109109
"typescript": "^5",
110-
"webpack": "^5.103.0",
110+
"webpack": "^5.108.0",
111111
"zod": "^3.22.3"
112112
},
113113
"sideEffects": false,

‎packages/cli/plugin-data-loader/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"supertest": "^6.1.6",
7878
"ts-jest": "^29.1.0",
7979
"typescript": "^5",
80-
"webpack": "^5.103.0"
80+
"webpack": "^5.108.0"
8181
},
8282
"peerDependencies": {
8383
"react": ">=17.0.0"

‎packages/cli/rsbuild-plugin-esbuild/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"dependencies": {
2929
"@swc/helpers": "^0.5.17",
3030
"esbuild": "0.25.5",
31-
"webpack": "^5.103.0"
31+
"webpack": "^5.108.0"
3232
},
3333
"devDependencies": {
3434
"@rsbuild/core": "1.7.6",
35-
"@rsbuild/webpack": "1.6.1",
35+
"@rsbuild/webpack": "1.7.0",
3636
"@scripts/build": "workspace:*",
3737
"typescript": "^5.4.2"
3838
},

‎packages/cli/uni-builder/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"@rsbuild/plugin-type-check": "1.5.0",
6767
"@rsbuild/plugin-typed-css-modules": "1.2.4",
6868
"@rsbuild/plugin-yaml": "1.0.5",
69-
"@rsbuild/webpack": "1.6.1",
69+
"@rsbuild/webpack": "1.7.0",
7070
"@swc/core": "1.15.8",
7171
"@swc/helpers": "^0.5.17",
7272
"autoprefixer": "10.4.23",
@@ -97,7 +97,7 @@
9797
"terser-webpack-plugin": "5.3.14",
9898
"ts-deepmerge": "7.0.2",
9999
"ts-loader": "9.4.4",
100-
"webpack": "^5.103.0",
100+
"webpack": "^5.108.0",
101101
"webpack-subresource-integrity": "5.1.0"
102102
},
103103
"devDependencies": {

‎packages/cli/uni-builder/tests/__snapshots__/default.test.ts.snap‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,8 +1358,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
13581358
"configFile": "tsconfig.json",
13591359
"memoryLimit": 8192,
13601360
"mode": "readonly",
1361-
"tsgo": false,
1362-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
1361+
"resolveRoot": "",
13631362
},
13641363
},
13651364
},
@@ -2399,8 +2398,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when node
23992398
"configFile": "tsconfig.json",
24002399
"memoryLimit": 8192,
24012400
"mode": "readonly",
2402-
"tsgo": false,
2403-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
2401+
"resolveRoot": "",
24042402
},
24052403
},
24062404
},
@@ -3833,8 +3831,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
38333831
"configFile": "tsconfig.json",
38343832
"memoryLimit": 8192,
38353833
"mode": "readonly",
3836-
"tsgo": false,
3837-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
3834+
"resolveRoot": "",
38383835
},
38393836
},
38403837
},
@@ -4799,8 +4796,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when serv
47994796
"configFile": "tsconfig.json",
48004797
"memoryLimit": 8192,
48014798
"mode": "readonly",
4802-
"tsgo": false,
4803-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
4799+
"resolveRoot": "",
48044800
},
48054801
},
48064802
},
@@ -6342,9 +6338,21 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
63426338
"id": "web",
63436339
"modulesCount": 5000,
63446340
"name": "ProgressPlugin",
6341+
"options": {
6342+
"activeModules": false,
6343+
"dependencies": true,
6344+
"dependenciesCount": 10000,
6345+
"entries": true,
6346+
"handler": [Function],
6347+
"modules": true,
6348+
"modulesCount": 5000,
6349+
"percentBy": null,
6350+
"profile": false,
6351+
},
63456352
"percentBy": null,
63466353
"prettyTime": [Function],
63476354
"profile": false,
6355+
"progressBar": false,
63486356
"showActiveModules": false,
63496357
"showDependencies": true,
63506358
"showEntries": true,
@@ -6366,8 +6374,7 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
63666374
"configFile": "tsconfig.json",
63676375
"memoryLimit": 8192,
63686376
"mode": "readonly",
6369-
"tsgo": false,
6370-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
6377+
"resolveRoot": "",
63716378
},
63726379
},
63736380
},
@@ -8052,9 +8059,21 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
80528059
"id": "web",
80538060
"modulesCount": 5000,
80548061
"name": "ProgressPlugin",
8062+
"options": {
8063+
"activeModules": false,
8064+
"dependencies": true,
8065+
"dependenciesCount": 10000,
8066+
"entries": true,
8067+
"handler": [Function],
8068+
"modules": true,
8069+
"modulesCount": 5000,
8070+
"percentBy": null,
8071+
"profile": false,
8072+
},
80558073
"percentBy": null,
80568074
"prettyTime": [Function],
80578075
"profile": false,
8076+
"progressBar": false,
80588077
"showActiveModules": false,
80598078
"showDependencies": true,
80608079
"showEntries": true,
@@ -8076,8 +8095,7 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
80768095
"configFile": "tsconfig.json",
80778096
"memoryLimit": 8192,
80788097
"mode": "readonly",
8079-
"tsgo": false,
8080-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
8098+
"resolveRoot": "",
80818099
},
80828100
},
80838101
},

‎packages/cli/uni-builder/tests/__snapshots__/environment.test.ts.snap‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,8 +1359,7 @@ exports[`uni-builder environment compat > should generator environment config co
13591359
"configFile": "tsconfig.json",
13601360
"memoryLimit": 8192,
13611361
"mode": "readonly",
1362-
"tsgo": false,
1363-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
1362+
"resolveRoot": "",
13641363
},
13651364
},
13661365
},

‎packages/cli/uni-builder/tests/__snapshots__/minimize.test.ts.snap‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,21 @@ exports[`html minify > should not apply html minify in production when disableMi
101101
"id": "web",
102102
"modulesCount": 5000,
103103
"name": "ProgressPlugin",
104+
"options": {
105+
"activeModules": false,
106+
"dependencies": true,
107+
"dependenciesCount": 10000,
108+
"entries": true,
109+
"handler": [Function],
110+
"modules": true,
111+
"modulesCount": 5000,
112+
"percentBy": null,
113+
"profile": false,
114+
},
104115
"percentBy": null,
105116
"prettyTime": [Function],
106117
"profile": false,
118+
"progressBar": false,
107119
"showActiveModules": false,
108120
"showDependencies": true,
109121
"showEntries": true,
@@ -125,8 +137,7 @@ exports[`html minify > should not apply html minify in production when disableMi
125137
"configFile": "tsconfig.json",
126138
"memoryLimit": 8192,
127139
"mode": "readonly",
128-
"tsgo": false,
129-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
140+
"resolveRoot": "",
130141
},
131142
},
132143
},
@@ -234,9 +245,21 @@ exports[`html minify > should not apply html minify when htmlPlugin.minify false
234245
"id": "web",
235246
"modulesCount": 5000,
236247
"name": "ProgressPlugin",
248+
"options": {
249+
"activeModules": false,
250+
"dependencies": true,
251+
"dependenciesCount": 10000,
252+
"entries": true,
253+
"handler": [Function],
254+
"modules": true,
255+
"modulesCount": 5000,
256+
"percentBy": null,
257+
"profile": false,
258+
},
237259
"percentBy": null,
238260
"prettyTime": [Function],
239261
"profile": false,
262+
"progressBar": false,
240263
"showActiveModules": false,
241264
"showDependencies": true,
242265
"showEntries": true,
@@ -258,8 +281,7 @@ exports[`html minify > should not apply html minify when htmlPlugin.minify false
258281
"configFile": "tsconfig.json",
259282
"memoryLimit": 8192,
260283
"mode": "readonly",
261-
"tsgo": false,
262-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
284+
"resolveRoot": "",
263285
},
264286
},
265287
},
@@ -307,9 +329,21 @@ exports[`html minify > should not apply html plugin when htmlPlugin false 1`] =
307329
"id": "web",
308330
"modulesCount": 5000,
309331
"name": "ProgressPlugin",
332+
"options": {
333+
"activeModules": false,
334+
"dependencies": true,
335+
"dependenciesCount": 10000,
336+
"entries": true,
337+
"handler": [Function],
338+
"modules": true,
339+
"modulesCount": 5000,
340+
"percentBy": null,
341+
"profile": false,
342+
},
310343
"percentBy": null,
311344
"prettyTime": [Function],
312345
"profile": false,
346+
"progressBar": false,
313347
"showActiveModules": false,
314348
"showDependencies": true,
315349
"showEntries": true,
@@ -331,8 +365,7 @@ exports[`html minify > should not apply html plugin when htmlPlugin false 1`] =
331365
"configFile": "tsconfig.json",
332366
"memoryLimit": 8192,
333367
"mode": "readonly",
334-
"tsgo": false,
335-
"typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
368+
"resolveRoot": "",
336369
},
337370
},
338371
},

‎packages/runtime/plugin-runtime/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
"ts-jest": "^29.1.0",
259259
"ts-node": "^10.9.1",
260260
"typescript": "^5",
261-
"webpack": "^5.103.0",
261+
"webpack": "^5.108.0",
262262
"@modern-js/core": "workspace:*"
263263
},
264264
"sideEffects": false,

‎packages/server/server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"ts-node": "^10.9.1",
7676
"tsconfig-paths": "4.2.0",
7777
"typescript": "^5",
78-
"webpack": "^5.103.0",
78+
"webpack": "^5.108.0",
7979
"websocket": "^1.0.35"
8080
},
8181
"peerDependencies": {

0 commit comments

Comments
 (0)