@vue/compat 3.4.4 → 3.4.6

package/dist/vue.cjs.js

@@ -1940,7 +1940,9 @@ function flushPreFlushCbs(instance, seen, i = isFlushing ? flushIndex + 1 : 0) {
 }
 function flushPostFlushCbs(seen) {
   if (pendingPostFlushCbs.length) {
-    const deduped = [...new Set(pendingPostFlushCbs)];
+    const deduped = [...new Set(pendingPostFlushCbs)].sort(
+      (a, b) => getId(a) - getId(b)
+    );
     pendingPostFlushCbs.length = 0;
     if (activePostFlushCbs) {
       activePostFlushCbs.push(...deduped);
@@ -1950,7 +1952,6 @@ function flushPostFlushCbs(seen) {
     {
       seen = seen || /* @__PURE__ */ new Map();
     }
-    activePostFlushCbs.sort((a, b) => getId(a) - getId(b));
     for (postFlushIndex = 0; postFlushIndex < activePostFlushCbs.length; postFlushIndex++) {
       if (checkRecursiveUpdates(seen, activePostFlushCbs[postFlushIndex])) {
         continue;
@@ -3564,6 +3565,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
   {
     assertNumber(timeout, `Suspense timeout`);
   }
+  const initialAnchor = anchor;
   const suspense = {
     vnode,
     parent: parentSuspense,
@@ -3571,7 +3573,6 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     namespace,
     container,
     hiddenContainer,
-    anchor,
     deps: 0,
     pendingId: suspenseId++,
     timeout: typeof timeout === "number" ? timeout : -1,
@@ -3614,20 +3615,21 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
               move(
                 pendingBranch,
                 container2,
-                next(activeBranch),
+                anchor === initialAnchor ? next(activeBranch) : anchor,
                 0
               );
               queuePostFlushCb(effects);
             }
           };
         }
-        let { anchor: anchor2 } = suspense;
         if (activeBranch) {
-          anchor2 = next(activeBranch);
+          if (parentNode(activeBranch.el) !== suspense.hiddenContainer) {
+            anchor = next(activeBranch);
+          }
           unmount(activeBranch, parentComponent2, suspense, true);
         }
         if (!delayEnter) {
-          move(pendingBranch, container2, anchor2, 0);
+          move(pendingBranch, container2, anchor, 0);
         }
       }
       setActiveBranch(suspense, pendingBranch);
@@ -4110,10 +4112,11 @@ function doWatch(source, cb, {
     scheduler = () => queueJob(job);
   }
   const effect = new ReactiveEffect(getter, NOOP, scheduler);
+  const scope = getCurrentScope();
   const unwatch = () => {
     effect.stop();
-    if (instance && instance.scope) {
-      remove(instance.scope.effects, effect);
+    if (scope) {
+      remove(scope.effects, effect);
     }
   };
   {
@@ -6601,7 +6604,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.4.4"}`;
+  Vue.version = `2.6.14-compat:${"3.4.6"}`;
   Vue.config = singletonApp.config;
   Vue.use = (p, ...options) => {
     if (p && isFunction(p.install)) {
@@ -8146,7 +8149,7 @@ Server rendered element contains more child nodes than client vdom.`
       if (props) {
         {
           for (const key in props) {
-            if (propHasMismatch(el, key, props[key])) {
+            if (propHasMismatch(el, key, props[key], vnode)) {
               hasMismatch = true;
             }
             if (forcePatch && (key.endsWith("value") || key === "indeterminate") || isOn(key) && !isReservedProp(key) || // force hydrate v-bind with .prop modifiers
@@ -8321,7 +8324,7 @@ Server rendered element contains fewer child nodes than client vdom.`
   };
   return [hydrate, hydrateNode];
 }
-function propHasMismatch(el, key, clientValue) {
+function propHasMismatch(el, key, clientValue, vnode) {
   let mismatchType;
   let mismatchKey;
   let actual;
@@ -8333,14 +8336,23 @@ function propHasMismatch(el, key, clientValue) {
       mismatchType = mismatchKey = `class`;
     }
   } else if (key === "style") {
-    actual = el.getAttribute("style");
-    expected = isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue));
-    if (actual !== expected) {
+    actual = toStyleMap(el.getAttribute("style") || "");
+    expected = toStyleMap(
+      isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue))
+    );
+    if (vnode.dirs) {
+      for (const { dir, value } of vnode.dirs) {
+        if (dir.name === "show" && !value) {
+          expected.set("display", "none");
+        }
+      }
+    }
+    if (!isMapEqual(actual, expected)) {
       mismatchType = mismatchKey = "style";
     }
   } else if (el instanceof SVGElement && isKnownSvgAttr(key) || el instanceof HTMLElement && (isBooleanAttr(key) || isKnownHtmlAttr(key))) {
-    actual = el.hasAttribute(key) && el.getAttribute(key);
-    expected = isBooleanAttr(key) ? includeBooleanAttr(clientValue) ? "" : false : clientValue == null ? false : String(clientValue);
+    actual = el.hasAttribute(key) ? el.getAttribute(key) : key in el ? el[key] : "";
+    expected = isBooleanAttr(key) ? includeBooleanAttr(clientValue) ? "" : false : clientValue == null ? "" : String(clientValue);
     if (actual !== expected) {
       mismatchType = `attribute`;
       mismatchKey = key;
@@ -8375,6 +8387,29 @@ function isSetEqual(a, b) {
   }
   return true;
 }
+function toStyleMap(str) {
+  const styleMap = /* @__PURE__ */ new Map();
+  for (const item of str.split(";")) {
+    let [key, value] = item.split(":");
+    key = key == null ? void 0 : key.trim();
+    value = value == null ? void 0 : value.trim();
+    if (key && value) {
+      styleMap.set(key, value);
+    }
+  }
+  return styleMap;
+}
+function isMapEqual(a, b) {
+  if (a.size !== b.size) {
+    return false;
+  }
+  for (const [key, value] of a) {
+    if (value !== b.get(key)) {
+      return false;
+    }
+  }
+  return true;
+}
 
 let supported;
 let perf;
@@ -8963,7 +8998,11 @@ function baseCreateRenderer(options, createHydrationFns) {
       hostInsert(fragmentStartAnchor, container, anchor);
       hostInsert(fragmentEndAnchor, container, anchor);
       mountChildren(
-        n2.children,
+        // #10007
+        // such fragment like `<></>` will be compiled into
+        // a fragment which doesn't have a children.
+        // In this case fallback to an empty array
+        n2.children || [],
         container,
         fragmentEndAnchor,
         parentComponent,
@@ -9831,6 +9870,7 @@ function baseCreateRenderer(options, createHydrationFns) {
     }
     return hostNextSibling(vnode.anchor || vnode.el);
   };
+  let isFlushing = false;
   const render = (vnode, container, namespace) => {
     if (vnode == null) {
       if (container._vnode) {
@@ -9847,8 +9887,12 @@ function baseCreateRenderer(options, createHydrationFns) {
         namespace
       );
     }
-    flushPreFlushCbs();
-    flushPostFlushCbs();
+    if (!isFlushing) {
+      isFlushing = true;
+      flushPreFlushCbs();
+      flushPostFlushCbs();
+      isFlushing = false;
+    }
     container._vnode = vnode;
   };
   const internals = {
@@ -10752,7 +10796,14 @@ function createComponentInstance(vnode, parent, suspense) {
   return instance;
 }
 let currentInstance = null;
-const getCurrentInstance = () => currentInstance || currentRenderingInstance;
+const getCurrentInstance = () => {
+  if (isInComputedGetter) {
+    warn$1(
+      `getCurrentInstance() called inside a computed getter. This is incorrect usage as computed getters are not guaranteed to be executed with an active component instance. If you are using a composable inside a computed getter, move it ouside to the setup scope.`
+    );
+  }
+  return currentInstance || currentRenderingInstance;
+};
 let internalSetCurrentInstance;
 let setInSSRSetupState;
 {
@@ -11095,7 +11146,25 @@ function isClassComponent(value) {
   return isFunction(value) && "__vccOpts" in value;
 }
 
+let isInComputedGetter = false;
+function wrapComputedGetter(getter) {
+  return () => {
+    isInComputedGetter = true;
+    try {
+      return getter();
+    } finally {
+      isInComputedGetter = false;
+    }
+  };
+}
 const computed = (getterOrOptions, debugOptions) => {
+  {
+    if (isFunction(getterOrOptions)) {
+      getterOrOptions = wrapComputedGetter(getterOrOptions);
+    } else {
+      getterOrOptions.get = wrapComputedGetter(getterOrOptions.get);
+    }
+  }
   return computed$1(getterOrOptions, debugOptions, isInSSRComponentSetup);
 };
 
@@ -11321,7 +11390,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.4.4";
+const version = "3.4.6";
 const warn = warn$1 ;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = devtools$1 ;
@@ -11770,6 +11839,9 @@ const vShow = {
     setDisplay(el, value);
   }
 };
+{
+  vShow.name = "show";
+}
 function setDisplay(el, value) {
   el.style.display = value ? el[vShowOldKey] : "none";
 }
@@ -14488,6 +14560,18 @@ function isInDestructureAssignment(parent, parentStack) {
   }
   return false;
 }
+function isInNewExpression(parentStack) {
+  let i = parentStack.length;
+  while (i--) {
+    const p = parentStack[i];
+    if (p.type === "NewExpression") {
+      return true;
+    } else if (p.type !== "MemberExpression") {
+      break;
+    }
+  }
+  return false;
+}
 function walkFunctionParams(node, onIdent) {
   for (const p of node.params) {
     for (const id of extractIdentifiers(p)) {
@@ -17073,12 +17157,17 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
       const isAssignmentLVal = parent && parent.type === "AssignmentExpression" && parent.left === id;
       const isUpdateArg = parent && parent.type === "UpdateExpression" && parent.argument === id;
       const isDestructureAssignment = parent && isInDestructureAssignment(parent, parentStack);
+      const isNewExpression = parent && isInNewExpression(parentStack);
+      const wrapWithUnref = (raw2) => {
+        const wrapped = `${context.helperString(UNREF)}(${raw2})`;
+        return isNewExpression ? `(${wrapped})` : wrapped;
+      };
       if (isConst(type) || type === "setup-reactive-const" || localVars[raw]) {
         return raw;
       } else if (type === "setup-ref") {
         return `${raw}.value`;
       } else if (type === "setup-maybe-ref") {
-        return isAssignmentLVal || isUpdateArg || isDestructureAssignment ? `${raw}.value` : `${context.helperString(UNREF)}(${raw})`;
+        return isAssignmentLVal || isUpdateArg || isDestructureAssignment ? `${raw}.value` : wrapWithUnref(raw);
       } else if (type === "setup-let") {
         if (isAssignmentLVal) {
           const { right: rVal, operator } = parent;
@@ -17105,7 +17194,7 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
         } else if (isDestructureAssignment) {
           return raw;
         } else {
-          return `${context.helperString(UNREF)}(${raw})`;
+          return wrapWithUnref(raw);
         }
       } else if (type === "props") {
         return genPropsAccessExp(raw);

package/dist/vue.cjs.prod.js

@@ -1657,14 +1657,15 @@ function flushPreFlushCbs(instance, seen, i = isFlushing ? flushIndex + 1 : 0) {
 }
 function flushPostFlushCbs(seen) {
   if (pendingPostFlushCbs.length) {
-    const deduped = [...new Set(pendingPostFlushCbs)];
+    const deduped = [...new Set(pendingPostFlushCbs)].sort(
+      (a, b) => getId(a) - getId(b)
+    );
     pendingPostFlushCbs.length = 0;
     if (activePostFlushCbs) {
       activePostFlushCbs.push(...deduped);
       return;
     }
     activePostFlushCbs = deduped;
-    activePostFlushCbs.sort((a, b) => getId(a) - getId(b));
     for (postFlushIndex = 0; postFlushIndex < activePostFlushCbs.length; postFlushIndex++) {
       activePostFlushCbs[postFlushIndex]();
     }
@@ -2617,6 +2618,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     }
   }
   const timeout = vnode.props ? toNumber(vnode.props.timeout) : void 0;
+  const initialAnchor = anchor;
   const suspense = {
     vnode,
     parent: parentSuspense,
@@ -2624,7 +2626,6 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     namespace,
     container,
     hiddenContainer,
-    anchor,
     deps: 0,
     pendingId: suspenseId++,
     timeout: typeof timeout === "number" ? timeout : -1,
@@ -2655,20 +2656,21 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
               move(
                 pendingBranch,
                 container2,
-                next(activeBranch),
+                anchor === initialAnchor ? next(activeBranch) : anchor,
                 0
               );
               queuePostFlushCb(effects);
             }
           };
         }
-        let { anchor: anchor2 } = suspense;
         if (activeBranch) {
-          anchor2 = next(activeBranch);
+          if (parentNode(activeBranch.el) !== suspense.hiddenContainer) {
+            anchor = next(activeBranch);
+          }
           unmount(activeBranch, parentComponent2, suspense, true);
         }
         if (!delayEnter) {
-          move(pendingBranch, container2, anchor2, 0);
+          move(pendingBranch, container2, anchor, 0);
         }
       }
       setActiveBranch(suspense, pendingBranch);
@@ -3100,10 +3102,11 @@ function doWatch(source, cb, {
     scheduler = () => queueJob(job);
   }
   const effect = new ReactiveEffect(getter, NOOP, scheduler);
+  const scope = getCurrentScope();
   const unwatch = () => {
     effect.stop();
-    if (instance && instance.scope) {
-      remove(instance.scope.effects, effect);
+    if (scope) {
+      remove(scope.effects, effect);
     }
   };
   if (cb) {
@@ -5282,7 +5285,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.4.4"}`;
+  Vue.version = `2.6.14-compat:${"3.4.6"}`;
   Vue.config = singletonApp.config;
   Vue.use = (p, ...options) => {
     if (p && isFunction(p.install)) {
@@ -7179,7 +7182,11 @@ function baseCreateRenderer(options, createHydrationFns) {
       hostInsert(fragmentStartAnchor, container, anchor);
       hostInsert(fragmentEndAnchor, container, anchor);
       mountChildren(
-        n2.children,
+        // #10007
+        // such fragment like `<></>` will be compiled into
+        // a fragment which doesn't have a children.
+        // In this case fallback to an empty array
+        n2.children || [],
         container,
         fragmentEndAnchor,
         parentComponent,
@@ -7961,6 +7968,7 @@ function baseCreateRenderer(options, createHydrationFns) {
     }
     return hostNextSibling(vnode.anchor || vnode.el);
   };
+  let isFlushing = false;
   const render = (vnode, container, namespace) => {
     if (vnode == null) {
       if (container._vnode) {
@@ -7977,8 +7985,12 @@ function baseCreateRenderer(options, createHydrationFns) {
         namespace
       );
     }
-    flushPreFlushCbs();
-    flushPostFlushCbs();
+    if (!isFlushing) {
+      isFlushing = true;
+      flushPreFlushCbs();
+      flushPostFlushCbs();
+      isFlushing = false;
+    }
     container._vnode = vnode;
   };
   const internals = {
@@ -8822,7 +8834,9 @@ function createComponentInstance(vnode, parent, suspense) {
   return instance;
 }
 let currentInstance = null;
-const getCurrentInstance = () => currentInstance || currentRenderingInstance;
+const getCurrentInstance = () => {
+  return currentInstance || currentRenderingInstance;
+};
 let internalSetCurrentInstance;
 let setInSSRSetupState;
 {
@@ -9082,7 +9096,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.4.4";
+const version = "3.4.6";
 const warn$1 = NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = void 0;
@@ -12078,6 +12092,18 @@ function isInDestructureAssignment(parent, parentStack) {
   }
   return false;
 }
+function isInNewExpression(parentStack) {
+  let i = parentStack.length;
+  while (i--) {
+    const p = parentStack[i];
+    if (p.type === "NewExpression") {
+      return true;
+    } else if (p.type !== "MemberExpression") {
+      break;
+    }
+  }
+  return false;
+}
 function walkFunctionParams(node, onIdent) {
   for (const p of node.params) {
     for (const id of extractIdentifiers(p)) {
@@ -14590,12 +14616,17 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
       const isAssignmentLVal = parent && parent.type === "AssignmentExpression" && parent.left === id;
       const isUpdateArg = parent && parent.type === "UpdateExpression" && parent.argument === id;
       const isDestructureAssignment = parent && isInDestructureAssignment(parent, parentStack);
+      const isNewExpression = parent && isInNewExpression(parentStack);
+      const wrapWithUnref = (raw2) => {
+        const wrapped = `${context.helperString(UNREF)}(${raw2})`;
+        return isNewExpression ? `(${wrapped})` : wrapped;
+      };
       if (isConst(type) || type === "setup-reactive-const" || localVars[raw]) {
         return raw;
       } else if (type === "setup-ref") {
         return `${raw}.value`;
       } else if (type === "setup-maybe-ref") {
-        return isAssignmentLVal || isUpdateArg || isDestructureAssignment ? `${raw}.value` : `${context.helperString(UNREF)}(${raw})`;
+        return isAssignmentLVal || isUpdateArg || isDestructureAssignment ? `${raw}.value` : wrapWithUnref(raw);
       } else if (type === "setup-let") {
         if (isAssignmentLVal) {
           const { right: rVal, operator } = parent;
@@ -14622,7 +14653,7 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
         } else if (isDestructureAssignment) {
           return raw;
         } else {
-          return `${context.helperString(UNREF)}(${raw})`;
+          return wrapWithUnref(raw);
         }
       } else if (type === "props") {
         return genPropsAccessExp(raw);