@vue/server-renderer 3.5.43 → 3.5.44

package/dist/server-renderer.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/server-renderer v3.5.43
+* @vue/server-renderer v3.5.44
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -232,9 +232,11 @@ function ssrRenderList(source, renderItem) {
     }
   } else if (typeof source === "number") {
     if (!Number.isInteger(source) || source < 0) {
-      Vue.warn(
-        `The v-for range expects a positive integer value but got ${source}.`
-      );
+      {
+        Vue.warn(
+          `The v-for range expects a positive integer value but got ${source}.`
+        );
+      }
       return;
     }
     for (let i = 0; i < source; i++) {
@@ -426,23 +428,28 @@ function renderComponentVNode(vnode, parentComponent = null, slotScopeId) {
   popWarningContext();
   const hasAsyncSetup = shared.isPromise(res);
   let prefetches = instance.sp;
+  let p;
   if (hasAsyncSetup || prefetches) {
-    const p = Promise.resolve(res).then(() => {
+    p = Promise.resolve(res).then(() => {
       if (hasAsyncSetup) prefetches = instance.sp;
       if (prefetches) {
-        return Promise.all(
-          prefetches.map((prefetch) => prefetch.call(instance.proxy))
-        );
+        try {
+          return Promise.all(
+            prefetches.map((prefetch) => prefetch.call(instance.proxy))
+          ).catch(shared.NOOP);
+        } catch {
+        }
       }
-    }).catch(shared.NOOP);
-    return p.then(() => renderComponentSubTree(instance, slotScopeId));
+    }).then(() => renderComponentSubTree(instance, slotScopeId));
   } else {
     try {
       return renderComponentSubTree(instance, slotScopeId);
     } catch (err) {
-      return Promise.reject(err);
+      p = Promise.reject(err);
     }
   }
+  p.catch(shared.NOOP);
+  return p;
 }
 function renderComponentSubTree(instance, slotScopeId) {
   pushWarningContext(instance.vnode);
@@ -613,13 +620,13 @@ function renderElementVNode(push, vnode, parentComponent, slotScopeId) {
   if (!shared.isVoidTag(tag)) {
     let hasChildrenOverride = false;
     if (props) {
-      if (props.innerHTML) {
+      if (props.innerHTML != null) {
         hasChildrenOverride = true;
-        push(props.innerHTML);
-      } else if (props.textContent) {
+        push(String(props.innerHTML));
+      } else if (props.textContent != null) {
         hasChildrenOverride = true;
         push(shared.escapeHtml(props.textContent));
-      } else if (tag === "textarea" && props.value) {
+      } else if (tag === "textarea" && props.value != null) {
         hasChildrenOverride = true;
         push(shared.escapeHtml(props.value));
       }
@@ -735,15 +742,50 @@ async function renderToString(input, context = {}) {
   const vnode = Vue.createVNode(input._component, input._props);
   vnode.appContext = input._context;
   input.provide(Vue.ssrContextKey, context);
-  const buffer = await renderComponentVNode(vnode);
-  const result = await unrollBuffer$1(buffer);
-  await resolveTeleports(context);
-  if (context.__watcherHandles) {
-    for (const unwatch of context.__watcherHandles) {
-      unwatch();
+  let buffer;
+  let result;
+  try {
+    buffer = await renderComponentVNode(vnode);
+    result = await unrollBuffer$1(buffer);
+    await resolveTeleports(context);
+  } catch (err) {
+    cleanupFailedRender(buffer, context);
+    throw err;
+  }
+  stopWatchers(context);
+  return result;
+}
+function stopWatchers(context, start = 0) {
+  const handles = context.__watcherHandles;
+  if (handles) {
+    for (let i = start; i < handles.length; i++) {
+      handles[i]();
+    }
+  }
+}
+function cleanupFailedRender(buffer, context) {
+  const stopped = context.__watcherHandles ? context.__watcherHandles.length : 0;
+  try {
+    stopWatchers(context);
+  } catch {
+  }
+  (async () => {
+    if (buffer) await settleBuffer(buffer);
+    for (const key in context.__teleportBuffers) {
+      await settleBuffer(context.__teleportBuffers[key]);
+    }
+    stopWatchers(context, stopped);
+  })().catch(shared.NOOP);
+}
+async function settleBuffer(buffer) {
+  if (!buffer.hasAsync) return;
+  for (let item of buffer) {
+    try {
+      if (shared.isPromise(item)) item = await item;
+      if (!shared.isString(item)) await settleBuffer(item);
+    } catch {
     }
   }
-  return result;
 }
 async function resolveTeleports(context) {
   if (context.__teleportBuffers) {
@@ -795,13 +837,17 @@ function renderToSimpleStream(input, context, stream) {
   const vnode = Vue.createVNode(input._component, input._props);
   vnode.appContext = input._context;
   input.provide(Vue.ssrContextKey, context);
-  Promise.resolve(renderComponentVNode(vnode)).then((buffer) => unrollBuffer(buffer, stream)).then(() => resolveTeleports(context)).then(() => {
-    if (context.__watcherHandles) {
-      for (const unwatch of context.__watcherHandles) {
-        unwatch();
-      }
+  let buffer;
+  Promise.resolve(renderComponentVNode(vnode)).then((b) => unrollBuffer(buffer = b, stream)).then(() => resolveTeleports(context)).then(
+    () => {
+      stopWatchers(context);
+      stream.push(null);
+    },
+    (error) => {
+      cleanupFailedRender(buffer, context);
+      throw error;
     }
-  }).then(() => stream.push(null)).catch((error) => {
+  ).catch((error) => {
     stream.destroy(error);
   });
   return stream;

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

@@ -1,5 +1,5 @@
 /**
-* @vue/server-renderer v3.5.43
+* @vue/server-renderer v3.5.44
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -231,6 +231,9 @@ function ssrRenderList(source, renderItem) {
       renderItem(source[i], i);
     }
   } else if (typeof source === "number") {
+    if (!Number.isInteger(source) || source < 0) {
+      return;
+    }
     for (let i = 0; i < source; i++) {
       renderItem(i + 1, i);
     }
@@ -411,23 +414,28 @@ function renderComponentVNode(vnode, parentComponent = null, slotScopeId) {
   );
   const hasAsyncSetup = shared.isPromise(res);
   let prefetches = instance.sp;
+  let p;
   if (hasAsyncSetup || prefetches) {
-    const p = Promise.resolve(res).then(() => {
+    p = Promise.resolve(res).then(() => {
       if (hasAsyncSetup) prefetches = instance.sp;
       if (prefetches) {
-        return Promise.all(
-          prefetches.map((prefetch) => prefetch.call(instance.proxy))
-        );
+        try {
+          return Promise.all(
+            prefetches.map((prefetch) => prefetch.call(instance.proxy))
+          ).catch(shared.NOOP);
+        } catch {
+        }
       }
-    }).catch(shared.NOOP);
-    return p.then(() => renderComponentSubTree(instance, slotScopeId));
+    }).then(() => renderComponentSubTree(instance, slotScopeId));
   } else {
     try {
       return renderComponentSubTree(instance, slotScopeId);
     } catch (err) {
-      return Promise.reject(err);
+      p = Promise.reject(err);
     }
   }
+  p.catch(shared.NOOP);
+  return p;
 }
 function renderComponentSubTree(instance, slotScopeId) {
   const comp = instance.type;
@@ -596,13 +604,13 @@ function renderElementVNode(push, vnode, parentComponent, slotScopeId) {
   if (!shared.isVoidTag(tag)) {
     let hasChildrenOverride = false;
     if (props) {
-      if (props.innerHTML) {
+      if (props.innerHTML != null) {
         hasChildrenOverride = true;
-        push(props.innerHTML);
-      } else if (props.textContent) {
+        push(String(props.innerHTML));
+      } else if (props.textContent != null) {
         hasChildrenOverride = true;
         push(shared.escapeHtml(props.textContent));
-      } else if (tag === "textarea" && props.value) {
+      } else if (tag === "textarea" && props.value != null) {
         hasChildrenOverride = true;
         push(shared.escapeHtml(props.value));
       }
@@ -718,15 +726,50 @@ async function renderToString(input, context = {}) {
   const vnode = Vue.createVNode(input._component, input._props);
   vnode.appContext = input._context;
   input.provide(Vue.ssrContextKey, context);
-  const buffer = await renderComponentVNode(vnode);
-  const result = await unrollBuffer$1(buffer);
-  await resolveTeleports(context);
-  if (context.__watcherHandles) {
-    for (const unwatch of context.__watcherHandles) {
-      unwatch();
+  let buffer;
+  let result;
+  try {
+    buffer = await renderComponentVNode(vnode);
+    result = await unrollBuffer$1(buffer);
+    await resolveTeleports(context);
+  } catch (err) {
+    cleanupFailedRender(buffer, context);
+    throw err;
+  }
+  stopWatchers(context);
+  return result;
+}
+function stopWatchers(context, start = 0) {
+  const handles = context.__watcherHandles;
+  if (handles) {
+    for (let i = start; i < handles.length; i++) {
+      handles[i]();
+    }
+  }
+}
+function cleanupFailedRender(buffer, context) {
+  const stopped = context.__watcherHandles ? context.__watcherHandles.length : 0;
+  try {
+    stopWatchers(context);
+  } catch {
+  }
+  (async () => {
+    if (buffer) await settleBuffer(buffer);
+    for (const key in context.__teleportBuffers) {
+      await settleBuffer(context.__teleportBuffers[key]);
+    }
+    stopWatchers(context, stopped);
+  })().catch(shared.NOOP);
+}
+async function settleBuffer(buffer) {
+  if (!buffer.hasAsync) return;
+  for (let item of buffer) {
+    try {
+      if (shared.isPromise(item)) item = await item;
+      if (!shared.isString(item)) await settleBuffer(item);
+    } catch {
     }
   }
-  return result;
 }
 async function resolveTeleports(context) {
   if (context.__teleportBuffers) {
@@ -778,13 +821,17 @@ function renderToSimpleStream(input, context, stream) {
   const vnode = Vue.createVNode(input._component, input._props);
   vnode.appContext = input._context;
   input.provide(Vue.ssrContextKey, context);
-  Promise.resolve(renderComponentVNode(vnode)).then((buffer) => unrollBuffer(buffer, stream)).then(() => resolveTeleports(context)).then(() => {
-    if (context.__watcherHandles) {
-      for (const unwatch of context.__watcherHandles) {
-        unwatch();
-      }
+  let buffer;
+  Promise.resolve(renderComponentVNode(vnode)).then((b) => unrollBuffer(buffer = b, stream)).then(() => resolveTeleports(context)).then(
+    () => {
+      stopWatchers(context);
+      stream.push(null);
+    },
+    (error) => {
+      cleanupFailedRender(buffer, context);
+      throw error;
     }
-  }).then(() => stream.push(null)).catch((error) => {
+  ).catch((error) => {
     stream.destroy(error);
   });
   return stream;