From b84e544bb23918081b55b5f8785a6aa45270103c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 19 May 2023 09:06:41 +0800
Subject: [PATCH] refactor: tweaks

---
 packages/runtime-core/src/component.ts            |  2 +-
 packages/server-renderer/__tests__/render.spec.ts | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
index 51e0f6f2bcc..e68a8560bff 100644
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@ -905,8 +905,8 @@ export function finishComponentSetup(
     pauseTracking()
     try {
       applyOptions(instance)
-      resetTracking()
     } finally {
+      resetTracking()
       unsetCurrentInstance()
     }
   }
diff --git a/packages/server-renderer/__tests__/render.spec.ts b/packages/server-renderer/__tests__/render.spec.ts
index 0c8ced159f2..0abaebf088e 100644
--- a/packages/server-renderer/__tests__/render.spec.ts
+++ b/packages/server-renderer/__tests__/render.spec.ts
@@ -817,21 +817,24 @@ function testRender(type: string, render: typeof renderToString) {
       const prev = getCurrentInstance()
 
       expect(prev).toBe(null)
+
+      const Child = {
+        created() {
+          throw new Error()
+        }
+      }
       try {
         await render(
           createApp({
             errorCaptured() {
               throw new Error()
             },
-            template: `<div>hello</div>`,
-            created() {
-              throw new Error()
-            }
+            render: () => h(Child)
           })
         )
       } catch {}
       expect(
-        'Unhandled error during execution of created hook'
+        'Unhandled error during execution of errorCaptured hook'
       ).toHaveBeenWarned()
       expect(getCurrentInstance()).toBe(null)
     })