From 07857a2309deb46d2f7731d450d6c5ccbc720520 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 10 Dec 2018 02:21:16 +0000 Subject: [PATCH] Bump webpack-merge from 4.1.4 to 4.1.5 in /js Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/commits) Signed-off-by: dependabot[bot] --- js/package-lock.json | 6 +++--- js/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/package-lock.json b/js/package-lock.json index 26f0fd053..eb241d786 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -7029,9 +7029,9 @@ } }, "webpack-merge": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz", - "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz", + "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/js/package.json b/js/package.json index 398b86a24..a1da60cf7 100644 --- a/js/package.json +++ b/js/package.json @@ -32,7 +32,7 @@ "uglifyjs-webpack-plugin": "^2.0.1", "webpack": "^4.26.1", "webpack-cli": "^3.1.2", - "webpack-merge": "^4.1.4" + "webpack-merge": "^4.1.5" }, "scripts": { "build": "./node_modules/webpack-cli/bin/cli.js --mode production --config webpack.prod.config.js",