@dcloudio/uni-cli-shared 3.0.0-alpha-5000720260416001 → 3.0.0-alpha-5000820260420001

package/lib/dom2/app/@vue/compiler-sfc/dist/compiler-sfc.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-sfc v3.6.0-beta.5
+  * @vue/compiler-sfc v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -24914,7 +24914,7 @@ function wrapTemplate(node, dirs) {
 	const reserved = [];
 	const pass = [];
 	node.props.forEach((prop) => {
-		if (prop.type === 7 && dirs.includes(prop.name)) reserved.push(prop);
+		if (prop.type === 7 && (dirs.includes(prop.name) || prop.name === "bind" && prop.arg && prop.arg.type === 4 && prop.arg.content === "key" && dirs.includes("key"))) reserved.push(prop);
 		else pass.push(prop);
 	});
 	return extend({}, node, {
@@ -24974,13 +24974,6 @@ function getLiteralExpressionValue(exp, excludeNumber) {
 	}
 	return exp.isStatic ? exp.content : null;
 }
-function isInTransition(context) {
-	const parentNode = context.parent && context.parent.node;
-	return !!(parentNode && isTransitionNode(parentNode));
-}
-function isTransitionNode(node) {
-	return node.type === 1 && isTransitionTag(node.tag);
-}
 function isTransitionTag(tag) {
 	tag = tag.toLowerCase();
 	return tag === "transition" || tag === "vaportransition";
@@ -25447,12 +25440,14 @@ const IRNodeTypes = {
 	"14": "IF",
 	"FOR": 15,
 	"15": "FOR",
-	"GET_TEXT_CHILD": 16,
-	"16": "GET_TEXT_CHILD",
-	"GET_INSERTION_PARENT": 17,
-	"17": "GET_INSERTION_PARENT",
-	"SET_CHANGE_PROP": 18,
-	"18": "SET_CHANGE_PROP"
+	"KEY": 16,
+	"16": "KEY",
+	"GET_TEXT_CHILD": 17,
+	"17": "GET_TEXT_CHILD",
+	"GET_INSERTION_PARENT": 18,
+	"18": "GET_INSERTION_PARENT",
+	"SET_CHANGE_PROP": 19,
+	"19": "SET_CHANGE_PROP"
 };
 const DynamicFlag = {
 	"NONE": 0,
@@ -25466,7 +25461,7 @@ const DynamicFlag = {
 };
 function isBlockOperation(op) {
 	const type = op.type;
-	return type === 11 || type === 12 || type === 14 || type === 15;
+	return type === 11 || type === 12 || type === 14 || type === 16 || type === 15;
 }
 
 //#endregion
@@ -26724,7 +26719,7 @@ function genSlotBlockWithProps(oper, context) {
 	let propsName;
 	let exitScope;
 	let depth;
-	const { props, key, node } = oper;
+	const { props, node } = oper;
 	const idToPathMap = props ? parseValueDestructure(props, context) : /* @__PURE__ */ new Map();
 	if (props) if (props.ast) {
 		[depth, exitScope] = context.enterScope();
@@ -26734,16 +26729,6 @@ function genSlotBlockWithProps(oper, context) {
 	if (propsName) idMap[propsName] = null;
 	let blockFn = context.withId(() => genBlock(oper, context, propsName ? [propsName] : []), idMap);
 	exitScope && exitScope();
-	if (key) blockFn = [
-		`() => {`,
-		INDENT_START,
-		NEWLINE,
-		`return `,
-		...genCall(context.helper("createKeyedFragment"), [`() => `, ...genExpression(key, context)], blockFn),
-		INDENT_END,
-		NEWLINE,
-		`}`
-	];
 	if (node.type === 1) {
 		if (needsVaporCtx(oper)) blockFn = [
 			`${context.helper("withVaporCtx")}(`,
@@ -26817,6 +26802,20 @@ function genSlotOutlet(oper, context) {
 	return frag;
 }
 
+//#endregion
+//#region packages/compiler-vapor/src/generators/key.ts
+function genKey(oper, context) {
+	const { id, value, block } = oper;
+	const [frag, push] = buildCodeFragment();
+	const blockFn = genBlock(block, context);
+	push(NEWLINE, `const n${id} = `, ...genCall(context.helper("createKeyedFragment"), [
+		`() => (`,
+		...genExpression(value, context),
+		")"
+	], blockFn));
+	return frag;
+}
+
 //#endregion
 //#region packages/compiler-vapor/src/generators/operation.ts
 function genOperations(opers, context) {
@@ -26843,12 +26842,13 @@ function genOperation(oper, context) {
 		case 10: return genPrependNode(oper, context);
 		case 14: return genIf(oper, context);
 		case 15: return genFor(oper, context);
+		case 16: return genKey(oper, context);
 		case 11: return genCreateComponent(oper, context);
 		case 12: return genSlotOutlet(oper, context);
 		case 13: return genBuiltinDirective(oper, context);
-		case 16: return genGetTextChild(oper, context);
-		case 17: return [];
+		case 17: return genGetTextChild(oper, context);
 		case 18: return [];
+		case 19: return [];
 		default:
 			const exhaustiveCheck = oper;
 			throw new Error(`Unhandled operation type in genOperation: ${exhaustiveCheck}`);
@@ -27336,11 +27336,13 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
 	let template = "";
 	template += `<${tag}`;
 	if (scopeId) template += ` ${scopeId}`;
-	if (isDom2 && singleRoot) {
-		template += ` gen-flag-flatten=""`;
-		const rootElementTagName = context.options.rootElementTagName;
-		if (rootElementTagName || context.options.genVueId) template += ` gen-vue-id=""`;
-		if (rootElementTagName) template += ` custom-tag-name="${rootElementTagName}"`;
+	if (isDom2) {
+		if (context.effectiveParent === context.root) template += ` gen-vue-id=""`;
+		if (singleRoot) {
+			template += ` gen-flag-flatten=""`;
+			const rootElementTagName = context.options.rootElementTagName;
+			if (rootElementTagName) template += ` custom-tag-name="${rootElementTagName}"`;
+		}
 	}
 	const dynamicProps = [];
 	if (propsResult[0]) {
@@ -27386,7 +27388,7 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
 					dynamicProps.push(key.content);
 					values[0].isStatic = false;
 					context.registerEffect(values, {
-						type: 18,
+						type: 19,
 						node,
 						prop
 					}, getEffectIndex);
@@ -27608,7 +27610,7 @@ const transformVText = (dir, node, context) => {
 		context.childrenTemplate = [context.options.platform ? TEXT_PLACEHOLDER : " "];
 		const isComponent = node.tagType === 1;
 		if (!isComponent) context.registerOperation({
-			type: 16,
+			type: 17,
 			node,
 			parent: context.reference()
 		});
@@ -27843,7 +27845,7 @@ function processTextContainer(children, context) {
 	else {
 		context.childrenTemplate = [context.options.platform ? TEXT_PLACEHOLDER : " "];
 		context.registerOperation({
-			type: 16,
+			type: 17,
 			node: context.node,
 			parent: context.reference()
 		});
@@ -27988,7 +27990,7 @@ function processIf(node, dir, context) {
 				id,
 				condition: dir.exp,
 				positive: branch,
-				index: isInTransition(context) ? context.root.nextIfIndex() : void 0,
+				index: context.root.nextIfIndex(),
 				once: context.inVOnce || isStaticExpression(dir.exp, context.options.bindingMetadata)
 			};
 		};
@@ -28022,7 +28024,7 @@ function processIf(node, dir, context) {
 			id: -1,
 			condition: dir.exp,
 			positive: branch,
-			index: isInTransition(context) ? context.root.nextIfIndex() : void 0,
+			index: context.root.nextIfIndex(),
 			once: context.inVOnce || isStaticExpression(dir.exp, context.options.bindingMetadata)
 		};
 		return () => onExit();
@@ -28059,7 +28061,7 @@ function processFor(node, dir, context) {
 	const typeProp = findProp(node, "type");
 	const typeProperty = typeProp && propToExpression(typeProp);
 	const isComponent = node.tagType === 1 || isTemplateWithSingleComponent(node);
-	context.node = node = wrapTemplate(node, ["for"]);
+	context.node = node = wrapTemplate(node, ["for", "key"]);
 	context.dynamic.flags |= 6;
 	const id = context.reference();
 	const render = newBlock(node);
@@ -28176,13 +28178,6 @@ function transformComponentSlot(node, dir, context) {
 		markNonTemplate(n, context);
 	});
 	const [block, onExit] = createSlotBlock(node, dir, context);
-	if (isTransitionNode(node) && nonSlotTemplateChildren.length) {
-		const nonCommentChild = nonSlotTemplateChildren.find((n) => !isCommentOrWhitespace(n));
-		if (nonCommentChild) {
-			const keyProp = findProp(nonCommentChild, "key");
-			if (keyProp) block.key = keyProp.exp;
-		}
-	}
 	const { slots } = context;
 	return () => {
 		onExit();
@@ -28301,6 +28296,32 @@ function hasMultipleChildren(node) {
 	return children.length > 1;
 }
 
+//#endregion
+//#region packages/compiler-vapor/src/transforms/transformKey.ts
+const transformKey = (node, context) => {
+	if (node.type !== 1 || context.inVOnce || findDir(node, "for")) return;
+	const dir = findProp(node, "key", true, true);
+	if (!dir || dir.type === 6) return;
+	let value;
+	value = dir.exp || normalizeBindShorthand(dir.arg, context);
+	if (isStaticExpression(value, context.options.bindingMetadata)) return;
+	let id = context.reference();
+	context.dynamic.flags |= 6;
+	context.node = node = wrapTemplate(node, ["key"]);
+	const block = newBlock(node);
+	const exitBlock = context.enterBlock(block);
+	return () => {
+		exitBlock();
+		context.dynamic.operation = {
+			type: 16,
+			node,
+			id,
+			value,
+			block
+		};
+	};
+};
+
 //#endregion
 //#region packages/compiler-vapor/src/compile.ts
 function compile$1(source, options = {}) {
@@ -28325,6 +28346,7 @@ function getBaseTransformPreset() {
 		transformVOnce,
 		transformVIf,
 		transformVFor,
+		transformKey,
 		transformSlotOutlet,
 		transformTemplateRef,
 		transformElement,
@@ -28409,6 +28431,7 @@ var src_exports$1 = /* @__PURE__ */ __exportAll({
 	transformChildren: () => transformChildren,
 	transformComment: () => transformComment,
 	transformElement: () => transformElement,
+	transformKey: () => transformKey,
 	transformSlotOutlet: () => transformSlotOutlet,
 	transformTemplateRef: () => transformTemplateRef,
 	transformText: () => transformText,
@@ -39422,7 +39445,7 @@ function resolveParserPlugins(lang, userPlugins, dts = false) {
 	if (!userPlugins || !userPlugins.some((p) => p === "importAssertions" || p === "importAttributes" || isArray$3(p) && p[0] === "importAttributes")) plugins.push("importAttributes");
 	if (lang === "jsx" || lang === "tsx" || lang === "mtsx") plugins.push("jsx");
 	else if (userPlugins) userPlugins = userPlugins.filter((p) => p !== "jsx");
-	if (lang === "uts" || lang === "ts" || lang === "mts" || lang === "tsx" || lang === "mtsx") {
+	if (lang === "uts" || lang === "ts" || lang === "mts" || lang === "tsx" || lang === "cts" || lang === "mtsx") {
 		plugins.push(["typescript", { dts }], "explicitResourceManagement");
 		if (!userPlugins || !userPlugins.includes("decorators")) plugins.push("decorators-legacy");
 	}
@@ -39926,11 +39949,17 @@ function importSourceToScope(ctx, node, scope, source) {
 	} else return ctx.error(`Failed to resolve import source ${JSON.stringify(source)}.`, node, scope);
 }
 function resolveExt(filename, fs) {
-	filename = filename.replace(/\.js$/, "");
+	let moduleType = "u";
+	if (filename.endsWith(".mjs")) moduleType = "m";
+	else if (filename.endsWith(".cjs")) moduleType = "c";
+	filename = filename.replace(/\.[cm]?jsx?$/, "");
 	const tryResolve = (filename) => {
 		if (fs.fileExists(filename)) return filename;
 	};
-	return tryResolve(filename) || tryResolve(filename + `.ts`) || tryResolve(filename + `.tsx`) || tryResolve(filename + `.d.ts`) || tryResolve(joinPaths(filename, `index.ts`)) || tryResolve(joinPaths(filename, `index.tsx`)) || tryResolve(joinPaths(filename, `index.d.ts`));
+	const resolveTs = () => tryResolve(filename + `.uts`) || tryResolve(filename + `.ts`) || tryResolve(filename + `.tsx`) || tryResolve(filename + `.d.ts`);
+	const resolveMts = () => tryResolve(filename + `.mts`) || tryResolve(filename + `.d.mts`);
+	const resolveCts = () => tryResolve(filename + `.cts`) || tryResolve(filename + `.d.cts`);
+	return tryResolve(filename) || (moduleType === "m" ? resolveMts() || resolveTs() : moduleType === "c" ? resolveCts() || resolveTs() : resolveTs() || resolveMts() || resolveCts()) || tryResolve(joinPaths(filename, `index.uts`)) || tryResolve(joinPaths(filename, `index.ts`)) || tryResolve(joinPaths(filename, `index.tsx`)) || tryResolve(joinPaths(filename, `index.d.ts`));
 }
 const tsConfigCache = createCache();
 const tsConfigRefMap = /* @__PURE__ */ new Map();
@@ -39958,8 +39987,8 @@ function fileToScope(ctx, filename, asGlobal = false) {
 }
 function parseFile(filename, content, fs, parserPlugins) {
 	const ext = extname(filename);
-	if (ext === ".uts" || ext === ".ts" || ext === ".mts" || ext === ".tsx" || ext === ".mtsx") return (0, import_lib.parse)(content, {
-		plugins: resolveParserPlugins(ext.slice(1), parserPlugins, /\.d\.m?ts$/.test(filename)),
+	if (ext === ".uts" || ext === ".ts" || ext === ".mts" || ext === ".tsx" || ext === ".cts" || ext === ".mtsx") return (0, import_lib.parse)(content, {
+		plugins: resolveParserPlugins(ext.slice(1), parserPlugins, /\.d\.[cm]?ts$/.test(filename)),
 		sourceType: "module"
 	}).program.body;
 	const isUnknownTypeSource = !/\.[cm]?[tj]sx?$/.test(filename);
@@ -40589,7 +40618,18 @@ function genRuntimePropFromType(ctx, { key, required, type, skipCheck }, hasStat
 			return resolveObjectKey(node.key, node.computed) === key;
 		});
 		if (prop) if (prop.type === "ObjectProperty") defaultString = `default: ${ctx.getString(prop.value)}`;
-		else defaultString = `${prop.async ? "async " : ""}${prop.kind !== "method" ? `${prop.kind} ` : ""}default() ${ctx.getString(prop.body)}`;
+		else {
+			let paramsString = "";
+			if (prop.params.length) {
+				const start = prop.params[0].start;
+				const end = prop.params[prop.params.length - 1].end;
+				paramsString = ctx.getString({
+					start,
+					end
+				});
+			}
+			defaultString = `${prop.async ? "async " : ""}${prop.kind !== "method" ? `${prop.kind} ` : ""}default(${paramsString}) ${ctx.getString(prop.body)}`;
+		}
 	}
 	const finalKey = getEscapedPropName(key);
 	if (!ctx.options.isProd) return `${finalKey}: { ${concatStrings([
@@ -41332,13 +41372,16 @@ function compileScript(sfc, options) {
 			const optionsProps = [];
 			if (hasScriptCpp) optionsProps.push("scriptCpp: true");
 			const optionsCode = optionsProps.length ? `, { ${optionsProps.join(", ")} }` : "";
+			const dynamicSharedDataOptionsCode = options.dynamicSharedData ? `_useSharedDataPageOptions({ bundleKey: __className, sharedDataClassId: 0 })` : `_useSharedDataPageOptions()`;
+			const dynamicSharedDataComponentOptionsCode = options.dynamicSharedData ? `_useSharedDataComponentOptions({ bundleKey: __className, sharedDataClassId: 0 })` : `_useSharedDataComponentOptions()`;
 			if (componentType === "page") {
 				setupPreambleLines.unshift(`const __sharedDataScope =  _useSharedDataScope(__sharedData)`);
-				setupPreambleLines.unshift(`const __sharedData = _withSharedDataPage(useSharedDataPage<__SHARED_DATA_CLASS_NAME_TYPE>(_useSharedDataRenderer() == 'component' ? _useSharedDataScope() : _useSharedDataPageId(), _useSharedDataPageOptions())${optionsCode})`);
+				setupPreambleLines.unshift(`const __sharedData = _withSharedDataPage(useSharedDataPage<__SHARED_DATA_CLASS_NAME_TYPE>(_useSharedDataRenderer() == 'component' ? _useSharedDataScope() : _useSharedDataPageId(), ${dynamicSharedDataOptionsCode})${optionsCode})`);
 			} else if (componentType === "component") {
-				setupPreambleLines.unshift(`const __sharedData = _withSharedDataComponent(useSharedDataComponent<__SHARED_DATA_CLASS_NAME_TYPE>(__sharedDataScope, _useSharedDataComponentOptions())${optionsCode})`);
+				setupPreambleLines.unshift(`const __sharedData = _withSharedDataComponent(useSharedDataComponent<__SHARED_DATA_CLASS_NAME_TYPE>(__sharedDataScope, ${dynamicSharedDataComponentOptionsCode})${optionsCode})`);
 				setupPreambleLines.unshift(`const __sharedDataScope =  _useSharedDataScope()`);
 			}
+			if (options.dynamicSharedData) runtimeOptions += `\n  __dynamicSharedData: true,`;
 			if (options.isWatch && templateHash) runtimeOptions += `\n  __hash: "${templateHash}",`;
 			runtimeOptions += `\n  __className,`;
 			runtimeOptions += `\n  __filename: '${((_options$templateOpti3 = options.templateOptions) === null || _options$templateOpti3 === void 0 ? void 0 : _options$templateOpti3.compilerOptions).relativeFilename || ""}',`;
@@ -41509,7 +41552,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
 init_objectSpread2();
-const version = "3.6.0-beta.5";
+const version = "3.6.0-beta.7";
 const parseCache = parseCache$1;
 const errorMessages = _objectSpread2(_objectSpread2({}, errorMessages$1), DOMErrorMessages);
 const walk = walk$2;

package/lib/dom2/app/@vue/compiler-vapor/dist/compiler-vapor.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-vapor v3.6.0-beta.5
+  * @vue/compiler-vapor v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -50,7 +50,7 @@ function wrapTemplate(node, dirs) {
 	const reserved = [];
 	const pass = [];
 	node.props.forEach((prop) => {
-		if (prop.type === 7 && dirs.includes(prop.name)) reserved.push(prop);
+		if (prop.type === 7 && (dirs.includes(prop.name) || prop.name === "bind" && prop.arg && prop.arg.type === 4 && prop.arg.content === "key" && dirs.includes("key"))) reserved.push(prop);
 		else pass.push(prop);
 	});
 	return (0, _vue_shared.extend)({}, node, {
@@ -110,13 +110,6 @@ function getLiteralExpressionValue(exp, excludeNumber) {
 	}
 	return exp.isStatic ? exp.content : null;
 }
-function isInTransition(context) {
-	const parentNode = context.parent && context.parent.node;
-	return !!(parentNode && isTransitionNode(parentNode));
-}
-function isTransitionNode(node) {
-	return node.type === 1 && isTransitionTag(node.tag);
-}
 function isTransitionTag(tag) {
 	tag = tag.toLowerCase();
 	return tag === "transition" || tag === "vaportransition";
@@ -583,12 +576,14 @@ const IRNodeTypes = {
 	"14": "IF",
 	"FOR": 15,
 	"15": "FOR",
-	"GET_TEXT_CHILD": 16,
-	"16": "GET_TEXT_CHILD",
-	"GET_INSERTION_PARENT": 17,
-	"17": "GET_INSERTION_PARENT",
-	"SET_CHANGE_PROP": 18,
-	"18": "SET_CHANGE_PROP"
+	"KEY": 16,
+	"16": "KEY",
+	"GET_TEXT_CHILD": 17,
+	"17": "GET_TEXT_CHILD",
+	"GET_INSERTION_PARENT": 18,
+	"18": "GET_INSERTION_PARENT",
+	"SET_CHANGE_PROP": 19,
+	"19": "SET_CHANGE_PROP"
 };
 const DynamicFlag = {
 	"NONE": 0,
@@ -602,7 +597,7 @@ const DynamicFlag = {
 };
 function isBlockOperation(op) {
 	const type = op.type;
-	return type === 11 || type === 12 || type === 14 || type === 15;
+	return type === 11 || type === 12 || type === 14 || type === 16 || type === 15;
 }
 
 //#endregion
@@ -1860,7 +1855,7 @@ function genSlotBlockWithProps(oper, context) {
 	let propsName;
 	let exitScope;
 	let depth;
-	const { props, key, node } = oper;
+	const { props, node } = oper;
 	const idToPathMap = props ? parseValueDestructure(props, context) : /* @__PURE__ */ new Map();
 	if (props) if (props.ast) {
 		[depth, exitScope] = context.enterScope();
@@ -1870,16 +1865,6 @@ function genSlotBlockWithProps(oper, context) {
 	if (propsName) idMap[propsName] = null;
 	let blockFn = context.withId(() => genBlock(oper, context, propsName ? [propsName] : []), idMap);
 	exitScope && exitScope();
-	if (key) blockFn = [
-		`() => {`,
-		INDENT_START,
-		NEWLINE,
-		`return `,
-		...genCall(context.helper("createKeyedFragment"), [`() => `, ...genExpression(key, context)], blockFn),
-		INDENT_END,
-		NEWLINE,
-		`}`
-	];
 	if (node.type === 1) {
 		if (needsVaporCtx(oper)) blockFn = [
 			`${context.helper("withVaporCtx")}(`,
@@ -1953,6 +1938,20 @@ function genSlotOutlet(oper, context) {
 	return frag;
 }
 
+//#endregion
+//#region packages/compiler-vapor/src/generators/key.ts
+function genKey(oper, context) {
+	const { id, value, block } = oper;
+	const [frag, push] = buildCodeFragment();
+	const blockFn = genBlock(block, context);
+	push(NEWLINE, `const n${id} = `, ...genCall(context.helper("createKeyedFragment"), [
+		`() => (`,
+		...genExpression(value, context),
+		")"
+	], blockFn));
+	return frag;
+}
+
 //#endregion
 //#region packages/compiler-vapor/src/generators/operation.ts
 function genOperations(opers, context) {
@@ -1979,12 +1978,13 @@ function genOperation(oper, context) {
 		case 10: return genPrependNode(oper, context);
 		case 14: return genIf(oper, context);
 		case 15: return genFor(oper, context);
+		case 16: return genKey(oper, context);
 		case 11: return genCreateComponent(oper, context);
 		case 12: return genSlotOutlet(oper, context);
 		case 13: return genBuiltinDirective(oper, context);
-		case 16: return genGetTextChild(oper, context);
-		case 17: return [];
+		case 17: return genGetTextChild(oper, context);
 		case 18: return [];
+		case 19: return [];
 		default:
 			const exhaustiveCheck = oper;
 			throw new Error(`Unhandled operation type in genOperation: ${exhaustiveCheck}`);
@@ -2472,11 +2472,13 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
 	let template = "";
 	template += `<${tag}`;
 	if (scopeId) template += ` ${scopeId}`;
-	if (isDom2 && singleRoot) {
-		template += ` gen-flag-flatten=""`;
-		const rootElementTagName = context.options.rootElementTagName;
-		if (rootElementTagName || context.options.genVueId) template += ` gen-vue-id=""`;
-		if (rootElementTagName) template += ` custom-tag-name="${rootElementTagName}"`;
+	if (isDom2) {
+		if (context.effectiveParent === context.root) template += ` gen-vue-id=""`;
+		if (singleRoot) {
+			template += ` gen-flag-flatten=""`;
+			const rootElementTagName = context.options.rootElementTagName;
+			if (rootElementTagName) template += ` custom-tag-name="${rootElementTagName}"`;
+		}
 	}
 	const dynamicProps = [];
 	if (propsResult[0]) {
@@ -2522,7 +2524,7 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
 					dynamicProps.push(key.content);
 					values[0].isStatic = false;
 					context.registerEffect(values, {
-						type: 18,
+						type: 19,
 						node,
 						prop
 					}, getEffectIndex);
@@ -2769,7 +2771,7 @@ const transformVText = (dir, node, context) => {
 		context.childrenTemplate = [context.options.platform ? TEXT_PLACEHOLDER : " "];
 		const isComponent = node.tagType === 1;
 		if (!isComponent) context.registerOperation({
-			type: 16,
+			type: 17,
 			node,
 			parent: context.reference()
 		});
@@ -3004,7 +3006,7 @@ function processTextContainer(children, context) {
 	else {
 		context.childrenTemplate = [context.options.platform ? TEXT_PLACEHOLDER : " "];
 		context.registerOperation({
-			type: 16,
+			type: 17,
 			node: context.node,
 			parent: context.reference()
 		});
@@ -3149,7 +3151,7 @@ function processIf(node, dir, context) {
 				id,
 				condition: dir.exp,
 				positive: branch,
-				index: isInTransition(context) ? context.root.nextIfIndex() : void 0,
+				index: context.root.nextIfIndex(),
 				once: context.inVOnce || isStaticExpression(dir.exp, context.options.bindingMetadata)
 			};
 		};
@@ -3183,7 +3185,7 @@ function processIf(node, dir, context) {
 			id: -1,
 			condition: dir.exp,
 			positive: branch,
-			index: isInTransition(context) ? context.root.nextIfIndex() : void 0,
+			index: context.root.nextIfIndex(),
 			once: context.inVOnce || isStaticExpression(dir.exp, context.options.bindingMetadata)
 		};
 		return () => onExit();
@@ -3220,7 +3222,7 @@ function processFor(node, dir, context) {
 	const typeProp = findProp$1(node, "type");
 	const typeProperty = typeProp && propToExpression(typeProp);
 	const isComponent = node.tagType === 1 || isTemplateWithSingleComponent(node);
-	context.node = node = wrapTemplate(node, ["for"]);
+	context.node = node = wrapTemplate(node, ["for", "key"]);
 	context.dynamic.flags |= 6;
 	const id = context.reference();
 	const render = newBlock(node);
@@ -3337,13 +3339,6 @@ function transformComponentSlot(node, dir, context) {
 		markNonTemplate(n, context);
 	});
 	const [block, onExit] = createSlotBlock(node, dir, context);
-	if (isTransitionNode(node) && nonSlotTemplateChildren.length) {
-		const nonCommentChild = nonSlotTemplateChildren.find((n) => !(0, _vue_compiler_dom.isCommentOrWhitespace)(n));
-		if (nonCommentChild) {
-			const keyProp = findProp$1(nonCommentChild, "key");
-			if (keyProp) block.key = keyProp.exp;
-		}
-	}
 	const { slots } = context;
 	return () => {
 		onExit();
@@ -3462,6 +3457,32 @@ function hasMultipleChildren(node) {
 	return children.length > 1;
 }
 
+//#endregion
+//#region packages/compiler-vapor/src/transforms/transformKey.ts
+const transformKey = (node, context) => {
+	if (node.type !== 1 || context.inVOnce || findDir$2(node, "for")) return;
+	const dir = findProp$1(node, "key", true, true);
+	if (!dir || dir.type === 6) return;
+	let value;
+	value = dir.exp || normalizeBindShorthand(dir.arg, context);
+	if (isStaticExpression(value, context.options.bindingMetadata)) return;
+	let id = context.reference();
+	context.dynamic.flags |= 6;
+	context.node = node = wrapTemplate(node, ["key"]);
+	const block = newBlock(node);
+	const exitBlock = context.enterBlock(block);
+	return () => {
+		exitBlock();
+		context.dynamic.operation = {
+			type: 16,
+			node,
+			id,
+			value,
+			block
+		};
+	};
+};
+
 //#endregion
 //#region packages/compiler-vapor/src/compile.ts
 function compile(source, options = {}) {
@@ -3486,6 +3507,7 @@ function getBaseTransformPreset() {
 		transformVOnce,
 		transformVIf,
 		transformVFor,
+		transformKey,
 		transformSlotOutlet,
 		transformTemplateRef,
 		transformElement,
@@ -3568,6 +3590,7 @@ exports.transform = transform;
 exports.transformChildren = transformChildren;
 exports.transformComment = transformComment;
 exports.transformElement = transformElement;
+exports.transformKey = transformKey;
 exports.transformSlotOutlet = transformSlotOutlet;
 exports.transformTemplateRef = transformTemplateRef;
 exports.transformText = transformText;