Merge remote-tracking branch 'upstream/dev' into feat/jest

This commit is contained in:
Clark Du 2018-03-19 10:27:23 +08:00
commit cb9d286238
No known key found for this signature in database
GPG Key ID: D0E5986AF78B86D9

View File

@ -16,8 +16,6 @@ import VueSSRClientPlugin from './plugins/vue/client'
const debug = Debug('nuxt:build') const debug = Debug('nuxt:build')
debug.color = 2 // Force green color debug.color = 2 // Force green color
const isWindows = /^win/.test(process.platform)
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Webpack Client Config | Webpack Client Config
@ -95,7 +93,7 @@ export default function webpackClientConfig() {
config.optimization.splitChunks = { config.optimization.splitChunks = {
chunks: 'all', chunks: 'all',
// TODO: remove spa after https://github.com/jantimon/html-webpack-plugin/issues/878 solved // TODO: remove spa after https://github.com/jantimon/html-webpack-plugin/issues/878 solved
name: this.options.dev || (this.options.mode === 'spa' && isWindows), name: this.options.dev || this.options.mode === 'spa',
// Explicit cache groups // Explicit cache groups
cacheGroups: { cacheGroups: {
@ -132,7 +130,7 @@ export default function webpackClientConfig() {
} }
// Create additional runtime chunk for cache boosting // Create additional runtime chunk for cache boosting
config.optimization.runtimeChunk = true // config.optimization.runtimeChunk = true
// -------------------------------------- // --------------------------------------
// Dev specific config // Dev specific config