@vue/server-renderer 3.6.0-beta.8 → 3.6.0-rc.1

package/dist/server-renderer.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/server-renderer v3.6.0-beta.8
+  * @vue/server-renderer v3.6.0-rc.1
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -38,8 +38,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-let vue = require("vue");
-vue = __toESM(vue);
+let _vue_runtime_dom = require("@vue/runtime-dom");
+_vue_runtime_dom = __toESM(_vue_runtime_dom);
 let _vue_shared = require("@vue/shared");
 let _vue_compiler_ssr = require("@vue/compiler-ssr");
 //#region packages/server-renderer/src/helpers/ssrRenderAttrs.ts
@@ -92,11 +92,16 @@ function ssrResetCssVars(raw) {
 //#endregion
 //#region packages/server-renderer/src/helpers/ssrRenderComponent.ts
 function ssrRenderComponent(comp, props = null, children = null, parentComponent = null, slotScopeId) {
-	return renderComponentVNode((0, vue.createVNode)(comp, props, children), parentComponent, slotScopeId);
+	if ((0, _vue_shared.isString)(comp)) {
+		const { getBuffer, push } = createBuffer();
+		renderVNode(push, (0, _vue_runtime_dom.createVNode)(comp, props, children), parentComponent, slotScopeId);
+		return getBuffer();
+	}
+	return renderComponentVNode((0, _vue_runtime_dom.createVNode)(comp, props, children), parentComponent, slotScopeId);
 }
 //#endregion
 //#region packages/server-renderer/src/helpers/ssrRenderSlot.ts
-const { ensureValidVNode } = vue.ssrUtils;
+const { ensureValidVNode } = _vue_runtime_dom.ssrUtils;
 function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
 	push(`<!--[-->`);
 	ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId);
@@ -149,7 +154,7 @@ function isComment(item) {
 //#region packages/server-renderer/src/helpers/ssrRenderTeleport.ts
 function ssrRenderTeleport(parentPush, contentRenderFn, target, disabled, parentComponent) {
 	parentPush("<!--teleport start-->");
-	const context = parentComponent.appContext.provides[vue.ssrContextKey];
+	const context = parentComponent.appContext.provides[_vue_runtime_dom.ssrContextKey];
 	const teleportBuffers = context.__teleportBuffers || (context.__teleportBuffers = {});
 	const targetBuffer = teleportBuffers[target] || (teleportBuffers[target] = []);
 	const bufferIndex = targetBuffer.length;
@@ -165,6 +170,7 @@ function ssrRenderTeleport(parentPush, contentRenderFn, target, disabled, parent
 		teleportContent = getBuffer();
 	}
 	targetBuffer.splice(bufferIndex, 0, teleportContent);
+	if ((0, _vue_shared.isPromise)(teleportContent) || (0, _vue_shared.isArray)(teleportContent) && teleportContent.hasAsync) targetBuffer.hasAsync = true;
 	parentPush("<!--teleport end-->");
 }
 //#endregion
@@ -178,8 +184,8 @@ function ssrRenderList(source, renderItem) {
 	if ((0, _vue_shared.isArray)(source) || (0, _vue_shared.isString)(source)) for (let i = 0, l = source.length; i < l; i++) renderItem(source[i], i);
 	else if (typeof source === "number") for (let i = 0; i < source; i++) renderItem(i + 1, i);
 	else if ((0, _vue_shared.isObject)(source)) if (source[Symbol.iterator]) {
-		const arr = Array.from(source);
-		for (let i = 0, l = arr.length; i < l; i++) renderItem(arr[i], i);
+		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++) {
@@ -190,7 +196,7 @@ function ssrRenderList(source, renderItem) {
 }
 //#endregion
 //#region packages/server-renderer/src/helpers/ssrRenderSuspense.ts
-async function ssrRenderSuspense(push, { default: renderContent }) {
+function ssrRenderSuspense(push, { default: renderContent }) {
 	if (renderContent) renderContent();
 	else push(`<!---->`);
 }
@@ -199,7 +205,7 @@ async function ssrRenderSuspense(push, { default: renderContent }) {
 function ssrGetDirectiveProps(instance, dir, value, arg, modifiers = {}) {
 	if (typeof dir !== "function" && dir.getSSRProps) return dir.getSSRProps({
 		dir,
-		instance: vue.ssrUtils.getComponentPublicInstance(instance.$),
+		instance: _vue_runtime_dom.ssrUtils.getComponentPublicInstance(instance.$),
 		value,
 		oldValue: void 0,
 		arg,
@@ -277,7 +283,7 @@ function ssrCompile(template, instance) {
 	};
 	const { code } = (0, _vue_compiler_ssr.compile)(template, finalCompilerOptions);
 	const requireMap = {
-		vue,
+		vue: _vue_runtime_dom,
 		"vue/server-renderer": internal_exports
 	};
 	const fakeRequire = (id) => requireMap[id];
@@ -285,7 +291,27 @@ function ssrCompile(template, instance) {
 }
 //#endregion
 //#region packages/server-renderer/src/render.ts
-const { createComponentInstance, setCurrentRenderingInstance, setupComponent, renderComponentRoot, normalizeVNode, pushWarningContext, popWarningContext } = vue.ssrUtils;
+const { createComponentInstance, setCurrentRenderingInstance, setupComponent, renderComponentRoot, normalizeVNode, pushWarningContext, popWarningContext } = _vue_runtime_dom.ssrUtils;
+function cleanupContext(context) {
+	let firstError;
+	if (context.__watcherHandles) {
+		for (const unwatch of context.__watcherHandles) try {
+			unwatch();
+		} catch (err) {
+			if (firstError === void 0) firstError = err;
+		}
+		context.__watcherHandles.length = 0;
+	}
+	if (context.__instanceScopes) {
+		for (const scope of context.__instanceScopes) try {
+			scope.stop();
+		} catch (err) {
+			if (firstError === void 0) firstError = err;
+		}
+		context.__instanceScopes.length = 0;
+	}
+	if (firstError !== void 0) throw firstError;
+}
 function createBuffer() {
 	let appendable = false;
 	const buffer = [];
@@ -307,6 +333,8 @@ function createBuffer() {
 }
 function renderComponentVNode(vnode, parentComponent = null, slotScopeId) {
 	const instance = vnode.component = createComponentInstance(vnode, parentComponent, null);
+	const context = instance.appContext.provides[_vue_runtime_dom.ssrContextKey];
+	if (context) (context.__instanceScopes || (context.__instanceScopes = [])).push(instance.scope);
 	const res = setupComponent(instance, true);
 	const hasAsyncSetup = (0, _vue_shared.isPromise)(res);
 	let prefetches = instance.sp;
@@ -314,7 +342,11 @@ function renderComponentVNode(vnode, parentComponent = null, slotScopeId) {
 		if (hasAsyncSetup) prefetches = instance.sp;
 		if (prefetches) return Promise.all(prefetches.map((prefetch) => prefetch.call(instance.proxy)));
 	}).catch(_vue_shared.NOOP).then(() => renderComponentSubTree(instance, slotScopeId));
-	else return renderComponentSubTree(instance, slotScopeId);
+	else try {
+		return renderComponentSubTree(instance, slotScopeId);
+	} catch (err) {
+		return Promise.reject(err);
+	}
 }
 function renderComponentSubTree(instance, slotScopeId) {
 	const comp = instance.type;
@@ -353,12 +385,14 @@ function renderComponentSubTree(instance, slotScopeId) {
 			const prev = setCurrentRenderingInstance(instance);
 			try {
 				ssrRender(instance.proxy, push, instance, attrs, instance.props, instance.setupState, instance.data, instance.ctx);
+			} catch (err) {
+				(0, _vue_runtime_dom.handleError)(err, instance, 1);
 			} finally {
 				setCurrentRenderingInstance(prev);
 			}
 		} else if (instance.render && instance.render !== _vue_shared.NOOP) renderVNode(push, instance.subTree = renderComponentRoot(instance), instance, slotScopeId);
 		else {
-			(0, vue.warn)(`Component ${comp.name || comp.__file || `<Anonymous>`} is missing template or render function.`);
+			(0, _vue_runtime_dom.warn)(`Component ${comp.name || comp.__file || `<Anonymous>`} is missing template or render function.`);
 			push(`<!---->`);
 		}
 	}
@@ -368,16 +402,16 @@ function renderVNode(push, vnode, parentComponent, slotScopeId) {
 	const { type, shapeFlag, children, dirs, props } = vnode;
 	if (dirs) vnode.props = applySSRDirectives(vnode, props, dirs);
 	switch (type) {
-		case vue.Text:
+		case _vue_runtime_dom.Text:
 			push((0, _vue_shared.escapeHtml)(children));
 			break;
-		case vue.Comment:
+		case _vue_runtime_dom.Comment:
 			push(children ? `<!--${(0, _vue_shared.escapeHtmlComment)(children)}-->` : `<!---->`);
 			break;
-		case vue.Static:
+		case _vue_runtime_dom.Static:
 			push(children);
 			break;
-		case vue.Fragment:
+		case _vue_runtime_dom.Fragment:
 			if (vnode.slotScopeIds) slotScopeId = (slotScopeId ? slotScopeId + " " : "") + vnode.slotScopeIds.join(" ");
 			push(`<!--[-->`);
 			renderVNodeChildren(push, children, parentComponent, slotScopeId);
@@ -387,7 +421,7 @@ function renderVNode(push, vnode, parentComponent, slotScopeId) {
 		else if (shapeFlag & 6) push(renderComponentVNode(vnode, parentComponent, slotScopeId));
 		else if (shapeFlag & 64) renderTeleportVNode(push, vnode, parentComponent, slotScopeId);
 		else if (shapeFlag & 128) renderVNode(push, vnode.ssContent, parentComponent, slotScopeId);
-		else (0, vue.warn)("[@vue/server-renderer] Invalid VNode type:", type, `(${typeof type})`);
+		else (0, _vue_runtime_dom.warn)("[@vue/server-renderer] Invalid VNode type:", type, `(${typeof type})`);
 	}
 }
 function renderVNodeChildren(push, children, parentComponent, slotScopeId) {
@@ -398,15 +432,25 @@ function renderElementVNode(push, vnode, parentComponent, slotScopeId) {
 	let { props, children, shapeFlag, scopeId } = vnode;
 	let openTag = `<${tag}`;
 	if (props) openTag += ssrRenderAttrs(props, tag);
-	if (scopeId) openTag += ` ${scopeId}`;
+	const renderedScopeIds = [];
+	const appendScopeId = (id) => {
+		if (id && (!props || !(0, _vue_shared.hasOwn)(props, id)) && !renderedScopeIds.includes(id)) {
+			openTag += ` ${id}`;
+			renderedScopeIds.push(id);
+		}
+	};
+	if (scopeId) appendScopeId(scopeId);
 	let curParent = parentComponent;
 	let curVnode = vnode;
 	while (curParent && curVnode === curParent.subTree) {
 		curVnode = curParent.vnode;
-		if (curVnode.scopeId) openTag += ` ${curVnode.scopeId}`;
+		if (curVnode.scopeId) appendScopeId(curVnode.scopeId);
 		curParent = curParent.parent;
 	}
-	if (slotScopeId) openTag += ` ${slotScopeId}`;
+	if (slotScopeId) {
+		const slotScopeIdList = slotScopeId.trim().split(" ");
+		for (let i = 0; i < slotScopeIdList.length; i++) appendScopeId(slotScopeIdList[i]);
+	}
 	push(openTag + `>`);
 	if (!(0, _vue_shared.isVoidTag)(tag)) {
 		let hasChildrenOverride = false;
@@ -439,17 +483,17 @@ function applySSRDirectives(vnode, rawProps, dirs) {
 			if (props) toMerge.push(props);
 		}
 	}
-	return (0, vue.mergeProps)(rawProps || {}, ...toMerge);
+	return (0, _vue_runtime_dom.mergeProps)(rawProps || {}, ...toMerge);
 }
 function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
 	const target = vnode.props && vnode.props.to;
 	const disabled = vnode.props && vnode.props.disabled;
 	if (!target) {
-		if (!disabled) (0, vue.warn)(`[@vue/server-renderer] Teleport is missing target prop.`);
+		if (!disabled) (0, _vue_runtime_dom.warn)(`[@vue/server-renderer] Teleport is missing target prop.`);
 		return [];
 	}
 	if (!(0, _vue_shared.isString)(target)) {
-		(0, vue.warn)(`[@vue/server-renderer] Teleport target must be a query selector string.`);
+		(0, _vue_runtime_dom.warn)(`[@vue/server-renderer] Teleport target must be a query selector string.`);
 		return [];
 	}
 	ssrRenderTeleport(push, (push) => {
@@ -458,7 +502,7 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
 }
 //#endregion
 //#region packages/server-renderer/src/renderToString.ts
-const { isVNode: isVNode$1 } = vue.ssrUtils;
+const { isVNode: isVNode$1 } = _vue_runtime_dom.ssrUtils;
 function nestedUnrollBuffer(buffer, parentRet, startIndex) {
 	if (!buffer.hasAsync) return parentRet + unrollBufferSync$1(buffer);
 	let ret = parentRet;
@@ -494,24 +538,27 @@ function unrollBufferSync$1(buffer) {
 	return ret;
 }
 async function renderToString(input, context = {}) {
-	if (isVNode$1(input)) return renderToString((0, vue.createApp)({ render: () => input }), context);
-	const vnode = (0, vue.createVNode)(input._component, input._props);
+	if (isVNode$1(input)) return renderToString((0, _vue_runtime_dom.createApp)({ render: () => input }), context);
+	const vnode = (0, _vue_runtime_dom.createVNode)(input._component, input._props);
 	vnode.appContext = input._context;
-	input.provide(vue.ssrContextKey, context);
-	const result = await unrollBuffer$1(await renderComponentVNode(vnode));
-	await resolveTeleports(context);
-	if (context.__watcherHandles) for (const unwatch of context.__watcherHandles) unwatch();
-	return result;
+	input.provide(_vue_runtime_dom.ssrContextKey, context);
+	try {
+		const result = await unrollBuffer$1(await renderComponentVNode(vnode));
+		await resolveTeleports(context);
+		return result;
+	} finally {
+		cleanupContext(context);
+	}
 }
 async function resolveTeleports(context) {
 	if (context.__teleportBuffers) {
 		context.teleports = context.teleports || {};
-		for (const key in context.__teleportBuffers) context.teleports[key] = await unrollBuffer$1(await Promise.all([context.__teleportBuffers[key]]));
+		for (const key in context.__teleportBuffers) context.teleports[key] = await unrollBuffer$1(context.__teleportBuffers[key]);
 	}
 }
 //#endregion
 //#region packages/server-renderer/src/renderToStream.ts
-const { isVNode } = vue.ssrUtils;
+const { isVNode } = _vue_runtime_dom.ssrUtils;
 async function unrollBuffer(buffer, stream) {
 	if (buffer.hasAsync) for (let i = 0; i < buffer.length; i++) {
 		let item = buffer[i];
@@ -523,19 +570,29 @@ async function unrollBuffer(buffer, stream) {
 }
 function unrollBufferSync(buffer, stream) {
 	for (let i = 0; i < buffer.length; i++) {
-		let item = buffer[i];
+		const item = buffer[i];
 		if ((0, _vue_shared.isString)(item)) stream.push(item);
 		else unrollBufferSync(item, stream);
 	}
 }
 function renderToSimpleStream(input, context, stream) {
-	if (isVNode(input)) return renderToSimpleStream((0, vue.createApp)({ render: () => input }), context, stream);
-	const vnode = (0, vue.createVNode)(input._component, input._props);
+	if (isVNode(input)) return renderToSimpleStream((0, _vue_runtime_dom.createApp)({ render: () => input }), context, stream);
+	const vnode = (0, _vue_runtime_dom.createVNode)(input._component, input._props);
 	vnode.appContext = input._context;
-	input.provide(vue.ssrContextKey, context);
-	Promise.resolve(renderComponentVNode(vnode)).then((buffer) => unrollBuffer(buffer, stream)).then(() => resolveTeleports(context)).then(() => {
-		if (context.__watcherHandles) for (const unwatch of context.__watcherHandles) unwatch();
-	}).then(() => stream.push(null)).catch((error) => {
+	input.provide(_vue_runtime_dom.ssrContextKey, context);
+	let cleaned = false;
+	const finalize = () => {
+		if (cleaned) return;
+		cleaned = true;
+		cleanupContext(context);
+	};
+	Promise.resolve().then(() => renderComponentVNode(vnode)).then((buffer) => unrollBuffer(buffer, stream)).then(() => resolveTeleports(context)).then(() => {
+		finalize();
+		return stream.push(null);
+	}).catch((error) => {
+		try {
+			finalize();
+		} catch {}
 		stream.destroy(error);
 	});
 	return stream;
@@ -606,7 +663,7 @@ function pipeToWebWritable(input, context = {}, writable) {
 }
 //#endregion
 //#region packages/server-renderer/src/index.ts
-(0, vue.initDirectivesForSSR)();
+(0, _vue_runtime_dom.initDirectivesForSSR)();
 //#endregion
 exports.pipeToNodeWritable = pipeToNodeWritable;
 exports.pipeToWebWritable = pipeToWebWritable;

package/dist/server-renderer.d.ts

@@ -1,4 +1,4 @@
-import { App, Component, ComponentInternalInstance, ComponentPublicInstance, Directive, Slots, VNode } from "vue";
+import { App, Component, ComponentInternalInstance, ComponentPublicInstance, Directive, Slots, VNode } from "@vue/runtime-dom";
 import { Readable, Writable } from "node:stream";
 import { includeBooleanAttr as ssrIncludeBooleanAttr } from "@vue/shared";
 
@@ -40,7 +40,7 @@ export declare function ssrRenderSlot(slots: Slots | SSRSlots, slotName: string,
 export declare function ssrRenderSlotInner(slots: Slots | SSRSlots, slotName: string, slotProps: Props, fallbackRenderFn: (() => void) | null, push: PushFn, parentComponent: ComponentInternalInstance, slotScopeId?: string, transition?: boolean): void;
 //#endregion
 //#region temp/packages/server-renderer/src/helpers/ssrRenderComponent.d.ts
-export declare function ssrRenderComponent(comp: Component, props?: Props | null, children?: Slots | SSRSlots | null, parentComponent?: ComponentInternalInstance | null, slotScopeId?: string): SSRBuffer | Promise<SSRBuffer>;
+export declare function ssrRenderComponent(comp: Component | string, props?: Props | null, children?: Slots | SSRSlots | null, parentComponent?: ComponentInternalInstance | null, slotScopeId?: string): SSRBuffer | Promise<SSRBuffer>;
 //#endregion
 //#region temp/packages/server-renderer/src/helpers/ssrRenderTeleport.d.ts
 export declare function ssrRenderTeleport(parentPush: PushFn, contentRenderFn: (push: PushFn) => void, target: string, disabled: boolean, parentComponent: ComponentInternalInstance): void;
@@ -61,7 +61,7 @@ export declare function ssrRenderList(source: unknown, renderItem: (value: unkno
 //#region temp/packages/server-renderer/src/helpers/ssrRenderSuspense.d.ts
 export declare function ssrRenderSuspense(push: PushFn, {
   default: renderContent
-}: Record<string, (() => void) | undefined>): Promise<void>;
+}: Record<string, (() => void) | undefined>): void;
 //#endregion
 //#region temp/packages/server-renderer/src/helpers/ssrGetDirectiveProps.d.ts
 export declare function ssrGetDirectiveProps(instance: ComponentPublicInstance, dir: Directive, value?: any, arg?: string, modifiers?: Record<string, boolean>): Record<string, any>;