summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--package.json2
-rw-r--r--yarn.lock9
2 files changed, 2 insertions, 9 deletions
diff --git a/package.json b/package.json
index 46ea2fff..11c88416 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
"url-loader": "4.1.1",
"webpack": "4.46.0",
"webpack-cli": "4.5.0",
- "webpack-merge": "4.2.2"
+ "webpack-merge": "5.7.3"
},
"optionalDependencies": {
"bufferutil": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index d1a26697..38e38434 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11506,14 +11506,7 @@ webpack-cli@4.5.0:
v8-compile-cache "^2.2.0"
webpack-merge "^5.7.3"
-webpack-merge@4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
- integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
- dependencies:
- lodash "^4.17.15"
-
-webpack-merge@^5.7.3:
+webpack-merge@5.7.3, webpack-merge@^5.7.3:
version "5.7.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==