From 9eab136f53d87a503276eb691dd25a1325232009 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 14 Aug 2018 19:23:39 +0000 Subject: [PATCH] Bump webpack-merge from 4.1.3 to 4.1.4 in /js Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.3 to 4.1.4. - [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/compare/v4.1.3...v4.1.4) 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 cb08c106b..2bbdf6e84 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -7845,9 +7845,9 @@ } }, "webpack-merge": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz", - "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz", + "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/js/package.json b/js/package.json index 7ff75a5ad..53ea2ce4d 100644 --- a/js/package.json +++ b/js/package.json @@ -30,7 +30,7 @@ "node-sass": "^4.9.2", "webpack": "^4.16.5", "webpack-cli": "^3.1.0", - "webpack-merge": "^4.1.3" + "webpack-merge": "^4.1.4" }, "scripts": { "build": "./node_modules/webpack-cli/bin/cli.js --mode production --config webpack.prod.config.js",