summaryrefslogtreecommitdiffstats
path: root/webpack.common.js
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-07-18 01:16:07 +0000
committerMorris Jobke <hey@morrisjobke.de>2020-07-30 16:38:05 +0200
commitd7845570c05f5c2640ce1ff8e27d0b881d950c86 (patch)
tree628001f497902861a9a2bf332ba9788f6d9351b5 /webpack.common.js
parenta32e6a795868f4d26983b26502d2588b3e6fd80e (diff)
downloadnextcloud-server-d7845570c05f5c2640ce1ff8e27d0b881d950c86.tar.gz
nextcloud-server-d7845570c05f5c2640ce1ff8e27d0b881d950c86.zip
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>
Diffstat (limited to 'webpack.common.js')
-rw-r--r--webpack.common.js2
1 files changed, 1 insertions, 1 deletions
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')