Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: extract customize webpack function (#3745)

This commit is contained in:
Clark Du 2018-08-16 18:14:26 +01:00 committed by Sébastien Chopin
parent a67136c6d6
commit 673a38216f
3 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/builder/webpack/base.js
View File

@ -260,6 +260,21 @@ export default class WebpackBaseConfig {
return plugins return plugins
} }
customize(config) {
if (typeof this.options.build.extend === 'function') {
const extendedConfig = this.options.build.extend.call(this.builder, config, {
isDev: this.options.dev,
isServer: this.isServer,
isClient: !this.isServer
})
// Only overwrite config when something is returned for backwards compatibility
if (extendedConfig !== undefined) {
return extendedConfig
}
}
return config
}
config() { config() {
// Prioritize nested node_modules in webpack search path (#2558) // Prioritize nested node_modules in webpack search path (#2558)
const webpackModulesDir = ['node_modules'].concat(this.options.modulesDir) const webpackModulesDir = ['node_modules'].concat(this.options.modulesDir)

18
lib/builder/webpack/client.js
View File

@ -76,7 +76,7 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
} }
config() { config() {
let config = super.config() const config = super.config()
// Entry points // Entry points
config.entry = path.resolve(this.options.buildDir, 'client.js') config.entry = path.resolve(this.options.buildDir, 'client.js')
@ -119,20 +119,6 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
) )
} }
// Extend config
if (typeof this.options.build.extend === 'function') {
const isDev = this.options.dev
const extendedConfig = this.options.build.extend.call(this.builder, config, {
isDev,
isClient: true
})
// Only overwrite config when something is returned for backwards compatibility
if (extendedConfig !== undefined) {
config = extendedConfig
}
}
// Make uglifyjs faster // Make uglifyjs faster
if (!this.options.dev && !config.optimization.minimizer) { if (!this.options.dev && !config.optimization.minimizer) {
// https://github.com/webpack-contrib/uglifyjs-webpack-plugin // https://github.com/webpack-contrib/uglifyjs-webpack-plugin
@ -153,6 +139,6 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
] ]
} }
return config return this.customize(config)
} }
} }

17
lib/builder/webpack/server.js
View File

@ -33,7 +33,7 @@ export default class WebpackServerConfig extends BaseConfig {
} }
config() { config() {
let config = super.config() const config = super.config()
// Config devtool // Config devtool
config.devtool = 'cheap-source-map' config.devtool = 'cheap-source-map'
@ -75,19 +75,6 @@ export default class WebpackServerConfig extends BaseConfig {
} }
}) })
// Extend config return this.customize(config)
if (typeof this.options.build.extend === 'function') {
const isDev = this.options.dev
const extendedConfig = this.options.build.extend.call(this.builder, config, {
isDev,
isServer: true
})
// Only overwrite config when something is returned for backwards compatibility
if (extendedConfig !== undefined) {
config = extendedConfig
}
}
return config
} }
} }