Simplified eslint configuration (#147)

* chore: Simplified eslint config * chore: Updated blueprints * chore: Updated fixtures * chore: Added changeset --------- Co-authored-by: ijlee2 <[email protected]>
ijlee2 · Feb 5, 2025 · bd407c4 · bd407c4
1 parent f967e3f
commit bd407c4
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 191 deletions.
diff --git a/.changeset/violet-planes-allow.md b/.changeset/violet-planes-allow.md
@@ -0,0 +1,5 @@
+---
+"@codemod-utils/cli": patch
+---
+
+Simplified eslint configuration
diff --git a/configs/eslint/node/eslint.config.js b/configs/eslint/node/eslint.config.js
@@ -1,3 +1,3 @@
 import eslintConfigNodeJavascript from './javascript/index.js';
 
-export default [...eslintConfigNodeJavascript];
+export default eslintConfigNodeJavascript;
diff --git a/configs/eslint/node/javascript/index.js b/configs/eslint/node/javascript/index.js
@@ -25,6 +25,18 @@ const parserOptionsJs = {
 };
 
 export default [
+  {
+    ignores: [
+      'dist/',
+      'dist-for-testing/',
+      'node_modules/',
+      'src/blueprints/',
+      'tests/fixtures/',
+      'tmp/',
+      '!.*',
+      '.*/',
+    ],
+  },
   {
     linterOptions: {
       reportUnusedDisableDirectives: 'error',
@@ -57,14 +69,12 @@ export default [
     },
   },
 
-  // Node files
+  // Configuration files
   {
     files: ['**/*.cjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       sourceType: 'script',
     },
     plugins: {
@@ -75,9 +85,7 @@ export default [
     files: ['**/*.mjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       parserOptions: parserOptionsJs,
       sourceType: 'module',
     },

diff --git a/configs/eslint/node/typescript/index.js b/configs/eslint/node/typescript/index.js
@@ -33,6 +33,18 @@ const parserOptionsTs = {
 };
 
 export default tseslint.config(
+  {
+    ignores: [
+      'dist/',
+      'dist-for-testing/',
+      'node_modules/',
+      'src/blueprints/',
+      'tests/fixtures/',
+      'tmp/',
+      '!.*',
+      '.*/',
+    ],
+  },
   {
     linterOptions: {
       reportUnusedDisableDirectives: 'error',
@@ -94,14 +106,12 @@ export default tseslint.config(
     },
   },
 
-  // Node files
+  // Configuration files
   {
     files: ['**/*.cjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       sourceType: 'script',
     },
     plugins: {
@@ -112,9 +122,7 @@ export default tseslint.config(
     files: ['**/*.mjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       parserOptions: parserOptionsJs,
       sourceType: 'module',
     },

diff --git a/packages/ast/javascript/eslint.config.js b/packages/ast/javascript/eslint.config.js
@@ -1,18 +1,3 @@
 import eslintConfigNodeTypescript from '@shared-configs/eslint-config-node/typescript/index.js';
 
-export default [
-  {
-    ignores: [
-      'dist/',
-      'dist-for-testing/',
-      'node_modules/',
-      'src/blueprints/',
-      'tests/fixtures/',
-      'tmp/',
-      '!.*',
-      '.*/',
-    ],
-  },
-
-  ...eslintConfigNodeTypescript,
-];
+export default eslintConfigNodeTypescript;
diff --git a/packages/ast/template/eslint.config.js b/packages/ast/template/eslint.config.js
@@ -1,18 +1,3 @@
 import eslintConfigNodeTypescript from '@shared-configs/eslint-config-node/typescript/index.js';
 
-export default [
-  {
-    ignores: [
-      'dist/',
-      'dist-for-testing/',
-      'node_modules/',
-      'src/blueprints/',
-      'tests/fixtures/',
-      'tmp/',
-      '!.*',
-      '.*/',
-    ],
-  },
-
-  ...eslintConfigNodeTypescript,
-];
+export default eslintConfigNodeTypescript;
diff --git a/packages/blueprints/eslint.config.js b/packages/blueprints/eslint.config.js
@@ -1,18 +1,3 @@
 import eslintConfigNodeTypescript from '@shared-configs/eslint-config-node/typescript/index.js';
 
-export default [
-  {
-    ignores: [
-      'dist/',
-      'dist-for-testing/',
-      'node_modules/',
-      'src/blueprints/',
-      'tests/fixtures/',
-      'tmp/',
-      '!.*',
-      '.*/',
-    ],
-  },
-
-  ...eslintConfigNodeTypescript,
-];
+export default eslintConfigNodeTypescript;
diff --git a/packages/cli/eslint.config.js b/packages/cli/eslint.config.js
@@ -1,18 +1,3 @@
 import eslintConfigNodeTypescript from '@shared-configs/eslint-config-node/typescript/index.js';
 
-export default [
-  {
-    ignores: [
-      'dist/',
-      'dist-for-testing/',
-      'node_modules/',
-      'src/blueprints/',
-      'tests/fixtures/',
-      'tmp/',
-      '!.*',
-      '.*/',
-    ],
-  },
-
-  ...eslintConfigNodeTypescript,
-];
+export default eslintConfigNodeTypescript;
diff --git a/packages/cli/src/blueprints/eslint.config.js b/packages/cli/src/blueprints/eslint.config.js
@@ -45,7 +45,6 @@ export default tseslint.config(
       '.*/',
     ],
   },
-
   {
     linterOptions: {
       reportUnusedDisableDirectives: 'error',
@@ -106,14 +105,12 @@ export default tseslint.config(
     },
   },
 
-  // Node files
+  // Configuration files
   {
     files: ['**/*.cjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       sourceType: 'script',
     },
     plugins: {
@@ -124,9 +121,7 @@ export default tseslint.config(
     files: ['**/*.mjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       parserOptions: parserOptionsJs,
       sourceType: 'module',
     },
@@ -173,7 +168,6 @@ export default tseslint.config(
       '.*/',
     ],
   },
-
   {
     linterOptions: {
       reportUnusedDisableDirectives: 'error',
@@ -205,14 +199,12 @@ export default tseslint.config(
     },
   },
 
-  // Node files
+  // Configuration files
   {
     files: ['**/*.cjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       sourceType: 'script',
     },
     plugins: {
@@ -223,9 +215,7 @@ export default tseslint.config(
     files: ['**/*.mjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       parserOptions: parserOptionsJs,
       sourceType: 'module',
     },

diff --git a/...s/fixtures/javascript-with-addons/output/ember-codemod-args-to-signature/eslint.config.js b/...s/fixtures/javascript-with-addons/output/ember-codemod-args-to-signature/eslint.config.js
@@ -37,7 +37,6 @@ export default tseslint.config(
       '.*/',
     ],
   },
-
   {
     linterOptions: {
       reportUnusedDisableDirectives: 'error',
@@ -69,14 +68,12 @@ export default tseslint.config(
     },
   },
 
-  // Node files
+  // Configuration files
   {
     files: ['**/*.cjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       sourceType: 'script',
     },
     plugins: {
@@ -87,9 +84,7 @@ export default tseslint.config(
     files: ['**/*.mjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       parserOptions: parserOptionsJs,
       sourceType: 'module',
     },

diff --git a/packages/cli/tests/fixtures/javascript/output/ember-codemod-pod-to-octane/eslint.config.js b/packages/cli/tests/fixtures/javascript/output/ember-codemod-pod-to-octane/eslint.config.js
@@ -37,7 +37,6 @@ export default tseslint.config(
       '.*/',
     ],
   },
-
   {
     linterOptions: {
       reportUnusedDisableDirectives: 'error',
@@ -69,14 +68,12 @@ export default tseslint.config(
     },
   },
 
-  // Node files
+  // Configuration files
   {
     files: ['**/*.cjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       sourceType: 'script',
     },
     plugins: {
@@ -87,9 +84,7 @@ export default tseslint.config(
     files: ['**/*.mjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       parserOptions: parserOptionsJs,
       sourceType: 'module',
     },

diff --git a/...s/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/eslint.config.js b/...s/fixtures/typescript-with-addons/output/ember-codemod-args-to-signature/eslint.config.js
@@ -45,7 +45,6 @@ export default tseslint.config(
       '.*/',
     ],
   },
-
   {
     linterOptions: {
       reportUnusedDisableDirectives: 'error',
@@ -106,14 +105,12 @@ export default tseslint.config(
     },
   },
 
-  // Node files
+  // Configuration files
   {
     files: ['**/*.cjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       sourceType: 'script',
     },
     plugins: {
@@ -124,9 +121,7 @@ export default tseslint.config(
     files: ['**/*.mjs'],
     languageOptions: {
       ecmaVersion: 'latest',
-      globals: {
-        ...globals.node,
-      },
+      globals: globals.node,
       parserOptions: parserOptionsJs,
       sourceType: 'module',
     },