summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--webpack.dev.js2
-rw-r--r--webpack.prod.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/webpack.dev.js b/webpack.dev.js
index 0e84f7a4..7c7edb61 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -1,6 +1,6 @@
const common = require('./webpack.common.js')
const htmlexport = require('./webpack.htmlexport')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge');
module.exports = [
// merge common config
diff --git a/webpack.prod.js b/webpack.prod.js
index 4dfac1a8..5c523c06 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -1,6 +1,6 @@
const common = require('./webpack.common.js')
const htmlexport = require('./webpack.htmlexport')
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge');
const path = require('path')
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')