@vue/runtime-core 3.6.0-beta.8 → 3.6.0-beta.9

package/dist/runtime-core.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-beta.8
+  * @vue/runtime-core v3.6.0-beta.9
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -402,6 +402,13 @@ function checkRecursiveUpdates(seen, fn) {
 //#endregion
 //#region packages/runtime-core/src/hmr.ts
 let isHmrUpdating = false;
+const setHmrUpdating = (v) => {
+	try {
+		return isHmrUpdating;
+	} finally {
+		isHmrUpdating = v;
+	}
+};
 const hmrDirtyComponents = /* @__PURE__ */ new Map();
 const hmrDirtyComponentsMode = /* @__PURE__ */ new Map();
 (0, _vue_shared.getGlobalThis)().__VUE_HMR_RUNTIME__ = {
@@ -908,25 +915,26 @@ const TeleportImpl = {
 				mount(container, mainAnchor);
 				updateCssVars(n2, true);
 			}
-			if (isTeleportDeferred(n2.props)) {
+			if (isTeleportDeferred(n2.props) || parentSuspense && parentSuspense.pendingBranch) {
 				n2.el.__isMounted = false;
 				queuePostRenderEffect(() => {
+					if (n2.el.__isMounted !== false) return;
 					mountToTarget();
 					delete n2.el.__isMounted;
 				}, void 0, parentSuspense);
 			} else mountToTarget();
 		} else {
-			if (isTeleportDeferred(n2.props) && n1.el.__isMounted === false) {
-				queuePostRenderEffect(() => {
-					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
-				}, void 0, parentSuspense);
-				return;
-			}
 			n2.el = n1.el;
 			n2.targetStart = n1.targetStart;
 			const mainAnchor = n2.anchor = n1.anchor;
 			const target = n2.target = n1.target;
 			const targetAnchor = n2.targetAnchor = n1.targetAnchor;
+			if (n1.el.__isMounted === false) {
+				queuePostRenderEffect(() => {
+					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
+				}, void 0, parentSuspense);
+				return;
+			}
 			const wasDisabled = isTeleportDisabled(n1.props);
 			const currentContainer = wasDisabled ? container : target;
 			const currentAnchor = wasDisabled ? mainAnchor : targetAnchor;
@@ -948,11 +956,9 @@ const TeleportImpl = {
 		}
 	},
 	remove(vnode, parentComponent, parentSuspense, { um: unmount, o: { remove: hostRemove } }, doRemove) {
-		const { shapeFlag, children, anchor, targetStart, targetAnchor, target, props } = vnode;
-		if (target) {
-			hostRemove(targetStart);
-			hostRemove(targetAnchor);
-		}
+		const { shapeFlag, children, anchor, targetStart, targetAnchor, props } = vnode;
+		if (targetStart) hostRemove(targetStart);
+		if (targetAnchor) hostRemove(targetAnchor);
 		doRemove && hostRemove(anchor);
 		if (shapeFlag & 16) {
 			const shouldRemove = doRemove || !isTeleportDisabled(props);
@@ -1211,7 +1217,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			callHook(hook, [el]);
 		},
 		enter(el) {
-			if (isLeaving()) return;
+			if (!isHmrUpdating && isLeaving()) return;
 			let hook = onEnter;
 			let afterHook = onAfterEnter;
 			let cancelHook = onEnterCancelled;
@@ -3588,15 +3594,19 @@ function hasPropValueChanged(nextProps, prevProps, key) {
 	if (key === "style" && (0, _vue_shared.isObject)(nextProp) && (0, _vue_shared.isObject)(prevProp)) return !(0, _vue_shared.looseEqual)(nextProp, prevProp);
 	return nextProp !== prevProp;
 }
-function updateHOCHostEl({ vnode, parent }, el) {
+function updateHOCHostEl({ vnode, parent, suspense }, el) {
 	while (parent && !parent.vapor) {
 		const root = parent.subTree;
-		if (root.suspense && root.suspense.activeBranch === vnode) root.el = vnode.el;
+		if (root.suspense && root.suspense.activeBranch === vnode) {
+			root.suspense.vnode.el = root.el = el;
+			vnode = root;
+		}
 		if (root === vnode) {
 			(vnode = parent.vnode).el = el;
 			parent = parent.parent;
 		} else break;
 	}
+	if (suspense && suspense.activeBranch === vnode) suspense.vnode.el = el;
 }
 //#endregion
 //#region packages/runtime-core/src/internalObject.ts
@@ -4172,10 +4182,19 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (dirs) invokeDirectiveHook(vnode, null, parentComponent, "beforeMount");
 		if (transition) performTransitionEnter(el, transition, () => hostInsert(el, container, anchor), parentSuspense);
 		else hostInsert(el, container, anchor);
-		if ((vnodeHook = props && props.onVnodeMounted) || dirs) queuePostRenderEffect(() => {
-			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
-			dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
-		}, void 0, parentSuspense);
+		if ((vnodeHook = props && props.onVnodeMounted) || dirs) {
+			const isHmr = isHmrUpdating;
+			queuePostRenderEffect(() => {
+				let prev;
+				prev = setHmrUpdating(isHmr);
+				try {
+					vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
+					dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+				} finally {
+					setHmrUpdating(prev);
+				}
+			}, void 0, parentSuspense);
+		}
 	};
 	const setScopeId = (el, vnode, scopeId, slotScopeIds, parentComponent) => {
 		if (scopeId) hostSetScopeId(el, scopeId);
@@ -4648,7 +4667,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		else hostInsert(el, container, anchor);
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
-		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex } = vnode;
+		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex, memo } = vnode;
 		if (patchFlag === -2) optimized = false;
 		if (ref != null) {
 			const prevSub = (0, _vue_reactivity.setActiveSub)();
@@ -4686,9 +4705,11 @@ function baseCreateRenderer(options, createHydrationFns) {
 			}
 			if (doRemove) remove(vnode);
 		}
-		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs) queuePostRenderEffect(() => {
+		const shouldInvalidateMemo = memo != null && cacheIndex == null;
+		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs || shouldInvalidateMemo) queuePostRenderEffect(() => {
 			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
 			shouldInvokeDirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
+			if (shouldInvalidateMemo) vnode.el = null;
 		}, void 0, parentSuspense);
 	};
 	const remove = (vnode) => {
@@ -5041,6 +5062,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 		pendingId: suspenseId++,
 		timeout: typeof timeout === "number" ? timeout : -1,
 		activeBranch: null,
+		isFallbackMountPending: false,
 		pendingBranch: null,
 		isInFallback: !isHydrating,
 		isHydrating,
@@ -5061,13 +5083,14 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 						if (isInFallback && vnode.ssFallback) vnode.ssFallback.el = null;
 					}
 				};
-				if (activeBranch) {
+				if (activeBranch && !suspense.isFallbackMountPending) {
 					if (parentNode(activeBranch.el) === container) anchor = next(activeBranch);
 					unmount(activeBranch, parentComponent, suspense, true);
 					if (!delayEnter && isInFallback && vnode.ssFallback) queuePostRenderEffect(() => vnode.ssFallback.el = null, void 0, suspense);
 				}
 				if (!delayEnter) move(pendingBranch, container, anchor, 0, parentComponent);
 			}
+			suspense.isFallbackMountPending = false;
 			setActiveBranch(suspense, pendingBranch);
 			suspense.pendingBranch = null;
 			suspense.isInFallback = false;
@@ -5097,12 +5120,16 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 			triggerEvent(vnode, "onFallback");
 			const anchor = next(activeBranch);
 			const mountFallback = () => {
+				suspense.isFallbackMountPending = false;
 				if (!suspense.isInFallback) return;
 				patch(null, fallbackVNode, container, anchor, parentComponent, null, namespace, slotScopeIds, optimized);
 				setActiveBranch(suspense, fallbackVNode);
 			};
 			const delayEnter = fallbackVNode.transition && fallbackVNode.transition.mode === "out-in";
-			if (delayEnter) activeBranch.transition.afterLeave = mountFallback;
+			if (delayEnter) {
+				suspense.isFallbackMountPending = true;
+				activeBranch.transition.afterLeave = mountFallback;
+			}
 			suspense.isInFallback = true;
 			unmount(activeBranch, parentComponent, null, true);
 			if (!delayEnter) mountFallback();
@@ -5503,6 +5530,7 @@ function mergeProps(...args) {
 			const existing = ret[key];
 			const incoming = toMerge[key];
 			if (incoming && existing !== incoming && !((0, _vue_shared.isArray)(existing) && existing.includes(incoming))) ret[key] = existing ? [].concat(existing, incoming) : incoming;
+			else if (incoming == null && existing == null && !(0, _vue_shared.isModelListener)(key)) ret[key] = incoming;
 		} else if (key !== "") ret[key] = toMerge[key];
 	}
 	return ret;
@@ -6079,7 +6107,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.8";
+const version = "3.6.0-beta.9";
 const warn = warn$1;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.

package/dist/runtime-core.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-beta.8
+  * @vue/runtime-core v3.6.0-beta.9
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -569,25 +569,26 @@ const TeleportImpl = {
 				mount(container, mainAnchor);
 				updateCssVars(n2, true);
 			}
-			if (isTeleportDeferred(n2.props)) {
+			if (isTeleportDeferred(n2.props) || parentSuspense && parentSuspense.pendingBranch) {
 				n2.el.__isMounted = false;
 				queuePostRenderEffect(() => {
+					if (n2.el.__isMounted !== false) return;
 					mountToTarget();
 					delete n2.el.__isMounted;
 				}, void 0, parentSuspense);
 			} else mountToTarget();
 		} else {
-			if (isTeleportDeferred(n2.props) && n1.el.__isMounted === false) {
-				queuePostRenderEffect(() => {
-					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
-				}, void 0, parentSuspense);
-				return;
-			}
 			n2.el = n1.el;
 			n2.targetStart = n1.targetStart;
 			const mainAnchor = n2.anchor = n1.anchor;
 			const target = n2.target = n1.target;
 			const targetAnchor = n2.targetAnchor = n1.targetAnchor;
+			if (n1.el.__isMounted === false) {
+				queuePostRenderEffect(() => {
+					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
+				}, void 0, parentSuspense);
+				return;
+			}
 			const wasDisabled = isTeleportDisabled(n1.props);
 			const currentContainer = wasDisabled ? container : target;
 			const currentAnchor = wasDisabled ? mainAnchor : targetAnchor;
@@ -608,11 +609,9 @@ const TeleportImpl = {
 		}
 	},
 	remove(vnode, parentComponent, parentSuspense, { um: unmount, o: { remove: hostRemove } }, doRemove) {
-		const { shapeFlag, children, anchor, targetStart, targetAnchor, target, props } = vnode;
-		if (target) {
-			hostRemove(targetStart);
-			hostRemove(targetAnchor);
-		}
+		const { shapeFlag, children, anchor, targetStart, targetAnchor, props } = vnode;
+		if (targetStart) hostRemove(targetStart);
+		if (targetAnchor) hostRemove(targetAnchor);
 		doRemove && hostRemove(anchor);
 		if (shapeFlag & 16) {
 			const shouldRemove = doRemove || !isTeleportDisabled(props);
@@ -2823,15 +2822,19 @@ function hasPropValueChanged(nextProps, prevProps, key) {
 	if (key === "style" && (0, _vue_shared.isObject)(nextProp) && (0, _vue_shared.isObject)(prevProp)) return !(0, _vue_shared.looseEqual)(nextProp, prevProp);
 	return nextProp !== prevProp;
 }
-function updateHOCHostEl({ vnode, parent }, el) {
+function updateHOCHostEl({ vnode, parent, suspense }, el) {
 	while (parent && !parent.vapor) {
 		const root = parent.subTree;
-		if (root.suspense && root.suspense.activeBranch === vnode) root.el = vnode.el;
+		if (root.suspense && root.suspense.activeBranch === vnode) {
+			root.suspense.vnode.el = root.el = el;
+			vnode = root;
+		}
 		if (root === vnode) {
 			(vnode = parent.vnode).el = el;
 			parent = parent.parent;
 		} else break;
 	}
+	if (suspense && suspense.activeBranch === vnode) suspense.vnode.el = el;
 }
 //#endregion
 //#region packages/runtime-core/src/internalObject.ts
@@ -3230,8 +3233,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (transition) performTransitionEnter(el, transition, () => hostInsert(el, container, anchor), parentSuspense);
 		else hostInsert(el, container, anchor);
 		if ((vnodeHook = props && props.onVnodeMounted) || dirs) queuePostRenderEffect(() => {
-			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
-			dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+			try {
+				vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
+				dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+			} finally {}
 		}, void 0, parentSuspense);
 	};
 	const setScopeId = (el, vnode, scopeId, slotScopeIds, parentComponent) => {
@@ -3659,7 +3664,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		else hostInsert(el, container, anchor);
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
-		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex } = vnode;
+		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex, memo } = vnode;
 		if (patchFlag === -2) optimized = false;
 		if (ref != null) {
 			const prevSub = (0, _vue_reactivity.setActiveSub)();
@@ -3697,9 +3702,11 @@ function baseCreateRenderer(options, createHydrationFns) {
 			}
 			if (doRemove) remove(vnode);
 		}
-		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs) queuePostRenderEffect(() => {
+		const shouldInvalidateMemo = memo != null && cacheIndex == null;
+		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs || shouldInvalidateMemo) queuePostRenderEffect(() => {
 			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
 			shouldInvokeDirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
+			if (shouldInvalidateMemo) vnode.el = null;
 		}, void 0, parentSuspense);
 	};
 	const remove = (vnode) => {
@@ -4029,6 +4036,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 		pendingId: suspenseId++,
 		timeout: typeof timeout === "number" ? timeout : -1,
 		activeBranch: null,
+		isFallbackMountPending: false,
 		pendingBranch: null,
 		isInFallback: !isHydrating,
 		isHydrating,
@@ -4047,13 +4055,14 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 						if (isInFallback && vnode.ssFallback) vnode.ssFallback.el = null;
 					}
 				};
-				if (activeBranch) {
+				if (activeBranch && !suspense.isFallbackMountPending) {
 					if (parentNode(activeBranch.el) === container) anchor = next(activeBranch);
 					unmount(activeBranch, parentComponent, suspense, true);
 					if (!delayEnter && isInFallback && vnode.ssFallback) queuePostRenderEffect(() => vnode.ssFallback.el = null, void 0, suspense);
 				}
 				if (!delayEnter) move(pendingBranch, container, anchor, 0, parentComponent);
 			}
+			suspense.isFallbackMountPending = false;
 			setActiveBranch(suspense, pendingBranch);
 			suspense.pendingBranch = null;
 			suspense.isInFallback = false;
@@ -4083,12 +4092,16 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 			triggerEvent(vnode, "onFallback");
 			const anchor = next(activeBranch);
 			const mountFallback = () => {
+				suspense.isFallbackMountPending = false;
 				if (!suspense.isInFallback) return;
 				patch(null, fallbackVNode, container, anchor, parentComponent, null, namespace, slotScopeIds, optimized);
 				setActiveBranch(suspense, fallbackVNode);
 			};
 			const delayEnter = fallbackVNode.transition && fallbackVNode.transition.mode === "out-in";
-			if (delayEnter) activeBranch.transition.afterLeave = mountFallback;
+			if (delayEnter) {
+				suspense.isFallbackMountPending = true;
+				activeBranch.transition.afterLeave = mountFallback;
+			}
 			suspense.isInFallback = true;
 			unmount(activeBranch, parentComponent, null, true);
 			if (!delayEnter) mountFallback();
@@ -4454,6 +4467,7 @@ function mergeProps(...args) {
 			const existing = ret[key];
 			const incoming = toMerge[key];
 			if (incoming && existing !== incoming && !((0, _vue_shared.isArray)(existing) && existing.includes(incoming))) ret[key] = existing ? [].concat(existing, incoming) : incoming;
+			else if (incoming == null && existing == null && !(0, _vue_shared.isModelListener)(key)) ret[key] = incoming;
 		} else if (key !== "") ret[key] = toMerge[key];
 	}
 	return ret;
@@ -4785,7 +4799,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.8";
+const version = "3.6.0-beta.9";
 const warn = _vue_shared.NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.

package/dist/runtime-core.d.ts

@@ -497,6 +497,10 @@ export interface SuspenseProps {
   onResolve?: () => void;
   onPending?: () => void;
   onFallback?: () => void;
+  /**
+  * Switch to fallback content if it takes longer than `timeout` milliseconds to render the new default content.
+  * A `timeout` value of `0` will cause the fallback content to be displayed immediately when default content is replaced.
+  */
   timeout?: string | number;
   /**
   * Allow suspense to be captured by parent suspense
@@ -530,6 +534,7 @@ export interface SuspenseBoundary {
   container: RendererElement;
   hiddenContainer: RendererElement;
   activeBranch: VNode | null;
+  isFallbackMountPending: boolean;
   pendingBranch: VNode | null;
   deps: number;
   pendingId: number;

package/dist/runtime-core.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-beta.8
+  * @vue/runtime-core v3.6.0-beta.9
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -408,6 +408,13 @@ function checkRecursiveUpdates(seen, fn) {
 //#endregion
 //#region packages/runtime-core/src/hmr.ts
 let isHmrUpdating = false;
+const setHmrUpdating = (v) => {
+	try {
+		return isHmrUpdating;
+	} finally {
+		isHmrUpdating = v;
+	}
+};
 const hmrDirtyComponents = /* @__PURE__ */ new Map();
 const hmrDirtyComponentsMode = /* @__PURE__ */ new Map();
 if (!!(process.env.NODE_ENV !== "production")) getGlobalThis().__VUE_HMR_RUNTIME__ = {
@@ -916,25 +923,26 @@ const TeleportImpl = {
 				mount(container, mainAnchor);
 				updateCssVars(n2, true);
 			}
-			if (isTeleportDeferred(n2.props)) {
+			if (isTeleportDeferred(n2.props) || parentSuspense && parentSuspense.pendingBranch) {
 				n2.el.__isMounted = false;
 				queuePostRenderEffect(() => {
+					if (n2.el.__isMounted !== false) return;
 					mountToTarget();
 					delete n2.el.__isMounted;
 				}, void 0, parentSuspense);
 			} else mountToTarget();
 		} else {
-			if (isTeleportDeferred(n2.props) && n1.el.__isMounted === false) {
-				queuePostRenderEffect(() => {
-					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
-				}, void 0, parentSuspense);
-				return;
-			}
 			n2.el = n1.el;
 			n2.targetStart = n1.targetStart;
 			const mainAnchor = n2.anchor = n1.anchor;
 			const target = n2.target = n1.target;
 			const targetAnchor = n2.targetAnchor = n1.targetAnchor;
+			if (n1.el.__isMounted === false) {
+				queuePostRenderEffect(() => {
+					TeleportImpl.process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals);
+				}, void 0, parentSuspense);
+				return;
+			}
 			const wasDisabled = isTeleportDisabled(n1.props);
 			const currentContainer = wasDisabled ? container : target;
 			const currentAnchor = wasDisabled ? mainAnchor : targetAnchor;
@@ -956,11 +964,9 @@ const TeleportImpl = {
 		}
 	},
 	remove(vnode, parentComponent, parentSuspense, { um: unmount, o: { remove: hostRemove } }, doRemove) {
-		const { shapeFlag, children, anchor, targetStart, targetAnchor, target, props } = vnode;
-		if (target) {
-			hostRemove(targetStart);
-			hostRemove(targetAnchor);
-		}
+		const { shapeFlag, children, anchor, targetStart, targetAnchor, props } = vnode;
+		if (targetStart) hostRemove(targetStart);
+		if (targetAnchor) hostRemove(targetAnchor);
 		doRemove && hostRemove(anchor);
 		if (shapeFlag & 16) {
 			const shouldRemove = doRemove || !isTeleportDisabled(props);
@@ -1220,7 +1226,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			callHook(hook, [el]);
 		},
 		enter(el) {
-			if (isLeaving()) return;
+			if (!isHmrUpdating && isLeaving()) return;
 			let hook = onEnter;
 			let afterHook = onAfterEnter;
 			let cancelHook = onEnterCancelled;
@@ -3636,15 +3642,19 @@ function hasPropValueChanged(nextProps, prevProps, key) {
 	if (key === "style" && isObject(nextProp) && isObject(prevProp)) return !looseEqual(nextProp, prevProp);
 	return nextProp !== prevProp;
 }
-function updateHOCHostEl({ vnode, parent }, el) {
+function updateHOCHostEl({ vnode, parent, suspense }, el) {
 	while (parent && !parent.vapor) {
 		const root = parent.subTree;
-		if (root.suspense && root.suspense.activeBranch === vnode) root.el = vnode.el;
+		if (root.suspense && root.suspense.activeBranch === vnode) {
+			root.suspense.vnode.el = root.el = el;
+			vnode = root;
+		}
 		if (root === vnode) {
 			(vnode = parent.vnode).el = el;
 			parent = parent.parent;
 		} else break;
 	}
+	if (suspense && suspense.activeBranch === vnode) suspense.vnode.el = el;
 }
 //#endregion
 //#region packages/runtime-core/src/internalObject.ts
@@ -4252,10 +4262,19 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (dirs) invokeDirectiveHook(vnode, null, parentComponent, "beforeMount");
 		if (transition) performTransitionEnter(el, transition, () => hostInsert(el, container, anchor), parentSuspense);
 		else hostInsert(el, container, anchor);
-		if ((vnodeHook = props && props.onVnodeMounted) || dirs) queuePostRenderEffect(() => {
-			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
-			dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
-		}, void 0, parentSuspense);
+		if ((vnodeHook = props && props.onVnodeMounted) || dirs) {
+			const isHmr = !!(process.env.NODE_ENV !== "production") && isHmrUpdating;
+			queuePostRenderEffect(() => {
+				let prev;
+				if (!!(process.env.NODE_ENV !== "production")) prev = setHmrUpdating(isHmr);
+				try {
+					vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
+					dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+				} finally {
+					if (!!(process.env.NODE_ENV !== "production")) setHmrUpdating(prev);
+				}
+			}, void 0, parentSuspense);
+		}
 	};
 	const setScopeId = (el, vnode, scopeId, slotScopeIds, parentComponent) => {
 		if (scopeId) hostSetScopeId(el, scopeId);
@@ -4735,7 +4754,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		else hostInsert(el, container, anchor);
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
-		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex } = vnode;
+		const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs, cacheIndex, memo } = vnode;
 		if (patchFlag === -2) optimized = false;
 		if (ref != null) {
 			const prevSub = setActiveSub();
@@ -4773,9 +4792,11 @@ function baseCreateRenderer(options, createHydrationFns) {
 			}
 			if (doRemove) remove(vnode);
 		}
-		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs) queuePostRenderEffect(() => {
+		const shouldInvalidateMemo = memo != null && cacheIndex == null;
+		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs || shouldInvalidateMemo) queuePostRenderEffect(() => {
 			vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
 			shouldInvokeDirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
+			if (shouldInvalidateMemo) vnode.el = null;
 		}, void 0, parentSuspense);
 	};
 	const remove = (vnode) => {
@@ -5128,6 +5149,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 		pendingId: suspenseId++,
 		timeout: typeof timeout === "number" ? timeout : -1,
 		activeBranch: null,
+		isFallbackMountPending: false,
 		pendingBranch: null,
 		isInFallback: !isHydrating,
 		isHydrating,
@@ -5150,13 +5172,14 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 						if (isInFallback && vnode.ssFallback) vnode.ssFallback.el = null;
 					}
 				};
-				if (activeBranch) {
+				if (activeBranch && !suspense.isFallbackMountPending) {
 					if (parentNode(activeBranch.el) === container) anchor = next(activeBranch);
 					unmount(activeBranch, parentComponent, suspense, true);
 					if (!delayEnter && isInFallback && vnode.ssFallback) queuePostRenderEffect(() => vnode.ssFallback.el = null, void 0, suspense);
 				}
 				if (!delayEnter) move(pendingBranch, container, anchor, 0, parentComponent);
 			}
+			suspense.isFallbackMountPending = false;
 			setActiveBranch(suspense, pendingBranch);
 			suspense.pendingBranch = null;
 			suspense.isInFallback = false;
@@ -5186,12 +5209,16 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 			triggerEvent(vnode, "onFallback");
 			const anchor = next(activeBranch);
 			const mountFallback = () => {
+				suspense.isFallbackMountPending = false;
 				if (!suspense.isInFallback) return;
 				patch(null, fallbackVNode, container, anchor, parentComponent, null, namespace, slotScopeIds, optimized);
 				setActiveBranch(suspense, fallbackVNode);
 			};
 			const delayEnter = fallbackVNode.transition && fallbackVNode.transition.mode === "out-in";
-			if (delayEnter) activeBranch.transition.afterLeave = mountFallback;
+			if (delayEnter) {
+				suspense.isFallbackMountPending = true;
+				activeBranch.transition.afterLeave = mountFallback;
+			}
 			suspense.isInFallback = true;
 			unmount(activeBranch, parentComponent, null, true);
 			if (!delayEnter) mountFallback();
@@ -5592,6 +5619,7 @@ function mergeProps(...args) {
 			const existing = ret[key];
 			const incoming = toMerge[key];
 			if (incoming && existing !== incoming && !(isArray(existing) && existing.includes(incoming))) ret[key] = existing ? [].concat(existing, incoming) : incoming;
+			else if (incoming == null && existing == null && !isModelListener(key)) ret[key] = incoming;
 		} else if (key !== "") ret[key] = toMerge[key];
 	}
 	return ret;
@@ -6187,7 +6215,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.8";
+const version = "3.6.0-beta.9";
 const warn = !!(process.env.NODE_ENV !== "production") ? warn$1 : NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -6222,4 +6250,4 @@ const resolveFilter = null;
 const compatUtils = null;
 const DeprecationTypes = null;
 //#endregion
-export { BaseTransition, BaseTransitionPropsValidators, Comment, DeprecationTypes, EffectScope, ErrorCodes, ErrorTypeStrings, Fragment, KeepAlive, MismatchTypes, MoveType, NULL_DYNAMIC_COMPONENT, ReactiveEffect, SchedulerJobFlags, Static, Suspense, Teleport, Text, TrackOpTypes, TriggerOpTypes, activate, assertNumber, baseEmit, baseNormalizePropsOptions, baseResolveTransitionHooks, callWithAsyncErrorHandling, callWithErrorHandling, camelize, capitalize, checkTransitionMode, cloneVNode, compatUtils, computed, createAppAPI, createAsyncComponentContext, createBlock, createCanSetSetupRefChecker, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createInternalObject, createPropsRestProxy, createRenderer, createSlots, createStaticVNode, createTextVNode, createVNode, currentInstance, customRef, deactivate, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineModel, defineOptions, defineProps, defineSlots, devtools, devtoolsComponentAdded, effect, effectScope, endMeasure, ensureVaporSlotFallback, expose, flushOnAppMount, getAttributeMismatch, getComponentName, getCurrentInstance, getCurrentScope, getCurrentWatcher, getFunctionalFallthrough, getInheritedScopeIds, getTransitionRawChildren, guardReactiveProps, h, handleError, hasInjectionContext, hydrateOnIdle, hydrateOnInteraction, hydrateOnMediaQuery, hydrateOnVisible, initCustomFormatter, initFeatureFlags, inject, isAsyncWrapper, isEmitListener, isHydrating, isKeepAlive, isMapEqual, isMemoSame, isMismatchAllowed, isProxy, isReactive, isReadonly, isRef, isRuntimeOnly, isSetEqual, isShallow, isTeleportDeferred, isTeleportDisabled, isTemplateNode, isTemplateRefKey, isVNode, isValidHtmlOrSvgAttribute, knownTemplateRefs, leaveCbKey, markAsyncBoundary, markRaw, matches, mergeDefaults, mergeModels, mergeProps, nextTick, nextUid, normalizeClass, normalizeProps, normalizeRef, normalizeStyle, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onScopeDispose, onServerPrefetch, onUnmounted, onUpdated, onWatcherCleanup, openBlock, performAsyncHydrate, performTransitionEnter, performTransitionLeave, popScopeId, popWarningContext, provide, proxyRefs, pushScopeId, pushWarningContext, queueJob, queuePostFlushCb, reactive, readonly, ref, registerHMR, registerRuntimeCompiler, renderList, renderSlot, resetShapeFlag, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolvePropValue, resolveTarget as resolveTeleportTarget, resolveTransitionHooks, setBlockTracking, setCurrentInstance, setCurrentRenderingInstance, setDevtoolsHook, setIsHydratingEnabled, setRef, setTransitionHooks, shallowReactive, shallowReadonly, shallowRef, simpleSetCurrentInstance, ssrContextKey, ssrUtils, startMeasure, stop, toClassSet, toDisplayString, toHandlerKey, toHandlers, toRaw, toRef, toRefs, toStyleMap, toValue, transformVNodeArgs, triggerRef, unref, unregisterHMR, useAsyncComponentState, useAttrs, useId, useInstanceOption, useModel, useSSRContext, useSlots, useTemplateRef, useTransitionState, validateComponentName, validateProps, version, warn, warnExtraneousAttributes, warnPropMismatch, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withMemo, withScopeId };
+export { BaseTransition, BaseTransitionPropsValidators, Comment, DeprecationTypes, EffectScope, ErrorCodes, ErrorTypeStrings, Fragment, KeepAlive, MismatchTypes, MoveType, NULL_DYNAMIC_COMPONENT, ReactiveEffect, SchedulerJobFlags, Static, Suspense, Teleport, Text, TrackOpTypes, TriggerOpTypes, activate, assertNumber, baseEmit, baseNormalizePropsOptions, baseResolveTransitionHooks, callWithAsyncErrorHandling, callWithErrorHandling, camelize, capitalize, checkTransitionMode, cloneVNode, compatUtils, computed, createAppAPI, createAsyncComponentContext, createBlock, createCanSetSetupRefChecker, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createInternalObject, createPropsRestProxy, createRenderer, createSlots, createStaticVNode, createTextVNode, createVNode, currentInstance, customRef, deactivate, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineModel, defineOptions, defineProps, defineSlots, devtools, devtoolsComponentAdded, effect, effectScope, endMeasure, ensureVaporSlotFallback, expose, flushOnAppMount, getAttributeMismatch, getComponentName, getCurrentInstance, getCurrentScope, getCurrentWatcher, getFunctionalFallthrough, getInheritedScopeIds, getTransitionRawChildren, guardReactiveProps, h, handleError, hasInjectionContext, hydrateOnIdle, hydrateOnInteraction, hydrateOnMediaQuery, hydrateOnVisible, initCustomFormatter, initFeatureFlags, inject, invalidateMount, invokeDirectiveHook, isAsyncWrapper, isEmitListener, isHydrating, isKeepAlive, isMapEqual, isMemoSame, isMismatchAllowed, isProxy, isReactive, isReadonly, isRef, isRuntimeOnly, isSetEqual, isShallow, isTeleportDeferred, isTeleportDisabled, isTemplateNode, isTemplateRefKey, isVNode, isValidHtmlOrSvgAttribute, knownTemplateRefs, leaveCbKey, markAsyncBoundary, markRaw, matches, mergeDefaults, mergeModels, mergeProps, nextTick, nextUid, normalizeClass, normalizeProps, normalizeRef, normalizeStyle, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onScopeDispose, onServerPrefetch, onUnmounted, onUpdated, onWatcherCleanup, openBlock, performAsyncHydrate, performTransitionEnter, performTransitionLeave, popScopeId, popWarningContext, provide, proxyRefs, pushScopeId, pushWarningContext, queueJob, queuePostFlushCb, reactive, readonly, ref, registerHMR, registerRuntimeCompiler, renderList, renderSlot, resetShapeFlag, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolvePropValue, resolveTarget as resolveTeleportTarget, resolveTransitionHooks, setBlockTracking, setCurrentInstance, setCurrentRenderingInstance, setDevtoolsHook, setIsHydratingEnabled, setRef, setTransitionHooks, shallowReactive, shallowReadonly, shallowRef, shouldUpdateComponent, simpleSetCurrentInstance, ssrContextKey, ssrUtils, startMeasure, stop, toClassSet, toDisplayString, toHandlerKey, toHandlers, toRaw, toRef, toRefs, toStyleMap, toValue, transformVNodeArgs, triggerRef, unref, unregisterHMR, useAsyncComponentState, useAttrs, useId, useInstanceOption, useModel, useSSRContext, useSlots, useTemplateRef, useTransitionState, validateComponentName, validateProps, version, warn, warnExtraneousAttributes, warnPropMismatch, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withMemo, withScopeId };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/runtime-core",
-  "version": "3.6.0-beta.8",
+  "version": "3.6.0-beta.9",
   "description": "@vue/runtime-core",
   "main": "index.js",
   "module": "dist/runtime-core.esm-bundler.js",
@@ -46,7 +46,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-core#readme",
   "dependencies": {
-    "@vue/shared": "3.6.0-beta.8",
-    "@vue/reactivity": "3.6.0-beta.8"
+    "@vue/shared": "3.6.0-beta.9",
+    "@vue/reactivity": "3.6.0-beta.9"
   }
 }