@@ -5,14 +5,14 @@ process.env.NODE_ENV = 'development'
5
5
const utils = require ( './utils' )
6
6
const webpack = require ( 'webpack' )
7
7
const config = require ( '../config' )
8
- const merge = require ( 'webpack-merge' )
8
+ const { merge } = require ( 'webpack-merge' )
9
9
const path = require ( 'path' )
10
10
const baseWebpackConfig = require ( './webpack.base.conf' )
11
11
const CopyWebpackPlugin = require ( 'copy-webpack-plugin' )
12
12
const HtmlWebpackPlugin = require ( 'html-webpack-plugin' )
13
13
const FriendlyErrorsPlugin = require ( 'friendly-errors-webpack-plugin' )
14
14
const portfinder = require ( 'portfinder' )
15
- const VueLoaderPlugin = require ( 'vue-loader/lib/plugin' ) ;
15
+ const { VueLoaderPlugin } = require ( 'vue-loader' )
16
16
const cesiumSource = 'node_modules/cesium/Source'
17
17
const cesiumWorkers = '../Build/Cesium/Workers'
18
18
const GitRevisionPlugin = require ( 'git-revision-webpack-plugin' )
@@ -32,27 +32,26 @@ const devWebpackConfig = merge(baseWebpackConfig, {
32
32
33
33
// these devServer options should be customized in /config/index.js
34
34
devServer : {
35
- clientLogLevel : 'warning' ,
35
+ client : {
36
+ overlay : config . dev . errorOverlay
37
+ ? { warnings : false , errors : true }
38
+ : false ,
39
+ logging : 'warn' ,
40
+
41
+ } ,
36
42
historyApiFallback : {
37
43
rewrites : [
38
44
{ from : / .* / , to : path . posix . join ( config . dev . assetsPublicPath , 'index.html' ) } ,
39
45
] ,
40
46
} ,
41
47
hot : true ,
42
- contentBase : false , // since we use CopyWebpackPlugin.
48
+ static : "./" ,
43
49
compress : true ,
44
50
host : HOST || config . dev . host ,
45
51
port : PORT || config . dev . port ,
46
52
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,
51
54
proxy : config . dev . proxyTable ,
52
- quiet : false , // necessary for FriendlyErrorsPlugin
53
- watchOptions : {
54
- poll : config . dev . poll ,
55
- }
56
55
} ,
57
56
plugins : [
58
57
new webpack . DefinePlugin ( {
0 commit comments