diff options
| author | Julius Härtl <jus@bitgrid.net> | 2020-09-07 10:05:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 10:05:55 +0300 |
| commit | 5a76e4d2f80eaf26bca222d0132500ae4a37d9fb (patch) | |
| tree | a14ff77c7baec9c2bd86f0f239ff717b863edde6 | |
| parent | 9f91501511744026354e466499f5106619af0389 (diff) | |
| parent | 5280085204904cc812736f21925519be238cbd7a (diff) | |
Merge pull request #986 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.2
Bump webpack-merge from 4.2.2 to 5.1.2
| -rw-r--r-- | package-lock.json | 35 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | webpack.dev.js | 2 | ||||
| -rw-r--r-- | webpack.prod.js | 2 |
4 files changed, 34 insertions, 7 deletions
diff --git a/package-lock.json b/package-lock.json index 58488002c..3cda82b0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7079,6 +7079,17 @@ "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", "dev": true }, + "clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + } + }, "clone-regexp": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz", @@ -16633,6 +16644,15 @@ "safe-buffer": "^5.0.1" } }, + "shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dev": true, + "requires": { + "kind-of": "^6.0.2" + } + }, "shasum": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz", @@ -19190,12 +19210,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.1.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.2.tgz", + "integrity": "sha512-/slG0Kh0OKTf0zxdFJlhQHzv8bU9gUYVK5DkBjB3i/yoc1Xx4ADG0KITGO5S/6cqn2Ug43+8VR6Sz8daA/c+5g==", "dev": true, "requires": { - "lodash": "^4.17.15" + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" } }, "webpack-sources": { @@ -19257,6 +19278,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 860180e97..8fa79ada9 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "vue-template-compiler": "^2.6.11", "webpack": "^4.44.1", "webpack-cli": "^3.3.12", - "webpack-merge": "^4.2.2" + "webpack-merge": "^5.1.2" }, "jest": { "verbose": true, diff --git a/webpack.dev.js b/webpack.dev.js index 49291d777..439d2b0a4 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 f081567bd..4ff9c2c1a 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, { |