@vue/compiler-sfc 3.6.0-beta.13 → 3.6.0-beta.14

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-sfc v3.6.0-beta.13
+  * @vue/compiler-sfc v3.6.0-beta.14
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -15044,7 +15044,6 @@ function compileScript(sfc, options) {
 			const local = specifier.local.name;
 			const imported = getImportedName(specifier);
 			const source = node.source.value;
-			if (vapor && ssr && specifier.type === "ImportSpecifier" && source === "vue" && imported === "defineVaporAsyncComponent") ctx.s.overwrite(specifier.start + startOffset, specifier.end + startOffset, `defineAsyncComponent as ${local}`);
 			const existing = ctx.userImports[local];
 			if (source === "vue" && MACROS.includes(imported)) {
 				if (local === imported) warnOnce(`\`${imported}\` is a compiler macro and no longer needs to be imported.`);
@@ -15443,7 +15442,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 }
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
-const version = "3.6.0-beta.13";
+const version = "3.6.0-beta.14";
 const parseCache = parseCache$1;
 const errorMessages = {
 	..._vue_compiler_dom.errorMessages,

package/dist/compiler-sfc.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-sfc v3.6.0-beta.13
+  * @vue/compiler-sfc v3.6.0-beta.14
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -25813,7 +25813,7 @@ function isConstantBinding(value, context) {
 //#region packages/compiler-vapor/src/generators/for.ts
 function genFor(oper, context) {
 	const { helper } = context;
-	const { source, value, key, index, render, keyProp, once, id, component, onlyChild } = oper;
+	const { source, value, key, index, render, keyProp, once, id, component, onlyChild, slotRoot } = oper;
 	const rawValue = value && value.content;
 	const rawKey = key && key.content;
 	const rawIndex = index && index.content;
@@ -25872,6 +25872,7 @@ function genFor(oper, context) {
 	if (isFragmentBlock(render)) flags |= 16;
 	if (!component && isSingleNodeBlock(render)) flags |= 8;
 	if (once) flags |= 4;
+	if (slotRoot) flags |= 32;
 	const onResetCalls = [];
 	for (let i = 0; i < selectorPatterns.length; i++) onResetCalls.push(NEWLINE, `n${id}.onReset(${selectorName(i)}.reset)`);
 	return [
@@ -25953,7 +25954,7 @@ function parseValueDestructure(value, context) {
 					if (child.type === "AssignmentPattern" && (parent.type === "ObjectProperty" || parent.type === "ArrayPattern")) {
 						isDynamic = true;
 						helper = context.helper("getDefaultValue");
-						helperArgs = rawValue.slice(child.right.start - 1, child.right.end - 1);
+						helperArgs = `() => (${rawValue.slice(child.right.start - 1, child.right.end - 1)})`;
 					}
 				}
 				map.set(id.name, {
@@ -26101,9 +26102,9 @@ function genSetHtml(oper, context) {
 //#region packages/compiler-vapor/src/generators/if.ts
 function genIf(oper, context, isNested = false) {
 	const { helper } = context;
-	const { condition, positive, negative, once, index, blockShape } = oper;
+	const { condition, positive, negative, once, slotRoot, index, blockShape } = oper;
 	const [frag, push] = buildCodeFragment();
-	const flags = genIfFlags(blockShape, once, negative ? index : void 0);
+	const flags = genIfFlags(blockShape, once, slotRoot, negative ? index : void 0);
 	const conditionExpr = [
 		"() => (",
 		...genExpression(condition, context),
@@ -26117,19 +26118,21 @@ function genIf(oper, context, isNested = false) {
 	push(...genCall(helper("createIf"), conditionExpr, positiveArg, negativeArg, flags));
 	return frag;
 }
-function genIfFlags(blockShape, once, index) {
+function genIfFlags(blockShape, once, slotRoot, index) {
 	let flags = blockShape;
+	if (slotRoot) flags |= 128;
 	if (once) flags |= 16;
-	else if (index !== void 0) flags |= index + 1 << 7;
+	else if (index !== void 0) flags |= index + 1 << 8;
 	if (flags === 1) return false;
-	return `${flags} /* ${genIfFlagNames(once, index, blockShape)} */`;
+	return `${flags} /* ${genIfFlagNames(once, slotRoot, index, blockShape)} */`;
 }
-function genIfFlagNames(once, index, blockShape) {
+function genIfFlagNames(once, slotRoot, index, blockShape) {
 	const names = ["BLOCK_SHAPE"];
 	if (blockShape & 32) names.push("TRUE_NO_SCOPE");
 	if (blockShape & 64) names.push("FALSE_NO_SCOPE");
 	if (once) names.push("ONCE");
-	else if (index !== void 0) names.push("INDEX_SHIFT");
+	if (slotRoot) names.push("SLOT_ROOT");
+	if (!once && index !== void 0) names.push("INDEX_SHIFT");
 	return names.join(", ");
 }
 //#endregion
@@ -26475,7 +26478,9 @@ function genCreateComponent(operation, context) {
 	const useAssetComponentHelper = operation.asset && !operation.dynamic && context.block === context.ir.block && !!singleUseAssetComponentNames && singleUseAssetComponentNames.has(operation.tag);
 	const maybeSelfReference = useAssetComponentHelper && operation.tag.endsWith("__self");
 	const tag = genTag();
-	const { root, props, slots, once } = operation;
+	const { root, props, slots, once, slotRoot } = operation;
+	const isRuntimeDynamicComponent = !!(operation.dynamic && !operation.dynamic.isStatic);
+	const dynamicComponentFlags = isRuntimeDynamicComponent ? (root ? 1 : 0) | (once ? 2 : 0) | (slotRoot ? 4 : 0) : 0;
 	const rawSlots = genRawSlots(slots, context);
 	const [ids, handlers] = processInlineHandlers(props, context);
 	const rawProps = context.withId(() => genRawProps(props, context, true), ids);
@@ -26491,7 +26496,7 @@ function genCreateComponent(operation, context) {
 			];
 		}, []),
 		`const n${operation.id} = `,
-		...genCall(operation.dynamic && !operation.dynamic.isStatic ? helper("createDynamicComponent") : operation.useCreateElement ? helper("createPlainElement") : useAssetComponentHelper ? helper("createAssetComponent") : operation.asset ? helper("createComponentWithFallback") : helper("createComponent"), tag, rawProps, rawSlots, root ? "true" : false, once && "true", maybeSelfReference && "true"),
+		...genCall(isRuntimeDynamicComponent ? helper("createDynamicComponent") : operation.useCreateElement ? helper("createPlainElement") : useAssetComponentHelper ? helper("createAssetComponent") : operation.asset ? helper("createComponentWithFallback") : helper("createComponent"), tag, rawProps, rawSlots, isRuntimeDynamicComponent ? dynamicComponentFlags ? String(dynamicComponentFlags) : false : root ? "true" : false, isRuntimeDynamicComponent ? false : once && "true", isRuntimeDynamicComponent ? false : maybeSelfReference && "true"),
 		...genDirectivesForElement(operation.id, context)
 	];
 	function genTag() {
@@ -26768,23 +26773,12 @@ function genDynamicSlot(slot, context, withFunction = false) {
 			break;
 	}
 	if (!withFunction) return frag;
-	return needsDynamicSlotSourceCtx(slot) ? [
-		`${context.helper("withVaporCtx")}(() => (`,
-		...frag,
-		"))"
-	] : [
+	return [
 		"() => (",
 		...frag,
 		")"
 	];
 }
-function needsDynamicSlotSourceCtx(slot) {
-	switch (slot.slotType) {
-		case 1: return needsVaporCtx(slot.fn);
-		case 2: return needsVaporCtx(slot.fn);
-		case 3: return needsDynamicSlotSourceCtx(slot.positive) || (slot.negative ? needsDynamicSlotSourceCtx(slot.negative) : false);
-	}
-}
 function genBasicDynamicSlot(slot, context) {
 	const { name, fn } = slot;
 	return genMulti(DELIMITERS_OBJECT_NEWLINE, ["name: ", ...genExpression(name, context)], ["fn: ", ...genSlotBlockWithProps(fn, context)]);
@@ -26829,7 +26823,7 @@ function genSlotBlockWithProps(oper, context) {
 	let propsName;
 	let exitScope;
 	let depth;
-	const { props, node } = oper;
+	const { props } = oper;
 	const idToPathMap = props ? parseValueDestructure(props, context) : /* @__PURE__ */ new Map();
 	if (props) if (props.ast) {
 		[depth, exitScope] = context.enterScope();
@@ -26838,64 +26832,12 @@ function genSlotBlockWithProps(oper, context) {
 	const idMap = idToPathMap.size ? buildDestructureIdMap(idToPathMap, propsName || "", context.options.expressionPlugins) : {};
 	if (propsName) idMap[propsName] = null;
 	const exitSlotBlock = context.enterSlotBlock();
+	markSlotRootOperations(oper);
 	let blockFn = context.withId(() => genBlock(oper, context, propsName ? [propsName] : []), idMap);
 	exitSlotBlock();
 	exitScope && exitScope();
-	if (node.type === 1) {
-		if (needsVaporCtx(oper)) blockFn = [
-			`${context.helper("withVaporCtx")}(`,
-			...blockFn,
-			`)`
-		];
-	}
 	return blockFn;
 }
-/**
-* Check if a slot block needs withVaporCtx wrapper.
-* Returns true if the block contains:
-* - Component creation (needs scopeId inheritance)
-* - Slot outlet (needs rawSlots from slot owner)
-*/
-function needsVaporCtx(block) {
-	return hasComponentOrSlotInBlock(block);
-}
-function hasComponentOrSlotInBlock(block) {
-	if (hasComponentOrSlotInOperations(block.operation)) return true;
-	return hasComponentOrSlotInDynamic(block.dynamic);
-}
-function hasComponentOrSlotInDynamic(dynamic) {
-	if (dynamic.operation) {
-		const type = dynamic.operation.type;
-		if (type === 12 || type === 13) return true;
-		if (type === 15) {
-			if (hasComponentOrSlotInIf(dynamic.operation)) return true;
-		}
-		if (type === 16) {
-			if (hasComponentOrSlotInBlock(dynamic.operation.render)) return true;
-		}
-	}
-	for (const child of dynamic.children) if (hasComponentOrSlotInDynamic(child)) return true;
-	return false;
-}
-function hasComponentOrSlotInOperations(operations) {
-	for (const op of operations) switch (op.type) {
-		case 12:
-		case 13: return true;
-		case 15:
-			if (hasComponentOrSlotInIf(op)) return true;
-			break;
-		case 16:
-			if (hasComponentOrSlotInBlock(op.render)) return true;
-			break;
-	}
-	return false;
-}
-function hasComponentOrSlotInIf(node) {
-	if (hasComponentOrSlotInBlock(node.positive)) return true;
-	if (node.negative) if ("positive" in node.negative) return hasComponentOrSlotInIf(node.negative);
-	else return hasComponentOrSlotInBlock(node.negative);
-	return false;
-}
 //#endregion
 //#region packages/compiler-vapor/src/generators/slotOutlet.ts
 function genSlotOutlet(oper, context) {
@@ -26903,7 +26845,10 @@ function genSlotOutlet(oper, context) {
 	const { id, name, fallback, flags } = oper;
 	const [frag, push] = buildCodeFragment();
 	let fallbackArg;
-	if (fallback) fallbackArg = genBlock(fallback, context);
+	if (fallback) {
+		markSlotRootOperations(fallback);
+		fallbackArg = genBlock(fallback, context);
+	}
 	const createSlot = helper("createSlot");
 	const rawPropsArg = genRawProps(oper.props, context, true);
 	const nameArg = name.isStatic && name.content === "default" && !rawPropsArg && !fallbackArg && !flags ? void 0 : name.isStatic ? genExpression(name, context) : [
@@ -27237,6 +27182,42 @@ function genBlockContent(block, context, root, genEffectsExtraFrag) {
 		for (const name of context.ir[kind]) push(NEWLINE, `const ${toValidAssetId(name, kind)} = `, ...genCall(context.helper(helper), JSON.stringify(name)));
 	}
 }
+function markSlotRootOperations(block) {
+	for (let i = 0; i < block.returns.length; i++) {
+		const child = findReturnedDynamic$1(block, block.returns[i]);
+		const operation = child && child.operation;
+		if (!operation) continue;
+		if (operation.type === 15) markSlotRootIf(operation);
+		else if (operation.type === 16) markSlotRootFor(operation);
+		else if (operation.type === 13) markSlotRootSlotOutlet(operation);
+		else if (operation.type === 12) markSlotRootComponent(operation);
+	}
+}
+function markSlotRootIf(operation) {
+	if (!operation.once) operation.slotRoot = true;
+	markSlotRootOperations(operation.positive);
+	const negative = operation.negative;
+	if (!negative) return;
+	if (negative.type === 15) markSlotRootIf(negative);
+	else markSlotRootOperations(negative);
+}
+function markSlotRootFor(operation) {
+	if (!operation.once) operation.slotRoot = true;
+	markSlotRootOperations(operation.render);
+}
+function markSlotRootSlotOutlet(operation) {
+	operation.flags |= 4;
+	if (operation.fallback) markSlotRootOperations(operation.fallback);
+}
+function markSlotRootComponent(operation) {
+	if (!operation.once && operation.dynamic && !operation.dynamic.isStatic) operation.slotRoot = true;
+}
+function findReturnedDynamic$1(block, id) {
+	for (let i = 0; i < block.dynamic.children.length; i++) {
+		const child = block.dynamic.children[i];
+		if (child.id === id) return child;
+	}
+}
 function collectSingleUseAssetComponents(block) {
 	const usageMap = /* @__PURE__ */ new Map();
 	const seenOperations = /* @__PURE__ */ new Set();
@@ -41782,7 +41763,6 @@ function compileScript(sfc, options) {
 			const local = specifier.local.name;
 			const imported = getImportedName(specifier);
 			const source = node.source.value;
-			if (vapor && ssr && specifier.type === "ImportSpecifier" && source === "vue" && imported === "defineVaporAsyncComponent") ctx.s.overwrite(specifier.start + startOffset, specifier.end + startOffset, `defineAsyncComponent as ${local}`);
 			const existing = ctx.userImports[local];
 			if (source === "vue" && MACROS.includes(imported)) {
 				if (local === imported) warnOnce(`\`${imported}\` is a compiler macro and no longer needs to be imported.`);
@@ -42177,7 +42157,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
 init_objectSpread2();
-const version = "3.6.0-beta.13";
+const version = "3.6.0-beta.14";
 const parseCache = parseCache$1;
 const errorMessages = _objectSpread2(_objectSpread2({}, errorMessages$1), DOMErrorMessages);
 const walk = walk$2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.6.0-beta.13",
+  "version": "3.6.0-beta.14",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -47,11 +47,11 @@
     "magic-string": "^0.30.21",
     "postcss": "^8.5.14",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-core": "3.6.0-beta.13",
-    "@vue/compiler-ssr": "3.6.0-beta.13",
-    "@vue/compiler-vapor": "3.6.0-beta.13",
-    "@vue/shared": "3.6.0-beta.13",
-    "@vue/compiler-dom": "3.6.0-beta.13"
+    "@vue/compiler-core": "3.6.0-beta.14",
+    "@vue/compiler-dom": "3.6.0-beta.14",
+    "@vue/compiler-vapor": "3.6.0-beta.14",
+    "@vue/shared": "3.6.0-beta.14",
+    "@vue/compiler-ssr": "3.6.0-beta.14"
   },
   "devDependencies": {
     "@babel/types": "^7.29.0",