feat: expose options object in generate configs, fix #375

nuxt · Apr 3, 2024 · 84b7891 · 84b7891
1 parent 80a050b
commit 84b7891
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/eslint-config/src/flat/index.ts b/packages/eslint-config/src/flat/index.ts
@@ -13,6 +13,8 @@ import { resolveOptions } from './utils'
 
 export * from './types'
 
+export { resolveOptions }
+
 /**
  * Provide type definitions for constructing ESLint flat config items.
  *
@@ -46,6 +48,10 @@ export function createConfigForNuxt(options: NuxtESLintConfigOptions = {}): Flat
     )
   }
 
+  c.append(
+    nuxt(resolved),
+  )
+
   if (resolved.features.stylistic) {
     c.append({
       name: 'nuxt/stylistic',
@@ -58,7 +64,6 @@ export function createConfigForNuxt(options: NuxtESLintConfigOptions = {}): Flat
   }
 
   c.append(
-    nuxt(resolved),
     disables(resolved),
   )
 

diff --git a/packages/module/src/modules/config.ts b/packages/module/src/modules/config.ts
@@ -42,10 +42,13 @@ export async function setupConfigGen(options: ModuleOptions, nuxt: Nuxt) {
       return [
         'import type { FlatConfigComposer, FlatConfigItem } from "eslint-flat-config-utils"',
         'import { defineFlatConfigs } from "@nuxt/eslint-config/flat"',
+        'import type { NuxtESLintConfigOptionsResolved } from "@nuxt/eslint-config/flat"',
+        '',
         'declare const configs: FlatConfigComposer<FlatConfigItem>',
+        'declare const options: NuxtESLintConfigOptionsResolved',
         'declare const withNuxt: typeof defineFlatConfigs',
         'export default withNuxt',
-        'export { withNuxt, defineFlatConfigs }',
+        'export { withNuxt, defineFlatConfigs, configs, options }',
       ].join('\n')
     },
   })
@@ -80,6 +83,10 @@ async function generateESLintConfig(options: ModuleOptions, nuxt: Nuxt, addons:
       from: '@nuxt/eslint-config/flat',
       name: 'defineFlatConfigs',
     },
+    {
+      from: '@nuxt/eslint-config/flat',
+      name: 'resolveOptions',
+    },
   )
 
   const basicOptions: NuxtESLintConfigOptions = {
@@ -90,7 +97,7 @@ async function generateESLintConfig(options: ModuleOptions, nuxt: Nuxt, addons:
     dirs: getDirs(nuxt),
   }
 
-  configItems.push(`// Nuxt Configs\ncreateConfigForNuxt(${JSON.stringify(basicOptions, null, 2)})`)
+  configItems.push(`// Nuxt Configs\ncreateConfigForNuxt(options)`)
 
   for (const addon of addons) {
     const resolved = await addon.getConfigs()
@@ -118,6 +125,8 @@ async function generateESLintConfig(options: ModuleOptions, nuxt: Nuxt, addons:
     'export { defineFlatConfigs }',
     '',
     `export const configs = composer()`,
+    '',
+    `export const options = resolveOptions(${JSON.stringify(basicOptions, null, 2)})`,
     ``,
     `configs.append(`,
     configItems.join(',\n\n'),