fix: ts generator & airbnb import/extensions rule compatibility

fix #871
vuejs · Feb 28, 2018 · 88726a3 · 88726a3
1 parent f4d1841
commit 88726a3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/packages/@vue/cli-plugin-typescript/generator/index.js b/packages/@vue/cli-plugin-typescript/generator/index.js
@@ -46,7 +46,7 @@ module.exports = (api, {
     }
   }
 
-  if (tsLint && !api.hasPlugin('eslint')) {
+  if (tsLint) {
     api.extendPackage({
       scripts: {
         lint: 'vue-cli-service lint'
@@ -114,13 +114,16 @@ module.exports = (api, {
   const jsRE = /\.js$/
   const excludeRE = /^test\/e2e\/|\.config\.js$/
   const convertLintFlags = require('../lib/convertLintFlags')
-  const convertImports = require('../lib/convertImports')
   api.postProcessFiles(files => {
     for (const file in files) {
       if (jsRE.test(file) && !excludeRE.test(file)) {
         const tsFile = file.replace(jsRE, '.ts')
         if (!files[tsFile]) {
-          files[tsFile] = convertLintFlags(convertImports(files[file]))
+          let content = files[file]
+          if (tsLint) {
+            content = convertLintFlags(content)
+          }
+          files[tsFile] = content
         }
         delete files[file]
       }

diff --git a/packages/@vue/cli-plugin-typescript/lib/convertImports.js b/packages/@vue/cli-plugin-typescript/lib/convertImports.js
diff --git a/packages/@vue/eslint-config-airbnb/index.js b/packages/@vue/eslint-config-airbnb/index.js
@@ -7,6 +7,22 @@ module.exports = {
       webpack: {
         config: require.resolve('@vue/cli-service/webpack.config.js')
       }
-    }
+    },
+    'import/extensions': [
+      '.js',
+      '.jsx',
+      '.mjs',
+      '.ts',
+      '.tsx'
+    ]
+  },
+  rules: {
+    'import/extensions': ['error', 'always', {
+      js: 'never',
+      mjs: 'never',
+      jsx: 'never',
+      ts: 'never',
+      tsx: 'never'
+    }]
   }
 }