Merge pull request #784 from nextcloud/dependabot/npm_and_yarn/js/webpack-merge-4.1.5

Bump webpack-merge from 4.1.4 to 4.1.5 in /js
This commit is contained in:
Julius Härtl
2018-12-18 20:37:45 +01:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

6
js/package-lock.json generated
View File

@@ -6991,9 +6991,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"

View File

@@ -32,7 +32,7 @@
"uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.27.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",