update

Author: ota-meshi

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "test/fixtures/eslint"]
-	path = test/fixtures/eslint
-	url = https://github.com/eslint/eslint.git

eslint.config.mjs

@@ -118,6 +118,10 @@ export default [
 
         languageOptions: {
             parser: tsParser,
+            globals: {
+                process: "readonly",
+                require: "readonly",
+            },
         },
 
         rules: {
@@ -248,14 +252,14 @@ export default [
             ],
 
             "no-undef": [
-                "off",
+                "error",
                 {
                     typeof: true,
                 },
             ],
 
-            "no-unused-vars": [
-                "off",
+            "@typescript-eslint/no-unused-vars": [
+                "error",
                 {
                     args: "all",
                     argsIgnorePattern: "^_(?:[^_].*)?$",
@@ -291,7 +295,6 @@ export default [
             "@typescript-eslint/no-non-null-assertion": ["off"],
             "@typescript-eslint/no-type-alias": ["off"],
             "@typescript-eslint/no-unnecessary-condition": ["off"],
-            "@typescript-eslint/no-unused-vars": ["off"],
             "@typescript-eslint/no-use-before-define": ["off"],
             "@typescript-eslint/prefer-for-of": ["off"],
             "@typescript-eslint/promise-function-async": ["off"],

package.json

@@ -13,13 +13,13 @@
     "eslint": "^8.57.0 || ^9.0.0"
   },
   "dependencies": {
-    "debug": "^4.3.4",
-    "eslint-scope": "^7.1.1",
-    "eslint-visitor-keys": "^3.3.0",
-    "espree": "^9.3.1",
-    "esquery": "^1.4.0",
+    "debug": "^4.4.0",
+    "eslint-scope": "^8.2.0",
+    "eslint-visitor-keys": "^4.2.0",
+    "espree": "^10.3.0",
+    "esquery": "^1.6.0",
     "lodash": "^4.17.21",
-    "semver": "^7.3.6"
+    "semver": "^7.6.3"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
@@ -60,8 +60,8 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-sourcemaps": "^0.6.3",
-    "ts-node": "^10.4.0",
-    "typescript": "~4.8.4",
+    "ts-node": "^10.9.2",
+    "typescript": "~5.7.3",
     "wait-on": "^6.0.0",
     "warun": "^1.0.0"
   },

scripts/ci-install-eslint.js

@@ -29,18 +29,18 @@ function sh(command) {
         : `^${requestedVersion}`
 
     // Install ESLint of the requested version
-    await sh(`npm install eslint@${requestedVersionSpec} --legacy-peer-deps`)
+    await sh(`npm install eslint@${requestedVersionSpec} -f`)
 
     // Install ESLint submodule of the requested version
-    const installedVersion = require("eslint/package.json").version
-    cd("test/fixtures/eslint")
-    if (!installedVersion.startsWith("8.")) {
-        await sh(`git checkout v${installedVersion}`)
-    }
-    if (installedVersion.startsWith("5.")) {
-        await sh("npm install [email protected]")
-    }
-    await sh("npm install --legacy-peer-deps")
+    // const installedVersion = require("eslint/package.json").version
+    // cd("test/fixtures/eslint")
+    // if (!installedVersion.startsWith("8.")) {
+    //     await sh(`git checkout v${installedVersion}`)
+    // }
+    // if (installedVersion.startsWith("5.")) {
+    //     await sh("npm install [email protected]")
+    // }
+    // await sh("npm install -f")
 })().catch((error) => {
     console.error(error)
     process.exitCode = 1

scripts/update-fixtures-ast.js

@@ -28,7 +28,8 @@ const ROOT = path.join(__dirname, "../test/fixtures/ast")
 const TARGETS = fs.readdirSync(ROOT)
 const PARSER_OPTIONS = {
     comment: true,
-    ecmaVersion: 2020,
+    ecmaVersion: "latest",
+    sourceType: "module",
     loc: true,
     range: true,
     tokens: true,

scripts/update-fixtures-document-fragment.js

@@ -16,11 +16,11 @@ const ROOT = path.join(__dirname, "../test/fixtures/document-fragment")
 const TARGETS = fs.readdirSync(ROOT)
 const PARSER_OPTIONS = {
     comment: true,
-    ecmaVersion: 6,
+    ecmaVersion: "latest",
+    sourceType: "module",
     loc: true,
     range: true,
     tokens: true,
-    sourceType: "module",
 }
 
 /**

src/common/eslint-scope.ts

@@ -1,25 +1,41 @@
 import * as escope from "eslint-scope"
-import { getLinterRequire } from "./linter-require"
 import { lte } from "semver"
+import { createRequire } from "./create-require"
+import path from "path"
 
-let escopeCache: typeof escope | null = null
+type ESLintScope = typeof escope & {
+    version: string
+}
+let escopeCache: ESLintScope | null = null
 
 /**
  * Load the newest `eslint-scope` from the loaded ESLint or dependency.
  */
-export function getEslintScope(): typeof escope & {
-    version: string
-} {
-    if (!escopeCache) {
-        escopeCache = getLinterRequire()?.("eslint-scope")
-        if (
-            !escopeCache ||
-            escopeCache.version == null ||
-            lte(escopeCache.version, escope.version)
-        ) {
-            escopeCache = escope
-        }
+export function getEslintScope(): ESLintScope {
+    return escopeCache || (escopeCache = getNewest())
+}
+
+/**
+ * Load the newest `eslint-scope` from the dependency.
+ */
+function getNewest(): ESLintScope {
+    let newest = escope
+    const userEscope = getEslintScopeFromUser()
+    if (userEscope.version != null && lte(newest.version, userEscope.version)) {
+        newest = userEscope
     }
+    return newest
+}
 
-    return escopeCache
+/**
+ * Load `eslint-scope` from the user dir.
+ */
+function getEslintScopeFromUser(): ESLintScope {
+    try {
+        const cwd = process.cwd()
+        const relativeTo = path.join(cwd, "__placeholder__.js")
+        return createRequire(relativeTo)("eslint-scope")
+    } catch {
+        return escope
+    }
 }

src/common/espree.ts

@@ -1,83 +1,42 @@
 import type { ParserOptions } from "../common/parser-options"
-import { getLinterRequire } from "./linter-require"
 // @ts-expect-error -- ignore
 import * as dependencyEspree from "espree"
-import { lte, lt } from "semver"
+import { lte } from "semver"
 import { createRequire } from "./create-require"
 import path from "path"
 import type { BasicParserObject } from "./parser-object"
 
 type Espree = BasicParserObject & {
-    latestEcmaVersion?: number
+    latestEcmaVersion: number
     version: string
 }
 let espreeCache: Espree | null = null
 
 /**
  * Gets the espree that the given ecmaVersion can parse.
  */
-export function getEspreeFromEcmaVersion(
-    ecmaVersion: ParserOptions["ecmaVersion"],
-): Espree {
-    const linterEspree = getEspreeFromLinter()
-    if (ecmaVersion == null) {
-        return linterEspree
-    }
-    if (ecmaVersion === "latest") {
-        return getNewestEspree()
-    }
-    if (
-        normalizeEcmaVersion(ecmaVersion) <= getLatestEcmaVersion(linterEspree)
-    ) {
-        return linterEspree
-    }
-    const userEspree = getEspreeFromUser()
-    if (normalizeEcmaVersion(ecmaVersion) <= getLatestEcmaVersion(userEspree)) {
-        return userEspree
-    }
-    return linterEspree
+export function getEspree(): Espree {
+    return espreeCache || (espreeCache = getNewestEspree())
 }
 
 /**
  * Load `espree` from the user dir.
  */
-export function getEspreeFromUser(): Espree {
+function getEspreeFromUser(): Espree {
     try {
         const cwd = process.cwd()
         const relativeTo = path.join(cwd, "__placeholder__.js")
         return createRequire(relativeTo)("espree")
     } catch {
-        return getEspreeFromLinter()
-    }
-}
-
-/**
- * Load `espree` from the loaded ESLint.
- * If the loaded ESLint was not found, just returns `require("espree")`.
- */
-export function getEspreeFromLinter(): Espree {
-    if (!espreeCache) {
-        espreeCache = getLinterRequire()?.("espree")
-        if (!espreeCache) {
-            espreeCache = dependencyEspree
-        }
+        return dependencyEspree
     }
-
-    return espreeCache!
 }
 
 /**
- * Load the newest `espree` from the loaded ESLint or dependency.
+ * Load the newest `espree` from the dependency.
  */
 function getNewestEspree(): Espree {
     let newest = dependencyEspree
-    const linterEspree = getEspreeFromLinter()
-    if (
-        linterEspree.version != null &&
-        lte(newest.version, linterEspree.version)
-    ) {
-        newest = linterEspree
-    }
     const userEspree = getEspreeFromUser()
     if (userEspree.version != null && lte(newest.version, userEspree.version)) {
         newest = userEspree
@@ -94,7 +53,7 @@ export function getEcmaVersionIfUseEspree(
     }
 
     if (parserOptions.ecmaVersion === "latest") {
-        return normalizeEcmaVersion(getLatestEcmaVersion(getNewestEspree()))
+        return getDefaultEcmaVersion()
     }
     if (parserOptions.ecmaVersion == null) {
         const defVer = getDefaultEcmaVersion()
@@ -104,10 +63,6 @@ export function getEcmaVersionIfUseEspree(
 }
 
 function getDefaultEcmaVersion(): number {
-    if (lt(getEspreeFromLinter().version, "9.0.0")) {
-        return 5
-    }
-    // Perhaps the version 9 will change the default to "latest".
     return normalizeEcmaVersion(getLatestEcmaVersion(getNewestEspree()))
 }
 
@@ -122,16 +77,5 @@ function normalizeEcmaVersion(version: number) {
 }
 
 function getLatestEcmaVersion(espree: Espree) {
-    if (espree.latestEcmaVersion == null) {
-        for (const { v, latest } of [
-            { v: "6.1.0", latest: 2020 },
-            { v: "4.0.0", latest: 2019 },
-        ]) {
-            if (lte(v, espree.version)) {
-                return latest
-            }
-        }
-        return 2018
-    }
     return normalizeEcmaVersion(espree.latestEcmaVersion)
 }

src/common/linter-require.ts

@@ -1,5 +1,4 @@
-import { lte } from "semver"
-import { getEcmaVersionIfUseEspree, getEspreeFromUser } from "../common/espree"
+import { getEcmaVersionIfUseEspree, getEspree } from "../common/espree"
 import type { ParserOptions } from "../common/parser-options"
 
 export const DEFAULT_ECMA_VERSION = 2017
@@ -21,10 +20,6 @@ export function getScriptSetupParserOptions(
     }
 }
 
-function getDefaultEcmaVersion(def: number) {
-    if (lte("8.0.0", getEspreeFromUser().version)) {
-        // Script setup requires top level await support, so default the ecma version to 2022.
-        return getEspreeFromUser().latestEcmaVersion!
-    }
-    return Math.max(def, DEFAULT_ECMA_VERSION)
+function getDefaultEcmaVersion() {
+    return getEspree().latestEcmaVersion
 }

src/script-setup/parser-options.ts

@@ -43,11 +43,7 @@ import {
     analyzeExternalReferences,
     analyzeVariablesAndExternalReferences,
 } from "./scope-analyzer"
-import {
-    getEcmaVersionIfUseEspree,
-    getEspreeFromUser,
-    getEspreeFromEcmaVersion,
-} from "../common/espree"
+import { getEcmaVersionIfUseEspree, getEspree } from "../common/espree"
 import type { ParserOptions } from "../common/parser-options"
 import {
     fixErrorLocation,
@@ -571,7 +567,7 @@ function loadParser(parser: string) {
         // eslint-disable-next-line @typescript-eslint/no-require-imports
         return require(parser)
     }
-    return getEspreeFromUser()
+    return getEspree()
 }
 
 /**
@@ -590,7 +586,7 @@ export function parseScript(
             ? loadParser(parserOptions.parser)
             : isParserObject(parserOptions.parser)
               ? parserOptions.parser
-              : getEspreeFromEcmaVersion(parserOptions.ecmaVersion)
+              : getEspree()
 
     const result: any = isEnhancedParserObject(parser)
         ? parser.parseForESLint(code, parserOptions)