@vue/server-renderer 3.2.36 → 3.2.39

package/dist/server-renderer.cjs.js

@@ -250,10 +250,14 @@ function renderComponentSubTree(instance, slotScopeId) {
             }
             // set current rendering instance for asset resolution
             const prev = setCurrentRenderingInstance(instance);
-            ssrRender(instance.proxy, push, instance, attrs, 
-            // compiler-optimized bindings
-            instance.props, instance.setupState, instance.data, instance.ctx);
-            setCurrentRenderingInstance(prev);
+            try {
+                ssrRender(instance.proxy, push, instance, attrs, 
+                // compiler-optimized bindings
+                instance.props, instance.setupState, instance.data, instance.ctx);
+            }
+            finally {
+                setCurrentRenderingInstance(prev);
+            }
         }
         else if (instance.render && instance.render !== shared.NOOP) {
             renderVNode(push, (instance.subTree = renderComponentRoot(instance)), instance, slotScopeId);
@@ -288,16 +292,16 @@ function renderVNode(push, vnode, parentComponent, slotScopeId) {
             push(`<!--]-->`); // close
             break;
         default:
-            if (shapeFlag & 1 /* ELEMENT */) {
+            if (shapeFlag & 1 /* ShapeFlags.ELEMENT */) {
                 renderElementVNode(push, vnode, parentComponent, slotScopeId);
             }
-            else if (shapeFlag & 6 /* COMPONENT */) {
+            else if (shapeFlag & 6 /* ShapeFlags.COMPONENT */) {
                 push(renderComponentVNode(vnode, parentComponent, slotScopeId));
             }
-            else if (shapeFlag & 64 /* TELEPORT */) {
+            else if (shapeFlag & 64 /* ShapeFlags.TELEPORT */) {
                 renderTeleportVNode(push, vnode, parentComponent, slotScopeId);
             }
-            else if (shapeFlag & 128 /* SUSPENSE */) {
+            else if (shapeFlag & 128 /* ShapeFlags.SUSPENSE */) {
                 renderVNode(push, vnode.ssContent, parentComponent, slotScopeId);
             }
             else {
@@ -354,10 +358,10 @@ function renderElementVNode(push, vnode, parentComponent, slotScopeId) {
             }
         }
         if (!hasChildrenOverride) {
-            if (shapeFlag & 8 /* TEXT_CHILDREN */) {
+            if (shapeFlag & 8 /* ShapeFlags.TEXT_CHILDREN */) {
                 push(shared.escapeHtml(children));
             }
-            else if (shapeFlag & 16 /* ARRAY_CHILDREN */) {
+            else if (shapeFlag & 16 /* ShapeFlags.ARRAY_CHILDREN */) {
                 renderVNodeChildren(push, children, parentComponent, slotScopeId);
             }
         }
@@ -454,7 +458,7 @@ async function resolveTeleports(context) {
         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])));
+            context.teleports[key] = await unrollBuffer(await Promise.all([context.__teleportBuffers[key]]));
         }
     }
 }
@@ -614,7 +618,7 @@ function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, paren
     ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId);
     push(`<!--]-->`);
 }
-function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
+function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId, transition) {
     const slotFn = slots[slotName];
     if (slotFn) {
         const slotBuffer = [];
@@ -630,10 +634,15 @@ function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push,
             // ssr slot.
             // check if the slot renders all comments, in which case use the fallback
             let isEmptySlot = true;
-            for (let i = 0; i < slotBuffer.length; i++) {
-                if (!isComment(slotBuffer[i])) {
-                    isEmptySlot = false;
-                    break;
+            if (transition) {
+                isEmptySlot = false;
+            }
+            else {
+                for (let i = 0; i < slotBuffer.length; i++) {
+                    if (!isComment(slotBuffer[i])) {
+                        isEmptySlot = false;
+                        break;
+                    }
                 }
             }
             if (isEmptySlot) {
@@ -652,11 +661,15 @@ function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push,
         fallbackRenderFn();
     }
 }
+const commentTestRE = /^<!--.*-->$/s;
 const commentRE = /<!--[^]*?-->/gm;
 function isComment(item) {
-    return (typeof item === 'string' &&
-        commentRE.test(item) &&
-        !item.replace(commentRE, '').trim());
+    if (typeof item !== 'string' || !commentTestRE.test(item))
+        return false;
+    // if item is '<!---->' or '<!--[-->' or '<!--]-->', return true directly
+    if (item.length <= 8)
+        return true;
+    return !item.replace(commentRE, '').trim();
 }
 
 function ssrInterpolate(value) {
@@ -664,7 +677,7 @@ function ssrInterpolate(value) {
 }
 
 function toRaw(observed) {
-    const raw = observed && observed["__v_raw" /* RAW */];
+    const raw = observed && observed["__v_raw" /* ReactiveFlags.RAW */];
     return raw ? toRaw(raw) : observed;
 }
 
@@ -684,7 +697,7 @@ function warn(msg, ...args) {
     const appWarnHandler = instance && instance.appContext.config.warnHandler;
     const trace = getComponentTrace();
     if (appWarnHandler) {
-        callWithErrorHandling(appWarnHandler, instance, 11 /* APP_WARN_HANDLER */, [
+        callWithErrorHandling(appWarnHandler, instance, 11 /* ErrorCodes.APP_WARN_HANDLER */, [
             msg + args.join(''),
             instance && instance.proxy,
             trace
@@ -783,35 +796,35 @@ function formatProp(key, value, raw) {
 }
 
 const ErrorTypeStrings = {
-    ["sp" /* SERVER_PREFETCH */]: 'serverPrefetch hook',
-    ["bc" /* BEFORE_CREATE */]: 'beforeCreate hook',
-    ["c" /* CREATED */]: 'created hook',
-    ["bm" /* BEFORE_MOUNT */]: 'beforeMount hook',
-    ["m" /* MOUNTED */]: 'mounted hook',
-    ["bu" /* BEFORE_UPDATE */]: 'beforeUpdate hook',
-    ["u" /* UPDATED */]: 'updated',
-    ["bum" /* BEFORE_UNMOUNT */]: 'beforeUnmount hook',
-    ["um" /* UNMOUNTED */]: 'unmounted hook',
-    ["a" /* ACTIVATED */]: 'activated hook',
-    ["da" /* DEACTIVATED */]: 'deactivated hook',
-    ["ec" /* ERROR_CAPTURED */]: 'errorCaptured hook',
-    ["rtc" /* RENDER_TRACKED */]: 'renderTracked hook',
-    ["rtg" /* RENDER_TRIGGERED */]: 'renderTriggered hook',
-    [0 /* SETUP_FUNCTION */]: 'setup function',
-    [1 /* RENDER_FUNCTION */]: 'render function',
-    [2 /* WATCH_GETTER */]: 'watcher getter',
-    [3 /* WATCH_CALLBACK */]: 'watcher callback',
-    [4 /* WATCH_CLEANUP */]: 'watcher cleanup function',
-    [5 /* NATIVE_EVENT_HANDLER */]: 'native event handler',
-    [6 /* COMPONENT_EVENT_HANDLER */]: 'component event handler',
-    [7 /* VNODE_HOOK */]: 'vnode hook',
-    [8 /* DIRECTIVE_HOOK */]: 'directive hook',
-    [9 /* TRANSITION_HOOK */]: 'transition hook',
-    [10 /* APP_ERROR_HANDLER */]: 'app errorHandler',
-    [11 /* APP_WARN_HANDLER */]: 'app warnHandler',
-    [12 /* FUNCTION_REF */]: 'ref function',
-    [13 /* ASYNC_COMPONENT_LOADER */]: 'async component loader',
-    [14 /* SCHEDULER */]: 'scheduler flush. This is likely a Vue internals bug. ' +
+    ["sp" /* LifecycleHooks.SERVER_PREFETCH */]: 'serverPrefetch hook',
+    ["bc" /* LifecycleHooks.BEFORE_CREATE */]: 'beforeCreate hook',
+    ["c" /* LifecycleHooks.CREATED */]: 'created hook',
+    ["bm" /* LifecycleHooks.BEFORE_MOUNT */]: 'beforeMount hook',
+    ["m" /* LifecycleHooks.MOUNTED */]: 'mounted hook',
+    ["bu" /* LifecycleHooks.BEFORE_UPDATE */]: 'beforeUpdate hook',
+    ["u" /* LifecycleHooks.UPDATED */]: 'updated',
+    ["bum" /* LifecycleHooks.BEFORE_UNMOUNT */]: 'beforeUnmount hook',
+    ["um" /* LifecycleHooks.UNMOUNTED */]: 'unmounted hook',
+    ["a" /* LifecycleHooks.ACTIVATED */]: 'activated hook',
+    ["da" /* LifecycleHooks.DEACTIVATED */]: 'deactivated hook',
+    ["ec" /* LifecycleHooks.ERROR_CAPTURED */]: 'errorCaptured hook',
+    ["rtc" /* LifecycleHooks.RENDER_TRACKED */]: 'renderTracked hook',
+    ["rtg" /* LifecycleHooks.RENDER_TRIGGERED */]: 'renderTriggered hook',
+    [0 /* ErrorCodes.SETUP_FUNCTION */]: 'setup function',
+    [1 /* ErrorCodes.RENDER_FUNCTION */]: 'render function',
+    [2 /* ErrorCodes.WATCH_GETTER */]: 'watcher getter',
+    [3 /* ErrorCodes.WATCH_CALLBACK */]: 'watcher callback',
+    [4 /* ErrorCodes.WATCH_CLEANUP */]: 'watcher cleanup function',
+    [5 /* ErrorCodes.NATIVE_EVENT_HANDLER */]: 'native event handler',
+    [6 /* ErrorCodes.COMPONENT_EVENT_HANDLER */]: 'component event handler',
+    [7 /* ErrorCodes.VNODE_HOOK */]: 'vnode hook',
+    [8 /* ErrorCodes.DIRECTIVE_HOOK */]: 'directive hook',
+    [9 /* ErrorCodes.TRANSITION_HOOK */]: 'transition hook',
+    [10 /* ErrorCodes.APP_ERROR_HANDLER */]: 'app errorHandler',
+    [11 /* ErrorCodes.APP_WARN_HANDLER */]: 'app warnHandler',
+    [12 /* ErrorCodes.FUNCTION_REF */]: 'ref function',
+    [13 /* ErrorCodes.ASYNC_COMPONENT_LOADER */]: 'async component loader',
+    [14 /* ErrorCodes.SCHEDULER */]: 'scheduler flush. This is likely a Vue internals bug. ' +
         'Please open an issue at https://new-issue.vuejs.org/?repo=vuejs/core'
 };
 function callWithErrorHandling(fn, instance, type, args) {
@@ -846,7 +859,7 @@ function handleError(err, instance, type, throwInDev = true) {
         // app-level handling
         const appErrorHandler = instance.appContext.config.errorHandler;
         if (appErrorHandler) {
-            callWithErrorHandling(appErrorHandler, null, 10 /* APP_ERROR_HANDLER */, [err, exposedInstance, errorInfo]);
+            callWithErrorHandling(appErrorHandler, null, 10 /* ErrorCodes.APP_ERROR_HANDLER */, [err, exposedInstance, errorInfo]);
             return;
         }
     }
@@ -874,10 +887,10 @@ function logError(err, type, contextVNode, throwInDev = true) {
 
 const classifyRE = /(?:^|[-_])(\w)/g;
 const classify = (str) => str.replace(classifyRE, c => c.toUpperCase()).replace(/[-_]/g, '');
-function getComponentName(Component) {
+function getComponentName(Component, includeInferred = true) {
     return shared.isFunction(Component)
         ? Component.displayName || Component.name
-        : Component.name;
+        : Component.name || (includeInferred && Component.__name);
 }
 /* istanbul ignore next */
 function formatComponentName(instance, Component, isRoot = false) {

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

@@ -247,10 +247,14 @@ function renderComponentSubTree(instance, slotScopeId) {
             }
             // set current rendering instance for asset resolution
             const prev = setCurrentRenderingInstance(instance);
-            ssrRender(instance.proxy, push, instance, attrs, 
-            // compiler-optimized bindings
-            instance.props, instance.setupState, instance.data, instance.ctx);
-            setCurrentRenderingInstance(prev);
+            try {
+                ssrRender(instance.proxy, push, instance, attrs, 
+                // compiler-optimized bindings
+                instance.props, instance.setupState, instance.data, instance.ctx);
+            }
+            finally {
+                setCurrentRenderingInstance(prev);
+            }
         }
         else if (instance.render && instance.render !== shared.NOOP) {
             renderVNode(push, (instance.subTree = renderComponentRoot(instance)), instance, slotScopeId);
@@ -285,16 +289,16 @@ function renderVNode(push, vnode, parentComponent, slotScopeId) {
             push(`<!--]-->`); // close
             break;
         default:
-            if (shapeFlag & 1 /* ELEMENT */) {
+            if (shapeFlag & 1 /* ShapeFlags.ELEMENT */) {
                 renderElementVNode(push, vnode, parentComponent, slotScopeId);
             }
-            else if (shapeFlag & 6 /* COMPONENT */) {
+            else if (shapeFlag & 6 /* ShapeFlags.COMPONENT */) {
                 push(renderComponentVNode(vnode, parentComponent, slotScopeId));
             }
-            else if (shapeFlag & 64 /* TELEPORT */) {
+            else if (shapeFlag & 64 /* ShapeFlags.TELEPORT */) {
                 renderTeleportVNode(push, vnode, parentComponent, slotScopeId);
             }
-            else if (shapeFlag & 128 /* SUSPENSE */) {
+            else if (shapeFlag & 128 /* ShapeFlags.SUSPENSE */) {
                 renderVNode(push, vnode.ssContent, parentComponent, slotScopeId);
             }
             else {
@@ -351,10 +355,10 @@ function renderElementVNode(push, vnode, parentComponent, slotScopeId) {
             }
         }
         if (!hasChildrenOverride) {
-            if (shapeFlag & 8 /* TEXT_CHILDREN */) {
+            if (shapeFlag & 8 /* ShapeFlags.TEXT_CHILDREN */) {
                 push(shared.escapeHtml(children));
             }
-            else if (shapeFlag & 16 /* ARRAY_CHILDREN */) {
+            else if (shapeFlag & 16 /* ShapeFlags.ARRAY_CHILDREN */) {
                 renderVNodeChildren(push, children, parentComponent, slotScopeId);
             }
         }
@@ -451,7 +455,7 @@ async function resolveTeleports(context) {
         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])));
+            context.teleports[key] = await unrollBuffer(await Promise.all([context.__teleportBuffers[key]]));
         }
     }
 }
@@ -611,7 +615,7 @@ function ssrRenderSlot(slots, slotName, slotProps, fallbackRenderFn, push, paren
     ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId);
     push(`<!--]-->`);
 }
-function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId) {
+function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push, parentComponent, slotScopeId, transition) {
     const slotFn = slots[slotName];
     if (slotFn) {
         const slotBuffer = [];
@@ -627,10 +631,15 @@ function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push,
             // ssr slot.
             // check if the slot renders all comments, in which case use the fallback
             let isEmptySlot = true;
-            for (let i = 0; i < slotBuffer.length; i++) {
-                if (!isComment(slotBuffer[i])) {
-                    isEmptySlot = false;
-                    break;
+            if (transition) {
+                isEmptySlot = false;
+            }
+            else {
+                for (let i = 0; i < slotBuffer.length; i++) {
+                    if (!isComment(slotBuffer[i])) {
+                        isEmptySlot = false;
+                        break;
+                    }
                 }
             }
             if (isEmptySlot) {
@@ -649,11 +658,15 @@ function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push,
         fallbackRenderFn();
     }
 }
+const commentTestRE = /^<!--.*-->$/s;
 const commentRE = /<!--[^]*?-->/gm;
 function isComment(item) {
-    return (typeof item === 'string' &&
-        commentRE.test(item) &&
-        !item.replace(commentRE, '').trim());
+    if (typeof item !== 'string' || !commentTestRE.test(item))
+        return false;
+    // if item is '<!---->' or '<!--[-->' or '<!--]-->', return true directly
+    if (item.length <= 8)
+        return true;
+    return !item.replace(commentRE, '').trim();
 }
 
 function ssrInterpolate(value) {

package/dist/server-renderer.d.ts

@@ -83,7 +83,7 @@ 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 ssrRenderSlotInner(slots: Slots | SSRSlots, slotName: string, slotProps: Props, fallbackRenderFn: (() => void) | null, push: PushFn, parentComponent: ComponentInternalInstance, slotScopeId?: string, transition?: boolean): void;
 
 export declare function ssrRenderStyle(raw: unknown): string;