Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 08:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(builder): use require.resolve to get the path of babel-loader (#4150)

Browse Source
This commit is contained in:
Pooya Parsa 2018-10-23 01:18:06 +03:30 committed by GitHub
parent ff6385f5a0
commit 60dbc6ddc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/webpack/base.js
View File

@ -164,7 +164,7 @@ export default class WebpackBaseConfig {
return !modulesToTranspile.some(module => module.test(file)) return !modulesToTranspile.some(module => module.test(file))
}, },
use: perfLoader.pool('js', { use: perfLoader.pool('js', {
loader: 'babel-loader', loader: require.resolve('babel-loader'),
options: this.getBabelOptions() options: this.getBabelOptions()
}) })
}, },

5
packages/builder/src/webpack/utils/perf-loader.js
View File

@ -22,7 +22,10 @@ export default class PerfLoader {
} }
warmupAll() { warmupAll() {
this.warmup(this.workerPools.js, ['babel-loader', '@babel/preset-env']) this.warmup(this.workerPools.js, [
require.resolve('babel-loader'),
require.resolve('@babel/preset-env')
])
this.warmup(this.workerPools.css, ['css-loader']) this.warmup(this.workerPools.css, ['css-loader'])
} }

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

@ -18,7 +18,10 @@ describe('webpack configuration', () => {
perfLoader.warmup = jest.fn() perfLoader.warmup = jest.fn()
perfLoader.warmupAll() perfLoader.warmupAll()
expect(perfLoader.warmup).toHaveBeenCalledTimes(2) expect(perfLoader.warmup).toHaveBeenCalledTimes(2)
expect(perfLoader.warmup).toHaveBeenCalledWith(js, ['babel-loader', '@babel/preset-env']) expect(perfLoader.warmup).toHaveBeenCalledWith(js, [
require.resolve('babel-loader'),
require.resolve('@babel/preset-env')
])
expect(perfLoader.warmup).toHaveBeenCalledWith(css, ['css-loader']) expect(perfLoader.warmup).toHaveBeenCalledWith(css, ['css-loader'])
const loaders = perfLoader.pool('js', { loader: 'test-perf-loader' }) const loaders = perfLoader.pool('js', { loader: 'test-perf-loader' })