feat: move ignores to separate config

allohamora · Jan 30, 2025 · 184a1b8 · 184a1b8
1 parent 7304bf9
commit 184a1b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/__tests__/categories/js/eslint/eslint.entrypoint.test.ts b/__tests__/categories/js/eslint/eslint.entrypoint.test.ts
@@ -66,7 +66,7 @@ describe('eslint', () => {
     configMocked.getConfig.mockReturnValueOnce(config);
 
     const configFile = `export default [
-{ignores: ["__test__"]}
+{ignores: ["__test__"]},
 ];`;
 
     await eslint();
@@ -80,7 +80,6 @@ describe('eslint', () => {
     configMocked.getConfig.mockReturnValueOnce(config);
 
     const configFile = `export default [
-{}
 ];`;
 
     await eslint();
@@ -118,7 +117,6 @@ describe('eslint', () => {
     const configFile = `export default [
 __test1__,
 __test2__,
-{}
 ];`;
 
     await eslint();
@@ -153,7 +151,8 @@ __test2__,
     const configFile = `// @ts-check
 import globals from "globals";
 export default tseslint.config(
-{files: ["src/**/*.ts"],ignores: ["node_modules"],languageOptions: {globals: {...globals.window},parserOptions: {"ecmaVersion":2020}},plugins: {'@typescript-eslint': eslintPluginTs},rules: {"no-console":"warn"}}
+{ignores: ["node_modules"]},
+{files: ["src/**/*.ts"],languageOptions: {globals: {...globals.window},parserOptions: {"ecmaVersion":2020}},plugins: {'@typescript-eslint': eslintPluginTs},rules: {"no-console":"warn"}}
 );`;
 
     await eslint();

diff --git a/src/categories/js/eslint/eslint.entrypoint.ts b/src/categories/js/eslint/eslint.entrypoint.ts
@@ -19,7 +19,6 @@ export const buildConfig = (config: Config) => {
   const configs = config.configs.map((item) => `${item},`).join('\n');
 
   const files = optional(config.eslintConfig.files, (value) => `files: ${JSON.stringify(value)}`);
-  const ignores = optional(config.eslintConfig.ignores, (value) => `ignores: ${JSON.stringify(value)}`);
 
   const plugins = optional(
     config.eslintConfig.plugins,
@@ -45,9 +44,12 @@ export const buildConfig = (config: Config) => {
     () => `languageOptions: {${[globals, parserOptions].filter(Boolean).join(',')}}`,
   );
 
-  const mainConfig = `{${[files, ignores, languageOptions, plugins, rules].filter(Boolean).join(',')}}`;
+  const ignoresConfig = optional(config.eslintConfig.ignores, (value) => `{ignores: ${JSON.stringify(value)}},`);
 
-  return [start, imports, exportStart, configs, mainConfig, exportEnd].filter(Boolean).join('\n');
+  const mainContent = [files, languageOptions, plugins, rules].filter(Boolean).join(',');
+  const mainConfig = optional(mainContent, (content) => `{${content}}`);
+
+  return [start, imports, exportStart, configs, ignoresConfig, mainConfig, exportEnd].filter(Boolean).join('\n');
 };
 
 export const eslint = async () => {