Revert default option for sourceType: module on <script setup>. (#…

…111) * Revert default option for `sourceType: module` on `<script setup>`. * update * Update * update * update
vuejs · Jul 2, 2021 · 79574b5 · 79574b5
1 parent 68dde0f
commit 79574b5
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 9 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -85,25 +85,32 @@ export function parseForESLint(
     options = Object.assign(
         {
             comment: true,
-            ecmaVersion: 2017,
             loc: true,
             range: true,
             tokens: true,
         },
         options || {},
     )
 
+    const optionsWithEcmaVersion = {
+        ...options,
+        ecmaVersion: options.ecmaVersion || 2017,
+    }
+
     let result: AST.ESLintExtendedProgram
     let document: AST.VDocumentFragment | null
     let locationCalculator: LocationCalculatorForHtml | null
     if (!isVueFile(code, options)) {
-        result = parseScript(code, options)
+        result = parseScript(code, optionsWithEcmaVersion)
         document = null
         locationCalculator = null
     } else {
         const skipParsingScript = options.parser === false
-        const tokenizer = new HTMLTokenizer(code, options)
-        const rootAST = new HTMLParser(tokenizer, options).parse()
+        const tokenizer = new HTMLTokenizer(code, optionsWithEcmaVersion)
+        const rootAST = new HTMLParser(
+            tokenizer,
+            optionsWithEcmaVersion,
+        ).parse()
 
         locationCalculator = new LocationCalculatorForHtml(
             tokenizer.gaps,
@@ -124,7 +131,7 @@ export function parseForESLint(
 
         let scriptSetup: VElement | undefined
         if (skipParsingScript || !scripts.length) {
-            result = parseScript("", options)
+            result = parseScript("", optionsWithEcmaVersion)
         } else if (
             scripts.length === 2 &&
             (scriptSetup = scripts.find(isScriptSetup))

diff --git a/src/script-setup/parser-options.ts b/src/script-setup/parser-options.ts
@@ -16,8 +16,6 @@ export function getScriptSetupParserOptions(
     )
 
     return {
-        // Script setup requires module support, so set module to sourceType.
-        sourceType: "module",
         ...parserOptions,
         ecmaVersion: espreeEcmaVersion,
     }
@@ -28,5 +26,5 @@ function getDefaultEcmaVersion(def: number) {
         // Script setup requires top level await support, so default the ecma version to 2022.
         return getEspreeFromLinter().latestEcmaVersion!
     }
-    return Math.max(def, 2015)
+    return Math.max(def, 2017)
 }
diff --git a/src/script/index.ts b/src/script/index.ts
@@ -562,7 +562,10 @@ export function parseScriptElement(
 ): ESLintExtendedProgram {
     const parserOptions: ParserOptions = isScriptSetup(node)
         ? getScriptSetupParserOptions(originalParserOptions)
-        : originalParserOptions
+        : {
+              ...originalParserOptions,
+              ecmaVersion: originalParserOptions.ecmaVersion || 2017,
+          }
 
     const text = node.children[0]
     const { code, offset } =

diff --git a/test/fixtures/ast/script-setup-top-level-await-with-latest/parser-options.json b/test/fixtures/ast/script-setup-top-level-await-with-latest/parser-options.json
@@ -1,3 +1,4 @@
 {
+  "sourceType": "module",
   "ecmaVersion": "latest"
 }
diff --git a/test/fixtures/ast/script-setup-top-level-await/parser-options.json b/test/fixtures/ast/script-setup-top-level-await/parser-options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "module"
+}
diff --git a/test/parser-options.js b/test/parser-options.js
@@ -36,5 +36,21 @@ describe("parserOptions", () => {
             assert.strictEqual(messages.length, 1)
             assert.strictEqual(messages[0].ruleId, "vue/valid-template-root")
         })
+
+        it("Fail in <script setup> without sourceType.", () => {
+            const code = `<template>Hello</template>
+<script setup>import Foo from './foo'</script>`
+            const config = {
+                parser: "vue-eslint-parser",
+                parserOptions: {},
+                rules: {
+                    "vue/valid-template-root": "error",
+                },
+            }
+            const messages = linter.verify(code, config, "test.vue")
+
+            assert.strictEqual(messages.length, 1)
+            assert.strictEqual(messages[0].fatal, true)
+        })
     })
 })
diff --git a/typings/eslint-scope/index.d.ts b/typings/eslint-scope/index.d.ts
@@ -4,6 +4,7 @@
  * See LICENSE file in root directory for full license.
  */
 import type * as estree from "estree"
+import type { VisitorKeys } from "eslint-visitor-keys"
 
 export interface AnalysisOptions {
     optimistic?: boolean
@@ -14,6 +15,7 @@ export interface AnalysisOptions {
     fallback?: string | Function
     sourceType?: "script" | "module"
     ecmaVersion?: number
+    childVisitorKeys?: VisitorKeys
 }
 
 export interface ScopeManager {