@vue/runtime-dom 3.6.0-beta.13 → 3.6.0-beta.15

package/dist/runtime-dom.global.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-dom v3.6.0-beta.13
+  * @vue/runtime-dom v3.6.0-beta.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -2158,8 +2158,9 @@ var VueRuntimeDOM = (function(exports) {
 			if (once && cb) {
 				const _cb = cb;
 				cb = (...args) => {
-					_cb(...args);
+					const res = _cb(...args);
 					this.stop();
+					return res;
 				};
 			}
 			this.cb = cb;
@@ -2173,7 +2174,7 @@ var VueRuntimeDOM = (function(exports) {
 			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;
@@ -2590,6 +2591,7 @@ var VueRuntimeDOM = (function(exports) {
 			}
 			flushIndex = 0;
 			jobsLength = 0;
+			jobs.length = 0;
 			flushPostFlushCbs(seen);
 			currentFlushPromise = null;
 			if (jobsLength || postJobs.length) flushJobs(seen);
@@ -2647,6 +2649,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;
@@ -2678,42 +2688,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();
@@ -4189,11 +4226,16 @@ var VueRuntimeDOM = (function(exports) {
 					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;
 				});
@@ -4251,14 +4293,22 @@ var VueRuntimeDOM = (function(exports) {
 			setPendingRequest: (request) => pendingRequest = request
 		};
 	}
-	const useAsyncComponentState = (delay, timeout, onError) => {
+	const useAsyncComponentState = (delay, timeout, onError, instance = currentInstance) => {
 		const loaded = /* @__PURE__ */ ref(false);
 		const error = /* @__PURE__ */ ref();
 		const delayed = /* @__PURE__ */ 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);
@@ -4661,6 +4711,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)) {
@@ -5514,12 +5565,13 @@ var VueRuntimeDOM = (function(exports) {
 						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 (hasChanged(value, emittedValue) && hasChanged(value, prevSetValue) && !hasChanged(emittedValue, prevEmittedValue)) trigger();
+					if (hasChanged(value, prevSetValue) && (hasChanged(value, emittedValue) && !hasChanged(emittedValue, prevEmittedValue) || hasVModel && prevSetValue !== EMPTY_OBJ && !hasChanged(emittedValue, localValue))) trigger();
 					prevSetValue = value;
 					prevEmittedValue = emittedValue;
 				}
@@ -8365,7 +8417,7 @@ var VueRuntimeDOM = (function(exports) {
 	}
 	//#endregion
 	//#region packages/runtime-core/src/index.ts
-	const version = "3.6.0-beta.13";
+	const version = "3.6.0-beta.15";
 	const warn = warn$1;
 	/**
 	* Runtime error messages. Only exposed in dev or esm builds.
@@ -9500,7 +9552,7 @@ var VueRuntimeDOM = (function(exports) {
 				prevChildren = [];
 				if (children) for (let i = 0; i < children.length; i++) {
 					const child = children[i];
-					if (child.el && child.el instanceof Element) {
+					if (child.el && child.el instanceof Element && !child.el[vShowHidden]) {
 						prevChildren.push(child);
 						setTransitionHooks(child, resolveTransitionHooks(child, cssTransitionProps, state, instance));
 						positionMap.set(child, getPosition(child.el));