diff options
author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-09-01 15:58:09 +0300 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-09-01 17:39:38 +0300 |
commit | bee8702a433b2850e3687647b157b5ce17ed91f4 (patch) | |
tree | 6bfd4966f0883c19d94350ac9805c5d18445682d | |
parent | 0ee6e1215a91c78f6c61679956b84e3218c0e478 (diff) |
Bump webpack-merge from 4.2.2 to 5.1.3
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.1.3.
- [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.1.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
-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 | ||||
-rw-r--r-- | webpack.test.js | 2 |
5 files changed, 35 insertions, 8 deletions
diff --git a/package-lock.json b/package-lock.json index 5cd1d6b68..13e8f799b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3806,6 +3806,17 @@ } } }, + "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", @@ -11199,6 +11210,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" + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -13358,12 +13378,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.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.3.tgz", + "integrity": "sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==", "dev": true, "requires": { - "lodash": "^4.17.15" + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" } }, "webpack-node-externals": { @@ -13442,6 +13463,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 cd73e18f0..1e96c2f8c 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.43.0", "webpack-cli": "^3.3.12", - "webpack-merge": "^4.2.2", + "webpack-merge": "^5.1.3", "webpack-node-externals": "^1.7.2" } } diff --git a/webpack.dev.js b/webpack.dev.js index db837f09b..5f60c6db1 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, { diff --git a/webpack.test.js b/webpack.test.js index 76e18fa12..9a5b4d98b 100644 --- a/webpack.test.js +++ b/webpack.test.js @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const common = require('./webpack.common.js'); // webpack.config.js const nodeExternals = require('webpack-node-externals') |