@vue/compat 3.6.0-rc.6 → 3.6.0-rc.7

package/dist/vue-compat.d.ts

@@ -1050,15 +1050,13 @@ interface VaporInVdomInterface {
   setTransitionHooks(component: ComponentInternalInstance, transition: TransitionHooks): void;
 }
 /**
- * Options for rendering a VDOM slot inside vapor. The booleans describe the
- * outlet's position in the fallback chain; see renderVDOMSlot.
+ * Options for rendering a VDOM slot inside vapor. `flags` carries the
+ * outlet's VaporSlotFlags describing its position in the fallback chain;
+ * see renderVDOMSlot.
  */
 interface VdomSlotOptions {
   fallback?: (...args: any[]) => any;
-  once?: boolean;
-  slotRoot?: boolean;
-  sharedFallback?: boolean;
-  inheritFallback?: boolean;
+  flags?: number;
   adoptAnchor?: Node;
 }
 /**

package/dist/vue.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-rc.6
+  * @vue/compat v3.6.0-rc.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -4038,7 +4038,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			else done();
 		},
 		clone(node) {
-			return cloneHooks(node);
+			return cloneHooks ? cloneHooks(node) : hooks;
 		}
 	};
 	return hooks;
@@ -4876,7 +4876,7 @@ function defineAsyncComponent(source) {
 		name: "AsyncComponentWrapper",
 		__asyncLoader: load,
 		__asyncHydrate(el, instance, hydrate) {
-			performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy);
+			performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy, true);
 		},
 		get __asyncResolved() {
 			return getResolvedComp();
@@ -4995,10 +4995,10 @@ const useAsyncComponentState = (delay, timeout, onError, instance = currentInsta
 * shared between core and vapor
 * @internal
 */
-function performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy) {
+function performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy, skipIfUpdated) {
 	const wasConnected = el.isConnected;
 	let patched = false;
-	(instance.bu || (instance.bu = [])).push(() => patched = true);
+	if (skipIfUpdated) (instance.bu || (instance.bu = [])).push(() => patched = true);
 	const performHydrate = () => {
 		if (patched) {
 			{
@@ -6607,7 +6607,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
 		if (options.el) return vm.$mount(options.el);
 		else return vm;
 	}
-	Vue.version = `2.6.14-compat:3.6.0-rc.6`;
+	Vue.version = `2.6.14-compat:3.6.0-rc.7`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -8573,24 +8573,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 		}
 		if (moveType !== 2 && shapeFlag & 1 && transition) {
 			if (moveType === 0) performTransitionEnter(el, transition, () => hostInsert(el, container, anchor), parentSuspense, true);
-			else {
-				const { leave, delayLeave, afterLeave } = transition;
-				const remove = () => {
-					if (vnode.ctx.isUnmounted) hostRemove(el);
-					else hostInsert(el, container, anchor);
-				};
-				const performLeave = () => {
-					const wasLeaving = el._isLeaving || !!el[leaveCbKey];
-					if (el._isLeaving) el[leaveCbKey](true);
-					if (transition.persisted && !wasLeaving) remove();
-					else leave(el, () => {
-						remove();
-						afterLeave && afterLeave();
-					});
-				};
-				if (delayLeave) delayLeave(el, remove, performLeave);
-				else performLeave();
-			}
+			else performTransitionLeave(el, transition, () => {
+				if (vnode.ctx.isUnmounted) hostRemove(el);
+				else hostInsert(el, container, anchor);
+			}, true, true);
 		} else hostInsert(el, container, anchor);
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
@@ -8824,13 +8810,15 @@ function performTransitionEnter(el, transition, insert, parentSuspense, force =
 function performTransitionLeave(el, transition, remove, isElement = true, force = false) {
 	const performRemove = () => {
 		remove();
-		if (transition && !transition.persisted && transition.afterLeave) transition.afterLeave();
+		if (transition && (force || !transition.persisted) && transition.afterLeave) transition.afterLeave();
 	};
 	if (force || isElement && transition && !transition.persisted) {
 		const { leave, delayLeave } = transition;
 		const performLeave = () => {
+			const wasLeaving = el._isLeaving || !!el[leaveCbKey];
 			if (el._isLeaving && force) el[leaveCbKey](true);
-			leave(el, performRemove);
+			if (force && transition.persisted && !wasLeaving) remove();
+			else leave(el, performRemove);
 		};
 		if (delayLeave) delayLeave(el, performRemove, performLeave);
 		else performLeave();
@@ -10172,7 +10160,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-rc.6";
+const version = "3.6.0-rc.7";
 const warn = warn$1;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -11109,13 +11097,11 @@ var VueElementBase = class VueElementBase extends BaseClass {
 	_renderSlots() {
 		const outlets = this._getSlots();
 		const scopeId = this._instance.type.__scopeId;
-		const slotReplacements = /* @__PURE__ */ new Map();
 		for (let i = 0; i < outlets.length; i++) {
 			const o = outlets[i];
 			const slotName = o.getAttribute("name") || "default";
 			const content = this._slots[slotName];
 			const parent = o.parentNode;
-			const replacementNodes = [];
 			if (content) for (const n of content) {
 				if (scopeId && n.nodeType === 1) {
 					const id = scopeId + "-s";
@@ -11125,20 +11111,10 @@ var VueElementBase = class VueElementBase extends BaseClass {
 					while (child = walker.nextNode()) child.setAttribute(id, "");
 				}
 				parent.insertBefore(n, o);
-				replacementNodes.push(n);
-			}
-			else while (o.firstChild) {
-				const child = o.firstChild;
-				parent.insertBefore(child, o);
-				replacementNodes.push(child);
 			}
+			else while (o.firstChild) parent.insertBefore(o.firstChild, o);
 			parent.removeChild(o);
-			slotReplacements.set(o, {
-				nodes: replacementNodes,
-				usedFallback: !content
-			});
 		}
-		this._updateSlotNodes(slotReplacements);
 	}
 	/**
 	* @internal
@@ -11177,7 +11153,7 @@ var VueElementBase = class VueElementBase extends BaseClass {
 	* @internal
 	*/
 	_hasShadowRoot() {
-		return this._def.shadowRoot !== false;
+		return this._root !== this;
 	}
 	/**
 	* @internal
@@ -11222,10 +11198,6 @@ var VueElement = class extends VueElementBase {
 		if (this._instance && this._instance.ce) this._instance.ce = void 0;
 		this._app = this._instance = null;
 	}
-	/**
-	* Only called when shadowRoot is false
-	*/
-	_updateSlotNodes(replacements) {}
 	_createVNode() {
 		const baseProps = {};
 		if (!this.shadowRoot) baseProps.onVnodeMounted = baseProps.onVnodeUpdated = this._renderSlots.bind(this);

package/dist/vue.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-rc.6
+  * @vue/compat v3.6.0-rc.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -3245,7 +3245,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			else done();
 		},
 		clone(node) {
-			return cloneHooks(node);
+			return cloneHooks ? cloneHooks(node) : hooks;
 		}
 	};
 	return hooks;
@@ -3939,7 +3939,7 @@ function defineAsyncComponent(source) {
 		name: "AsyncComponentWrapper",
 		__asyncLoader: load,
 		__asyncHydrate(el, instance, hydrate) {
-			performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy);
+			performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy, true);
 		},
 		get __asyncResolved() {
 			return getResolvedComp();
@@ -4056,10 +4056,10 @@ const useAsyncComponentState = (delay, timeout, onError, instance = currentInsta
 * shared between core and vapor
 * @internal
 */
-function performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy) {
+function performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy, skipIfUpdated) {
 	const wasConnected = el.isConnected;
 	let patched = false;
-	(instance.bu || (instance.bu = [])).push(() => patched = true);
+	if (skipIfUpdated) (instance.bu || (instance.bu = [])).push(() => patched = true);
 	const performHydrate = () => {
 		if (patched) return;
 		if (!el.parentNode || wasConnected && !el.isConnected) return;
@@ -5458,7 +5458,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
 		if (options.el) return vm.$mount(options.el);
 		else return vm;
 	}
-	Vue.version = `2.6.14-compat:3.6.0-rc.6`;
+	Vue.version = `2.6.14-compat:3.6.0-rc.7`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -7030,24 +7030,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 		}
 		if (moveType !== 2 && shapeFlag & 1 && transition) {
 			if (moveType === 0) performTransitionEnter(el, transition, () => hostInsert(el, container, anchor), parentSuspense, true);
-			else {
-				const { leave, delayLeave, afterLeave } = transition;
-				const remove = () => {
-					if (vnode.ctx.isUnmounted) hostRemove(el);
-					else hostInsert(el, container, anchor);
-				};
-				const performLeave = () => {
-					const wasLeaving = el._isLeaving || !!el[leaveCbKey];
-					if (el._isLeaving) el[leaveCbKey](true);
-					if (transition.persisted && !wasLeaving) remove();
-					else leave(el, () => {
-						remove();
-						afterLeave && afterLeave();
-					});
-				};
-				if (delayLeave) delayLeave(el, remove, performLeave);
-				else performLeave();
-			}
+			else performTransitionLeave(el, transition, () => {
+				if (vnode.ctx.isUnmounted) hostRemove(el);
+				else hostInsert(el, container, anchor);
+			}, true, true);
 		} else hostInsert(el, container, anchor);
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
@@ -7269,13 +7255,15 @@ function performTransitionEnter(el, transition, insert, parentSuspense, force =
 function performTransitionLeave(el, transition, remove, isElement = true, force = false) {
 	const performRemove = () => {
 		remove();
-		if (transition && !transition.persisted && transition.afterLeave) transition.afterLeave();
+		if (transition && (force || !transition.persisted) && transition.afterLeave) transition.afterLeave();
 	};
 	if (force || isElement && transition && !transition.persisted) {
 		const { leave, delayLeave } = transition;
 		const performLeave = () => {
+			const wasLeaving = el._isLeaving || !!el[leaveCbKey];
 			if (el._isLeaving && force) el[leaveCbKey](true);
-			leave(el, performRemove);
+			if (force && transition.persisted && !wasLeaving) remove();
+			else leave(el, performRemove);
 		};
 		if (delayLeave) delayLeave(el, performRemove, performLeave);
 		else performLeave();
@@ -8298,7 +8286,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-rc.6";
+const version = "3.6.0-rc.7";
 const warn = NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -9197,13 +9185,11 @@ var VueElementBase = class VueElementBase extends BaseClass {
 	_renderSlots() {
 		const outlets = this._getSlots();
 		const scopeId = this._instance.type.__scopeId;
-		const slotReplacements = /* @__PURE__ */ new Map();
 		for (let i = 0; i < outlets.length; i++) {
 			const o = outlets[i];
 			const slotName = o.getAttribute("name") || "default";
 			const content = this._slots[slotName];
 			const parent = o.parentNode;
-			const replacementNodes = [];
 			if (content) for (const n of content) {
 				if (scopeId && n.nodeType === 1) {
 					const id = scopeId + "-s";
@@ -9213,20 +9199,10 @@ var VueElementBase = class VueElementBase extends BaseClass {
 					while (child = walker.nextNode()) child.setAttribute(id, "");
 				}
 				parent.insertBefore(n, o);
-				replacementNodes.push(n);
-			}
-			else while (o.firstChild) {
-				const child = o.firstChild;
-				parent.insertBefore(child, o);
-				replacementNodes.push(child);
 			}
+			else while (o.firstChild) parent.insertBefore(o.firstChild, o);
 			parent.removeChild(o);
-			slotReplacements.set(o, {
-				nodes: replacementNodes,
-				usedFallback: !content
-			});
 		}
-		this._updateSlotNodes(slotReplacements);
 	}
 	/**
 	* @internal
@@ -9265,7 +9241,7 @@ var VueElementBase = class VueElementBase extends BaseClass {
 	* @internal
 	*/
 	_hasShadowRoot() {
-		return this._def.shadowRoot !== false;
+		return this._root !== this;
 	}
 	/**
 	* @internal
@@ -9298,10 +9274,6 @@ var VueElement = class extends VueElementBase {
 		if (this._instance && this._instance.ce) this._instance.ce = void 0;
 		this._app = this._instance = null;
 	}
-	/**
-	* Only called when shadowRoot is false
-	*/
-	_updateSlotNodes(replacements) {}
 	_createVNode() {
 		const baseProps = {};
 		if (!this.shadowRoot) baseProps.onVnodeMounted = baseProps.onVnodeUpdated = this._renderSlots.bind(this);

package/dist/vue.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-rc.6
+  * @vue/compat v3.6.0-rc.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -3975,7 +3975,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			else done();
 		},
 		clone(node) {
-			return cloneHooks(node);
+			return cloneHooks ? cloneHooks(node) : hooks;
 		}
 	};
 	return hooks;
@@ -4813,7 +4813,7 @@ function defineAsyncComponent(source) {
 		name: "AsyncComponentWrapper",
 		__asyncLoader: load,
 		__asyncHydrate(el, instance, hydrate) {
-			performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy);
+			performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy, true);
 		},
 		get __asyncResolved() {
 			return getResolvedComp();
@@ -4932,10 +4932,10 @@ const useAsyncComponentState = (delay, timeout, onError, instance = currentInsta
 * shared between core and vapor
 * @internal
 */
-function performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy) {
+function performAsyncHydrate(el, instance, hydrate, getResolvedComp, load, hydrateStrategy, skipIfUpdated) {
 	const wasConnected = el.isConnected;
 	let patched = false;
-	(instance.bu || (instance.bu = [])).push(() => patched = true);
+	if (skipIfUpdated) (instance.bu || (instance.bu = [])).push(() => patched = true);
 	const performHydrate = () => {
 		if (patched) {
 			{
@@ -6539,7 +6539,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
 		if (options.el) return vm.$mount(options.el);
 		else return vm;
 	}
-	Vue.version = `2.6.14-compat:3.6.0-rc.6`;
+	Vue.version = `2.6.14-compat:3.6.0-rc.7`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -8505,24 +8505,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 		}
 		if (moveType !== 2 && shapeFlag & 1 && transition) {
 			if (moveType === 0) performTransitionEnter(el, transition, () => hostInsert(el, container, anchor), parentSuspense, true);
-			else {
-				const { leave, delayLeave, afterLeave } = transition;
-				const remove = () => {
-					if (vnode.ctx.isUnmounted) hostRemove(el);
-					else hostInsert(el, container, anchor);
-				};
-				const performLeave = () => {
-					const wasLeaving = el._isLeaving || !!el[leaveCbKey];
-					if (el._isLeaving) el[leaveCbKey](true);
-					if (transition.persisted && !wasLeaving) remove();
-					else leave(el, () => {
-						remove();
-						afterLeave && afterLeave();
-					});
-				};
-				if (delayLeave) delayLeave(el, remove, performLeave);
-				else performLeave();
-			}
+			else performTransitionLeave(el, transition, () => {
+				if (vnode.ctx.isUnmounted) hostRemove(el);
+				else hostInsert(el, container, anchor);
+			}, true, true);
 		} else hostInsert(el, container, anchor);
 	};
 	const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
@@ -8756,13 +8742,15 @@ function performTransitionEnter(el, transition, insert, parentSuspense, force =
 function performTransitionLeave(el, transition, remove, isElement = true, force = false) {
 	const performRemove = () => {
 		remove();
-		if (transition && !transition.persisted && transition.afterLeave) transition.afterLeave();
+		if (transition && (force || !transition.persisted) && transition.afterLeave) transition.afterLeave();
 	};
 	if (force || isElement && transition && !transition.persisted) {
 		const { leave, delayLeave } = transition;
 		const performLeave = () => {
+			const wasLeaving = el._isLeaving || !!el[leaveCbKey];
 			if (el._isLeaving && force) el[leaveCbKey](true);
-			leave(el, performRemove);
+			if (force && transition.persisted && !wasLeaving) remove();
+			else leave(el, performRemove);
 		};
 		if (delayLeave) delayLeave(el, performRemove, performLeave);
 		else performLeave();
@@ -10093,7 +10081,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-rc.6";
+const version = "3.6.0-rc.7";
 const warn = warn$1;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -11090,13 +11078,11 @@ var VueElementBase = class VueElementBase extends BaseClass {
 	_renderSlots() {
 		const outlets = this._getSlots();
 		const scopeId = this._instance.type.__scopeId;
-		const slotReplacements = /* @__PURE__ */ new Map();
 		for (let i = 0; i < outlets.length; i++) {
 			const o = outlets[i];
 			const slotName = o.getAttribute("name") || "default";
 			const content = this._slots[slotName];
 			const parent = o.parentNode;
-			const replacementNodes = [];
 			if (content) for (const n of content) {
 				if (scopeId && n.nodeType === 1) {
 					const id = scopeId + "-s";
@@ -11106,20 +11092,10 @@ var VueElementBase = class VueElementBase extends BaseClass {
 					while (child = walker.nextNode()) child.setAttribute(id, "");
 				}
 				parent.insertBefore(n, o);
-				replacementNodes.push(n);
-			}
-			else while (o.firstChild) {
-				const child = o.firstChild;
-				parent.insertBefore(child, o);
-				replacementNodes.push(child);
 			}
+			else while (o.firstChild) parent.insertBefore(o.firstChild, o);
 			parent.removeChild(o);
-			slotReplacements.set(o, {
-				nodes: replacementNodes,
-				usedFallback: !content
-			});
 		}
-		this._updateSlotNodes(slotReplacements);
 	}
 	/**
 	* @internal
@@ -11158,7 +11134,7 @@ var VueElementBase = class VueElementBase extends BaseClass {
 	* @internal
 	*/
 	_hasShadowRoot() {
-		return this._def.shadowRoot !== false;
+		return this._root !== this;
 	}
 	/**
 	* @internal
@@ -11203,10 +11179,6 @@ var VueElement = class extends VueElementBase {
 		if (this._instance && this._instance.ce) this._instance.ce = void 0;
 		this._app = this._instance = null;
 	}
-	/**
-	* Only called when shadowRoot is false
-	*/
-	_updateSlotNodes(replacements) {}
 	_createVNode() {
 		const baseProps = {};
 		if (!this.shadowRoot) baseProps.onVnodeMounted = baseProps.onVnodeUpdated = this._renderSlots.bind(this);