diff --git a/package.json b/package.json index de1f5aa..1380703 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "umi-plugin-react": "^1.4.2", "webpack": "4.28.0", "webpack-cli": "^3.2.1", - "webpack-merge": "^4.2.1" + "webpack-merge": "^5.7.3" }, "dependencies": { "@ant-design/icons": "^4.3.0", diff --git a/yarn.lock b/yarn.lock index 2b3c274..49b28cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18895,13 +18895,21 @@ webpack-merge@4.2.1: dependencies: lodash "^4.17.5" -webpack-merge@^4.2.1, webpack-merge@^4.2.2: +webpack-merge@^4.2.2: version "4.2.2" resolved "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-4.2.2.tgz?cache=0&sync_timestamp=1608705506214&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" integrity sha1-onxS6ng9E5iv0gh/VH17nS9DY00= dependencies: lodash "^4.17.15" +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== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + webpack-node-externals@1.7.2: version "1.7.2" resolved "https://registry.npm.taobao.org/webpack-node-externals/download/webpack-node-externals-1.7.2.tgz?cache=0&sync_timestamp=1598275529056&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-node-externals%2Fdownload%2Fwebpack-node-externals-1.7.2.tgz#6e1ee79ac67c070402ba700ef033a9b8d52ac4e3" @@ -19084,6 +19092,11 @@ widest-line@^2.0.0: dependencies: string-width "^2.1.1" +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + with-open-file@^0.1.6: version "0.1.7" resolved "https://registry.npm.taobao.org/with-open-file/download/with-open-file-0.1.7.tgz#e2de8d974e8a8ae6e58886be4fe8e7465b58a729"