about summary refs log tree commit diff
path: root/config/webpack/development.js
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2020-11-05 02:21:28 +0900
committerGitHub <noreply@github.com>2020-11-05 02:21:28 +0900
commitab009985035dcad87cfd2bfaafaa76f6a03291e7 (patch)
tree87d479f8b99724ae4fc50e8f0ab3d7045e3d4a8f /config/webpack/development.js
parente16b0fb15a7ef2607f080e8c0b884c1cf37e5ebb (diff)
Bump webpack-merge from 4.2.2 to 5.0.9 (#14424)
* 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[bot] <support@github.com>

* Fix import path

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Diffstat (limited to 'config/webpack/development.js')
-rw-r--r--config/webpack/development.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/development.js b/config/webpack/development.js
index 774ecbc07..c3cf1b655 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -1,6 +1,6 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const sharedConfig = require('./shared');
 const { settings, output } = require('./configuration');