@vue/server-renderer 3.5.38 → 3.5.40

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

@@ -1,10 +1,10 @@
 /**
-* @vue/server-renderer v3.5.38
+* @vue/server-renderer v3.5.40
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
-import { createVNode, ssrUtils, ssrContextKey, warn as warn$2, Fragment, Static, Comment, Text, mergeProps, createApp, initDirectivesForSSR } from 'vue';
-import { isOn, escapeHtml, isRenderableAttrValue, isSVGTag, propsToAttrMap, isBooleanAttr, includeBooleanAttr, isSSRSafeAttrName, normalizeClass, isString, normalizeStyle, stringifyStyle, isArray, isObject, normalizeCssVarValue, makeMap, toDisplayString, isFunction, EMPTY_OBJ, getGlobalThis, NOOP, looseEqual, looseIndexOf, escapeHtmlComment, isPromise, isVoidTag } from '@vue/shared';
+import { createVNode, ssrUtils, ssrContextKey, warn, Fragment, Static, Comment, Text, mergeProps, handleError, createApp, initDirectivesForSSR } from '@vue/runtime-dom';
+import { isOn, escapeHtml, isRenderableAttrValue, isSVGTag, propsToAttrMap, isBooleanAttr, includeBooleanAttr, isSSRSafeAttrName, normalizeClass, isString, normalizeStyle, stringifyStyle, isArray, isObject, normalizeCssVarValue, makeMap, isPromise, toDisplayString, looseEqual, looseIndexOf, escapeHtmlComment, NOOP, isVoidTag, isFunction, hasOwn } from '@vue/shared';
 export { includeBooleanAttr as ssrIncludeBooleanAttr } from '@vue/shared';
 
 const shouldIgnoreProp = /* @__PURE__ */ makeMap(
@@ -196,6 +196,9 @@ function ssrRenderTeleport(parentPush, contentRenderFn, target, disabled, parent
     teleportContent = getBuffer();
   }
   targetBuffer.splice(bufferIndex, 0, teleportContent);
+  if (isPromise(teleportContent) || isArray(teleportContent) && teleportContent.hasAsync) {
+    targetBuffer.hasAsync = true;
+  }
   parentPush("<!--teleport end-->");
 }
 
@@ -203,314 +206,6 @@ function ssrInterpolate(value) {
   return escapeHtml(toDisplayString(value));
 }
 
-// @__NO_SIDE_EFFECTS__
-function isProxy(value) {
-  return value ? !!value["__v_raw"] : false;
-}
-// @__NO_SIDE_EFFECTS__
-function toRaw(observed) {
-  const raw = observed && observed["__v_raw"];
-  return raw ? /* @__PURE__ */ toRaw(raw) : observed;
-}
-
-// @__NO_SIDE_EFFECTS__
-function isRef(r) {
-  return r ? r["__v_isRef"] === true : false;
-}
-
-const stack = [];
-function pushWarningContext$1(vnode) {
-  stack.push(vnode);
-}
-function popWarningContext$1() {
-  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();
-  if (appWarnHandler) {
-    callWithErrorHandling(
-      appWarnHandler,
-      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);
-        }).join(""),
-        instance && instance.proxy,
-        trace.map(
-          ({ vnode }) => `at <${formatComponentName(instance, vnode.type)}>`
-        ).join("\n"),
-        trace
-      ]
-    );
-  } else {
-    const warnArgs = [`[Vue warn]: ${msg}`, ...args];
-    if (trace.length && // avoid spamming console during tests
-    true) {
-      warnArgs.push(`
-`, ...formatTrace(trace));
-    }
-    console.warn(...warnArgs);
-  }
-  isWarning = false;
-}
-function getComponentTrace() {
-  let currentVNode = stack[stack.length - 1];
-  if (!currentVNode) {
-    return [];
-  }
-  const normalizedStack = [];
-  while (currentVNode) {
-    const last = normalizedStack[0];
-    if (last && last.vnode === currentVNode) {
-      last.recurseCount++;
-    } else {
-      normalizedStack.push({
-        vnode: currentVNode,
-        recurseCount: 0
-      });
-    }
-    const parentInstance = currentVNode.component && currentVNode.component.parent;
-    currentVNode = parentInstance && parentInstance.vnode;
-  }
-  return normalizedStack;
-}
-function formatTrace(trace) {
-  const logs = [];
-  trace.forEach((entry, i) => {
-    logs.push(...i === 0 ? [] : [`
-`], ...formatTraceEntry(entry));
-  });
-  return logs;
-}
-function formatTraceEntry({ vnode, recurseCount }) {
-  const postfix = recurseCount > 0 ? `... (${recurseCount} recursive calls)` : ``;
-  const isRoot = vnode.component ? vnode.component.parent == null : false;
-  const open = ` at <${formatComponentName(
-    vnode.component,
-    vnode.type,
-    isRoot
-  )}`;
-  const close = `>` + postfix;
-  return vnode.props ? [open, ...formatProps(vnode.props), close] : [open + close];
-}
-function formatProps(props) {
-  const res = [];
-  const keys = Object.keys(props);
-  keys.slice(0, 3).forEach((key) => {
-    res.push(...formatProp(key, props[key]));
-  });
-  if (keys.length > 3) {
-    res.push(` ...`);
-  }
-  return res;
-}
-function formatProp(key, value, raw) {
-  if (isString(value)) {
-    value = JSON.stringify(value);
-    return raw ? value : [`${key}=${value}`];
-  } else if (typeof value === "number" || typeof value === "boolean" || value == null) {
-    return raw ? value : [`${key}=${value}`];
-  } else if (isRef(value)) {
-    value = formatProp(key, toRaw(value.value), true);
-    return raw ? value : [`${key}=Ref<`, value, `>`];
-  } else if (isFunction(value)) {
-    return [`${key}=fn${value.name ? `<${value.name}>` : ``}`];
-  } else {
-    value = toRaw(value);
-    return raw ? value : [`${key}=`, value];
-  }
-}
-
-const ErrorTypeStrings = {
-  ["sp"]: "serverPrefetch hook",
-  ["bc"]: "beforeCreate hook",
-  ["c"]: "created hook",
-  ["bm"]: "beforeMount hook",
-  ["m"]: "mounted hook",
-  ["bu"]: "beforeUpdate hook",
-  ["u"]: "updated",
-  ["bum"]: "beforeUnmount hook",
-  ["um"]: "unmounted hook",
-  ["a"]: "activated hook",
-  ["da"]: "deactivated hook",
-  ["ec"]: "errorCaptured hook",
-  ["rtc"]: "renderTracked hook",
-  ["rtg"]: "renderTriggered hook",
-  [0]: "setup function",
-  [1]: "render function",
-  [2]: "watcher getter",
-  [3]: "watcher callback",
-  [4]: "watcher cleanup function",
-  [5]: "native event handler",
-  [6]: "component event handler",
-  [7]: "vnode hook",
-  [8]: "directive hook",
-  [9]: "transition hook",
-  [10]: "app errorHandler",
-  [11]: "app warnHandler",
-  [12]: "ref function",
-  [13]: "async component loader",
-  [14]: "scheduler flush",
-  [15]: "component update",
-  [16]: "app unmount cleanup function"
-};
-function callWithErrorHandling(fn, instance, type, args) {
-  try {
-    return args ? fn(...args) : fn();
-  } catch (err) {
-    handleError(err, instance, type);
-  }
-}
-function handleError(err, instance, type, throwInDev = true) {
-  const contextVNode = instance ? instance.vnode : null;
-  const { errorHandler, throwUnhandledErrorInProduction } = instance && instance.appContext.config || EMPTY_OBJ;
-  if (instance) {
-    let cur = instance.parent;
-    const exposedInstance = instance.proxy;
-    const errorInfo = !!(process.env.NODE_ENV !== "production") ? ErrorTypeStrings[type] : `https://vuejs.org/error-reference/#runtime-${type}`;
-    while (cur) {
-      const errorCapturedHooks = cur.ec;
-      if (errorCapturedHooks) {
-        for (let i = 0; i < errorCapturedHooks.length; i++) {
-          if (errorCapturedHooks[i](err, exposedInstance, errorInfo) === false) {
-            return;
-          }
-        }
-      }
-      cur = cur.parent;
-    }
-    if (errorHandler) {
-      callWithErrorHandling(errorHandler, null, 10, [
-        err,
-        exposedInstance,
-        errorInfo
-      ]);
-      return;
-    }
-  }
-  logError(err, type, contextVNode, throwInDev, throwUnhandledErrorInProduction);
-}
-function logError(err, type, contextVNode, throwInDev = true, throwInProd = false) {
-  if (!!(process.env.NODE_ENV !== "production")) {
-    const info = ErrorTypeStrings[type];
-    if (contextVNode) {
-      pushWarningContext$1(contextVNode);
-    }
-    warn$1(`Unhandled error${info ? ` during execution of ${info}` : ``}`);
-    if (contextVNode) {
-      popWarningContext$1();
-    }
-    if (throwInDev) {
-      throw err;
-    } else {
-      console.error(err);
-    }
-  } else if (throwInProd) {
-    throw err;
-  } else {
-    console.error(err);
-  }
-}
-
-let devtools;
-let buffer = [];
-function setDevtoolsHook(hook, target) {
-  var _a, _b;
-  devtools = hook;
-  if (devtools) {
-    devtools.enabled = true;
-    buffer.forEach(({ event, args }) => devtools.emit(event, ...args));
-    buffer = [];
-  } else if (
-    // handle late devtools injection - only do this if we are in an actual
-    // browser environment to avoid the timer handle stalling test runner exit
-    // (#4815)
-    typeof window !== "undefined" && // some envs mock window but not fully
-    window.HTMLElement && // also exclude jsdom
-    // eslint-disable-next-line no-restricted-syntax
-    !((_b = (_a = window.navigator) == null ? void 0 : _a.userAgent) == null ? void 0 : _b.includes("jsdom"))
-  ) {
-    const replay = target.__VUE_DEVTOOLS_HOOK_REPLAY__ = target.__VUE_DEVTOOLS_HOOK_REPLAY__ || [];
-    replay.push((newHook) => {
-      setDevtoolsHook(newHook, target);
-    });
-    setTimeout(() => {
-      if (!devtools) {
-        target.__VUE_DEVTOOLS_HOOK_REPLAY__ = null;
-        buffer = [];
-      }
-    }, 3e3);
-  } else {
-    buffer = [];
-  }
-}
-
-{
-  const g = getGlobalThis();
-  const registerGlobalSetter = (key, setter) => {
-    let setters;
-    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);
-    };
-  };
-  registerGlobalSetter(
-    `__VUE_INSTANCE_SETTERS__`,
-    (v) => v
-  );
-  registerGlobalSetter(
-    `__VUE_SSR_SETTERS__`,
-    (v) => v
-  );
-}
-!!(process.env.NODE_ENV !== "production") ? {
-  } : {
-  };
-const classifyRE = /(?:^|[-_])\w/g;
-const classify = (str) => str.replace(classifyRE, (c) => c.toUpperCase()).replace(/[-_]/g, "");
-function getComponentName(Component, includeInferred = true) {
-  return isFunction(Component) ? Component.displayName || Component.name : Component.name || includeInferred && Component.__name;
-}
-function formatComponentName(instance, Component, isRoot = false) {
-  let name = getComponentName(Component);
-  if (!name && Component.__file) {
-    const match = Component.__file.match(/([^/\\]+)\.\w+$/);
-    if (match) {
-      name = match[1];
-    }
-  }
-  if (!name && instance) {
-    const inferFromRegistry = (registry) => {
-      for (const key in registry) {
-        if (registry[key] === Component) {
-          return key;
-        }
-      }
-    };
-    name = inferFromRegistry(instance.components) || instance.parent && inferFromRegistry(
-      instance.parent.type.components
-    ) || inferFromRegistry(instance.appContext.components);
-  }
-  return name ? classify(name) : isRoot ? `App` : `Anonymous`;
-}
-function isClassComponent(value) {
-  return isFunction(value) && "__vccOpts" in value;
-}
-
-const warn = !!(process.env.NODE_ENV !== "production") ? warn$1 : NOOP;
-!!(process.env.NODE_ENV !== "production") || true ? devtools : void 0;
-!!(process.env.NODE_ENV !== "production") || true ? setDevtoolsHook : NOOP;
-
 function ssrRenderList(source, renderItem) {
   if (isArray(source) || isString(source)) {
     for (let i = 0, l = source.length; i < l; i++) {
@@ -657,7 +352,11 @@ function renderComponentVNode(vnode, parentComponent = null, slotScopeId) {
     }).catch(NOOP);
     return p.then(() => renderComponentSubTree(instance, slotScopeId));
   } else {
-    return renderComponentSubTree(instance, slotScopeId);
+    try {
+      return renderComponentSubTree(instance, slotScopeId);
+    } catch (err) {
+      return Promise.reject(err);
+    }
   }
 }
 function renderComponentSubTree(instance, slotScopeId) {
@@ -719,6 +418,8 @@ function renderComponentSubTree(instance, slotScopeId) {
           instance.data,
           instance.ctx
         );
+      } catch (err) {
+        handleError(err, instance, 1);
       } finally {
         setCurrentRenderingInstance(prev);
       }
@@ -731,7 +432,7 @@ function renderComponentSubTree(instance, slotScopeId) {
       );
     } else {
       const componentName = comp.name || comp.__file || `<Anonymous>`;
-      warn$2(`Component ${componentName} is missing template or render function.`);
+      warn(`Component ${componentName} is missing template or render function.`);
       push(`<!---->`);
     }
   }
@@ -778,7 +479,7 @@ function renderVNode(push, vnode, parentComponent, slotScopeId) {
       } else if (shapeFlag & 128) {
         renderVNode(push, vnode.ssContent, parentComponent, slotScopeId);
       } else {
-        warn$2(
+        warn(
           "[@vue/server-renderer] Invalid VNode type:",
           type,
           `(${typeof type})`
@@ -798,20 +499,30 @@ function renderElementVNode(push, vnode, parentComponent, slotScopeId) {
   if (props) {
     openTag += ssrRenderAttrs(props, tag);
   }
+  const renderedScopeIds = [];
+  const appendScopeId = (id) => {
+    if (id && (!props || !hasOwn(props, id)) && !renderedScopeIds.includes(id)) {
+      openTag += ` ${id}`;
+      renderedScopeIds.push(id);
+    }
+  };
   if (scopeId) {
-    openTag += ` ${scopeId}`;
+    appendScopeId(scopeId);
   }
   let curParent = parentComponent;
   let curVnode = vnode;
   while (curParent && curVnode === curParent.subTree) {
     curVnode = curParent.vnode;
     if (curVnode.scopeId) {
-      openTag += ` ${curVnode.scopeId}`;
+      appendScopeId(curVnode.scopeId);
     }
     curParent = curParent.parent;
   }
   if (slotScopeId) {
-    openTag += ` ${slotScopeId}`;
+    const slotScopeIdList = slotScopeId.trim().split(" ");
+    for (let i = 0; i < slotScopeIdList.length; i++) {
+      appendScopeId(slotScopeIdList[i]);
+    }
   }
   push(openTag + `>`);
   if (!isVoidTag(tag)) {
@@ -862,12 +573,12 @@ function renderTeleportVNode(push, vnode, parentComponent, slotScopeId) {
   const disabled = vnode.props && vnode.props.disabled;
   if (!target) {
     if (!disabled) {
-      warn$2(`[@vue/server-renderer] Teleport is missing target prop.`);
+      warn(`[@vue/server-renderer] Teleport is missing target prop.`);
     }
     return [];
   }
   if (!isString(target)) {
-    warn$2(
+    warn(
       `[@vue/server-renderer] Teleport target must be a query selector string.`
     );
     return [];
@@ -954,7 +665,7 @@ async function resolveTeleports(context) {
     context.teleports = context.teleports || {};
     for (const key in context.__teleportBuffers) {
       context.teleports[key] = await unrollBuffer$1(
-        await Promise.all([context.__teleportBuffers[key]])
+        context.__teleportBuffers[key]
       );
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/server-renderer",
-  "version": "3.5.38",
+  "version": "3.5.40",
   "description": "@vue/server-renderer",
   "main": "index.js",
   "module": "dist/server-renderer.esm-bundler.js",
@@ -45,11 +45,9 @@
     "url": "https://github.com/vuejs/core/issues"
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/server-renderer#readme",
-  "peerDependencies": {
-    "vue": "3.5.38"
-  },
   "dependencies": {
-    "@vue/shared": "3.5.38",
-    "@vue/compiler-ssr": "3.5.38"
+    "@vue/shared": "3.5.40",
+    "@vue/runtime-dom": "3.5.40",
+    "@vue/compiler-ssr": "3.5.40"
   }
 }