@vue/server-renderer 3.2.33 → 3.2.35

package/dist/server-renderer.cjs.js

@@ -6,31 +6,6 @@ var vue = require('vue');
 var shared = require('@vue/shared');
 var compilerSsr = require('@vue/compiler-ssr');
 
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
 // leading comma for empty string ""
 const shouldIgnoreProp = shared.makeMap(`,key,ref,innerHTML,textContent,ref_key,ref_for`);
 function ssrRenderAttrs(props, tag) {
@@ -139,25 +114,24 @@ function ssrCompile(template, instance) {
 
 function ssrRenderTeleport(parentPush, contentRenderFn, target, disabled, parentComponent) {
     parentPush('<!--teleport start-->');
+    const context = parentComponent.appContext.provides[vue.ssrContextKey];
+    const teleportBuffers = context.__teleportBuffers || (context.__teleportBuffers = {});
+    const targetBuffer = teleportBuffers[target] || (teleportBuffers[target] = []);
+    // record current index of the target buffer to handle nested teleports
+    // since the parent needs to be rendered before the child
+    const bufferIndex = targetBuffer.length;
     let teleportContent;
     if (disabled) {
         contentRenderFn(parentPush);
-        teleportContent = `<!---->`;
+        teleportContent = `<!--teleport anchor-->`;
     }
     else {
         const { getBuffer, push } = createBuffer();
         contentRenderFn(push);
-        push(`<!---->`); // teleport end anchor
+        push(`<!--teleport anchor-->`);
         teleportContent = getBuffer();
     }
-    const context = parentComponent.appContext.provides[vue.ssrContextKey];
-    const teleportBuffers = context.__teleportBuffers || (context.__teleportBuffers = {});
-    if (teleportBuffers[target]) {
-        teleportBuffers[target].push(teleportContent);
-    }
-    else {
-        teleportBuffers[target] = [teleportContent];
-    }
+    targetBuffer.splice(bufferIndex, 0, teleportContent);
     parentPush('<!--teleport end-->');
 }
 
@@ -218,7 +192,17 @@ function renderComponentSubTree(instance, slotScopeId) {
     const comp = instance.type;
     const { getBuffer, push } = createBuffer();
     if (shared.isFunction(comp)) {
-        renderVNode(push, (instance.subTree = renderComponentRoot(instance)), instance, slotScopeId);
+        let root = renderComponentRoot(instance);
+        // #5817 scope ID attrs not falling through if functional component doesn't
+        // have props
+        if (!comp.props) {
+            for (const key in instance.attrs) {
+                if (key.startsWith(`data-v-`)) {
+                    (root.props || (root.props = {}))[key] = ``;
+                }
+            }
+        }
+        renderVNode(push, (instance.subTree = root), instance, slotScopeId);
     }
     else {
         if ((!instance.render || instance.render === shared.NOOP) &&
@@ -244,7 +228,7 @@ function renderComponentSubTree(instance, slotScopeId) {
                 const scopeId = cur.vnode.scopeId;
                 if (scopeId) {
                     if (!hasCloned) {
-                        attrs = Object.assign({}, attrs);
+                        attrs = { ...attrs };
                         hasCloned = true;
                     }
                     attrs[scopeId] = '';
@@ -261,7 +245,7 @@ function renderComponentSubTree(instance, slotScopeId) {
             }
             if (slotScopeId) {
                 if (!hasCloned)
-                    attrs = Object.assign({}, attrs);
+                    attrs = { ...attrs };
                 attrs[slotScopeId.trim()] = '';
             }
             // set current rendering instance for asset resolution
@@ -275,7 +259,8 @@ function renderComponentSubTree(instance, slotScopeId) {
             renderVNode(push, (instance.subTree = renderComponentRoot(instance)), instance, slotScopeId);
         }
         else {
-            vue.warn(`Component ${comp.name ? `${comp.name} ` : ``} is missing template or render function.`);
+            const componentName = comp.name || comp.__file || `<Anonymous>`;
+            vue.warn(`Component ${componentName} is missing template or render function.`);
             push(`<!---->`);
         }
     }
@@ -396,7 +381,9 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
     const target = vnode.props && vnode.props.to;
     const disabled = vnode.props && vnode.props.disabled;
     if (!target) {
-        vue.warn(`[@vue/server-renderer] Teleport is missing target prop.`);
+        if (!disabled) {
+            vue.warn(`[@vue/server-renderer] Teleport is missing target prop.`);
+        }
         return [];
     }
     if (!shared.isString(target)) {
@@ -409,30 +396,28 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
 }
 
 const { isVNode } = vue.ssrUtils;
-function unrollBuffer(buffer) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (buffer.hasAsync) {
-            let ret = '';
-            for (let i = 0; i < buffer.length; i++) {
-                let item = buffer[i];
-                if (shared.isPromise(item)) {
-                    item = yield item;
-                }
-                if (shared.isString(item)) {
-                    ret += item;
-                }
-                else {
-                    ret += yield unrollBuffer(item);
-                }
+async function unrollBuffer(buffer) {
+    if (buffer.hasAsync) {
+        let ret = '';
+        for (let i = 0; i < buffer.length; i++) {
+            let item = buffer[i];
+            if (shared.isPromise(item)) {
+                item = await item;
+            }
+            if (shared.isString(item)) {
+                ret += item;
+            }
+            else {
+                ret += await unrollBuffer(item);
             }
-            return ret;
-        }
-        else {
-            // sync buffer can be more efficiently unrolled without unnecessary await
-            // ticks
-            return unrollBufferSync(buffer);
         }
-    });
+        return ret;
+    }
+    else {
+        // sync buffer can be more efficiently unrolled without unnecessary await
+        // ticks
+        return unrollBufferSync(buffer);
+    }
 }
 function unrollBufferSync(buffer) {
     let ret = '';
@@ -448,58 +433,53 @@ function unrollBufferSync(buffer) {
     }
     return ret;
 }
-function renderToString(input, context = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (isVNode(input)) {
-            // raw vnode, wrap with app (for context)
-            return renderToString(vue.createApp({ render: () => input }), context);
-        }
-        // rendering an app
-        const vnode = vue.createVNode(input._component, input._props);
-        vnode.appContext = input._context;
-        // provide the ssr context to the tree
-        input.provide(vue.ssrContextKey, context);
-        const buffer = yield renderComponentVNode(vnode);
-        yield resolveTeleports(context);
-        return unrollBuffer(buffer);
-    });
+async function renderToString(input, context = {}) {
+    if (isVNode(input)) {
+        // raw vnode, wrap with app (for context)
+        return renderToString(vue.createApp({ render: () => input }), context);
+    }
+    // rendering an app
+    const vnode = vue.createVNode(input._component, input._props);
+    vnode.appContext = input._context;
+    // provide the ssr context to the tree
+    input.provide(vue.ssrContextKey, context);
+    const buffer = await renderComponentVNode(vnode);
+    const result = await unrollBuffer(buffer);
+    await resolveTeleports(context);
+    return result;
 }
-function resolveTeleports(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (context.__teleportBuffers) {
-            context.teleports = context.teleports || {};
-            for (const key in context.__teleportBuffers) {
-                // note: it's OK to await sequentially here because the Promises were
-                // created eagerly in parallel.
-                context.teleports[key] = yield unrollBuffer((yield Promise.all(context.__teleportBuffers[key])));
-            }
+async function resolveTeleports(context) {
+    if (context.__teleportBuffers) {
+        context.teleports = context.teleports || {};
+        for (const key in context.__teleportBuffers) {
+            // note: it's OK to await sequentially here because the Promises were
+            // created eagerly in parallel.
+            context.teleports[key] = await unrollBuffer((await Promise.all(context.__teleportBuffers[key])));
         }
-    });
+    }
 }
 
 const { isVNode: isVNode$1 } = vue.ssrUtils;
-function unrollBuffer$1(buffer, stream) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (buffer.hasAsync) {
-            for (let i = 0; i < buffer.length; i++) {
-                let item = buffer[i];
-                if (shared.isPromise(item)) {
-                    item = yield item;
-                }
-                if (shared.isString(item)) {
-                    stream.push(item);
-                }
-                else {
-                    yield unrollBuffer$1(item, stream);
-                }
+async function unrollBuffer$1(buffer, stream) {
+    if (buffer.hasAsync) {
+        for (let i = 0; i < buffer.length; i++) {
+            let item = buffer[i];
+            if (shared.isPromise(item)) {
+                item = await item;
+            }
+            if (shared.isString(item)) {
+                stream.push(item);
+            }
+            else {
+                await unrollBuffer$1(item, stream);
             }
         }
-        else {
-            // sync buffer can be more efficiently unrolled without unnecessary await
-            // ticks
-            unrollBufferSync$1(buffer, stream);
-        }
-    });
+    }
+    else {
+        // sync buffer can be more efficiently unrolled without unnecessary await
+        // ticks
+        unrollBufferSync$1(buffer, stream);
+    }
 }
 function unrollBufferSync$1(buffer, stream) {
     for (let i = 0; i < buffer.length; i++) {
@@ -525,6 +505,7 @@ function renderToSimpleStream(input, context, stream) {
     input.provide(vue.ssrContextKey, context);
     Promise.resolve(renderComponentVNode(vnode))
         .then(buffer => unrollBuffer$1(buffer, stream))
+        .then(() => resolveTeleports(context))
         .then(() => stream.push(null))
         .catch(error => {
         stream.destroy(error);
@@ -539,7 +520,7 @@ function renderToStream(input, context = {}) {
     return renderToNodeStream(input, context);
 }
 function renderToNodeStream(input, context = {}) {
-    const stream = new (require('stream').Readable)()
+    const stream = new (require('stream').Readable)({ read() { } })
         ;
     if (!stream) {
         throw new Error(`ESM build of renderToStream() does not support renderToNodeStream(). ` +
@@ -604,18 +585,16 @@ function pipeToWebWritable(input, context = {}, writable) {
     }
     catch (e) { }
     renderToSimpleStream(input, context, {
-        push(content) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (hasReady) {
-                    yield writer.ready;
-                }
-                if (content != null) {
-                    return writer.write(encoder.encode(content));
-                }
-                else {
-                    return writer.close();
-                }
-            });
+        async push(content) {
+            if (hasReady) {
+                await writer.ready;
+            }
+            if (content != null) {
+                return writer.write(encoder.encode(content));
+            }
+            else {
+                return writer.close();
+            }
         },
         destroy(err) {
             // TODO better error handling?
@@ -632,6 +611,10 @@ function ssrRenderComponent(comp, props = null, children = null, parentComponent
 function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
     // template-compiled slots are always rendered as fragments
     push(`<!--[-->`);
+    ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId);
+    push(`<!--]-->`);
+}
+function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
     const slotFn = slots[slotName];
     if (slotFn) {
         const slotBuffer = [];
@@ -668,11 +651,12 @@ function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, paren
     else if (fallbackRenderFn) {
         fallbackRenderFn();
     }
-    push(`<!--]-->`);
 }
-const commentRE = /^<!--.*-->$/;
+const commentRE = /<!--[^]*?-->/gm;
 function isComment(item) {
-    return typeof item === 'string' && commentRE.test(item);
+    return (typeof item === 'string' &&
+        commentRE.test(item) &&
+        !item.replace(commentRE, '').trim());
 }
 
 function ssrInterpolate(value) {
@@ -952,15 +936,13 @@ function ssrRenderList(source, renderItem) {
     }
 }
 
-function ssrRenderSuspense(push, { default: renderContent }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (renderContent) {
-            renderContent();
-        }
-        else {
-            push(`<!---->`);
-        }
-    });
+async function ssrRenderSuspense(push, { default: renderContent }) {
+    if (renderContent) {
+        renderContent();
+    }
+    else {
+        push(`<!---->`);
+    }
 }
 
 function ssrGetDirectiveProps(instance, dir, value, arg, modifiers = {}) {
@@ -1034,6 +1016,7 @@ exports.ssrRenderDynamicAttr = ssrRenderDynamicAttr;
 exports.ssrRenderDynamicModel = ssrRenderDynamicModel;
 exports.ssrRenderList = ssrRenderList;
 exports.ssrRenderSlot = ssrRenderSlot;
+exports.ssrRenderSlotInner = ssrRenderSlotInner;
 exports.ssrRenderStyle = ssrRenderStyle;
 exports.ssrRenderSuspense = ssrRenderSuspense;
 exports.ssrRenderTeleport = ssrRenderTeleport;

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

@@ -6,31 +6,6 @@ var vue = require('vue');
 var shared = require('@vue/shared');
 var compilerSsr = require('@vue/compiler-ssr');
 
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
 // leading comma for empty string ""
 const shouldIgnoreProp = shared.makeMap(`,key,ref,innerHTML,textContent,ref_key,ref_for`);
 function ssrRenderAttrs(props, tag) {
@@ -136,25 +111,24 @@ function ssrCompile(template, instance) {
 
 function ssrRenderTeleport(parentPush, contentRenderFn, target, disabled, parentComponent) {
     parentPush('<!--teleport start-->');
+    const context = parentComponent.appContext.provides[vue.ssrContextKey];
+    const teleportBuffers = context.__teleportBuffers || (context.__teleportBuffers = {});
+    const targetBuffer = teleportBuffers[target] || (teleportBuffers[target] = []);
+    // record current index of the target buffer to handle nested teleports
+    // since the parent needs to be rendered before the child
+    const bufferIndex = targetBuffer.length;
     let teleportContent;
     if (disabled) {
         contentRenderFn(parentPush);
-        teleportContent = `<!---->`;
+        teleportContent = `<!--teleport anchor-->`;
     }
     else {
         const { getBuffer, push } = createBuffer();
         contentRenderFn(push);
-        push(`<!---->`); // teleport end anchor
+        push(`<!--teleport anchor-->`);
         teleportContent = getBuffer();
     }
-    const context = parentComponent.appContext.provides[vue.ssrContextKey];
-    const teleportBuffers = context.__teleportBuffers || (context.__teleportBuffers = {});
-    if (teleportBuffers[target]) {
-        teleportBuffers[target].push(teleportContent);
-    }
-    else {
-        teleportBuffers[target] = [teleportContent];
-    }
+    targetBuffer.splice(bufferIndex, 0, teleportContent);
     parentPush('<!--teleport end-->');
 }
 
@@ -215,7 +189,17 @@ function renderComponentSubTree(instance, slotScopeId) {
     const comp = instance.type;
     const { getBuffer, push } = createBuffer();
     if (shared.isFunction(comp)) {
-        renderVNode(push, (instance.subTree = renderComponentRoot(instance)), instance, slotScopeId);
+        let root = renderComponentRoot(instance);
+        // #5817 scope ID attrs not falling through if functional component doesn't
+        // have props
+        if (!comp.props) {
+            for (const key in instance.attrs) {
+                if (key.startsWith(`data-v-`)) {
+                    (root.props || (root.props = {}))[key] = ``;
+                }
+            }
+        }
+        renderVNode(push, (instance.subTree = root), instance, slotScopeId);
     }
     else {
         if ((!instance.render || instance.render === shared.NOOP) &&
@@ -241,7 +225,7 @@ function renderComponentSubTree(instance, slotScopeId) {
                 const scopeId = cur.vnode.scopeId;
                 if (scopeId) {
                     if (!hasCloned) {
-                        attrs = Object.assign({}, attrs);
+                        attrs = { ...attrs };
                         hasCloned = true;
                     }
                     attrs[scopeId] = '';
@@ -258,7 +242,7 @@ function renderComponentSubTree(instance, slotScopeId) {
             }
             if (slotScopeId) {
                 if (!hasCloned)
-                    attrs = Object.assign({}, attrs);
+                    attrs = { ...attrs };
                 attrs[slotScopeId.trim()] = '';
             }
             // set current rendering instance for asset resolution
@@ -272,7 +256,8 @@ function renderComponentSubTree(instance, slotScopeId) {
             renderVNode(push, (instance.subTree = renderComponentRoot(instance)), instance, slotScopeId);
         }
         else {
-            vue.warn(`Component ${comp.name ? `${comp.name} ` : ``} is missing template or render function.`);
+            const componentName = comp.name || comp.__file || `<Anonymous>`;
+            vue.warn(`Component ${componentName} is missing template or render function.`);
             push(`<!---->`);
         }
     }
@@ -393,7 +378,9 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
     const target = vnode.props && vnode.props.to;
     const disabled = vnode.props && vnode.props.disabled;
     if (!target) {
-        vue.warn(`[@vue/server-renderer] Teleport is missing target prop.`);
+        if (!disabled) {
+            vue.warn(`[@vue/server-renderer] Teleport is missing target prop.`);
+        }
         return [];
     }
     if (!shared.isString(target)) {
@@ -406,30 +393,28 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
 }
 
 const { isVNode } = vue.ssrUtils;
-function unrollBuffer(buffer) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (buffer.hasAsync) {
-            let ret = '';
-            for (let i = 0; i < buffer.length; i++) {
-                let item = buffer[i];
-                if (shared.isPromise(item)) {
-                    item = yield item;
-                }
-                if (shared.isString(item)) {
-                    ret += item;
-                }
-                else {
-                    ret += yield unrollBuffer(item);
-                }
+async function unrollBuffer(buffer) {
+    if (buffer.hasAsync) {
+        let ret = '';
+        for (let i = 0; i < buffer.length; i++) {
+            let item = buffer[i];
+            if (shared.isPromise(item)) {
+                item = await item;
+            }
+            if (shared.isString(item)) {
+                ret += item;
+            }
+            else {
+                ret += await unrollBuffer(item);
             }
-            return ret;
-        }
-        else {
-            // sync buffer can be more efficiently unrolled without unnecessary await
-            // ticks
-            return unrollBufferSync(buffer);
         }
-    });
+        return ret;
+    }
+    else {
+        // sync buffer can be more efficiently unrolled without unnecessary await
+        // ticks
+        return unrollBufferSync(buffer);
+    }
 }
 function unrollBufferSync(buffer) {
     let ret = '';
@@ -445,58 +430,53 @@ function unrollBufferSync(buffer) {
     }
     return ret;
 }
-function renderToString(input, context = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (isVNode(input)) {
-            // raw vnode, wrap with app (for context)
-            return renderToString(vue.createApp({ render: () => input }), context);
-        }
-        // rendering an app
-        const vnode = vue.createVNode(input._component, input._props);
-        vnode.appContext = input._context;
-        // provide the ssr context to the tree
-        input.provide(vue.ssrContextKey, context);
-        const buffer = yield renderComponentVNode(vnode);
-        yield resolveTeleports(context);
-        return unrollBuffer(buffer);
-    });
+async function renderToString(input, context = {}) {
+    if (isVNode(input)) {
+        // raw vnode, wrap with app (for context)
+        return renderToString(vue.createApp({ render: () => input }), context);
+    }
+    // rendering an app
+    const vnode = vue.createVNode(input._component, input._props);
+    vnode.appContext = input._context;
+    // provide the ssr context to the tree
+    input.provide(vue.ssrContextKey, context);
+    const buffer = await renderComponentVNode(vnode);
+    const result = await unrollBuffer(buffer);
+    await resolveTeleports(context);
+    return result;
 }
-function resolveTeleports(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (context.__teleportBuffers) {
-            context.teleports = context.teleports || {};
-            for (const key in context.__teleportBuffers) {
-                // note: it's OK to await sequentially here because the Promises were
-                // created eagerly in parallel.
-                context.teleports[key] = yield unrollBuffer((yield Promise.all(context.__teleportBuffers[key])));
-            }
+async function resolveTeleports(context) {
+    if (context.__teleportBuffers) {
+        context.teleports = context.teleports || {};
+        for (const key in context.__teleportBuffers) {
+            // note: it's OK to await sequentially here because the Promises were
+            // created eagerly in parallel.
+            context.teleports[key] = await unrollBuffer((await Promise.all(context.__teleportBuffers[key])));
         }
-    });
+    }
 }
 
 const { isVNode: isVNode$1 } = vue.ssrUtils;
-function unrollBuffer$1(buffer, stream) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (buffer.hasAsync) {
-            for (let i = 0; i < buffer.length; i++) {
-                let item = buffer[i];
-                if (shared.isPromise(item)) {
-                    item = yield item;
-                }
-                if (shared.isString(item)) {
-                    stream.push(item);
-                }
-                else {
-                    yield unrollBuffer$1(item, stream);
-                }
+async function unrollBuffer$1(buffer, stream) {
+    if (buffer.hasAsync) {
+        for (let i = 0; i < buffer.length; i++) {
+            let item = buffer[i];
+            if (shared.isPromise(item)) {
+                item = await item;
+            }
+            if (shared.isString(item)) {
+                stream.push(item);
+            }
+            else {
+                await unrollBuffer$1(item, stream);
             }
         }
-        else {
-            // sync buffer can be more efficiently unrolled without unnecessary await
-            // ticks
-            unrollBufferSync$1(buffer, stream);
-        }
-    });
+    }
+    else {
+        // sync buffer can be more efficiently unrolled without unnecessary await
+        // ticks
+        unrollBufferSync$1(buffer, stream);
+    }
 }
 function unrollBufferSync$1(buffer, stream) {
     for (let i = 0; i < buffer.length; i++) {
@@ -522,6 +502,7 @@ function renderToSimpleStream(input, context, stream) {
     input.provide(vue.ssrContextKey, context);
     Promise.resolve(renderComponentVNode(vnode))
         .then(buffer => unrollBuffer$1(buffer, stream))
+        .then(() => resolveTeleports(context))
         .then(() => stream.push(null))
         .catch(error => {
         stream.destroy(error);
@@ -536,7 +517,7 @@ function renderToStream(input, context = {}) {
     return renderToNodeStream(input, context);
 }
 function renderToNodeStream(input, context = {}) {
-    const stream = new (require('stream').Readable)()
+    const stream = new (require('stream').Readable)({ read() { } })
         ;
     if (!stream) {
         throw new Error(`ESM build of renderToStream() does not support renderToNodeStream(). ` +
@@ -601,18 +582,16 @@ function pipeToWebWritable(input, context = {}, writable) {
     }
     catch (e) { }
     renderToSimpleStream(input, context, {
-        push(content) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (hasReady) {
-                    yield writer.ready;
-                }
-                if (content != null) {
-                    return writer.write(encoder.encode(content));
-                }
-                else {
-                    return writer.close();
-                }
-            });
+        async push(content) {
+            if (hasReady) {
+                await writer.ready;
+            }
+            if (content != null) {
+                return writer.write(encoder.encode(content));
+            }
+            else {
+                return writer.close();
+            }
         },
         destroy(err) {
             // TODO better error handling?
@@ -629,6 +608,10 @@ function ssrRenderComponent(comp, props = null, children = null, parentComponent
 function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
     // template-compiled slots are always rendered as fragments
     push(`<!--[-->`);
+    ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId);
+    push(`<!--]-->`);
+}
+function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
     const slotFn = slots[slotName];
     if (slotFn) {
         const slotBuffer = [];
@@ -665,11 +648,12 @@ function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, paren
     else if (fallbackRenderFn) {
         fallbackRenderFn();
     }
-    push(`<!--]-->`);
 }
-const commentRE = /^<!--.*-->$/;
+const commentRE = /<!--[^]*?-->/gm;
 function isComment(item) {
-    return typeof item === 'string' && commentRE.test(item);
+    return (typeof item === 'string' &&
+        commentRE.test(item) &&
+        !item.replace(commentRE, '').trim());
 }
 
 function ssrInterpolate(value) {
@@ -704,15 +688,13 @@ function ssrRenderList(source, renderItem) {
     }
 }
 
-function ssrRenderSuspense(push, { default: renderContent }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (renderContent) {
-            renderContent();
-        }
-        else {
-            push(`<!---->`);
-        }
-    });
+async function ssrRenderSuspense(push, { default: renderContent }) {
+    if (renderContent) {
+        renderContent();
+    }
+    else {
+        push(`<!---->`);
+    }
 }
 
 function ssrGetDirectiveProps(instance, dir, value, arg, modifiers = {}) {
@@ -786,6 +768,7 @@ exports.ssrRenderDynamicAttr = ssrRenderDynamicAttr;
 exports.ssrRenderDynamicModel = ssrRenderDynamicModel;
 exports.ssrRenderList = ssrRenderList;
 exports.ssrRenderSlot = ssrRenderSlot;
+exports.ssrRenderSlotInner = ssrRenderSlotInner;
 exports.ssrRenderStyle = ssrRenderStyle;
 exports.ssrRenderSuspense = ssrRenderSuspense;
 exports.ssrRenderTeleport = ssrRenderTeleport;

package/dist/server-renderer.d.ts

@@ -83,6 +83,8 @@ export declare function ssrRenderList(source: unknown, renderItem: (value: unkno
 
 export declare function ssrRenderSlot(slots: Slots | SSRSlots, slotName: string, slotProps: Props, fallbackRenderFn: (() => void) | null, push: PushFn, parentComponent: ComponentInternalInstance, slotScopeId?: string): void;
 
+export declare function ssrRenderSlotInner(slots: Slots | SSRSlots, slotName: string, slotProps: Props, fallbackRenderFn: (() => void) | null, push: PushFn, parentComponent: ComponentInternalInstance, slotScopeId?: string): void;
+
 export declare function ssrRenderStyle(raw: unknown): string;
 
 export declare function ssrRenderSuspense(push: PushFn, { default: renderContent }: Record<string, (() => void) | undefined>): Promise<void>;

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

@@ -2,31 +2,6 @@ import { ssrContextKey, warn as warn$1, Fragment, Static, Comment, Text, mergePr
 import { makeMap, isOn, escapeHtml, normalizeClass, propsToAttrMap, isBooleanAttr, includeBooleanAttr, isSSRSafeAttrName, isString, normalizeStyle, stringifyStyle, escapeHtmlComment, isVoidTag, isPromise, isArray, isFunction, NOOP, toDisplayString, isObject, looseEqual, looseIndexOf } from '@vue/shared';
 export { includeBooleanAttr as ssrIncludeBooleanAttr } from '@vue/shared';
 
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
 // leading comma for empty string ""
 const shouldIgnoreProp = makeMap(`,key,ref,innerHTML,textContent,ref_key,ref_for`);
 function ssrRenderAttrs(props, tag) {
@@ -108,25 +83,24 @@ function ssrCompile(template, instance) {
 
 function ssrRenderTeleport(parentPush, contentRenderFn, target, disabled, parentComponent) {
     parentPush('<!--teleport start-->');
+    const context = parentComponent.appContext.provides[ssrContextKey];
+    const teleportBuffers = context.__teleportBuffers || (context.__teleportBuffers = {});
+    const targetBuffer = teleportBuffers[target] || (teleportBuffers[target] = []);
+    // record current index of the target buffer to handle nested teleports
+    // since the parent needs to be rendered before the child
+    const bufferIndex = targetBuffer.length;
     let teleportContent;
     if (disabled) {
         contentRenderFn(parentPush);
-        teleportContent = `<!---->`;
+        teleportContent = `<!--teleport anchor-->`;
     }
     else {
         const { getBuffer, push } = createBuffer();
         contentRenderFn(push);
-        push(`<!---->`); // teleport end anchor
+        push(`<!--teleport anchor-->`);
         teleportContent = getBuffer();
     }
-    const context = parentComponent.appContext.provides[ssrContextKey];
-    const teleportBuffers = context.__teleportBuffers || (context.__teleportBuffers = {});
-    if (teleportBuffers[target]) {
-        teleportBuffers[target].push(teleportContent);
-    }
-    else {
-        teleportBuffers[target] = [teleportContent];
-    }
+    targetBuffer.splice(bufferIndex, 0, teleportContent);
     parentPush('<!--teleport end-->');
 }
 
@@ -187,7 +161,17 @@ function renderComponentSubTree(instance, slotScopeId) {
     const comp = instance.type;
     const { getBuffer, push } = createBuffer();
     if (isFunction(comp)) {
-        renderVNode(push, (instance.subTree = renderComponentRoot(instance)), instance, slotScopeId);
+        let root = renderComponentRoot(instance);
+        // #5817 scope ID attrs not falling through if functional component doesn't
+        // have props
+        if (!comp.props) {
+            for (const key in instance.attrs) {
+                if (key.startsWith(`data-v-`)) {
+                    (root.props || (root.props = {}))[key] = ``;
+                }
+            }
+        }
+        renderVNode(push, (instance.subTree = root), instance, slotScopeId);
     }
     else {
         if ((!instance.render || instance.render === NOOP) &&
@@ -213,7 +197,7 @@ function renderComponentSubTree(instance, slotScopeId) {
                 const scopeId = cur.vnode.scopeId;
                 if (scopeId) {
                     if (!hasCloned) {
-                        attrs = Object.assign({}, attrs);
+                        attrs = { ...attrs };
                         hasCloned = true;
                     }
                     attrs[scopeId] = '';
@@ -230,7 +214,7 @@ function renderComponentSubTree(instance, slotScopeId) {
             }
             if (slotScopeId) {
                 if (!hasCloned)
-                    attrs = Object.assign({}, attrs);
+                    attrs = { ...attrs };
                 attrs[slotScopeId.trim()] = '';
             }
             // set current rendering instance for asset resolution
@@ -244,7 +228,8 @@ function renderComponentSubTree(instance, slotScopeId) {
             renderVNode(push, (instance.subTree = renderComponentRoot(instance)), instance, slotScopeId);
         }
         else {
-            warn$1(`Component ${comp.name ? `${comp.name} ` : ``} is missing template or render function.`);
+            const componentName = comp.name || comp.__file || `<Anonymous>`;
+            warn$1(`Component ${componentName} is missing template or render function.`);
             push(`<!---->`);
         }
     }
@@ -365,7 +350,9 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
     const target = vnode.props && vnode.props.to;
     const disabled = vnode.props && vnode.props.disabled;
     if (!target) {
-        warn$1(`[@vue/server-renderer] Teleport is missing target prop.`);
+        if (!disabled) {
+            warn$1(`[@vue/server-renderer] Teleport is missing target prop.`);
+        }
         return [];
     }
     if (!isString(target)) {
@@ -378,30 +365,28 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
 }
 
 const { isVNode } = ssrUtils;
-function unrollBuffer(buffer) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (buffer.hasAsync) {
-            let ret = '';
-            for (let i = 0; i < buffer.length; i++) {
-                let item = buffer[i];
-                if (isPromise(item)) {
-                    item = yield item;
-                }
-                if (isString(item)) {
-                    ret += item;
-                }
-                else {
-                    ret += yield unrollBuffer(item);
-                }
+async function unrollBuffer(buffer) {
+    if (buffer.hasAsync) {
+        let ret = '';
+        for (let i = 0; i < buffer.length; i++) {
+            let item = buffer[i];
+            if (isPromise(item)) {
+                item = await item;
+            }
+            if (isString(item)) {
+                ret += item;
+            }
+            else {
+                ret += await unrollBuffer(item);
             }
-            return ret;
-        }
-        else {
-            // sync buffer can be more efficiently unrolled without unnecessary await
-            // ticks
-            return unrollBufferSync(buffer);
         }
-    });
+        return ret;
+    }
+    else {
+        // sync buffer can be more efficiently unrolled without unnecessary await
+        // ticks
+        return unrollBufferSync(buffer);
+    }
 }
 function unrollBufferSync(buffer) {
     let ret = '';
@@ -417,58 +402,53 @@ function unrollBufferSync(buffer) {
     }
     return ret;
 }
-function renderToString(input, context = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (isVNode(input)) {
-            // raw vnode, wrap with app (for context)
-            return renderToString(createApp({ render: () => input }), context);
-        }
-        // rendering an app
-        const vnode = createVNode(input._component, input._props);
-        vnode.appContext = input._context;
-        // provide the ssr context to the tree
-        input.provide(ssrContextKey, context);
-        const buffer = yield renderComponentVNode(vnode);
-        yield resolveTeleports(context);
-        return unrollBuffer(buffer);
-    });
+async function renderToString(input, context = {}) {
+    if (isVNode(input)) {
+        // raw vnode, wrap with app (for context)
+        return renderToString(createApp({ render: () => input }), context);
+    }
+    // rendering an app
+    const vnode = createVNode(input._component, input._props);
+    vnode.appContext = input._context;
+    // provide the ssr context to the tree
+    input.provide(ssrContextKey, context);
+    const buffer = await renderComponentVNode(vnode);
+    const result = await unrollBuffer(buffer);
+    await resolveTeleports(context);
+    return result;
 }
-function resolveTeleports(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (context.__teleportBuffers) {
-            context.teleports = context.teleports || {};
-            for (const key in context.__teleportBuffers) {
-                // note: it's OK to await sequentially here because the Promises were
-                // created eagerly in parallel.
-                context.teleports[key] = yield unrollBuffer((yield Promise.all(context.__teleportBuffers[key])));
-            }
+async function resolveTeleports(context) {
+    if (context.__teleportBuffers) {
+        context.teleports = context.teleports || {};
+        for (const key in context.__teleportBuffers) {
+            // note: it's OK to await sequentially here because the Promises were
+            // created eagerly in parallel.
+            context.teleports[key] = await unrollBuffer((await Promise.all(context.__teleportBuffers[key])));
         }
-    });
+    }
 }
 
 const { isVNode: isVNode$1 } = ssrUtils;
-function unrollBuffer$1(buffer, stream) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (buffer.hasAsync) {
-            for (let i = 0; i < buffer.length; i++) {
-                let item = buffer[i];
-                if (isPromise(item)) {
-                    item = yield item;
-                }
-                if (isString(item)) {
-                    stream.push(item);
-                }
-                else {
-                    yield unrollBuffer$1(item, stream);
-                }
+async function unrollBuffer$1(buffer, stream) {
+    if (buffer.hasAsync) {
+        for (let i = 0; i < buffer.length; i++) {
+            let item = buffer[i];
+            if (isPromise(item)) {
+                item = await item;
+            }
+            if (isString(item)) {
+                stream.push(item);
+            }
+            else {
+                await unrollBuffer$1(item, stream);
             }
         }
-        else {
-            // sync buffer can be more efficiently unrolled without unnecessary await
-            // ticks
-            unrollBufferSync$1(buffer, stream);
-        }
-    });
+    }
+    else {
+        // sync buffer can be more efficiently unrolled without unnecessary await
+        // ticks
+        unrollBufferSync$1(buffer, stream);
+    }
 }
 function unrollBufferSync$1(buffer, stream) {
     for (let i = 0; i < buffer.length; i++) {
@@ -494,6 +474,7 @@ function renderToSimpleStream(input, context, stream) {
     input.provide(ssrContextKey, context);
     Promise.resolve(renderComponentVNode(vnode))
         .then(buffer => unrollBuffer$1(buffer, stream))
+        .then(() => resolveTeleports(context))
         .then(() => stream.push(null))
         .catch(error => {
         stream.destroy(error);
@@ -571,18 +552,16 @@ function pipeToWebWritable(input, context = {}, writable) {
     }
     catch (e) { }
     renderToSimpleStream(input, context, {
-        push(content) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (hasReady) {
-                    yield writer.ready;
-                }
-                if (content != null) {
-                    return writer.write(encoder.encode(content));
-                }
-                else {
-                    return writer.close();
-                }
-            });
+        async push(content) {
+            if (hasReady) {
+                await writer.ready;
+            }
+            if (content != null) {
+                return writer.write(encoder.encode(content));
+            }
+            else {
+                return writer.close();
+            }
         },
         destroy(err) {
             // TODO better error handling?
@@ -599,6 +578,10 @@ function ssrRenderComponent(comp, props = null, children = null, parentComponent
 function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
     // template-compiled slots are always rendered as fragments
     push(`<!--[-->`);
+    ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId);
+    push(`<!--]-->`);
+}
+function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
     const slotFn = slots[slotName];
     if (slotFn) {
         const slotBuffer = [];
@@ -635,11 +618,12 @@ function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, paren
     else if (fallbackRenderFn) {
         fallbackRenderFn();
     }
-    push(`<!--]-->`);
 }
-const commentRE = /^<!--.*-->$/;
+const commentRE = /<!--[^]*?-->/gm;
 function isComment(item) {
-    return typeof item === 'string' && commentRE.test(item);
+    return (typeof item === 'string' &&
+        commentRE.test(item) &&
+        !item.replace(commentRE, '').trim());
 }
 
 function ssrInterpolate(value) {
@@ -923,15 +907,13 @@ function ssrRenderList(source, renderItem) {
     }
 }
 
-function ssrRenderSuspense(push, { default: renderContent }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (renderContent) {
-            renderContent();
-        }
-        else {
-            push(`<!---->`);
-        }
-    });
+async function ssrRenderSuspense(push, { default: renderContent }) {
+    if (renderContent) {
+        renderContent();
+    }
+    else {
+        push(`<!---->`);
+    }
 }
 
 function ssrGetDirectiveProps(instance, dir, value, arg, modifiers = {}) {
@@ -984,4 +966,4 @@ function ssrGetDynamicModelProps(existingProps = {}, model) {
 
 initDirectivesForSSR();
 
-export { pipeToNodeWritable, pipeToWebWritable, renderToNodeStream, renderToSimpleStream, renderToStream, renderToString, renderToWebStream, ssrGetDirectiveProps, ssrGetDynamicModelProps, ssrInterpolate, ssrLooseContain, ssrLooseEqual, ssrRenderAttr, ssrRenderAttrs, ssrRenderClass, ssrRenderComponent, ssrRenderDynamicAttr, ssrRenderDynamicModel, ssrRenderList, ssrRenderSlot, ssrRenderStyle, ssrRenderSuspense, ssrRenderTeleport, renderVNode as ssrRenderVNode };
+export { pipeToNodeWritable, pipeToWebWritable, renderToNodeStream, renderToSimpleStream, renderToStream, renderToString, renderToWebStream, ssrGetDirectiveProps, ssrGetDynamicModelProps, ssrInterpolate, ssrLooseContain, ssrLooseEqual, ssrRenderAttr, ssrRenderAttrs, ssrRenderClass, ssrRenderComponent, ssrRenderDynamicAttr, ssrRenderDynamicModel, ssrRenderList, ssrRenderSlot, ssrRenderSlotInner, ssrRenderStyle, ssrRenderSuspense, ssrRenderTeleport, renderVNode as ssrRenderVNode };

package/package.json

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