diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-07-11 01:21:36 +0000 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2020-07-13 12:14:26 +0200 |
| commit | d295b6ab8ecab0755c1dac8e1fa5ea08d3060809 (patch) | |
| tree | e10dcbbfa4aa87a9657712ddb08544edfa0548ef | |
| parent | 6f9f695e0d6b2f3832346d5fc7a3ae19563057d3 (diff) | |
Bump webpack-merge from 4.2.2 to 5.0.9
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.0.9.
- [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.2.2...v5.0.9)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
| -rw-r--r-- | package-lock.json | 15 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | webpack.dev.js | 2 | ||||
| -rw-r--r-- | webpack.prod.js | 2 |
4 files changed, 14 insertions, 7 deletions
diff --git a/package-lock.json b/package-lock.json index 9bd7efb1..b5847c50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20003,12 +20003,13 @@ } }, "webpack-merge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", - "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.0.9.tgz", + "integrity": "sha512-P4teh6O26xIDPugOGX61wPxaeP918QOMjmzhu54zTVcLtOS28ffPWtnv+ilt3wscwBUCL2WNMnh97XkrKqt9Fw==", "dev": true, "requires": { - "lodash": "^4.17.15" + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" } }, "webpack-sources": { @@ -20087,6 +20088,12 @@ "string-width": "^1.0.2 || 2" } }, + "wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "dev": true + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", diff --git a/package.json b/package.json index d84f61cc..cc7d40e5 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "vue-template-compiler": "^2.6.10", "webpack": "^4.43.0", "webpack-cli": "^3.3.11", - "webpack-merge": "^4.2.2" + "webpack-merge": "^5.0.9" }, "jest": { "moduleFileExtensions": [ diff --git a/webpack.dev.js b/webpack.dev.js index 49291d77..439d2b0a 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -1,4 +1,4 @@ -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const common = require('./webpack.common.js'); module.exports = merge(common, { diff --git a/webpack.prod.js b/webpack.prod.js index f081567b..4ff9c2c1 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -1,4 +1,4 @@ -const merge = require('webpack-merge') +const { merge } = require('webpack-merge') const common = require('./webpack.common.js') module.exports = merge(common, { |