Skip to content

Commit e775051

Browse files
Update more dependencies
1 parent 6c334de commit e775051

File tree

5 files changed

+30179
-20496
lines changed

5 files changed

+30179
-20496
lines changed

build/webpack.dev.conf.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ process.env.NODE_ENV = 'development'
55
const utils = require('./utils')
66
const webpack = require('webpack')
77
const config = require('../config')
8-
const merge = require('webpack-merge')
8+
const { merge } = require('webpack-merge')
99
const path = require('path')
1010
const baseWebpackConfig = require('./webpack.base.conf')
1111
const CopyWebpackPlugin = require('copy-webpack-plugin')
1212
const HtmlWebpackPlugin = require('html-webpack-plugin')
1313
const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
1414
const portfinder = require('portfinder')
15-
const VueLoaderPlugin = require('vue-loader/lib/plugin');
15+
const { VueLoaderPlugin } = require('vue-loader')
1616
const cesiumSource = 'node_modules/cesium/Source'
1717
const cesiumWorkers = '../Build/Cesium/Workers'
1818
const 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({

build/webpack.prod.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const path = require('path')
66
const utils = require('./utils')
77
const webpack = require('webpack')
88
const config = require('../config')
9-
const merge = require('webpack-merge')
9+
const { merge } = require('webpack-merge');
1010
const baseWebpackConfig = require('./webpack.base.conf')
1111
const CopyWebpackPlugin = require('copy-webpack-plugin')
1212
const HtmlWebpackPlugin = require('html-webpack-plugin')
@@ -15,7 +15,7 @@ const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
1515
const cesiumSource = 'node_modules/cesium/Source'
1616
const cesiumWorkers = '../Build/Cesium/Workers'
1717
const TerserPlugin = require('terser-webpack-plugin')
18-
const VueLoaderPlugin = require('vue-loader/lib/plugin');
18+
const { VueLoaderPlugin } = require('vue-loader')
1919
const CompressionPlugin = require('compression-webpack-plugin');
2020
const GitRevisionPlugin = require('git-revision-webpack-plugin')
2121
const gitRevisionPlugin = new GitRevisionPlugin()

config/dev.env.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
const merge = require('webpack-merge')
2+
const { merge } = require('webpack-merge')
33
const prodEnv = require('./prod.env')
44

55
module.exports = merge(prodEnv, {

0 commit comments

Comments
 (0)