mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-27 08:02:01 +00:00
perf: improve build speed
In practice, both thread-loader and cache (uglify, babel, cache-loader) slow down process up to 10sec with their overhead so disabled by default.
This commit is contained in:
parent
ca80e0614d
commit
ac79cf3282
@ -18,6 +18,7 @@ import upath from 'upath'
|
||||
import { r, wp, wChunk, createRoutes, parallel, relativeTo, waitFor, createSpinner } from '../common/utils'
|
||||
import Options from '../common/options'
|
||||
|
||||
import PerfLoader from './webpack/utils/perf-loader'
|
||||
import ClientWebpackConfig from './webpack/client'
|
||||
import ServerWebpackConfig from './webpack/server'
|
||||
|
||||
@ -39,6 +40,9 @@ export default class Builder {
|
||||
this.webpackHotMiddleware = null
|
||||
this.filesWatcher = null
|
||||
this.customFilesWatcher = null
|
||||
this.perfLoader = null
|
||||
|
||||
// Shared spinner
|
||||
this.spinner = createSpinner({ minimal: this.options.minimalCLI })
|
||||
this.spinner.enabled = !this.options.test
|
||||
|
||||
@ -419,7 +423,8 @@ export default class Builder {
|
||||
}
|
||||
|
||||
async webpackBuild() {
|
||||
debug('Building files...')
|
||||
this.perfLoader = new PerfLoader(this)
|
||||
|
||||
const compilersOptions = []
|
||||
|
||||
// Client
|
||||
@ -449,7 +454,7 @@ export default class Builder {
|
||||
}
|
||||
})
|
||||
|
||||
// Initialize compilers
|
||||
// Configure compilers
|
||||
this.compilers = compilersOptions.map(compilersOption => {
|
||||
const compiler = webpack(compilersOption)
|
||||
|
||||
@ -461,6 +466,13 @@ export default class Builder {
|
||||
return compiler
|
||||
})
|
||||
|
||||
// Warmup perfLoader before build
|
||||
if (this.options.build.parallel) {
|
||||
this.spinner.start('Warming up worker pools')
|
||||
this.perfLoader.warmup()
|
||||
this.spinner.succeed('Worker pools ready')
|
||||
}
|
||||
|
||||
// Start Builds
|
||||
await parallel(this.compilers, compiler => {
|
||||
return this.webpackCompile(compiler)
|
||||
|
@ -99,34 +99,6 @@ export default class WebpackBaseConfig {
|
||||
}
|
||||
}
|
||||
|
||||
perfLoaders(_baseLoaders) {
|
||||
if (this.options.dev) {
|
||||
return _baseLoaders
|
||||
}
|
||||
|
||||
const loaders = []
|
||||
|
||||
if (this.options.build.cache) {
|
||||
// https://github.com/webpack-contrib/cache-loader
|
||||
loaders.push({
|
||||
loader: 'cache-loader',
|
||||
options: {
|
||||
cacheDirectory: path.resolve('node_modules/.cache/cache-loader')
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
if (this.options.build.parallel) {
|
||||
// https://github.com/webpack-contrib/thread-loader
|
||||
loaders.push({
|
||||
loader: 'thread-loader',
|
||||
options: {}
|
||||
})
|
||||
}
|
||||
|
||||
return loaders.concat(_baseLoaders)
|
||||
}
|
||||
|
||||
rules() {
|
||||
const styleLoader = new StyleLoader(
|
||||
this.options,
|
||||
@ -134,6 +106,8 @@ export default class WebpackBaseConfig {
|
||||
{ isServer: this.isServer }
|
||||
)
|
||||
|
||||
const perfLoader = this.builder.perfLoader
|
||||
|
||||
return [
|
||||
{
|
||||
test: /\.vue$/,
|
||||
@ -143,56 +117,62 @@ export default class WebpackBaseConfig {
|
||||
{
|
||||
test: /\.jsx?$/,
|
||||
exclude: /node_modules/,
|
||||
use: this.perfLoaders({
|
||||
use: perfLoader.pool('js', {
|
||||
loader: 'babel-loader',
|
||||
options: this.getBabelOptions()
|
||||
})
|
||||
},
|
||||
{
|
||||
test: /\.css$/,
|
||||
use: styleLoader.apply('css')
|
||||
use: perfLoader.pool('css', styleLoader.apply('css'))
|
||||
},
|
||||
{
|
||||
test: /\.less$/,
|
||||
use: styleLoader.apply('less', 'less-loader')
|
||||
use: perfLoader.pool('css', styleLoader.apply('less', 'less-loader'))
|
||||
},
|
||||
{
|
||||
test: /\.sass$/,
|
||||
use: styleLoader.apply('sass', {
|
||||
use: perfLoader.pool('css', styleLoader.apply('sass', {
|
||||
loader: 'sass-loader',
|
||||
options: { indentedSyntax: true }
|
||||
})
|
||||
}))
|
||||
},
|
||||
{
|
||||
test: /\.scss$/,
|
||||
use: styleLoader.apply('scss', 'sass-loader')
|
||||
use: perfLoader.pool('css', styleLoader.apply('scss', 'sass-loader'))
|
||||
},
|
||||
{
|
||||
test: /\.styl(us)?$/,
|
||||
use: styleLoader.apply('stylus', 'stylus-loader')
|
||||
use: perfLoader.pool('css', styleLoader.apply('stylus', 'stylus-loader'))
|
||||
},
|
||||
{
|
||||
test: /\.(png|jpe?g|gif|svg)$/,
|
||||
loader: 'url-loader',
|
||||
options: {
|
||||
limit: 1000, // 1KO
|
||||
name: 'img/[name].[hash:7].[ext]'
|
||||
}
|
||||
use: perfLoader.pool('assets', {
|
||||
loader: 'url-loader',
|
||||
options: {
|
||||
limit: 1000, // 1KO
|
||||
name: 'img/[name].[hash:7].[ext]'
|
||||
}
|
||||
})
|
||||
},
|
||||
{
|
||||
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
|
||||
loader: 'url-loader',
|
||||
options: {
|
||||
limit: 1000, // 1 KO
|
||||
name: 'fonts/[name].[hash:7].[ext]'
|
||||
}
|
||||
use: perfLoader.pool('assets', {
|
||||
loader: 'url-loader',
|
||||
options: {
|
||||
limit: 1000, // 1 KO
|
||||
name: 'fonts/[name].[hash:7].[ext]'
|
||||
}
|
||||
})
|
||||
},
|
||||
{
|
||||
test: /\.(webm|mp4)$/,
|
||||
loader: 'file-loader',
|
||||
options: {
|
||||
name: 'videos/[name].[hash:7].[ext]'
|
||||
}
|
||||
use: perfLoader.pool('assets', {
|
||||
loader: 'file-loader',
|
||||
options: {
|
||||
name: 'videos/[name].[hash:7].[ext]'
|
||||
}
|
||||
})
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -112,7 +112,7 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
|
||||
config.optimization.minimizer = [
|
||||
new UglifyJsWebpackPlugin({
|
||||
parallel: true,
|
||||
cache: true,
|
||||
cache: this.options.build.cache,
|
||||
sourceMap: false
|
||||
})
|
||||
]
|
||||
|
@ -44,7 +44,8 @@ export default class ProgressPlugin extends webpack.ProgressPlugin {
|
||||
const progress = Math.floor(percent * 100)
|
||||
|
||||
this.state.progress = progress
|
||||
this.state.msg = (msg && msg.length) ? msg : 'wait'
|
||||
this.state.msg = (msg && msg.length) ? msg : (progress === 100 ? 'done' : 'still building')
|
||||
this.state.details = details
|
||||
|
||||
// Process all states
|
||||
let inProgress = false
|
||||
@ -72,7 +73,9 @@ export default class ProgressPlugin extends webpack.ProgressPlugin {
|
||||
if (!inProgress) {
|
||||
logUpdate.clear()
|
||||
} else {
|
||||
logUpdate('\n' + lines.join('\n') + '\n')
|
||||
const title = chalk.bgRedBright.black('BUILDING')
|
||||
|
||||
logUpdate('\n' + title + '\n\n' + lines.join('\n'))
|
||||
}
|
||||
}
|
||||
|
||||
|
60
lib/builder/webpack/utils/perf-loader.mjs
Normal file
60
lib/builder/webpack/utils/perf-loader.mjs
Normal file
@ -0,0 +1,60 @@
|
||||
import path from 'path'
|
||||
|
||||
import threadLoader from 'thread-loader'
|
||||
|
||||
// https://github.com/webpack-contrib/thread-loader
|
||||
// https://github.com/webpack-contrib/cache-loader
|
||||
|
||||
export default class PerfLoader {
|
||||
constructor(builder) {
|
||||
this.builder = builder
|
||||
this.options = builder.options
|
||||
|
||||
this.workerPools = {
|
||||
js: {
|
||||
name: 'js',
|
||||
poolTimeout: this.options.dev ? Infinity : 2000
|
||||
|
||||
},
|
||||
css: {
|
||||
name: 'css',
|
||||
poolTimeout: this.options.dev ? Infinity : 2000
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
warmup() {
|
||||
if (!this.options.build.parallel) {
|
||||
return
|
||||
}
|
||||
|
||||
threadLoader.warmup(this.workerPools.js, ['babel-loader', 'babel-preset-env'])
|
||||
threadLoader.warmup(this.workerPools.css, ['css-loader'])
|
||||
}
|
||||
|
||||
pool(poolName, _loaders) {
|
||||
const loaders = [].concat(_loaders)
|
||||
|
||||
if (this.options.build.parallel) {
|
||||
const pool = this.workerPools[poolName]
|
||||
|
||||
if (pool) {
|
||||
loaders.unshift({
|
||||
loader: 'thread-loader',
|
||||
options: pool
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if (this.options.build.cache) {
|
||||
loaders.unshift({
|
||||
loader: 'cache-loader',
|
||||
options: {
|
||||
cacheDirectory: path.resolve('node_modules/.cache/cache-loader')
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
return loaders
|
||||
}
|
||||
}
|
@ -37,8 +37,8 @@ export default {
|
||||
extractCSS: false,
|
||||
cssSourceMap: undefined,
|
||||
ssr: undefined,
|
||||
parallel: os.cpus().length > 1,
|
||||
cache: true,
|
||||
parallel: false,
|
||||
cache: false,
|
||||
publicPath: '/_nuxt/',
|
||||
filenames: {
|
||||
app: '[name].[chunkhash].js',
|
||||
|
@ -143,7 +143,7 @@ Options.from = function (_options) {
|
||||
|
||||
// babel cacheDirectory
|
||||
if (options.build.babel.cacheDirectory === undefined) {
|
||||
options.build.babel.cacheDirectory = options.dev
|
||||
options.build.babel.cacheDirectory = options.dev && options.build.cache
|
||||
}
|
||||
|
||||
// Resource hints
|
||||
|
Loading…
Reference in New Issue
Block a user