Unverified Commit c8624091 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Improve check for eslint version (#25910)

Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent d2caaeab
...@@ -7,7 +7,6 @@ import * as CommentJson from 'next/dist/compiled/comment-json' ...@@ -7,7 +7,6 @@ import * as CommentJson from 'next/dist/compiled/comment-json'
import { formatResults } from './customFormatter' import { formatResults } from './customFormatter'
import { writeDefaultConfig } from './writeDefaultConfig' import { writeDefaultConfig } from './writeDefaultConfig'
import { getPackageVersion } from '../get-package-version'
import { findPagesDir } from '../find-pages-dir' import { findPagesDir } from '../find-pages-dir'
import { CompileError } from '../compile-error' import { CompileError } from '../compile-error'
...@@ -35,19 +34,25 @@ async function lint( ...@@ -35,19 +34,25 @@ async function lint(
pkgJsonPath: string | null pkgJsonPath: string | null
): Promise<string | null> { ): Promise<string | null> {
// Load ESLint after we're sure it exists: // Load ESLint after we're sure it exists:
const { ESLint } = await import(deps.resolved) const mod = await import(deps.resolved)
const { ESLint } = mod
if (!ESLint) { if (!ESLint) {
const eslintVersion: string | null = await getPackageVersion({ const eslintVersion: string | undefined = mod?.CLIEngine?.version
cwd: baseDir,
name: 'eslint',
})
if (eslintVersion && semver.lt(eslintVersion, '7.0.0')) { if (!eslintVersion || semver.lt(eslintVersion, '7.0.0')) {
Log.error( Log.error(
`Your project has an older version of ESLint installed (${eslintVersion}). Please upgrade to v7 or later` `Your project has an older version of ESLint installed${
eslintVersion ? ' (' + eslintVersion + ')' : ''
}. Please upgrade to ESLint version 7 or later`
) )
return null
} }
Log.error(
`ESLint class not found. Please upgrade to ESLint version 7 or later`
)
return null return null
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment