Skip to content

Commit

Permalink
Update more dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Williangalvani committed Jul 13, 2022
1 parent 6c334de commit e775051
Show file tree
Hide file tree
Showing 5 changed files with 30,179 additions and 20,496 deletions.
23 changes: 11 additions & 12 deletions build/webpack.dev.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ process.env.NODE_ENV = 'development'
const utils = require('./utils')
const webpack = require('webpack')
const config = require('../config')
const merge = require('webpack-merge')
const { merge } = require('webpack-merge')
const path = require('path')
const baseWebpackConfig = require('./webpack.base.conf')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
const portfinder = require('portfinder')
const VueLoaderPlugin = require('vue-loader/lib/plugin');
const { VueLoaderPlugin } = require('vue-loader')
const cesiumSource = 'node_modules/cesium/Source'
const cesiumWorkers = '../Build/Cesium/Workers'
const GitRevisionPlugin = require('git-revision-webpack-plugin')
Expand All @@ -32,27 +32,26 @@ const devWebpackConfig = merge(baseWebpackConfig, {

// these devServer options should be customized in /config/index.js
devServer: {
clientLogLevel: 'warning',
client: {
overlay: config.dev.errorOverlay
? { warnings: false, errors: true }
: false,
logging: 'warn',

},
historyApiFallback: {
rewrites: [
{ from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
],
},
hot: true,
contentBase: false, // since we use CopyWebpackPlugin.
static: "./",
compress: true,
host: HOST || config.dev.host,
port: PORT || config.dev.port,
open: config.dev.autoOpenBrowser,
overlay: config.dev.errorOverlay
? { warnings: false, errors: true }
: false,
publicPath: config.dev.assetsPublicPath,
// publicPath: config.dev.assetsPublicPath,
proxy: config.dev.proxyTable,
quiet: false, // necessary for FriendlyErrorsPlugin
watchOptions: {
poll: config.dev.poll,
}
},
plugins: [
new webpack.DefinePlugin({
Expand Down
4 changes: 2 additions & 2 deletions build/webpack.prod.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const path = require('path')
const utils = require('./utils')
const webpack = require('webpack')
const config = require('../config')
const merge = require('webpack-merge')
const { merge } = require('webpack-merge');
const baseWebpackConfig = require('./webpack.base.conf')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
Expand All @@ -15,7 +15,7 @@ const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
const cesiumSource = 'node_modules/cesium/Source'
const cesiumWorkers = '../Build/Cesium/Workers'
const TerserPlugin = require('terser-webpack-plugin')
const VueLoaderPlugin = require('vue-loader/lib/plugin');
const { VueLoaderPlugin } = require('vue-loader')
const CompressionPlugin = require('compression-webpack-plugin');
const GitRevisionPlugin = require('git-revision-webpack-plugin')
const gitRevisionPlugin = new GitRevisionPlugin()
Expand Down
2 changes: 1 addition & 1 deletion config/dev.env.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const merge = require('webpack-merge')
const { merge } = require('webpack-merge')
const prodEnv = require('./prod.env')

module.exports = merge(prodEnv, {
Expand Down
Loading

0 comments on commit e775051

Please sign in to comment.