@vue/server-renderer 3.6.0-rc.1 → 3.6.0-rc.10

package/dist/server-renderer.esm-bundler.js

@@ -1,12 +1,12 @@
 /**
-  * @vue/server-renderer v3.6.0-rc.1
+  * @vue/server-renderer v3.6.0-rc.10
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
-import { Comment, Fragment, Static, Text, createApp, createVNode, handleError, initDirectivesForSSR, mergeProps, ssrContextKey, ssrUtils, warn } from "@vue/runtime-dom";
+import { Comment, Fragment, Static, Text, createApp, createVNode, getCurrentInstance, handleError, initDirectivesForSSR, mergeProps, ssrContextKey, ssrUtils, warn } from "@vue/runtime-dom";
 import { NOOP, escapeHtml, escapeHtmlComment, hasOwn, includeBooleanAttr, includeBooleanAttr as ssrIncludeBooleanAttr, isArray, isBooleanAttr, isFunction, isObject, isOn, isPromise, isRenderableAttrValue, isSSRSafeAttrName, isSVGTag, isString, isVoidTag, looseEqual, looseIndexOf, makeMap, normalizeClass, normalizeCssVarValue, normalizeStyle, propsToAttrMap, stringifyStyle, toDisplayString } from "@vue/shared";
 //#region packages/server-renderer/src/helpers/ssrRenderAttrs.ts
-const shouldIgnoreProp = /* @__PURE__ */ makeMap(`,key,ref,innerHTML,textContent,ref_key,ref_for`);
+const shouldIgnoreProp = /*@__PURE__*/ makeMap(`,key,ref,innerHTML,textContent,ref_key,ref_for`);
 function ssrRenderAttrs(props, tag) {
 	let ret = "";
 	for (let key in props) {
@@ -24,7 +24,7 @@ function ssrRenderAttrs(props, tag) {
 function ssrRenderDynamicAttr(key, value, tag) {
 	if (!isRenderableAttrValue(value)) return ``;
 	const attrKey = tag && (tag.indexOf("-") > 0 || isSVGTag(tag)) ? key : propsToAttrMap[key] || key.toLowerCase();
-	if (isBooleanAttr(attrKey)) return includeBooleanAttr(value) ? ` ${attrKey}` : ``;
+	if (isBooleanAttr(attrKey) || attrKey === "hidden" && (typeof value === "boolean" || typeof value === "number")) return includeBooleanAttr(value) ? ` ${attrKey}` : ``;
 	else if (isSSRSafeAttrName(attrKey)) return value === "" ? ` ${attrKey}` : ` ${attrKey}="${escapeHtml(value)}"`;
 	else {
 		console.warn(`[@vue/server-renderer] Skipped rendering unsafe attribute name: ${attrKey}`);
@@ -41,7 +41,8 @@ function ssrRenderClass(raw) {
 function ssrRenderStyle(raw) {
 	if (!raw) return "";
 	if (isString(raw)) return escapeHtml(raw);
-	return escapeHtml(stringifyStyle(normalizeStyle(ssrResetCssVars(raw))));
+	const styles = normalizeStyle(ssrResetCssVars(raw));
+	return escapeHtml(stringifyStyle(styles));
 }
 function ssrResetCssVars(raw) {
 	if (!isArray(raw) && isObject(raw)) {
@@ -53,58 +54,76 @@ function ssrResetCssVars(raw) {
 	return raw;
 }
 //#endregion
-//#region packages/server-renderer/src/helpers/ssrRenderComponent.ts
-function ssrRenderComponent(comp, props = null, children = null, parentComponent = null, slotScopeId) {
-	if (isString(comp)) {
-		const { getBuffer, push } = createBuffer();
-		renderVNode(push, createVNode(comp, props, children), parentComponent, slotScopeId);
-		return getBuffer();
-	}
-	return renderComponentVNode(createVNode(comp, props, children), parentComponent, slotScopeId);
-}
-//#endregion
 //#region packages/server-renderer/src/helpers/ssrRenderSlot.ts
-const { ensureValidVNode } = ssrUtils;
+const { ensureValidVNode, rawVaporSlotKey: rawVaporSlotKey$1 } = ssrUtils;
+let vaporSlots = 0;
 function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
-	push(`<!--[-->`);
 	ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId);
-	push(`<!--]-->`);
 }
 function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId, transition) {
 	const slotFn = slots[slotName];
+	let fallback = false;
 	if (slotFn) {
+		if (slotFn[rawVaporSlotKey$1]) vaporSlots++;
+		const before = vaporSlots;
 		const slotBuffer = [];
 		const bufferedPush = (item) => {
 			slotBuffer.push(item);
 		};
-		const ret = slotFn(slotProps, bufferedPush, parentComponent, slotScopeId ? " " + slotScopeId : "");
+		const ret = slotFn(slotProps || {}, bufferedPush, parentComponent, slotScopeId ? " " + slotScopeId : "");
+		let vnodes;
 		if (isArray(ret)) {
-			const validSlotContent = ensureValidVNode(ret);
-			if (validSlotContent) renderVNodeChildren(push, validSlotContent, parentComponent, slotScopeId);
+			vnodes = ensureValidVNode(ret);
+			if (vnodes && isVaporSlotContent(vnodes)) {
+				renderVNodeChildren(bufferedPush, vnodes, parentComponent, slotScopeId);
+				vnodes = void 0;
+			}
+		}
+		if (vnodes !== void 0) {
+			if (!transition) {
+				fallback = !vnodes && !!fallbackRenderFn;
+				push(fallback ? `<!--(-->` : `<!--[-->`);
+			}
+			if (vnodes) renderVNodeChildren(push, vnodes, parentComponent, slotScopeId);
 			else if (fallbackRenderFn) fallbackRenderFn();
 			else if (transition) push(`<!---->`);
 		} else {
 			let isEmptySlot = true;
-			if (transition) isEmptySlot = false;
+			const owner = getCurrentInstance();
+			if (transition || !(owner && owner.type.__vapor) && !fallbackRenderFn && vaporSlots !== before) isEmptySlot = false;
 			else for (let i = 0; i < slotBuffer.length; i++) if (!isComment(slotBuffer[i])) {
 				isEmptySlot = false;
 				break;
 			}
+			if (!transition) {
+				fallback = isEmptySlot && !!fallbackRenderFn;
+				push(fallback ? `<!--(-->` : `<!--[-->`);
+			}
 			if (isEmptySlot) {
 				if (fallbackRenderFn) fallbackRenderFn();
 			} else {
 				let start = 0;
 				let end = slotBuffer.length;
-				if (transition && slotBuffer[0] === "<!--[-->" && slotBuffer[end - 1] === "<!--]-->") {
-					start++;
-					end--;
+				if (transition) {
+					const first = slotBuffer[0];
+					if ((first === "<!--[-->" || first === "<!--(-->") && slotBuffer[end - 1] === (first === "<!--(-->" ? "<!--)-->" : "<!--]-->")) {
+						start++;
+						end--;
+					}
 				}
 				if (start < end) for (let i = start; i < end; i++) push(slotBuffer[i]);
 				else if (transition) push(`<!---->`);
 			}
 		}
-	} else if (fallbackRenderFn) fallbackRenderFn();
-	else if (transition) push(`<!---->`);
+	} else {
+		if (!transition) {
+			fallback = !!fallbackRenderFn;
+			push(fallback ? `<!--(-->` : `<!--[-->`);
+		}
+		if (fallbackRenderFn) fallbackRenderFn();
+		else if (transition) push(`<!---->`);
+	}
+	if (!transition) push(fallback ? `<!--)-->` : `<!--]-->`);
 }
 const commentTestRE = /^<!--[\s\S]*-->$/;
 const commentRE = /<!--[^]*?-->/gm;
@@ -114,6 +133,16 @@ function isComment(item) {
 	return !item.replace(commentRE, "").trim();
 }
 //#endregion
+//#region packages/server-renderer/src/helpers/ssrRenderComponent.ts
+function ssrRenderComponent(comp, props = null, children = null, parentComponent = null, slotScopeId) {
+	if (isString(comp)) {
+		const { getBuffer, push } = createBuffer();
+		renderVNode(push, createVNode(comp, props, children), parentComponent, slotScopeId);
+		return getBuffer();
+	}
+	return renderComponentVNode(createVNode(comp, props, children), parentComponent, slotScopeId);
+}
+//#endregion
 //#region packages/server-renderer/src/helpers/ssrRenderTeleport.ts
 function ssrRenderTeleport(parentPush, contentRenderFn, target, disabled, parentComponent) {
 	parentPush("<!--teleport start-->");
@@ -151,14 +180,16 @@ function ssrRenderList(source, renderItem) {
 			return;
 		}
 		for (let i = 0; i < source; i++) renderItem(i + 1, i);
-	} else if (isObject(source)) if (source[Symbol.iterator]) {
-		let i = 0;
-		for (const item of source) renderItem(item, i++);
-	} else {
-		const keys = Object.keys(source);
-		for (let i = 0, l = keys.length; i < l; i++) {
-			const key = keys[i];
-			renderItem(source[key], key, i);
+	} else if (isObject(source)) {
+		if (source[Symbol.iterator]) {
+			let i = 0;
+			for (const item of source) renderItem(item, i++);
+		} else {
+			const keys = Object.keys(source);
+			for (let i = 0, l = keys.length; i < l; i++) {
+				const key = keys[i];
+				renderItem(source[key], key, i);
+			}
 		}
 	}
 }
@@ -209,7 +240,7 @@ function ssrCompile(template, instance) {
 }
 //#endregion
 //#region packages/server-renderer/src/render.ts
-const { createComponentInstance, setCurrentRenderingInstance, setupComponent, renderComponentRoot, normalizeVNode, pushWarningContext, popWarningContext } = ssrUtils;
+const { createComponentInstance, setCurrentRenderingInstance, setupComponent, renderComponentRoot, isVNode: isVNode$2, normalizeVNode, pushWarningContext, popWarningContext, VaporSlot, rawVaporSlotKey, invokeSlotFallback } = ssrUtils;
 function cleanupContext(context) {
 	let firstError;
 	if (context.__watcherHandles) {
@@ -249,7 +280,41 @@ function createBuffer() {
 		}
 	};
 }
+const vaporOutlets = /* @__PURE__ */ new WeakMap();
+const vaporInterface = { attachSlotOutlet(content, fallback, owner) {
+	const lone = isVaporSlotContent(content);
+	if (lone) vaporOutlets.set(content, {
+		fallback,
+		owner
+	});
+	return lone;
+} };
+function isVaporSlotContent(children) {
+	const lone = findVaporSlot(children);
+	vaporSlot = null;
+	return lone;
+}
+let vaporSlot = null;
+function findVaporSlot(children) {
+	for (let i = 0; i < children.length; i++) {
+		const child = children[i];
+		if (!isVNode$2(child)) return false;
+		if (child.type === VaporSlot) {
+			if (vaporSlot) return false;
+			vaporSlot = child;
+		} else if (child.type === Fragment) {
+			if (child.patchFlag > 0 && child.patchFlag & 384 || !findVaporSlot(child.children)) return false;
+		} else if (child.type !== Comment) return false;
+	}
+	return true;
+}
 function renderComponentVNode(vnode, parentComponent = null, slotScopeId) {
+	const ctx = vnode.ctx;
+	if (vnode.shapeFlag & 32 && ctx && ctx.type.__vapor) {
+		const slots = vnode.children;
+		for (const name in slots) if (isFunction(slots[name])) slots[name][rawVaporSlotKey] = slots[name];
+		if (!ctx.appContext.vapor) ctx.appContext.vapor = vaporInterface;
+	}
 	const instance = vnode.component = createComponentInstance(vnode, parentComponent, null);
 	const context = instance.appContext.provides[ssrContextKey];
 	if (context) (context.__instanceScopes || (context.__instanceScopes = [])).push(instance.scope);
@@ -313,7 +378,8 @@ function renderComponentSubTree(instance, slotScopeId) {
 			}
 		} else if (instance.render && instance.render !== NOOP) renderVNode(push, instance.subTree = renderComponentRoot(instance), instance, slotScopeId);
 		else {
-			warn(`Component ${comp.name || comp.__file || `<Anonymous>`} is missing template or render function.`);
+			const componentName = comp.name || comp.__file || `<Anonymous>`;
+			warn(`Component ${componentName} is missing template or render function.`);
 			push(`<!---->`);
 		}
 	}
@@ -333,12 +399,25 @@ function renderVNode(push, vnode, parentComponent, slotScopeId) {
 		case Static:
 			push(children);
 			break;
-		case Fragment:
+		case Fragment: {
 			if (vnode.slotScopeIds) slotScopeId = (slotScopeId ? slotScopeId + " " : "") + vnode.slotScopeIds.join(" ");
-			push(`<!--[-->`);
+			const outlet = vnode.vo && vaporOutlets.get(children);
+			if (outlet) {
+				renderVaporOutlet(push, (_, push) => renderVNodeChildren(push, children, parentComponent, slotScopeId), null, outlet, parentComponent, slotScopeId);
+				break;
+			}
+			const isFallback = shapeFlag & 1024;
+			push(isFallback ? `<!--(-->` : `<!--[-->`);
 			renderVNodeChildren(push, children, parentComponent, slotScopeId);
-			push(`<!--]-->`);
+			push(isFallback ? `<!--)-->` : `<!--]-->`);
 			break;
+		}
+		case VaporSlot: {
+			if (vnode.slotScopeIds) slotScopeId = (slotScopeId ? slotScopeId + " " : "") + vnode.slotScopeIds.join(" ");
+			const { slot, outlets } = vnode.vs;
+			renderVaporOutlet(push, slot, vnode.props, outlets && outlets[0], parentComponent, slotScopeId);
+			break;
+		}
 		default: if (shapeFlag & 1) renderElementVNode(push, vnode, parentComponent, slotScopeId);
 		else if (shapeFlag & 6) push(renderComponentVNode(vnode, parentComponent, slotScopeId));
 		else if (shapeFlag & 64) renderTeleportVNode(push, vnode, parentComponent, slotScopeId);
@@ -346,6 +425,11 @@ function renderVNode(push, vnode, parentComponent, slotScopeId) {
 		else warn("[@vue/server-renderer] Invalid VNode type:", type, `(${typeof type})`);
 	}
 }
+function renderVaporOutlet(push, slot, props, outlet, parentComponent, slotScopeId) {
+	const prev = setCurrentRenderingInstance(parentComponent);
+	ssrRenderSlot({ default: slot }, "default", props, outlet ? () => renderVNodeChildren(push, invokeSlotFallback(outlet.fallback, outlet.owner), parentComponent, slotScopeId) : null, push, parentComponent, slotScopeId);
+	setCurrentRenderingInstance(prev);
+}
 function renderVNodeChildren(push, children, parentComponent, slotScopeId) {
 	for (let i = 0; i < children.length; i++) renderVNode(push, normalizeVNode(children[i]), parentComponent, slotScopeId);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/server-renderer",
-  "version": "3.6.0-rc.1",
+  "version": "3.6.0-rc.10",
   "description": "@vue/server-renderer",
   "main": "index.js",
   "module": "dist/server-renderer.esm-bundler.js",
@@ -46,8 +46,8 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/server-renderer#readme",
   "dependencies": {
-    "@vue/shared": "3.6.0-rc.1",
-    "@vue/compiler-ssr": "3.6.0-rc.1",
-    "@vue/runtime-dom": "3.6.0-rc.1"
+    "@vue/shared": "3.6.0-rc.10",
+    "@vue/compiler-ssr": "3.6.0-rc.10",
+    "@vue/runtime-dom": "3.6.0-rc.10"
   }
 }