diff --git a/package-lock.json b/package-lock.json index a342e8bc..72914f1e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6461,7 +6461,7 @@ "dependencies": { "resolve": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", "dev": true } @@ -25775,12 +25775,12 @@ } }, "webpack-merge": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz", - "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", + "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "dev": true, "requires": { - "lodash": "^4.17.5" + "lodash": "^4.17.15" } }, "webpack-sources": { diff --git a/package.json b/package.json index 5a41f325..9bd17588 100644 --- a/package.json +++ b/package.json @@ -289,6 +289,6 @@ "webpack-cli": "^3.3.10", "webpack-dev-server": "^3.10.1", "webpack-hot-middleware": "^2.25.0", - "webpack-merge": "^4.1.4" + "webpack-merge": "^4.2.2" } }