Skip to content

Commit 2c5557b

Browse files
ScriptedAlchemyScriptedAlchemy
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # pnpm-lock.yaml
2 parents 13a9d9f + 29c4a4f commit 2c5557b

File tree

213 files changed

+3302
-6099
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+3302
-6099
lines changed

‎advanced-api/automatic-vendor-sharing/app1/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@rspack/dev-server": "0.7.5",
1313
"webpack": "5.92.1",
1414
"webpack-cli": "5.1.4",
15-
"webpack-dev-server": "4.15.2",
15+
"webpack-dev-server": "5.0.4",
1616
"@module-federation/enhanced": "0.2.5"
1717
},
1818
"scripts": {

‎advanced-api/automatic-vendor-sharing/app2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@rspack/dev-server": "0.7.5",
1313
"webpack": "5.92.1",
1414
"webpack-cli": "5.1.4",
15-
"webpack-dev-server": "4.15.2",
15+
"webpack-dev-server": "5.0.4",
1616
"@module-federation/enhanced": "0.2.5"
1717
},
1818
"scripts": {

‎advanced-api/dynamic-remotes-runtime-environment-variables/host/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"serve": "14.2.3",
1111
"webpack": "5.92.1",
1212
"webpack-cli": "5.1.4",
13-
"webpack-dev-server": "4.15.2",
13+
"webpack-dev-server": "5.0.4",
1414
"@rspack/core": "0.7.5",
1515
"@rspack/cli": "0.7.5",
1616
"@rspack/dev-server": "0.7.5",

‎advanced-api/dynamic-remotes-runtime-environment-variables/remote/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve": "14.2.3",
1010
"webpack": "5.92.1",
1111
"webpack-cli": "5.1.4",
12-
"webpack-dev-server": "4.15.2",
12+
"webpack-dev-server": "5.0.4",
1313
"@rspack/core": "0.7.5",
1414
"@rspack/cli": "0.7.5",
1515
"@rspack/dev-server": "0.7.5",

‎advanced-api/dynamic-remotes-synchronous-imports/app1/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve": "14.2.3",
1010
"webpack": "5.92.1",
1111
"webpack-cli": "5.1.4",
12-
"webpack-dev-server": "4.15.2",
12+
"webpack-dev-server": "5.0.4",
1313
"@module-federation/enhanced": "0.2.5"
1414
},
1515
"scripts": {

‎advanced-api/dynamic-remotes-synchronous-imports/app2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve": "14.2.3",
1010
"webpack": "5.92.1",
1111
"webpack-cli": "5.1.4",
12-
"webpack-dev-server": "4.15.2",
12+
"webpack-dev-server": "5.0.4",
1313
"@module-federation/enhanced": "0.2.5"
1414
},
1515
"scripts": {

‎advanced-api/dynamic-remotes/app1/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"serve": "14.2.3",
1515
"webpack": "5.92.1",
1616
"webpack-cli": "5.1.4",
17-
"webpack-dev-server": "4.15.2"
17+
"webpack-dev-server": "5.0.4"
1818
},
1919
"scripts": {
2020
"start": "rspack serve",

‎advanced-api/dynamic-remotes/app2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"serve": "14.2.3",
1414
"webpack": "5.92.1",
1515
"webpack-cli": "5.1.4",
16-
"webpack-dev-server": "4.15.2"
16+
"webpack-dev-server": "5.0.4"
1717
},
1818
"scripts": {
1919
"start": "rspack serve",

‎advanced-api/dynamic-remotes/app3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"serve": "14.2.3",
1414
"webpack": "5.92.1",
1515
"webpack-cli": "5.1.4",
16-
"webpack-dev-server": "4.15.2"
16+
"webpack-dev-server": "5.0.4"
1717
},
1818
"scripts": {
1919
"start": "rspack serve",

‎angular-universal-ssr/client-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
"sass-loader": "14.2.1",
4040
"ts-node": "10.9.2",
4141
"tslint": "6.1.3",
42-
"typescript": "4.9.5",
42+
"typescript": "5.5.3",
4343
"webpack": "5.92.1",
44-
"webpack-cli": "5.0.1"
44+
"webpack-cli": "5.1.4"
4545
}
4646
}

‎angular-universal-ssr/host-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"sass-loader": "14.2.1",
4444
"ts-node": "10.9.2",
4545
"tslint": "6.1.3",
46-
"typescript": "4.9.5",
46+
"typescript": "5.5.3",
4747
"webpack": "5.92.1",
48-
"webpack-cli": "5.0.1"
48+
"webpack-cli": "5.1.4"
4949
}
5050
}

‎apollo-client/app1/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
"babel-loader": "9.1.3",
4141
"rimraf": "5.0.8",
4242
"webpack": "5.92.1",
43-
"webpack-cli": "4.10.0",
44-
"webpack-merge": "5.10.0",
43+
"webpack-cli": "5.1.4",
44+
"webpack-merge": "6.0.1",
4545
"@rspack/core": "0.7.5",
4646
"@rspack/cli": "0.7.5",
4747
"@rspack/dev-server": "0.7.5"

‎apollo-client/app2/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
"babel-loader": "9.1.3",
4141
"rimraf": "5.0.8",
4242
"webpack": "5.92.1",
43-
"webpack-cli": "4.10.0",
44-
"webpack-merge": "5.10.0",
43+
"webpack-cli": "5.1.4",
44+
"webpack-merge": "6.0.1",
4545
"@rspack/core": "0.7.5",
4646
"@rspack/cli": "0.7.5",
4747
"@rspack/dev-server": "0.7.5"

‎cloud/azure-functions-node-v4/remote/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"html-webpack-plugin": "5.6.0",
2222
"rimraf": "5.0.8",
2323
"webpack": "5.92.1",
24-
"webpack-cli": "4.10.0",
25-
"webpack-dev-server": "4.15.2",
24+
"webpack-cli": "5.1.4",
25+
"webpack-dev-server": "5.0.4",
2626
"webpack-livereload-plugin": "3.0.2"
2727
},
2828
"dependencies": {

‎cloud/azure-functions-node-v4/shell/api/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"@types/react": "18.3.3",
3535
"@types/react-dom": "18.3.0",
3636
"swc-loader": "0.2.6",
37-
"typescript": "5.0.4",
38-
"webpack-cli": "5.0.2"
37+
"typescript": "5.5.3",
38+
"webpack-cli": "5.1.4"
3939
},
4040
"main": "dist/server/index.js"
4141
}

‎cloud/azure-functions-node-v4/shell/client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"swc-loader": "0.2.6",
2222
"html-webpack-plugin": "5.6.0",
2323
"webpack": "5.92.1",
24-
"webpack-cli": "4.10.0",
25-
"webpack-dev-server": "4.15.2",
24+
"webpack-cli": "5.1.4",
25+
"webpack-dev-server": "5.0.4",
2626
"webpack-livereload-plugin": "3.0.2",
2727
"@module-federation/enhanced": "0.2.5"
2828
},

‎comprehensive-demo-react16/app-01/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"react-router-dom": "^5.1.2",
1616
"serve": "^14.2.1",
1717
"webpack": "5.92.1",
18-
"webpack-cli": "^4.0.0",
18+
"webpack-cli": "^5.0.0",
1919
"@rspack/core": "0.7.5",
2020
"@module-federation/enhanced": "0.2.5",
2121
"@rspack/cli": "0.7.5",

‎comprehensive-demo-react16/app-02/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"react-router-dom": "^5.1.2",
1616
"serve": "^14.2.1",
1717
"webpack": "5.92.1",
18-
"webpack-cli": "^4.0.0",
18+
"webpack-cli": "^5.0.0",
1919
"@rspack/core": "0.7.5",
2020
"@rspack/cli": "0.7.5",
2121
"@rspack/dev-server": "0.7.5"

‎comprehensive-demo-react16/app-03/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"serve": "^14.2.1",
1515
"styled-components": "^5.0.1",
1616
"webpack": "5.92.1",
17-
"webpack-cli": "^4.0.0",
17+
"webpack-cli": "^5.0.0",
1818
"@rspack/core": "0.7.5",
1919
"@rspack/cli": "0.7.5",
2020
"@rspack/dev-server": "0.7.5"

‎comprehensive-demo-react16/app-04/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"svelte-loader": "3.2.3",
1313
"html-webpack-plugin": "5.6.0",
1414
"webpack": "5.92.1",
15-
"webpack-cli": "4.10.0",
16-
"webpack-dev-server": "4.15.2",
15+
"webpack-cli": "5.1.4",
16+
"webpack-dev-server": "5.0.4",
1717
"serve": "14.2.3",
1818
"@rspack/core": "0.7.5",
1919
"@module-federation/enhanced": "0.2.5",

‎comprehensive-demo-react16/app-05/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"@module-federation/enhanced": "0.2.5",
1818
"lit-element": "2.5.1",
1919
"ts-loader": "9.5.1",
20-
"typescript": "4.3.5",
20+
"typescript": "5.5.3",
2121
"html-webpack-plugin": "5.6.0",
2222
"webpack": "5.92.1",
23-
"webpack-cli": "4.10.0",
24-
"webpack-dev-server": "4.15.2",
23+
"webpack-cli": "5.1.4",
24+
"webpack-dev-server": "5.0.4",
2525
"serve": "14.2.3",
2626
"@rspack/core": "0.7.5",
2727
"@rspack/cli": "0.7.5",

‎comprehensive-demo-react18/app-04/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"svelte-loader": "3.2.3",
2121
"webpack": "5.92.1",
2222
"webpack-cli": "5.1.4",
23-
"webpack-dev-server": "4.15.2"
23+
"webpack-dev-server": "5.0.4"
2424
},
2525
"scripts": {
2626
"build": "cross-env NODE_ENV=production rspack build --mode production",

‎comprehensive-demo-react18/app-05/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"react-refresh": "0.14.2",
2626
"serve": "14.2.3",
2727
"ts-loader": "9.5.1",
28-
"typescript": "4.3.5",
28+
"typescript": "5.5.3",
2929
"webpack": "5.92.1",
3030
"webpack-cli": "5.1.4",
31-
"webpack-dev-server": "4.15.2"
31+
"webpack-dev-server": "5.0.4"
3232
}
3333
}

‎css-isolation/app1/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"style-loader": "4.0.0",
1212
"webpack": "5.92.1",
1313
"@module-federation/enhanced": "0.2.5",
14-
"webpack-cli": "4.10.0",
15-
"webpack-dev-server": "4.15.2",
14+
"webpack-cli": "5.1.4",
15+
"webpack-dev-server": "5.0.4",
1616
"@rspack/core": "0.7.5",
1717
"@rspack/cli": "0.7.5",
1818
"@rspack/dev-server": "0.7.5"

‎css-isolation/app2/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"serve": "14.2.3",
1111
"style-loader": "4.0.0",
1212
"webpack": "5.92.1",
13-
"webpack-cli": "4.10.0",
13+
"webpack-cli": "5.1.4",
1414
"@module-federation/enhanced": "0.2.5",
15-
"webpack-dev-server": "4.15.2",
15+
"webpack-dev-server": "5.0.4",
1616
"@rspack/core": "0.7.5",
1717
"@rspack/cli": "0.7.5",
1818
"@rspack/dev-server": "0.7.5"

‎dashboard-admin-react-rspack-material-ui/dashboard-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"html-webpack-plugin": "5.6.0",
5050
"style-loader": "4.0.0",
5151
"webpack": "5.92.1",
52-
"webpack-cli": "4.10.0",
53-
"webpack-dev-server": "4.15.2"
52+
"webpack-cli": "5.1.4",
53+
"webpack-dev-server": "5.0.4"
5454
}
5555
}

‎dashboard-admin-react-rspack-material-ui/faq-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"html-webpack-plugin": "5.6.0",
4545
"style-loader": "4.0.0",
4646
"webpack": "5.92.1",
47-
"webpack-cli": "4.10.0",
48-
"webpack-dev-server": "4.15.2"
47+
"webpack-cli": "5.1.4",
48+
"webpack-dev-server": "5.0.4"
4949
}
5050
}

‎dashboard-admin-react-rspack-material-ui/root/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"sass-loader": "14.2.1",
3838
"style-loader": "4.0.0",
3939
"webpack": "5.92.1",
40-
"webpack-cli": "4.10.0",
41-
"webpack-dev-server": "4.15.2",
40+
"webpack-cli": "5.1.4",
41+
"webpack-dev-server": "5.0.4",
4242
"webpack-pwa-manifest": "4.3.0"
4343
}
4444
}

‎dashboard-admin-react-rspack-material-ui/sidebar/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"style-loader": "4.0.0",
3838
"webpack": "5.92.1",
3939
"webpack-cli": "5.1.4",
40-
"webpack-dev-server": "4.15.2"
40+
"webpack-dev-server": "5.0.4"
4141
},
4242
"eslintConfig": {
4343
"extends": [

‎different-react-versions-16-17-typescript/app1/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"babel-loader": "9.1.3",
2727
"html-webpack-plugin": "5.6.0",
2828
"serve": "14.2.3",
29-
"typescript": "4.8.4",
29+
"typescript": "5.5.3",
3030
"webpack": "5.92.1",
31-
"webpack-cli": "4.10.0",
32-
"webpack-dev-server": "4.15.2",
31+
"webpack-cli": "5.1.4",
32+
"webpack-dev-server": "5.0.4",
3333
"@rspack/core": "0.7.5",
3434
"@rspack/cli": "0.7.5",
3535
"@rspack/dev-server": "0.7.5"

‎different-react-versions-16-17-typescript/app2/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"babel-loader": "9.1.3",
2727
"html-webpack-plugin": "5.6.0",
2828
"serve": "14.2.3",
29-
"typescript": "4.8.4",
29+
"typescript": "5.5.3",
3030
"webpack": "5.92.1",
31-
"webpack-cli": "4.10.0",
32-
"webpack-dev-server": "4.15.2",
31+
"webpack-cli": "5.1.4",
32+
"webpack-dev-server": "5.0.4",
3333
"@rspack/core": "0.7.5",
3434
"@rspack/cli": "0.7.5",
3535
"@rspack/dev-server": "0.7.5"

‎different-react-versions-16-18/app1/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"html-webpack-plugin": "5.6.0",
1313
"serve": "14.2.3",
1414
"webpack": "5.92.1",
15-
"webpack-cli": "4.10.0",
16-
"webpack-dev-server": "4.15.2",
15+
"webpack-cli": "5.1.4",
16+
"webpack-dev-server": "5.0.4",
1717
"@rspack/core": "0.7.5",
1818
"@rspack/cli": "0.7.5",
1919
"@rspack/dev-server": "0.7.5"

‎different-react-versions-16-18/app2/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"serve": "14.2.3",
1313
"webpack": "5.92.1",
1414
"@module-federation/enhanced": "0.2.5",
15-
"webpack-cli": "4.10.0",
16-
"webpack-dev-server": "4.15.2",
15+
"webpack-cli": "5.1.4",
16+
"webpack-dev-server": "5.0.4",
1717
"@rspack/core": "0.7.5",
1818
"@rspack/cli": "0.7.5",
1919
"@rspack/dev-server": "0.7.5"

‎different-react-versions-isolated/app1/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"html-webpack-plugin": "5.6.0",
99
"serve": "14.2.3",
1010
"webpack": "5.92.1",
11-
"webpack-cli": "4.10.0",
11+
"webpack-cli": "5.1.4",
1212
"@module-federation/enhanced": "0.2.5",
13-
"webpack-dev-server": "4.15.2",
13+
"webpack-dev-server": "5.0.4",
1414
"@rspack/core": "0.7.5",
1515
"@rspack/cli": "0.7.5",
1616
"@rspack/dev-server": "0.7.5"

‎different-react-versions-isolated/app2/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"serve": "14.2.3",
1010
"@module-federation/enhanced": "0.2.5",
1111
"webpack": "5.92.1",
12-
"webpack-cli": "4.10.0",
13-
"webpack-dev-server": "4.15.2",
12+
"webpack-cli": "5.1.4",
13+
"webpack-dev-server": "5.0.4",
1414
"@rspack/core": "0.7.5",
1515
"@rspack/cli": "0.7.5",
1616
"@rspack/dev-server": "0.7.5"

‎different-react-versions-typescript/app1/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
"babel-loader": "9.1.3",
2525
"html-webpack-plugin": "5.6.0",
2626
"serve": "14.2.3",
27-
"typescript": "4.8.4",
27+
"typescript": "5.5.3",
2828
"webpack": "5.92.1",
29-
"webpack-cli": "4.10.0",
30-
"webpack-dev-server": "4.15.2",
29+
"webpack-cli": "5.1.4",
30+
"webpack-dev-server": "5.0.4",
3131
"@rspack/core": "0.7.5",
3232
"@rspack/cli": "0.7.5",
3333
"@rspack/dev-server": "0.7.5"

‎different-react-versions-typescript/app2/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
"html-webpack-plugin": "5.6.0",
2525
"serve": "14.2.3",
2626
"@module-federation/enhanced": "0.2.5",
27-
"typescript": "4.8.4",
27+
"typescript": "5.5.3",
2828
"webpack": "5.92.1",
29-
"webpack-cli": "4.10.0",
30-
"webpack-dev-server": "4.15.2",
29+
"webpack-cli": "5.1.4",
30+
"webpack-dev-server": "5.0.4",
3131
"@rspack/core": "0.7.5",
3232
"@rspack/cli": "0.7.5",
3333
"@rspack/dev-server": "0.7.5"

0 commit comments

Comments
 (0)