@vue/runtime-core 3.6.0-beta.9 → 3.6.0-rc.2

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-beta.9
+  * @vue/runtime-core v3.6.0-rc.2
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -169,8 +169,8 @@ function findInsertionIndex(order, queue, start, end) {
 /**
 * @internal for runtime-vapor only
 */
-function queueJob(job, id, isPre = false) {
-	if (queueJobWorker(job, id === void 0 ? isPre ? -2 : Infinity : isPre ? id * 2 : id * 2 + 1, jobs, jobsLength, flushIndex)) {
+function queueJob(job, id, isPre = false, order = 0) {
+	if (queueJobWorker(job, id === void 0 ? isPre ? -2 : Infinity : isPre ? id * 2 : order ? id * 2 + 1 + order / (order + 1) : id * 2 + 1, jobs, jobsLength, flushIndex)) {
 		jobsLength++;
 		queueFlush();
 	}
@@ -273,6 +273,7 @@ function flushJobs(seen) {
 		}
 		flushIndex = 0;
 		jobsLength = 0;
+		jobs.length = 0;
 		flushPostFlushCbs(seen);
 		currentFlushPromise = null;
 		if (jobsLength || postJobs.length) flushJobs(seen);
@@ -332,10 +333,12 @@ function withCtx(fn, ctx = currentRenderingInstance, isNonScopedSlot) {
 	const renderFnWithContext = (...args) => {
 		if (renderFnWithContext._d) setBlockTracking(-1);
 		const prevInstance = setCurrentRenderingInstance(ctx);
+		const prevStackSize = blockStack.length;
 		let res;
 		try {
 			res = fn(...args);
 		} finally {
+			for (let i = blockStack.length; i > prevStackSize; i--) closeBlock();
 			setCurrentRenderingInstance(prevInstance);
 			if (renderFnWithContext._d) setBlockTracking(1);
 		}
@@ -512,7 +515,7 @@ function instanceWatch(source, value, options) {
 	}
 	const prev = setCurrentInstance(this);
 	const res = doWatch(getter, cb.bind(publicThis), options);
-	setCurrentInstance(...prev);
+	restoreCurrentInstance(prev);
 	return res;
 }
 function createPathGetter(ctx, path) {
@@ -525,6 +528,7 @@ function createPathGetter(ctx, path) {
 }
 //#endregion
 //#region packages/runtime-core/src/components/Teleport.ts
+const pendingMounts = /* @__PURE__ */ new WeakMap();
 const TeleportEndKey = Symbol("_vte");
 const isTeleport = (type) => type.__isTeleport;
 const isTeleportDisabled = (props) => props && (props.disabled || props.disabled === "");
@@ -541,54 +545,66 @@ const TeleportImpl = {
 	name: "Teleport",
 	__isTeleport: true,
 	process(n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized, internals) {
-		const { mc: mountChildren, pc: patchChildren, pbc: patchBlockChildren, o: { insert, querySelector, createText, createComment } } = internals;
+		const { mc: mountChildren, pc: patchChildren, pbc: patchBlockChildren, o: { insert, querySelector, createText, createComment, parentNode } } = internals;
 		const disabled = isTeleportDisabled(n2.props);
-		let { shapeFlag, children, dynamicChildren } = n2;
+		let { dynamicChildren } = n2;
+		const mount = (vnode, container, anchor) => {
+			if (vnode.shapeFlag & 16) mountChildren(vnode.children, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized);
+		};
+		const mountToTarget = (vnode = n2) => {
+			const disabled = isTeleportDisabled(vnode.props);
+			const target = vnode.target = resolveTarget(vnode.props, querySelector);
+			const targetAnchor = prepareAnchor(target, vnode, createText, insert);
+			if (target) {
+				if (namespace !== "svg" && isTargetSVG(target)) namespace = "svg";
+				else if (namespace !== "mathml" && isTargetMathML(target)) namespace = "mathml";
+				if (parentComponent && parentComponent.isCE) (parentComponent.ce._teleportTargets || (parentComponent.ce._teleportTargets = /* @__PURE__ */ new Set())).add(target);
+				if (!disabled) {
+					mount(vnode, target, targetAnchor);
+					updateCssVars(vnode, false);
+				}
+			}
+		};
+		const queuePendingMount = (vnode) => {
+			const mountJob = () => {
+				if (pendingMounts.get(vnode) !== mountJob) return;
+				pendingMounts.delete(vnode);
+				if (isTeleportDisabled(vnode.props)) {
+					mount(vnode, parentNode(vnode.el) || container, vnode.anchor);
+					updateCssVars(vnode, true);
+				}
+				mountToTarget(vnode);
+			};
+			pendingMounts.set(vnode, mountJob);
+			queuePostRenderEffect(mountJob, void 0, parentSuspense);
+		};
 		if (n1 == null) {
 			const placeholder = n2.el = createText("");
 			const mainAnchor = n2.anchor = createText("");
 			insert(placeholder, container, anchor);
 			insert(mainAnchor, container, anchor);
-			const mount = (container, anchor) => {
-				if (shapeFlag & 16) mountChildren(children, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized);
-			};
-			const mountToTarget = () => {
-				const target = n2.target = resolveTarget(n2.props, querySelector);
-				const targetAnchor = prepareAnchor(target, n2, createText, insert);
-				if (target) {
-					if (namespace !== "svg" && isTargetSVG(target)) namespace = "svg";
-					else if (namespace !== "mathml" && isTargetMathML(target)) namespace = "mathml";
-					if (parentComponent && parentComponent.isCE) (parentComponent.ce._teleportTargets || (parentComponent.ce._teleportTargets = /* @__PURE__ */ new Set())).add(target);
-					if (!disabled) {
-						mount(target, targetAnchor);
-						updateCssVars(n2, false);
-					}
-				}
-			};
+			if (isTeleportDeferred(n2.props) || parentSuspense && parentSuspense.pendingBranch) {
+				queuePendingMount(n2);
+				return;
+			}
 			if (disabled) {
-				mount(container, mainAnchor);
+				mount(n2, container, mainAnchor);
 				updateCssVars(n2, true);
 			}
-			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();
+			mountToTarget();
 		} else {
 			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);
+			const pendingMount = pendingMounts.get(n1);
+			if (pendingMount) {
+				pendingMount.flags |= 4;
+				pendingMounts.delete(n1);
+				queuePendingMount(n2);
 				return;
 			}
+			n2.targetStart = n1.targetStart;
+			const target = n2.target = n1.target;
+			const targetAnchor = n2.targetAnchor = n1.targetAnchor;
 			const wasDisabled = isTeleportDisabled(n1.props);
 			const currentContainer = wasDisabled ? container : target;
 			const currentAnchor = wasDisabled ? mainAnchor : targetAnchor;
@@ -602,23 +618,30 @@ const TeleportImpl = {
 				if (!wasDisabled) moveTeleport(n2, container, mainAnchor, internals, parentComponent, 1);
 				else if (n2.props && n1.props && n2.props.to !== n1.props.to) n2.props.to = n1.props.to;
 			} else if ((n2.props && n2.props.to) !== (n1.props && n1.props.to)) {
-				const nextTarget = n2.target = resolveTarget(n2.props, querySelector);
-				if (nextTarget) moveTeleport(n2, nextTarget, null, internals, parentComponent, 0);
+				const nextTarget = resolveTarget(n2.props, querySelector);
+				if (nextTarget) {
+					n2.target = nextTarget;
+					moveTeleport(n2, nextTarget, null, internals, parentComponent, 0);
+				}
 			} else if (wasDisabled) moveTeleport(n2, target, targetAnchor, internals, parentComponent, 1);
 			updateCssVars(n2, disabled);
 		}
 	},
 	remove(vnode, parentComponent, parentSuspense, { um: unmount, o: { remove: hostRemove } }, doRemove) {
-		const { shapeFlag, children, anchor, targetStart, targetAnchor, props } = vnode;
+		const { shapeFlag, children, anchor, targetStart, targetAnchor, target, props } = vnode;
+		const disabled = isTeleportDisabled(props);
+		const shouldRemove = doRemove || !disabled;
+		const pendingMount = pendingMounts.get(vnode);
+		if (pendingMount) {
+			pendingMount.flags |= 4;
+			pendingMounts.delete(vnode);
+		}
 		if (targetStart) hostRemove(targetStart);
 		if (targetAnchor) hostRemove(targetAnchor);
 		doRemove && hostRemove(anchor);
-		if (shapeFlag & 16) {
-			const shouldRemove = doRemove || !isTeleportDisabled(props);
-			for (let i = 0; i < children.length; i++) {
-				const child = children[i];
-				unmount(child, parentComponent, parentSuspense, shouldRemove, !!child.dynamicChildren);
-			}
+		if (!pendingMount && (disabled || target) && shapeFlag & 16) for (let i = 0; i < children.length; i++) {
+			const child = children[i];
+			unmount(child, parentComponent, parentSuspense, shouldRemove, !!child.dynamicChildren);
 		}
 	},
 	move: moveTeleport,
@@ -629,7 +652,7 @@ function moveTeleport(vnode, container, parentAnchor, { o: { insert }, m: move }
 	const { el, anchor, shapeFlag, children, props } = vnode;
 	const isReorder = moveType === 2;
 	if (isReorder) insert(el, container, parentAnchor);
-	if (!isReorder || isTeleportDisabled(props)) {
+	if (!pendingMounts.has(vnode) && (!isReorder || isTeleportDisabled(props))) {
 		if (shapeFlag & 16) for (let i = 0; i < children.length; i++) move(children[i], container, parentAnchor, 2, parentComponent);
 	}
 	if (isReorder) insert(anchor, container, parentAnchor);
@@ -754,8 +777,8 @@ const BaseTransitionImpl = {
 		const state = useTransitionState();
 		return () => {
 			const children = slots.default && getTransitionRawChildren(slots.default(), true);
-			if (!children || !children.length) return;
-			const child = findNonCommentChild(children);
+			const child = children && children.length ? findNonCommentChild(children) : instance.subTree ? createCommentVNode() : void 0;
+			if (!child) return;
 			const rawProps = (0, _vue_reactivity.toRaw)(props);
 			const { mode } = rawProps;
 			if (state.isLeaving) return emptyPlaceholder(child);
@@ -931,12 +954,11 @@ function getInnerChild$1(vnode) {
 	}
 }
 function setTransitionHooks(vnode, hooks) {
-	if (vnode.shapeFlag & 6 && vnode.component) if (isVaporComponent(vnode.type)) getVaporInterface(vnode.component, vnode).setTransitionHooks(vnode.component, hooks);
-	else {
+	if (vnode.shapeFlag & 6 && vnode.component) {
 		vnode.transition = hooks;
-		setTransitionHooks(vnode.component.subTree, hooks);
-	}
-	else if (vnode.shapeFlag & 128) {
+		if (isVaporComponent(vnode.type)) getVaporInterface(vnode.component, vnode).setTransitionHooks(vnode.component, hooks);
+		else setTransitionHooks(vnode.component.subTree, hooks);
+	} else if (vnode.shapeFlag & 128) {
 		vnode.ssContent.transition = hooks.clone(vnode.ssContent);
 		vnode.ssFallback.transition = hooks.clone(vnode.ssFallback);
 	} else vnode.transition = hooks;
@@ -1179,7 +1201,7 @@ function createHydrationFunctions(rendererInternals) {
 				else nextNode = hydrateFragment(node, vnode, parentComponent, parentSuspense, slotScopeIds, optimized);
 				break;
 			case VaporSlot:
-				nextNode = getVaporInterface(parentComponent, vnode).hydrateSlot(vnode, node);
+				nextNode = getVaporInterface(parentComponent, vnode).hydrateSlot(vnode, node, parentComponent, parentSuspense);
 				break;
 			default: if (shapeFlag & 1) if ((domType !== 1 || vnode.type.toLowerCase() !== node.tagName.toLowerCase()) && !isTemplateNode(node)) nextNode = onMismatch();
 			else nextNode = hydrateElement(node, vnode, parentComponent, parentSuspense, slotScopeIds, optimized);
@@ -1189,16 +1211,31 @@ function createHydrationFunctions(rendererInternals) {
 				if (isFragmentStart) nextNode = locateClosingAnchor(node);
 				else if (isComment(node) && node.data === "teleport start") nextNode = locateClosingAnchor(node, node.data, "teleport end");
 				else nextNode = nextSibling(node);
-				if (vnode.type.__vapor) getVaporInterface(parentComponent, vnode).hydrate(vnode, node, container, null, parentComponent, parentSuspense);
-				else mountComponent(vnode, container, null, parentComponent, parentSuspense, getContainerType(container), optimized);
-				if (isAsyncWrapper(vnode) && !vnode.type.__asyncResolved) {
-					let subTree;
-					if (isFragmentStart) {
-						subTree = createVNode(Fragment);
-						subTree.anchor = nextNode ? nextNode.previousSibling : container.lastChild;
-					} else subTree = node.nodeType === 3 ? createTextVNode("") : createVNode("div");
-					subTree.el = node;
-					vnode.component.subTree = subTree;
+				if (vnode.type.__vapor) {
+					const vnodeBeforeMountHook = !isAsyncWrapper(vnode) && vnode.props && vnode.props.onVnodeBeforeMount;
+					getVaporInterface(parentComponent, vnode).hydrate(vnode, node, container, nextNode, parentComponent, parentSuspense, () => {
+						if (vnode.dirs) {
+							invokeDirectiveHook(vnode, null, parentComponent, "created");
+							invokeDirectiveHook(vnode, null, parentComponent, "beforeMount");
+						}
+					}, () => {
+						if (vnodeBeforeMountHook) invokeVNodeHook(vnodeBeforeMountHook, parentComponent, vnode);
+					});
+					if (vnode.dirs) queueEffectWithSuspense(() => invokeDirectiveHook(vnode, null, parentComponent, "mounted"), void 0, parentSuspense);
+					const vnodeMountedHook = !isAsyncWrapper(vnode) && vnode.props && vnode.props.onVnodeMounted;
+					if (vnodeMountedHook) queueEffectWithSuspense(() => invokeVNodeHook(vnodeMountedHook, parentComponent, vnode), void 0, parentSuspense);
+				} else {
+					mountComponent(vnode, container, null, parentComponent, parentSuspense, getContainerType(container), optimized);
+					const component = vnode.component;
+					if (isAsyncWrapper(vnode) && !vnode.type.__asyncResolved || component.asyncDep && !component.asyncResolved) {
+						let subTree;
+						if (isFragmentStart) {
+							subTree = createVNode(Fragment);
+							subTree.anchor = nextNode ? nextNode.previousSibling : container.lastChild;
+						} else subTree = node.nodeType === 3 ? createTextVNode("") : createVNode("div");
+						subTree.el = node;
+						component.subTree = subTree;
+					}
 				}
 			} else if (shapeFlag & 64) if (domType !== 8) nextNode = onMismatch();
 			else nextNode = vnode.type.hydrate(node, vnode, parentComponent, parentSuspense, slotScopeIds, optimized, rendererInternals, hydrateChildren);
@@ -1209,9 +1246,10 @@ function createHydrationFunctions(rendererInternals) {
 	};
 	const hydrateElement = (el, vnode, parentComponent, parentSuspense, slotScopeIds, optimized) => {
 		optimized = optimized || !!vnode.dynamicChildren;
-		const { type, props, patchFlag, shapeFlag, dirs, transition } = vnode;
+		const { type, dynamicProps, props, patchFlag, shapeFlag, dirs, transition } = vnode;
 		const forcePatch = type === "input" || type === "option";
-		if (forcePatch || patchFlag !== -1) {
+		const hasDynamicProps = !!dynamicProps;
+		if (forcePatch || hasDynamicProps || patchFlag !== -1) {
 			if (dirs) invokeDirectiveHook(vnode, null, parentComponent, "created");
 			let needCallTransitionHooks = false;
 			if (isTemplateNode(el)) {
@@ -1227,8 +1265,8 @@ function createHydrationFunctions(rendererInternals) {
 			}
 			if (shapeFlag & 16 && !(props && (props.innerHTML || props.textContent))) {
 				let next = hydrateChildren(el.firstChild, vnode, el, parentComponent, parentSuspense, slotScopeIds, optimized);
+				if (next && !isMismatchAllowed(el, 1)) logMismatchError();
 				while (next) {
-					if (!isMismatchAllowed(el, 1)) logMismatchError();
 					const cur = next;
 					next = next.nextSibling;
 					remove(cur);
@@ -1243,9 +1281,10 @@ function createHydrationFunctions(rendererInternals) {
 				}
 			}
 			if (props) {
-				if (forcePatch || !optimized || patchFlag & 48) {
+				if (forcePatch || hasDynamicProps || !optimized || patchFlag & 48) {
 					const isCustomElement = el.tagName.includes("-");
-					for (const key in props) if (forcePatch && (key.endsWith("value") || key === "indeterminate") || (0, _vue_shared.isOn)(key) && !(0, _vue_shared.isReservedProp)(key) || key[0] === "." || isCustomElement && !(0, _vue_shared.isReservedProp)(key)) patchProp(el, key, null, props[key], void 0, parentComponent);
+					const namespace = el.namespaceURI.includes("svg") ? "svg" : el.namespaceURI.includes("MathML") ? "mathml" : void 0;
+					for (const key in props) if (forcePatch && (key.endsWith("value") || key === "indeterminate") || (0, _vue_shared.isOn)(key) && !(0, _vue_shared.isReservedProp)(key) || key[0] === "." || isCustomElement && !(0, _vue_shared.isReservedProp)(key) || dynamicProps && dynamicProps.includes(key)) patchProp(el, key, null, props[key], namespace, parentComponent);
 				} else if (props.onClick) patchProp(el, "onClick", null, props.onClick, void 0, parentComponent);
 				else if (patchFlag & 4 && (0, _vue_reactivity.isReactive)(props.style)) for (const key in props.style) props.style[key];
 			}
@@ -1264,6 +1303,7 @@ function createHydrationFunctions(rendererInternals) {
 		optimized = optimized || !!parentVNode.dynamicChildren;
 		const children = parentVNode.children;
 		const l = children.length;
+		let hasCheckedMismatch = false;
 		for (let i = 0; i < l; i++) {
 			const vnode = optimized ? children[i] : children[i] = normalizeVNode(children[i]);
 			const isText = vnode.type === Text;
@@ -1277,7 +1317,10 @@ function createHydrationFunctions(rendererInternals) {
 				node = hydrateNode(node, vnode, parentComponent, parentSuspense, slotScopeIds, optimized);
 			} else if (isText && !vnode.children) insert(vnode.el = createText(""), container);
 			else {
-				if (!isMismatchAllowed(container, 1)) logMismatchError();
+				if (!hasCheckedMismatch) {
+					hasCheckedMismatch = true;
+					if (!isMismatchAllowed(container, 1)) logMismatchError();
+				}
 				patch(null, vnode, container, null, parentComponent, parentSuspense, getContainerType(container), slotScopeIds);
 			}
 		}
@@ -1296,7 +1339,7 @@ function createHydrationFunctions(rendererInternals) {
 		}
 	};
 	const handleMismatch = (node, vnode, parentComponent, parentSuspense, slotScopeIds, isFragment) => {
-		if (!isMismatchAllowed(node.parentElement, 1)) logMismatchError();
+		if (!isNodeMismatchAllowed(node, vnode)) logMismatchError();
 		vnode.el = null;
 		if (isFragment) {
 			const end = locateClosingAnchor(node);
@@ -1352,7 +1395,9 @@ const MismatchTypeString = {
 };
 function isMismatchAllowed(el, allowedType) {
 	if (allowedType === 0 || allowedType === 1) while (el && !el.hasAttribute(allowMismatchAttr)) el = el.parentElement;
-	const allowedAttr = el && el.getAttribute(allowMismatchAttr);
+	return isMismatchAllowedByAttr(el && el.getAttribute(allowMismatchAttr), allowedType);
+}
+function isMismatchAllowedByAttr(allowedAttr, allowedType) {
 	if (allowedAttr == null) return false;
 	else if (allowedAttr === "") return true;
 	else {
@@ -1361,6 +1406,16 @@ function isMismatchAllowed(el, allowedType) {
 		return list.includes(MismatchTypeString[allowedType]);
 	}
 }
+function isNodeMismatchAllowed(node, vnode) {
+	return isMismatchAllowed(node.parentElement, 1) || isMismatchAllowedByNode(node) || isMismatchAllowedByVNode(vnode);
+}
+function isMismatchAllowedByNode(node) {
+	return node.nodeType === 1 && isMismatchAllowedByAttr(node.getAttribute(allowMismatchAttr), 1);
+}
+function isMismatchAllowedByVNode({ props }) {
+	const allowedAttr = props && props[allowMismatchAttr];
+	return typeof allowedAttr === "string" && isMismatchAllowedByAttr(allowedAttr, 1);
+}
 //#endregion
 //#region packages/runtime-core/src/hydrationStrategies.ts
 let requestIdleCallback;
@@ -1479,11 +1534,16 @@ function defineAsyncComponent(source) {
 				onError(err);
 				return () => errorComponent ? createVNode(errorComponent, { error: err }) : null;
 			});
-			const { loaded, error, delayed } = useAsyncComponentState(delay, timeout, onError);
+			const { loaded, error, delayed } = useAsyncComponentState(delay, timeout, onError, instance);
 			load().then(() => {
+				if (instance.isUnmounted) return;
 				loaded.value = true;
 				if (instance.parent && instance.parent.vnode && isKeepAlive(instance.parent.vnode)) instance.parent.update();
 			}).catch((err) => {
+				if (instance.isUnmounted) {
+					setPendingRequest(null);
+					return;
+				}
 				onError(err);
 				error.value = err;
 			});
@@ -1539,14 +1599,22 @@ function createAsyncComponentContext(source) {
 		setPendingRequest: (request) => pendingRequest = request
 	};
 }
-const useAsyncComponentState = (delay, timeout, onError) => {
+const useAsyncComponentState = (delay, timeout, onError, instance = currentInstance) => {
 	const loaded = (0, _vue_reactivity.ref)(false);
 	const error = (0, _vue_reactivity.ref)();
 	const delayed = (0, _vue_reactivity.ref)(!!delay);
-	if (delay) setTimeout(() => {
+	let timeoutTimer;
+	let delayTimer;
+	if (instance) onUnmounted(() => {
+		if (timeoutTimer != null) clearTimeout(timeoutTimer);
+		if (delayTimer != null) clearTimeout(delayTimer);
+	}, instance);
+	if (delay) delayTimer = setTimeout(() => {
+		if (instance && instance.isUnmounted) return;
 		delayed.value = false;
 	}, delay);
-	if (timeout != null) setTimeout(() => {
+	if (timeout != null) timeoutTimer = setTimeout(() => {
+		if (instance && instance.isUnmounted) return;
 		if (!loaded.value && !error.value) {
 			const err = /* @__PURE__ */ new Error(`Async component timed out after ${timeout}ms.`);
 			onError(err);
@@ -1564,10 +1632,12 @@ const useAsyncComponentState = (delay, timeout, onError) => {
 * @internal
 */
 function performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy) {
+	const wasConnected = el.isConnected;
 	let patched = false;
 	(instance.bu || (instance.bu = [])).push(() => patched = true);
 	const performHydrate = () => {
 		if (patched) return;
+		if (!el.parentNode || wasConnected && !el.isConnected) return;
 		hydrate();
 	};
 	const doHydrate = hydrateStrategy ? () => {
@@ -1804,7 +1874,7 @@ function injectHook(type, hook, target = currentInstance, prepend = false) {
 			try {
 				return callWithAsyncErrorHandling(hook, target, type, args);
 			} finally {
-				setCurrentInstance(...prev);
+				restoreCurrentInstance(prev);
 				(0, _vue_reactivity.setActiveSub)(prevSub);
 			}
 		});
@@ -1925,8 +1995,9 @@ function createSlots(slots, dynamicSlots) {
 * Compiler runtime helper for rendering `<slot/>`
 * @private
 */
-function renderSlot(slots, name, props = {}, fallback, noSlotted) {
+function renderSlot(slots, name, props = {}, fallback, noSlotted, branchKey) {
 	let slot = slots[name];
+	if (fallback) fallback.__vdom = true;
 	const vaporSlot = slot && (slot.__vs || (slot.__vapor ? slot : null));
 	if (vaporSlot) {
 		const ret = (openBlock(), createBlock(VaporSlot, props));
@@ -1934,21 +2005,31 @@ function renderSlot(slots, name, props = {}, fallback, noSlotted) {
 			slot: vaporSlot,
 			fallback
 		};
+		if (!noSlotted && ret.scopeId) ret.slotScopeIds = [ret.scopeId + "-s"];
 		return ret;
 	}
 	if (currentRenderingInstance && (currentRenderingInstance.ce || currentRenderingInstance.parent && isAsyncWrapper(currentRenderingInstance.parent) && currentRenderingInstance.parent.ce)) {
-		const hasProps = Object.keys(props).length > 0;
-		if (name !== "default") props.name = name;
-		return openBlock(), createBlock(Fragment, null, [createVNode("slot", props, fallback && fallback())], hasProps ? -2 : 64);
+		const slotProps = branchKey != null && props.key == null ? (0, _vue_shared.extend)({}, props, { key: branchKey }) : props;
+		const hasProps = Object.keys(slotProps).length > 0;
+		if (name !== "default") slotProps.name = name;
+		return openBlock(), createBlock(Fragment, null, [createVNode("slot", slotProps, fallback && fallback())], hasProps ? -2 : 64);
 	}
 	if (slot && slot._c) slot._d = false;
+	const prevStackSize = blockStack.length;
 	openBlock();
-	const validSlotContent = slot && ensureValidVNode(slot(props));
-	ensureVaporSlotFallback(validSlotContent, fallback);
-	const slotKey = props.key || validSlotContent && validSlotContent.key;
-	const rendered = createBlock(Fragment, { key: (slotKey && !(0, _vue_shared.isSymbol)(slotKey) ? slotKey : `_${name}`) + (!validSlotContent && fallback ? "_fb" : "") }, validSlotContent || (fallback ? fallback() : []), validSlotContent && slots._ === 1 ? 64 : -2);
+	let rendered;
+	try {
+		const validSlotContent = slot && ensureValidVNode(slot(props));
+		ensureVaporSlotFallback(validSlotContent, fallback);
+		const slotKey = props.key || branchKey || validSlotContent && validSlotContent.key;
+		rendered = createBlock(Fragment, { key: (slotKey && !(0, _vue_shared.isSymbol)(slotKey) ? slotKey : `_${name}`) + (!validSlotContent && fallback ? "_fb" : "") }, validSlotContent || (fallback ? fallback() : []), validSlotContent && slots._ === 1 ? 64 : -2);
+	} catch (err) {
+		for (let i = blockStack.length; i > prevStackSize; i--) closeBlock();
+		throw err;
+	} finally {
+		if (slot && slot._c) slot._d = true;
+	}
 	if (!noSlotted && rendered.scopeId) rendered.slotScopeIds = [rendered.scopeId + "-s"];
-	if (slot && slot._c) slot._d = true;
 	return rendered;
 }
 function ensureValidVNode(vnodes) {
@@ -1961,9 +2042,7 @@ function ensureValidVNode(vnodes) {
 }
 function ensureVaporSlotFallback(vnodes, fallback) {
 	let vaporSlot;
-	if (vnodes && vnodes.length === 1 && isVNode(vnodes[0]) && (vaporSlot = vnodes[0].vs)) {
-		if (!vaporSlot.fallback && fallback) vaporSlot.fallback = fallback;
-	}
+	if (vnodes && vnodes.length === 1 && isVNode(vnodes[0]) && (vaporSlot = vnodes[0].vs)) vaporSlot.outletFallback = fallback;
 }
 //#endregion
 //#region packages/runtime-core/src/helpers/toHandlers.ts
@@ -2239,25 +2318,38 @@ function createPropsRestProxy(props, excludedKeys) {
 function withAsyncContext(getAwaitable) {
 	const ctx = getCurrentGenericInstance();
 	const inSSRSetup = isInSSRComponentSetup;
+	const restoreAsyncContext = ctx && ctx.restoreAsyncContext ? ctx.restoreAsyncContext.bind(ctx) : void 0;
 	let awaitable = getAwaitable();
 	setCurrentInstance(null, void 0);
 	if (inSSRSetup) setInSSRSetupState(false);
 	const restore = () => {
+		const resetStoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
 		setCurrentInstance(ctx);
 		if (inSSRSetup) setInSSRSetupState(true);
+		const reset = restoreAsyncContext && restoreAsyncContext();
+		return () => {
+			if (reset) reset();
+			if (resetStoppedScope) resetStoppedScope.reset();
+		};
 	};
 	const cleanup = () => {
 		setCurrentInstance(null, void 0);
 		if (inSSRSetup) setInSSRSetupState(false);
 	};
 	if ((0, _vue_shared.isPromise)(awaitable)) awaitable = awaitable.catch((e) => {
-		restore();
-		Promise.resolve().then(() => Promise.resolve().then(cleanup));
+		const reset = restore();
+		Promise.resolve().then(() => Promise.resolve().then(() => {
+			if (reset) reset();
+			cleanup();
+		}));
 		throw e;
 	});
 	return [awaitable, () => {
-		restore();
-		Promise.resolve().then(cleanup);
+		const reset = restore();
+		Promise.resolve().then(() => {
+			if (reset) reset();
+			cleanup();
+		});
 	}];
 }
 //#endregion
@@ -2612,12 +2704,13 @@ function useModel(props, name, options = _vue_shared.EMPTY_OBJ) {
 					for (const key of rawPropKeys) if (key === name || key === camelizedName || key === hyphenatedName) parentPassedModelValue = true;
 					else if (key === `onUpdate:${name}` || key === `onUpdate:${camelizedName}` || key === `onUpdate:${hyphenatedName}`) parentPassedModelUpdater = true;
 				}
-				if (!parentPassedModelValue || !parentPassedModelUpdater) {
+				const hasVModel = parentPassedModelValue && parentPassedModelUpdater;
+				if (!hasVModel) {
 					localValue = value;
 					trigger();
 				}
 				i.emit(`update:${name}`, emittedValue);
-				if ((0, _vue_shared.hasChanged)(value, emittedValue) && (0, _vue_shared.hasChanged)(value, prevSetValue) && !(0, _vue_shared.hasChanged)(emittedValue, prevEmittedValue)) trigger();
+				if ((0, _vue_shared.hasChanged)(value, prevSetValue) && ((0, _vue_shared.hasChanged)(value, emittedValue) && !(0, _vue_shared.hasChanged)(emittedValue, prevEmittedValue) || hasVModel && prevSetValue !== _vue_shared.EMPTY_OBJ && !(0, _vue_shared.hasChanged)(emittedValue, localValue))) trigger();
 				prevSetValue = value;
 				prevEmittedValue = emittedValue;
 			}
@@ -2708,7 +2801,8 @@ function normalizeEmitsOptions(comp, appContext, asMixin = false) {
 */
 function isEmitListener(options, key) {
 	if (!options || !(0, _vue_shared.isOn)(key)) return false;
-	key = key.slice(2).replace(/Once$/, "");
+	key = key.slice(2);
+	key = key === "Once" ? key : key.replace(/Once$/, "");
 	return (0, _vue_shared.hasOwn)(options, key[0].toLowerCase() + key.slice(1)) || (0, _vue_shared.hasOwn)(options, (0, _vue_shared.hyphenate)(key)) || (0, _vue_shared.hasOwn)(options, key);
 }
 //#endregion
@@ -2959,7 +3053,7 @@ function baseResolveDefault(factory, instance, key) {
 	const prev = setCurrentInstance(instance);
 	const props = (0, _vue_reactivity.toRaw)(instance.props);
 	value = factory.call(null, props);
-	setCurrentInstance(...prev);
+	restoreCurrentInstance(prev);
 	return value;
 }
 const mixinPropsCache = /* @__PURE__ */ new WeakMap();
@@ -3259,6 +3353,11 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (vnodeHook = newProps.onVnodeBeforeUpdate) invokeVNodeHook(vnodeHook, parentComponent, n2, n1);
 		if (dirs) invokeDirectiveHook(n2, n1, parentComponent, "beforeUpdate");
 		parentComponent && toggleRecurse(parentComponent, true);
+		if (dynamicChildren && (!n1.dynamicChildren || n1.dynamicChildren.length !== dynamicChildren.length)) {
+			patchFlag = 0;
+			optimized = false;
+			dynamicChildren = null;
+		}
 		if (oldProps.innerHTML && newProps.innerHTML == null || oldProps.textContent && newProps.textContent == null) hostSetElementText(el, "");
 		if (dynamicChildren) patchBlockChildren(n1.dynamicChildren, dynamicChildren, el, parentComponent, parentSuspense, resolveChildrenNamespace(n2, namespace), slotScopeIds);
 		else if (!optimized) patchChildren(n1, n2, el, null, parentComponent, parentSuspense, resolveChildrenNamespace(n2, namespace), slotScopeIds, false);
@@ -3325,21 +3424,37 @@ function baseCreateRenderer(options, createHydrationFns) {
 	};
 	const processComponent = (n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized) => {
 		n2.slotScopeIds = slotScopeIds;
-		if (n2.type.__vapor) if (n1 == null) if (n2.shapeFlag & 512) getVaporInterface(parentComponent, n2).activate(n2, container, anchor, parentComponent);
+		if (n2.type.__vapor) if (n1 == null) if (n2.shapeFlag & 512) getVaporInterface(parentComponent, n2).activate(n2, container, anchor, parentComponent, parentSuspense);
 		else {
+			const vnodeBeforeMountHook = !isAsyncWrapper(n2) && n2.props && n2.props.onVnodeBeforeMount;
 			getVaporInterface(parentComponent, n2).mount(n2, container, anchor, parentComponent, parentSuspense, () => {
 				if (n2.dirs) {
 					invokeDirectiveHook(n2, null, parentComponent, "created");
 					invokeDirectiveHook(n2, null, parentComponent, "beforeMount");
 				}
+			}, () => {
+				if (vnodeBeforeMountHook) invokeVNodeHook(vnodeBeforeMountHook, parentComponent, n2);
 			});
 			if (n2.dirs) queuePostRenderEffect(() => invokeDirectiveHook(n2, null, parentComponent, "mounted"), void 0, parentSuspense);
+			const vnodeMountedHook = !isAsyncWrapper(n2) && n2.props && n2.props.onVnodeMounted;
+			if (vnodeMountedHook) {
+				const scopedVNode = n2;
+				queuePostRenderEffect(() => invokeVNodeHook(vnodeMountedHook, parentComponent, scopedVNode), void 0, parentSuspense);
+			}
 		}
 		else {
-			getVaporInterface(parentComponent, n2).update(n1, n2, shouldUpdateComponent(n1, n2, optimized), () => {
+			const shouldUpdate = shouldUpdateComponent(n1, n2, optimized);
+			getVaporInterface(parentComponent, n2).update(n1, n2, shouldUpdate, () => {
 				if (n2.dirs) invokeDirectiveHook(n2, n1, parentComponent, "beforeUpdate");
+			}, () => {
+				const vnodeBeforeUpdateHook = n2.props && n2.props.onVnodeBeforeUpdate;
+				if (vnodeBeforeUpdateHook) invokeVNodeHook(vnodeBeforeUpdateHook, parentComponent, n2, n1);
 			});
-			if (n2.dirs) queuePostRenderEffect(() => invokeDirectiveHook(n2, n1, parentComponent, "updated"), void 0, parentSuspense);
+			const vnodeUpdatedHook = n2.props && n2.props.onVnodeUpdated;
+			if (shouldUpdate && (vnodeUpdatedHook || n2.dirs)) queuePostRenderEffect(() => {
+				n2.dirs && invokeDirectiveHook(n2, n1, parentComponent, "updated");
+				vnodeUpdatedHook && invokeVNodeHook(vnodeUpdatedHook, parentComponent, n2, n1);
+			}, void 0, parentSuspense);
 		}
 		else if (n1 == null) if (n2.shapeFlag & 512) parentComponent.ctx.activate(n2, container, anchor, namespace, optimized);
 		else mountComponent(n2, container, anchor, parentComponent, parentSuspense, namespace, optimized);
@@ -3619,7 +3734,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 	const move = (vnode, container, anchor, moveType, parentComponent, parentSuspense = null) => {
 		const { el, type, transition, children, shapeFlag } = vnode;
 		if (isVaporComponent(type) || type === VaporSlot) {
-			getVaporInterface(parentComponent, vnode).move(vnode, container, anchor, moveType);
+			getVaporInterface(parentComponent, vnode).move(vnode, container, anchor, moveType, parentSuspense);
 			return;
 		}
 		if (shapeFlag & 6) {
@@ -3652,8 +3767,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 				else hostInsert(el, container, anchor);
 			};
 			const performLeave = () => {
+				const wasLeaving = el._isLeaving || !!el[leaveCbKey];
 				if (el._isLeaving) el[leaveCbKey](true);
-				leave(el, () => {
+				if (transition.persisted && !wasLeaving) remove();
+				else leave(el, () => {
 					remove();
 					afterLeave && afterLeave();
 				});
@@ -3673,7 +3790,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		}
 		if (cacheIndex != null) parentComponent.renderCache[cacheIndex] = void 0;
 		if (shapeFlag & 256) {
-			if (isVaporComponent(vnode.type)) getVaporInterface(parentComponent, vnode).deactivate(vnode, parentComponent.ctx.getStorageContainer());
+			if (isVaporComponent(vnode.type)) getVaporInterface(parentComponent, vnode).deactivate(vnode, parentComponent.ctx.getStorageContainer(), parentSuspense);
 			else parentComponent.ctx.deactivate(vnode);
 			return;
 		}
@@ -3683,8 +3800,11 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeBeforeUnmount)) invokeVNodeHook(vnodeHook, parentComponent, vnode);
 		if (shapeFlag & 6) if (isVaporComponent(type)) {
 			if (dirs) invokeDirectiveHook(vnode, null, parentComponent, "beforeUnmount");
-			getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove);
-			if (dirs) queuePostRenderEffect(() => invokeDirectiveHook(vnode, null, parentComponent, "unmounted"), void 0, parentSuspense);
+			getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove, parentSuspense);
+			if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || dirs) queuePostRenderEffect(() => {
+				dirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
+				vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
+			}, void 0, parentSuspense);
 			return;
 		} else unmountComponent(vnode.component, parentSuspense, doRemove);
 		else {
@@ -3697,7 +3817,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 			else if (dynamicChildren && !dynamicChildren.hasOnce && (type !== Fragment || patchFlag > 0 && patchFlag & 64)) unmountChildren(dynamicChildren, parentComponent, parentSuspense, false, true);
 			else if (type === Fragment && patchFlag & 384 || !optimized && shapeFlag & 16) unmountChildren(children, parentComponent, parentSuspense);
 			if (type === VaporSlot) {
-				getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove);
+				getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove, parentSuspense);
 				return;
 			}
 			if (doRemove) remove(vnode);
@@ -3740,7 +3860,7 @@ function baseCreateRenderer(options, createHydrationFns) {
 		if (effect) {
 			effect.stop();
 			unmount(subTree, instance, parentSuspense, doRemove);
-		}
+		} else if (doRemove && subTree && instance.vnode.el) remove(subTree);
 		if (um) queuePostRenderEffect(um, void 0, parentSuspense);
 		queuePostRenderEffect(() => instance.isUnmounted = true, void 0, parentSuspense);
 	};
@@ -3859,6 +3979,10 @@ function invalidateMount(hooks) {
 	if (hooks) for (let i = 0; i < hooks.length; i++) hooks[i].flags |= 4;
 }
 function performTransitionEnter(el, transition, insert, parentSuspense, force = false) {
+	if (force && transition.persisted && !el[leaveCbKey]) {
+		insert();
+		return;
+	}
 	if (force || needTransition(parentSuspense, transition)) {
 		transition.beforeEnter(el);
 		insert();
@@ -4048,15 +4172,19 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 			if (suspense.isHydrating) suspense.isHydrating = false;
 			else if (!resume) {
 				delayEnter = activeBranch && pendingBranch.transition && pendingBranch.transition.mode === "out-in";
+				let hasUpdatedAnchor = false;
 				if (delayEnter) activeBranch.transition.afterLeave = () => {
 					if (pendingId === suspense.pendingId) {
-						move(pendingBranch, container, anchor === initialAnchor ? next(activeBranch) : anchor, 0, parentComponent);
+						move(pendingBranch, container, anchor === initialAnchor && !hasUpdatedAnchor ? next(activeBranch) : anchor, 0, parentComponent);
 						queuePostFlushCb(effects);
 						if (isInFallback && vnode.ssFallback) vnode.ssFallback.el = null;
 					}
 				};
 				if (activeBranch && !suspense.isFallbackMountPending) {
-					if (parentNode(activeBranch.el) === container) anchor = next(activeBranch);
+					if (parentNode(activeBranch.el) === container) {
+						anchor = next(activeBranch);
+						hasUpdatedAnchor = true;
+					}
 					unmount(activeBranch, parentComponent, suspense, true);
 					if (!delayEnter && isInFallback && vnode.ssFallback) queuePostRenderEffect(() => vnode.ssFallback.el = null, void 0, suspense);
 				}
@@ -4120,6 +4248,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
 				handleError(err, instance, 0);
 			}).then((asyncSetupResult) => {
 				if (instance.isUnmounted || suspense.isUnmounted || suspense.pendingId !== instance.suspenseId) return;
+				setCurrentInstance(null, void 0);
 				instance.asyncResolved = true;
 				onResolve(asyncSetupResult);
 				if (isInPendingSuspense && --suspense.deps === 0) suspense.resolve();
@@ -4383,11 +4512,29 @@ function cloneVNode(vnode, extraProps, mergeRef = false, cloneTransition = false
 		el: vnode.el,
 		anchor: vnode.anchor,
 		ctx: vnode.ctx,
-		ce: vnode.ce
+		ce: vnode.ce,
+		vi: vnode.vi,
+		vs: cloneVaporSlotMeta(vnode),
+		vb: vnode.vb
 	};
 	if (transition && cloneTransition) setTransitionHooks(cloned, transition.clone(cloned));
 	return cloned;
 }
+function cloneVaporSlotMeta(vnode) {
+	const vaporSlot = vnode.vs;
+	if (!vaporSlot) return vaporSlot;
+	const cloned = {
+		slot: vaporSlot.slot,
+		fallback: vaporSlot.fallback,
+		outletFallback: vaporSlot.outletFallback
+	};
+	if (vnode.el) {
+		cloned.state = vaporSlot.state;
+		cloned.ref = vaporSlot.ref;
+		cloned.scope = vaporSlot.scope;
+	}
+	return cloned;
+}
 /**
 * @private
 */
@@ -4441,6 +4588,10 @@ function normalizeChildren(vnode, children) {
 		}
 	}
 	else if ((0, _vue_shared.isFunction)(children)) {
+		if (shapeFlag & 65) {
+			normalizeChildren(vnode, { default: children });
+			return;
+		}
 		children = {
 			default: children,
 			_ctx: currentRenderingInstance
@@ -4513,6 +4664,16 @@ const setCurrentInstance = (instance, scope = instance !== null ? instance.scope
 		simpleSetCurrentInstance(instance);
 	}
 };
+/**
+* Restores a snapshot returned by {@link setCurrentInstance}. Unlike calling
+* `setCurrentInstance(...prev)`, an `undefined` saved scope is restored
+* verbatim instead of re-triggering the `instance.scope` default.
+* @internal
+*/
+const restoreCurrentInstance = (prev) => {
+	(0, _vue_reactivity.setCurrentScope)(prev[1]);
+	simpleSetCurrentInstance(prev[0]);
+};
 const internalOptions = [
 	"ce",
 	"type",
@@ -4641,7 +4802,7 @@ function setupStatefulComponent(instance, isSSR) {
 		const setupResult = callWithErrorHandling(setup, instance, 0, [instance.props, setupContext]);
 		const isAsyncSetup = (0, _vue_shared.isPromise)(setupResult);
 		(0, _vue_reactivity.setActiveSub)(prevSub);
-		setCurrentInstance(...prev);
+		restoreCurrentInstance(prev);
 		if ((isAsyncSetup || instance.sp) && !isAsyncWrapper(instance)) markAsyncBoundary(instance);
 		if (isAsyncSetup) {
 			const unsetCurrentInstance = () => {
@@ -4701,7 +4862,7 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
 			applyOptions(instance);
 		} finally {
 			(0, _vue_reactivity.setActiveSub)(prevSub);
-			setCurrentInstance(...prevInstance);
+			restoreCurrentInstance(prevInstance);
 		}
 	}
 }
@@ -4799,7 +4960,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.9";
+const version = "3.6.0-rc.2";
 const warn = _vue_shared.NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.