fix(watch): ensure oldValue in multi-source watcher is always an array

fix #7070
vuejs · Nov 9, 2022 · 23e85e2 · 23e85e2
1 parent d33292d
commit 23e85e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/runtime-core/__tests__/apiWatch.spec.ts b/packages/runtime-core/__tests__/apiWatch.spec.ts
@@ -183,10 +183,10 @@ describe('api: watch', () => {
     let called = false
     watch(
       [a, b],
-      (newVal, oldVal) => {
+      ([newA, newB], [oldA, oldB]) => {
         called = true
-        expect(newVal).toMatchObject([undefined, undefined])
-        expect(oldVal).toBeUndefined()
+        expect([newA, newB]).toMatchObject([undefined, undefined])
+        expect([oldA, oldB]).toMatchObject([undefined, undefined])
       },
       { immediate: true }
     )

diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
@@ -335,7 +335,7 @@ function doWatch(
           // pass undefined as the old value when it's changed for the first time
           oldValue === INITIAL_WATCHER_VALUE ||
           (isMultiSource && oldValue[0] === INITIAL_WATCHER_VALUE)
-            ? undefined
+            ? []
             : oldValue,
           onCleanup
         ])