chore: improve code

chore: improve code

chore: improve code

chore(deps): update dependency @types/node to v18 (vuejs#9323)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore: improve code

Author: edison1105

package.json

@@ -66,7 +66,7 @@
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-terser": "^0.4.3",
     "@types/hash-sum": "^1.0.0",
-    "@types/node": "^16.18.52",
+    "@types/node": "^18.18.5",
     "@typescript-eslint/parser": "^6.7.2",
     "@vitest/coverage-istanbul": "^0.34.4",
     "@vue/consolidate": "0.17.3",

packages/runtime-core/src/components/Suspense.ts

@@ -379,7 +379,8 @@ export interface SuspenseBoundary {
   container: RendererElement
   hiddenContainer: RendererElement
   anchor: RendererNode | null
-  activeBranch: (VNode & { __isUnmounted?: boolean }) | null
+  activeBranch: VNode | null
+  preActiveBranch: VNode | null
   pendingBranch: VNode | null
   deps: number
   pendingId: number
@@ -462,6 +463,7 @@ function createSuspenseBoundary(
     pendingId: 0,
     timeout: typeof timeout === 'number' ? timeout : -1,
     activeBranch: null,
+    preActiveBranch: null,
     pendingBranch: null,
     isInFallback: true,
     isHydrating,
@@ -506,12 +508,12 @@ function createSuspenseBoundary(
           }
         }
         // this is initial anchor on mount
-        let { anchor } = suspense
+        let { anchor, preActiveBranch } = suspense
         // unmount current active tree
         // #7966 if suspense is wrapped in Transition, the Transition's afterLeave may not have been
         // performed (this means the fallbackVNode not mounted) when suspense resolves.
         // so avoid unmount activeBranch again
-        if (activeBranch && !activeBranch.__isUnmounted) {
+        if (activeBranch && activeBranch !== preActiveBranch) {
           // if the fallback tree was mounted, it may have been moved
           // as part of a parent suspense. get the latest anchor for insertion
           anchor = next(activeBranch)
@@ -594,6 +596,7 @@ function createSuspenseBoundary(
           optimized
         )
         setActiveBranch(suspense, fallbackVNode)
+        suspense.preActiveBranch = null
       }
 
       const delayEnter =
@@ -611,7 +614,7 @@ function createSuspenseBoundary(
         true // shouldRemove
       )
 
-      activeBranch!.__isUnmounted = true
+      suspense.preActiveBranch = activeBranch!
 
       if (!delayEnter) {
         mountFallback()
@@ -691,6 +694,7 @@ function createSuspenseBoundary(
 
     unmount(parentSuspense, doRemove) {
       suspense.isUnmounted = true
+      suspense.preActiveBranch = null
       if (suspense.activeBranch) {
         unmount(
           suspense.activeBranch,