diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-07-13 10:57:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 10:57:38 +0000 |
| commit | c3c5b214d2c2b56b33b58799253511af182a8c00 (patch) | |
| tree | 662364e1439761bce2c65d9d5bb4d0a7ff541822 | |
| parent | 3520f5e6ddd42a09d126e164aa357b787e444e96 (diff) | |
| parent | d295b6ab8ecab0755c1dac8e1fa5ea08d3060809 (diff) | |
Merge pull request #942 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.0.9
| -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 f597ebcf..0bd6901d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20263,12 +20263,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": { @@ -20347,6 +20348,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 471167ee..a550c631 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, { |