@vue/server-renderer 3.5.17 → 3.6.0-alpha.2

package/dist/server-renderer.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/server-renderer v3.5.17
+* @vue/server-renderer v3.6.0-alpha.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -78,9 +78,23 @@ function ssrRenderStyle(raw) {
   if (shared.isString(raw)) {
     return shared.escapeHtml(raw);
   }
-  const styles = shared.normalizeStyle(raw);
+  const styles = shared.normalizeStyle(ssrResetCssVars(raw));
   return shared.escapeHtml(shared.stringifyStyle(styles));
 }
+function ssrResetCssVars(raw) {
+  if (!shared.isArray(raw) && shared.isObject(raw)) {
+    const res = {};
+    for (const key in raw) {
+      if (key.startsWith(":--")) {
+        res[key.slice(1)] = shared.normalizeCssVarValue(raw[key]);
+      } else {
+        res[key] = raw[key];
+      }
+    }
+    return res;
+  }
+  return raw;
+}
 
 function ssrRenderComponent(comp, props = null, children = null, parentComponent = null, slotScopeId) {
   return renderComponentVNode(
@@ -194,6 +208,15 @@ function ssrInterpolate(value) {
   return shared.escapeHtml(shared.toDisplayString(value));
 }
 
+let activeSub = void 0;
+function setActiveSub(sub) {
+  try {
+    return activeSub;
+  } finally {
+    activeSub = sub;
+  }
+}
+
 function toRaw(observed) {
   const raw = observed && observed["__v_raw"];
   return raw ? toRaw(raw) : observed;
@@ -204,8 +227,8 @@ function isRef(r) {
 }
 
 const stack = [];
-function pushWarningContext$1(vnode) {
-  stack.push(vnode);
+function pushWarningContext$1(ctx) {
+  stack.push(ctx);
 }
 function popWarningContext$1() {
   stack.pop();
@@ -214,7 +237,9 @@ let isWarning = false;
 function warn$1(msg, ...args) {
   if (isWarning) return;
   isWarning = true;
-  const instance = stack.length ? stack[stack.length - 1].component : null;
+  const prevSub = setActiveSub();
+  const entry = stack.length ? stack[stack.length - 1] : null;
+  const instance = isVNode$2(entry) ? entry.component : entry;
   const appWarnHandler = instance && instance.appContext.config.warnHandler;
   const trace = getComponentTrace();
   if (appWarnHandler) {
@@ -228,9 +253,9 @@ function warn$1(msg, ...args) {
           var _a, _b;
           return (_b = (_a = a.toString) == null ? void 0 : _a.call(a)) != null ? _b : JSON.stringify(a);
         }).join(""),
-        instance && instance.proxy,
+        instance && instance.proxy || instance,
         trace.map(
-          ({ vnode }) => `at <${formatComponentName(instance, vnode.type)}>`
+          ({ ctx }) => `at <${formatComponentName(instance, ctx.type)}>`
         ).join("\n"),
         trace
       ]
@@ -244,26 +269,31 @@ function warn$1(msg, ...args) {
     }
     console.warn(...warnArgs);
   }
+  setActiveSub(prevSub);
   isWarning = false;
 }
 function getComponentTrace() {
-  let currentVNode = stack[stack.length - 1];
-  if (!currentVNode) {
+  let currentCtx = stack[stack.length - 1];
+  if (!currentCtx) {
     return [];
   }
   const normalizedStack = [];
-  while (currentVNode) {
+  while (currentCtx) {
     const last = normalizedStack[0];
-    if (last && last.vnode === currentVNode) {
+    if (last && last.ctx === currentCtx) {
       last.recurseCount++;
     } else {
       normalizedStack.push({
-        vnode: currentVNode,
+        ctx: currentCtx,
         recurseCount: 0
       });
     }
-    const parentInstance = currentVNode.component && currentVNode.component.parent;
-    currentVNode = parentInstance && parentInstance.vnode;
+    if (isVNode$2(currentCtx)) {
+      const parent = currentCtx.component && currentCtx.component.parent;
+      currentCtx = parent && parent.vnode || parent;
+    } else {
+      currentCtx = currentCtx.parent;
+    }
   }
   return normalizedStack;
 }
@@ -275,16 +305,13 @@ function formatTrace(trace) {
   });
   return logs;
 }
-function formatTraceEntry({ vnode, recurseCount }) {
+function formatTraceEntry({ ctx, 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 instance = isVNode$2(ctx) ? ctx.component : ctx;
+  const isRoot = instance ? instance.parent == null : false;
+  const open = ` at <${formatComponentName(instance, ctx.type, isRoot)}`;
   const close = `>` + postfix;
-  return vnode.props ? [open, ...formatProps(vnode.props), close] : [open + close];
+  return ctx.props ? [open, ...formatProps(ctx.props), close] : [open + close];
 }
 function formatProps(props) {
   const res = [];
@@ -355,11 +382,10 @@ 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;
+    const exposedInstance = instance.proxy || instance;
     const errorInfo = ErrorTypeStrings[type] ;
     while (cur) {
       const errorCapturedHooks = cur.ec;
@@ -373,24 +399,26 @@ function handleError(err, instance, type, throwInDev = true) {
       cur = cur.parent;
     }
     if (errorHandler) {
+      const prevSub = setActiveSub();
       callWithErrorHandling(errorHandler, null, 10, [
         err,
         exposedInstance,
         errorInfo
       ]);
+      setActiveSub(prevSub);
       return;
     }
   }
-  logError(err, type, contextVNode, throwInDev, throwUnhandledErrorInProduction);
+  logError(err, type, instance, throwInDev, throwUnhandledErrorInProduction);
 }
-function logError(err, type, contextVNode, throwInDev = true, throwInProd = false) {
+function logError(err, type, instance, throwInDev = true, throwInProd = false) {
   {
     const info = ErrorTypeStrings[type];
-    if (contextVNode) {
-      pushWarningContext$1(contextVNode);
+    if (instance) {
+      pushWarningContext$1(instance);
     }
     warn$1(`Unhandled error${info ? ` during execution of ${info}` : ``}`);
-    if (contextVNode) {
+    if (instance) {
       popWarningContext$1();
     }
     if (throwInDev) {
@@ -401,26 +429,10 @@ function logError(err, type, contextVNode, throwInDev = true, throwInProd = fals
   }
 }
 
-{
-  const g = shared.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
-  );
+function isVNode$2(value) {
+  return value ? value.__v_isVNode === true : false;
 }
+
 const classifyRE = /(?:^|[-_])(\w)/g;
 const classify = (str) => str.replace(classifyRE, (c) => c.toUpperCase()).replace(/[-_]/g, "");
 function getComponentName(Component, includeInferred = true) {

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

@@ -1,5 +1,5 @@
 /**
-* @vue/server-renderer v3.5.17
+* @vue/server-renderer v3.6.0-alpha.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -78,9 +78,23 @@ function ssrRenderStyle(raw) {
   if (shared.isString(raw)) {
     return shared.escapeHtml(raw);
   }
-  const styles = shared.normalizeStyle(raw);
+  const styles = shared.normalizeStyle(ssrResetCssVars(raw));
   return shared.escapeHtml(shared.stringifyStyle(styles));
 }
+function ssrResetCssVars(raw) {
+  if (!shared.isArray(raw) && shared.isObject(raw)) {
+    const res = {};
+    for (const key in raw) {
+      if (key.startsWith(":--")) {
+        res[key.slice(1)] = shared.normalizeCssVarValue(raw[key]);
+      } else {
+        res[key] = raw[key];
+      }
+    }
+    return res;
+  }
+  return raw;
+}
 
 function ssrRenderComponent(comp, props = null, children = null, parentComponent = null, slotScopeId) {
   return renderComponentVNode(