Skip to content

Commit e364221

Browse files
chore: webpack-merge
1 parent e6b7cee commit e364221

File tree

2 files changed

+35
-10
lines changed

2 files changed

+35
-10
lines changed

packages/webpack-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"import-local": "^3.0.2",
4747
"interpret": "^3.1.1",
4848
"rechoir": "^0.8.0",
49-
"webpack-merge": "^5.7.3"
49+
"webpack-merge": "^6.0.1"
5050
},
5151
"devDependencies": {
5252
"@types/envinfo": "^7.8.1"

yarn.lock

+34-9
Original file line numberDiff line numberDiff line change
@@ -9643,7 +9643,16 @@ string-length@^5.0.1:
96439643
char-regex "^2.0.0"
96449644
strip-ansi "^7.0.1"
96459645

9646-
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
9646+
"string-width-cjs@npm:string-width@^4.2.0":
9647+
version "4.2.3"
9648+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
9649+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
9650+
dependencies:
9651+
emoji-regex "^8.0.0"
9652+
is-fullwidth-code-point "^3.0.0"
9653+
strip-ansi "^6.0.1"
9654+
9655+
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
96479656
version "4.2.3"
96489657
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
96499658
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9684,7 +9693,14 @@ string_decoder@~1.1.1:
96849693
dependencies:
96859694
safe-buffer "~5.1.0"
96869695

9687-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
9696+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
9697+
version "6.0.1"
9698+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
9699+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
9700+
dependencies:
9701+
ansi-regex "^5.0.1"
9702+
9703+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
96889704
version "6.0.1"
96899705
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
96909706
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10343,14 +10359,14 @@ webpack-dev-server@^5.1.0:
1034310359
webpack-dev-middleware "^7.4.2"
1034410360
ws "^8.18.0"
1034510361

10346-
webpack-merge@^5.7.3:
10347-
version "5.10.0"
10348-
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
10349-
integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
10362+
webpack-merge@^6.0.1:
10363+
version "6.0.1"
10364+
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-6.0.1.tgz#50c776868e080574725abc5869bd6e4ef0a16c6a"
10365+
integrity sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==
1035010366
dependencies:
1035110367
clone-deep "^4.0.1"
1035210368
flat "^5.0.2"
10353-
wildcard "^2.0.0"
10369+
wildcard "^2.0.1"
1035410370

1035510371
webpack-sources@^3.2.3:
1035610372
version "3.2.3"
@@ -10434,7 +10450,7 @@ [email protected]:
1043410450
dependencies:
1043510451
string-width "^1.0.2 || 2 || 3 || 4"
1043610452

10437-
wildcard@^2.0.0:
10453+
wildcard@^2.0.1:
1043810454
version "2.0.1"
1043910455
resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
1044010456
integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
@@ -10449,7 +10465,7 @@ wordwrap@^1.0.0:
1044910465
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
1045010466
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
1045110467

10452-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
10468+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
1045310469
version "7.0.0"
1045410470
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
1045510471
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10467,6 +10483,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
1046710483
string-width "^4.1.0"
1046810484
strip-ansi "^6.0.0"
1046910485

10486+
wrap-ansi@^7.0.0:
10487+
version "7.0.0"
10488+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
10489+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
10490+
dependencies:
10491+
ansi-styles "^4.0.0"
10492+
string-width "^4.1.0"
10493+
strip-ansi "^6.0.0"
10494+
1047010495
wrap-ansi@^8.1.0:
1047110496
version "8.1.0"
1047210497
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)