@vue/compat 3.4.5 → 3.4.7

package/dist/vue.runtime.esm-bundler.js

@@ -1828,7 +1828,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);
@@ -1838,7 +1840,6 @@ function flushPostFlushCbs(seen) {
     if (!!(process.env.NODE_ENV !== "production")) {
       seen = seen || /* @__PURE__ */ new Map();
     }
-    activePostFlushCbs.sort((a, b) => getId(a) - getId(b));
     for (postFlushIndex = 0; postFlushIndex < activePostFlushCbs.length; postFlushIndex++) {
       if (!!(process.env.NODE_ENV !== "production") && checkRecursiveUpdates(seen, activePostFlushCbs[postFlushIndex])) {
         continue;
@@ -3455,6 +3456,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
   if (!!(process.env.NODE_ENV !== "production")) {
     assertNumber(timeout, `Suspense timeout`);
   }
+  const initialAnchor = anchor;
   const suspense = {
     vnode,
     parent: parentSuspense,
@@ -3462,7 +3464,6 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     namespace,
     container,
     hiddenContainer,
-    anchor,
     deps: 0,
     pendingId: suspenseId++,
     timeout: typeof timeout === "number" ? timeout : -1,
@@ -3505,20 +3506,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);
@@ -4040,14 +4042,9 @@ function instanceWatch(source, value, options) {
     cb = value.handler;
     options = value;
   }
-  const cur = currentInstance;
-  setCurrentInstance(this);
+  const reset = setCurrentInstance(this);
   const res = doWatch(getter, cb.bind(publicThis), options);
-  if (cur) {
-    setCurrentInstance(cur);
-  } else {
-    unsetCurrentInstance();
-  }
+  reset();
   return res;
 }
 function createPathGetter(ctx, path) {
@@ -4099,12 +4096,11 @@ function validateDirectiveName(name) {
   }
 }
 function withDirectives(vnode, directives) {
-  const internalInstance = currentRenderingInstance;
-  if (internalInstance === null) {
+  if (currentRenderingInstance === null) {
     !!(process.env.NODE_ENV !== "production") && warn$1(`withDirectives can only be used inside render functions.`);
     return vnode;
   }
-  const instance = getExposeProxy(internalInstance) || internalInstance.proxy;
+  const instance = getExposeProxy(currentRenderingInstance) || currentRenderingInstance.proxy;
   const bindings = vnode.dirs || (vnode.dirs = []);
   for (let i = 0; i < directives.length; i++) {
     let [dir, value, arg, modifiers = EMPTY_OBJ] = directives[i];
@@ -4901,9 +4897,9 @@ function injectHook(type, hook, target = currentInstance, prepend = false) {
         return;
       }
       pauseTracking();
-      setCurrentInstance(target);
+      const reset = setCurrentInstance(target);
       const res = callWithAsyncErrorHandling(hook, target, type, args);
-      unsetCurrentInstance();
+      reset();
       resetTracking();
       return res;
     });
@@ -6497,7 +6493,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.4.5"}`;
+  Vue.version = `2.6.14-compat:${"3.4.7"}`;
   Vue.config = singletonApp.config;
   Vue.use = (p, ...options) => {
     if (p && isFunction(p.install)) {
@@ -7340,12 +7336,12 @@ function resolvePropValue(options, props, key, value, instance, isAbsent) {
         if (key in propsDefaults) {
           value = propsDefaults[key];
         } else {
-          setCurrentInstance(instance);
+          const reset = setCurrentInstance(instance);
           value = propsDefaults[key] = defaultValue.call(
             isCompatEnabled("PROPS_DEFAULT_THIS", instance) ? createPropsDefaultThis(instance, props, key) : null,
             props
           );
-          unsetCurrentInstance();
+          reset();
         }
       } else {
         value = defaultValue;
@@ -8045,7 +8041,7 @@ Server rendered element contains more child nodes than client vdom.`
       if (props) {
         if (!!(process.env.NODE_ENV !== "production") || forcePatch || !optimized || patchFlag & (16 | 32)) {
           for (const key in props) {
-            if (!!(process.env.NODE_ENV !== "production") && propHasMismatch(el, key, props[key])) {
+            if (!!(process.env.NODE_ENV !== "production") && 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
@@ -8230,7 +8226,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;
@@ -8242,14 +8238,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;
@@ -8284,6 +8289,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;
@@ -8897,7 +8925,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,
@@ -9778,6 +9810,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) {
@@ -9794,8 +9827,12 @@ function baseCreateRenderer(options, createHydrationFns) {
         namespace
       );
     }
-    flushPreFlushCbs();
-    flushPostFlushCbs();
+    if (!isFlushing) {
+      isFlushing = true;
+      flushPreFlushCbs();
+      flushPostFlushCbs();
+      isFlushing = false;
+    }
     container._vnode = vnode;
   };
   const internals = {
@@ -10728,8 +10765,13 @@ let setInSSRSetupState;
   );
 }
 const setCurrentInstance = (instance) => {
+  const prev = currentInstance;
   internalSetCurrentInstance(instance);
   instance.scope.on();
+  return () => {
+    instance.scope.off();
+    internalSetCurrentInstance(prev);
+  };
 };
 const unsetCurrentInstance = () => {
   currentInstance && currentInstance.scope.off();
@@ -10791,7 +10833,7 @@ function setupStatefulComponent(instance, isSSR) {
   const { setup } = Component;
   if (setup) {
     const setupContext = instance.setupContext = setup.length > 1 ? createSetupContext(instance) : null;
-    setCurrentInstance(instance);
+    const reset = setCurrentInstance(instance);
     pauseTracking();
     const setupResult = callWithErrorHandling(
       setup,
@@ -10803,7 +10845,7 @@ function setupStatefulComponent(instance, isSSR) {
       ]
     );
     resetTracking();
-    unsetCurrentInstance();
+    reset();
     if (isPromise(setupResult)) {
       setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
       if (isSSR) {
@@ -10911,13 +10953,13 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
     }
   }
   if (__VUE_OPTIONS_API__ && !skipOptions) {
-    setCurrentInstance(instance);
+    const reset = setCurrentInstance(instance);
     pauseTracking();
     try {
       applyOptions(instance);
     } finally {
       resetTracking();
-      unsetCurrentInstance();
+      reset();
     }
   }
   if (!!(process.env.NODE_ENV !== "production") && !Component.render && instance.render === NOOP && !isSSR) {
@@ -11284,7 +11326,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.4.5";
+const version = "3.4.7";
 const warn = !!(process.env.NODE_ENV !== "production") ? warn$1 : NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = !!(process.env.NODE_ENV !== "production") || __VUE_PROD_DEVTOOLS__ ? devtools$1 : void 0;
@@ -11733,6 +11775,9 @@ const vShow = {
     setDisplay(el, value);
   }
 };
+if (!!(process.env.NODE_ENV !== "production")) {
+  vShow.name = "show";
+}
 function setDisplay(el, value) {
   el.style.display = value ? el[vShowOldKey] : "none";
 }

package/dist/vue.runtime.global.js

@@ -1827,7 +1827,9 @@ var Vue = (function () {
   }
   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);
@@ -1837,7 +1839,6 @@ var Vue = (function () {
       {
         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;
@@ -3451,6 +3452,7 @@ If this is a native custom element, make sure to exclude it from component resol
     {
       assertNumber(timeout, `Suspense timeout`);
     }
+    const initialAnchor = anchor;
     const suspense = {
       vnode,
       parent: parentSuspense,
@@ -3458,7 +3460,6 @@ If this is a native custom element, make sure to exclude it from component resol
       namespace,
       container,
       hiddenContainer,
-      anchor,
       deps: 0,
       pendingId: suspenseId++,
       timeout: typeof timeout === "number" ? timeout : -1,
@@ -3501,20 +3502,21 @@ If this is a native custom element, make sure to exclude it from component resol
                 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);
@@ -4009,14 +4011,9 @@ If this is a native custom element, make sure to exclude it from component resol
       cb = value.handler;
       options = value;
     }
-    const cur = currentInstance;
-    setCurrentInstance(this);
+    const reset = setCurrentInstance(this);
     const res = doWatch(getter, cb.bind(publicThis), options);
-    if (cur) {
-      setCurrentInstance(cur);
-    } else {
-      unsetCurrentInstance();
-    }
+    reset();
     return res;
   }
   function createPathGetter(ctx, path) {
@@ -4068,12 +4065,11 @@ If this is a native custom element, make sure to exclude it from component resol
     }
   }
   function withDirectives(vnode, directives) {
-    const internalInstance = currentRenderingInstance;
-    if (internalInstance === null) {
+    if (currentRenderingInstance === null) {
       warn$1(`withDirectives can only be used inside render functions.`);
       return vnode;
     }
-    const instance = getExposeProxy(internalInstance) || internalInstance.proxy;
+    const instance = getExposeProxy(currentRenderingInstance) || currentRenderingInstance.proxy;
     const bindings = vnode.dirs || (vnode.dirs = []);
     for (let i = 0; i < directives.length; i++) {
       let [dir, value, arg, modifiers = EMPTY_OBJ] = directives[i];
@@ -4862,9 +4858,9 @@ If this is a native custom element, make sure to exclude it from component resol
           return;
         }
         pauseTracking();
-        setCurrentInstance(target);
+        const reset = setCurrentInstance(target);
         const res = callWithAsyncErrorHandling(hook, target, type, args);
-        unsetCurrentInstance();
+        reset();
         resetTracking();
         return res;
       });
@@ -6456,7 +6452,7 @@ If this is a native custom element, make sure to exclude it from component resol
         return vm;
       }
     }
-    Vue.version = `2.6.14-compat:${"3.4.5"}`;
+    Vue.version = `2.6.14-compat:${"3.4.7"}`;
     Vue.config = singletonApp.config;
     Vue.use = (p, ...options) => {
       if (p && isFunction(p.install)) {
@@ -7296,12 +7292,12 @@ If you want to remount the same app, move your app creation logic into a factory
           if (key in propsDefaults) {
             value = propsDefaults[key];
           } else {
-            setCurrentInstance(instance);
+            const reset = setCurrentInstance(instance);
             value = propsDefaults[key] = defaultValue.call(
               isCompatEnabled("PROPS_DEFAULT_THIS", instance) ? createPropsDefaultThis(instance, props, key) : null,
               props
             );
-            unsetCurrentInstance();
+            reset();
           }
         } else {
           value = defaultValue;
@@ -8001,7 +7997,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
@@ -8176,7 +8172,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;
@@ -8188,14 +8184,23 @@ Server rendered element contains fewer child nodes than client vdom.`
         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;
@@ -8230,6 +8235,29 @@ Server rendered element contains fewer child nodes than client vdom.`
     }
     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;
@@ -8818,7 +8846,11 @@ Server rendered element contains fewer child nodes than client vdom.`
         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,
@@ -9686,6 +9718,7 @@ Server rendered element contains fewer child nodes than client vdom.`
       }
       return hostNextSibling(vnode.anchor || vnode.el);
     };
+    let isFlushing = false;
     const render = (vnode, container, namespace) => {
       if (vnode == null) {
         if (container._vnode) {
@@ -9702,8 +9735,12 @@ Server rendered element contains fewer child nodes than client vdom.`
           namespace
         );
       }
-      flushPreFlushCbs();
-      flushPostFlushCbs();
+      if (!isFlushing) {
+        isFlushing = true;
+        flushPreFlushCbs();
+        flushPostFlushCbs();
+        isFlushing = false;
+      }
       container._vnode = vnode;
     };
     const internals = {
@@ -10619,8 +10656,13 @@ Component that was made reactive: `,
     };
   }
   const setCurrentInstance = (instance) => {
+    const prev = currentInstance;
     internalSetCurrentInstance(instance);
     instance.scope.on();
+    return () => {
+      instance.scope.off();
+      internalSetCurrentInstance(prev);
+    };
   };
   const unsetCurrentInstance = () => {
     currentInstance && currentInstance.scope.off();
@@ -10682,7 +10724,7 @@ Component that was made reactive: `,
     const { setup } = Component;
     if (setup) {
       const setupContext = instance.setupContext = setup.length > 1 ? createSetupContext(instance) : null;
-      setCurrentInstance(instance);
+      const reset = setCurrentInstance(instance);
       pauseTracking();
       const setupResult = callWithErrorHandling(
         setup,
@@ -10694,7 +10736,7 @@ Component that was made reactive: `,
         ]
       );
       resetTracking();
-      unsetCurrentInstance();
+      reset();
       if (isPromise(setupResult)) {
         setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
         if (isSSR) {
@@ -10800,13 +10842,13 @@ Component that was made reactive: `,
       }
     }
     if (!skipOptions) {
-      setCurrentInstance(instance);
+      const reset = setCurrentInstance(instance);
       pauseTracking();
       try {
         applyOptions(instance);
       } finally {
         resetTracking();
-        unsetCurrentInstance();
+        reset();
       }
     }
     if (!Component.render && instance.render === NOOP && !isSSR) {
@@ -11159,7 +11201,7 @@ Component that was made reactive: `,
     return true;
   }
 
-  const version = "3.4.5";
+  const version = "3.4.7";
   const warn = warn$1 ;
   const ErrorTypeStrings = ErrorTypeStrings$1 ;
   const devtools = devtools$1 ;
@@ -11600,6 +11642,9 @@ Component that was made reactive: `,
       setDisplay(el, value);
     }
   };
+  {
+    vShow.name = "show";
+  }
   function setDisplay(el, value) {
     el.style.display = value ? el[vShowOldKey] : "none";
   }