From e9a4e8d1e0c99f7e359975d9c72963bc89fcecbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ole=C5=9B?= <piotrek.oles@gmail.com>
Date: Wed, 20 Oct 2021 15:43:07 +0200
Subject: [PATCH] revert: support "setup" attribute in <script> tag in vue 3
 (#667)

This reverts commit 2cfe45f567e30a56dea4cb5907a0d47e62dae644.
---
 .../extension/vue/TypeScriptVueExtension.ts                   | 4 ++--
 .../extension/vue/types/vue__compiler-sfc.ts                  | 1 -
 test/e2e/fixtures/implementation/typescript-vue.fixture       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/typescript-reporter/extension/vue/TypeScriptVueExtension.ts b/src/typescript-reporter/extension/vue/TypeScriptVueExtension.ts
index a90beced..fd217449 100644
--- a/src/typescript-reporter/extension/vue/TypeScriptVueExtension.ts
+++ b/src/typescript-reporter/extension/vue/TypeScriptVueExtension.ts
@@ -112,8 +112,8 @@ function createTypeScriptVueExtension(
     } else if (isVueTemplateCompilerV3(compiler)) {
       const parsed = compiler.parse(vueSourceText);
 
-      if (parsed.descriptor && (parsed.descriptor.script || parsed.descriptor.scriptSetup)) {
-        const scriptV3 = (parsed.descriptor.script || parsed.descriptor.scriptSetup)!;
+      if (parsed.descriptor && parsed.descriptor.script) {
+        const scriptV3 = parsed.descriptor.script;
 
         // map newer version of SFCScriptBlock to the generic one
         script = {
diff --git a/src/typescript-reporter/extension/vue/types/vue__compiler-sfc.ts b/src/typescript-reporter/extension/vue/types/vue__compiler-sfc.ts
index 5a933576..eada888d 100644
--- a/src/typescript-reporter/extension/vue/types/vue__compiler-sfc.ts
+++ b/src/typescript-reporter/extension/vue/types/vue__compiler-sfc.ts
@@ -23,7 +23,6 @@ interface SFCDescriptor {
   filename: string;
   template: SFCBlock | null;
   script: SFCBlock | null;
-  scriptSetup: SFCBlock | null;
   styles: SFCBlock[];
   customBlocks: SFCBlock[];
 }
diff --git a/test/e2e/fixtures/implementation/typescript-vue.fixture b/test/e2e/fixtures/implementation/typescript-vue.fixture
index 7a77e187..b38a3c30 100644
--- a/test/e2e/fixtures/implementation/typescript-vue.fixture
+++ b/test/e2e/fixtures/implementation/typescript-vue.fixture
@@ -92,7 +92,7 @@ h1 {
   </p>
 </template>
 
-<script setup lang="ts">
+<script lang="ts">
 import User, { getUserName } from '@/model/User';
 
 export default {