Merge pull request #247 from Shopify/restore-ts-naming-convention

@shopify/eslint-plugin: merge typescript naming convention rules
Shopify · May 10, 2021 · 0e1857c · 0e1857c
2 parents d7e431f + 04548f6
commit 0e1857c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
@@ -7,6 +7,10 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 <!-- ## Unreleased -->
 
+### Changed
+
+- Fix conflicting `@typescript-eslint/naming-convention` rules  [[#247](https://github.com/Shopify/web-configs/pull/247)]
+
 ## 40.2.2 - 2021-05-05
 
 ### Changed

diff --git a/packages/eslint-plugin/lib/config/rules/typescript.js b/packages/eslint-plugin/lib/config/rules/typescript.js
@@ -131,6 +131,19 @@ module.exports = {
       selector: 'typeLike',
       format: ['PascalCase'],
     },
+    {
+      selector: 'typeParameter',
+      format: ['PascalCase'],
+      prefix: ['T'],
+    },
+    {
+      selector: 'interface',
+      format: ['PascalCase'],
+      custom: {
+        regex: '^I[A-Z]',
+        match: false,
+      },
+    },
   ],
   // Enforces naming of generic type variables
   '@typescript-eslint/generic-type-naming': 'off',

diff --git a/packages/eslint-plugin/lib/config/typescript.js b/packages/eslint-plugin/lib/config/typescript.js
@@ -69,23 +69,6 @@ module.exports = {
         '@shopify/typescript/prefer-singular-enums': 'error',
         // Prefer buildClientSchema for schema building.
         '@shopify/typescript/prefer-build-client-schema': 'error',
-
-        '@typescript-eslint/naming-convention': [
-          'error',
-          {
-            selector: 'typeParameter',
-            format: ['PascalCase'],
-            prefix: ['T'],
-          },
-          {
-            selector: 'interface',
-            format: ['PascalCase'],
-            custom: {
-              regex: '^I[A-Z]',
-              match: false,
-            },
-          },
-        ],
       }),
     },
   ],