mirror/vue-cli
1
0
Fork 0
mirror of https://github.com/vuejs/vue-cli.git synced 2026-01-17 21:00:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: polyfill injection when building app on multiple threads (#5592)

Browse Source
This commit is contained in:
dtcz
2020-06-22 17:05:04 +08:00
committed by GitHub
parent 66370e82c4
commit 326934e084
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/@vue/cli-service/__tests__/Service.spec.js
View File

@@ -318,6 +318,8 @@ test('api: configureWebpack preserve ruleNames', () => {
})
test('internal: should correctly set VUE_CLI_ENTRY_FILES', () => {
delete process.env.VUE_CLI_ENTRY_FILES
const service = createMockService([{
id: 'test',
apply: api => {

5
packages/@vue/cli-service/lib/Service.js
View File

@@ -279,7 +279,10 @@ module.exports = class Service {
)
}
if (typeof config.entry !== 'function') {
if (
!process.env.VUE_CLI_ENTRY_FILES &&
typeof config.entry !== 'function'
) {
let entryFiles
if (typeof config.entry === 'string') {
entryFiles = [config.entry]

18
packages/@vue/cli-service/lib/commands/build/resolveAppConfig.js
View File

@@ -1,4 +1,11 @@
module.exports = (api, args, options) => {
// respect inline entry
if (args.entry && !options.pages) {
api.configureWebpack(config => {
config.entry = { app: api.resolve(args.entry) }
})
}
const config = api.resolveChainableWebpackConfig()
const targetDir = api.resolve(args.dest || options.outputDir)
@@ -36,14 +43,5 @@ module.exports = (api, args, options) => {
}
}
const rawConfig = api.resolveWebpackConfig(config)
// respect inline entry
if (args.entry && !options.pages) {
const entry = api.resolve(args.entry)
rawConfig.entry = { app: entry }
process.env.VUE_CLI_ENTRY_FILES = JSON.stringify([entry])
}
return rawConfig
return api.resolveWebpackConfig(config)
}