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

package/dist/runtime-dom.cjs.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
   **/

package/dist/runtime-dom.cjs.prod.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
   **/

package/dist/runtime-dom.esm-browser.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
   **/
@@ -3071,7 +3071,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) {
@@ -3529,12 +3529,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;
@@ -4597,7 +4596,7 @@ function injectHook(type, hook, target = currentInstance, prepend = false) {
 			try {
 				return callWithAsyncErrorHandling(hook, target, type, args);
 			} finally {
-				setCurrentInstance(...prev);
+				restoreCurrentInstance(prev);
 				setActiveSub(prevSub);
 			}
 		});
@@ -6042,7 +6041,7 @@ function baseResolveDefault(factory, instance, key) {
 	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();
@@ -6602,7 +6601,7 @@ 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, () => {
@@ -6945,7 +6944,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) {
@@ -7001,7 +7000,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;
 		}
@@ -7011,7 +7010,7 @@ 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);
+			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);
@@ -7028,7 +7027,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);
@@ -7926,6 +7925,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) => {
+	setCurrentScope(prev[1]);
+	simpleSetCurrentInstance(prev[0]);
+};
 const internalOptions = [
 	"ce",
 	"type",
@@ -8077,7 +8086,7 @@ function setupStatefulComponent(instance, isSSR) {
 		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 = () => {
@@ -8146,7 +8155,7 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
 			applyOptions(instance);
 		} finally {
 			setActiveSub(prevSub);
-			setCurrentInstance(...prevInstance);
+			restoreCurrentInstance(prevInstance);
 		}
 	}
 	if (!Component.render && instance.render === NOOP && !isSSR) if (!compile && Component.template)
@@ -8456,7 +8465,7 @@ function isMemoSame(cached, memo) {
 }
 //#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.