Skip to content

fix: .vue file script lang is tsx but createSourceFile as JS. so join ScriptKind. #3097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 31, 2019
Merged

fix: .vue file script lang is tsx but createSourceFile as JS. so join ScriptKind. #3097

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e018007
fix: .vue file script lang is tsx but createSourceFile as JS. so joi…
lihuanji Dec 7, 2018
d2e5f77
optimize
lihuanji Dec 7, 2018
87089f5
change: Default ScriptKind is JS
lihuanji Dec 7, 2018
a3610eb
fix: Default ScriptKind is JS
lihuanji Dec 7, 2018
9d1b6b1
fix
lihuanji Dec 7, 2018
8991e32
fix: default lang
lihuanji Dec 7, 2018
0fe3796
fix: del lang
lihuanji Dec 7, 2018
9a5162b
add default lang
lihuanji Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/@vue/cli-plugin-typescript/lib/tslint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module.exports = function lint (args = {}, api, silent) {
before: content.slice(0, script.start),
after: content.slice(script.end)
})
return script.content
return script
}
}

Expand All @@ -61,8 +61,9 @@ module.exports = function lint (args = {}, api, silent) {
const getSourceFile = program.getSourceFile
program.getSourceFile = function (file, languageVersion, onError) {
if (isVueFile(file)) {
const script = parseTSFromVueFile(file) || ''
return ts.createSourceFile(file, script, languageVersion, true)
const { content, lang = 'js' } = parseTSFromVueFile(file) || { content: '', lang: 'js' }
const contentLang = ts.ScriptKind[lang.toUpperCase()];
return ts.createSourceFile(file, content, languageVersion, true, contentLang)
} else {
return getSourceFile.call(this, file, languageVersion, onError)
}
Expand Down