revert: fix(reactivity): correct dirty assign in render function (#10091)

This reverts commit 8d042050411fdf04d9d1d6c153287164b12e0255.

close #10098
close #10100

diff --git a/packages/reactivity/__tests__/effect.spec.ts b/packages/reactivity/__tests__/effect.spec.ts
index 925d9ed61040788332009bc33e35b53b2ae26183..9109177bf49a437abc824205e04738c53dd9f0bb 100644 (file)
--- a/packages/reactivity/__tests__/effect.spec.ts
+++ b/packages/reactivity/__tests__/effect.spec.ts
@@ -3,19 +3,16 @@ import {
   type ReactiveEffectRunner,
   TrackOpTypes,
   TriggerOpTypes,
-  computed,
   effect,
   markRaw,
   reactive,
   readonly,
-  ref,
   shallowReactive,
   stop,
   toRaw,
 } from '../src/index'
 import { pauseScheduling, resetScheduling } from '../src/effect'
 import { ITERATE_KEY, getDepFromReactive } from '../src/reactiveEffect'
-import { h, nextTick, nodeOps, render, serialize } from '@vue/runtime-test'
 
 describe('reactivity/effect', () => {
   it('should run the passed function once (wrapped by a effect)', () => {
@@ -1014,35 +1011,6 @@ describe('reactivity/effect', () => {
     expect(counterSpy).toHaveBeenCalledTimes(1)
   })
 
-  // #10082
-  it('should set dirtyLevel when effect is allowRecurse and is running', async () => {
-    const s = ref(0)
-    const n = computed(() => s.value + 1)
-
-    const Child = {
-      setup() {
-        s.value++
-        return () => n.value
-      },
-    }
-
-    const renderSpy = vi.fn()
-    const Parent = {
-      setup() {
-        return () => {
-          renderSpy()
-          return [n.value, h(Child)]
-        }
-      },
-    }
-
-    const root = nodeOps.createElement('div')
-    render(h(Parent), root)
-    await nextTick()
-    expect(serialize(root)).toBe('<div>22</div>')
-    expect(renderSpy).toHaveBeenCalledTimes(2)
-  })
-
   describe('empty dep cleanup', () => {
     it('should remove the dep when the effect is stopped', () => {
       const obj = reactive({ prop: 1 })

diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts
index 8876604bc7a3538322722259c962bf8400b75516..5ddf8e6f0accfd1c576fe37043f03807f772bd0f 100644 (file)
--- a/packages/reactivity/src/effect.ts
+++ b/packages/reactivity/src/effect.ts
@@ -295,9 +295,7 @@ export function triggerEffects(
     }
     if (
       effect._dirtyLevel < dirtyLevel &&
-      (!effect._runnings ||
-        effect.allowRecurse ||
-        dirtyLevel !== DirtyLevels.ComputedValueDirty)
+      (!effect._runnings || dirtyLevel !== DirtyLevels.ComputedValueDirty)
     ) {
       const lastDirtyLevel = effect._dirtyLevel
       effect._dirtyLevel = dirtyLevel