diff options
| -rw-r--r-- | core/webpack.test.js | 4 | ||||
| -rw-r--r-- | package-lock.json | 35 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | webpack.common.js | 2 | ||||
| -rw-r--r-- | webpack.dev.js | 2 | ||||
| -rw-r--r-- | webpack.prod.js | 2 |
6 files changed, 37 insertions, 10 deletions
diff --git a/core/webpack.test.js b/core/webpack.test.js index 024348fe879..f87d8bd9d92 100644 --- a/core/webpack.test.js +++ b/core/webpack.test.js @@ -1,4 +1,4 @@ -/* +/** * @copyright 2018 Christoph Wurst <christoph@winzerhof-wurst.at> * * @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at> @@ -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.js'); // webpack.config.js const nodeExternals = require('webpack-node-externals') diff --git a/package-lock.json b/package-lock.json index 534f190ec28..bfc33cc5fba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5746,6 +5746,17 @@ "wrap-ansi": "^5.1.0" } }, + "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" + } + }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -11838,6 +11849,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", @@ -13459,12 +13479,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-node-externals": { @@ -13567,6 +13588,12 @@ } } }, + "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 6e24895c93c..0d4906b3f96 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "vue-template-compiler": "^2.6.11", "webpack": "^4.43.0", "webpack-cli": "^3.3.12", - "webpack-merge": "^4.2.2", + "webpack-merge": "^5.0.9", "webpack-node-externals": "^1.7.2" }, "browserslist": [ diff --git a/webpack.common.js b/webpack.common.js index d03617d77d8..d304828e578 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -1,6 +1,6 @@ /* eslint-disable camelcase */ const path = require('path') -const merge = require('webpack-merge') +const { merge } = require('webpack-merge') const { VueLoaderPlugin } = require('vue-loader') const accessibility = require('./apps/accessibility/webpack') diff --git a/webpack.dev.js b/webpack.dev.js index 8de803b5683..95b82b823a4 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 = common.map( diff --git a/webpack.prod.js b/webpack.prod.js index 02f21f80ced..9a2477e7d70 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') const TerserPlugin = require('terser-webpack-plugin'); |