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

李瑞丰 · haoqunjiang · commit 80c20db7035b · 2019-07-25T09:54:47.000+08:00
fix #3947
diff --git a/packages/@vue/cli-plugin-eslint/generator/index.js b/packages/@vue/cli-plugin-eslint/generator/index.js
@@ -80,8 +80,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
`@@ -80,8 +80,14 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => {`
`80`	`80`	`pkg.gitHooks = {`
`81`	`81`	`'pre-commit': 'lint-staged'`
`82`	`82`	`}`
`83`		`- pkg['lint-staged'] = {`
`84`		`- '*.{js,vue}': ['vue-cli-service lint', 'git add']`
	`83`	`+ if (api.hasPlugin('typescript')) {`
	`84`	`+ pkg['lint-staged'] = {`
	`85`	`+ '*.{js,vue,ts}': ['vue-cli-service lint', 'git add']`
	`86`	`+ }`
	`87`	`+ } else {`
	`88`	`+ pkg['lint-staged'] = {`
	`89`	`+ '*.{js,vue}': ['vue-cli-service lint', 'git add']`
	`90`	`+ }`
`85`	`91`	`}`
`86`	`92`	`}`
`87`	`93`