@w5s/eslint-config 3.12.0 → 3.13.0

package/src/config/imports.ts

@@ -10,10 +10,13 @@ export async function imports(options: imports.Options = {}) {
   const [importPlugin] = await Promise.all([interopDefault(import('eslint-plugin-import'))] as const);
   return [
     {
-      name: 'w5s/import/rules',
+      name: 'w5s/import/setup',
       plugins: {
         import: importPlugin,
       },
+    },
+    {
+      name: 'w5s/import/rules',
       rules: {
         ...(recommended ? imports['recommended'] : {}),
         ...(stylisticEnabled
@@ -22,7 +25,7 @@ export async function imports(options: imports.Options = {}) {
         ...rules,
       },
     },
-  ] as [Config] satisfies Array<Config>;
+  ] as [Config, Config] satisfies Array<Config>;
 }
 
 /**

package/src/config/unicorn.ts

@@ -3,13 +3,14 @@ import { interopDefault } from '@w5s/dev';
 import type { RuleOptions } from '../typegen/unicorn.js';
 
 import { sourceGlob } from '../glob.js';
+import { withDefaultFiles } from '../internal/withDefaultFiles.js';
 import { type Config, type PluginOptionsBase, StylisticConfig } from '../type.js';
 
 const defaultFiles = [sourceGlob];
 
 export async function unicorn(options: unicorn.Options = {}) {
   const [unicornPlugin] = await Promise.all([interopDefault(import('eslint-plugin-unicorn'))] as const);
-  const { files = defaultFiles, recommended = true, rules = {}, stylistic = true } = options;
+  const { files, recommended = true, rules = {}, stylistic = true } = options;
   const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
 
   return [
@@ -20,7 +21,7 @@ export async function unicorn(options: unicorn.Options = {}) {
       },
     },
     {
-      files,
+      files: withDefaultFiles(files, defaultFiles),
       name: 'w5s/unicorn/rules',
       rules: {
         ...(recommended && unicornPlugin.configs['unopinionated'].rules),

package/src/defineConfig.ts

@@ -56,11 +56,16 @@ export async function defineConfig(options: DefineConfigOptions = {}) {
   const stylisticOptions =
     typeof plugins.stylistic === 'boolean' ? { enabled: plugins.stylistic } : { enabled: true, ...plugins.stylistic };
   const withDefaultStylistic = <T>(_options: T) => ({ stylistic: stylisticOptions, ..._options });
-  const toOption = <T extends {}>(optionsOrBoolean: boolean | T | undefined) =>
+  const toOption = <T extends {}>(
+    optionsOrBoolean: boolean | T | undefined,
+    defaultEnabled = true,
+  ) =>
     withDefaultStylistic(
       (typeof optionsOrBoolean === 'boolean'
         ? { enabled: optionsOrBoolean }
-        : { enabled: true, ...optionsOrBoolean }) as T & { enabled: boolean },
+        : optionsOrBoolean === undefined
+          ? { enabled: defaultEnabled }
+          : { enabled: defaultEnabled, ...optionsOrBoolean }) as T & { enabled: boolean },
     );
   const includeEnabled = <T extends { enabled?: boolean }, R extends Promise<readonly Config[]>>(factory: (config: T) => R, input: T) =>
     input.enabled ? [factory(input)] : [];
@@ -76,7 +81,7 @@ export async function defineConfig(options: DefineConfigOptions = {}) {
     ...includeEnabled(stylistic, toOption(plugins.stylistic)),
     ...includeEnabled(imports, toOption(plugins.import)),
     ...includeEnabled(markdown, toOption(plugins.markdown)),
-    ...includeEnabled(next, toOption(plugins.next)),
+    ...includeEnabled(next, toOption(plugins.next, false)),
     ...includeEnabled(node, toOption(plugins.node)),
     ...includeEnabled(perfectionist, toOption(plugins.perfectionist)),
     ...includeEnabled(unicorn, toOption(plugins.unicorn)),