Skip to content

Commit e4e8633

Browse files
committed
chore(deps): update dependency webpack-merge to v5
1 parent eac586b commit e4e8633

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"webpack": "^4.43.0",
7171
"webpack-cli": "^3.3.11",
7272
"webpack-dev-server": "^3.10.3",
73-
"webpack-merge": "^4.2.2"
73+
"webpack-merge": "^5.0.0"
7474
},
7575
"engines": {
7676
"node": ">= 10"

yarn.lock

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2192,6 +2192,15 @@ clone-deep@^0.2.4:
21922192
lazy-cache "^1.0.3"
21932193
shallow-clone "^0.1.2"
21942194

2195+
clone-deep@^4.0.1:
2196+
version "4.0.1"
2197+
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
2198+
integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
2199+
dependencies:
2200+
is-plain-object "^2.0.4"
2201+
kind-of "^6.0.2"
2202+
shallow-clone "^3.0.0"
2203+
21952204
co@^4.6.0:
21962205
version "4.6.0"
21972206
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -7819,6 +7828,13 @@ shallow-clone@^0.1.2:
78197828
lazy-cache "^0.2.3"
78207829
mixin-object "^2.0.1"
78217830

7831+
shallow-clone@^3.0.0:
7832+
version "3.0.1"
7833+
resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
7834+
integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
7835+
dependencies:
7836+
kind-of "^6.0.2"
7837+
78227838
shebang-command@^1.2.0:
78237839
version "1.2.0"
78247840
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -9212,12 +9228,13 @@ webpack-log@^2.0.0:
92129228
ansi-colors "^3.0.0"
92139229
uuid "^3.3.2"
92149230

9215-
webpack-merge@^4.2.2:
9216-
version "4.2.2"
9217-
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
9218-
integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
9231+
webpack-merge@^5.0.0:
9232+
version "5.0.3"
9233+
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.0.3.tgz#d3bba03cc11bf43719bd058342842b16528f6779"
9234+
integrity sha512-DDbqWyHYBUxoxjysYRnfP30puLciPTZ0BQ3v3/l2OrafinwKurCQhzKUa3L7u8w469tcVWDxAbqQM13KXeij8g==
92199235
dependencies:
9220-
lodash "^4.17.15"
9236+
clone-deep "^4.0.1"
9237+
wildcard "^2.0.0"
92219238

92229239
webpack-sources@^1.4.0, webpack-sources@^1.4.1:
92239240
version "1.4.3"
@@ -9310,6 +9327,11 @@ which@^2.0.1, which@^2.0.2:
93109327
dependencies:
93119328
isexe "^2.0.0"
93129329

9330+
wildcard@^2.0.0:
9331+
version "2.0.0"
9332+
resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
9333+
integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
9334+
93139335
windows-release@^3.1.0:
93149336
version "3.3.0"
93159337
resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.3.0.tgz#dce167e9f8be733f21c849ebd4d03fe66b29b9f0"

0 commit comments

Comments
 (0)