@vue/runtime-core 3.6.0-rc.6 → 3.6.0-rc.8

package/dist/runtime-core.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-rc.6
+  * @vue/runtime-core v3.6.0-rc.8
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -1317,7 +1317,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			else done();
 		},
 		clone(node) {
-			return cloneHooks(node);
+			return cloneHooks ? cloneHooks(node) : hooks;
 		}
 	};
 	return hooks;
@@ -2155,7 +2155,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();
@@ -2274,10 +2274,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) {
 			{
@@ -3120,37 +3120,32 @@ function createPropsRestProxy(props, excludedKeys) {
 function withAsyncContext(getAwaitable) {
 	const ctx = getCurrentGenericInstance();
 	const inSSRSetup = isInSSRComponentSetup;
-	const restoreAsyncContext = ctx && ctx.restoreAsyncContext ? ctx.restoreAsyncContext.bind(ctx) : void 0;
 	if (!ctx) warn$1("withAsyncContext called without active current instance. This is likely a bug.");
 	let awaitable = getAwaitable();
 	setCurrentInstance(null, void 0);
 	if (inSSRSetup) setInSSRSetupState(false);
 	const restore = () => {
-		const resetStoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
+		const stoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
 		setCurrentInstance(ctx);
 		if (inSSRSetup) setInSSRSetupState(true);
-		const reset = restoreAsyncContext && restoreAsyncContext();
-		return () => {
-			if (reset) reset();
-			if (resetStoppedScope) resetStoppedScope.reset();
-		};
+		return stoppedScope;
 	};
 	const cleanup = () => {
 		setCurrentInstance(null, void 0);
 		if (inSSRSetup) setInSSRSetupState(false);
 	};
 	if ((0, _vue_shared.isPromise)(awaitable)) awaitable = awaitable.catch((e) => {
-		const reset = restore();
+		const stoppedScope = restore();
 		Promise.resolve().then(() => Promise.resolve().then(() => {
-			if (reset) reset();
+			if (stoppedScope) stoppedScope.reset();
 			cleanup();
 		}));
 		throw e;
 	});
 	return [awaitable, () => {
-		const reset = restore();
+		const stoppedScope = restore();
 		Promise.resolve().then(() => {
-			if (reset) reset();
+			if (stoppedScope) stoppedScope.reset();
 			cleanup();
 		});
 	}];
@@ -4985,24 +4980,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) => {
@@ -5234,13 +5215,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();
@@ -6534,7 +6517,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.8";
 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-rc.6
+  * @vue/runtime-core v3.6.0-rc.8
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -916,7 +916,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			else done();
 		},
 		clone(node) {
-			return cloneHooks(node);
+			return cloneHooks ? cloneHooks(node) : hooks;
 		}
 	};
 	return hooks;
@@ -1610,7 +1610,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();
@@ -1727,10 +1727,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;
@@ -2433,36 +2433,31 @@ function createPropsRestProxy(props, excludedKeys) {
 function withAsyncContext(getAwaitable) {
 	const ctx = getCurrentGenericInstance();
 	const inSSRSetup = isInSSRComponentSetup;
-	const restoreAsyncContext = ctx && ctx.restoreAsyncContext ? ctx.restoreAsyncContext.bind(ctx) : void 0;
 	let awaitable = getAwaitable();
 	setCurrentInstance(null, void 0);
 	if (inSSRSetup) setInSSRSetupState(false);
 	const restore = () => {
-		const resetStoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
+		const stoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
 		setCurrentInstance(ctx);
 		if (inSSRSetup) setInSSRSetupState(true);
-		const reset = restoreAsyncContext && restoreAsyncContext();
-		return () => {
-			if (reset) reset();
-			if (resetStoppedScope) resetStoppedScope.reset();
-		};
+		return stoppedScope;
 	};
 	const cleanup = () => {
 		setCurrentInstance(null, void 0);
 		if (inSSRSetup) setInSSRSetupState(false);
 	};
 	if ((0, _vue_shared.isPromise)(awaitable)) awaitable = awaitable.catch((e) => {
-		const reset = restore();
+		const stoppedScope = restore();
 		Promise.resolve().then(() => Promise.resolve().then(() => {
-			if (reset) reset();
+			if (stoppedScope) stoppedScope.reset();
 			cleanup();
 		}));
 		throw e;
 	});
 	return [awaitable, () => {
-		const reset = restore();
+		const stoppedScope = restore();
 		Promise.resolve().then(() => {
-			if (reset) reset();
+			if (stoppedScope) stoppedScope.reset();
 			cleanup();
 		});
 	}];
@@ -3908,24 +3903,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) => {
@@ -4145,13 +4126,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();
@@ -5127,7 +5110,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.8";
 const warn = _vue_shared.NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.

package/dist/runtime-core.d.ts

@@ -624,7 +624,7 @@ export interface TransitionHooksContext {
   setLeavingNodeCache: (node: any) => void;
   unsetLeavingNodeCache: (node: any) => void;
   earlyRemove: () => void;
-  cloneHooks: (node: any) => TransitionHooks;
+  cloneHooks?: (node: any) => TransitionHooks;
 }
 export declare function resolveTransitionHooks(vnode: VNode, props: BaseTransitionProps<any>, state: TransitionState, instance: GenericComponentInstance, postClone?: (hooks: TransitionHooks) => void): TransitionHooks;
 export declare function setTransitionHooks(vnode: VNode, hooks: TransitionHooks): TransitionHooks;

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/runtime-core v3.6.0-rc.6
+  * @vue/runtime-core v3.6.0-rc.8
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -1328,7 +1328,7 @@ function baseResolveTransitionHooks(context, props, state, instance) {
 			else done();
 		},
 		clone(node) {
-			return cloneHooks(node);
+			return cloneHooks ? cloneHooks(node) : hooks;
 		}
 	};
 	return hooks;
@@ -2206,7 +2206,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();
@@ -2325,10 +2325,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) {
 			if (!!(process.env.NODE_ENV !== "production")) {
@@ -3171,37 +3171,32 @@ function createPropsRestProxy(props, excludedKeys) {
 function withAsyncContext(getAwaitable) {
 	const ctx = getCurrentGenericInstance();
 	const inSSRSetup = isInSSRComponentSetup;
-	const restoreAsyncContext = ctx && ctx.restoreAsyncContext ? ctx.restoreAsyncContext.bind(ctx) : void 0;
 	if (!!(process.env.NODE_ENV !== "production") && !ctx) warn$1("withAsyncContext called without active current instance. This is likely a bug.");
 	let awaitable = getAwaitable();
 	setCurrentInstance(null, void 0);
 	if (inSSRSetup) setInSSRSetupState(false);
 	const restore = () => {
-		const resetStoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
+		const stoppedScope = ctx && !ctx.scope.active ? ctx.scope : void 0;
 		setCurrentInstance(ctx);
 		if (inSSRSetup) setInSSRSetupState(true);
-		const reset = restoreAsyncContext && restoreAsyncContext();
-		return () => {
-			if (reset) reset();
-			if (resetStoppedScope) resetStoppedScope.reset();
-		};
+		return stoppedScope;
 	};
 	const cleanup = () => {
 		setCurrentInstance(null, void 0);
 		if (inSSRSetup) setInSSRSetupState(false);
 	};
 	if (isPromise(awaitable)) awaitable = awaitable.catch((e) => {
-		const reset = restore();
+		const stoppedScope = restore();
 		Promise.resolve().then(() => Promise.resolve().then(() => {
-			if (reset) reset();
+			if (stoppedScope) stoppedScope.reset();
 			cleanup();
 		}));
 		throw e;
 	});
 	return [awaitable, () => {
-		const reset = restore();
+		const stoppedScope = restore();
 		Promise.resolve().then(() => {
-			if (reset) reset();
+			if (stoppedScope) stoppedScope.reset();
 			cleanup();
 		});
 	}];
@@ -5086,24 +5081,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) => {
@@ -5335,13 +5316,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();
@@ -6656,7 +6639,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.8";
 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-rc.6",
+  "version": "3.6.0-rc.8",
   "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/reactivity": "3.6.0-rc.6",
-    "@vue/shared": "3.6.0-rc.6"
+    "@vue/shared": "3.6.0-rc.8",
+    "@vue/reactivity": "3.6.0-rc.8"
   }
 }