Skip to content

Commit 326934e

Browse files
authored
fix: polyfill injection when building app on multiple threads (#5592)
1 parent 66370e8 commit 326934e

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,8 @@ test('api: configureWebpack preserve ruleNames', () => {
318318
})
319319

320320
test('internal: should correctly set VUE_CLI_ENTRY_FILES', () => {
321+
delete process.env.VUE_CLI_ENTRY_FILES
322+
321323
const service = createMockService([{
322324
id: 'test',
323325
apply: api => {

packages/@vue/cli-service/lib/Service.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,10 @@ module.exports = class Service {
279279
)
280280
}
281281

282-
if (typeof config.entry !== 'function') {
282+
if (
283+
!process.env.VUE_CLI_ENTRY_FILES &&
284+
typeof config.entry !== 'function'
285+
) {
283286
let entryFiles
284287
if (typeof config.entry === 'string') {
285288
entryFiles = [config.entry]

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

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
module.exports = (api, args, options) => {
2+
// respect inline entry
3+
if (args.entry && !options.pages) {
4+
api.configureWebpack(config => {
5+
config.entry = { app: api.resolve(args.entry) }
6+
})
7+
}
8+
29
const config = api.resolveChainableWebpackConfig()
310
const targetDir = api.resolve(args.dest || options.outputDir)
411

@@ -36,14 +43,5 @@ module.exports = (api, args, options) => {
3643
}
3744
}
3845

39-
const rawConfig = api.resolveWebpackConfig(config)
40-
41-
// respect inline entry
42-
if (args.entry && !options.pages) {
43-
const entry = api.resolve(args.entry)
44-
rawConfig.entry = { app: entry }
45-
process.env.VUE_CLI_ENTRY_FILES = JSON.stringify([entry])
46-
}
47-
48-
return rawConfig
46+
return api.resolveWebpackConfig(config)
4947
}

0 commit comments

Comments
 (0)