diff --git a/webpack.dev.js b/webpack.dev.js index d4992df..3889752 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -1,10 +1,10 @@ -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const common = require('./webpack.common.js'); module.exports = merge(common, { mode: 'development', devtool: 'inline-source-map', devServer: { - contentBase: './dist', + static: './dist', } }); \ No newline at end of file diff --git a/webpack.prod.js b/webpack.prod.js index f2f3252..0320293 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -1,5 +1,5 @@ const webpack = require('webpack'); -const merge = require('webpack-merge'); +const { merge } = require('webpack-merge'); const common = require('./webpack.common.js'); const Terser = require('terser-webpack-plugin');