create base and base-legacy configs

microsoft · Mar 17, 2022 · 1e3d42c · 1e3d42c
1 parent 3a5eceb
commit 1e3d42c
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 24 deletions.
diff --git a/packages/eslint-plugin/src/configs/base-legacy.js b/packages/eslint-plugin/src/configs/base-legacy.js
@@ -0,0 +1,18 @@
+// @ts-check
+
+const path = require('path');
+
+const { configHelpers } = require('..');
+
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: [path.join(__dirname, 'core')],
+  rules: {
+    /**
+     * `@typescript-eslint`plugin eslint rules
+     * @see https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/eslint-plugin
+     */
+    ...configHelpers.getNamingConventionRule({ prefixInterface: true }),
+  },
+  overrides: [],
+};
diff --git a/packages/eslint-plugin/src/configs/base.js b/packages/eslint-plugin/src/configs/base.js
@@ -0,0 +1,26 @@
+// @ts-check
+
+const path = require('path');
+
+const { configHelpers } = require('..');
+
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: [path.join(__dirname, 'core')],
+  rules: {
+    /**
+     * `@typescript-eslint`plugin eslint rules
+     * @see https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/eslint-plugin
+     */
+    ...configHelpers.getNamingConventionRule(),
+  },
+  overrides: [
+    {
+      files: '**/src/index.{ts,tsx,js}',
+      rules: {
+        // TODO: propagate to `error` once all packages barrel files have been fixed
+        '@rnx-kit/no-export-all': ['warn', { expand: 'all' }],
+      },
+    },
+  ],
+};
diff --git a/packages/eslint-plugin/src/configs/core.js b/packages/eslint-plugin/src/configs/core.js
@@ -153,8 +153,6 @@ const config = {
      * `@typescript-eslint`plugin eslint rules
      * @see https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/eslint-plugin
      */
-    // tslint: function-name, variable-name
-    ...configHelpers.getNamingConventionRule(false),
     '@typescript-eslint/no-empty-function': 'error',
     '@typescript-eslint/no-explicit-any': 'error',
     '@typescript-eslint/prefer-namespace-keyword': 'error',

diff --git a/packages/eslint-plugin/src/configs/node-legacy.js b/packages/eslint-plugin/src/configs/node-legacy.js
@@ -1,12 +1,9 @@
 // @ts-check
 
 const path = require('path');
-const configHelpers = require('../utils/configHelpers');
 
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
-  extends: [path.join(__dirname, 'core')],
-  rules: {
-    ...configHelpers.getNamingConventionRule(true),
-  },
+  extends: [path.join(__dirname, 'base-legacy')],
+  rules: {},
 };
diff --git a/packages/eslint-plugin/src/configs/node.js b/packages/eslint-plugin/src/configs/node.js
@@ -4,7 +4,7 @@ const path = require('path');
 
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
-  extends: [path.join(__dirname, 'core')],
+  extends: [path.join(__dirname, 'base')],
   rules: {
     'no-console': 'off',
   },

diff --git a/packages/eslint-plugin/src/configs/react-legacy.js b/packages/eslint-plugin/src/configs/react-legacy.js
@@ -1,14 +1,12 @@
 // @ts-check
 
 const path = require('path');
-const configHelpers = require('../utils/configHelpers');
 
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
-  extends: [path.join(__dirname, 'core'), path.join(__dirname, 'react-config')],
+  extends: [path.join(__dirname, 'base-legacy'), path.join(__dirname, 'react-config')],
 
   rules: {
-    ...configHelpers.getNamingConventionRule(true),
     'jsdoc/check-tag-names': 'off',
   },
 };
diff --git a/packages/eslint-plugin/src/configs/react.js b/packages/eslint-plugin/src/configs/react.js
@@ -4,15 +4,6 @@ const path = require('path');
 
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
-  extends: [path.join(__dirname, 'core'), path.join(__dirname, 'react-config')],
+  extends: [path.join(__dirname, 'base'), path.join(__dirname, 'react-config')],
   rules: {},
-  overrides: [
-    {
-      files: '**/src/index.{ts,tsx,js}',
-      rules: {
-        // TODO: propagate to `error` once all packages barrel files have been fixed
-        '@rnx-kit/no-export-all': ['warn', { expand: 'all' }],
-      },
-    },
-  ],
 };
diff --git a/packages/eslint-plugin/src/utils/configHelpers.js b/packages/eslint-plugin/src/utils/configHelpers.js
@@ -69,10 +69,10 @@ module.exports = {
    * Returns a rule configuration for [`@typescript-eslint/naming-convention`](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/naming-convention.md).
    * This provides the ability to override *only* the interface rule without having to repeat or
    * lose the rest of the (very complicated) config.
-   * @param {boolean} prefixWithI - Whether to prefix interfaces with I
+   * @param {{prefixInterface: boolean}} config - Whether to prefix interfaces with I
    * @returns {import("eslint").Linter.RulesRecord}
    */
-  getNamingConventionRule: prefixWithI => ({
+  getNamingConventionRule: (config = { prefixInterface: false }) => ({
     '@typescript-eslint/naming-convention': [
       'error',
       { selector: 'function', format: ['camelCase'], leadingUnderscore: 'allow' },
@@ -98,7 +98,7 @@ module.exports = {
       {
         selector: 'interface',
         format: ['PascalCase'],
-        ...(prefixWithI ? { prefix: ['I'] } : { custom: { regex: '^I[A-Z]', match: false } }),
+        ...(config.prefixInterface ? { prefix: ['I'] } : { custom: { regex: '^I[A-Z]', match: false } }),
       },
       {
         selector: 'default',