Skip to content

Commit 4d00161

Browse files
committed
fix(typescript): avoid including router file when router is not selected
1 parent 970eee7 commit 4d00161

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
extend: '@vue/cli-service/generator/router/template/src/views/Home.vue'
3+
when: 'rootOptions.router'
34
replace:
45
- !!js/regexp /Welcome to Your Vue\.js App/
56
- !!js/regexp /<script>[^]*?<\/script>/

packages/@vue/cli/lib/GeneratorAPI.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,13 @@ function renderFile (name, data, ejsOptions) {
297297
finalTemplate = finalTemplate.replace(parsed.replace, content.trim())
298298
}
299299
}
300+
if (parsed.when) {
301+
finalTemplate = (
302+
`<%_ if (${parsed.when}) { _%>` +
303+
finalTemplate +
304+
`<%_ } _%>`
305+
)
306+
}
300307
}
301308

302309
return ejs.render(finalTemplate, data, ejsOptions)

0 commit comments

Comments
 (0)