From 4db7c3aba3a13a4eb03b8582a6b00cf9e05407a9 Mon Sep 17 00:00:00 2001
From: underfin <likui6666666@gmail.com>
Date: Sun, 30 May 2021 12:19:13 +0800
Subject: [PATCH 1/4] fix(plugin-vue): rewrite default after ts compiled fix:
 #3542

---
 packages/playground/vue/CustomBlock.vue |  7 +++++--
 packages/plugin-vue/src/main.ts         | 25 +++++++++++++------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/packages/playground/vue/CustomBlock.vue b/packages/playground/vue/CustomBlock.vue
index cc49cd07242fdd..5b908c79e5ebdd 100644
--- a/packages/playground/vue/CustomBlock.vue
+++ b/packages/playground/vue/CustomBlock.vue
@@ -3,12 +3,12 @@
   <p class="custom-block">{{ t('hello') }}</p>
 </template>
 
-<script>
+<script lang="ts">
 import { getCurrentInstance } from 'vue'
 
 function useI18n(locale = 'en') {
   const instance = getCurrentInstance()
-  const resources = instance.type.i18n || { en: {} }
+  const resources = (instance.type as any).i18n || { en: {} }
   function t(key) {
     const res = resources[locale] || {}
     return res[key]
@@ -16,6 +16,9 @@ function useI18n(locale = 'en') {
   return { t }
 }
 
+/*
+export default
+*/
 export default {
   setup() {
     return { ...useI18n('ja') }
diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts
index daa330e85b84ca..d1a01cc2c21a16 100644
--- a/packages/plugin-vue/src/main.ts
+++ b/packages/plugin-vue/src/main.ts
@@ -248,18 +248,7 @@ async function genScriptCode(
       !script.src
     ) {
       // TODO remove the class check logic after upgrading @vue/compiler-sfc
-      const classMatch = script.content.match(exportDefaultClassRE)
-      if (classMatch) {
-        scriptCode =
-          script.content.replace(exportDefaultClassRE, `\nclass $1`) +
-          `\nconst _sfc_main = ${classMatch[1]}`
-        if (/export\s+default/.test(scriptCode)) {
-          // fallback if there are still export default
-          scriptCode = rewriteDefault(script.content, `_sfc_main`)
-        }
-      } else {
-        scriptCode = rewriteDefault(script.content, `_sfc_main`)
-      }
+      scriptCode = script.content
       map = script.map
       if (script.lang === 'ts') {
         const result = await options.devServer!.transformWithEsbuild(
@@ -271,6 +260,18 @@ async function genScriptCode(
         scriptCode = result.code
         map = result.map
       }
+      const classMatch = scriptCode.match(exportDefaultClassRE)
+      if (classMatch) {
+        scriptCode =
+          scriptCode.replace(exportDefaultClassRE, `\nclass $1`) +
+          `\nconst _sfc_main = ${classMatch[1]}`
+        if (/export\s+default/.test(scriptCode)) {
+          // fallback if there are still export default
+          scriptCode = rewriteDefault(scriptCode, `_sfc_main`)
+        }
+      } else {
+        scriptCode = rewriteDefault(scriptCode, `_sfc_main`)
+      }
     } else {
       if (script.src) {
         await linkSrcToDescriptor(script.src, descriptor, pluginContext)

From eb9f1f18d47476215ecd10db52a209126ebbd280 Mon Sep 17 00:00:00 2001
From: underfin <likui6666666@gmail.com>
Date: Sun, 30 May 2021 19:41:54 +0800
Subject: [PATCH 2/4] Update packages/playground/vue/CustomBlock.vue

Co-authored-by: Shinigami <chrissi92@hotmail.de>
---
 packages/playground/vue/CustomBlock.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/playground/vue/CustomBlock.vue b/packages/playground/vue/CustomBlock.vue
index 5b908c79e5ebdd..aedf7f09b4bbc0 100644
--- a/packages/playground/vue/CustomBlock.vue
+++ b/packages/playground/vue/CustomBlock.vue
@@ -16,9 +16,7 @@ function useI18n(locale = 'en') {
   return { t }
 }
 
-/*
-export default
-*/
+// export default
 export default {
   setup() {
     return { ...useI18n('ja') }

From b2419ccac77f38c8427a36eb078a355813aefb55 Mon Sep 17 00:00:00 2001
From: underfin <likui6666666@gmail.com>
Date: Sun, 30 May 2021 19:52:24 +0800
Subject: [PATCH 3/4] fix: remove class check

---
 packages/plugin-vue/package.json |  2 +-
 packages/plugin-vue/src/main.ts  | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json
index 0e47c6342b249a..07d8e1e031708d 100644
--- a/packages/plugin-vue/package.json
+++ b/packages/plugin-vue/package.json
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-vue#readme",
   "peerDependencies": {
-    "@vue/compiler-sfc": "^3.0.6"
+    "@vue/compiler-sfc": "^3.0.8"
   },
   "devDependencies": {
     "@rollup/pluginutils": "^4.1.0",
diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts
index d1a01cc2c21a16..838b919e1190a4 100644
--- a/packages/plugin-vue/src/main.ts
+++ b/packages/plugin-vue/src/main.ts
@@ -247,7 +247,6 @@ async function genScriptCode(
       (!script.lang || (script.lang === 'ts' && options.devServer)) &&
       !script.src
     ) {
-      // TODO remove the class check logic after upgrading @vue/compiler-sfc
       scriptCode = script.content
       map = script.map
       if (script.lang === 'ts') {
@@ -260,18 +259,7 @@ async function genScriptCode(
         scriptCode = result.code
         map = result.map
       }
-      const classMatch = scriptCode.match(exportDefaultClassRE)
-      if (classMatch) {
-        scriptCode =
-          scriptCode.replace(exportDefaultClassRE, `\nclass $1`) +
-          `\nconst _sfc_main = ${classMatch[1]}`
-        if (/export\s+default/.test(scriptCode)) {
-          // fallback if there are still export default
-          scriptCode = rewriteDefault(scriptCode, `_sfc_main`)
-        }
-      } else {
-        scriptCode = rewriteDefault(scriptCode, `_sfc_main`)
-      }
+      scriptCode = rewriteDefault(scriptCode, `_sfc_main`)
     } else {
       if (script.src) {
         await linkSrcToDescriptor(script.src, descriptor, pluginContext)

From 1d66297aef70692a2d8764569062526c6b3459f2 Mon Sep 17 00:00:00 2001
From: underfin <likui6666666@gmail.com>
Date: Sun, 30 May 2021 19:57:00 +0800
Subject: [PATCH 4/4] fix: fix test

---
 packages/plugin-vue/src/main.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts
index 838b919e1190a4..98bca03db6f081 100644
--- a/packages/plugin-vue/src/main.ts
+++ b/packages/plugin-vue/src/main.ts
@@ -225,9 +225,6 @@ async function genTemplateCode(
   }
 }
 
-const exportDefaultClassRE =
-  /(?:(?:^|\n|;)\s*)export\s+default\s+class\s+([\w$]+)/
-
 async function genScriptCode(
   descriptor: SFCDescriptor,
   options: ResolvedOptions,