fix(eslint-generator): add ts file check to lint-staged (#4347)

李瑞丰 · haoqunjiang · commit 66c410b31a58 · 2019-08-02T18:41:47.000+08:00
fix #3947 (cherry picked from commit 80c20db)
diff --git a/packages/@vue/cli-plugin-eslint/generator/index.js b/packages/@vue/cli-plugin-eslint/generator/index.js
@@ -78,8 +78,14 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => {
     pkg.gitHooks = {
       'pre-commit': 'lint-staged'
     }
-    pkg['lint-staged'] = {
-      '*.{js,vue}': ['vue-cli-service lint', 'git add']
+    if (api.hasPlugin('typescript')) {
+      pkg['lint-staged'] = {
+        '*.{js,vue,ts}': ['vue-cli-service lint', 'git add']
+      }
+    } else {
+      pkg['lint-staged'] = {
+        '*.{js,vue}': ['vue-cli-service lint', 'git add']
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,14 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => {`
`78`	`78`	`pkg.gitHooks = {`
`79`	`79`	`'pre-commit': 'lint-staged'`
`80`	`80`	`}`
`81`		`- pkg['lint-staged'] = {`
`82`		`- '*.{js,vue}': ['vue-cli-service lint', 'git add']`
	`81`	`+ if (api.hasPlugin('typescript')) {`
	`82`	`+ pkg['lint-staged'] = {`
	`83`	`+ '*.{js,vue,ts}': ['vue-cli-service lint', 'git add']`
	`84`	`+ }`
	`85`	`+ } else {`
	`86`	`+ pkg['lint-staged'] = {`
	`87`	`+ '*.{js,vue}': ['vue-cli-service lint', 'git add']`
	`88`	`+ }`
`83`	`89`	`}`
`84`	`90`	`}`
`85`	`91`