vue 3.2.38 → 3.2.40

package/dist/vue.global.js

@@ -1879,7 +1879,9 @@ var Vue = (function (exports) {
       }
       queueFlush();
   }
-  function flushPreFlushCbs(seen, i = flushIndex) {
+  function flushPreFlushCbs(seen, 
+  // if currently flushing, skip the current job itself
+  i = isFlushing ? flushIndex + 1 : 0) {
       {
           seen = seen || new Map();
       }
@@ -4249,7 +4251,7 @@ var Vue = (function (exports) {
   const createHook = (lifecycle) => (hook, target = currentInstance) => 
   // post-create lifecycle registrations are noops during SSR (except for serverPrefetch)
   (!isInSSRComponentSetup || lifecycle === "sp" /* LifecycleHooks.SERVER_PREFETCH */) &&
-      injectHook(lifecycle, hook, target);
+      injectHook(lifecycle, (...args) => hook(...args), target);
   const onBeforeMount = createHook("bm" /* LifecycleHooks.BEFORE_MOUNT */);
   const onMounted = createHook("m" /* LifecycleHooks.MOUNTED */);
   const onBeforeUpdate = createHook("bu" /* LifecycleHooks.BEFORE_UPDATE */);
@@ -4472,7 +4474,10 @@ var Vue = (function (exports) {
               slots[slot.name] = slot.key
                   ? (...args) => {
                       const res = slot.fn(...args);
-                      res.key = slot.key;
+                      // attach branch key so each conditional branch is considered a
+                      // different fragment
+                      if (res)
+                          res.key = slot.key;
                       return res;
                   }
                   : slot.fn;
@@ -6124,7 +6129,7 @@ var Vue = (function (exports) {
           const isFragmentStart = isComment(node) && node.data === '[';
           const onMismatch = () => handleMismatch(node, vnode, parentComponent, parentSuspense, slotScopeIds, isFragmentStart);
           const { type, ref, shapeFlag, patchFlag } = vnode;
-          const domType = node.nodeType;
+          let domType = node.nodeType;
           vnode.el = node;
           if (patchFlag === -2 /* PatchFlags.BAIL */) {
               optimized = false;
@@ -6164,10 +6169,12 @@ var Vue = (function (exports) {
                   }
                   break;
               case Static:
-                  if (domType !== 1 /* DOMNodeTypes.ELEMENT */ && domType !== 3 /* DOMNodeTypes.TEXT */) {
-                      nextNode = onMismatch();
+                  if (isFragmentStart) {
+                      // entire template is static but SSRed as a fragment
+                      node = nextSibling(node);
+                      domType = node.nodeType;
                   }
-                  else {
+                  if (domType === 1 /* DOMNodeTypes.ELEMENT */ || domType === 3 /* DOMNodeTypes.TEXT */) {
                       // determine anchor, adopt content
                       nextNode = node;
                       // if the static vnode has its content stripped during build,
@@ -6184,7 +6191,10 @@ var Vue = (function (exports) {
                           }
                           nextNode = nextSibling(nextNode);
                       }
-                      return nextNode;
+                      return isFragmentStart ? nextSibling(nextNode) : nextNode;
+                  }
+                  else {
+                      onMismatch();
                   }
                   break;
               case Fragment:
@@ -6509,7 +6519,7 @@ var Vue = (function (exports) {
       {
           setDevtoolsHook(target.__VUE_DEVTOOLS_GLOBAL_HOOK__, target);
       }
-      const { insert: hostInsert, remove: hostRemove, patchProp: hostPatchProp, createElement: hostCreateElement, createText: hostCreateText, createComment: hostCreateComment, setText: hostSetText, setElementText: hostSetElementText, parentNode: hostParentNode, nextSibling: hostNextSibling, setScopeId: hostSetScopeId = NOOP, cloneNode: hostCloneNode, insertStaticContent: hostInsertStaticContent } = options;
+      const { insert: hostInsert, remove: hostRemove, patchProp: hostPatchProp, createElement: hostCreateElement, createText: hostCreateText, createComment: hostCreateComment, setText: hostSetText, setElementText: hostSetElementText, parentNode: hostParentNode, nextSibling: hostNextSibling, setScopeId: hostSetScopeId = NOOP, insertStaticContent: hostInsertStaticContent } = options;
       // Note: functions inside this closure should use `const xxx = () => {}`
       // style in order to prevent being inlined by minifiers.
       const patch = (n1, n2, container, anchor = null, parentComponent = null, parentSuspense = null, isSVG = false, slotScopeIds = null, optimized = isHmrUpdating ? false : !!n2.dynamicChildren) => {
@@ -6636,46 +6646,44 @@ var Vue = (function (exports) {
       const mountElement = (vnode, container, anchor, parentComponent, parentSuspense, isSVG, slotScopeIds, optimized) => {
           let el;
           let vnodeHook;
-          const { type, props, shapeFlag, transition, patchFlag, dirs } = vnode;
-          {
-              el = vnode.el = hostCreateElement(vnode.type, isSVG, props && props.is, props);
-              // mount children first, since some props may rely on child content
-              // being already rendered, e.g. `<select value>`
-              if (shapeFlag & 8 /* ShapeFlags.TEXT_CHILDREN */) {
-                  hostSetElementText(el, vnode.children);
-              }
-              else if (shapeFlag & 16 /* ShapeFlags.ARRAY_CHILDREN */) {
-                  mountChildren(vnode.children, el, null, parentComponent, parentSuspense, isSVG && type !== 'foreignObject', slotScopeIds, optimized);
-              }
-              if (dirs) {
-                  invokeDirectiveHook(vnode, null, parentComponent, 'created');
-              }
-              // props
-              if (props) {
-                  for (const key in props) {
-                      if (key !== 'value' && !isReservedProp(key)) {
-                          hostPatchProp(el, key, null, props[key], isSVG, vnode.children, parentComponent, parentSuspense, unmountChildren);
-                      }
-                  }
-                  /**
-                   * Special case for setting value on DOM elements:
-                   * - it can be order-sensitive (e.g. should be set *after* min/max, #2325, #4024)
-                   * - it needs to be forced (#1471)
-                   * #2353 proposes adding another renderer option to configure this, but
-                   * the properties affects are so finite it is worth special casing it
-                   * here to reduce the complexity. (Special casing it also should not
-                   * affect non-DOM renderers)
-                   */
-                  if ('value' in props) {
-                      hostPatchProp(el, 'value', null, props.value);
-                  }
-                  if ((vnodeHook = props.onVnodeBeforeMount)) {
-                      invokeVNodeHook(vnodeHook, parentComponent, vnode);
-                  }
-              }
-              // scopeId
-              setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
+          const { type, props, shapeFlag, transition, dirs } = vnode;
+          el = vnode.el = hostCreateElement(vnode.type, isSVG, props && props.is, props);
+          // mount children first, since some props may rely on child content
+          // being already rendered, e.g. `<select value>`
+          if (shapeFlag & 8 /* ShapeFlags.TEXT_CHILDREN */) {
+              hostSetElementText(el, vnode.children);
+          }
+          else if (shapeFlag & 16 /* ShapeFlags.ARRAY_CHILDREN */) {
+              mountChildren(vnode.children, el, null, parentComponent, parentSuspense, isSVG && type !== 'foreignObject', slotScopeIds, optimized);
           }
+          if (dirs) {
+              invokeDirectiveHook(vnode, null, parentComponent, 'created');
+          }
+          // props
+          if (props) {
+              for (const key in props) {
+                  if (key !== 'value' && !isReservedProp(key)) {
+                      hostPatchProp(el, key, null, props[key], isSVG, vnode.children, parentComponent, parentSuspense, unmountChildren);
+                  }
+              }
+              /**
+               * Special case for setting value on DOM elements:
+               * - it can be order-sensitive (e.g. should be set *after* min/max, #2325, #4024)
+               * - it needs to be forced (#1471)
+               * #2353 proposes adding another renderer option to configure this, but
+               * the properties affects are so finite it is worth special casing it
+               * here to reduce the complexity. (Special casing it also should not
+               * affect non-DOM renderers)
+               */
+              if ('value' in props) {
+                  hostPatchProp(el, 'value', null, props.value);
+              }
+              if ((vnodeHook = props.onVnodeBeforeMount)) {
+                  invokeVNodeHook(vnodeHook, parentComponent, vnode);
+              }
+          }
+          // scopeId
+          setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
           {
               Object.defineProperty(el, '__vnode', {
                   value: vnode,
@@ -6861,6 +6869,13 @@ var Vue = (function (exports) {
       };
       const patchProps = (el, vnode, oldProps, newProps, parentComponent, parentSuspense, isSVG) => {
           if (oldProps !== newProps) {
+              if (oldProps !== EMPTY_OBJ) {
+                  for (const key in oldProps) {
+                      if (!isReservedProp(key) && !(key in newProps)) {
+                          hostPatchProp(el, key, oldProps[key], null, isSVG, vnode.children, parentComponent, parentSuspense, unmountChildren);
+                      }
+                  }
+              }
               for (const key in newProps) {
                   // empty string is not valid prop
                   if (isReservedProp(key))
@@ -6872,13 +6887,6 @@ var Vue = (function (exports) {
                       hostPatchProp(el, key, prev, next, isSVG, vnode.children, parentComponent, parentSuspense, unmountChildren);
                   }
               }
-              if (oldProps !== EMPTY_OBJ) {
-                  for (const key in oldProps) {
-                      if (!isReservedProp(key) && !(key in newProps)) {
-                          hostPatchProp(el, key, oldProps[key], null, isSVG, vnode.children, parentComponent, parentSuspense, unmountChildren);
-                      }
-                  }
-              }
               if ('value' in newProps) {
                   hostPatchProp(el, 'value', oldProps.value, newProps.value);
               }
@@ -8402,7 +8410,10 @@ var Vue = (function (exports) {
   }
   // optimized normalization for template-compiled render fns
   function cloneIfMounted(child) {
-      return child.el === null || child.memo ? child : cloneVNode(child);
+      return (child.el === null && child.patchFlag !== -1 /* PatchFlags.HOISTED */) ||
+          child.memo
+          ? child
+          : cloneVNode(child);
   }
   function normalizeChildren(vnode, children) {
       let type = 0;
@@ -8744,7 +8755,8 @@ var Vue = (function (exports) {
           // only do on-the-fly compile if not in SSR - SSR on-the-fly compilation
           // is done by server-renderer
           if (!isSSR && compile && !Component.render) {
-              const template = Component.template;
+              const template = Component.template ||
+                  resolveMergedOptions(instance).template;
               if (template) {
                   {
                       startMeasure(instance, `compile`);
@@ -9294,7 +9306,7 @@ var Vue = (function (exports) {
   }
 
   // Core API ------------------------------------------------------------------
-  const version = "3.2.38";
+  const version = "3.2.40";
   /**
    * SSR utils for \@vue/server-renderer. Only exposed in ssr-possible builds.
    * @internal
@@ -9345,22 +9357,6 @@ var Vue = (function (exports) {
       setScopeId(el, id) {
           el.setAttribute(id, '');
       },
-      cloneNode(el) {
-          const cloned = el.cloneNode(true);
-          // #3072
-          // - in `patchDOMProp`, we store the actual value in the `el._value` property.
-          // - normally, elements using `:value` bindings will not be hoisted, but if
-          //   the bound value is a constant, e.g. `:value="true"` - they do get
-          //   hoisted.
-          // - in production, hoisted nodes are cloned when subsequent inserts, but
-          //   cloneNode() does not copy the custom property we attached.
-          // - This may need to account for other custom DOM properties we attach to
-          //   elements in addition to `_value` in the future.
-          if (`_value` in el) {
-              cloned._value = el._value;
-          }
-          return cloned;
-      },
       // __UNSAFE__
       // Reason: innerHTML.
       // Static content here can only come from compiled templates.
@@ -9572,7 +9568,6 @@ var Vue = (function (exports) {
           }
           else if (type === 'number') {
               // e.g. <img :width="null">
-              // the value of some IDL attr must be greater than 0, e.g. input.size = 0 -> error
               value = 0;
               needRemove = true;
           }
@@ -9584,7 +9579,8 @@ var Vue = (function (exports) {
           el[key] = value;
       }
       catch (e) {
-          {
+          // do not warn if value is auto-coerced from nullish values
+          if (!needRemove) {
               warn$1(`Failed setting prop "${key}" on <${el.tagName.toLowerCase()}>: ` +
                   `value ${value} is invalid.`, e);
           }
@@ -11794,34 +11790,42 @@ var Vue = (function (exports) {
           const shouldCondense = context.options.whitespace !== 'preserve';
           for (let i = 0; i < nodes.length; i++) {
               const node = nodes[i];
-              if (!context.inPre && node.type === 2 /* NodeTypes.TEXT */) {
-                  if (!/[^\t\r\n\f ]/.test(node.content)) {
-                      const prev = nodes[i - 1];
-                      const next = nodes[i + 1];
-                      // Remove if:
-                      // - the whitespace is the first or last node, or:
-                      // - (condense mode) the whitespace is adjacent to a comment, or:
-                      // - (condense mode) the whitespace is between two elements AND contains newline
-                      if (!prev ||
-                          !next ||
-                          (shouldCondense &&
-                              (prev.type === 3 /* NodeTypes.COMMENT */ ||
-                                  next.type === 3 /* NodeTypes.COMMENT */ ||
-                                  (prev.type === 1 /* NodeTypes.ELEMENT */ &&
-                                      next.type === 1 /* NodeTypes.ELEMENT */ &&
-                                      /[\r\n]/.test(node.content))))) {
-                          removedWhitespace = true;
-                          nodes[i] = null;
+              if (node.type === 2 /* NodeTypes.TEXT */) {
+                  if (!context.inPre) {
+                      if (!/[^\t\r\n\f ]/.test(node.content)) {
+                          const prev = nodes[i - 1];
+                          const next = nodes[i + 1];
+                          // Remove if:
+                          // - the whitespace is the first or last node, or:
+                          // - (condense mode) the whitespace is adjacent to a comment, or:
+                          // - (condense mode) the whitespace is between two elements AND contains newline
+                          if (!prev ||
+                              !next ||
+                              (shouldCondense &&
+                                  (prev.type === 3 /* NodeTypes.COMMENT */ ||
+                                      next.type === 3 /* NodeTypes.COMMENT */ ||
+                                      (prev.type === 1 /* NodeTypes.ELEMENT */ &&
+                                          next.type === 1 /* NodeTypes.ELEMENT */ &&
+                                          /[\r\n]/.test(node.content))))) {
+                              removedWhitespace = true;
+                              nodes[i] = null;
+                          }
+                          else {
+                              // Otherwise, the whitespace is condensed into a single space
+                              node.content = ' ';
+                          }
                       }
-                      else {
-                          // Otherwise, the whitespace is condensed into a single space
-                          node.content = ' ';
+                      else if (shouldCondense) {
+                          // in condense mode, consecutive whitespaces in text are condensed
+                          // down to a single space.
+                          node.content = node.content.replace(/[\t\r\n\f ]+/g, ' ');
                       }
                   }
-                  else if (shouldCondense) {
-                      // in condense mode, consecutive whitespaces in text are condensed
-                      // down to a single space.
-                      node.content = node.content.replace(/[\t\r\n\f ]+/g, ' ');
+                  else {
+                      // #6410 normalize windows newlines in <pre>:
+                      // in SSR, browsers normalize server-rendered \r\n into a single \n
+                      // in the DOM
+                      node.content = node.content.replace(/\r\n/g, '\n');
                   }
               }
               // Remove comment nodes if desired by configuration.
@@ -12462,11 +12466,6 @@ var Vue = (function (exports) {
                   }
               }
           }
-          else if (child.type === 12 /* NodeTypes.TEXT_CALL */ &&
-              getConstantType(child.content, context) >= 2 /* ConstantTypes.CAN_HOIST */) {
-              child.codegenNode = context.hoist(child.codegenNode);
-              hoistedCount++;
-          }
           // walk further
           if (child.type === 1 /* NodeTypes.ELEMENT */) {
               const isComponent = child.tagType === 1 /* ElementTypes.COMPONENT */;
@@ -14477,6 +14476,14 @@ var Vue = (function (exports) {
       let hasDynamicKeys = false;
       let hasVnodeHook = false;
       const dynamicPropNames = [];
+      const pushMergeArg = (arg) => {
+          if (properties.length) {
+              mergeArgs.push(createObjectExpression(dedupeProperties(properties), elementLoc));
+              properties = [];
+          }
+          if (arg)
+              mergeArgs.push(arg);
+      };
       const analyzePatchFlag = ({ key, value }) => {
           if (isStaticExp(key)) {
               const name = key.content;
@@ -14589,16 +14596,14 @@ var Vue = (function (exports) {
               if (!arg && (isVBind || isVOn)) {
                   hasDynamicKeys = true;
                   if (exp) {
-                      if (properties.length) {
-                          mergeArgs.push(createObjectExpression(dedupeProperties(properties), elementLoc));
-                          properties = [];
-                      }
                       if (isVBind) {
+                          // have to merge early for compat build check
+                          pushMergeArg();
                           mergeArgs.push(exp);
                       }
                       else {
                           // v-on="obj" -> toHandlers(obj)
-                          mergeArgs.push({
+                          pushMergeArg({
                               type: 14 /* NodeTypes.JS_CALL_EXPRESSION */,
                               loc,
                               callee: context.helper(TO_HANDLERS),
@@ -14618,7 +14623,12 @@ var Vue = (function (exports) {
                   // has built-in directive transform.
                   const { props, needRuntime } = directiveTransform(prop, node, context);
                   !ssr && props.forEach(analyzePatchFlag);
-                  properties.push(...props);
+                  if (isVOn && arg && !isStaticExp(arg)) {
+                      pushMergeArg(createObjectExpression(props, elementLoc));
+                  }
+                  else {
+                      properties.push(...props);
+                  }
                   if (needRuntime) {
                       runtimeDirectives.push(prop);
                       if (isSymbol(needRuntime)) {
@@ -14640,9 +14650,8 @@ var Vue = (function (exports) {
       let propsExpression = undefined;
       // has v-bind="object" or v-on="object", wrap with mergeProps
       if (mergeArgs.length) {
-          if (properties.length) {
-              mergeArgs.push(createObjectExpression(dedupeProperties(properties), elementLoc));
-          }
+          // close up any not-yet-merged props
+          pushMergeArg();
           if (mergeArgs.length > 1) {
               propsExpression = createCallExpression(context.helper(MERGE_PROPS), mergeArgs, elementLoc);
           }