Skip to content

Commit 7f75a46

Browse files
chore(deps): update dependency @types/webpack-merge to v5
1 parent ea8183a commit 7f75a46

File tree

2 files changed

+42
-7
lines changed

2 files changed

+42
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@types/memory-fs": "^0.3.2",
3737
"@types/node": "^14.14.10",
3838
"@types/webpack": "^4.41.26",
39-
"@types/webpack-merge": "^4.1.5",
39+
"@types/webpack-merge": "^5.0.0",
4040
"@typescript-eslint/eslint-plugin": "^4.15.0",
4141
"@typescript-eslint/parser": "^4.15.0",
4242
"babel-loader": "^8.1.0",

yarn.lock

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -895,12 +895,12 @@
895895
dependencies:
896896
source-map "^0.6.1"
897897

898-
"@types/webpack-merge@^4.1.5":
899-
version "4.1.5"
900-
resolved "https://registry.yarnpkg.com/@types/webpack-merge/-/webpack-merge-4.1.5.tgz#265fbee4810474860d0f4c17e0107032881eed47"
901-
integrity sha512-cbDo592ljSHeaVe5Q39JKN6Z4vMhmo4+C3JbksOIg+kjhKQYN2keGN7dvr/i18+dughij98Qrsfn1mU9NgVoCA==
898+
"@types/webpack-merge@^5.0.0":
899+
version "5.0.0"
900+
resolved "https://registry.yarnpkg.com/@types/webpack-merge/-/webpack-merge-5.0.0.tgz#818a13948c1642bde7e2f4f079335a5f85365699"
901+
integrity sha512-CFedsXD/7vmJ66PaC3eavdqqNZujWlvdkGFcizi0QPtDswK75DV7a5GTKzL9Ev6d0okLurq+ebQjwIEFmP9aZw==
902902
dependencies:
903-
"@types/webpack" "*"
903+
webpack-merge "*"
904904

905905
"@types/webpack-sources@*":
906906
version "2.1.0"
@@ -911,7 +911,7 @@
911911
"@types/source-list-map" "*"
912912
source-map "^0.7.3"
913913

914-
"@types/webpack@*", "@types/webpack@^4.41.26":
914+
"@types/webpack@^4.41.26":
915915
version "4.41.26"
916916
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.26.tgz#27a30d7d531e16489f9c7607c747be6bc1a459ef"
917917
integrity sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA==
@@ -2247,6 +2247,15 @@ clone-deep@^0.2.4:
22472247
lazy-cache "^1.0.3"
22482248
shallow-clone "^0.1.2"
22492249

2250+
clone-deep@^4.0.1:
2251+
version "4.0.1"
2252+
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
2253+
integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
2254+
dependencies:
2255+
is-plain-object "^2.0.4"
2256+
kind-of "^6.0.2"
2257+
shallow-clone "^3.0.0"
2258+
22502259
co@^4.6.0:
22512260
version "4.6.0"
22522261
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -3666,6 +3675,11 @@ flat-cache@^3.0.4:
36663675
flatted "^3.1.0"
36673676
rimraf "^3.0.2"
36683677

3678+
flat@^5.0.2:
3679+
version "5.0.2"
3680+
resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
3681+
integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
3682+
36693683
flatted@^3.1.0:
36703684
version "3.1.1"
36713685
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
@@ -7539,6 +7553,13 @@ shallow-clone@^0.1.2:
75397553
lazy-cache "^0.2.3"
75407554
mixin-object "^2.0.1"
75417555

7556+
shallow-clone@^3.0.0:
7557+
version "3.0.1"
7558+
resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
7559+
integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
7560+
dependencies:
7561+
kind-of "^6.0.2"
7562+
75427563
shebang-command@^1.2.0:
75437564
version "1.2.0"
75447565
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -8875,6 +8896,15 @@ webpack-log@^2.0.0:
88758896
ansi-colors "^3.0.0"
88768897
uuid "^3.3.2"
88778898

8899+
webpack-merge@*:
8900+
version "6.0.1"
8901+
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-6.0.1.tgz#50c776868e080574725abc5869bd6e4ef0a16c6a"
8902+
integrity sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==
8903+
dependencies:
8904+
clone-deep "^4.0.1"
8905+
flat "^5.0.2"
8906+
wildcard "^2.0.1"
8907+
88788908
webpack-merge@^4.2.2:
88798909
version "4.2.2"
88808910
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
@@ -8973,6 +9003,11 @@ which@^2.0.1, which@^2.0.2:
89739003
dependencies:
89749004
isexe "^2.0.0"
89759005

9006+
wildcard@^2.0.1:
9007+
version "2.0.1"
9008+
resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
9009+
integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
9010+
89769011
windows-release@^3.1.0:
89779012
version "3.3.3"
89789013
resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.3.3.tgz#1c10027c7225743eec6b89df160d64c2e0293999"

0 commit comments

Comments
 (0)