diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-08-31 11:51:55 +0300 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-08-31 11:51:55 +0300 |
| commit | 0fc82a15666ee03e8b44509e44deec884649ff39 (patch) | |
| tree | 6eebc3a96197d940513afddcba93f6b68d870ce4 /js | |
| parent | 7bee633b5f67504615a9326e51d21ef105f743de (diff) | |
Fix building
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
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, { |