Skip to content

Commit 394e761

Browse files
angular-robotclydin
authored andcommitted
build: update dependency webpack-merge to v6
1 parent 0d46aab commit 394e761

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
"webpack": "5.92.1",
207207
"webpack-dev-middleware": "7.2.1",
208208
"webpack-dev-server": "5.0.4",
209-
"webpack-merge": "5.10.0",
209+
"webpack-merge": "6.0.1",
210210
"webpack-subresource-integrity": "5.1.0",
211211
"yargs": "17.7.2",
212212
"yargs-parser": "21.1.1",

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"webpack": "5.92.1",
6868
"webpack-dev-middleware": "7.2.1",
6969
"webpack-dev-server": "5.0.4",
70-
"webpack-merge": "5.10.0",
70+
"webpack-merge": "6.0.1",
7171
"webpack-subresource-integrity": "5.1.0"
7272
},
7373
"optionalDependencies": {

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ __metadata:
131131
webpack: "npm:5.92.1"
132132
webpack-dev-middleware: "npm:7.2.1"
133133
webpack-dev-server: "npm:5.0.4"
134-
webpack-merge: "npm:5.10.0"
134+
webpack-merge: "npm:6.0.1"
135135
webpack-subresource-integrity: "npm:5.1.0"
136136
peerDependencies:
137137
"@angular/compiler-cli": ^18.0.0 || ^18.1.0-next.0
@@ -791,7 +791,7 @@ __metadata:
791791
webpack: "npm:5.92.1"
792792
webpack-dev-middleware: "npm:7.2.1"
793793
webpack-dev-server: "npm:5.0.4"
794-
webpack-merge: "npm:5.10.0"
794+
webpack-merge: "npm:6.0.1"
795795
webpack-subresource-integrity: "npm:5.1.0"
796796
yargs: "npm:17.7.2"
797797
yargs-parser: "npm:21.1.1"
@@ -18518,14 +18518,14 @@ __metadata:
1851818518
languageName: node
1851918519
linkType: hard
1852018520

18521-
"webpack-merge@npm:5.10.0":
18522-
version: 5.10.0
18523-
resolution: "webpack-merge@npm:5.10.0"
18521+
"webpack-merge@npm:6.0.1":
18522+
version: 6.0.1
18523+
resolution: "webpack-merge@npm:6.0.1"
1852418524
dependencies:
1852518525
clone-deep: "npm:^4.0.1"
1852618526
flat: "npm:^5.0.2"
18527-
wildcard: "npm:^2.0.0"
18528-
checksum: 10c0/b607c84cabaf74689f965420051a55a08722d897bdd6c29cb0b2263b451c090f962d41ecf8c9bf56b0ab3de56e65476ace0a8ecda4f4a4663684243d90e0512b
18527+
wildcard: "npm:^2.0.1"
18528+
checksum: 10c0/bf1429567858b353641801b8a2696ca0aac270fc8c55d4de8a7b586fe07d27fdcfc83099a98ab47e6162383db8dd63bb8cc25b1beb2ec82150422eec843b0dc0
1852918529
languageName: node
1853018530
linkType: hard
1853118531

@@ -18692,7 +18692,7 @@ __metadata:
1869218692
languageName: node
1869318693
linkType: hard
1869418694

18695-
"wildcard@npm:^2.0.0":
18695+
"wildcard@npm:^2.0.1":
1869618696
version: 2.0.1
1869718697
resolution: "wildcard@npm:2.0.1"
1869818698
checksum: 10c0/08f70cd97dd9a20aea280847a1fe8148e17cae7d231640e41eb26d2388697cbe65b67fd9e68715251c39b080c5ae4f76d71a9a69fa101d897273efdfb1b58bf7

0 commit comments

Comments
 (0)