@vue/compat 3.5.41 → 3.5.42

package/dist/vue.esm-bundler.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compat v3.5.41
+* @vue/compat v3.5.42
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -302,6 +302,23 @@ function looseCompareArrays(a, b) {
   }
   return equal;
 }
+function looseCompareCollections(a, b) {
+  if (a.size !== b.size) return false;
+  const candidates = Array.from(b);
+  const matched = new Uint8Array(candidates.length);
+  for (const item of a) {
+    let index = -1;
+    for (let i = 0; i < candidates.length; i++) {
+      if (!matched[i] && looseEqual(item, candidates[i])) {
+        index = i;
+        break;
+      }
+    }
+    if (index < 0) return false;
+    matched[index] = 1;
+  }
+  return true;
+}
 function looseEqual(a, b) {
   if (a === b) return true;
   let aValidType = isDate(a);
@@ -325,6 +342,16 @@ function looseEqual(a, b) {
     if (!aValidType || !bValidType) {
       return false;
     }
+    aValidType = isMap(a);
+    bValidType = isMap(b);
+    if (aValidType || bValidType) {
+      return aValidType && bValidType ? looseCompareCollections(a, b) : false;
+    }
+    aValidType = isSet(a);
+    bValidType = isSet(b);
+    if (aValidType || bValidType) {
+      return aValidType && bValidType ? looseCompareCollections(a, b) : false;
+    }
     const aKeysCount = Object.keys(a).length;
     const bKeysCount = Object.keys(b).length;
     if (aKeysCount !== bKeysCount) {
@@ -4897,10 +4924,10 @@ function createHydrationFunctions(rendererInternals) {
             getContainerType(container),
             optimized
           );
-          if (isAsyncWrapper(vnode) && !vnode.type.__asyncResolved) {
+          if (isAsyncWrapper(vnode) && !vnode.component.subTree) {
             let subTree;
             if (isFragmentStart) {
-              subTree = createVNode(Fragment);
+              subTree = createVNode(Static);
               subTree.anchor = nextNode ? nextNode.previousSibling : container.lastChild;
             } else {
               subTree = node.nodeType === 3 ? createTextVNode("") : createVNode("div");
@@ -5821,7 +5848,10 @@ const KeepAliveImpl = {
       if (pendingCacheKey != null) {
         if (isSuspense(instance.subTree.type)) {
           queuePostRenderEffect(() => {
-            cache.set(pendingCacheKey, getInnerChild(instance.subTree));
+            const vnode = getInnerChild(instance.subTree);
+            if (vnode.component) {
+              cache.set(pendingCacheKey, vnode);
+            }
           }, instance.subTree.suspense);
         } else {
           cache.set(pendingCacheKey, getInnerChild(instance.subTree));
@@ -6742,12 +6772,41 @@ const getPublicInstance = (i) => {
   if (isStatefulComponent(i)) return getComponentPublicInstance(i);
   return getPublicInstance(i.parent);
 };
+const resolveDevRootEl = (vnode) => {
+  let found = false;
+  while (true) {
+    if (vnode.patchFlag > 0 && vnode.patchFlag & 2048) {
+      const root = filterSingleRoot(vnode.children);
+      if (!root) {
+        return;
+      }
+      vnode = root;
+      found = true;
+      continue;
+    }
+    const component = vnode.component;
+    if (component && component.subTree) {
+      vnode = component.subTree;
+      continue;
+    }
+    const suspense = vnode.suspense;
+    if (suspense && suspense.activeBranch) {
+      vnode = suspense.activeBranch;
+      continue;
+    }
+    return found ? vnode.el : void 0;
+  }
+};
+const getDevRootFragmentEl = (i) => {
+  const el = i.subTree && resolveDevRootEl(i.subTree);
+  return el === void 0 ? i.vnode.el : el;
+};
 const publicPropertiesMap = (
   // Move PURE marker to new line to workaround compiler discarding it
   // due to type annotation
   /* @__PURE__ */ extend(/* @__PURE__ */ Object.create(null), {
     $: (i) => i,
-    $el: (i) => i.vnode.el,
+    $el: (i) => !!(process.env.NODE_ENV !== "production") ? getDevRootFragmentEl(i) : i.vnode.el,
     $data: (i) => i.data,
     $props: (i) => !!(process.env.NODE_ENV !== "production") ? shallowReadonly(i.props) : i.props,
     $attrs: (i) => !!(process.env.NODE_ENV !== "production") ? shallowReadonly(i.attrs) : i.attrs,
@@ -7663,7 +7722,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.5.41"}`;
+  Vue.version = `2.6.14-compat:${"3.5.42"}`;
   Vue.config = singletonApp.config;
   Vue.use = (plugin, ...options) => {
     if (plugin && isFunction(plugin.install)) {
@@ -8422,7 +8481,7 @@ function emit(instance, event, ...rawArgs) {
       args = rawArgs.map((a) => isString(a) ? a.trim() : a);
     }
     if (modifiers.number) {
-      args = rawArgs.map(looseToNumber);
+      args = args.map(looseToNumber);
     }
   }
   if (!!(process.env.NODE_ENV !== "production") || __VUE_PROD_DEVTOOLS__) {
@@ -11237,7 +11296,7 @@ function patchSuspense(n1, n2, container, anchor, parentComponent, namespace, sl
       if (suspense.deps <= 0) {
         suspense.resolve();
       } else if (isInFallback) {
-        if (!isHydrating) {
+        if (!isHydrating && !suspense.isFallbackMountPending) {
           patch(
             activeBranch,
             newFallback,
@@ -11278,7 +11337,7 @@ function patchSuspense(n1, n2, container, anchor, parentComponent, namespace, sl
         );
         if (suspense.deps <= 0) {
           suspense.resolve();
-        } else {
+        } else if (!suspense.isFallbackMountPending) {
           patch(
             activeBranch,
             newFallback,
@@ -11519,9 +11578,10 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
         if (!suspense.isInFallback) {
           return;
         }
+        const latestFallback = suspense.vnode.ssFallback;
         patch(
           null,
-          fallbackVNode,
+          latestFallback,
           container2,
           anchor2,
           parentComponent2,
@@ -11531,7 +11591,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
           slotScopeIds,
           optimized
         );
-        setActiveBranch(suspense, fallbackVNode);
+        setActiveBranch(suspense, latestFallback);
       };
       const delayEnter = fallbackVNode.transition && fallbackVNode.transition.mode === "out-in";
       if (delayEnter) {
@@ -12890,7 +12950,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.41";
+const version = "3.5.42";
 const warn = !!(process.env.NODE_ENV !== "production") ? warn$1 : NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = !!(process.env.NODE_ENV !== "production") || true ? devtools$1 : void 0;
@@ -13531,7 +13591,11 @@ function setStyle(style, name, val) {
       }
     }
     if (name.startsWith("--")) {
-      style.setProperty(name, val);
+      if (importantRE.test(val)) {
+        style.setProperty(name, val.replace(importantRE, ""), "important");
+      } else {
+        style.setProperty(name, val);
+      }
     } else {
       const prefixed = autoPrefix(style, name);
       if (importantRE.test(val)) {
@@ -14718,13 +14782,21 @@ const vModelSelect = {
       const selectedVal = Array.prototype.filter.call(el.options, (o) => o.selected).map(
         (o) => number ? looseToNumber(getValue(o)) : getValue(o)
       );
-      el[assignKey](
-        el.multiple ? isSet(el._modelValue) ? new Set(selectedVal) : selectedVal : selectedVal[0]
-      );
-      el._assigning = true;
-      nextTick(() => {
-        el._assigning = false;
-      });
+      const multiple = el.multiple;
+      const assignedValue = multiple ? isSet(el._modelValue) ? new Set(selectedVal) : selectedVal : selectedVal[0];
+      const pending = el._pendingValue = [
+        multiple,
+        multiple ? isArray(assignedValue) ? selectedVal.slice() : selectedVal : assignedValue
+      ];
+      try {
+        el[assignKey](assignedValue);
+      } finally {
+        nextTick(() => {
+          if (el._pendingValue === pending) {
+            el._pendingValue = void 0;
+          }
+        });
+      }
     });
     el[assignKey] = getModelAssigner(vnode);
   },
@@ -14738,11 +14810,25 @@ const vModelSelect = {
     el[assignKey] = getModelAssigner(vnode);
   },
   updated(el, { value }) {
-    if (!el._assigning) {
+    const pending = el._pendingValue;
+    el._pendingValue = void 0;
+    if (!pending || pending[0] !== el.multiple || !isSameSelectValue(value, pending[1], pending[0])) {
       setSelected(el, value);
     }
   }
 };
+function isSameSelectValue(value, assignedValue, multiple) {
+  if (!multiple) return looseEqual(value, assignedValue);
+  if (isArray(value)) return looseEqual(value, assignedValue);
+  if (isSet(value)) {
+    if (value.size !== assignedValue.length) return false;
+    for (const item of assignedValue) {
+      if (!value.has(item)) return false;
+    }
+    return true;
+  }
+  return false;
+}
 function setSelected(el, value) {
   const isMultiple = el.multiple;
   const isArrayValue = isArray(value);

package/dist/vue.global.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compat v3.5.41
+* @vue/compat v3.5.42
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -305,6 +305,23 @@ var Vue = (function () {
     }
     return equal;
   }
+  function looseCompareCollections(a, b) {
+    if (a.size !== b.size) return false;
+    const candidates = Array.from(b);
+    const matched = new Uint8Array(candidates.length);
+    for (const item of a) {
+      let index = -1;
+      for (let i = 0; i < candidates.length; i++) {
+        if (!matched[i] && looseEqual(item, candidates[i])) {
+          index = i;
+          break;
+        }
+      }
+      if (index < 0) return false;
+      matched[index] = 1;
+    }
+    return true;
+  }
   function looseEqual(a, b) {
     if (a === b) return true;
     let aValidType = isDate(a);
@@ -328,6 +345,16 @@ var Vue = (function () {
       if (!aValidType || !bValidType) {
         return false;
       }
+      aValidType = isMap(a);
+      bValidType = isMap(b);
+      if (aValidType || bValidType) {
+        return aValidType && bValidType ? looseCompareCollections(a, b) : false;
+      }
+      aValidType = isSet(a);
+      bValidType = isSet(b);
+      if (aValidType || bValidType) {
+        return aValidType && bValidType ? looseCompareCollections(a, b) : false;
+      }
       const aKeysCount = Object.keys(a).length;
       const bKeysCount = Object.keys(b).length;
       if (aKeysCount !== bKeysCount) {
@@ -4853,10 +4880,10 @@ Details: https://v3-migration.vuejs.org/breaking-changes/migration-build.html`
               getContainerType(container),
               optimized
             );
-            if (isAsyncWrapper(vnode) && !vnode.type.__asyncResolved) {
+            if (isAsyncWrapper(vnode) && !vnode.component.subTree) {
               let subTree;
               if (isFragmentStart) {
-                subTree = createVNode(Fragment);
+                subTree = createVNode(Static);
                 subTree.anchor = nextNode ? nextNode.previousSibling : container.lastChild;
               } else {
                 subTree = node.nodeType === 3 ? createTextVNode("") : createVNode("div");
@@ -5759,7 +5786,10 @@ Server rendered element contains fewer child nodes than client vdom.`
         if (pendingCacheKey != null) {
           if (isSuspense(instance.subTree.type)) {
             queuePostRenderEffect(() => {
-              cache.set(pendingCacheKey, getInnerChild(instance.subTree));
+              const vnode = getInnerChild(instance.subTree);
+              if (vnode.component) {
+                cache.set(pendingCacheKey, vnode);
+              }
             }, instance.subTree.suspense);
           } else {
             cache.set(pendingCacheKey, getInnerChild(instance.subTree));
@@ -6680,12 +6710,41 @@ If this is a native custom element, make sure to exclude it from component resol
     if (isStatefulComponent(i)) return getComponentPublicInstance(i);
     return getPublicInstance(i.parent);
   };
+  const resolveDevRootEl = (vnode) => {
+    let found = false;
+    while (true) {
+      if (vnode.patchFlag > 0 && vnode.patchFlag & 2048) {
+        const root = filterSingleRoot(vnode.children);
+        if (!root) {
+          return;
+        }
+        vnode = root;
+        found = true;
+        continue;
+      }
+      const component = vnode.component;
+      if (component && component.subTree) {
+        vnode = component.subTree;
+        continue;
+      }
+      const suspense = vnode.suspense;
+      if (suspense && suspense.activeBranch) {
+        vnode = suspense.activeBranch;
+        continue;
+      }
+      return found ? vnode.el : void 0;
+    }
+  };
+  const getDevRootFragmentEl = (i) => {
+    const el = i.subTree && resolveDevRootEl(i.subTree);
+    return el === void 0 ? i.vnode.el : el;
+  };
   const publicPropertiesMap = (
     // Move PURE marker to new line to workaround compiler discarding it
     // due to type annotation
     /* @__PURE__ */ extend(/* @__PURE__ */ Object.create(null), {
       $: (i) => i,
-      $el: (i) => i.vnode.el,
+      $el: (i) => getDevRootFragmentEl(i) ,
       $data: (i) => i.data,
       $props: (i) => shallowReadonly(i.props) ,
       $attrs: (i) => shallowReadonly(i.attrs) ,
@@ -7596,7 +7655,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.5.41"}`;
+    Vue.version = `2.6.14-compat:${"3.5.42"}`;
     Vue.config = singletonApp.config;
     Vue.use = (plugin, ...options) => {
       if (plugin && isFunction(plugin.install)) {
@@ -8353,7 +8412,7 @@ If you want to remount the same app, move your app creation logic into a factory
         args = rawArgs.map((a) => isString(a) ? a.trim() : a);
       }
       if (modifiers.number) {
-        args = rawArgs.map(looseToNumber);
+        args = args.map(looseToNumber);
       }
     }
     {
@@ -11130,7 +11189,7 @@ If you want to remount the same app, move your app creation logic into a factory
         if (suspense.deps <= 0) {
           suspense.resolve();
         } else if (isInFallback) {
-          if (!isHydrating) {
+          if (!isHydrating && !suspense.isFallbackMountPending) {
             patch(
               activeBranch,
               newFallback,
@@ -11171,7 +11230,7 @@ If you want to remount the same app, move your app creation logic into a factory
           );
           if (suspense.deps <= 0) {
             suspense.resolve();
-          } else {
+          } else if (!suspense.isFallbackMountPending) {
             patch(
               activeBranch,
               newFallback,
@@ -11412,9 +11471,10 @@ If you want to remount the same app, move your app creation logic into a factory
           if (!suspense.isInFallback) {
             return;
           }
+          const latestFallback = suspense.vnode.ssFallback;
           patch(
             null,
-            fallbackVNode,
+            latestFallback,
             container2,
             anchor2,
             parentComponent2,
@@ -11424,7 +11484,7 @@ If you want to remount the same app, move your app creation logic into a factory
             slotScopeIds,
             optimized
           );
-          setActiveBranch(suspense, fallbackVNode);
+          setActiveBranch(suspense, latestFallback);
         };
         const delayEnter = fallbackVNode.transition && fallbackVNode.transition.mode === "out-in";
         if (delayEnter) {
@@ -12755,7 +12815,7 @@ Component that was made reactive: `,
     return true;
   }
 
-  const version = "3.5.41";
+  const version = "3.5.42";
   const warn = warn$1 ;
   const ErrorTypeStrings = ErrorTypeStrings$1 ;
   const devtools = devtools$1 ;
@@ -13377,7 +13437,11 @@ Component that was made reactive: `,
         }
       }
       if (name.startsWith("--")) {
-        style.setProperty(name, val);
+        if (importantRE.test(val)) {
+          style.setProperty(name, val.replace(importantRE, ""), "important");
+        } else {
+          style.setProperty(name, val);
+        }
       } else {
         const prefixed = autoPrefix(style, name);
         if (importantRE.test(val)) {
@@ -14552,13 +14616,21 @@ Expected function or array of functions, received type ${typeof value}.`
         const selectedVal = Array.prototype.filter.call(el.options, (o) => o.selected).map(
           (o) => number ? looseToNumber(getValue(o)) : getValue(o)
         );
-        el[assignKey](
-          el.multiple ? isSet(el._modelValue) ? new Set(selectedVal) : selectedVal : selectedVal[0]
-        );
-        el._assigning = true;
-        nextTick(() => {
-          el._assigning = false;
-        });
+        const multiple = el.multiple;
+        const assignedValue = multiple ? isSet(el._modelValue) ? new Set(selectedVal) : selectedVal : selectedVal[0];
+        const pending = el._pendingValue = [
+          multiple,
+          multiple ? isArray(assignedValue) ? selectedVal.slice() : selectedVal : assignedValue
+        ];
+        try {
+          el[assignKey](assignedValue);
+        } finally {
+          nextTick(() => {
+            if (el._pendingValue === pending) {
+              el._pendingValue = void 0;
+            }
+          });
+        }
       });
       el[assignKey] = getModelAssigner(vnode);
     },
@@ -14572,11 +14644,25 @@ Expected function or array of functions, received type ${typeof value}.`
       el[assignKey] = getModelAssigner(vnode);
     },
     updated(el, { value }) {
-      if (!el._assigning) {
+      const pending = el._pendingValue;
+      el._pendingValue = void 0;
+      if (!pending || pending[0] !== el.multiple || !isSameSelectValue(value, pending[1], pending[0])) {
         setSelected(el, value);
       }
     }
   };
+  function isSameSelectValue(value, assignedValue, multiple) {
+    if (!multiple) return looseEqual(value, assignedValue);
+    if (isArray(value)) return looseEqual(value, assignedValue);
+    if (isSet(value)) {
+      if (value.size !== assignedValue.length) return false;
+      for (const item of assignedValue) {
+        if (!value.has(item)) return false;
+      }
+      return true;
+    }
+    return false;
+  }
   function setSelected(el, value) {
     const isMultiple = el.multiple;
     const isArrayValue = isArray(value);