vue 3.6.0-alpha.6 → 3.6.0-alpha.7

package/dist/vue.cjs.js

@@ -1,5 +1,5 @@
 /**
-* vue v3.6.0-alpha.6
+* vue v3.6.0-alpha.7
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/

package/dist/vue.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-* vue v3.6.0-alpha.6
+* vue v3.6.0-alpha.7
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/

package/dist/vue.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-* vue v3.6.0-alpha.6
+* vue v3.6.0-alpha.7
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -2070,6 +2070,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;
@@ -2080,10 +2090,6 @@ class EffectScope {
         dep = unlink(dep, this);
       }
     }
-    const sub = this.subs;
-    if (sub !== void 0) {
-      unlink(sub);
-    }
     cleanup(this);
   }
 }
@@ -2895,6 +2901,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),
@@ -2958,9 +2965,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);
@@ -2980,6 +2988,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);
@@ -3020,6 +3029,7 @@ function reload(id, newComp) {
   }
   queuePostFlushCb(() => {
     hmrDirtyComponents.clear();
+    hmrDirtyComponentsMode.clear();
   });
 }
 function updateComponentDef(oldComp, newComp) {
@@ -3650,7 +3660,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 = {
@@ -3957,7 +3967,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
@@ -8046,7 +8056,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) {
@@ -9227,7 +9243,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(
@@ -9337,7 +9353,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()
@@ -9354,7 +9370,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 {
@@ -9486,7 +9502,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);
@@ -9676,6 +9692,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;
@@ -11344,7 +11366,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.6.0-alpha.6";
+const version = "3.6.0-alpha.7";
 const warn = warn$1 ;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = devtools$1 ;