@vue/runtime-dom 3.6.0-rc.1 → 3.6.0-rc.2

package/dist/runtime-dom.global.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-dom v3.6.0-rc.1
+  * @vue/runtime-dom v3.6.0-rc.2
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -3069,7 +3069,7 @@ var VueRuntimeDOM = (function(exports) {
 		}
 		const prev = setCurrentInstance(this);
 		const res = doWatch(getter, cb.bind(publicThis), options);
-		setCurrentInstance(...prev);
+		restoreCurrentInstance(prev);
 		return res;
 	}
 	function createPathGetter(ctx, path) {
@@ -3527,12 +3527,11 @@ var VueRuntimeDOM = (function(exports) {
 		}
 	}
 	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;
@@ -4595,7 +4594,7 @@ var VueRuntimeDOM = (function(exports) {
 				try {
 					return callWithAsyncErrorHandling(hook, target, type, args);
 				} finally {
-					setCurrentInstance(...prev);
+					restoreCurrentInstance(prev);
 					setActiveSub(prevSub);
 				}
 			});
@@ -6040,7 +6039,7 @@ var VueRuntimeDOM = (function(exports) {
 		const prev = setCurrentInstance(instance);
 		const props = /* @__PURE__ */ toRaw(instance.props);
 		value = factory.call(null, props);
-		setCurrentInstance(...prev);
+		restoreCurrentInstance(prev);
 		return value;
 	}
 	const mixinPropsCache = /* @__PURE__ */ new WeakMap();
@@ -6600,7 +6599,7 @@ var VueRuntimeDOM = (function(exports) {
 		};
 		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, () => {
@@ -6943,7 +6942,7 @@ var VueRuntimeDOM = (function(exports) {
 		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) {
@@ -6999,7 +6998,7 @@ var VueRuntimeDOM = (function(exports) {
 			}
 			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;
 			}
@@ -7009,7 +7008,7 @@ var VueRuntimeDOM = (function(exports) {
 			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);
+				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);
@@ -7026,7 +7025,7 @@ var VueRuntimeDOM = (function(exports) {
 				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);
@@ -7924,6 +7923,16 @@ var VueRuntimeDOM = (function(exports) {
 			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) => {
+		setCurrentScope(prev[1]);
+		simpleSetCurrentInstance(prev[0]);
+	};
 	const internalOptions = [
 		"ce",
 		"type",
@@ -8075,7 +8084,7 @@ var VueRuntimeDOM = (function(exports) {
 			const setupResult = callWithErrorHandling(setup, instance, 0, [/* @__PURE__ */ shallowReadonly(instance.props), setupContext]);
 			const isAsyncSetup = isPromise(setupResult);
 			setActiveSub(prevSub);
-			setCurrentInstance(...prev);
+			restoreCurrentInstance(prev);
 			if ((isAsyncSetup || instance.sp) && !isAsyncWrapper(instance)) markAsyncBoundary(instance);
 			if (isAsyncSetup) {
 				const unsetCurrentInstance = () => {
@@ -8144,7 +8153,7 @@ var VueRuntimeDOM = (function(exports) {
 				applyOptions(instance);
 			} finally {
 				setActiveSub(prevSub);
-				setCurrentInstance(...prevInstance);
+				restoreCurrentInstance(prevInstance);
 			}
 		}
 		if (!Component.render && instance.render === NOOP && !isSSR) if (!compile && Component.template)
@@ -8454,7 +8463,7 @@ var VueRuntimeDOM = (function(exports) {
 	}
 	//#endregion
 	//#region packages/runtime-core/src/index.ts
-	const version = "3.6.0-rc.1";
+	const version = "3.6.0-rc.2";
 	const warn = warn$1;
 	/**
 	* Runtime error messages. Only exposed in dev or esm builds.