fix(reactivity): ensure computed is invalidated before other effects

fix #5720

packages/reactivity/__tests__/computed.spec.ts

@@ -170,6 +170,23 @@ describe('reactivity/computed', () => {
     expect(dummy).toBe(-1)
   })
 
+  // #5720
+  it('should invalidate before non-computed effects', () => {
+    let plusOneValues: number[] = []
+    const n = ref(0)
+    const plusOne = computed(() => n.value + 1)
+    effect(() => {
+      n.value
+      plusOneValues.push(plusOne.value)
+    })
+    // access plusOne, causing it to be non-dirty
+    plusOne.value
+    // mutate n
+    n.value++
+    // on the 2nd run, plusOne.value should have already updated.
+    expect(plusOneValues).toMatchObject([1, 2, 2])
+  })
+
   it('should warn if trying to set a readonly computed', () => {
     const n = ref(1)
     const plusOne = computed(() => n.value + 1)

packages/reactivity/src/effect.ts

@@ -348,16 +348,31 @@ export function triggerEffects(
   debuggerEventExtraInfo?: DebuggerEventExtraInfo
 ) {
   // spread into array for stabilization
-  for (const effect of isArray(dep) ? dep : [...dep]) {
+  const effects = isArray(dep) ? dep : [...dep]
-    if (effect !== activeEffect || effect.allowRecurse) {
+  for (const effect of effects) {
-      if (__DEV__ && effect.onTrigger) {
+    if (effect.computed) {
-        effect.onTrigger(extend({ effect }, debuggerEventExtraInfo))
+      triggerEffect(effect, debuggerEventExtraInfo)
-      }
+    }
-      if (effect.scheduler) {
+  }
-        effect.scheduler()
+  for (const effect of effects) {
-      } else {
+    if (!effect.computed) {
-        effect.run()
+      triggerEffect(effect, debuggerEventExtraInfo)
-      }
+    }
+  }
+}
+
+function triggerEffect(
+  effect: ReactiveEffect,
+  debuggerEventExtraInfo?: DebuggerEventExtraInfo
+) {
+  if (effect !== activeEffect || effect.allowRecurse) {
+    if (__DEV__ && effect.onTrigger) {
+      effect.onTrigger(extend({ effect }, debuggerEventExtraInfo))
+    }
+    if (effect.scheduler) {
+      effect.scheduler()
+    } else {
+      effect.run()
     }
   }
 }