chore: update

linzhe141 · Aug 12, 2024 · 5c2bc23 · 5c2bc23
1 parent a650c5f
commit 5c2bc23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts
@@ -169,7 +169,7 @@ export class ReactiveEffect<T = any>
     ) {
       return
     }
-    if (this.flags & EffectFlags.NO_BATCH) {
+    if (this.flags & EffectFlags.NO_BATCH && !batchDepth) {
       return this.trigger()
     }
     if (!(this.flags & EffectFlags.NOTIFIED)) {
@@ -267,6 +267,7 @@ export function endBatch(): void {
     return
   }
 
+  batchDepth--
   let error: unknown
   while (batchedEffect) {
     let e: ReactiveEffect | undefined = batchedEffect
@@ -286,7 +287,6 @@ export function endBatch(): void {
     }
   }
 
-  batchDepth--
   if (error) throw error
 }
 

diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
@@ -175,8 +175,6 @@ export function watch<T = any, Immediate extends Readonly<boolean> = false>(
   return doWatch(source as any, cb, options)
 }
 
-const syncJobs: SchedulerJob[] = []
-
 function doWatch(
   source: WatchSource | WatchSource[] | WatchEffect | object,
   cb: WatchCallback | null,
@@ -397,14 +395,8 @@ function doWatch(
   let scheduler: EffectScheduler
   if (flush === 'sync') {
     effect.flags |= EffectFlags.NO_BATCH
-    syncJobs.push(job)
-    scheduler = () => {
-      const job = syncJobs.shift()
-      if (job) {
-        syncJobs.push(job)
-        job()
-      }
-    } // the scheduler function gets called directly in reverse-order
+
+    scheduler = job as any
   } else if (flush === 'post') {
     scheduler = () => queuePostRenderEffect(job, instance && instance.suspense)
   } else {