@vue/server-renderer 3.6.0-beta.8 → 3.6.0-rc.1

package/dist/server-renderer.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/server-renderer v3.6.0-beta.8
+  * @vue/server-renderer v3.6.0-rc.1
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -292,9 +292,14 @@ function escapeHtml(string) {
 	}
 	return lastIndex !== index ? html + str.slice(lastIndex, index) : html;
 }
-const commentStripRE = /^-?>|<!--|-->|--!>|<!-$/g;
+const commentStripRE = /^(?:-?>)+|<!--|-->|--!>|<!-$/g;
 function escapeHtmlComment(src) {
-	return src.replace(commentStripRE, "");
+	let prev;
+	do {
+		prev = src;
+		src = src.replace(commentStripRE, "");
+	} while (src !== prev);
+	return src;
 }
 //#endregion
 //#region packages/shared/src/looseEqual.ts
@@ -457,6 +462,13 @@ function warn$2(msg, ...args) {
 const notifyBuffer = [];
 let batchDepth = 0;
 let activeSub = void 0;
+let runDepth = 0;
+function incRunDepth() {
+	++runDepth;
+}
+function decRunDepth() {
+	--runDepth;
+}
 let globalVersion = 0;
 let notifyIndex = 0;
 let notifyBufferLength = 0;
@@ -530,8 +542,10 @@ function propagate(link) {
 		const sub = link.sub;
 		let flags = sub.flags;
 		if (flags & 3) {
-			if (!(flags & 60)) sub.flags = flags | 32;
-			else if (!(flags & 12)) flags = 0;
+			if (!(flags & 60)) {
+				sub.flags = flags | 32;
+				if (runDepth) sub.flags |= 8;
+			} else if (!(flags & 12)) flags = 0;
 			else if (!(flags & 4)) sub.flags = flags & -9 | 32;
 			else if (!(flags & 48) && isValidLink(link, sub)) {
 				sub.flags = flags | 40;
@@ -600,13 +614,13 @@ function checkDirty(link, sub) {
 		let dirty = false;
 		if (sub.flags & 16) dirty = true;
 		else if ((depFlags & 17) === 17) {
+			const subs = dep.subs;
 			if (dep.update()) {
-				const subs = dep.subs;
 				if (subs.nextSub !== void 0) shallowPropagate(subs);
 				dirty = true;
 			}
 		} else if ((depFlags & 33) === 33) {
-			if (link.nextSub !== void 0 || link.prevSub !== void 0) stack = {
+			stack = {
 				value: link,
 				prev: stack
 			};
@@ -621,15 +635,12 @@ function checkDirty(link, sub) {
 		}
 		while (checkDepth) {
 			--checkDepth;
-			const firstSub = sub.subs;
-			const hasMultipleSubs = firstSub.nextSub !== void 0;
-			if (hasMultipleSubs) {
-				link = stack.value;
-				stack = stack.prev;
-			} else link = firstSub;
+			link = stack.value;
+			stack = stack.prev;
 			if (dirty) {
+				const subs = sub.subs;
 				if (sub.update()) {
-					if (hasMultipleSubs) shallowPropagate(firstSub);
+					if (subs.nextSub !== void 0) shallowPropagate(subs);
 					sub = link.sub;
 					continue;
 				}
@@ -641,7 +652,7 @@ function checkDirty(link, sub) {
 			}
 			dirty = false;
 		}
-		return dirty;
+		return dirty && !!sub.flags;
 	} while (true);
 }
 function shallowPropagate(link) {
@@ -1020,7 +1031,7 @@ var MutableReactiveHandler = class extends BaseReactiveHandler {
 		}
 		const hadKey = isArrayWithIntegerKey ? Number(key) < target.length : hasOwn(target, key);
 		const result = Reflect.set(target, key, value, /* @__PURE__ */ isRef(target) ? target : receiver);
-		if (target === /* @__PURE__ */ toRaw(receiver)) {
+		if (target === /* @__PURE__ */ toRaw(receiver) && result) {
 			if (!hadKey) trigger(target, "add", key, value);
 			else if (hasChanged(value, oldValue)) trigger(target, "set", key, value, oldValue);
 		}
@@ -1238,9 +1249,6 @@ function targetTypeMap(rawType) {
 		default: return 0;
 	}
 }
-function getTargetType(value) {
-	return value["__v_skip"] || !Object.isExtensible(value) ? 0 : targetTypeMap(toRawType(value));
-}
 /* @__NO_SIDE_EFFECTS__ */
 function reactive(target) {
 	if (/* @__PURE__ */ isReadonly(target)) return target;
@@ -1353,10 +1361,11 @@ function createReactiveObject(target, isReadonly, baseHandlers, collectionHandle
 		return target;
 	}
 	if (target["__v_raw"] && !(isReadonly && target["__v_isReactive"])) return target;
-	const targetType = getTargetType(target);
-	if (targetType === 0) return target;
+	if (target["__v_skip"] || !Object.isExtensible(target)) return target;
 	const existingProxy = proxyMap.get(target);
 	if (existingProxy) return existingProxy;
+	const targetType = targetTypeMap(toRawType(target));
+	if (targetType === 0) return target;
 	const proxy = new Proxy(target, targetType === 2 ? collectionHandlers : baseHandlers);
 	proxyMap.set(target, proxy);
 	return proxy;
@@ -1561,9 +1570,11 @@ var ReactiveEffect = class {
 		if (!this.active) return this.fn();
 		cleanup(this);
 		const prevSub = startTracking(this);
+		incRunDepth();
 		try {
 			return this.fn();
 		} finally {
+			decRunDepth();
 			endTracking(this, prevSub);
 			const flags = this.flags;
 			if ((flags & 136) === 136) {
@@ -1855,8 +1866,9 @@ var WatcherEffect = class extends ReactiveEffect {
 		if (once && cb) {
 			const _cb = cb;
 			cb = (...args) => {
-				_cb(...args);
+				const res = _cb(...args);
 				this.stop();
+				return res;
 			};
 		}
 		this.cb = cb;
@@ -1870,7 +1882,7 @@ var WatcherEffect = class extends ReactiveEffect {
 		if (!this.cb) return;
 		const { immediate, deep, call } = this.options;
 		if (initialRun && !immediate) return;
-		if (deep || this.forceTrigger || (this.isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue))) {
+		if (initialRun || deep || this.forceTrigger || (this.isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue))) {
 			cleanup(this);
 			const currentWatcher = activeWatcher;
 			activeWatcher = this;
@@ -2139,8 +2151,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();
 	}
@@ -2249,6 +2261,7 @@ function flushJobs(seen) {
 		}
 		flushIndex = 0;
 		jobsLength = 0;
+		jobs.length = 0;
 		flushPostFlushCbs(seen);
 		currentFlushPromise = null;
 		if (jobsLength || postJobs.length) flushJobs(seen);
@@ -2268,6 +2281,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();
 getGlobalThis().__VUE_HMR_RUNTIME__ = {
@@ -2299,6 +2319,14 @@ function createRecord(id, initialDef) {
 function normalizeClassComponent(component) {
 	return isClassComponent(component) ? component.__vccOpts : component;
 }
+function hasDirtyAncestor(instance, dirtyInstances) {
+	let parent = instance.parent;
+	while (parent) {
+		if (dirtyInstances.has(parent)) return true;
+		parent = parent.parent;
+	}
+	return false;
+}
 function rerender(id, newRender) {
 	const record = map.get(id);
 	if (!record) return;
@@ -2330,42 +2358,69 @@ function reload(id, newComp) {
 	const isVapor = record.initialDef.__vapor;
 	updateComponentDef(record.initialDef, newComp);
 	const instances = [...record.instances];
-	if (isVapor && newComp.__vapor && !instances.some((i) => i.ceReload)) {
+	if (isVapor && newComp.__vapor && !instances.some((instance) => instance.parent && !instance.parent.vapor) && !instances.some((i) => i.ceReload)) {
 		for (const instance of instances) if (instance.root && instance.root.ce && instance !== instance.root) instance.root.ce._removeChildStyle(instance.type);
-		for (const instance of instances) instance.hmrReload(newComp);
-	} else for (const instance of instances) {
-		const oldComp = normalizeClassComponent(instance.type);
-		let dirtyInstances = hmrDirtyComponents.get(oldComp);
-		if (!dirtyInstances) {
-			if (oldComp !== record.initialDef) updateComponentDef(oldComp, newComp);
-			hmrDirtyComponents.set(oldComp, dirtyInstances = /* @__PURE__ */ new Set());
-		}
-		dirtyInstances.add(instance);
-		hmrDirtyComponentsMode.set(oldComp, !!isVapor);
-		instance.appContext.propsCache.delete(instance.type);
-		instance.appContext.emitsCache.delete(instance.type);
-		instance.appContext.optionsCache.delete(instance.type);
-		if (instance.ceReload) {
-			dirtyInstances.add(instance);
-			instance.ceReload(newComp.styles);
-			dirtyInstances.delete(instance);
-		} else if (instance.parent) queueJob(() => {
-			isHmrUpdating = true;
+		const dirtyInstances = new Set(instances);
+		const rerenderedParents = /* @__PURE__ */ new Set();
+		for (const instance of instances) {
 			const parent = instance.parent;
-			if (parent.vapor) parent.hmrRerender();
-			else if (!(parent.effect.flags & 1024)) {
-				parent.renderCache = [];
-				parent.effect.run();
+			if (parent) {
+				if (!hasDirtyAncestor(instance, dirtyInstances) && !rerenderedParents.has(parent)) {
+					rerenderedParents.add(parent);
+					parent.hmrRerender();
+				}
+			} else instance.hmrReload(newComp);
+		}
+	} else {
+		const parentUpdates = /* @__PURE__ */ new Map();
+		const dirtyInstanceSet = new Set(instances);
+		for (const instance of instances) {
+			const oldComp = normalizeClassComponent(instance.type);
+			let dirtyInstances = hmrDirtyComponents.get(oldComp);
+			if (!dirtyInstances) {
+				if (oldComp !== record.initialDef) updateComponentDef(oldComp, newComp);
+				hmrDirtyComponents.set(oldComp, dirtyInstances = /* @__PURE__ */ new Set());
 			}
-			nextTick(() => {
-				isHmrUpdating = false;
+			dirtyInstances.add(instance);
+			hmrDirtyComponentsMode.set(oldComp, !!isVapor);
+			instance.appContext.propsCache.delete(instance.type);
+			instance.appContext.emitsCache.delete(instance.type);
+			instance.appContext.optionsCache.delete(instance.type);
+			if (instance.ceReload) {
+				dirtyInstances.add(instance);
+				instance.ceReload(newComp.styles);
+				dirtyInstances.delete(instance);
+			} else if (instance.parent) {
+				const parent = instance.parent;
+				if (!hasDirtyAncestor(instance, dirtyInstanceSet)) {
+					let updates = parentUpdates.get(parent);
+					if (!updates) parentUpdates.set(parent, updates = []);
+					updates.push([instance, dirtyInstances]);
+				}
+			} else if (instance.appContext.reload) instance.appContext.reload();
+			else if (typeof window !== "undefined") window.location.reload();
+			else console.warn("[HMR] Root or manually mounted instance modified. Full reload required.");
+			if (instance.root.ce && instance !== instance.root) instance.root.ce._removeChildStyle(oldComp);
+		}
+		parentUpdates.forEach((updates, parent) => {
+			queueJob(() => {
+				isHmrUpdating = true;
+				if (parent.vapor) parent.hmrRerender();
+				else {
+					const i = parent;
+					if (!(i.effect.flags & 1024)) {
+						i.renderCache = [];
+						i.effect.run();
+					}
+				}
+				nextTick(() => {
+					isHmrUpdating = false;
+				});
+				updates.forEach(([instance, dirtyInstances]) => {
+					dirtyInstances.delete(instance);
+				});
 			});
-			dirtyInstances.delete(instance);
 		});
-		else if (instance.appContext.reload) instance.appContext.reload();
-		else if (typeof window !== "undefined") window.location.reload();
-		else console.warn("[HMR] Root or manually mounted instance modified. Full reload required.");
-		if (instance.root.ce && instance !== instance.root) instance.root.ce._removeChildStyle(oldComp);
 	}
 	queuePostFlushCb(() => {
 		hmrDirtyComponents.clear();
@@ -2488,10 +2543,12 @@ function withCtx(fn, ctx = currentRenderingInstance, isNonScopedSlot) {
 	const renderFnWithContext = (...args) => {
 		if (renderFnWithContext._d) setBlockTracking(-1);
 		const prevInstance = setCurrentRenderingInstance$1(ctx);
+		const prevStackSize = blockStack.length;
 		let res;
 		try {
 			res = fn(...args);
 		} finally {
+			for (let i = blockStack.length; i > prevStackSize; i--) closeBlock();
 			setCurrentRenderingInstance$1(prevInstance);
 			if (renderFnWithContext._d) setBlockTracking(1);
 		}
@@ -3513,7 +3570,8 @@ function normalizeEmitsOptions(comp, appContext, asMixin = false) {
 */
 function isEmitListener(options, key) {
 	if (!options || !isOn(key)) return false;
-	key = key.slice(2).replace(/Once$/, "");
+	key = key.slice(2);
+	key = key === "Once" ? key : key.replace(/Once$/, "");
 	return hasOwn(options, key[0].toLowerCase() + key.slice(1)) || hasOwn(options, hyphenate(key)) || hasOwn(options, key);
 }
 //#endregion
@@ -3697,15 +3755,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
@@ -3984,7 +4046,7 @@ function getInvalidTypeMessage(name, value, expectedTypes) {
 	const receivedType = toRawType(value);
 	const expectedValue = styleValue(value, expectedType);
 	const receivedValue = styleValue(value, receivedType);
-	if (expectedTypes.length === 1 && isExplicable(expectedType) && !isBoolean(expectedType, receivedType)) message += ` with value ${expectedValue}`;
+	if (expectedTypes.length === 1 && isExplicable(expectedType) && isCoercible(expectedType, receivedType)) message += ` with value ${expectedValue}`;
 	message += `, got ${receivedType} `;
 	if (isExplicable(receivedType)) message += `with value ${receivedValue}.`;
 	return message;
@@ -3993,7 +4055,8 @@ function getInvalidTypeMessage(name, value, expectedTypes) {
 * dev only
 */
 function styleValue(value, type) {
-	if (type === "String") return `"${value}"`;
+	if (isSymbol(value)) return value.toString();
+	else if (type === "String") return `"${value}"`;
 	else if (type === "Number") return `${Number(value)}`;
 	else return `${value}`;
 }
@@ -4010,8 +4073,11 @@ function isExplicable(type) {
 /**
 * dev only
 */
-function isBoolean(...args) {
-	return args.some((elem) => elem.toLowerCase() === "boolean");
+function isCoercible(...args) {
+	return args.every((elem) => {
+		const value = elem.toLowerCase();
+		return value !== "boolean" && value !== "symbol";
+	});
 }
 //#endregion
 //#region packages/runtime-core/src/componentSlots.ts
@@ -4270,10 +4336,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);
@@ -4296,7 +4371,7 @@ 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 (isHmrUpdating) {
+		if (isHmrUpdating || dynamicChildren && (!n1.dynamicChildren || n1.dynamicChildren.length !== dynamicChildren.length)) {
 			patchFlag = 0;
 			optimized = false;
 			dynamicChildren = null;
@@ -4376,19 +4451,35 @@ function baseCreateRenderer(options, createHydrationFns) {
 		n2.slotScopeIds = slotScopeIds;
 		if (n2.type.__vapor) if (n1 == null) if (n2.shapeFlag & 512) getVaporInterface(parentComponent, n2).activate(n2, container, anchor, parentComponent);
 		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);
@@ -4734,8 +4825,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();
 				});
@@ -4746,7 +4839,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();
@@ -4766,7 +4859,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 		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);
+			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 {
@@ -4784,9 +4880,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) => {
@@ -4825,7 +4923,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);
 		devtoolsComponentRemoved(instance);
@@ -4951,6 +5049,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();
@@ -5025,6 +5127,11 @@ const Comment = Symbol.for("v-cmt");
 const Static = Symbol.for("v-stc");
 const VaporSlot = Symbol.for("v-vps");
 const blockStack = [];
+let currentBlock = null;
+function closeBlock() {
+	blockStack.pop();
+	currentBlock = blockStack[blockStack.length - 1] || null;
+}
 let isBlockTreeEnabled = 1;
 /**
 * Block tracking sometimes needs to be disabled, for example during the
@@ -5044,6 +5151,7 @@ let isBlockTreeEnabled = 1;
 */
 function setBlockTracking(value, inVOnce = false) {
 	isBlockTreeEnabled += value;
+	if (value < 0 && currentBlock && inVOnce) currentBlock.hasOnce = true;
 }
 function isVNode$2(value) {
 	return value ? value.__v_isVNode === true : false;
@@ -5107,6 +5215,7 @@ function createBaseVNode(type, props = null, children = null, patchFlag = 0, dyn
 		if (shapeFlag & 128) type.normalize(vnode);
 	} else if (children) vnode.shapeFlag |= isString(children) ? 8 : 16;
 	if (vnode.key !== vnode.key) warn$1(`VNode created with invalid key (NaN). VNode type:`, vnode.type);
+	if (isBlockTreeEnabled > 0 && !isBlockNode && currentBlock && (vnode.patchFlag > 0 || shapeFlag & 6) && vnode.patchFlag !== 32) currentBlock.push(vnode);
 	return vnode;
 }
 const createVNode = createVNodeWithArgsTransform;
@@ -5118,6 +5227,8 @@ function _createVNode(type, props = null, children = null, patchFlag = 0, dynami
 	if (isVNode$2(type)) {
 		const cloned = cloneVNode(type, props, true);
 		if (children) normalizeChildren(cloned, children);
+		if (isBlockTreeEnabled > 0 && !isBlockNode && currentBlock) if (cloned.shapeFlag & 6) currentBlock[currentBlock.indexOf(type)] = cloned;
+		else currentBlock.push(cloned);
 		cloned.patchFlag = -2;
 		return cloned;
 	}
@@ -5174,11 +5285,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;
+}
 /**
 * Dev only, for HMR of hoisted vnodes reused in v-for
 * https://github.com/vitejs/vite/issues/2022
@@ -5227,6 +5356,10 @@ function normalizeChildren(vnode, children) {
 		}
 	}
 	else if (isFunction(children)) {
+		if (shapeFlag & 65) {
+			normalizeChildren(vnode, { default: children });
+			return;
+		}
 		children = {
 			default: children,
 			_ctx: currentRenderingInstance
@@ -5253,6 +5386,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;
@@ -5570,7 +5704,7 @@ const computed = (getterOrOptions, debugOptions) => {
 };
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.8";
+const version = "3.6.0-rc.1";
 const warn = warn$1;
 /**
 * SSR utils for \@vue/server-renderer. Only exposed in ssr-possible builds.
@@ -5717,7 +5851,10 @@ function patchStyle(el, prev, next) {
 		}
 		for (const key in next) {
 			if (key === "display") hasControlledDisplay = true;
-			setStyle(style, key, next[key]);
+			const value = next[key];
+			if (value != null) {
+				if (!shouldPreserveTextareaResizeStyle(el, key, !isString(prev) && prev ? prev[key] : void 0, value)) setStyle(style, key, value);
+			} else setStyle(style, key, "");
 		}
 	} else if (isCssString) {
 		if (prev !== next) {
@@ -5765,6 +5902,14 @@ function autoPrefix(style, rawName) {
 	}
 	return rawName;
 }
+/**
+* Browsers update textarea width/height directly during native resize.
+* Only special-case this common textarea path for now; other resize scenarios
+* still follow normal vnode style patching.
+*/
+function shouldPreserveTextareaResizeStyle(el, key, prev, next) {
+	return el.tagName === "TEXTAREA" && (key === "width" || key === "height") && isString(next) && prev === next;
+}
 //#endregion
 //#region packages/runtime-dom/src/modules/attrs.ts
 const xlinkNS = "http://www.w3.org/1999/xlink";
@@ -5823,7 +5968,7 @@ function patchEvent(el, rawName, prevValue, nextValue, instance = null) {
 	const existingInvoker = invokers[rawName];
 	if (nextValue && existingInvoker) existingInvoker.value = sanitizeEventValue(nextValue, rawName);
 	else {
-		const [name, options] = parseName(rawName);
+		const [name, options] = parseEventName(rawName);
 		if (nextValue) addEventListener(el, name, invokers[rawName] = createInvoker(sanitizeEventValue(nextValue, rawName), instance), options);
 		else if (existingInvoker) {
 			removeEventListener(el, name, existingInvoker, options);
@@ -5831,16 +5976,15 @@ function patchEvent(el, rawName, prevValue, nextValue, instance = null) {
 		}
 	}
 }
-const optionsModifierRE = /(?:Once|Passive|Capture)$/;
-function parseName(name) {
+const optionsModifierRE = /(Once|Passive|Capture)$/;
+const optionsModifierEventRE = /^on:?(?:Once|Passive|Capture)$/;
+function parseEventName(name) {
 	let options;
-	if (optionsModifierRE.test(name)) {
-		options = {};
-		let m;
-		while (m = name.match(optionsModifierRE)) {
-			name = name.slice(0, name.length - m[0].length);
-			options[m[0].toLowerCase()] = true;
-		}
+	let m;
+	while ((m = name.match(optionsModifierRE)) && !optionsModifierEventRE.test(name)) {
+		if (!options) options = {};
+		name = name.slice(0, name.length - m[1].length);
+		options[m[1].toLowerCase()] = true;
 	}
 	return [name[2] === ":" ? name.slice(3) : hyphenate(name.slice(2)), options];
 }
@@ -5851,7 +5995,21 @@ function createInvoker(initialValue, instance) {
 	const invoker = (e) => {
 		if (!e._vts) e._vts = Date.now();
 		else if (e._vts <= invoker.attached) return;
-		callWithAsyncErrorHandling(patchStopImmediatePropagation(e, invoker.value), instance, 5, [e]);
+		const value = invoker.value;
+		if (isArray(value)) {
+			const originalStop = e.stopImmediatePropagation;
+			e.stopImmediatePropagation = () => {
+				originalStop.call(e);
+				e._stopped = true;
+			};
+			const handlers = value.slice();
+			const args = [e];
+			for (let i = 0; i < handlers.length; i++) {
+				if (e._stopped) break;
+				const handler = handlers[i];
+				if (handler) callWithAsyncErrorHandling(handler, instance, 5, args);
+			}
+		} else callWithAsyncErrorHandling(value, instance, 5, [e]);
 	};
 	invoker.value = initialValue;
 	invoker.attached = getNow();
@@ -5862,16 +6020,6 @@ function sanitizeEventValue(value, propName) {
 	warn(`Wrong type passed as event handler to ${propName} - did you forget @ or : in front of your prop?\nExpected function or array of functions, received type ${typeof value}.`);
 	return NOOP;
 }
-function patchStopImmediatePropagation(e, value) {
-	if (isArray(value)) {
-		const originalStop = e.stopImmediatePropagation;
-		e.stopImmediatePropagation = () => {
-			originalStop.call(e);
-			e._stopped = true;
-		};
-		return value.map((fn) => (e) => !e._stopped && fn && fn(e));
-	} else return value;
-}
 //#endregion
 //#region packages/runtime-dom/src/patchProp.ts
 const patchProp = (el, key, prevValue, nextValue, namespace, parentComponent) => {
@@ -5966,7 +6114,8 @@ const vModelTextUpdate = (el, oldValue, value, trim, number, lazy) => {
 	const elValue = (number || el.type === "number") && !/^0\d/.test(el.value) ? looseToNumber(el.value) : el.value;
 	const newValue = value == null ? "" : value;
 	if (elValue === newValue) return;
-	if (document.activeElement === el && el.type !== "range") {
+	const rootNode = el.getRootNode();
+	if ((rootNode instanceof Document || rootNode instanceof ShadowRoot) && rootNode.activeElement === el && el.type !== "range") {
 		if (lazy && value === oldValue) return;
 		if (trim && el.value.trim() === newValue) return;
 	}
@@ -6048,7 +6197,8 @@ const vModelSelect = {
 	mounted(el, { value }) {
 		vModelSetSelected(el, value);
 	},
-	beforeUpdate(el, _binding, vnode) {
+	beforeUpdate(el, { value }, vnode) {
+		el._modelValue = value;
 		el[assignKey] = getModelAssigner(vnode);
 	},
 	updated(el, { value }) {
@@ -6059,10 +6209,10 @@ const vModelSelect = {
 * @internal
 */
 const vModelSelectInit = (el, value, number, set) => {
-	const isSetModel = isSet(value);
+	el._modelValue = value;
 	addEventListener(el, "change", () => {
 		const selectedVal = Array.prototype.filter.call(el.options, (o) => o.selected).map((o) => number ? looseToNumber(getValue(o)) : getValue(o));
-		(set || el[assignKey])(el.multiple ? isSetModel ? new Set(selectedVal) : selectedVal : selectedVal[0]);
+		(set || el[assignKey])(el.multiple ? isSet(el._modelValue) ? new Set(selectedVal) : selectedVal : selectedVal[0]);
 		el._assigning = true;
 		nextTick(() => {
 			el._assigning = false;
@@ -6073,6 +6223,7 @@ const vModelSelectInit = (el, value, number, set) => {
 * @internal
 */
 const vModelSetSelected = (el, value) => {
+	el._modelValue = value;
 	if (el._assigning) return;
 	const isMultiple = el.multiple;
 	const isArrayValue = isArray(value);
@@ -6290,6 +6441,11 @@ function ssrResetCssVars(raw) {
 //#endregion
 //#region packages/server-renderer/src/helpers/ssrRenderComponent.ts
 function ssrRenderComponent(comp, props = null, children = null, parentComponent = null, slotScopeId) {
+	if (isString(comp)) {
+		const { getBuffer, push } = createBuffer();
+		renderVNode(push, createVNode(comp, props, children), parentComponent, slotScopeId);
+		return getBuffer();
+	}
 	return renderComponentVNode(createVNode(comp, props, children), parentComponent, slotScopeId);
 }
 //#endregion
@@ -6363,6 +6519,7 @@ function ssrRenderTeleport(parentPush, contentRenderFn, target, disabled, parent
 		teleportContent = getBuffer();
 	}
 	targetBuffer.splice(bufferIndex, 0, teleportContent);
+	if (isPromise(teleportContent) || isArray(teleportContent) && teleportContent.hasAsync) targetBuffer.hasAsync = true;
 	parentPush("<!--teleport end-->");
 }
 //#endregion
@@ -6381,8 +6538,8 @@ function ssrRenderList(source, renderItem) {
 		}
 		for (let i = 0; i < source; i++) renderItem(i + 1, i);
 	} else if (isObject(source)) if (source[Symbol.iterator]) {
-		const arr = Array.from(source);
-		for (let i = 0, l = arr.length; i < l; i++) renderItem(arr[i], i);
+		let i = 0;
+		for (const item of source) renderItem(item, i++);
 	} else {
 		const keys = Object.keys(source);
 		for (let i = 0, l = keys.length; i < l; i++) {
@@ -6393,7 +6550,7 @@ function ssrRenderList(source, renderItem) {
 }
 //#endregion
 //#region packages/server-renderer/src/helpers/ssrRenderSuspense.ts
-async function ssrRenderSuspense(push, { default: renderContent }) {
+function ssrRenderSuspense(push, { default: renderContent }) {
 	if (renderContent) renderContent();
 	else push(`<!---->`);
 }
@@ -6439,6 +6596,26 @@ function ssrCompile(template, instance) {
 //#endregion
 //#region packages/server-renderer/src/render.ts
 const { createComponentInstance, setCurrentRenderingInstance, setupComponent, renderComponentRoot, normalizeVNode, pushWarningContext, popWarningContext } = ssrUtils;
+function cleanupContext(context) {
+	let firstError;
+	if (context.__watcherHandles) {
+		for (const unwatch of context.__watcherHandles) try {
+			unwatch();
+		} catch (err) {
+			if (firstError === void 0) firstError = err;
+		}
+		context.__watcherHandles.length = 0;
+	}
+	if (context.__instanceScopes) {
+		for (const scope of context.__instanceScopes) try {
+			scope.stop();
+		} catch (err) {
+			if (firstError === void 0) firstError = err;
+		}
+		context.__instanceScopes.length = 0;
+	}
+	if (firstError !== void 0) throw firstError;
+}
 function createBuffer() {
 	let appendable = false;
 	const buffer = [];
@@ -6460,6 +6637,8 @@ function createBuffer() {
 }
 function renderComponentVNode(vnode, parentComponent = null, slotScopeId) {
 	const instance = vnode.component = createComponentInstance(vnode, parentComponent, null);
+	const context = instance.appContext.provides[ssrContextKey];
+	if (context) (context.__instanceScopes || (context.__instanceScopes = [])).push(instance.scope);
 	pushWarningContext(vnode);
 	const res = setupComponent(instance, true);
 	popWarningContext();
@@ -6469,7 +6648,11 @@ function renderComponentVNode(vnode, parentComponent = null, slotScopeId) {
 		if (hasAsyncSetup) prefetches = instance.sp;
 		if (prefetches) return Promise.all(prefetches.map((prefetch) => prefetch.call(instance.proxy)));
 	}).catch(NOOP).then(() => renderComponentSubTree(instance, slotScopeId));
-	else return renderComponentSubTree(instance, slotScopeId);
+	else try {
+		return renderComponentSubTree(instance, slotScopeId);
+	} catch (err) {
+		return Promise.reject(err);
+	}
 }
 function renderComponentSubTree(instance, slotScopeId) {
 	pushWarningContext(instance.vnode);
@@ -6509,6 +6692,8 @@ function renderComponentSubTree(instance, slotScopeId) {
 			const prev = setCurrentRenderingInstance(instance);
 			try {
 				ssrRender(instance.proxy, push, instance, attrs, instance.props, instance.setupState, instance.data, instance.ctx);
+			} catch (err) {
+				handleError(err, instance, 1);
 			} finally {
 				setCurrentRenderingInstance(prev);
 			}
@@ -6555,15 +6740,25 @@ function renderElementVNode(push, vnode, parentComponent, slotScopeId) {
 	let { props, children, shapeFlag, scopeId } = vnode;
 	let openTag = `<${tag}`;
 	if (props) openTag += ssrRenderAttrs(props, tag);
-	if (scopeId) openTag += ` ${scopeId}`;
+	const renderedScopeIds = [];
+	const appendScopeId = (id) => {
+		if (id && (!props || !hasOwn(props, id)) && !renderedScopeIds.includes(id)) {
+			openTag += ` ${id}`;
+			renderedScopeIds.push(id);
+		}
+	};
+	if (scopeId) appendScopeId(scopeId);
 	let curParent = parentComponent;
 	let curVnode = vnode;
 	while (curParent && curVnode === curParent.subTree) {
 		curVnode = curParent.vnode;
-		if (curVnode.scopeId) openTag += ` ${curVnode.scopeId}`;
+		if (curVnode.scopeId) appendScopeId(curVnode.scopeId);
 		curParent = curParent.parent;
 	}
-	if (slotScopeId) openTag += ` ${slotScopeId}`;
+	if (slotScopeId) {
+		const slotScopeIdList = slotScopeId.trim().split(" ");
+		for (let i = 0; i < slotScopeIdList.length; i++) appendScopeId(slotScopeIdList[i]);
+	}
 	push(openTag + `>`);
 	if (!isVoidTag(tag)) {
 		let hasChildrenOverride = false;
@@ -6655,15 +6850,18 @@ async function renderToString(input, context = {}) {
 	const vnode = createVNode(input._component, input._props);
 	vnode.appContext = input._context;
 	input.provide(ssrContextKey, context);
-	const result = await unrollBuffer$1(await renderComponentVNode(vnode));
-	await resolveTeleports(context);
-	if (context.__watcherHandles) for (const unwatch of context.__watcherHandles) unwatch();
-	return result;
+	try {
+		const result = await unrollBuffer$1(await renderComponentVNode(vnode));
+		await resolveTeleports(context);
+		return result;
+	} finally {
+		cleanupContext(context);
+	}
 }
 async function resolveTeleports(context) {
 	if (context.__teleportBuffers) {
 		context.teleports = context.teleports || {};
-		for (const key in context.__teleportBuffers) context.teleports[key] = await unrollBuffer$1(await Promise.all([context.__teleportBuffers[key]]));
+		for (const key in context.__teleportBuffers) context.teleports[key] = await unrollBuffer$1(context.__teleportBuffers[key]);
 	}
 }
 //#endregion
@@ -6680,7 +6878,7 @@ async function unrollBuffer(buffer, stream) {
 }
 function unrollBufferSync(buffer, stream) {
 	for (let i = 0; i < buffer.length; i++) {
-		let item = buffer[i];
+		const item = buffer[i];
 		if (isString(item)) stream.push(item);
 		else unrollBufferSync(item, stream);
 	}
@@ -6690,9 +6888,19 @@ function renderToSimpleStream(input, context, stream) {
 	const vnode = createVNode(input._component, input._props);
 	vnode.appContext = input._context;
 	input.provide(ssrContextKey, context);
-	Promise.resolve(renderComponentVNode(vnode)).then((buffer) => unrollBuffer(buffer, stream)).then(() => resolveTeleports(context)).then(() => {
-		if (context.__watcherHandles) for (const unwatch of context.__watcherHandles) unwatch();
-	}).then(() => stream.push(null)).catch((error) => {
+	let cleaned = false;
+	const finalize = () => {
+		if (cleaned) return;
+		cleaned = true;
+		cleanupContext(context);
+	};
+	Promise.resolve().then(() => renderComponentVNode(vnode)).then((buffer) => unrollBuffer(buffer, stream)).then(() => resolveTeleports(context)).then(() => {
+		finalize();
+		return stream.push(null);
+	}).catch((error) => {
+		try {
+			finalize();
+		} catch {}
 		stream.destroy(error);
 	});
 	return stream;