Changed default ecmaVersion to "latest"

vuejs · Jan 29, 2025 · 58dedba · 58dedba
1 parent d1d2540
commit 58dedba
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 66 deletions.
diff --git a/src/common/espree.ts b/src/common/espree.ts
@@ -19,6 +19,22 @@ export function getEspree(): Espree {
     return espreeCache || (espreeCache = getNewestEspree())
 }
 
+export function getEcmaVersionIfUseEspree(
+    parserOptions: ParserOptions,
+): number | undefined {
+    if (parserOptions.parser != null && parserOptions.parser !== "espree") {
+        return undefined
+    }
+
+    if (
+        parserOptions.ecmaVersion === "latest" ||
+        parserOptions.ecmaVersion == null
+    ) {
+        return getDefaultEcmaVersion()
+    }
+    return normalizeEcmaVersion(parserOptions.ecmaVersion)
+}
+
 /**
  * Load `espree` from the user dir.
  */
@@ -44,26 +60,8 @@ function getNewestEspree(): Espree {
     return newest
 }
 
-export function getEcmaVersionIfUseEspree(
-    parserOptions: ParserOptions,
-    getDefault?: (defaultVer: number) => number,
-): number | undefined {
-    if (parserOptions.parser != null && parserOptions.parser !== "espree") {
-        return undefined
-    }
-
-    if (parserOptions.ecmaVersion === "latest") {
-        return getDefaultEcmaVersion()
-    }
-    if (parserOptions.ecmaVersion == null) {
-        const defVer = getDefaultEcmaVersion()
-        return getDefault?.(defVer) ?? defVer
-    }
-    return normalizeEcmaVersion(parserOptions.ecmaVersion)
-}
-
 function getDefaultEcmaVersion(): number {
-    return normalizeEcmaVersion(getLatestEcmaVersion(getNewestEspree()))
+    return getLatestEcmaVersion(getEspree())
 }
 
 /**

diff --git a/src/script-setup/index.ts b/src/script-setup/index.ts
@@ -31,7 +31,7 @@ import {
     parseScriptFragment,
 } from "../script/index"
 import { extractGeneric } from "../script/generic"
-import { getScriptSetupParserOptions } from "./parser-options"
+import { DEFAULT_ECMA_VERSION } from "./parser-options"
 
 type RemapBlock = {
     range: [number, number]
@@ -214,9 +214,10 @@ export function parseScriptSetupElements(
     linesAndColumns: LinesAndColumns,
     originalParserOptions: ParserOptions,
 ): ESLintExtendedProgram {
-    const parserOptions: ParserOptions = getScriptSetupParserOptions(
-        originalParserOptions,
-    )
+    const parserOptions: ParserOptions = {
+        ...originalParserOptions,
+        ecmaVersion: originalParserOptions.ecmaVersion || DEFAULT_ECMA_VERSION,
+    }
     const scriptSetupModuleCodeBlocks = getScriptSetupModuleCodeBlocks(
         scriptSetupElement,
         scriptElement,

diff --git a/src/script-setup/parser-options.ts b/src/script-setup/parser-options.ts
@@ -1,25 +1,3 @@
-import { getEcmaVersionIfUseEspree, getEspree } from "../common/espree"
-import type { ParserOptions } from "../common/parser-options"
+export const DEFAULT_ECMA_VERSION = "latest"
 
-export const DEFAULT_ECMA_VERSION = 2017
-
-/**
- * Get parser options for <script setup>
- */
-export function getScriptSetupParserOptions(
-    parserOptions: ParserOptions,
-): ParserOptions {
-    const espreeEcmaVersion = getEcmaVersionIfUseEspree(
-        parserOptions,
-        getDefaultEcmaVersion,
-    )
-
-    return {
-        ...parserOptions,
-        ecmaVersion: espreeEcmaVersion,
-    }
-}
-
-function getDefaultEcmaVersion() {
-    return getEspree().latestEcmaVersion
-}
+export const ANALYZE_SCOPE_DEFAULT_ECMA_VERSION = 2022
diff --git a/src/script/index.ts b/src/script/index.ts
@@ -50,11 +50,7 @@ import {
     fixLocation,
     fixLocations,
 } from "../common/fix-locations"
-import {
-    DEFAULT_ECMA_VERSION,
-    getScriptSetupParserOptions,
-} from "../script-setup/parser-options"
-import { isScriptSetupElement } from "../common/ast-utils"
+import { DEFAULT_ECMA_VERSION } from "../script-setup/parser-options"
 import type { LinesAndColumns } from "../common/lines-and-columns"
 import type { ParserObject } from "../common/parser-object"
 import { isEnhancedParserObject, isParserObject } from "../common/parser-object"
@@ -612,13 +608,10 @@ export function parseScriptElement(
     linesAndColumns: LinesAndColumns,
     originalParserOptions: ParserOptions,
 ): ESLintExtendedProgram {
-    const parserOptions: ParserOptions = isScriptSetupElement(node)
-        ? getScriptSetupParserOptions(originalParserOptions)
-        : {
-              ...originalParserOptions,
-              ecmaVersion:
-                  originalParserOptions.ecmaVersion || DEFAULT_ECMA_VERSION,
-          }
+    const parserOptions: ParserOptions = {
+        ...originalParserOptions,
+        ecmaVersion: originalParserOptions.ecmaVersion || DEFAULT_ECMA_VERSION,
+    }
 
     let generic: GenericProcessInfo | null = null
     let code: string

diff --git a/src/script/scope-analyzer.ts b/src/script/scope-analyzer.ts
@@ -14,6 +14,7 @@ import type {
 import { getFallbackKeys } from "../ast/index"
 import { getEslintScope } from "../common/eslint-scope"
 import { getEcmaVersionIfUseEspree } from "../common/espree"
+import { ANALYZE_SCOPE_DEFAULT_ECMA_VERSION } from "../script-setup/parser-options"
 
 type ParserResult = {
     ast: ESLintProgram
@@ -100,7 +101,9 @@ export function analyzeScope(
     ast: ESLintProgram,
     parserOptions: ParserOptions,
 ): escopeTypes.ScopeManager {
-    const ecmaVersion = getEcmaVersionIfUseEspree(parserOptions) || 2022
+    const ecmaVersion =
+        getEcmaVersionIfUseEspree(parserOptions) ||
+        ANALYZE_SCOPE_DEFAULT_ECMA_VERSION
     const ecmaFeatures = parserOptions.ecmaFeatures || {}
     const sourceType = parserOptions.sourceType || "script"
     const result = getEslintScope().analyze(ast, {

diff --git a/src/sfc/custom-block/index.ts b/src/sfc/custom-block/index.ts
@@ -17,7 +17,10 @@ import type { LocationCalculatorForHtml } from "../../common/location-calculator
 import type { ParserObject } from "../../common/parser-object"
 import { isEnhancedParserObject } from "../../common/parser-object"
 import type { ParserOptions } from "../../common/parser-options"
-import { DEFAULT_ECMA_VERSION } from "../../script-setup/parser-options"
+import {
+    ANALYZE_SCOPE_DEFAULT_ECMA_VERSION,
+    DEFAULT_ECMA_VERSION,
+} from "../../script-setup/parser-options"
 
 export type ESLintCustomBlockParser = ParserObject<any, any>
 
@@ -291,7 +294,9 @@ export function createCustomBlockSharedContext({
             return parsedResult.scopeManager
         }
 
-        const ecmaVersion = getEcmaVersionIfUseEspree(parserOptions) || 2022
+        const ecmaVersion =
+            getEcmaVersionIfUseEspree(parserOptions) ||
+            ANALYZE_SCOPE_DEFAULT_ECMA_VERSION
         const ecmaFeatures = parserOptions.ecmaFeatures || {}
         const sourceType = parserOptions.sourceType || "script"
         return getEslintScope().analyze(parsedResult.ast, {

diff --git a/test/index.js b/test/index.js
@@ -588,7 +588,7 @@ describe("Basic tests", async () => {
                         parserOptions: {
                             ...BABEL_PARSER_OPTIONS,
                             sourceType: "module",
-                            ecmaVersion: 2017,
+                            ecmaVersion: "latest",
                         },
                         globals: {},
                     },
@@ -752,7 +752,7 @@ describe("Basic tests", async () => {
             const indexOfDecorator = code.indexOf("@Component")
             const ast = parse(code, {
                 ...BABEL_PARSER_OPTIONS,
-                ecmaVersion: 2017,
+                ecmaVersion: "latest",
                 sourceType: "module",
 
                 // Implicit parserOptions to detect whether the current ESLint supports `result.scopeManager` and `result.visitorKeys`.
@@ -859,7 +859,7 @@ describe("Basic tests", async () => {
                 languageOptions: {
                     parser,
                     parserOptions: {
-                        ecmaVersion: 2015,
+                        ecmaVersion: "latest",
                     },
                 },
             }

diff --git a/test/test-utils.js b/test/test-utils.js
@@ -105,7 +105,7 @@ function scopeToJSON(scopeManager) {
  * Analyze scope
  */
 function analyze(ast, parserOptions) {
-    const ecmaVersion = parserOptions.ecmaVersion || 2017
+    const ecmaVersion = parserOptions.ecmaVersion || 2022
     const ecmaFeatures = parserOptions.ecmaFeatures || {}
     const sourceType = parserOptions.sourceType || "script"
     const result = escope.analyze(ast, {