@fullstacksjs/eslint-config 14.6.0 → 14.8.0

package/src/modules/storybook.mjs

@@ -2,12 +2,15 @@ import { mergeConfigs } from 'eslint-flat-config-utils';
 import plugin from 'eslint-plugin-storybook';
 
 import { globs } from '../utils/globs.mjs';
+import { objectOrEmpty } from '../utils/objectOrEmpty.mjs';
 
 /**
  * @param { import('../types').Options } options
  * @return { Promise<import('eslint').Linter.Config> }
  */
 function storybook(options = {}) {
+  const overrides = objectOrEmpty(options.storybook.overrides);
+
   const storybookConfig = {
     name: 'storybook',
     files: globs.storybook,
@@ -38,7 +41,7 @@ function storybook(options = {}) {
     },
   };
 
-  return mergeConfigs(storybookConfig, options.storybook.overrides ?? {});
+  return mergeConfigs(storybookConfig, overrides);
 }
 
 export default storybook;

package/src/modules/stylistic.mjs

@@ -1,11 +1,15 @@
 import stylisticPlugin from '@stylistic/eslint-plugin';
 import { mergeConfigs } from 'eslint-flat-config-utils';
 
+import { objectOrEmpty } from '../utils/objectOrEmpty.mjs';
+
 /**
  * @param { import('../types').Options } options
  * @return { Promise<import('eslint').Linter.Config> }
  */
 function stylistic(options = {}) {
+  const overrides = objectOrEmpty(options.stylistic.overrides);
+
   const stylisticConfig = {
     name: 'stylistic',
     plugins: { '@stylistic': stylisticPlugin },
@@ -44,7 +48,7 @@ function stylistic(options = {}) {
       ],
     },
   };
-  return mergeConfigs(stylisticConfig, options.stylistic.overrides ?? {});
+  return mergeConfigs(stylisticConfig, overrides);
 }
 
 export default stylistic;

package/src/modules/tailwind.mjs

@@ -1,6 +1,7 @@
 import { mergeConfigs } from 'eslint-flat-config-utils';
 
-import { strict } from '../utils/conditions.mjs';
+import { predicate, strict } from '../utils/conditions.mjs';
+import { objectOrEmpty } from '../utils/objectOrEmpty.mjs';
 
 /**
  * @param { import('../types').Options } options
@@ -8,13 +9,20 @@ import { strict } from '../utils/conditions.mjs';
  */
 async function tailwind(options = {}) {
   const plugin = await import('eslint-plugin-better-tailwindcss');
+  const isObject = typeof options.tailwind === 'object';
+  const overrides = objectOrEmpty(options.tailwind.overrides);
+
   const tailwindConfig = {
     name: 'tailwind',
     plugins: { 'better-tailwindcss': plugin.default ?? plugin },
     settings: {
       'better-tailwindcss': {
-        entryPoint: options.tailwind.entryPoint,
-        tailwindConfig: options.tailwind.tailwindConfig,
+        ...predicate(isObject && 'entryPoint' in options.tailwind, {
+          entryPoint: options.tailwind.entryPoint,
+        }),
+        ...predicate(isObject && 'tailwindConfig' in options.tailwind, {
+          tailwindConfig: options.tailwind.tailwindConfig,
+        }),
         callees: [
           ['^class|classnames|classNames|cva|ctl|clsx|cn|cns|cx|cc|clb|cnb|dcnb|objstr|tv|twJoin|twMerge$', [{ match: 'strings' }]],
         ],
@@ -29,6 +37,7 @@ async function tailwind(options = {}) {
       'better-tailwindcss/enforce-consistent-variant-order': 'warn',
       'better-tailwindcss/enforce-logical-properties': strict('warn'),
       'better-tailwindcss/enforce-shorthand-classes': 'warn',
+      'better-tailwindcss/no-concatenated-classes': 'error',
       'better-tailwindcss/no-conflicting-classes': 'error',
       'better-tailwindcss/no-deprecated-classes': 'warn',
       'better-tailwindcss/no-duplicate-classes': 'error',
@@ -38,7 +47,7 @@ async function tailwind(options = {}) {
     },
   };
 
-  return mergeConfigs(tailwindConfig, options.tailwind.overrides ?? {});
+  return mergeConfigs(tailwindConfig, overrides);
 }
 
 export default tailwind;

package/src/modules/tests.mjs

@@ -4,6 +4,7 @@ import globals from 'globals';
 
 import { predicate } from '../utils/conditions.mjs';
 import { globs } from '../utils/globs.mjs';
+import { objectOrEmpty } from '../utils/objectOrEmpty.mjs';
 
 /**
  * @param { import('../types').Options } options
@@ -11,6 +12,8 @@ import { globs } from '../utils/globs.mjs';
  */
 
 function tests(options = {}) {
+  const overrides = objectOrEmpty(options.test.overrides);
+
   const testsConfug = {
     name: 'tests',
     files: [...globs.test, ...globs.e2e],
@@ -40,7 +43,7 @@ function tests(options = {}) {
     },
   };
 
-  return mergeConfigs(testsConfug, options.test.overrides ?? {});
+  return mergeConfigs(testsConfug, overrides);
 }
 
 export default tests;

package/src/modules/typescript.mjs

@@ -4,6 +4,7 @@ import { parser, plugin } from 'typescript-eslint';
 import { predicate, strict } from '../utils/conditions.mjs';
 import { globs } from '../utils/globs.mjs';
 import { namingConvention } from '../utils/naming-convention.mjs';
+import { objectOrEmpty } from '../utils/objectOrEmpty.mjs';
 
 /**
  * @param { import('../types').Options } options
@@ -11,6 +12,7 @@ import { namingConvention } from '../utils/naming-convention.mjs';
  */
 function typescript(options = {}) {
   const projectService = options.typescript && options.typescript.tsconfigRootDir && options.typescript.projectService;
+  const overrides = objectOrEmpty(options.typescript.overrides);
 
   const typescriptConfig = {
     name: 'typescript',
@@ -137,12 +139,9 @@ function typescript(options = {}) {
       '@typescript-eslint/promise-function-async': 'off', // Breaks react component when return type is React.ReactNode
       '@typescript-eslint/restrict-plus-operands': 'warn',
       '@typescript-eslint/strict-boolean-expressions': 'off', // Annoying
-      '@typescript-eslint/space-before-blocks': 'off',
 
       '@typescript-eslint/triple-slash-reference': 'error',
-      '@typescript-eslint/typedef': ['error', { parameter: false, arrowParameter: false, variableDeclaration: false }],
       '@typescript-eslint/unified-signatures': 'error',
-      '@typescript-eslint/key-spacing': 'off',
 
       ...predicate(projectService, {
         '@typescript-eslint/await-thenable': 'error',
@@ -227,7 +226,6 @@ function typescript(options = {}) {
       'import/namespace': 'off',
       'import/default': 'off',
       'import/no-named-as-default-member': 'off',
-      'key-spacing': 'off',
       'camelcase': 'off',
       'default-param-last': 'off',
       'init-declarations': 'off',
@@ -239,9 +237,6 @@ function typescript(options = {}) {
       'no-unused-vars': 'off',
       'no-use-before-define': 'off',
       'no-useless-constructor': 'off',
-      'object-curly-spacing': 'off',
-      'padding-line-between-statements': 'off',
-      'space-before-blocks': 'off',
       'dot-notation': 'off',
       'no-throw-literal': 'off',
       'require-await': 'off',
@@ -250,7 +245,7 @@ function typescript(options = {}) {
     },
   };
 
-  return mergeConfigs(typescriptConfig, options.typescript.overrides ?? {});
+  return mergeConfigs(typescriptConfig, overrides);
 }
 
 export default typescript;

package/src/modules/vitest.mjs

@@ -2,12 +2,15 @@ import plugin from '@vitest/eslint-plugin';
 import { mergeConfigs } from 'eslint-flat-config-utils';
 
 import { globs } from '../utils/globs.mjs';
+import { objectOrEmpty } from '../utils/objectOrEmpty.mjs';
 
 /**
  * @param { import('../types').Options } options
  * @return { import('eslint').Linter.Config }
  */
 function vitest(options = {}) {
+  const overrides = objectOrEmpty(options.vitest.overrides);
+
   const vitestConfig = {
     name: 'vitest',
     files: globs.test,
@@ -46,7 +49,6 @@ function vitest(options = {}) {
       'vitest/no-conditional-in-test': 'off',
       'vitest/no-conditional-tests': 'warn',
       'vitest/no-disabled-tests': 'warn',
-      'vitest/no-done-callback': 'off',
       'vitest/no-duplicate-hooks': 'error',
       'vitest/no-focused-tests': 'warn',
       'vitest/no-hooks': 'off',
@@ -103,7 +105,7 @@ function vitest(options = {}) {
     },
   };
 
-  return mergeConfigs(vitestConfig, options.vitest.overrides ?? {});
+  return mergeConfigs(vitestConfig, overrides);
 }
 
 export default vitest;

package/src/types/modules/react.d.ts

@@ -1,5 +1,10 @@
 import type { ConfigWithOverrides } from '..';
 
 interface ReactOptions extends ConfigWithOverrides {
+  version?: string;
+  importSource?: string;
+  compilationMode?: 'all' | 'annotation' | 'infer' | 'syntax'; // Use the same compilationMode as the React Compiler config for consistent analysis
+  polymorphicPropName?: string;
+  additionalStateHooks?: string;
   additionalEffectHooks?: string;
 }

package/src/types/modules/regex.d.ts

@@ -1,5 +1,5 @@
 import type { ConfigWithOverrides } from '..';
 
 interface RegexOptions extends ConfigWithOverrides {
-  allowedCharacterRanges: string[];
+  allowedCharacterRanges?: string[];
 }

package/src/types/modules/tailwind.d.ts

@@ -1,18 +1,11 @@
 import type { ConfigWithOverrides } from '..';
 
-interface TailwindOptionsBase extends ConfigWithOverrides {
-  callees?: string[];
-  variables?: string[];
-  attributes?: string[];
-  tags?: string[];
-}
-
-interface TailwindOptionsWithEntryPoint extends TailwindOptionsBase {
+interface TailwindOptionsWithEntryPoint extends ConfigWithOverrides {
   entryPoint: string;
   tailwindConfig?: string;
 }
 
-interface TailwindOptionsWithConfig extends TailwindOptionsBase {
+interface TailwindOptionsWithConfig extends ConfigWithOverrides {
   entryPoint?: string;
   tailwindConfig: string;
 }

package/src/utils/nextAllowExportNames.mjs

@@ -0,0 +1,17 @@
+export const nextAllowExportNames = [
+  'experimental_ppr',
+  'dynamic',
+  'dynamicParams',
+  'revalidate',
+  'fetchCache',
+  'runtime',
+  'preferredRegion',
+  'maxDuration',
+  'metadata',
+  'generateMetadata',
+  'viewport',
+  'generateViewport',
+  'generateImageMetadata',
+  'generateSitemaps',
+  'generateStaticParams',
+];

package/src/utils/objectOrEmpty.mjs

@@ -0,0 +1,8 @@
+/**
+ * @template T
+ * @param {T | null | undefined} value
+ * @returns {T | {}}
+ */
+export function objectOrEmpty(value) {
+  return typeof value === 'object' && value !== null ? value : {};
+}