feat: Use file type based lint rules

src/config/eslintrc-js.js

@@ -0,0 +1,51 @@
+'use strict'
+
+module.exports = {
+  extends: 'standard',
+  parserOptions: {
+    sourceType: 'script'
+  },
+  globals: {
+    self: true,
+    mocha: true
+  },
+  plugins: [
+    'no-only-tests'
+  ],
+  rules: {
+    strict: [2, 'safe'],
+    curly: 'error',
+    'block-scoped-var': 2,
+    complexity: 1,
+    'default-case': 2,
+    'dot-notation': 1,
+    'guard-for-in': 1,
+    'linebreak-style': [1, 'unix'],
+    'no-alert': 2,
+    'no-case-declarations': 2,
+    'no-console': 2,
+    'no-constant-condition': 2,
+    'no-continue': 1,
+    'no-div-regex': 2,
+    'no-empty': 1,
+    'no-empty-pattern': 2,
+    'no-extra-semi': 2,
+    'no-implicit-coercion': 2,
+    'no-labels': 2,
+    'no-loop-func': 2,
+    'no-nested-ternary': 1,
+    'no-only-tests/no-only-tests': 2,
+    'no-script-url': 2,
+    'no-warning-comments': 1,
+    'quote-props': [2, 'as-needed'],
+    'require-yield': 2,
+    'max-nested-callbacks': [2, 4],
+    'max-depth': [2, 4],
+    'valid-jsdoc': [2, {
+      requireReturn: false,
+      requireParamDescription: false,
+      requireReturnDescription: false
+    }],
+    'require-await': 2
+  }
+}

src/config/eslintrc-ts.js

@@ -7,7 +7,7 @@ module.exports = {
   },
   plugins: ['@typescript-eslint'],
   extends: [
-    fromAegir('src/config/eslintrc.js'),
+    fromAegir('src/config/eslintrc-js.js'),
     'plugin:@typescript-eslint/recommended'
   ]
 }

src/config/eslintrc.js

@@ -1,51 +1,18 @@
 'use strict'
-
+const { fromAegir } = require('../utils')
 module.exports = {
-  extends: 'standard',
-  parserOptions: {
-    sourceType: 'script'
-  },
-  globals: {
-    self: true,
-    mocha: true
-  },
-  plugins: [
-    'no-only-tests'
-  ],
-  rules: {
-    strict: [2, 'safe'],
-    curly: 'error',
-    'block-scoped-var': 2,
-    complexity: 1,
-    'default-case': 2,
-    'dot-notation': 1,
-    'guard-for-in': 1,
-    'linebreak-style': [1, 'unix'],
-    'no-alert': 2,
-    'no-case-declarations': 2,
-    'no-console': 2,
-    'no-constant-condition': 2,
-    'no-continue': 1,
-    'no-div-regex': 2,
-    'no-empty': 1,
-    'no-empty-pattern': 2,
-    'no-extra-semi': 2,
-    'no-implicit-coercion': 2,
-    'no-labels': 2,
-    'no-loop-func': 2,
-    'no-nested-ternary': 1,
-    'no-only-tests/no-only-tests': 2,
-    'no-script-url': 2,
-    'no-warning-comments': 1,
-    'quote-props': [2, 'as-needed'],
-    'require-yield': 2,
-    'max-nested-callbacks': [2, 4],
-    'max-depth': [2, 4],
-    'valid-jsdoc': [2, {
-      requireReturn: false,
-      requireParamDescription: false,
-      requireReturnDescription: false
-    }],
-    'require-await': 2
-  }
+  overrides: [
+    {
+      files: [
+        '**/*.js'
+      ],
+      extends: fromAegir('src/config/eslintrc-js.js')
+    },
+    {
+      files: [
+        '**/*.ts'
+      ],
+      extends: fromAegir('src/config/eslintrc-ts.js')
+    }
+  ]
 }

src/lint.js

@@ -83,7 +83,7 @@ function checkDependencyVersions () {
 function runLinter (opts = {}) {
   const cli = new CLIEngine({
     useEslintrc: true,
-    baseConfig: opts.ts ? require('./config/eslintrc-ts.js') : require('./config/eslintrc.js'),
+    baseConfig: require('./config/eslintrc.js'),
     fix: opts.fix
   })
 

test/fixtures/js+ts/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "my-project"
+}

test/fixtures/js+ts/src/another.ts

@@ -0,0 +1,5 @@
+import { hello } from './typed'
+
+export const main = ():void => {
+  hello('world')
+}

test/fixtures/js+ts/src/some.js

@@ -0,0 +1,7 @@
+'use strict'
+
+const main = () => {
+
+}
+
+module.exports = main

test/fixtures/js+ts/src/typed.ts

@@ -0,0 +1,3 @@
+export const hello = (name:string):string => {
+  return `Hello ${name}`
+}

test/lint.js

@@ -161,4 +161,9 @@ describe('lint', () => {
 
     await expect(lint({ silent: true })).to.eventually.be.rejectedWith('Lint errors')
   })
+
+  it('should lint ts and js with different parsers rules', async () => {
+    process.chdir(path.join(__dirname, './fixtures/js+ts/'))
+    await lint()
+  })
 })