@vue/compat 3.6.0-alpha.5 → 3.6.0-alpha.7

package/dist/vue.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compat v3.6.0-alpha.5
+* @vue/compat v3.6.0-alpha.7
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -2123,6 +2123,16 @@ class EffectScope {
       return;
     }
     this.flags = 1024;
+    this.reset();
+    const sub = this.subs;
+    if (sub !== void 0) {
+      unlink(sub);
+    }
+  }
+  /**
+   * @internal
+   */
+  reset() {
     let dep = this.deps;
     while (dep !== void 0) {
       const node = dep.dep;
@@ -2133,10 +2143,6 @@ class EffectScope {
         dep = unlink(dep, this);
       }
     }
-    const sub = this.subs;
-    if (sub !== void 0) {
-      unlink(sub);
-    }
     cleanup(this);
   }
 }
@@ -2948,6 +2954,7 @@ function checkRecursiveUpdates(seen, fn) {
 
 let isHmrUpdating = false;
 const hmrDirtyComponents = /* @__PURE__ */ new Map();
+const hmrDirtyComponentsMode = /* @__PURE__ */ new Map();
 {
   getGlobalThis().__VUE_HMR_RUNTIME__ = {
     createRecord: tryWrap(createRecord),
@@ -3011,9 +3018,10 @@ function reload(id, newComp) {
   const record = map.get(id);
   if (!record) return;
   newComp = normalizeClassComponent(newComp);
+  const isVapor = record.initialDef.__vapor;
   updateComponentDef(record.initialDef, newComp);
   const instances = [...record.instances];
-  if (newComp.__vapor && !instances.some((i) => i.ceReload)) {
+  if (isVapor && newComp.__vapor && !instances.some((i) => i.ceReload)) {
     for (const instance of instances) {
       if (instance.root && instance.root.ce && instance !== instance.root) {
         instance.root.ce._removeChildStyle(instance.type);
@@ -3033,6 +3041,7 @@ function reload(id, newComp) {
         hmrDirtyComponents.set(oldComp, dirtyInstances = /* @__PURE__ */ new Set());
       }
       dirtyInstances.add(instance);
+      hmrDirtyComponentsMode.set(oldComp, !!isVapor);
       instance.appContext.propsCache.delete(instance.type);
       instance.appContext.emitsCache.delete(instance.type);
       instance.appContext.optionsCache.delete(instance.type);
@@ -3073,6 +3082,7 @@ function reload(id, newComp) {
   }
   queuePostFlushCb(() => {
     hmrDirtyComponents.clear();
+    hmrDirtyComponentsMode.clear();
   });
 }
 function updateComponentDef(oldComp, newComp) {
@@ -4231,7 +4241,7 @@ const BaseTransitionPropsValidators = {
   onAppearCancelled: TransitionHookValidator
 };
 const recursiveGetSubtree = (instance) => {
-  const subTree = instance.type.__vapor ? instance.block : instance.subTree;
+  const subTree = isVaporComponent(instance.type) ? instance.block : instance.subTree;
   return subTree.component ? recursiveGetSubtree(subTree.component) : subTree;
 };
 const BaseTransitionImpl = {
@@ -4541,7 +4551,7 @@ function getInnerChild$1(vnode) {
 }
 function setTransitionHooks(vnode, hooks) {
   if (vnode.shapeFlag & 6 && vnode.component) {
-    if (vnode.type.__vapor) {
+    if (isVaporComponent(vnode.type)) {
       getVaporInterface(vnode.component, vnode).setTransitionHooks(
         vnode.component,
         hooks
@@ -4950,7 +4960,8 @@ function createHydrationFunctions(rendererInternals) {
               node,
               container,
               null,
-              parentComponent
+              parentComponent,
+              parentSuspense
             );
           } else {
             mountComponent(
@@ -7737,7 +7748,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.6.0-alpha.5"}`;
+  Vue.version = `2.6.14-compat:${"3.6.0-alpha.7"}`;
   Vue.config = singletonApp.config;
   Vue.use = (plugin, ...options) => {
     if (plugin && isFunction(plugin.install)) {
@@ -8836,29 +8847,7 @@ function renderComponentRoot(instance) {
         }
         root = cloneVNode(root, fallthroughAttrs, false, true);
       } else if (!accessedAttrs && root.type !== Comment) {
-        const allAttrs = Object.keys(attrs);
-        const eventAttrs = [];
-        const extraAttrs = [];
-        for (let i = 0, l = allAttrs.length; i < l; i++) {
-          const key = allAttrs[i];
-          if (isOn(key)) {
-            if (!isModelListener(key)) {
-              eventAttrs.push(key[2].toLowerCase() + key.slice(3));
-            }
-          } else {
-            extraAttrs.push(key);
-          }
-        }
-        if (extraAttrs.length) {
-          warn$1(
-            `Extraneous non-props attributes (${extraAttrs.join(", ")}) were passed to component but could not be automatically inherited because component renders fragment or text or teleport root nodes.`
-          );
-        }
-        if (eventAttrs.length) {
-          warn$1(
-            `Extraneous non-emits event listeners (${eventAttrs.join(", ")}) were passed to component but could not be automatically inherited because component renders fragment or text root nodes. If the listener is intended to be a component custom event listener only, declare it using the "emits" option.`
-          );
-        }
+        warnExtraneousAttributes(attrs);
       }
     }
   }
@@ -8931,6 +8920,31 @@ const getChildRoot = (vnode) => {
   };
   return [normalizeVNode(childRoot), setRoot];
 };
+function warnExtraneousAttributes(attrs) {
+  const allAttrs = Object.keys(attrs);
+  const eventAttrs = [];
+  const extraAttrs = [];
+  for (let i = 0, l = allAttrs.length; i < l; i++) {
+    const key = allAttrs[i];
+    if (isOn(key)) {
+      if (!isModelListener(key)) {
+        eventAttrs.push(key[2].toLowerCase() + key.slice(3));
+      }
+    } else {
+      extraAttrs.push(key);
+    }
+  }
+  if (extraAttrs.length) {
+    warn$1(
+      `Extraneous non-props attributes (${extraAttrs.join(", ")}) were passed to component but could not be automatically inherited because component renders fragment or text or teleport root nodes.`
+    );
+  }
+  if (eventAttrs.length) {
+    warn$1(
+      `Extraneous non-emits event listeners (${eventAttrs.join(", ")}) were passed to component but could not be automatically inherited because component renders fragment or text root nodes. If the listener is intended to be a component custom event listener only, declare it using the "emits" option.`
+    );
+  }
+}
 function filterSingleRoot(children, recurse = true) {
   let singleRoot;
   for (let i = 0; i < children.length; i++) {
@@ -9752,7 +9766,13 @@ function baseCreateRenderer(options, createHydrationFns) {
         );
         break;
       case VaporSlot:
-        getVaporInterface(parentComponent, n2).slot(n1, n2, container, anchor);
+        getVaporInterface(parentComponent, n2).slot(
+          n1,
+          n2,
+          container,
+          anchor,
+          parentComponent
+        );
         break;
       default:
         if (shapeFlag & 1) {
@@ -10255,7 +10275,8 @@ function baseCreateRenderer(options, createHydrationFns) {
             n2,
             container,
             anchor,
-            parentComponent
+            parentComponent,
+            parentSuspense
           );
         }
       } else {
@@ -10317,7 +10338,42 @@ function baseCreateRenderer(options, createHydrationFns) {
     }
     if (isHmrUpdating) initialVNode.el = null;
     if (instance.asyncDep) {
-      parentSuspense && parentSuspense.registerDep(instance, setupRenderEffect, optimized);
+      if (parentSuspense) {
+        const hydratedEl = instance.vnode.el;
+        parentSuspense.registerDep(instance, (setupResult) => {
+          const { vnode } = instance;
+          {
+            pushWarningContext(vnode);
+          }
+          handleSetupResult(instance, setupResult, false);
+          if (hydratedEl) {
+            vnode.el = hydratedEl;
+          }
+          const placeholder = !hydratedEl && instance.subTree.el;
+          setupRenderEffect(
+            instance,
+            vnode,
+            // component may have been moved before resolve.
+            // if this is not a hydration, instance.subTree will be the comment
+            // placeholder.
+            hostParentNode(hydratedEl || instance.subTree.el),
+            // anchor will not be used if this is hydration, so only need to
+            // consider the comment placeholder case.
+            hydratedEl ? null : getNextHostNode(instance.subTree),
+            parentSuspense,
+            namespace,
+            optimized
+          );
+          if (placeholder) {
+            vnode.placeholder = null;
+            hostRemove(placeholder);
+          }
+          updateHOCHostEl(instance, vnode.el);
+          {
+            popWarningContext();
+          }
+        });
+      }
       if (!initialVNode.el) {
         const placeholder = instance.subTree = createVNode(Comment);
         processCommentNode(null, placeholder, container, anchor);
@@ -10925,7 +10981,7 @@ function baseCreateRenderer(options, createHydrationFns) {
   const move = (vnode, container, anchor, moveType, parentComponent, parentSuspense = null) => {
     const { el, type, transition, children, shapeFlag } = vnode;
     if (shapeFlag & 6) {
-      if (type.__vapor) {
+      if (isVaporComponent(type)) {
         getVaporInterface(parentComponent, vnode).move(vnode, container, anchor);
       } else {
         move(
@@ -11035,7 +11091,7 @@ function baseCreateRenderer(options, createHydrationFns) {
       parentComponent.renderCache[cacheIndex] = void 0;
     }
     if (shapeFlag & 256) {
-      if (vnode.type.__vapor) {
+      if (isVaporComponent(vnode.type)) {
         getVaporInterface(parentComponent, vnode).deactivate(
           vnode,
           parentComponent.ctx.getStorageContainer()
@@ -11052,7 +11108,7 @@ function baseCreateRenderer(options, createHydrationFns) {
       invokeVNodeHook(vnodeHook, parentComponent, vnode);
     }
     if (shapeFlag & 6) {
-      if (type.__vapor) {
+      if (isVaporComponent(type)) {
         getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove);
         return;
       } else {
@@ -11194,7 +11250,7 @@ function baseCreateRenderer(options, createHydrationFns) {
   };
   const getNextHostNode = (vnode) => {
     if (vnode.shapeFlag & 6) {
-      if (vnode.type.__vapor) {
+      if (isVaporComponent(vnode.type)) {
         return hostNextSibling(vnode.anchor);
       }
       return getNextHostNode(vnode.component.subTree);
@@ -11386,6 +11442,12 @@ app.use(vaporInteropPlugin)
   }
   return res;
 }
+function isVaporComponent(type) {
+  if (isHmrUpdating && hmrDirtyComponentsMode.has(type)) {
+    return hmrDirtyComponentsMode.get(type);
+  }
+  return type.__vapor;
+}
 function getInheritedScopeIds(vnode, parentComponent) {
   const inheritedScopeIds = [];
   let currentParent = parentComponent;
@@ -11685,7 +11747,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     m: move,
     um: unmount,
     n: next,
-    o: { parentNode, remove }
+    o: { parentNode }
   } = rendererInternals;
   let parentSuspenseId;
   const isSuspensible = isVNodeSuspensible(vnode);
@@ -11860,12 +11922,11 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
     next() {
       return suspense.activeBranch && next(suspense.activeBranch);
     },
-    registerDep(instance, setupRenderEffect, optimized2) {
+    registerDep(instance, onResolve) {
       const isInPendingSuspense = !!suspense.pendingBranch;
       if (isInPendingSuspense) {
         suspense.deps++;
       }
-      const hydratedEl = instance.vnode.el;
       instance.asyncDep.catch((err) => {
         handleError(err, instance, 0);
       }).then((asyncSetupResult) => {
@@ -11873,37 +11934,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
           return;
         }
         instance.asyncResolved = true;
-        const { vnode: vnode2 } = instance;
-        {
-          pushWarningContext(vnode2);
-        }
-        handleSetupResult(instance, asyncSetupResult, false);
-        if (hydratedEl) {
-          vnode2.el = hydratedEl;
-        }
-        const placeholder = !hydratedEl && instance.subTree.el;
-        setupRenderEffect(
-          instance,
-          vnode2,
-          // component may have been moved before resolve.
-          // if this is not a hydration, instance.subTree will be the comment
-          // placeholder.
-          parentNode(hydratedEl || instance.subTree.el),
-          // anchor will not be used if this is hydration, so only need to
-          // consider the comment placeholder case.
-          hydratedEl ? null : next(instance.subTree),
-          suspense,
-          namespace,
-          optimized2
-        );
-        if (placeholder) {
-          vnode2.placeholder = null;
-          remove(placeholder);
-        }
-        updateHOCHostEl(instance, vnode2.el);
-        {
-          popWarningContext();
-        }
+        onResolve(asyncSetupResult);
         if (isInPendingSuspense && --suspense.deps === 0) {
           suspense.resolve();
         }
@@ -13164,7 +13195,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.6.0-alpha.5";
+const version = "3.6.0-alpha.7";
 const warn = warn$1 ;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = devtools$1 ;
@@ -22087,7 +22118,9 @@ const isNonKeyModifier = /* @__PURE__ */ makeMap(
   `stop,prevent,self,ctrl,shift,alt,meta,exact,middle`
 );
 const maybeKeyModifier = /* @__PURE__ */ makeMap("left,right");
-const isKeyboardEvent = /* @__PURE__ */ makeMap(`onkeyup,onkeydown,onkeypress`);
+const isKeyboardEvent = /* @__PURE__ */ makeMap(
+  `onkeyup,onkeydown,onkeypress`
+);
 const resolveModifiers = (key, modifiers, context, loc) => {
   const keyModifiers = [];
   const nonKeyModifiers = [];