diff --git a/package.json b/package.json index 33707be6..ea155042 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "webpack-bundle-analyzer": "^3.5.1", "webpack-dev-middleware": "^1.10.0", "webpack-hot-middleware": "^2.16.1", - "webpack-merge": "^2.6.1" + "webpack-merge": "^4.2.2" }, "license": "MIT", "homepage": "https://shentao.github.io/vue-multiselect/", diff --git a/yarn.lock b/yarn.lock index 65d7d002..54ea30cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11705,19 +11705,12 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-2.6.1.tgz#f1d801d2c5d39f83ffec9f119240b3e3be994a1c" - integrity sha1-8dgB0sXTn4P/7J8RkkCz476ZShw= - dependencies: - lodash "^4.17.4" - -webpack-merge@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b" - integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ== +webpack-merge@^4.1.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.5" + lodash "^4.17.15" webpack-sources@^0.1.0: version "0.1.5"