diff --git a/package.json b/package.json index 47b9be0406..7e4dce1443 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "@types/webpack": "^4.4.27", "@types/webpack-dev-middleware": "^2.0.1", "@types/webpack-hot-middleware": "^2.16.3", - "@types/webpack-merge": "^4.1.4", + "@types/webpack-merge": "^4.1.5", "@typescript-eslint/eslint-plugin": "^1.6.0", "@typescript-eslint/parser": "^1.1.0", "asar": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index cce3fcdb7a..354340a846 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1178,10 +1178,10 @@ "@types/connect" "*" "@types/webpack" "*" -"@types/webpack-merge@^4.1.4": - version "4.1.4" - resolved "https://registry.yarnpkg.com/@types/webpack-merge/-/webpack-merge-4.1.4.tgz#48ed14b9f15919f966e7e00bb97615d4af13fe42" - integrity sha512-aAMCQFhHAugvmjykIJlxjX1lqzw5V7j6t8fYeFkMvJN1ZhUDkMOY94/7UhQJTffGP0qnKxoVoQF2zm6DHfdVMw== +"@types/webpack-merge@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/webpack-merge/-/webpack-merge-4.1.5.tgz#265fbee4810474860d0f4c17e0107032881eed47" + integrity sha512-cbDo592ljSHeaVe5Q39JKN6Z4vMhmo4+C3JbksOIg+kjhKQYN2keGN7dvr/i18+dughij98Qrsfn1mU9NgVoCA== dependencies: "@types/webpack" "*"