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] <support@dependabot.com>
This commit is contained in:
dependabot[bot]
2018-12-10 02:21:16 +00:00
parent 0296b8dd37
commit 07857a2309
2 changed files with 4 additions and 4 deletions

6
js/package-lock.json generated
View File

@@ -7029,9 +7029,9 @@
} }
}, },
"webpack-merge": { "webpack-merge": {
"version": "4.1.4", "version": "4.1.5",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz",
"integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.5" "lodash": "^4.17.5"

View File

@@ -32,7 +32,7 @@
"uglifyjs-webpack-plugin": "^2.0.1", "uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.26.1", "webpack": "^4.26.1",
"webpack-cli": "^3.1.2", "webpack-cli": "^3.1.2",
"webpack-merge": "^4.1.4" "webpack-merge": "^4.1.5"
}, },
"scripts": { "scripts": {
"build": "./node_modules/webpack-cli/bin/cli.js --mode production --config webpack.prod.config.js", "build": "./node_modules/webpack-cli/bin/cli.js --mode production --config webpack.prod.config.js",