@vue/compat 3.6.0-beta.11 → 3.6.0-beta.13

package/dist/vue-compat.d.ts

@@ -1025,9 +1025,9 @@ interface VaporInteropInterface {
   activate(vnode: VNode, container: any, anchor: any, parentComponent: ComponentInternalInstance): void;
   deactivate(vnode: VNode, container: any): void;
   setTransitionHooks(component: ComponentInternalInstance, transition: TransitionHooks): void;
-  vdomMount: (component: ConcreteComponent, parentComponent: any, props?: any, slots?: any) => any;
+  vdomMount: (component: ConcreteComponent, parentComponent: any, props?: any, slots?: any, once?: boolean) => any;
   vdomUnmount: UnmountComponentFn;
-  vdomSlot: (slots: any, name: string | (() => string), props: Record<string, any>, parentComponent: any, fallback?: any) => any;
+  vdomSlot: (slots: any, name: string | (() => string), props: Record<string, any>, parentComponent: any, fallback?: any, once?: boolean) => any;
   vdomMountVNode: (vnode: VNode, parentComponent: any) => any;
 }
 /**

package/dist/vue.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-beta.11
+  * @vue/compat v3.6.0-beta.13
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -566,6 +566,13 @@ function warn$2(msg, ...args) {
 const notifyBuffer = [];
 let batchDepth = 0;
 let activeSub = void 0;
+let runDepth = 0;
+function incRunDepth() {
+	++runDepth;
+}
+function decRunDepth() {
+	--runDepth;
+}
 let globalVersion = 0;
 let notifyIndex = 0;
 let notifyBufferLength = 0;
@@ -639,8 +646,10 @@ function propagate(link) {
 		const sub = link.sub;
 		let flags = sub.flags;
 		if (flags & 3) {
-			if (!(flags & 60)) sub.flags = flags | 32;
-			else if (!(flags & 12)) flags = 0;
+			if (!(flags & 60)) {
+				sub.flags = flags | 32;
+				if (runDepth) sub.flags |= 8;
+			} else if (!(flags & 12)) flags = 0;
 			else if (!(flags & 4)) sub.flags = flags & -9 | 32;
 			else if (!(flags & 48) && isValidLink(link, sub)) {
 				sub.flags = flags | 40;
@@ -709,13 +718,13 @@ function checkDirty(link, sub) {
 		let dirty = false;
 		if (sub.flags & 16) dirty = true;
 		else if ((depFlags & 17) === 17) {
+			const subs = dep.subs;
 			if (dep.update()) {
-				const subs = dep.subs;
 				if (subs.nextSub !== void 0) shallowPropagate(subs);
 				dirty = true;
 			}
 		} else if ((depFlags & 33) === 33) {
-			if (link.nextSub !== void 0 || link.prevSub !== void 0) stack = {
+			stack = {
 				value: link,
 				prev: stack
 			};
@@ -730,15 +739,12 @@ function checkDirty(link, sub) {
 		}
 		while (checkDepth) {
 			--checkDepth;
-			const firstSub = sub.subs;
-			const hasMultipleSubs = firstSub.nextSub !== void 0;
-			if (hasMultipleSubs) {
-				link = stack.value;
-				stack = stack.prev;
-			} else link = firstSub;
+			link = stack.value;
+			stack = stack.prev;
 			if (dirty) {
+				const subs = sub.subs;
 				if (sub.update()) {
-					if (hasMultipleSubs) shallowPropagate(firstSub);
+					if (subs.nextSub !== void 0) shallowPropagate(subs);
 					sub = link.sub;
 					continue;
 				}
@@ -750,7 +756,7 @@ function checkDirty(link, sub) {
 			}
 			dirty = false;
 		}
-		return dirty;
+		return dirty && !!sub.flags;
 	} while (true);
 }
 function shallowPropagate(link) {
@@ -1351,9 +1357,6 @@ function targetTypeMap(rawType) {
 		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;
@@ -1466,10 +1469,11 @@ function createReactiveObject(target, isReadonly, baseHandlers, collectionHandle
 		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;
@@ -1902,9 +1906,11 @@ var ReactiveEffect = class {
 		if (!this.active) return this.fn();
 		cleanup(this);
 		const prevSub = startTracking(this);
+		incRunDepth();
 		try {
 			return this.fn();
 		} finally {
+			decRunDepth();
 			endTracking(this, prevSub);
 			const flags = this.flags;
 			if ((flags & 136) === 136) {
@@ -3655,17 +3661,16 @@ const TeleportImpl = {
 	},
 	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);
 		}
@@ -4318,15 +4323,11 @@ function createHydrationFunctions(rendererInternals) {
 			}
 			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);
@@ -4365,7 +4366,7 @@ function createHydrationFunctions(rendererInternals) {
 		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;
@@ -4379,12 +4380,12 @@ function createHydrationFunctions(rendererInternals) {
 				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);
 			}
@@ -6323,7 +6324,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-beta.11`;
+	Vue.version = `2.6.14-compat:3.6.0-beta.13`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -8259,8 +8260,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 				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();
 				});
@@ -8483,6 +8486,10 @@ function invalidateMount(hooks) {
 	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();
@@ -9787,7 +9794,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.11";
+const version = "3.6.0-beta.13";
 const warn = warn$1;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -10385,7 +10392,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();
@@ -10396,16 +10417,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) => {
@@ -15464,12 +15475,9 @@ const transformFor = createStructuralDirectiveTransform("for", (node, dir, conte
 		const keyProp = findProp(node, `key`, false, true);
 		const isDirKey = keyProp && keyProp.type === 7;
 		let keyExp = keyProp && (keyProp.type === 6 ? keyProp.value ? createSimpleExpression(keyProp.value.content, true) : void 0 : keyProp.exp);
-		if (memo && keyExp && isDirKey) keyProp.exp = keyExp = processExpression(keyExp, context);
-		const keyProperty = keyProp && keyExp ? createObjectProperty(`key`, keyExp) : null;
-		if (isTemplate) {
-			if (memo) memo.exp = processExpression(memo.exp, context);
-			if (keyProperty && keyProp.type !== 6) keyProperty.value = processExpression(keyProperty.value, context);
-		}
+		const keyProperty = keyExp ? createObjectProperty(`key`, keyExp) : null;
+		if (isTemplate && memo) memo.exp = processExpression(memo.exp, context);
+		if ((isTemplate || memo) && keyProperty && isDirKey) keyExp = keyProp.exp = keyProperty.value = processExpression(keyProperty.value, context);
 		const isStableFragment = forNode.source.type === 4 && forNode.source.constType > 0;
 		const fragmentFlag = isStableFragment ? 64 : keyProp ? 128 : 256;
 		forNode.codegenNode = createVNodeCall(context, helper(FRAGMENT), void 0, renderExp, fragmentFlag, void 0, void 0, true, !isStableFragment, false, node.loc);

package/dist/vue.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compat v3.6.0-beta.11
+  * @vue/compat v3.6.0-beta.13
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -432,6 +432,13 @@ function getSequence(arr) {
 const notifyBuffer = [];
 let batchDepth = 0;
 let activeSub = void 0;
+let runDepth = 0;
+function incRunDepth() {
+	++runDepth;
+}
+function decRunDepth() {
+	--runDepth;
+}
 let globalVersion = 0;
 let notifyIndex = 0;
 let notifyBufferLength = 0;
@@ -505,8 +512,10 @@ function propagate(link) {
 		const sub = link.sub;
 		let flags = sub.flags;
 		if (flags & 3) {
-			if (!(flags & 60)) sub.flags = flags | 32;
-			else if (!(flags & 12)) flags = 0;
+			if (!(flags & 60)) {
+				sub.flags = flags | 32;
+				if (runDepth) sub.flags |= 8;
+			} else if (!(flags & 12)) flags = 0;
 			else if (!(flags & 4)) sub.flags = flags & -9 | 32;
 			else if (!(flags & 48) && isValidLink(link, sub)) {
 				sub.flags = flags | 40;
@@ -574,13 +583,13 @@ function checkDirty(link, sub) {
 		let dirty = false;
 		if (sub.flags & 16) dirty = true;
 		else if ((depFlags & 17) === 17) {
+			const subs = dep.subs;
 			if (dep.update()) {
-				const subs = dep.subs;
 				if (subs.nextSub !== void 0) shallowPropagate(subs);
 				dirty = true;
 			}
 		} else if ((depFlags & 33) === 33) {
-			if (link.nextSub !== void 0 || link.prevSub !== void 0) stack = {
+			stack = {
 				value: link,
 				prev: stack
 			};
@@ -595,15 +604,12 @@ function checkDirty(link, sub) {
 		}
 		while (checkDepth) {
 			--checkDepth;
-			const firstSub = sub.subs;
-			const hasMultipleSubs = firstSub.nextSub !== void 0;
-			if (hasMultipleSubs) {
-				link = stack.value;
-				stack = stack.prev;
-			} else link = firstSub;
+			link = stack.value;
+			stack = stack.prev;
 			if (dirty) {
+				const subs = sub.subs;
 				if (sub.update()) {
-					if (hasMultipleSubs) shallowPropagate(firstSub);
+					if (subs.nextSub !== void 0) shallowPropagate(subs);
 					sub = link.sub;
 					continue;
 				}
@@ -615,7 +621,7 @@ function checkDirty(link, sub) {
 			}
 			dirty = false;
 		}
-		return dirty;
+		return dirty && !!sub.flags;
 	} while (true);
 }
 function shallowPropagate(link) {
@@ -1187,9 +1193,6 @@ function targetTypeMap(rawType) {
 		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;
@@ -1299,10 +1302,11 @@ function shallowReadonly(target) {
 function createReactiveObject(target, isReadonly, baseHandlers, collectionHandlers, proxyMap) {
 	if (!isObject(target)) 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;
@@ -1720,9 +1724,11 @@ var ReactiveEffect = class {
 		if (!this.active) return this.fn();
 		cleanup(this);
 		const prevSub = startTracking(this);
+		incRunDepth();
 		try {
 			return this.fn();
 		} finally {
+			decRunDepth();
 			endTracking(this, prevSub);
 			const flags = this.flags;
 			if ((flags & 136) === 136) {
@@ -2916,17 +2922,16 @@ const TeleportImpl = {
 	},
 	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);
 		}
@@ -3550,8 +3555,8 @@ function createHydrationFunctions(rendererInternals) {
 			}
 			if (shapeFlag & 16 && !(props && (props.innerHTML || props.textContent))) {
 				let next = hydrateChildren(el.firstChild, vnode, el, parentComponent, parentSuspense, slotScopeIds, optimized);
+				if (next && !isMismatchAllowed(el, 1)) logMismatchError();
 				while (next) {
-					if (!isMismatchAllowed(el, 1)) logMismatchError();
 					const cur = next;
 					next = next.nextSibling;
 					remove(cur);
@@ -3587,6 +3592,7 @@ function createHydrationFunctions(rendererInternals) {
 		optimized = optimized || !!parentVNode.dynamicChildren;
 		const children = parentVNode.children;
 		const l = children.length;
+		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;
@@ -3600,7 +3606,10 @@ function createHydrationFunctions(rendererInternals) {
 				node = hydrateNode(node, vnode, parentComponent, parentSuspense, slotScopeIds, optimized);
 			} else if (isText && !vnode.children) insert(vnode.el = createText(""), container);
 			else {
-				if (!isMismatchAllowed(container, 1)) logMismatchError();
+				if (!hasCheckedMismatch) {
+					hasCheckedMismatch = true;
+					if (!isMismatchAllowed(container, 1)) logMismatchError();
+				}
 				patch(null, vnode, container, null, parentComponent, parentSuspense, getContainerType(container), slotScopeIds);
 			}
 		}
@@ -5244,7 +5253,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-beta.11`;
+	Vue.version = `2.6.14-compat:3.6.0-beta.13`;
 	Vue.config = singletonApp.config;
 	Vue.use = (plugin, ...options) => {
 		if (plugin && isFunction(plugin.install)) plugin.install(Vue, ...options);
@@ -6788,8 +6797,10 @@ function baseCreateRenderer(options, createHydrationFns) {
 				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();
 				});
@@ -7000,6 +7011,10 @@ function invalidateMount(hooks) {
 	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();
@@ -8010,7 +8025,7 @@ function isMemoSame(cached, memo) {
 }
 //#endregion
 //#region packages/runtime-core/src/index.ts
-const version = "3.6.0-beta.11";
+const version = "3.6.0-beta.13";
 const warn = NOOP;
 /**
 * Runtime error messages. Only exposed in dev or esm builds.
@@ -8598,22 +8613,26 @@ 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();
 	return invoker;
 }
-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) => {
@@ -13490,12 +13509,9 @@ const transformFor = createStructuralDirectiveTransform("for", (node, dir, conte
 		const keyProp = findProp(node, `key`, false, true);
 		const isDirKey = keyProp && keyProp.type === 7;
 		let keyExp = keyProp && (keyProp.type === 6 ? keyProp.value ? createSimpleExpression(keyProp.value.content, true) : void 0 : keyProp.exp);
-		if (memo && keyExp && isDirKey) keyProp.exp = keyExp = processExpression(keyExp, context);
-		const keyProperty = keyProp && keyExp ? createObjectProperty(`key`, keyExp) : null;
-		if (isTemplate) {
-			if (memo) memo.exp = processExpression(memo.exp, context);
-			if (keyProperty && keyProp.type !== 6) keyProperty.value = processExpression(keyProperty.value, context);
-		}
+		const keyProperty = keyExp ? createObjectProperty(`key`, keyExp) : null;
+		if (isTemplate && memo) memo.exp = processExpression(memo.exp, context);
+		if ((isTemplate || memo) && keyProperty && isDirKey) keyExp = keyProp.exp = keyProperty.value = processExpression(keyProperty.value, context);
 		const isStableFragment = forNode.source.type === 4 && forNode.source.constType > 0;
 		const fragmentFlag = isStableFragment ? 64 : keyProp ? 128 : 256;
 		forNode.codegenNode = createVNodeCall(context, helper(FRAGMENT), void 0, renderExp, fragmentFlag, void 0, void 0, true, !isStableFragment, false, node.loc);