@@ -5,14 +5,14 @@ process.env.NODE_ENV = 'development'
55const utils = require ( './utils' )
66const webpack = require ( 'webpack' )
77const config = require ( '../config' )
8- const merge = require ( 'webpack-merge' )
8+ const { merge } = require ( 'webpack-merge' )
99const path = require ( 'path' )
1010const baseWebpackConfig = require ( './webpack.base.conf' )
1111const CopyWebpackPlugin = require ( 'copy-webpack-plugin' )
1212const HtmlWebpackPlugin = require ( 'html-webpack-plugin' )
1313const FriendlyErrorsPlugin = require ( 'friendly-errors-webpack-plugin' )
1414const portfinder = require ( 'portfinder' )
15- const VueLoaderPlugin = require ( 'vue-loader/lib/plugin' ) ;
15+ const { VueLoaderPlugin } = require ( 'vue-loader' )
1616const cesiumSource = 'node_modules/cesium/Source'
1717const cesiumWorkers = '../Build/Cesium/Workers'
1818const GitRevisionPlugin = require ( 'git-revision-webpack-plugin' )
@@ -32,27 +32,26 @@ const devWebpackConfig = merge(baseWebpackConfig, {
3232
3333 // these devServer options should be customized in /config/index.js
3434 devServer : {
35- clientLogLevel : 'warning' ,
35+ client : {
36+ overlay : config . dev . errorOverlay
37+ ? { warnings : false , errors : true }
38+ : false ,
39+ logging : 'warn' ,
40+
41+ } ,
3642 historyApiFallback : {
3743 rewrites : [
3844 { from : / .* / , to : path . posix . join ( config . dev . assetsPublicPath , 'index.html' ) } ,
3945 ] ,
4046 } ,
4147 hot : true ,
42- contentBase : false , // since we use CopyWebpackPlugin.
48+ static : "./" ,
4349 compress : true ,
4450 host : HOST || config . dev . host ,
4551 port : PORT || config . dev . port ,
4652 open : config . dev . autoOpenBrowser ,
47- overlay : config . dev . errorOverlay
48- ? { warnings : false , errors : true }
49- : false ,
50- publicPath : config . dev . assetsPublicPath ,
53+ // publicPath: config.dev.assetsPublicPath,
5154 proxy : config . dev . proxyTable ,
52- quiet : false , // necessary for FriendlyErrorsPlugin
53- watchOptions : {
54- poll : config . dev . poll ,
55- }
5655 } ,
5756 plugins : [
5857 new webpack . DefinePlugin ( {
0 commit comments