Use typescript parser only for typescript files and some small tidying

CHANGELOG.md

@@ -3,11 +3,17 @@
 <!-- ## Unreleased -->
 
 ### Added
+
 * `shopify/no-ancestor-directory-import` ([#149](https://github.com/Shopify/eslint-plugin-shopify/pull/149))
 
+### Fixed
+
+* Set TypeScript parser only on TS files. This makes sure you can specify extending from the typescript and react configs in either order. Previously you had to make sure react came first. ([#200](https://github.com/Shopify/eslint-plugin-shopify/pull/200))
+
 ## [26.0.0] - 2018-10-26
 
 ### Added
+
 * `shopify/eslint-comments` plugin with [eslint-plugin-eslint-comments](https://www.npmjs.com/package/eslint-plugin-eslint-comments) rules:
   - `eslint-comments/disable-enable-pair`,
   - `eslint-comments/no-aggregating-enable`

index.js

@@ -32,10 +32,15 @@ module.exports = {
   },
 
   configs: {
-    ava: require('./lib/config/ava'),
+    // Core configs - When extending, one of these should go first
     core: require('./lib/config/core'),
     es5: require('./lib/config/es5'),
     esnext: require('./lib/config/esnext'),
+    react: require('./lib/config/react'),
+    typescript: require('./lib/config/typescript'),
+
+    // Augmenting configs - When extending, these go after the core config
+    ava: require('./lib/config/ava'),
     'eslint-comments': require('./lib/config/eslint-comments'),
     flow: require('./lib/config/flow'),
     graphql: require('./lib/config/graphql'),
@@ -45,11 +50,14 @@ module.exports = {
     mocha: require('./lib/config/mocha'),
     node: require('./lib/config/node'),
     polaris: require('./lib/config/polaris'),
-    prettier: require('./lib/config/prettier'),
-    react: require('./lib/config/react'),
-    typescript: require('./lib/config/typescript'),
-    'typescript-prettier': require('./lib/config/typescript-prettier'),
-    'typescript-react': require('./lib/config/typescript-react'),
     webpack: require('./lib/config/webpack'),
+
+    // Prettier config - When extending, this must go last
+    prettier: require('./lib/config/prettier'),
+
+    // DEPREACATED - use 'prettier' instead
+    'typescript-prettier': require('./lib/config/prettier'),
+    // DEPREACATED - use 'react' instead
+    'typescript-react': require('./lib/config/react'),
   },
 };

lib/config/all.js

@@ -59,14 +59,16 @@ module.exports = {
     require('./rules/jsx-a11y'),
     require('./rules/lodash'),
     require('./rules/node'),
-    require('./rules/prettier'),
     require('./rules/promise'),
     require('./rules/react'),
     require('./rules/shopify'),
     require('./rules/sort-class-members'),
     require('./rules/typescript'),
-    require('./rules/typescript-prettier'),
-    require('./rules/typescript-react'),
+    require('./rules/react-typescript'),
     require('./rules/webpack'),
+
+    // Prettier must go last
+    require('./rules/prettier'),
+    require('./rules/prettier-typescript'),
   ),
 };

lib/config/prettier.js

@@ -38,7 +38,7 @@ module.exports = {
     },
     {
       files: ['*.ts', '*.tsx'],
-      rules: require('./rules/typescript-prettier'),
+      rules: require('./rules/prettier-typescript'),
     },
   ],
 };

lib/config/react.js

@@ -27,7 +27,7 @@ module.exports = {
   overrides: [
     {
       files: ['*.ts', '*.tsx'],
-      rules: require('./rules/typescript-react'),
+      rules: require('./rules/react-typescript'),
     },
   ],
 };

lib/config/typescript.js

@@ -1,17 +1,10 @@
 const merge = require('merge');
 
 module.exports = {
-  parser: 'typescript-eslint-parser',
-
   extends: 'plugin:shopify/esnext',
 
   plugins: ['typescript'],
 
-  parserOptions: {
-    ecmaVersion: 2017,
-    sourceType: 'module',
-  },
-
   settings: {
     'import/parsers': {
       'typescript-eslint-parser': ['.ts', '.tsx'],
@@ -23,6 +16,11 @@ module.exports = {
 
   overrides: [
     {
+      parser: 'typescript-eslint-parser',
+      parserOptions: {
+        ecmaVersion: 2017,
+        sourceType: 'module',
+      },
       files: ['*.ts', '*.tsx'],
       rules: merge(require('./rules/typescript'), {
         // TypeScript provides a better mechanism (explicit `this` type)