diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-07-18 01:16:07 +0000 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2020-07-30 16:38:05 +0200 |
| commit | d7845570c05f5c2640ce1ff8e27d0b881d950c86 (patch) | |
| tree | 628001f497902861a9a2bf332ba9788f6d9351b5 /core/webpack.test.js | |
| parent | a32e6a795868f4d26983b26502d2588b3e6fd80e (diff) | |
| download | nextcloud-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 'core/webpack.test.js')
| -rw-r--r-- | core/webpack.test.js | 4 |
1 files changed, 2 insertions, 2 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') |