@vue/runtime-dom 3.6.0-beta.12 → 3.6.0-beta.14

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-dom v3.6.0-beta.12
+  * @vue/runtime-dom v3.6.0-beta.14
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -598,7 +598,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();
@@ -609,16 +623,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) => {

package/dist/runtime-dom.global.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-dom v3.6.0-beta.12
+  * @vue/runtime-dom v3.6.0-beta.14
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -1224,9 +1224,6 @@ var VueRuntimeDOM = (function(exports) {
 			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;
@@ -1339,10 +1336,11 @@ var VueRuntimeDOM = (function(exports) {
 			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;
@@ -2592,6 +2590,7 @@ var VueRuntimeDOM = (function(exports) {
 			}
 			flushIndex = 0;
 			jobsLength = 0;
+			jobs.length = 0;
 			flushPostFlushCbs(seen);
 			currentFlushPromise = null;
 			if (jobsLength || postJobs.length) flushJobs(seen);
@@ -2649,6 +2648,14 @@ var VueRuntimeDOM = (function(exports) {
 	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;
@@ -2680,42 +2687,69 @@ var VueRuntimeDOM = (function(exports) {
 		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();
@@ -3157,17 +3191,16 @@ var VueRuntimeDOM = (function(exports) {
 		},
 		remove(vnode, parentComponent, parentSuspense, { um: unmount, o: { remove: hostRemove } }, doRemove) {
 			const { shapeFlag, children, anchor, targetStart, targetAnchor, props } = vnode;
-			let shouldRemove = doRemove || !isTeleportDisabled(props);
+			const shouldRemove = doRemove || !isTeleportDisabled(props);
 			const pendingMount = pendingMounts.get(vnode);
 			if (pendingMount) {
 				pendingMount.flags |= 4;
 				pendingMounts.delete(vnode);
-				shouldRemove = false;
 			}
 			if (targetStart) hostRemove(targetStart);
 			if (targetAnchor) hostRemove(targetAnchor);
 			doRemove && hostRemove(anchor);
-			if (shapeFlag & 16) for (let i = 0; i < children.length; i++) {
+			if (!pendingMount && shapeFlag & 16) for (let i = 0; i < children.length; i++) {
 				const child = children[i];
 				unmount(child, parentComponent, parentSuspense, shouldRemove, !!child.dynamicChildren);
 			}
@@ -3819,15 +3852,11 @@ var VueRuntimeDOM = (function(exports) {
 				}
 				if (shapeFlag & 16 && !(props && (props.innerHTML || props.textContent))) {
 					let next = hydrateChildren(el.firstChild, vnode, el, parentComponent, parentSuspense, slotScopeIds, optimized);
-					let hasWarned = false;
+					if (next && !isMismatchAllowed(el, 1)) {
+						warn$1(`Hydration children mismatch on`, el, `\nServer rendered element contains more child nodes than client vdom.`);
+						logMismatchError();
+					}
 					while (next) {
-						if (!isMismatchAllowed(el, 1)) {
-							if (!hasWarned) {
-								warn$1(`Hydration children mismatch on`, el, `\nServer rendered element contains more child nodes than client vdom.`);
-								hasWarned = true;
-							}
-							logMismatchError();
-						}
 						const cur = next;
 						next = next.nextSibling;
 						remove(cur);
@@ -3866,7 +3895,7 @@ var VueRuntimeDOM = (function(exports) {
 			optimized = optimized || !!parentVNode.dynamicChildren;
 			const children = parentVNode.children;
 			const l = children.length;
-			let hasWarned = false;
+			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;
@@ -3880,12 +3909,12 @@ var VueRuntimeDOM = (function(exports) {
 					node = hydrateNode(node, vnode, parentComponent, parentSuspense, slotScopeIds, optimized);
 				} else if (isText && !vnode.children) insert(vnode.el = createText(""), container);
 				else {
-					if (!isMismatchAllowed(container, 1)) {
-						if (!hasWarned) {
+					if (!hasCheckedMismatch) {
+						hasCheckedMismatch = true;
+						if (!isMismatchAllowed(container, 1)) {
 							warn$1(`Hydration children mismatch on`, container, `\nServer rendered element contains fewer child nodes than client vdom.`);
-							hasWarned = true;
+							logMismatchError();
 						}
-						logMismatchError();
 					}
 					patch(null, vnode, container, null, parentComponent, parentSuspense, getContainerType(container), slotScopeIds);
 				}
@@ -4668,6 +4697,7 @@ var VueRuntimeDOM = (function(exports) {
 				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)) {
@@ -6898,8 +6928,10 @@ var VueRuntimeDOM = (function(exports) {
 					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();
 					});
@@ -7120,6 +7152,10 @@ var VueRuntimeDOM = (function(exports) {
 		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();
@@ -8366,7 +8402,7 @@ var VueRuntimeDOM = (function(exports) {
 	}
 	//#endregion
 	//#region packages/runtime-core/src/index.ts
-	const version = "3.6.0-beta.12";
+	const version = "3.6.0-beta.14";
 	const warn = warn$1;
 	/**
 	* Runtime error messages. Only exposed in dev or esm builds.
@@ -8974,7 +9010,21 @@ var VueRuntimeDOM = (function(exports) {
 		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();
@@ -8985,16 +9035,6 @@ var VueRuntimeDOM = (function(exports) {
 		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) => {