@vue/server-renderer 3.5.0-alpha.2 → 3.5.0-alpha.3

package/dist/server-renderer.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/server-renderer v3.5.0-alpha.2
+* @vue/server-renderer v3.5.0-alpha.3
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -148,13 +148,11 @@ function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push,
     fallbackRenderFn();
   }
 }
-const commentTestRE = /^<!--.*-->$/s;
+const commentTestRE = /^<!--[\s\S]*-->$/;
 const commentRE = /<!--[^]*?-->/gm;
 function isComment(item) {
-  if (typeof item !== "string" || !commentTestRE.test(item))
-    return false;
-  if (item.length <= 8)
-    return true;
+  if (typeof item !== "string" || !commentTestRE.test(item)) return false;
+  if (item.length <= 8) return true;
   return !item.replace(commentRE, "").trim();
 }
 
@@ -188,7 +186,7 @@ function toRaw(observed) {
 }
 
 function isRef(r) {
-  return r ? r.__v_isRef === true : false;
+  return r ? r["__v_isRef"] === true : false;
 }
 
 const stack = [];
@@ -198,7 +196,10 @@ function pushWarningContext(vnode) {
 function popWarningContext() {
   stack.pop();
 }
+let isWarning = false;
 function warn$1(msg, ...args) {
+  if (isWarning) return;
+  isWarning = true;
   const instance = stack.length ? stack[stack.length - 1].component : null;
   const appWarnHandler = instance && instance.appContext.config.warnHandler;
   const trace = getComponentTrace();
@@ -208,6 +209,7 @@ function warn$1(msg, ...args) {
       instance,
       11,
       [
+        // eslint-disable-next-line no-restricted-syntax
         msg + args.map((a) => {
           var _a, _b;
           return (_b = (_a = a.toString) == null ? void 0 : _a.call(a)) != null ? _b : JSON.stringify(a);
@@ -228,6 +230,7 @@ function warn$1(msg, ...args) {
     }
     console.warn(...warnArgs);
   }
+  isWarning = false;
 }
 function getComponentTrace() {
   let currentVNode = stack[stack.length - 1];
@@ -326,8 +329,9 @@ const ErrorTypeStrings = {
   [11]: "app warnHandler",
   [12]: "ref function",
   [13]: "async component loader",
-  [14]: "scheduler flush. This is likely a Vue internals bug. Please open an issue at https://github.com/vuejs/core .",
-  [15]: "app unmount cleanup function"
+  [14]: "scheduler flush",
+  [15]: "component update",
+  [16]: "app unmount cleanup function"
 };
 function callWithErrorHandling(fn, instance, type, args) {
   try {
@@ -338,6 +342,7 @@ function callWithErrorHandling(fn, instance, type, args) {
 }
 function handleError(err, instance, type, throwInDev = true) {
   const contextVNode = instance ? instance.vnode : null;
+  const { errorHandler, throwUnhandledErrorInProduction } = instance && instance.appContext.config || shared.EMPTY_OBJ;
   if (instance) {
     let cur = instance.parent;
     const exposedInstance = instance.proxy;
@@ -353,20 +358,18 @@ function handleError(err, instance, type, throwInDev = true) {
       }
       cur = cur.parent;
     }
-    const appErrorHandler = instance.appContext.config.errorHandler;
-    if (appErrorHandler) {
-      callWithErrorHandling(
-        appErrorHandler,
-        null,
-        10,
-        [err, exposedInstance, errorInfo]
-      );
+    if (errorHandler) {
+      callWithErrorHandling(errorHandler, null, 10, [
+        err,
+        exposedInstance,
+        errorInfo
+      ]);
       return;
     }
   }
-  logError(err, type, contextVNode, throwInDev);
+  logError(err, type, contextVNode, throwInDev, throwUnhandledErrorInProduction);
 }
-function logError(err, type, contextVNode, throwInDev = true) {
+function logError(err, type, contextVNode, throwInDev = true, throwInProd = false) {
   {
     const info = ErrorTypeStrings[type];
     if (contextVNode) {
@@ -388,14 +391,11 @@ function logError(err, type, contextVNode, throwInDev = true) {
   const g = shared.getGlobalThis();
   const registerGlobalSetter = (key, setter) => {
     let setters;
-    if (!(setters = g[key]))
-      setters = g[key] = [];
+    if (!(setters = g[key])) setters = g[key] = [];
     setters.push(setter);
     return (v) => {
-      if (setters.length > 1)
-        setters.forEach((set) => set(v));
-      else
-        setters[0](v);
+      if (setters.length > 1) setters.forEach((set) => set(v));
+      else setters[0](v);
     };
   };
   registerGlobalSetter(
@@ -479,7 +479,7 @@ function ssrGetDirectiveProps(instance, dir, value, arg, modifiers = {}) {
     return dir.getSSRProps(
       {
         dir,
-        instance,
+        instance: Vue.ssrUtils.getComponentPublicInstance(instance.$),
         value,
         oldValue: void 0,
         arg,
@@ -609,9 +609,9 @@ function createBuffer() {
       const isStringItem = shared.isString(item);
       if (appendable && isStringItem) {
         buffer[buffer.length - 1] += item;
-      } else {
-        buffer.push(item);
+        return;
       }
+      buffer.push(item);
       appendable = isStringItem;
       if (shared.isPromise(item) || shared.isArray(item) && item.hasAsync) {
         buffer.hasAsync = true;
@@ -681,9 +681,11 @@ function renderComponentSubTree(instance, slotScopeId) {
         }
       }
       if (slotScopeId) {
-        if (!hasCloned)
-          attrs = { ...attrs };
-        attrs[slotScopeId.trim()] = "";
+        if (!hasCloned) attrs = { ...attrs };
+        const slotScopeIdList = slotScopeId.trim().split(" ");
+        for (let i = 0; i < slotScopeIdList.length; i++) {
+          attrs[slotScopeIdList[i]] = "";
+        }
       }
       const prev = setCurrentRenderingInstance(instance);
       try {
@@ -830,8 +832,7 @@ function applySSRDirectives(vnode, rawProps, dirs) {
     } = binding;
     if (getSSRProps) {
       const props = getSSRProps(binding, vnode);
-      if (props)
-        toMerge.push(props);
+      if (props) toMerge.push(props);
     }
   }
   return Vue.mergeProps(rawProps || {}, ...toMerge);
@@ -868,24 +869,36 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
 }
 
 const { isVNode: isVNode$1 } = Vue.ssrUtils;
-async function unrollBuffer$1(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$1(item);
-      }
+function nestedUnrollBuffer(buffer, parentRet, startIndex) {
+  if (!buffer.hasAsync) {
+    return parentRet + unrollBufferSync$1(buffer);
+  }
+  let ret = parentRet;
+  for (let i = startIndex; i < buffer.length; i += 1) {
+    const item = buffer[i];
+    if (shared.isString(item)) {
+      ret += item;
+      continue;
     }
-    return ret;
-  } else {
-    return unrollBufferSync$1(buffer);
+    if (shared.isPromise(item)) {
+      return item.then((nestedItem) => {
+        buffer[i] = nestedItem;
+        return nestedUnrollBuffer(buffer, ret, i);
+      });
+    }
+    const result = nestedUnrollBuffer(item, ret, 0);
+    if (shared.isPromise(result)) {
+      return result.then((nestedItem) => {
+        buffer[i] = nestedItem;
+        return nestedUnrollBuffer(buffer, "", i);
+      });
+    }
+    ret = result;
   }
+  return ret;
+}
+function unrollBuffer$1(buffer) {
+  return nestedUnrollBuffer(buffer, "", 0);
 }
 function unrollBufferSync$1(buffer) {
   let ret = "";
@@ -1019,8 +1032,7 @@ function renderToWebStream(input, context = {}) {
     start(controller) {
       renderToSimpleStream(input, context, {
         push(content) {
-          if (cancelled)
-            return;
+          if (cancelled) return;
           if (content != null) {
             controller.enqueue(encoder.encode(content));
           } else {

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

@@ -1,5 +1,5 @@
 /**
-* @vue/server-renderer v3.5.0-alpha.2
+* @vue/server-renderer v3.5.0-alpha.3
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -148,13 +148,11 @@ function ssrRenderSlotInner(slots, slotName, slotProps, fallbackRenderFn, push,
     fallbackRenderFn();
   }
 }
-const commentTestRE = /^<!--.*-->$/s;
+const commentTestRE = /^<!--[\s\S]*-->$/;
 const commentRE = /<!--[^]*?-->/gm;
 function isComment(item) {
-  if (typeof item !== "string" || !commentTestRE.test(item))
-    return false;
-  if (item.length <= 8)
-    return true;
+  if (typeof item !== "string" || !commentTestRE.test(item)) return false;
+  if (item.length <= 8) return true;
   return !item.replace(commentRE, "").trim();
 }
 
@@ -220,7 +218,7 @@ function ssrGetDirectiveProps(instance, dir, value, arg, modifiers = {}) {
     return dir.getSSRProps(
       {
         dir,
-        instance,
+        instance: Vue.ssrUtils.getComponentPublicInstance(instance.$),
         value,
         oldValue: void 0,
         arg,
@@ -343,9 +341,9 @@ function createBuffer() {
       const isStringItem = shared.isString(item);
       if (appendable && isStringItem) {
         buffer[buffer.length - 1] += item;
-      } else {
-        buffer.push(item);
+        return;
       }
+      buffer.push(item);
       appendable = isStringItem;
       if (shared.isPromise(item) || shared.isArray(item) && item.hasAsync) {
         buffer.hasAsync = true;
@@ -415,9 +413,11 @@ function renderComponentSubTree(instance, slotScopeId) {
         }
       }
       if (slotScopeId) {
-        if (!hasCloned)
-          attrs = { ...attrs };
-        attrs[slotScopeId.trim()] = "";
+        if (!hasCloned) attrs = { ...attrs };
+        const slotScopeIdList = slotScopeId.trim().split(" ");
+        for (let i = 0; i < slotScopeIdList.length; i++) {
+          attrs[slotScopeIdList[i]] = "";
+        }
       }
       const prev = setCurrentRenderingInstance(instance);
       try {
@@ -564,8 +564,7 @@ function applySSRDirectives(vnode, rawProps, dirs) {
     } = binding;
     if (getSSRProps) {
       const props = getSSRProps(binding, vnode);
-      if (props)
-        toMerge.push(props);
+      if (props) toMerge.push(props);
     }
   }
   return Vue.mergeProps(rawProps || {}, ...toMerge);
@@ -602,24 +601,36 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
 }
 
 const { isVNode: isVNode$1 } = Vue.ssrUtils;
-async function unrollBuffer$1(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$1(item);
-      }
+function nestedUnrollBuffer(buffer, parentRet, startIndex) {
+  if (!buffer.hasAsync) {
+    return parentRet + unrollBufferSync$1(buffer);
+  }
+  let ret = parentRet;
+  for (let i = startIndex; i < buffer.length; i += 1) {
+    const item = buffer[i];
+    if (shared.isString(item)) {
+      ret += item;
+      continue;
     }
-    return ret;
-  } else {
-    return unrollBufferSync$1(buffer);
+    if (shared.isPromise(item)) {
+      return item.then((nestedItem) => {
+        buffer[i] = nestedItem;
+        return nestedUnrollBuffer(buffer, ret, i);
+      });
+    }
+    const result = nestedUnrollBuffer(item, ret, 0);
+    if (shared.isPromise(result)) {
+      return result.then((nestedItem) => {
+        buffer[i] = nestedItem;
+        return nestedUnrollBuffer(buffer, "", i);
+      });
+    }
+    ret = result;
   }
+  return ret;
+}
+function unrollBuffer$1(buffer) {
+  return nestedUnrollBuffer(buffer, "", 0);
 }
 function unrollBufferSync$1(buffer) {
   let ret = "";
@@ -753,8 +764,7 @@ function renderToWebStream(input, context = {}) {
     start(controller) {
       renderToSimpleStream(input, context, {
         push(content) {
-          if (cancelled)
-            return;
+          if (cancelled) return;
           if (content != null) {
             controller.enqueue(encoder.encode(content));
           } else {

package/dist/server-renderer.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
-import { VNode, ComponentInternalInstance, App, Slots, Component } from 'vue';
+import { VNode, ComponentInternalInstance, App, Slots, Component, ComponentPublicInstance, Directive } from 'vue';
 import { Readable, Writable } from 'node:stream';
-import { ComponentPublicInstance, Directive } from '@vue/runtime-core';
 export { includeBooleanAttr as ssrIncludeBooleanAttr } from '@vue/shared';
 
 type SSRBuffer = SSRBufferItem[] & {