diff options
Diffstat (limited to 'js')
-rw-r--r-- | js/webpack.dev.config.js | 3 | ||||
-rw-r--r-- | js/webpack.prod.config.js | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/js/webpack.dev.config.js b/js/webpack.dev.config.js index 827569c..fd4a085 100644 --- a/js/webpack.dev.config.js +++ b/js/webpack.dev.config.js @@ -1,4 +1,5 @@ -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); + const baseConfig = require('./webpack.base.config.js'); module.exports = merge(baseConfig, { diff --git a/js/webpack.prod.config.js b/js/webpack.prod.config.js index add49e1..734c1f2 100644 --- a/js/webpack.prod.config.js +++ b/js/webpack.prod.config.js @@ -1,5 +1,6 @@ -var webpack = require('webpack'); -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); +const webpack = require('webpack'); + const baseConfig = require('./webpack.base.config.js'); module.exports = merge(baseConfig, { |