Skip to content

Commit 667eae1

Browse files
committed
chore(deps): update dependency webpack-merge to v5
1 parent 964b444 commit 667eae1

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
@@ -69,7 +69,7 @@
6969
"webpack": "^4.44.2",
7070
"webpack-cli": "^3.3.12",
7171
"webpack-dev-server": "^3.11.0",
72-
"webpack-merge": "^4.2.2"
72+
"webpack-merge": "^5.0.0"
7373
},
7474
"engines": {
7575
"node": ">= 10"

yarn.lock

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,6 +2244,15 @@ clone-deep@^0.2.4:
22442244
lazy-cache "^1.0.3"
22452245
shallow-clone "^0.1.2"
22462246

2247+
clone-deep@^4.0.1:
2248+
version "4.0.1"
2249+
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
2250+
integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
2251+
dependencies:
2252+
is-plain-object "^2.0.4"
2253+
kind-of "^6.0.2"
2254+
shallow-clone "^3.0.0"
2255+
22472256
co@^4.6.0:
22482257
version "4.6.0"
22492258
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"
@@ -9157,12 +9173,13 @@ webpack-log@^2.0.0:
91579173
ansi-colors "^3.0.0"
91589174
uuid "^3.3.2"
91599175

9160-
webpack-merge@^4.2.2:
9161-
version "4.2.2"
9162-
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
9163-
integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
9176+
webpack-merge@^5.0.0:
9177+
version "5.1.4"
9178+
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.4.tgz#a2c3a0c38ac2c02055c47bb1d42de1f072f1aea4"
9179+
integrity sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==
91649180
dependencies:
9165-
lodash "^4.17.15"
9181+
clone-deep "^4.0.1"
9182+
wildcard "^2.0.0"
91669183

91679184
webpack-sources@^1.4.0, webpack-sources@^1.4.1:
91689185
version "1.4.3"
@@ -9262,6 +9279,11 @@ which@^2.0.1, which@^2.0.2:
92629279
dependencies:
92639280
isexe "^2.0.0"
92649281

9282+
wildcard@^2.0.0:
9283+
version "2.0.0"
9284+
resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
9285+
integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
9286+
92659287
windows-release@^3.1.0:
92669288
version "3.3.3"
92679289
resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.3.3.tgz#1c10027c7225743eec6b89df160d64c2e0293999"

0 commit comments

Comments
 (0)