Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-17 14:11:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: perf-loader and test

Browse Source
This commit is contained in:
Clark Du 2018-04-02 20:08:31 +08:00
parent e2e124b8e4
commit 89bdd71591
No known key found for this signature in database
GPG Key ID: D0E5986AF78B86D9
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/builder/builder.js
View File

@ -466,7 +466,7 @@ export default class Builder {
// Warmup perfLoader before build // Warmup perfLoader before build
if (this.options.build.parallel) { if (this.options.build.parallel) {
consola.start('Warming up worker pools') consola.start('Warming up worker pools')
this.perfLoader.warmup() this.perfLoader.warmupAll()
consola.success('Worker pools ready') consola.success('Worker pools ready')
} }

11
lib/builder/webpack/utils/perf-loader.js
View File

@ -1,6 +1,6 @@
import path from 'path' import path from 'path'
import threadLoader from 'thread-loader' import { warmup } from 'thread-loader'
// https://github.com/webpack-contrib/thread-loader // https://github.com/webpack-contrib/thread-loader
// https://github.com/webpack-contrib/cache-loader // https://github.com/webpack-contrib/cache-loader
@ -8,12 +8,11 @@ import threadLoader from 'thread-loader'
export default class PerfLoader { export default class PerfLoader {
constructor(options) { constructor(options) {
this.options = options this.options = options
this.threadLoader = threadLoader this.warmup = warmup
this.workerPools = { this.workerPools = {
js: { js: {
name: 'js', name: 'js',
poolTimeout: this.options.dev ? Infinity : 2000 poolTimeout: this.options.dev ? Infinity : 2000
}, },
css: { css: {
name: 'css', name: 'css',
@ -22,9 +21,9 @@ export default class PerfLoader {
} }
} }
warmup() { warmupAll() {
this.threadLoader.warmup(this.workerPools.js, ['babel-loader', 'babel-preset-env']) this.warmup(this.workerPools.js, ['babel-loader', 'babel-preset-env'])
this.threadLoader.warmup(this.workerPools.css, ['css-loader']) this.warmup(this.workerPools.css, ['css-loader'])
} }
pool(poolName, _loaders) { pool(poolName, _loaders) {

1
test/fixtures/with-config/nuxt.config.js vendored
View File

@ -48,6 +48,7 @@ export default {
publicPath: '/orion/', publicPath: '/orion/',
maxChunkSize: 300000, maxChunkSize: 300000,
cssSourceMap: true, cssSourceMap: true,
parallel: true,
analyze: { analyze: {
analyzerMode: 'disabled', analyzerMode: 'disabled',
generateStatsFile: true, generateStatsFile: true,

11
test/unit/wp.config.test.js
View File

@ -15,12 +15,11 @@ describe('webpack configuration', () => {
const css = { name: 'css', poolTimeout: Infinity } const css = { name: 'css', poolTimeout: Infinity }
expect(perfLoader.workerPools).toMatchObject({ js, css }) expect(perfLoader.workerPools).toMatchObject({ js, css })
const warmup = jest.fn() perfLoader.warmup = jest.fn()
perfLoader.threadLoader = { warmup } perfLoader.warmupAll()
perfLoader.warmup() expect(perfLoader.warmup).toHaveBeenCalledTimes(2)
expect(warmup).toHaveBeenCalledTimes(2) expect(perfLoader.warmup).toHaveBeenCalledWith(js, ['babel-loader', 'babel-preset-env'])
expect(warmup).toHaveBeenCalledWith(js, ['babel-loader', 'babel-preset-env']) expect(perfLoader.warmup).toHaveBeenCalledWith(css, ['css-loader'])
expect(warmup).toHaveBeenCalledWith(css, ['css-loader'])
const loaders = perfLoader.pool('js', { loader: 'test-perf-loader' }) const loaders = perfLoader.pool('js', { loader: 'test-perf-loader' })
const cacheDirectory = path.resolve('node_modules/.cache/cache-loader') const cacheDirectory = path.resolve('node_modules/.cache/cache-loader')