Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions src/core/ctx.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Import, InlinePreset } from 'unimport'
import type { BiomeLintrc, ESLintGlobalsPropValue, ESLintrc, ImportExtended, Options } from '../types'
import type { BiomeLintrc, ESLintrc, ImportExtended, Options } from '../types'
import { existsSync, promises as fs } from 'node:fs'
import { dirname, isAbsolute, relative, resolve } from 'node:path'
import process from 'node:process'
Expand Down Expand Up @@ -164,20 +164,8 @@ ${dts}`.trim()}\n`
return currentContent
}

async function parseESLint(): Promise<Record<string, ESLintGlobalsPropValue>> {
if (!eslintrc.filepath)
return {}
if (eslintrc.filepath.match(/\.[cm]?[jt]sx?$/)) // Skip JavaScript-like files
return {}
const configStr = existsSync(eslintrc.filepath!)
? await fs.readFile(eslintrc.filepath!, 'utf-8')
: ''
const config = JSON.parse(configStr || '{ "globals": {} }')
return config.globals
}

async function generateESLint() {
return generateESLintConfigs(await unimport.getImports(), eslintrc, await parseESLint())
return generateESLintConfigs(await unimport.getImports(), eslintrc)
}

async function generateBiomeLint() {
Expand Down
5 changes: 2 additions & 3 deletions src/core/eslintrc.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import type { Import } from 'unimport'
import type { ESLintGlobalsPropValue, ESLintrc } from '../types'
import type { ESLintrc } from '../types'

export function generateESLintConfigs(
imports: Import[],
eslintrc: ESLintrc,
globals: Record<string, ESLintGlobalsPropValue> = {},
) {
const eslintConfigs: any = { globals }
const eslintConfigs: any = { globals: {} }

imports
.map(i => i.as ?? i.name)
Expand Down