@vue/runtime-core 3.6.0-beta.13 → 3.6.0-beta.14

package/dist/runtime-core.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-beta.13
+  * @vue/runtime-core v3.6.0-beta.14
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -383,6 +383,7 @@ function flushJobs(seen) {
 		}
 		flushIndex = 0;
 		jobsLength = 0;
+		jobs.length = 0;
 		flushPostFlushCbs(seen);
 		currentFlushPromise = null;
 		if (jobsLength || postJobs.length) flushJobs(seen);
@@ -440,6 +441,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;
@@ -471,42 +480,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();
@@ -2480,6 +2516,7 @@ function renderSlot(slots, name, props = {}, fallback, noSlotted) {
 			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)) {
@@ -6195,7 +6232,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.13";
+const version = "3.6.0-beta.14";
 const warn = warn$1;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.

package/dist/runtime-core.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-beta.13
+  * @vue/runtime-core v3.6.0-beta.14
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -273,6 +273,7 @@ function flushJobs(seen) {
 		}
 		flushIndex = 0;
 		jobsLength = 0;
+		jobs.length = 0;
 		flushPostFlushCbs(seen);
 		currentFlushPromise = null;
 		if (jobsLength || postJobs.length) flushJobs(seen);
@@ -1967,6 +1968,7 @@ function renderSlot(slots, name, props = {}, fallback, noSlotted) {
 			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)) {
@@ -4891,7 +4893,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.13";
+const version = "3.6.0-beta.14";
 const warn = _vue_shared.NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-beta.13
+  * @vue/runtime-core v3.6.0-beta.14
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -389,6 +389,7 @@ function flushJobs(seen) {
 		}
 		flushIndex = 0;
 		jobsLength = 0;
+		jobs.length = 0;
 		flushPostFlushCbs(seen);
 		currentFlushPromise = null;
 		if (jobsLength || postJobs.length) flushJobs(seen);
@@ -446,6 +447,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;
@@ -477,42 +486,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();
@@ -2517,6 +2553,7 @@ function renderSlot(slots, name, props = {}, fallback, noSlotted) {
 			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)) {
@@ -6303,7 +6340,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.13";
+const version = "3.6.0-beta.14";
 const warn = !!(process.env.NODE_ENV !== "production") ? warn$1 : NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/runtime-core",
-  "version": "3.6.0-beta.13",
+  "version": "3.6.0-beta.14",
   "description": "@vue/runtime-core",
   "main": "index.js",
   "module": "dist/runtime-core.esm-bundler.js",
@@ -46,7 +46,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-core#readme",
   "dependencies": {
-    "@vue/shared": "3.6.0-beta.13",
-    "@vue/reactivity": "3.6.0-beta.13"
+    "@vue/shared": "3.6.0-beta.14",
+    "@vue/reactivity": "3.6.0-beta.14"
   }
 }