From 10f4fd64ec8751c96a06181485ebe4722fc9e28e Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 4 Jun 2020 22:03:09 +0000 Subject: [PATCH] fix: upgrade webpack-merge from 4.1.4 to 4.2.2 Snyk has created this PR to upgrade webpack-merge from 4.1.4 to 4.2.2. See this package in NPM: https://www.npmjs.com/package/webpack-merge See this project in Snyk: https://app.snyk.io/org/vegemite/project/96c3e364-637e-425f-926a-785c99556c60?utm_source=github&utm_medium=upgrade-pr --- package-lock.json | 17 ++++++++++++----- package.json | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5af6b1..8751efb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "zendesk_app_framework_sdk", - "version": "2.0.31", + "version": "2.0.33", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -8233,11 +8233,18 @@ } }, "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==", "requires": { - "lodash": "^4.17.5" + "lodash": "^4.17.15" + }, + "dependencies": { + "lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + } } }, "webpack-sources": { diff --git a/package.json b/package.json index 0e85f1e..6d072b2 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "native-promise-only": "^0.8.1", "webpack": "^4.25.1", "webpack-cli": "^3.1.0", - "webpack-merge": "^4.1.4" + "webpack-merge": "^4.2.2" }, "devDependencies": { "chai": "^4.1.2",