@vue/compat 3.5.17 → 3.6.0-alpha.2

package/dist/vue.cjs.prod.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compat v3.5.17
+* @vue/compat v3.6.0-alpha.2
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -25,8 +25,10 @@ const NOOP = () => {
 const NO = () => false;
 const isOn = (key) => key.charCodeAt(0) === 111 && key.charCodeAt(1) === 110 && // uppercase letter
 (key.charCodeAt(2) > 122 || key.charCodeAt(2) < 97);
+const isNativeOn = (key) => key.charCodeAt(0) === 111 && key.charCodeAt(1) === 110 && // lowercase letter
+key.charCodeAt(2) > 96 && key.charCodeAt(2) < 123;
 const isModelListener = (key) => key.startsWith("onUpdate:");
-const extend$1 = Object.assign;
+const extend = Object.assign;
 const remove = (arr, el) => {
   const i = arr.indexOf(el);
   if (i > -1) {
@@ -69,10 +71,9 @@ const cacheStringFunction = (fn) => {
   };
 };
 const camelizeRE = /-(\w)/g;
+const camelizeReplacer = (_, c) => c ? c.toUpperCase() : "";
 const camelize = cacheStringFunction(
-  (str) => {
-    return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : "");
-  }
+  (str) => str.replace(camelizeRE, camelizeReplacer)
 );
 const hyphenateRE = /\B([A-Z])/g;
 const hyphenate = cacheStringFunction(
@@ -123,6 +124,10 @@ function genCacheKey(source, options) {
     (_, val) => typeof val === "function" ? val.toString() : val
   );
 }
+function canSetValueDirectly(tagName) {
+  return tagName !== "PROGRESS" && // custom elements may use _value internally
+  !tagName.includes("-");
+}
 
 const GLOBALS_ALLOWED = "Infinity,undefined,NaN,isFinite,isNaN,parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,BigInt,console,Error,Symbol";
 const isGloballyAllowed = /* @__PURE__ */ makeMap(GLOBALS_ALLOWED);
@@ -228,6 +233,24 @@ const isKnownSvgAttr = /* @__PURE__ */ makeMap(
 const isKnownMathMLAttr = /* @__PURE__ */ makeMap(
   `accent,accentunder,actiontype,align,alignmentscope,altimg,altimg-height,altimg-valign,altimg-width,alttext,bevelled,close,columnsalign,columnlines,columnspan,denomalign,depth,dir,display,displaystyle,encoding,equalcolumns,equalrows,fence,fontstyle,fontweight,form,frame,framespacing,groupalign,height,href,id,indentalign,indentalignfirst,indentalignlast,indentshift,indentshiftfirst,indentshiftlast,indextype,justify,largetop,largeop,lquote,lspace,mathbackground,mathcolor,mathsize,mathvariant,maxsize,minlabelspacing,mode,other,overflow,position,rowalign,rowlines,rowspan,rquote,rspace,scriptlevel,scriptminsize,scriptsizemultiplier,selection,separator,separators,shift,side,src,stackalign,stretchy,subscriptshift,superscriptshift,symmetric,voffset,width,widths,xlink:href,xlink:show,xlink:type,xmlns`
 );
+function shouldSetAsAttr(tagName, key) {
+  if (key === "spellcheck" || key === "draggable" || key === "translate" || key === "autocorrect") {
+    return true;
+  }
+  if (key === "form") {
+    return true;
+  }
+  if (key === "list" && tagName === "INPUT") {
+    return true;
+  }
+  if (key === "type" && tagName === "TEXTAREA") {
+    return true;
+  }
+  if ((key === "width" || key === "height") && (tagName === "IMG" || tagName === "VIDEO" || tagName === "CANVAS" || tagName === "SOURCE")) {
+    return true;
+  }
+  return false;
+}
 
 const escapeRE = /["'&<>]/;
 function escapeHtml(string) {
@@ -323,7 +346,20 @@ const isRef$1 = (val) => {
   return !!(val && val["__v_isRef"] === true);
 };
 const toDisplayString = (val) => {
-  return isString(val) ? val : val == null ? "" : isArray(val) || isObject(val) && (val.toString === objectToString || !isFunction(val.toString)) ? isRef$1(val) ? toDisplayString(val.value) : JSON.stringify(val, replacer, 2) : String(val);
+  switch (typeof val) {
+    case "string":
+      return val;
+    case "object":
+      if (val) {
+        if (isRef$1(val)) {
+          return toDisplayString(val.value);
+        } else if (isArray(val) || val.toString === objectToString || !isFunction(val.toString)) {
+          return JSON.stringify(val, replacer, 2);
+        }
+      }
+    default:
+      return val == null ? "" : String(val);
+  }
 };
 const replacer = (_key, val) => {
   if (isRef$1(val)) {
@@ -358,557 +394,325 @@ const stringifySymbol = (v, i = "") => {
   );
 };
 
-let activeEffectScope;
-class EffectScope {
-  constructor(detached = false) {
-    this.detached = detached;
-    /**
-     * @internal
-     */
-    this._active = true;
-    /**
-     * @internal track `on` calls, allow `on` call multiple times
-     */
-    this._on = 0;
-    /**
-     * @internal
-     */
-    this.effects = [];
-    /**
-     * @internal
-     */
-    this.cleanups = [];
-    this._isPaused = false;
-    this.parent = activeEffectScope;
-    if (!detached && activeEffectScope) {
-      this.index = (activeEffectScope.scopes || (activeEffectScope.scopes = [])).push(
-        this
-      ) - 1;
-    }
-  }
-  get active() {
-    return this._active;
-  }
-  pause() {
-    if (this._active) {
-      this._isPaused = true;
-      let i, l;
-      if (this.scopes) {
-        for (i = 0, l = this.scopes.length; i < l; i++) {
-          this.scopes[i].pause();
-        }
-      }
-      for (i = 0, l = this.effects.length; i < l; i++) {
-        this.effects[i].pause();
-      }
-    }
-  }
-  /**
-   * Resumes the effect scope, including all child scopes and effects.
-   */
-  resume() {
-    if (this._active) {
-      if (this._isPaused) {
-        this._isPaused = false;
-        let i, l;
-        if (this.scopes) {
-          for (i = 0, l = this.scopes.length; i < l; i++) {
-            this.scopes[i].resume();
-          }
-        }
-        for (i = 0, l = this.effects.length; i < l; i++) {
-          this.effects[i].resume();
-        }
-      }
-    }
-  }
-  run(fn) {
-    if (this._active) {
-      const currentEffectScope = activeEffectScope;
-      try {
-        activeEffectScope = this;
-        return fn();
-      } finally {
-        activeEffectScope = currentEffectScope;
-      }
-    }
-  }
-  /**
-   * This should only be called on non-detached scopes
-   * @internal
-   */
-  on() {
-    if (++this._on === 1) {
-      this.prevScope = activeEffectScope;
-      activeEffectScope = this;
-    }
-  }
-  /**
-   * This should only be called on non-detached scopes
-   * @internal
-   */
-  off() {
-    if (this._on > 0 && --this._on === 0) {
-      activeEffectScope = this.prevScope;
-      this.prevScope = void 0;
-    }
-  }
-  stop(fromParent) {
-    if (this._active) {
-      this._active = false;
-      let i, l;
-      for (i = 0, l = this.effects.length; i < l; i++) {
-        this.effects[i].stop();
-      }
-      this.effects.length = 0;
-      for (i = 0, l = this.cleanups.length; i < l; i++) {
-        this.cleanups[i]();
+function getSequence(arr) {
+  const p = arr.slice();
+  const result = [0];
+  let i, j, u, v, c;
+  const len = arr.length;
+  for (i = 0; i < len; i++) {
+    const arrI = arr[i];
+    if (arrI !== 0) {
+      j = result[result.length - 1];
+      if (arr[j] < arrI) {
+        p[i] = j;
+        result.push(i);
+        continue;
       }
-      this.cleanups.length = 0;
-      if (this.scopes) {
-        for (i = 0, l = this.scopes.length; i < l; i++) {
-          this.scopes[i].stop(true);
+      u = 0;
+      v = result.length - 1;
+      while (u < v) {
+        c = u + v >> 1;
+        if (arr[result[c]] < arrI) {
+          u = c + 1;
+        } else {
+          v = c;
         }
-        this.scopes.length = 0;
       }
-      if (!this.detached && this.parent && !fromParent) {
-        const last = this.parent.scopes.pop();
-        if (last && last !== this) {
-          this.parent.scopes[this.index] = last;
-          last.index = this.index;
+      if (arrI < arr[result[u]]) {
+        if (u > 0) {
+          p[i] = result[u - 1];
         }
+        result[u] = i;
       }
-      this.parent = void 0;
     }
   }
-}
-function effectScope(detached) {
-  return new EffectScope(detached);
-}
-function getCurrentScope() {
-  return activeEffectScope;
-}
-function onScopeDispose(fn, failSilently = false) {
-  if (activeEffectScope) {
-    activeEffectScope.cleanups.push(fn);
+  u = result.length;
+  v = result[u - 1];
+  while (u-- > 0) {
+    result[u] = v;
+    v = p[v];
   }
+  return result;
 }
 
-let activeSub;
-const pausedQueueEffects = /* @__PURE__ */ new WeakSet();
-class ReactiveEffect {
-  constructor(fn) {
-    this.fn = fn;
-    /**
-     * @internal
-     */
-    this.deps = void 0;
-    /**
-     * @internal
-     */
-    this.depsTail = void 0;
-    /**
-     * @internal
-     */
-    this.flags = 1 | 4;
-    /**
-     * @internal
-     */
-    this.next = void 0;
-    /**
-     * @internal
-     */
-    this.cleanup = void 0;
-    this.scheduler = void 0;
-    if (activeEffectScope && activeEffectScope.active) {
-      activeEffectScope.effects.push(this);
-    }
-  }
-  pause() {
-    this.flags |= 64;
-  }
-  resume() {
-    if (this.flags & 64) {
-      this.flags &= -65;
-      if (pausedQueueEffects.has(this)) {
-        pausedQueueEffects.delete(this);
-        this.trigger();
-      }
-    }
-  }
-  /**
-   * @internal
-   */
-  notify() {
-    if (this.flags & 2 && !(this.flags & 32)) {
-      return;
-    }
-    if (!(this.flags & 8)) {
-      batch(this);
-    }
-  }
-  run() {
-    if (!(this.flags & 1)) {
-      return this.fn();
-    }
-    this.flags |= 2;
-    cleanupEffect(this);
-    prepareDeps(this);
-    const prevEffect = activeSub;
-    const prevShouldTrack = shouldTrack;
-    activeSub = this;
-    shouldTrack = true;
-    try {
-      return this.fn();
-    } finally {
-      cleanupDeps(this);
-      activeSub = prevEffect;
-      shouldTrack = prevShouldTrack;
-      this.flags &= -3;
-    }
-  }
-  stop() {
-    if (this.flags & 1) {
-      for (let link = this.deps; link; link = link.nextDep) {
-        removeSub(link);
-      }
-      this.deps = this.depsTail = void 0;
-      cleanupEffect(this);
-      this.onStop && this.onStop();
-      this.flags &= -2;
-    }
-  }
-  trigger() {
-    if (this.flags & 64) {
-      pausedQueueEffects.add(this);
-    } else if (this.scheduler) {
-      this.scheduler();
-    } else {
-      this.runIfDirty();
-    }
-  }
-  /**
-   * @internal
-   */
-  runIfDirty() {
-    if (isDirty(this)) {
-      this.run();
-    }
-  }
-  get dirty() {
-    return isDirty(this);
-  }
-}
+var ReactiveFlags = /* @__PURE__ */ ((ReactiveFlags2) => {
+  ReactiveFlags2[ReactiveFlags2["None"] = 0] = "None";
+  ReactiveFlags2[ReactiveFlags2["Mutable"] = 1] = "Mutable";
+  ReactiveFlags2[ReactiveFlags2["Watching"] = 2] = "Watching";
+  ReactiveFlags2[ReactiveFlags2["RecursedCheck"] = 4] = "RecursedCheck";
+  ReactiveFlags2[ReactiveFlags2["Recursed"] = 8] = "Recursed";
+  ReactiveFlags2[ReactiveFlags2["Dirty"] = 16] = "Dirty";
+  ReactiveFlags2[ReactiveFlags2["Pending"] = 32] = "Pending";
+  return ReactiveFlags2;
+})(ReactiveFlags || {});
+const notifyBuffer = [];
 let batchDepth = 0;
-let batchedSub;
-let batchedComputed;
-function batch(sub, isComputed = false) {
-  sub.flags |= 8;
-  if (isComputed) {
-    sub.next = batchedComputed;
-    batchedComputed = sub;
-    return;
+let activeSub = void 0;
+let notifyIndex = 0;
+let notifyBufferLength = 0;
+function setActiveSub(sub) {
+  try {
+    return activeSub;
+  } finally {
+    activeSub = sub;
   }
-  sub.next = batchedSub;
-  batchedSub = sub;
 }
 function startBatch() {
-  batchDepth++;
+  ++batchDepth;
 }
 function endBatch() {
-  if (--batchDepth > 0) {
-    return;
-  }
-  if (batchedComputed) {
-    let e = batchedComputed;
-    batchedComputed = void 0;
-    while (e) {
-      const next = e.next;
-      e.next = void 0;
-      e.flags &= -9;
-      e = next;
-    }
-  }
-  let error;
-  while (batchedSub) {
-    let e = batchedSub;
-    batchedSub = void 0;
-    while (e) {
-      const next = e.next;
-      e.next = void 0;
-      e.flags &= -9;
-      if (e.flags & 1) {
-        try {
-          ;
-          e.trigger();
-        } catch (err) {
-          if (!error) error = err;
-        }
-      }
-      e = next;
-    }
-  }
-  if (error) throw error;
-}
-function prepareDeps(sub) {
-  for (let link = sub.deps; link; link = link.nextDep) {
-    link.version = -1;
-    link.prevActiveLink = link.dep.activeLink;
-    link.dep.activeLink = link;
-  }
-}
-function cleanupDeps(sub) {
-  let head;
-  let tail = sub.depsTail;
-  let link = tail;
-  while (link) {
-    const prev = link.prevDep;
-    if (link.version === -1) {
-      if (link === tail) tail = prev;
-      removeSub(link);
-      removeDep(link);
-    } else {
-      head = link;
-    }
-    link.dep.activeLink = link.prevActiveLink;
-    link.prevActiveLink = void 0;
-    link = prev;
-  }
-  sub.deps = head;
-  sub.depsTail = tail;
-}
-function isDirty(sub) {
-  for (let link = sub.deps; link; link = link.nextDep) {
-    if (link.dep.version !== link.version || link.dep.computed && (refreshComputed(link.dep.computed) || link.dep.version !== link.version)) {
-      return true;
-    }
-  }
-  if (sub._dirty) {
-    return true;
+  if (!--batchDepth && notifyBufferLength) {
+    flush();
   }
-  return false;
 }
-function refreshComputed(computed) {
-  if (computed.flags & 4 && !(computed.flags & 16)) {
+function link(dep, sub) {
+  const prevDep = sub.depsTail;
+  if (prevDep !== void 0 && prevDep.dep === dep) {
     return;
   }
-  computed.flags &= -17;
-  if (computed.globalVersion === globalVersion) {
-    return;
-  }
-  computed.globalVersion = globalVersion;
-  if (!computed.isSSR && computed.flags & 128 && (!computed.deps && !computed._dirty || !isDirty(computed))) {
-    return;
-  }
-  computed.flags |= 2;
-  const dep = computed.dep;
-  const prevSub = activeSub;
-  const prevShouldTrack = shouldTrack;
-  activeSub = computed;
-  shouldTrack = true;
-  try {
-    prepareDeps(computed);
-    const value = computed.fn(computed._value);
-    if (dep.version === 0 || hasChanged(value, computed._value)) {
-      computed.flags |= 128;
-      computed._value = value;
-      dep.version++;
+  let nextDep = void 0;
+  const recursedCheck = sub.flags & 4 /* RecursedCheck */;
+  if (recursedCheck) {
+    nextDep = prevDep !== void 0 ? prevDep.nextDep : sub.deps;
+    if (nextDep !== void 0 && nextDep.dep === dep) {
+      sub.depsTail = nextDep;
+      return;
     }
-  } catch (err) {
-    dep.version++;
-    throw err;
-  } finally {
-    activeSub = prevSub;
-    shouldTrack = prevShouldTrack;
-    cleanupDeps(computed);
-    computed.flags &= -3;
-  }
-}
-function removeSub(link, soft = false) {
-  const { dep, prevSub, nextSub } = link;
-  if (prevSub) {
-    prevSub.nextSub = nextSub;
-    link.prevSub = void 0;
   }
-  if (nextSub) {
-    nextSub.prevSub = prevSub;
-    link.nextSub = void 0;
+  const prevSub = dep.subsTail;
+  const newLink = sub.depsTail = dep.subsTail = {
+    dep,
+    sub,
+    prevDep,
+    nextDep,
+    prevSub,
+    nextSub: void 0
+  };
+  if (nextDep !== void 0) {
+    nextDep.prevDep = newLink;
   }
-  if (dep.subs === link) {
-    dep.subs = prevSub;
-    if (!prevSub && dep.computed) {
-      dep.computed.flags &= -5;
-      for (let l = dep.computed.deps; l; l = l.nextDep) {
-        removeSub(l, true);
-      }
-    }
+  if (prevDep !== void 0) {
+    prevDep.nextDep = newLink;
+  } else {
+    sub.deps = newLink;
   }
-  if (!soft && !--dep.sc && dep.map) {
-    dep.map.delete(dep.key);
+  if (prevSub !== void 0) {
+    prevSub.nextSub = newLink;
+  } else {
+    dep.subs = newLink;
   }
 }
-function removeDep(link) {
-  const { prevDep, nextDep } = link;
-  if (prevDep) {
-    prevDep.nextDep = nextDep;
-    link.prevDep = void 0;
-  }
-  if (nextDep) {
+function unlink(link2, sub = link2.sub) {
+  const dep = link2.dep;
+  const prevDep = link2.prevDep;
+  const nextDep = link2.nextDep;
+  const nextSub = link2.nextSub;
+  const prevSub = link2.prevSub;
+  if (nextDep !== void 0) {
     nextDep.prevDep = prevDep;
-    link.nextDep = void 0;
-  }
-}
-function effect(fn, options) {
-  if (fn.effect instanceof ReactiveEffect) {
-    fn = fn.effect.fn;
-  }
-  const e = new ReactiveEffect(fn);
-  if (options) {
-    extend$1(e, options);
-  }
-  try {
-    e.run();
-  } catch (err) {
-    e.stop();
-    throw err;
-  }
-  const runner = e.run.bind(e);
-  runner.effect = e;
-  return runner;
-}
-function stop(runner) {
-  runner.effect.stop();
-}
-let shouldTrack = true;
-const trackStack = [];
-function pauseTracking() {
-  trackStack.push(shouldTrack);
-  shouldTrack = false;
-}
-function resetTracking() {
-  const last = trackStack.pop();
-  shouldTrack = last === void 0 ? true : last;
-}
-function cleanupEffect(e) {
-  const { cleanup } = e;
-  e.cleanup = void 0;
-  if (cleanup) {
-    const prevSub = activeSub;
-    activeSub = void 0;
-    try {
-      cleanup();
-    } finally {
-      activeSub = prevSub;
-    }
-  }
-}
-
-let globalVersion = 0;
-class Link {
-  constructor(sub, dep) {
-    this.sub = sub;
-    this.dep = dep;
-    this.version = dep.version;
-    this.nextDep = this.prevDep = this.nextSub = this.prevSub = this.prevActiveLink = void 0;
-  }
-}
-class Dep {
-  // TODO isolatedDeclarations "__v_skip"
-  constructor(computed) {
-    this.computed = computed;
-    this.version = 0;
-    /**
-     * Link between this dep and the current active effect
-     */
-    this.activeLink = void 0;
-    /**
-     * Doubly linked list representing the subscribing effects (tail)
-     */
-    this.subs = void 0;
-    /**
-     * For object property deps cleanup
-     */
-    this.map = void 0;
-    this.key = void 0;
-    /**
-     * Subscriber counter
-     */
-    this.sc = 0;
-    /**
-     * @internal
-     */
-    this.__v_skip = true;
+  } else {
+    sub.depsTail = prevDep;
   }
-  track(debugInfo) {
-    if (!activeSub || !shouldTrack || activeSub === this.computed) {
-      return;
-    }
-    let link = this.activeLink;
-    if (link === void 0 || link.sub !== activeSub) {
-      link = this.activeLink = new Link(activeSub, this);
-      if (!activeSub.deps) {
-        activeSub.deps = activeSub.depsTail = link;
+  if (prevDep !== void 0) {
+    prevDep.nextDep = nextDep;
+  } else {
+    sub.deps = nextDep;
+  }
+  if (nextSub !== void 0) {
+    nextSub.prevSub = prevSub;
+  } else {
+    dep.subsTail = prevSub;
+  }
+  if (prevSub !== void 0) {
+    prevSub.nextSub = nextSub;
+  } else if ((dep.subs = nextSub) === void 0) {
+    let toRemove = dep.deps;
+    if (toRemove !== void 0) {
+      do {
+        toRemove = unlink(toRemove, dep);
+      } while (toRemove !== void 0);
+      dep.flags |= 16 /* Dirty */;
+    }
+  }
+  return nextDep;
+}
+function propagate(link2) {
+  let next = link2.nextSub;
+  let stack;
+  top: do {
+    const sub = link2.sub;
+    let flags = sub.flags;
+    if (flags & (1 /* Mutable */ | 2 /* Watching */)) {
+      if (!(flags & (4 /* RecursedCheck */ | 8 /* Recursed */ | 16 /* Dirty */ | 32 /* Pending */))) {
+        sub.flags = flags | 32 /* Pending */;
+      } else if (!(flags & (4 /* RecursedCheck */ | 8 /* Recursed */))) {
+        flags = 0 /* None */;
+      } else if (!(flags & 4 /* RecursedCheck */)) {
+        sub.flags = flags & -9 /* Recursed */ | 32 /* Pending */;
+      } else if (!(flags & (16 /* Dirty */ | 32 /* Pending */)) && isValidLink(link2, sub)) {
+        sub.flags = flags | 8 /* Recursed */ | 32 /* Pending */;
+        flags &= 1 /* Mutable */;
       } else {
-        link.prevDep = activeSub.depsTail;
-        activeSub.depsTail.nextDep = link;
-        activeSub.depsTail = link;
-      }
-      addSub(link);
-    } else if (link.version === -1) {
-      link.version = this.version;
-      if (link.nextDep) {
-        const next = link.nextDep;
-        next.prevDep = link.prevDep;
-        if (link.prevDep) {
-          link.prevDep.nextDep = next;
-        }
-        link.prevDep = activeSub.depsTail;
-        link.nextDep = void 0;
-        activeSub.depsTail.nextDep = link;
-        activeSub.depsTail = link;
-        if (activeSub.deps === link) {
-          activeSub.deps = next;
+        flags = 0 /* None */;
+      }
+      if (flags & 2 /* Watching */) {
+        notifyBuffer[notifyBufferLength++] = sub;
+      }
+      if (flags & 1 /* Mutable */) {
+        const subSubs = sub.subs;
+        if (subSubs !== void 0) {
+          link2 = subSubs;
+          if (subSubs.nextSub !== void 0) {
+            stack = { value: next, prev: stack };
+            next = link2.nextSub;
+          }
+          continue;
         }
       }
     }
-    return link;
-  }
-  trigger(debugInfo) {
-    this.version++;
-    globalVersion++;
-    this.notify(debugInfo);
-  }
-  notify(debugInfo) {
-    startBatch();
-    try {
-      if (false) ;
-      for (let link = this.subs; link; link = link.prevSub) {
-        if (link.sub.notify()) {
-          ;
-          link.sub.dep.notify();
+    if ((link2 = next) !== void 0) {
+      next = link2.nextSub;
+      continue;
+    }
+    while (stack !== void 0) {
+      link2 = stack.value;
+      stack = stack.prev;
+      if (link2 !== void 0) {
+        next = link2.nextSub;
+        continue top;
+      }
+    }
+    break;
+  } while (true);
+}
+function startTracking(sub) {
+  sub.depsTail = void 0;
+  sub.flags = sub.flags & -57 | 4 /* RecursedCheck */;
+  return setActiveSub(sub);
+}
+function endTracking(sub, prevSub) {
+  activeSub = prevSub;
+  const depsTail = sub.depsTail;
+  let toRemove = depsTail !== void 0 ? depsTail.nextDep : sub.deps;
+  while (toRemove !== void 0) {
+    toRemove = unlink(toRemove, sub);
+  }
+  sub.flags &= -5 /* RecursedCheck */;
+}
+function flush() {
+  while (notifyIndex < notifyBufferLength) {
+    const effect = notifyBuffer[notifyIndex];
+    notifyBuffer[notifyIndex++] = void 0;
+    effect.notify();
+  }
+  notifyIndex = 0;
+  notifyBufferLength = 0;
+}
+function checkDirty(link2, sub) {
+  let stack;
+  let checkDepth = 0;
+  top: do {
+    const dep = link2.dep;
+    const depFlags = dep.flags;
+    let dirty = false;
+    if (sub.flags & 16 /* Dirty */) {
+      dirty = true;
+    } else if ((depFlags & (1 /* Mutable */ | 16 /* Dirty */)) === (1 /* Mutable */ | 16 /* Dirty */)) {
+      if (dep.update()) {
+        const subs = dep.subs;
+        if (subs.nextSub !== void 0) {
+          shallowPropagate(subs);
+        }
+        dirty = true;
+      }
+    } else if ((depFlags & (1 /* Mutable */ | 32 /* Pending */)) === (1 /* Mutable */ | 32 /* Pending */)) {
+      if (link2.nextSub !== void 0 || link2.prevSub !== void 0) {
+        stack = { value: link2, prev: stack };
+      }
+      link2 = dep.deps;
+      sub = dep;
+      ++checkDepth;
+      continue;
+    }
+    if (!dirty && link2.nextDep !== void 0) {
+      link2 = link2.nextDep;
+      continue;
+    }
+    while (checkDepth) {
+      --checkDepth;
+      const firstSub = sub.subs;
+      const hasMultipleSubs = firstSub.nextSub !== void 0;
+      if (hasMultipleSubs) {
+        link2 = stack.value;
+        stack = stack.prev;
+      } else {
+        link2 = firstSub;
+      }
+      if (dirty) {
+        if (sub.update()) {
+          if (hasMultipleSubs) {
+            shallowPropagate(firstSub);
+          }
+          sub = link2.sub;
+          continue;
         }
+      } else {
+        sub.flags &= -33 /* Pending */;
+      }
+      sub = link2.sub;
+      if (link2.nextDep !== void 0) {
+        link2 = link2.nextDep;
+        continue top;
+      }
+      dirty = false;
+    }
+    return dirty;
+  } while (true);
+}
+function shallowPropagate(link2) {
+  do {
+    const sub = link2.sub;
+    const nextSub = link2.nextSub;
+    const subFlags = sub.flags;
+    if ((subFlags & (32 /* Pending */ | 16 /* Dirty */)) === 32 /* Pending */) {
+      sub.flags = subFlags | 16 /* Dirty */;
+    }
+    link2 = nextSub;
+  } while (link2 !== void 0);
+}
+function isValidLink(checkLink, sub) {
+  const depsTail = sub.depsTail;
+  if (depsTail !== void 0) {
+    let link2 = sub.deps;
+    do {
+      if (link2 === checkLink) {
+        return true;
       }
-    } finally {
-      endBatch();
-    }
+      if (link2 === depsTail) {
+        break;
+      }
+      link2 = link2.nextDep;
+    } while (link2 !== void 0);
   }
+  return false;
 }
-function addSub(link) {
-  link.dep.sc++;
-  if (link.sub.flags & 4) {
-    const computed = link.dep.computed;
-    if (computed && !link.dep.subs) {
-      computed.flags |= 4 | 16;
-      for (let l = computed.deps; l; l = l.nextDep) {
-        addSub(l);
-      }
-    }
-    const currentTail = link.dep.subs;
-    if (currentTail !== link) {
-      link.prevSub = currentTail;
-      if (currentTail) currentTail.nextSub = link;
+
+class Dep {
+  constructor(map, key) {
+    this.map = map;
+    this.key = key;
+    this._subs = void 0;
+    this.subsTail = void 0;
+    this.flags = ReactiveFlags.None;
+  }
+  get subs() {
+    return this._subs;
+  }
+  set subs(value) {
+    this._subs = value;
+    if (value === void 0) {
+      this.map.delete(this.key);
     }
-    link.dep.subs = link;
   }
 }
 const targetMap = /* @__PURE__ */ new WeakMap();
@@ -922,33 +726,27 @@ const ARRAY_ITERATE_KEY = Symbol(
   ""
 );
 function track(target, type, key) {
-  if (shouldTrack && activeSub) {
+  if (activeSub !== void 0) {
     let depsMap = targetMap.get(target);
     if (!depsMap) {
       targetMap.set(target, depsMap = /* @__PURE__ */ new Map());
     }
     let dep = depsMap.get(key);
     if (!dep) {
-      depsMap.set(key, dep = new Dep());
-      dep.map = depsMap;
-      dep.key = key;
-    }
-    {
-      dep.track();
+      depsMap.set(key, dep = new Dep(depsMap, key));
     }
+    link(dep, activeSub);
   }
 }
 function trigger(target, type, key, newValue, oldValue, oldTarget) {
   const depsMap = targetMap.get(target);
   if (!depsMap) {
-    globalVersion++;
     return;
   }
   const run = (dep) => {
-    if (dep) {
-      {
-        dep.trigger();
-      }
+    if (dep !== void 0 && dep.subs !== void 0) {
+      propagate(dep.subs);
+      shallowPropagate(dep.subs);
     }
   };
   startBatch();
@@ -1173,11 +971,11 @@ function searchProxy(self, method, args) {
   return res;
 }
 function noTracking(self, method, args = []) {
-  pauseTracking();
   startBatch();
+  const prevSub = setActiveSub();
   const res = toRaw(self)[method].apply(self, args);
+  setActiveSub(prevSub);
   endBatch();
-  resetTracking();
   return res;
 }
 
@@ -1223,14 +1021,18 @@ class BaseReactiveHandler {
         return hasOwnProperty;
       }
     }
+    const wasRef = isRef(target);
     const res = Reflect.get(
       target,
       key,
       // if this is a proxy wrapping a ref, return methods using the raw ref
       // as receiver so that we don't have to call `toRaw` on the ref in all
       // its class methods
-      isRef(target) ? target : receiver
+      wasRef ? target : receiver
     );
+    if (wasRef && key !== "value") {
+      return res;
+    }
     if (isSymbol(key) ? builtInSymbols.has(key) : isNonTrackableKeys(key)) {
       return res;
     }
@@ -1414,7 +1216,7 @@ function createInstrumentations(readonly, shallow) {
       });
     }
   };
-  extend$1(
+  extend(
     instrumentations,
     readonly ? {
       add: createReadonlyMethod("add"),
@@ -1640,29 +1442,47 @@ function isRef(r) {
   return r ? r["__v_isRef"] === true : false;
 }
 function ref(value) {
-  return createRef(value, false);
+  return createRef(value, toReactive);
 }
 function shallowRef(value) {
-  return createRef(value, true);
+  return createRef(value);
 }
-function createRef(rawValue, shallow) {
+function createRef(rawValue, wrap) {
   if (isRef(rawValue)) {
     return rawValue;
   }
-  return new RefImpl(rawValue, shallow);
+  return new RefImpl(rawValue, wrap);
 }
 class RefImpl {
-  constructor(value, isShallow2) {
-    this.dep = new Dep();
-    this["__v_isRef"] = true;
-    this["__v_isShallow"] = false;
-    this._rawValue = isShallow2 ? value : toRaw(value);
-    this._value = isShallow2 ? value : toReactive(value);
-    this["__v_isShallow"] = isShallow2;
+  // TODO isolatedDeclarations "__v_isShallow"
+  constructor(value, wrap) {
+    this.subs = void 0;
+    this.subsTail = void 0;
+    this.flags = ReactiveFlags.Mutable;
+    /**
+     * @internal
+     */
+    this.__v_isRef = true;
+    // TODO isolatedDeclarations "__v_isRef"
+    /**
+     * @internal
+     */
+    this.__v_isShallow = false;
+    this._oldValue = this._rawValue = wrap ? toRaw(value) : value;
+    this._value = wrap ? wrap(value) : value;
+    this._wrap = wrap;
+    this["__v_isShallow"] = !wrap;
+  }
+  get dep() {
+    return this;
   }
   get value() {
-    {
-      this.dep.track();
+    trackRef(this);
+    if (this.flags & ReactiveFlags.Dirty && this.update()) {
+      const subs = this.subs;
+      if (subs !== void 0) {
+        shallowPropagate(subs);
+      }
     }
     return this._value;
   }
@@ -1671,21 +1491,38 @@ class RefImpl {
     const useDirectValue = this["__v_isShallow"] || isShallow(newValue) || isReadonly(newValue);
     newValue = useDirectValue ? newValue : toRaw(newValue);
     if (hasChanged(newValue, oldValue)) {
+      this.flags |= ReactiveFlags.Dirty;
       this._rawValue = newValue;
-      this._value = useDirectValue ? newValue : toReactive(newValue);
-      {
-        this.dep.trigger();
+      this._value = !useDirectValue && this._wrap ? this._wrap(newValue) : newValue;
+      const subs = this.subs;
+      if (subs !== void 0) {
+        propagate(subs);
+        if (!batchDepth) {
+          flush();
+        }
       }
     }
   }
+  update() {
+    this.flags &= ~ReactiveFlags.Dirty;
+    return hasChanged(this._oldValue, this._oldValue = this._rawValue);
+  }
 }
 function triggerRef(ref2) {
-  if (ref2.dep) {
-    {
-      ref2.dep.trigger();
+  const dep = ref2.dep;
+  if (dep !== void 0 && dep.subs !== void 0) {
+    propagate(dep.subs);
+    shallowPropagate(dep.subs);
+    if (!batchDepth) {
+      flush();
     }
   }
 }
+function trackRef(dep) {
+  if (activeSub !== void 0) {
+    link(dep, activeSub);
+  }
+}
 function unref(ref2) {
   return isRef(ref2) ? ref2.value : ref2;
 }
@@ -1709,13 +1546,21 @@ function proxyRefs(objectWithRefs) {
 }
 class CustomRefImpl {
   constructor(factory) {
+    this.subs = void 0;
+    this.subsTail = void 0;
+    this.flags = ReactiveFlags.None;
     this["__v_isRef"] = true;
     this._value = void 0;
-    const dep = this.dep = new Dep();
-    const { get, set } = factory(dep.track.bind(dep), dep.trigger.bind(dep));
+    const { get, set } = factory(
+      () => trackRef(this),
+      () => triggerRef(this)
+    );
     this._get = get;
     this._set = set;
   }
+  get dep() {
+    return this;
+  }
   get value() {
     return this._value = this._get();
   }
@@ -1779,65 +1624,317 @@ function propertyToRef(source, key, defaultValue) {
   return isRef(val) ? val : new ObjectRefImpl(source, key, defaultValue);
 }
 
-class ComputedRefImpl {
-  constructor(fn, setter, isSSR) {
-    this.fn = fn;
-    this.setter = setter;
-    /**
-     * @internal
-     */
-    this._value = void 0;
-    /**
-     * @internal
-     */
-    this.dep = new Dep(this);
+class ReactiveEffect {
+  constructor(fn) {
+    this.deps = void 0;
+    this.depsTail = void 0;
+    this.subs = void 0;
+    this.subsTail = void 0;
+    this.flags = ReactiveFlags.Watching | ReactiveFlags.Dirty;
     /**
      * @internal
      */
-    this.__v_isRef = true;
-    // TODO isolatedDeclarations "__v_isReadonly"
-    // A computed is also a subscriber that tracks other deps
+    this.cleanups = [];
     /**
      * @internal
      */
+    this.cleanupsLength = 0;
+    if (fn !== void 0) {
+      this.fn = fn;
+    }
+    if (activeEffectScope) {
+      link(this, activeEffectScope);
+    }
+  }
+  // @ts-expect-error
+  fn() {
+  }
+  get active() {
+    return !(this.flags & 1024);
+  }
+  pause() {
+    this.flags |= 256;
+  }
+  resume() {
+    const flags = this.flags &= -257;
+    if (flags & (ReactiveFlags.Dirty | ReactiveFlags.Pending)) {
+      this.notify();
+    }
+  }
+  notify() {
+    if (!(this.flags & 256) && this.dirty) {
+      this.run();
+    }
+  }
+  run() {
+    if (!this.active) {
+      return this.fn();
+    }
+    cleanup(this);
+    const prevSub = startTracking(this);
+    try {
+      return this.fn();
+    } finally {
+      endTracking(this, prevSub);
+      const flags = this.flags;
+      if ((flags & (ReactiveFlags.Recursed | 128)) === (ReactiveFlags.Recursed | 128)) {
+        this.flags = flags & ~ReactiveFlags.Recursed;
+        this.notify();
+      }
+    }
+  }
+  stop() {
+    if (!this.active) {
+      return;
+    }
+    this.flags = 1024;
+    let dep = this.deps;
+    while (dep !== void 0) {
+      dep = unlink(dep, this);
+    }
+    const sub = this.subs;
+    if (sub !== void 0) {
+      unlink(sub);
+    }
+    cleanup(this);
+  }
+  get dirty() {
+    const flags = this.flags;
+    if (flags & ReactiveFlags.Dirty) {
+      return true;
+    }
+    if (flags & ReactiveFlags.Pending) {
+      if (checkDirty(this.deps, this)) {
+        this.flags = flags | ReactiveFlags.Dirty;
+        return true;
+      } else {
+        this.flags = flags & ~ReactiveFlags.Pending;
+      }
+    }
+    return false;
+  }
+}
+function effect(fn, options) {
+  if (fn.effect instanceof ReactiveEffect) {
+    fn = fn.effect.fn;
+  }
+  const e = new ReactiveEffect(fn);
+  if (options) {
+    const { onStop, scheduler } = options;
+    if (onStop) {
+      options.onStop = void 0;
+      const stop2 = e.stop.bind(e);
+      e.stop = () => {
+        stop2();
+        onStop();
+      };
+    }
+    if (scheduler) {
+      options.scheduler = void 0;
+      e.notify = () => {
+        if (!(e.flags & 256)) {
+          scheduler();
+        }
+      };
+    }
+    extend(e, options);
+  }
+  try {
+    e.run();
+  } catch (err) {
+    e.stop();
+    throw err;
+  }
+  const runner = e.run.bind(e);
+  runner.effect = e;
+  return runner;
+}
+function stop(runner) {
+  runner.effect.stop();
+}
+function cleanup(sub) {
+  const l = sub.cleanupsLength;
+  if (l) {
+    for (let i = 0; i < l; i++) {
+      sub.cleanups[i]();
+    }
+    sub.cleanupsLength = 0;
+  }
+}
+
+let activeEffectScope;
+class EffectScope {
+  constructor(detached = false) {
     this.deps = void 0;
+    this.depsTail = void 0;
+    this.subs = void 0;
+    this.subsTail = void 0;
+    this.flags = 0;
     /**
      * @internal
      */
-    this.depsTail = void 0;
+    this.cleanups = [];
     /**
      * @internal
      */
-    this.flags = 16;
+    this.cleanupsLength = 0;
+    if (!detached && activeEffectScope) {
+      link(this, activeEffectScope);
+    }
+  }
+  get active() {
+    return !(this.flags & 1024);
+  }
+  pause() {
+    if (!(this.flags & 256)) {
+      this.flags |= 256;
+      for (let link2 = this.deps; link2 !== void 0; link2 = link2.nextDep) {
+        const dep = link2.dep;
+        if ("pause" in dep) {
+          dep.pause();
+        }
+      }
+    }
+  }
+  /**
+   * Resumes the effect scope, including all child scopes and effects.
+   */
+  resume() {
+    const flags = this.flags;
+    if (flags & 256) {
+      this.flags = flags & -257;
+      for (let link2 = this.deps; link2 !== void 0; link2 = link2.nextDep) {
+        const dep = link2.dep;
+        if ("resume" in dep) {
+          dep.resume();
+        }
+      }
+    }
+  }
+  run(fn) {
+    const prevScope = activeEffectScope;
+    try {
+      activeEffectScope = this;
+      return fn();
+    } finally {
+      activeEffectScope = prevScope;
+    }
+  }
+  stop() {
+    if (!this.active) {
+      return;
+    }
+    this.flags = 1024;
+    let dep = this.deps;
+    while (dep !== void 0) {
+      const node = dep.dep;
+      if ("stop" in node) {
+        dep = dep.nextDep;
+        node.stop();
+      } else {
+        dep = unlink(dep, this);
+      }
+    }
+    const sub = this.subs;
+    if (sub !== void 0) {
+      unlink(sub);
+    }
+    cleanup(this);
+  }
+}
+function effectScope(detached) {
+  return new EffectScope(detached);
+}
+function getCurrentScope() {
+  return activeEffectScope;
+}
+function setCurrentScope(scope) {
+  try {
+    return activeEffectScope;
+  } finally {
+    activeEffectScope = scope;
+  }
+}
+function onScopeDispose(fn, failSilently = false) {
+  if (activeEffectScope !== void 0) {
+    activeEffectScope.cleanups[activeEffectScope.cleanupsLength++] = fn;
+  }
+}
+
+class ComputedRefImpl {
+  constructor(fn, setter) {
+    this.fn = fn;
+    this.setter = setter;
     /**
      * @internal
      */
-    this.globalVersion = globalVersion - 1;
+    this._value = void 0;
+    this.subs = void 0;
+    this.subsTail = void 0;
+    this.deps = void 0;
+    this.depsTail = void 0;
+    this.flags = ReactiveFlags.Mutable | ReactiveFlags.Dirty;
     /**
      * @internal
      */
-    this.next = void 0;
-    // for backwards compat
-    this.effect = this;
+    this.__v_isRef = true;
     this["__v_isReadonly"] = !setter;
-    this.isSSR = isSSR;
+  }
+  // TODO isolatedDeclarations "__v_isReadonly"
+  // for backwards compat
+  get effect() {
+    return this;
+  }
+  // for backwards compat
+  get dep() {
+    return this;
   }
   /**
    * @internal
+   * for backwards compat
    */
-  notify() {
-    this.flags |= 16;
-    if (!(this.flags & 8) && // avoid infinite self recursion
-    activeSub !== this) {
-      batch(this, true);
+  get _dirty() {
+    const flags = this.flags;
+    if (flags & ReactiveFlags.Dirty) {
       return true;
     }
+    if (flags & ReactiveFlags.Pending) {
+      if (checkDirty(this.deps, this)) {
+        this.flags = flags | ReactiveFlags.Dirty;
+        return true;
+      } else {
+        this.flags = flags & ~ReactiveFlags.Pending;
+      }
+    }
+    return false;
+  }
+  /**
+   * @internal
+   * for backwards compat
+   */
+  set _dirty(v) {
+    if (v) {
+      this.flags |= ReactiveFlags.Dirty;
+    } else {
+      this.flags &= ~(ReactiveFlags.Dirty | ReactiveFlags.Pending);
+    }
   }
   get value() {
-    const link = this.dep.track();
-    refreshComputed(this);
-    if (link) {
-      link.version = this.dep.version;
+    const flags = this.flags;
+    if (flags & ReactiveFlags.Dirty || flags & ReactiveFlags.Pending && checkDirty(this.deps, this)) {
+      if (this.update()) {
+        const subs = this.subs;
+        if (subs !== void 0) {
+          shallowPropagate(subs);
+        }
+      }
+    } else if (flags & ReactiveFlags.Pending) {
+      this.flags = flags & ~ReactiveFlags.Pending;
+    }
+    if (activeSub !== void 0) {
+      link(this, activeSub);
+    } else if (activeEffectScope !== void 0) {
+      link(this, activeEffectScope);
     }
     return this._value;
   }
@@ -1846,6 +1943,20 @@ class ComputedRefImpl {
       this.setter(newValue);
     }
   }
+  update() {
+    const prevSub = startTracking(this);
+    try {
+      const oldValue = this._value;
+      const newValue = this.fn(oldValue);
+      if (hasChanged(oldValue, newValue)) {
+        this._value = newValue;
+        return true;
+      }
+      return false;
+    } finally {
+      endTracking(this, prevSub);
+    }
+  }
 }
 function computed$1(getterOrOptions, debugOptions, isSSR = false) {
   let getter;
@@ -1856,7 +1967,7 @@ function computed$1(getterOrOptions, debugOptions, isSSR = false) {
     getter = getterOrOptions.get;
     setter = getterOrOptions.set;
   }
-  const cRef = new ComputedRefImpl(getter, setter, isSSR);
+  const cRef = new ComputedRefImpl(getter, setter);
   return cRef;
 }
 
@@ -1873,159 +1984,128 @@ const TriggerOpTypes = {
 };
 
 const INITIAL_WATCHER_VALUE = {};
-const cleanupMap = /* @__PURE__ */ new WeakMap();
 let activeWatcher = void 0;
 function getCurrentWatcher() {
   return activeWatcher;
 }
 function onWatcherCleanup(cleanupFn, failSilently = false, owner = activeWatcher) {
   if (owner) {
-    let cleanups = cleanupMap.get(owner);
-    if (!cleanups) cleanupMap.set(owner, cleanups = []);
-    cleanups.push(cleanupFn);
-  }
-}
-function watch$1(source, cb, options = EMPTY_OBJ) {
-  const { immediate, deep, once, scheduler, augmentJob, call } = options;
-  const reactiveGetter = (source2) => {
-    if (deep) return source2;
-    if (isShallow(source2) || deep === false || deep === 0)
-      return traverse(source2, 1);
-    return traverse(source2);
-  };
-  let effect;
-  let getter;
-  let cleanup;
-  let boundCleanup;
-  let forceTrigger = false;
-  let isMultiSource = false;
-  if (isRef(source)) {
-    getter = () => source.value;
-    forceTrigger = isShallow(source);
-  } else if (isReactive(source)) {
-    getter = () => reactiveGetter(source);
-    forceTrigger = true;
-  } else if (isArray(source)) {
-    isMultiSource = true;
-    forceTrigger = source.some((s) => isReactive(s) || isShallow(s));
-    getter = () => source.map((s) => {
-      if (isRef(s)) {
-        return s.value;
-      } else if (isReactive(s)) {
-        return reactiveGetter(s);
-      } else if (isFunction(s)) {
-        return call ? call(s, 2) : s();
-      } else ;
-    });
-  } else if (isFunction(source)) {
-    if (cb) {
-      getter = call ? () => call(source, 2) : source;
+    const { call } = owner.options;
+    if (call) {
+      owner.cleanups[owner.cleanupsLength++] = () => call(cleanupFn, 4);
     } else {
-      getter = () => {
-        if (cleanup) {
-          pauseTracking();
+      owner.cleanups[owner.cleanupsLength++] = cleanupFn;
+    }
+  }
+}
+class WatcherEffect extends ReactiveEffect {
+  constructor(source, cb, options = EMPTY_OBJ) {
+    const { deep, once, call, onWarn } = options;
+    let getter;
+    let forceTrigger = false;
+    let isMultiSource = false;
+    if (isRef(source)) {
+      getter = () => source.value;
+      forceTrigger = isShallow(source);
+    } else if (isReactive(source)) {
+      getter = () => reactiveGetter(source, deep);
+      forceTrigger = true;
+    } else if (isArray(source)) {
+      isMultiSource = true;
+      forceTrigger = source.some((s) => isReactive(s) || isShallow(s));
+      getter = () => source.map((s) => {
+        if (isRef(s)) {
+          return s.value;
+        } else if (isReactive(s)) {
+          return reactiveGetter(s, deep);
+        } else if (isFunction(s)) {
+          return call ? call(s, 2) : s();
+        } else ;
+      });
+    } else if (isFunction(source)) {
+      if (cb) {
+        getter = call ? () => call(source, 2) : source;
+      } else {
+        getter = () => {
+          if (this.cleanupsLength) {
+            const prevSub = setActiveSub();
+            try {
+              cleanup(this);
+            } finally {
+              setActiveSub(prevSub);
+            }
+          }
+          const currentEffect = activeWatcher;
+          activeWatcher = this;
           try {
-            cleanup();
+            return call ? call(source, 3, [
+              this.boundCleanup
+            ]) : source(this.boundCleanup);
           } finally {
-            resetTracking();
+            activeWatcher = currentEffect;
           }
-        }
-        const currentEffect = activeWatcher;
-        activeWatcher = effect;
-        try {
-          return call ? call(source, 3, [boundCleanup]) : source(boundCleanup);
-        } finally {
-          activeWatcher = currentEffect;
-        }
+        };
+      }
+    } else {
+      getter = NOOP;
+    }
+    if (cb && deep) {
+      const baseGetter = getter;
+      const depth = deep === true ? Infinity : deep;
+      getter = () => traverse(baseGetter(), depth);
+    }
+    super(getter);
+    this.cb = cb;
+    this.options = options;
+    this.boundCleanup = (fn) => onWatcherCleanup(fn, false, this);
+    this.forceTrigger = forceTrigger;
+    this.isMultiSource = isMultiSource;
+    if (once && cb) {
+      const _cb = cb;
+      cb = (...args) => {
+        _cb(...args);
+        this.stop();
       };
     }
-  } else {
-    getter = NOOP;
-  }
-  if (cb && deep) {
-    const baseGetter = getter;
-    const depth = deep === true ? Infinity : deep;
-    getter = () => traverse(baseGetter(), depth);
-  }
-  const scope = getCurrentScope();
-  const watchHandle = () => {
-    effect.stop();
-    if (scope && scope.active) {
-      remove(scope.effects, effect);
-    }
-  };
-  if (once && cb) {
-    const _cb = cb;
-    cb = (...args) => {
-      _cb(...args);
-      watchHandle();
-    };
+    this.cb = cb;
+    this.oldValue = isMultiSource ? new Array(source.length).fill(INITIAL_WATCHER_VALUE) : INITIAL_WATCHER_VALUE;
   }
-  let oldValue = isMultiSource ? new Array(source.length).fill(INITIAL_WATCHER_VALUE) : INITIAL_WATCHER_VALUE;
-  const job = (immediateFirstRun) => {
-    if (!(effect.flags & 1) || !effect.dirty && !immediateFirstRun) {
+  run(initialRun = false) {
+    const oldValue = this.oldValue;
+    const newValue = this.oldValue = super.run();
+    if (!this.cb) {
       return;
     }
-    if (cb) {
-      const newValue = effect.run();
-      if (deep || forceTrigger || (isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue))) {
-        if (cleanup) {
-          cleanup();
-        }
-        const currentWatcher = activeWatcher;
-        activeWatcher = effect;
-        try {
-          const args = [
-            newValue,
-            // pass undefined as the old value when it's changed for the first time
-            oldValue === INITIAL_WATCHER_VALUE ? void 0 : isMultiSource && oldValue[0] === INITIAL_WATCHER_VALUE ? [] : oldValue,
-            boundCleanup
-          ];
-          oldValue = newValue;
-          call ? call(cb, 3, args) : (
-            // @ts-expect-error
-            cb(...args)
-          );
-        } finally {
-          activeWatcher = currentWatcher;
-        }
-      }
-    } else {
-      effect.run();
+    const { immediate, deep, call } = this.options;
+    if (initialRun && !immediate) {
+      return;
     }
-  };
-  if (augmentJob) {
-    augmentJob(job);
-  }
-  effect = new ReactiveEffect(getter);
-  effect.scheduler = scheduler ? () => scheduler(job, false) : job;
-  boundCleanup = (fn) => onWatcherCleanup(fn, false, effect);
-  cleanup = effect.onStop = () => {
-    const cleanups = cleanupMap.get(effect);
-    if (cleanups) {
-      if (call) {
-        call(cleanups, 4);
-      } else {
-        for (const cleanup2 of cleanups) cleanup2();
+    if (deep || this.forceTrigger || (this.isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue))) {
+      cleanup(this);
+      const currentWatcher = activeWatcher;
+      activeWatcher = this;
+      try {
+        const args = [
+          newValue,
+          // pass undefined as the old value when it's changed for the first time
+          oldValue === INITIAL_WATCHER_VALUE ? void 0 : this.isMultiSource && oldValue[0] === INITIAL_WATCHER_VALUE ? [] : oldValue,
+          this.boundCleanup
+        ];
+        call ? call(this.cb, 3, args) : (
+          // @ts-expect-error
+          this.cb(...args)
+        );
+      } finally {
+        activeWatcher = currentWatcher;
       }
-      cleanupMap.delete(effect);
-    }
-  };
-  if (cb) {
-    if (immediate) {
-      job(true);
-    } else {
-      oldValue = effect.run();
     }
-  } else if (scheduler) {
-    scheduler(job.bind(null, true), true);
-  } else {
-    effect.run();
   }
-  watchHandle.pause = effect.pause.bind(effect);
-  watchHandle.resume = effect.resume.bind(effect);
-  watchHandle.stop = watchHandle;
-  return watchHandle;
+}
+function reactiveGetter(source, deep) {
+  if (deep) return source;
+  if (isShallow(source) || deep === false || deep === 0)
+    return traverse(source, 1);
+  return traverse(source);
 }
 function traverse(value, depth = Infinity, seen) {
   if (depth <= 0 || !isObject(value) || value["__v_skip"]) {
@@ -2060,7 +2140,7 @@ function traverse(value, depth = Infinity, seen) {
   return value;
 }
 
-function pushWarningContext(vnode) {
+function pushWarningContext(ctx) {
 }
 function popWarningContext() {
 }
@@ -2157,11 +2237,10 @@ function callWithAsyncErrorHandling(fn, instance, type, args) {
   }
 }
 function handleError(err, instance, type, throwInDev = true) {
-  const contextVNode = instance ? instance.vnode : null;
   const { errorHandler, throwUnhandledErrorInProduction } = instance && instance.appContext.config || EMPTY_OBJ;
   if (instance) {
     let cur = instance.parent;
-    const exposedInstance = instance.proxy;
+    const exposedInstance = instance.proxy || instance;
     const errorInfo = `https://vuejs.org/error-reference/#runtime-${type}`;
     while (cur) {
       const errorCapturedHooks = cur.ec;
@@ -2175,19 +2254,19 @@ function handleError(err, instance, type, throwInDev = true) {
       cur = cur.parent;
     }
     if (errorHandler) {
-      pauseTracking();
+      const prevSub = setActiveSub();
       callWithErrorHandling(errorHandler, null, 10, [
         err,
         exposedInstance,
         errorInfo
       ]);
-      resetTracking();
+      setActiveSub(prevSub);
       return;
     }
   }
-  logError(err, type, contextVNode, throwInDev, throwUnhandledErrorInProduction);
+  logError(err, type, instance, throwInDev, throwUnhandledErrorInProduction);
 }
-function logError(err, type, contextVNode, throwInDev = true, throwInProd = false) {
+function logError(err, type, instance, throwInDev = true, throwInProd = false) {
   if (throwInProd) {
     throw err;
   } else {
@@ -2195,25 +2274,22 @@ function logError(err, type, contextVNode, throwInDev = true, throwInProd = fals
   }
 }
 
-const queue = [];
-let flushIndex = -1;
-const pendingPostFlushCbs = [];
-let activePostFlushCbs = null;
+const jobs = [];
+let postJobs = [];
+let activePostJobs = null;
+let currentFlushPromise = null;
+let jobsLength = 0;
+let flushIndex = 0;
 let postFlushIndex = 0;
 const resolvedPromise = /* @__PURE__ */ Promise.resolve();
-let currentFlushPromise = null;
 function nextTick(fn) {
   const p = currentFlushPromise || resolvedPromise;
   return fn ? p.then(this ? fn.bind(this) : fn) : p;
 }
-function findInsertionIndex(id) {
-  let start = flushIndex + 1;
-  let end = queue.length;
+function findInsertionIndex(order, queue, start, end) {
   while (start < end) {
     const middle = start + end >>> 1;
-    const middleJob = queue[middle];
-    const middleJobId = getId(middleJob);
-    if (middleJobId < id || middleJobId === id && middleJob.flags & 2) {
+    if (queue[middle].order <= order) {
       start = middle + 1;
     } else {
       end = middle;
@@ -2221,112 +2297,151 @@ function findInsertionIndex(id) {
   }
   return start;
 }
-function queueJob(job) {
-  if (!(job.flags & 1)) {
-    const jobId = getId(job);
-    const lastJob = queue[queue.length - 1];
-    if (!lastJob || // fast path when the job id is larger than the tail
-    !(job.flags & 2) && jobId >= getId(lastJob)) {
-      queue.push(job);
+function queueJob(job, id, isPre = false) {
+  if (queueJobWorker(
+    job,
+    id === void 0 ? isPre ? -2 : Infinity : isPre ? id * 2 : id * 2 + 1,
+    jobs,
+    jobsLength,
+    flushIndex
+  )) {
+    jobsLength++;
+    queueFlush();
+  }
+}
+function queueJobWorker(job, order, queue, length, flushIndex2) {
+  const flags = job.flags;
+  if (!(flags & 1)) {
+    job.flags = flags | 1;
+    job.order = order;
+    if (flushIndex2 === length || // fast path when the job id is larger than the tail
+    order >= queue[length - 1].order) {
+      queue[length] = job;
     } else {
-      queue.splice(findInsertionIndex(jobId), 0, job);
+      queue.splice(findInsertionIndex(order, queue, flushIndex2, length), 0, job);
     }
-    job.flags |= 1;
-    queueFlush();
+    return true;
   }
+  return false;
 }
+const doFlushJobs = () => {
+  try {
+    flushJobs();
+  } catch (e) {
+    currentFlushPromise = null;
+    throw e;
+  }
+};
 function queueFlush() {
   if (!currentFlushPromise) {
-    currentFlushPromise = resolvedPromise.then(flushJobs);
+    currentFlushPromise = resolvedPromise.then(doFlushJobs);
   }
 }
-function queuePostFlushCb(cb) {
-  if (!isArray(cb)) {
-    if (activePostFlushCbs && cb.id === -1) {
-      activePostFlushCbs.splice(postFlushIndex + 1, 0, cb);
-    } else if (!(cb.flags & 1)) {
-      pendingPostFlushCbs.push(cb);
-      cb.flags |= 1;
+function queuePostFlushCb(jobs2, id = Infinity) {
+  if (!isArray(jobs2)) {
+    if (activePostJobs && id === -1) {
+      activePostJobs.splice(postFlushIndex, 0, jobs2);
+    } else {
+      queueJobWorker(jobs2, id, postJobs, postJobs.length, 0);
     }
   } else {
-    pendingPostFlushCbs.push(...cb);
+    for (const job of jobs2) {
+      queueJobWorker(job, id, postJobs, postJobs.length, 0);
+    }
   }
   queueFlush();
 }
-function flushPreFlushCbs(instance, seen, i = flushIndex + 1) {
-  for (; i < queue.length; i++) {
-    const cb = queue[i];
-    if (cb && cb.flags & 2) {
-      if (instance && cb.id !== instance.uid) {
-        continue;
-      }
-      queue.splice(i, 1);
-      i--;
-      if (cb.flags & 4) {
-        cb.flags &= -2;
-      }
-      cb();
-      if (!(cb.flags & 4)) {
-        cb.flags &= -2;
-      }
+function flushPreFlushCbs(instance, seen) {
+  for (let i = flushIndex; i < jobsLength; i++) {
+    const cb = jobs[i];
+    if (cb.order & 1 || cb.order === Infinity) {
+      continue;
+    }
+    if (instance && cb.order !== instance.uid * 2) {
+      continue;
+    }
+    jobs.splice(i, 1);
+    i--;
+    jobsLength--;
+    if (cb.flags & 2) {
+      cb.flags &= -2;
+    }
+    cb();
+    if (!(cb.flags & 2)) {
+      cb.flags &= -2;
     }
   }
 }
 function flushPostFlushCbs(seen) {
-  if (pendingPostFlushCbs.length) {
-    const deduped = [...new Set(pendingPostFlushCbs)].sort(
-      (a, b) => getId(a) - getId(b)
-    );
-    pendingPostFlushCbs.length = 0;
-    if (activePostFlushCbs) {
-      activePostFlushCbs.push(...deduped);
+  if (postJobs.length) {
+    if (activePostJobs) {
+      activePostJobs.push(...postJobs);
+      postJobs.length = 0;
       return;
     }
-    activePostFlushCbs = deduped;
-    for (postFlushIndex = 0; postFlushIndex < activePostFlushCbs.length; postFlushIndex++) {
-      const cb = activePostFlushCbs[postFlushIndex];
-      if (cb.flags & 4) {
+    activePostJobs = postJobs;
+    postJobs = [];
+    while (postFlushIndex < activePostJobs.length) {
+      const cb = activePostJobs[postFlushIndex++];
+      if (cb.flags & 2) {
         cb.flags &= -2;
       }
-      if (!(cb.flags & 8)) cb();
-      cb.flags &= -2;
+      if (!(cb.flags & 4)) {
+        try {
+          cb();
+        } finally {
+          cb.flags &= -2;
+        }
+      }
     }
-    activePostFlushCbs = null;
+    activePostJobs = null;
     postFlushIndex = 0;
   }
 }
-const getId = (job) => job.id == null ? job.flags & 2 ? -1 : Infinity : job.id;
+let isFlushing = false;
+function flushOnAppMount() {
+  if (!isFlushing) {
+    isFlushing = true;
+    flushPreFlushCbs();
+    flushPostFlushCbs();
+    isFlushing = false;
+  }
+}
 function flushJobs(seen) {
   try {
-    for (flushIndex = 0; flushIndex < queue.length; flushIndex++) {
-      const job = queue[flushIndex];
-      if (job && !(job.flags & 8)) {
+    while (flushIndex < jobsLength) {
+      const job = jobs[flushIndex];
+      jobs[flushIndex++] = void 0;
+      if (!(job.flags & 4)) {
         if (false) ;
-        if (job.flags & 4) {
+        if (job.flags & 2) {
           job.flags &= ~1;
         }
-        callWithErrorHandling(
-          job,
-          job.i,
-          job.i ? 15 : 14
-        );
-        if (!(job.flags & 4)) {
-          job.flags &= ~1;
+        try {
+          job();
+        } catch (err) {
+          handleError(
+            err,
+            job.i,
+            job.i ? 15 : 14
+          );
+        } finally {
+          if (!(job.flags & 2)) {
+            job.flags &= ~1;
+          }
         }
       }
     }
   } finally {
-    for (; flushIndex < queue.length; flushIndex++) {
-      const job = queue[flushIndex];
-      if (job) {
-        job.flags &= -2;
-      }
+    while (flushIndex < jobsLength) {
+      jobs[flushIndex].flags &= -2;
+      jobs[flushIndex++] = void 0;
     }
-    flushIndex = -1;
-    queue.length = 0;
+    flushIndex = 0;
+    jobsLength = 0;
     flushPostFlushCbs();
     currentFlushPromise = null;
-    if (queue.length || pendingPostFlushCbs.length) {
+    if (jobsLength || postJobs.length) {
       flushJobs();
     }
   }
@@ -2385,7 +2500,7 @@ const globalCompatConfig = {
   MODE: 2
 };
 function configureCompat(config) {
-  extend$1(globalCompatConfig, config);
+  extend(globalCompatConfig, config);
 }
 function getCompatConfigForKey(key, instance) {
   const instanceConfig = instance && instance.type.compatConfig;
@@ -2522,7 +2637,7 @@ function convertLegacyVModelProps(vnode) {
 function applyModelFromMixins(model, mixins) {
   if (mixins) {
     mixins.forEach((m) => {
-      if (m.model) extend$1(model, m.model);
+      if (m.model) extend(model, m.model);
       if (m.mixins) applyModelFromMixins(model, m.mixins);
     });
   }
@@ -2672,14 +2787,14 @@ function invokeDirectiveHook(vnode, prevVNode, instance, name) {
       hook = mapCompatDirectiveHook(name, binding.dir, instance);
     }
     if (hook) {
-      pauseTracking();
+      const prevSub = setActiveSub();
       callWithAsyncErrorHandling(hook, instance, 8, [
         vnode.el,
         binding,
         vnode,
         prevVNode
       ]);
-      resetTracking();
+      setActiveSub(prevSub);
     }
   }
 }
@@ -2758,29 +2873,37 @@ const TeleportImpl = {
       }
       if (isTeleportDeferred(n2.props)) {
         n2.el.__isMounted = false;
-        queuePostRenderEffect(() => {
-          mountToTarget();
-          delete n2.el.__isMounted;
-        }, parentSuspense);
+        queuePostRenderEffect(
+          () => {
+            mountToTarget();
+            delete n2.el.__isMounted;
+          },
+          void 0,
+          parentSuspense
+        );
       } else {
         mountToTarget();
       }
     } else {
       if (isTeleportDeferred(n2.props) && n1.el.__isMounted === false) {
-        queuePostRenderEffect(() => {
-          TeleportImpl.process(
-            n1,
-            n2,
-            container,
-            anchor,
-            parentComponent,
-            parentSuspense,
-            namespace,
-            slotScopeIds,
-            optimized,
-            internals
-          );
-        }, parentSuspense);
+        queuePostRenderEffect(
+          () => {
+            TeleportImpl.process(
+              n1,
+              n2,
+              container,
+              anchor,
+              parentComponent,
+              parentSuspense,
+              namespace,
+              slotScopeIds,
+              optimized,
+              internals
+            );
+          },
+          void 0,
+          parentSuspense
+        );
         return;
       }
       n2.el = n1.el;
@@ -2827,6 +2950,7 @@ const TeleportImpl = {
             container,
             mainAnchor,
             internals,
+            parentComponent,
             1
           );
         } else {
@@ -2846,6 +2970,7 @@ const TeleportImpl = {
               nextTarget,
               null,
               internals,
+              parentComponent,
               0
             );
           }
@@ -2855,6 +2980,7 @@ const TeleportImpl = {
             target,
             targetAnchor,
             internals,
+            parentComponent,
             1
           );
         }
@@ -2894,7 +3020,7 @@ const TeleportImpl = {
   move: moveTeleport,
   hydrate: hydrateTeleport
 };
-function moveTeleport(vnode, container, parentAnchor, { o: { insert }, m: move }, moveType = 2) {
+function moveTeleport(vnode, container, parentAnchor, { o: { insert }, m: move }, parentComponent, moveType = 2) {
   if (moveType === 0) {
     insert(vnode.targetAnchor, container, parentAnchor);
   }
@@ -2910,7 +3036,8 @@ function moveTeleport(vnode, container, parentAnchor, { o: { insert }, m: move }
           children[i],
           container,
           parentAnchor,
-          2
+          2,
+          parentComponent
         );
       }
     }
@@ -3092,7 +3219,7 @@ const BaseTransitionImpl = {
           state.isLeaving = true;
           leavingHooks.afterLeave = () => {
             state.isLeaving = false;
-            if (!(instance.job.flags & 8)) {
+            if (!(instance.job.flags & 4)) {
               instance.update();
             }
             delete leavingHooks.afterLeave;
@@ -3362,12 +3489,12 @@ function defineComponent(options, extraOptions) {
   return isFunction(options) ? (
     // #8236: extend call and options.name access are considered side-effects
     // by Rollup, so we have to wrap it in a pure-annotated IIFE.
-    /* @__PURE__ */ (() => extend$1({ name: options.name }, extraOptions, { setup: options }))()
+    /* @__PURE__ */ (() => extend({ name: options.name }, extraOptions, { setup: options }))()
   ) : options;
 }
 
 function useId() {
-  const i = getCurrentInstance();
+  const i = getCurrentGenericInstance();
   if (i) {
     return (i.appContext.config.idPrefix || "v") + "-" + i.ids[0] + i.ids[1]++;
   }
@@ -3378,7 +3505,7 @@ function markAsyncBoundary(instance) {
 }
 
 function useTemplateRef(key) {
-  const i = getCurrentInstance();
+  const i = getCurrentGenericInstance();
   const r = shallowRef(null);
   if (i) {
     const refs = i.refs === EMPTY_OBJ ? i.refs = {} : i.refs;
@@ -3470,8 +3597,7 @@ function setRef(rawRef, oldRawRef, parentSuspense, vnode, isUnmount = false) {
         } else ;
       };
       if (value) {
-        doSet.id = -1;
-        queuePostRenderEffect(doSet, parentSuspense);
+        queuePostRenderEffect(doSet, -1, parentSuspense);
       } else {
         doSet();
       }
@@ -3621,6 +3747,9 @@ function createHydrationFunctions(rendererInternals) {
             );
           }
         } else if (shapeFlag & 6) {
+          if (vnode.type.__vapor) {
+            throw new Error("Vapor component hydration is not supported yet.");
+          }
           vnode.slotScopeIds = slotScopeIds;
           const container = parentNode(node);
           if (isFragmentStart) {
@@ -3769,11 +3898,15 @@ function createHydrationFunctions(rendererInternals) {
         invokeDirectiveHook(vnode, null, parentComponent, "beforeMount");
       }
       if ((vnodeHooks = props && props.onVnodeMounted) || dirs || needCallTransitionHooks) {
-        queueEffectWithSuspense(() => {
-          vnodeHooks && invokeVNodeHook(vnodeHooks, parentComponent, vnode);
-          needCallTransitionHooks && transition.enter(el);
-          dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
-        }, parentSuspense);
+        queueEffectWithSuspense(
+          () => {
+            vnodeHooks && invokeVNodeHook(vnodeHooks, parentComponent, vnode);
+            needCallTransitionHooks && transition.enter(el);
+            dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+          },
+          void 0,
+          parentSuspense
+        );
       }
     }
     return el.nextSibling;
@@ -4160,7 +4293,7 @@ function defineAsyncComponent(source) {
       }
       load().then(() => {
         loaded.value = true;
-        if (instance.parent && isKeepAlive(instance.parent.vnode)) {
+        if (instance.parent && instance.parent.vnode && isKeepAlive(instance.parent.vnode)) {
           instance.parent.update();
         }
       }).catch((err) => {
@@ -4203,8 +4336,8 @@ const KeepAliveImpl = {
     max: [String, Number]
   },
   setup(props, { slots }) {
-    const instance = getCurrentInstance();
-    const sharedContext = instance.ctx;
+    const keepAliveInstance = getCurrentInstance();
+    const sharedContext = keepAliveInstance.ctx;
     if (!sharedContext.renderer) {
       return () => {
         const children = slots.default && slots.default();
@@ -4214,7 +4347,7 @@ const KeepAliveImpl = {
     const cache = /* @__PURE__ */ new Map();
     const keys = /* @__PURE__ */ new Set();
     let current = null;
-    const parentSuspense = instance.suspense;
+    const parentSuspense = keepAliveInstance.suspense;
     const {
       renderer: {
         p: patch,
@@ -4225,49 +4358,71 @@ const KeepAliveImpl = {
     } = sharedContext;
     const storageContainer = createElement("div");
     sharedContext.activate = (vnode, container, anchor, namespace, optimized) => {
-      const instance2 = vnode.component;
-      move(vnode, container, anchor, 0, parentSuspense);
+      const instance = vnode.component;
+      move(
+        vnode,
+        container,
+        anchor,
+        0,
+        keepAliveInstance,
+        parentSuspense
+      );
       patch(
-        instance2.vnode,
+        instance.vnode,
         vnode,
         container,
         anchor,
-        instance2,
+        instance,
         parentSuspense,
         namespace,
         vnode.slotScopeIds,
         optimized
       );
-      queuePostRenderEffect(() => {
-        instance2.isDeactivated = false;
-        if (instance2.a) {
-          invokeArrayFns(instance2.a);
-        }
-        const vnodeHook = vnode.props && vnode.props.onVnodeMounted;
-        if (vnodeHook) {
-          invokeVNodeHook(vnodeHook, instance2.parent, vnode);
-        }
-      }, parentSuspense);
+      queuePostRenderEffect(
+        () => {
+          instance.isDeactivated = false;
+          if (instance.a) {
+            invokeArrayFns(instance.a);
+          }
+          const vnodeHook = vnode.props && vnode.props.onVnodeMounted;
+          if (vnodeHook) {
+            invokeVNodeHook(vnodeHook, instance.parent, vnode);
+          }
+        },
+        void 0,
+        parentSuspense
+      );
     };
     sharedContext.deactivate = (vnode) => {
-      const instance2 = vnode.component;
-      invalidateMount(instance2.m);
-      invalidateMount(instance2.a);
-      move(vnode, storageContainer, null, 1, parentSuspense);
-      queuePostRenderEffect(() => {
-        if (instance2.da) {
-          invokeArrayFns(instance2.da);
-        }
-        const vnodeHook = vnode.props && vnode.props.onVnodeUnmounted;
-        if (vnodeHook) {
-          invokeVNodeHook(vnodeHook, instance2.parent, vnode);
-        }
-        instance2.isDeactivated = true;
-      }, parentSuspense);
+      const instance = vnode.component;
+      invalidateMount(instance.m);
+      invalidateMount(instance.a);
+      move(
+        vnode,
+        storageContainer,
+        null,
+        1,
+        keepAliveInstance,
+        parentSuspense
+      );
+      queuePostRenderEffect(
+        () => {
+          if (instance.da) {
+            invokeArrayFns(instance.da);
+          }
+          const vnodeHook = vnode.props && vnode.props.onVnodeUnmounted;
+          if (vnodeHook) {
+            invokeVNodeHook(vnodeHook, instance.parent, vnode);
+          }
+          instance.isDeactivated = true;
+        },
+        void 0,
+        parentSuspense
+      );
     };
     function unmount(vnode) {
       resetShapeFlag(vnode);
-      _unmount(vnode, instance, parentSuspense, true);
+      _unmount(vnode, keepAliveInstance, parentSuspense, true);
     }
     function pruneCache(filter) {
       cache.forEach((vnode, key) => {
@@ -4299,12 +4454,19 @@ const KeepAliveImpl = {
     let pendingCacheKey = null;
     const cacheSubtree = () => {
       if (pendingCacheKey != null) {
-        if (isSuspense(instance.subTree.type)) {
-          queuePostRenderEffect(() => {
-            cache.set(pendingCacheKey, getInnerChild(instance.subTree));
-          }, instance.subTree.suspense);
+        if (isSuspense(keepAliveInstance.subTree.type)) {
+          queuePostRenderEffect(
+            () => {
+              cache.set(
+                pendingCacheKey,
+                getInnerChild(keepAliveInstance.subTree)
+              );
+            },
+            void 0,
+            keepAliveInstance.subTree.suspense
+          );
         } else {
-          cache.set(pendingCacheKey, getInnerChild(instance.subTree));
+          cache.set(pendingCacheKey, getInnerChild(keepAliveInstance.subTree));
         }
       }
     };
@@ -4312,12 +4474,12 @@ const KeepAliveImpl = {
     onUpdated(cacheSubtree);
     onBeforeUnmount(() => {
       cache.forEach((cached) => {
-        const { subTree, suspense } = instance;
+        const { subTree, suspense } = keepAliveInstance;
         const vnode = getInnerChild(subTree);
         if (cached.type === vnode.type && cached.key === vnode.key) {
           resetShapeFlag(vnode);
           const da = vnode.component.da;
-          da && queuePostRenderEffect(da, suspense);
+          da && queuePostRenderEffect(da, void 0, suspense);
           return;
         }
         unmount(cached);
@@ -4404,7 +4566,7 @@ function onActivated(hook, target) {
 function onDeactivated(hook, target) {
   registerKeepAliveHook(hook, "da", target);
 }
-function registerKeepAliveHook(hook, type, target = currentInstance) {
+function registerKeepAliveHook(hook, type, target = getCurrentInstance()) {
   const wrappedHook = hook.__wdc || (hook.__wdc = () => {
     let current = target;
     while (current) {
@@ -4418,7 +4580,7 @@ function registerKeepAliveHook(hook, type, target = currentInstance) {
   injectHook(type, wrappedHook, target);
   if (target) {
     let current = target.parent;
-    while (current && current.parent) {
+    while (current && current.parent && current.parent.vnode) {
       if (isKeepAlive(current.parent.vnode)) {
         injectToKeepAliveRoot(wrappedHook, type, target, current);
       }
@@ -4450,12 +4612,14 @@ function injectHook(type, hook, target = currentInstance, prepend = false) {
   if (target) {
     const hooks = target[type] || (target[type] = []);
     const wrappedHook = hook.__weh || (hook.__weh = (...args) => {
-      pauseTracking();
-      const reset = setCurrentInstance(target);
-      const res = callWithAsyncErrorHandling(hook, target, type, args);
-      reset();
-      resetTracking();
-      return res;
+      const prevSub = setActiveSub();
+      const prev = setCurrentInstance(target);
+      try {
+        return callWithAsyncErrorHandling(hook, target, type, args);
+      } finally {
+        setCurrentInstance(...prev);
+        setActiveSub(prevSub);
+      }
     });
     if (prepend) {
       hooks.unshift(wrappedHook);
@@ -4560,7 +4724,11 @@ function resolveAsset(type, name, warnMissing = true, maybeSelfReference = false
     const res = (
       // local registration
       // check instance[type] first which is resolved for options API
-      resolve(instance[type] || Component[type], name) || // global registration
+      resolve(
+        instance[type] || Component[type],
+        name
+      ) || // global registration
+      // @ts-expect-error filters only exist in compat mode
       resolve(instance.appContext[type], name)
     );
     if (!res && maybeSelfReference) {
@@ -4639,7 +4807,7 @@ function convertLegacyProps(legacyProps, type) {
   const converted = {};
   for (const key in legacyProps) {
     if (key === "attrs" || key === "domProps" || key === "props") {
-      extend$1(converted, legacyProps[key]);
+      extend(converted, legacyProps[key]);
     } else if (key === "on" || key === "nativeOn") {
       const listeners = legacyProps[key];
       for (const event in listeners) {
@@ -4727,7 +4895,7 @@ function convertLegacySlots(vnode) {
   if (scopedSlots) {
     delete props.scopedSlots;
     if (slots) {
-      extend$1(slots, scopedSlots);
+      extend(slots, scopedSlots);
     } else {
       slots = scopedSlots;
     }
@@ -4890,7 +5058,13 @@ function createSlots(slots, dynamicSlots) {
 }
 
 function renderSlot(slots, name, props = {}, fallback, noSlotted) {
-  if (currentRenderingInstance.ce || currentRenderingInstance.parent && isAsyncWrapper(currentRenderingInstance.parent) && currentRenderingInstance.parent.ce) {
+  let slot = slots[name];
+  if (slot && slot.__vapor) {
+    const ret = (openBlock(), createBlock(VaporSlot, props));
+    ret.vs = { slot, fallback };
+    return ret;
+  }
+  if (currentRenderingInstance && (currentRenderingInstance.ce || currentRenderingInstance.parent && isAsyncWrapper(currentRenderingInstance.parent) && currentRenderingInstance.parent.ce)) {
     if (name !== "default") props.name = name;
     return openBlock(), createBlock(
       Fragment,
@@ -4899,7 +5073,6 @@ function renderSlot(slots, name, props = {}, fallback, noSlotted) {
       64
     );
   }
-  let slot = slots[name];
   if (slot && slot._c) {
     slot._d = false;
   }
@@ -4947,7 +5120,7 @@ function toObject(arr) {
   const res = {};
   for (let i = 0; i < arr.length; i++) {
     if (arr[i]) {
-      extend$1(res, arr[i]);
+      extend(res, arr[i]);
     }
   }
   return res;
@@ -5066,7 +5239,7 @@ function installCompatInstanceProperties(map) {
   const del = (target, key) => {
     delete target[key];
   };
-  extend$1(map, {
+  extend(map, {
     $set: (i) => {
       assertCompatEnabled("INSTANCE_SET", i);
       return set;
@@ -5111,7 +5284,7 @@ function installCompatInstanceProperties(map) {
       if (i.resolvedOptions) {
         return i.resolvedOptions;
       }
-      const res = i.resolvedOptions = extend$1({}, resolveMergedOptions(i));
+      const res = i.resolvedOptions = extend({}, resolveMergedOptions(i));
       Object.defineProperties(res, {
         parent: {
           get() {
@@ -5167,14 +5340,15 @@ function installCompatInstanceProperties(map) {
 }
 
 const getPublicInstance = (i) => {
-  if (!i) return null;
-  if (isStatefulComponent(i)) return getComponentPublicInstance(i);
+  if (!i || i.vapor) return null;
+  if (isStatefulComponent(i))
+    return getComponentPublicInstance(i);
   return getPublicInstance(i.parent);
 };
 const publicPropertiesMap = (
   // Move PURE marker to new line to workaround compiler discarding it
   // due to type annotation
-  /* @__PURE__ */ extend$1(/* @__PURE__ */ Object.create(null), {
+  /* @__PURE__ */ extend(/* @__PURE__ */ Object.create(null), {
     $: (i) => i,
     $el: (i) => i.vnode.el,
     $data: (i) => i.data,
@@ -5263,7 +5437,7 @@ const PublicInstanceProxyHandlers = {
           return desc.get.call(instance.proxy);
         } else {
           const val = globalProperties[key];
-          return isFunction(val) ? extend$1(val.bind(instance.proxy), val) : val;
+          return isFunction(val) ? extend(val.bind(instance.proxy), val) : val;
         }
       }
     } else ;
@@ -5303,7 +5477,7 @@ const PublicInstanceProxyHandlers = {
     return Reflect.defineProperty(target, key, descriptor);
   }
 };
-const RuntimeCompiledPublicInstanceProxyHandlers = /* @__PURE__ */ extend$1({}, PublicInstanceProxyHandlers, {
+const RuntimeCompiledPublicInstanceProxyHandlers = /* @__PURE__ */ extend({}, PublicInstanceProxyHandlers, {
   get(target, key) {
     if (key === Symbol.unscopables) {
       return;
@@ -5354,8 +5528,13 @@ function useAttrs() {
   return getContext().attrs;
 }
 function getContext() {
-  const i = getCurrentInstance();
-  return i.setupContext || (i.setupContext = createSetupContext(i));
+  const i = getCurrentGenericInstance();
+  if (i.vapor) {
+    return i;
+  } else {
+    const ii = i;
+    return ii.setupContext || (ii.setupContext = createSetupContext(ii));
+  }
 }
 function normalizePropsOrEmits(props) {
   return isArray(props) ? props.reduce(
@@ -5386,7 +5565,7 @@ function mergeDefaults(raw, defaults) {
 function mergeModels(a, b) {
   if (!a || !b) return a || b;
   if (isArray(a) && isArray(b)) return a.concat(b);
-  return extend$1({}, normalizePropsOrEmits(a), normalizePropsOrEmits(b));
+  return extend({}, normalizePropsOrEmits(a), normalizePropsOrEmits(b));
 }
 function createPropsRestProxy(props, excludedKeys) {
   const ret = {};
@@ -5401,9 +5580,9 @@ function createPropsRestProxy(props, excludedKeys) {
   return ret;
 }
 function withAsyncContext(getAwaitable) {
-  const ctx = getCurrentInstance();
+  const ctx = getCurrentGenericInstance();
   let awaitable = getAwaitable();
-  unsetCurrentInstance();
+  setCurrentInstance(null, void 0);
   if (isPromise(awaitable)) {
     awaitable = awaitable.catch((e) => {
       setCurrentInstance(ctx);
@@ -5605,7 +5784,8 @@ function createWatcher(raw, ctx, publicThis, key) {
   let getter = key.includes(".") ? createPathGetter(publicThis, key) : () => publicThis[key];
   const options = {};
   {
-    const instance = currentInstance && getCurrentScope() === currentInstance.scope ? currentInstance : null;
+    const cur = getCurrentInstance();
+    const instance = cur && getCurrentScope() === cur.scope ? cur : null;
     const newValue = getter();
     if (isArray(newValue) && isCompatEnabled$1("WATCH_ARRAY", instance)) {
       options.deep = true;
@@ -5636,7 +5816,7 @@ function createWatcher(raw, ctx, publicThis, key) {
     } else {
       const handler = isFunction(raw.handler) ? raw.handler.bind(publicThis) : ctx[raw.handler];
       if (isFunction(handler)) {
-        watch(getter, handler, extend$1(raw, options) );
+        watch(getter, handler, extend(raw, options) );
       }
     }
   } else ;
@@ -5655,7 +5835,7 @@ function resolveMergedOptions(instance) {
     resolved = cached;
   } else if (!globalMixins.length && !mixins && !extendsOptions) {
     if (isCompatEnabled$1("PRIVATE_APIS", instance)) {
-      resolved = extend$1({}, base);
+      resolved = extend({}, base);
       resolved.parent = instance.parent && instance.parent.proxy;
       resolved.propsData = instance.vnode.props;
     } else {
@@ -5738,7 +5918,7 @@ function mergeDataFn(to, from) {
     return from;
   }
   return function mergedDataFn() {
-    return (isCompatEnabled$1("OPTIONS_DATA_MERGE", null) ? deepMergeData : extend$1)(
+    return (isCompatEnabled$1("OPTIONS_DATA_MERGE", null) ? deepMergeData : extend)(
       isFunction(to) ? to.call(this, this) : to,
       isFunction(from) ? from.call(this, this) : from
     );
@@ -5761,14 +5941,14 @@ function mergeAsArray$1(to, from) {
   return to ? [...new Set([].concat(to, from))] : from;
 }
 function mergeObjectOptions(to, from) {
-  return to ? extend$1(/* @__PURE__ */ Object.create(null), to, from) : from;
+  return to ? extend(/* @__PURE__ */ Object.create(null), to, from) : from;
 }
 function mergeEmitsOrPropsOptions(to, from) {
   if (to) {
     if (isArray(to) && isArray(from)) {
       return [.../* @__PURE__ */ new Set([...to, ...from])];
     }
-    return extend$1(
+    return extend(
       /* @__PURE__ */ Object.create(null),
       normalizePropsOrEmits(to),
       normalizePropsOrEmits(from != null ? from : {})
@@ -5780,7 +5960,7 @@ function mergeEmitsOrPropsOptions(to, from) {
 function mergeWatchOptions(to, from) {
   if (!to) return from;
   if (!from) return to;
-  const merged = extend$1(/* @__PURE__ */ Object.create(null), to);
+  const merged = extend(/* @__PURE__ */ Object.create(null), to);
   for (const key in from) {
     merged[key] = mergeAsArray$1(to[key], from[key]);
   }
@@ -5827,7 +6007,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.5.17"}`;
+  Vue.version = `2.6.14-compat:${"3.6.0-alpha.2"}`;
   Vue.config = singletonApp.config;
   Vue.use = (plugin, ...options) => {
     if (plugin && isFunction(plugin.install)) {
@@ -5877,7 +6057,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       } else {
         return createCompatApp(
           mergeOptions(
-            extend$1({}, SubVue.options),
+            extend({}, SubVue.options),
             inlineOptions,
             internalOptionMergeStrats
           ),
@@ -5891,7 +6071,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
     const mergeBase = {};
     for (const key in Super.options) {
       const superValue = Super.options[key];
-      mergeBase[key] = isArray(superValue) ? superValue.slice() : isObject(superValue) ? extend$1(/* @__PURE__ */ Object.create(null), superValue) : superValue;
+      mergeBase[key] = isArray(superValue) ? superValue.slice() : isObject(superValue) ? extend(/* @__PURE__ */ Object.create(null), superValue) : superValue;
     }
     SubVue.options = mergeOptions(
       mergeBase,
@@ -5929,7 +6109,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
   };
   const util = {
     warn: NOOP,
-    extend: extend$1,
+    extend,
     mergeOptions: (parent, child, vm) => mergeOptions(
       parent,
       child,
@@ -6181,10 +6361,10 @@ function createAppContext() {
   };
 }
 let uid$1 = 0;
-function createAppAPI(render, hydrate) {
+function createAppAPI(mount, unmount, getPublicInstance, render) {
   return function createApp(rootComponent, rootProps = null) {
     if (!isFunction(rootComponent)) {
-      rootComponent = extend$1({}, rootComponent);
+      rootComponent = extend({}, rootComponent);
     }
     if (rootProps != null && !isObject(rootProps)) {
       rootProps = null;
@@ -6240,22 +6420,11 @@ function createAppAPI(render, hydrate) {
       },
       mount(rootContainer, isHydrate, namespace) {
         if (!isMounted) {
-          const vnode = app._ceVNode || createVNode(rootComponent, rootProps);
-          vnode.appContext = context;
-          if (namespace === true) {
-            namespace = "svg";
-          } else if (namespace === false) {
-            namespace = void 0;
-          }
-          if (isHydrate && hydrate) {
-            hydrate(vnode, rootContainer);
-          } else {
-            render(vnode, rootContainer, namespace);
-          }
+          const instance = mount(app, rootContainer, isHydrate, namespace);
           isMounted = true;
           app._container = rootContainer;
           rootContainer.__vue_app__ = app;
-          return getComponentPublicInstance(vnode.component);
+          return getPublicInstance(instance);
         }
       },
       onUnmount(cleanupFn) {
@@ -6268,7 +6437,7 @@ function createAppAPI(render, hydrate) {
             app._instance,
             16
           );
-          render(null, app._container);
+          unmount(app);
           delete app._container.__vue_app__;
         }
       },
@@ -6287,7 +6456,12 @@ function createAppAPI(render, hydrate) {
       }
     };
     {
-      installAppCompatProperties(app, context, render);
+      installAppCompatProperties(
+        app,
+        context,
+        // vapor doesn't have compat mode so this is always passed
+        render
+      );
     }
     return app;
   };
@@ -6295,6 +6469,7 @@ function createAppAPI(render, hydrate) {
 let currentApp = null;
 
 function provide(key, value) {
+  const currentInstance = getCurrentGenericInstance();
   if (!currentInstance) ; else {
     let provides = currentInstance.provides;
     const parentProvides = currentInstance.parent && currentInstance.parent.provides;
@@ -6305,9 +6480,9 @@ function provide(key, value) {
   }
 }
 function inject(key, defaultValue, treatDefaultAsFactory = false) {
-  const instance = currentInstance || currentRenderingInstance;
+  const instance = getCurrentGenericInstance();
   if (instance || currentApp) {
-    let provides = currentApp ? currentApp._context.provides : instance ? instance.parent == null || instance.ce ? instance.vnode.appContext && instance.vnode.appContext.provides : instance.parent.provides : void 0;
+    let provides = currentApp ? currentApp._context.provides : instance ? instance.parent == null || instance.ce ? instance.appContext && instance.appContext.provides : instance.parent.provides : void 0;
     if (provides && key in provides) {
       return provides[key];
     } else if (arguments.length > 1) {
@@ -6316,7 +6491,7 @@ function inject(key, defaultValue, treatDefaultAsFactory = false) {
   }
 }
 function hasInjectionContext() {
-  return !!(currentInstance || currentRenderingInstance || currentApp);
+  return !!(getCurrentGenericInstance() || currentApp);
 }
 
 function createPropsDefaultThis(instance, rawProps, propKey) {
@@ -6366,7 +6541,7 @@ const createInternalObject = () => Object.create(internalObjectProto);
 const isInternalObject = (obj) => Object.getPrototypeOf(obj) === internalObjectProto;
 
 function initProps(instance, rawProps, isStateful, isSSR = false) {
-  const props = {};
+  const props = instance.props = {};
   const attrs = createInternalObject();
   instance.propsDefaults = /* @__PURE__ */ Object.create(null);
   setFullProps(instance, rawProps, props, attrs);
@@ -6419,11 +6594,10 @@ function updateProps(instance, rawProps, rawPrevProps, optimized) {
             const camelizedKey = camelize(key);
             props[camelizedKey] = resolvePropValue(
               options,
-              rawCurrentProps,
               camelizedKey,
               value,
               instance,
-              false
+              baseResolveDefault
             );
           }
         } else {
@@ -6457,10 +6631,10 @@ function updateProps(instance, rawProps, rawPrevProps, optimized) {
           rawPrevProps[kebabKey] !== void 0)) {
             props[key] = resolvePropValue(
               options,
-              rawCurrentProps,
               key,
               void 0,
               instance,
+              baseResolveDefault,
               true
             );
           }
@@ -6527,39 +6701,37 @@ function setFullProps(instance, rawProps, props, attrs) {
     }
   }
   if (needCastKeys) {
-    const rawCurrentProps = toRaw(props);
     const castValues = rawCastValues || EMPTY_OBJ;
     for (let i = 0; i < needCastKeys.length; i++) {
       const key = needCastKeys[i];
       props[key] = resolvePropValue(
         options,
-        rawCurrentProps,
         key,
         castValues[key],
         instance,
+        baseResolveDefault,
         !hasOwn(castValues, key)
       );
     }
   }
   return hasAttrsChanged;
 }
-function resolvePropValue(options, props, key, value, instance, isAbsent) {
+function resolvePropValue(options, key, value, instance, resolveDefault, isAbsent = false) {
   const opt = options[key];
   if (opt != null) {
     const hasDefault = hasOwn(opt, "default");
     if (hasDefault && value === void 0) {
       const defaultValue = opt.default;
       if (opt.type !== Function && !opt.skipFactory && isFunction(defaultValue)) {
-        const { propsDefaults } = instance;
-        if (key in propsDefaults) {
-          value = propsDefaults[key];
+        const cachedDefaults = instance.propsDefaults || (instance.propsDefaults = {});
+        if (hasOwn(cachedDefaults, key)) {
+          value = cachedDefaults[key];
         } else {
-          const reset = setCurrentInstance(instance);
-          value = propsDefaults[key] = defaultValue.call(
-            isCompatEnabled$1("PROPS_DEFAULT_THIS", instance) ? createPropsDefaultThis(instance, props) : null,
-            props
+          value = cachedDefaults[key] = resolveDefault(
+            defaultValue,
+            instance,
+            key
           );
-          reset();
         }
       } else {
         value = defaultValue;
@@ -6578,6 +6750,17 @@ function resolvePropValue(options, props, key, value, instance, isAbsent) {
   }
   return value;
 }
+function baseResolveDefault(factory, instance, key) {
+  let value;
+  const prev = setCurrentInstance(instance);
+  const props = toRaw(instance.props);
+  value = factory.call(
+    isCompatEnabled$1("PROPS_DEFAULT_THIS", instance) ? createPropsDefaultThis(instance, props) : null,
+    props
+  );
+  setCurrentInstance(...prev);
+  return value;
+}
 const mixinPropsCache = /* @__PURE__ */ new WeakMap();
 function normalizePropsOptions(comp, appContext, asMixin = false) {
   const cache = asMixin ? mixinPropsCache : appContext.propsCache;
@@ -6596,7 +6779,7 @@ function normalizePropsOptions(comp, appContext, asMixin = false) {
       }
       hasExtends = true;
       const [props, keys] = normalizePropsOptions(raw2, appContext, true);
-      extend$1(normalized, props);
+      extend(normalized, props);
       if (keys) needCastKeys.push(...keys);
     };
     if (!asMixin && appContext.mixins.length) {
@@ -6615,6 +6798,14 @@ function normalizePropsOptions(comp, appContext, asMixin = false) {
     }
     return EMPTY_ARR;
   }
+  baseNormalizePropsOptions(raw, normalized, needCastKeys);
+  const res = [normalized, needCastKeys];
+  if (isObject(comp)) {
+    cache.set(comp, res);
+  }
+  return res;
+}
+function baseNormalizePropsOptions(raw, normalized, needCastKeys) {
   if (isArray(raw)) {
     for (let i = 0; i < raw.length; i++) {
       const normalizedKey = camelize(raw[i]);
@@ -6627,7 +6818,7 @@ function normalizePropsOptions(comp, appContext, asMixin = false) {
       const normalizedKey = camelize(key);
       if (validatePropName(normalizedKey)) {
         const opt = raw[key];
-        const prop = normalized[normalizedKey] = isArray(opt) || isFunction(opt) ? { type: opt } : extend$1({}, opt);
+        const prop = normalized[normalizedKey] = isArray(opt) || isFunction(opt) ? { type: opt } : extend({}, opt);
         const propType = prop.type;
         let shouldCast = false;
         let shouldCastTrue = true;
@@ -6653,11 +6844,6 @@ function normalizePropsOptions(comp, appContext, asMixin = false) {
       }
     }
   }
-  const res = [normalized, needCastKeys];
-  if (isObject(comp)) {
-    cache.set(comp, res);
-  }
-  return res;
 }
 function validatePropName(key) {
   if (key[0] !== "$" && !isReservedProp(key)) {
@@ -6814,6 +7000,9 @@ function baseCreateRenderer(options, createHydrationFns) {
           optimized
         );
         break;
+      case VaporSlot:
+        getVaporInterface(parentComponent, n2).slot(n1, n2, container, anchor);
+        break;
       default:
         if (shapeFlag & 1) {
           processElement(
@@ -7005,11 +7194,15 @@ function baseCreateRenderer(options, createHydrationFns) {
     }
     hostInsert(el, container, anchor);
     if ((vnodeHook = props && props.onVnodeMounted) || needCallTransitionHooks || dirs) {
-      queuePostRenderEffect(() => {
-        vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
-        needCallTransitionHooks && transition.enter(el);
-        dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
-      }, parentSuspense);
+      queuePostRenderEffect(
+        () => {
+          vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
+          needCallTransitionHooks && transition.enter(el);
+          dirs && invokeDirectiveHook(vnode, null, parentComponent, "mounted");
+        },
+        void 0,
+        parentSuspense
+      );
     }
   };
   const setScopeId = (el, vnode, scopeId, slotScopeIds, parentComponent) => {
@@ -7021,8 +7214,8 @@ function baseCreateRenderer(options, createHydrationFns) {
         hostSetScopeId(el, slotScopeIds[i]);
       }
     }
-    if (parentComponent) {
-      let subTree = parentComponent.subTree;
+    let subTree = parentComponent && parentComponent.subTree;
+    if (subTree) {
       if (vnode === subTree || isSuspense(subTree.type) && (subTree.ssContent === vnode || subTree.ssFallback === vnode)) {
         const parentVNode = parentComponent.vnode;
         setScopeId(
@@ -7125,10 +7318,14 @@ function baseCreateRenderer(options, createHydrationFns) {
       patchProps(el, oldProps, newProps, parentComponent, namespace);
     }
     if ((vnodeHook = newProps.onVnodeUpdated) || dirs) {
-      queuePostRenderEffect(() => {
-        vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, n2, n1);
-        dirs && invokeDirectiveHook(n2, n1, parentComponent, "updated");
-      }, parentSuspense);
+      queuePostRenderEffect(
+        () => {
+          vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, n2, n1);
+          dirs && invokeDirectiveHook(n2, n1, parentComponent, "updated");
+        },
+        void 0,
+        parentSuspense
+      );
     }
   };
   const patchBlockChildren = (oldChildren, newChildren, fallbackContainer, parentComponent, parentSuspense, namespace, slotScopeIds) => {
@@ -7259,7 +7456,22 @@ function baseCreateRenderer(options, createHydrationFns) {
   };
   const processComponent = (n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized) => {
     n2.slotScopeIds = slotScopeIds;
-    if (n1 == null) {
+    if (n2.type.__vapor) {
+      if (n1 == null) {
+        getVaporInterface(parentComponent, n2).mount(
+          n2,
+          container,
+          anchor,
+          parentComponent
+        );
+      } else {
+        getVaporInterface(parentComponent, n2).update(
+          n1,
+          n2,
+          shouldUpdateComponent(n1, n2, optimized)
+        );
+      }
+    } else if (n1 == null) {
       if (n2.shapeFlag & 512) {
         parentComponent.ctx.activate(
           n2,
@@ -7322,15 +7534,48 @@ function baseCreateRenderer(options, createHydrationFns) {
         return;
       } else {
         instance.next = n2;
-        instance.update();
+        instance.effect.run();
       }
     } else {
       n2.el = n1.el;
       instance.vnode = n2;
     }
   };
-  const setupRenderEffect = (instance, initialVNode, container, anchor, parentSuspense, namespace, optimized) => {
-    const componentUpdateFn = () => {
+  class SetupRenderEffect extends ReactiveEffect {
+    constructor(instance, initialVNode, container, anchor, parentSuspense, namespace, optimized) {
+      const prevScope = setCurrentScope(instance.scope);
+      super();
+      this.instance = instance;
+      this.initialVNode = initialVNode;
+      this.container = container;
+      this.anchor = anchor;
+      this.parentSuspense = parentSuspense;
+      this.namespace = namespace;
+      this.optimized = optimized;
+      setCurrentScope(prevScope);
+      this.job = instance.job = () => {
+        if (this.dirty) {
+          this.run();
+        }
+      };
+      this.job.i = instance;
+    }
+    notify() {
+      if (!(this.flags & 256)) {
+        const job = this.job;
+        queueJob(job, job.i.uid);
+      }
+    }
+    fn() {
+      const {
+        instance,
+        initialVNode,
+        container,
+        anchor,
+        parentSuspense,
+        namespace,
+        optimized
+      } = this;
       if (!instance.isMounted) {
         let vnodeHook;
         const { el, props } = initialVNode;
@@ -7385,32 +7630,35 @@ function baseCreateRenderer(options, createHydrationFns) {
           initialVNode.el = subTree.el;
         }
         if (m) {
-          queuePostRenderEffect(m, parentSuspense);
+          queuePostRenderEffect(m, void 0, parentSuspense);
         }
         if (!isAsyncWrapperVNode && (vnodeHook = props && props.onVnodeMounted)) {
           const scopedInitialVNode = initialVNode;
           queuePostRenderEffect(
             () => invokeVNodeHook(vnodeHook, parent, scopedInitialVNode),
+            void 0,
             parentSuspense
           );
         }
         if (isCompatEnabled$1("INSTANCE_EVENT_HOOKS", instance)) {
           queuePostRenderEffect(
             () => instance.emit("hook:mounted"),
+            void 0,
             parentSuspense
           );
         }
-        if (initialVNode.shapeFlag & 256 || parent && isAsyncWrapper(parent.vnode) && parent.vnode.shapeFlag & 256) {
-          instance.a && queuePostRenderEffect(instance.a, parentSuspense);
+        if (initialVNode.shapeFlag & 256 || parent && parent.vnode && isAsyncWrapper(parent.vnode) && parent.vnode.shapeFlag & 256) {
+          instance.a && queuePostRenderEffect(instance.a, void 0, parentSuspense);
           if (isCompatEnabled$1("INSTANCE_EVENT_HOOKS", instance)) {
             queuePostRenderEffect(
               () => instance.emit("hook:activated"),
+              void 0,
               parentSuspense
             );
           }
         }
         instance.isMounted = true;
-        initialVNode = container = anchor = null;
+        this.initialVNode = this.container = this.anchor = null;
       } else {
         let { next, bu, u, parent, vnode } = instance;
         {
@@ -7422,7 +7670,7 @@ function baseCreateRenderer(options, createHydrationFns) {
             }
             nonHydratedAsyncRoot.asyncDep.then(() => {
               if (!instance.isUnmounted) {
-                componentUpdateFn();
+                this.fn();
               }
             });
             return;
@@ -7466,32 +7714,38 @@ function baseCreateRenderer(options, createHydrationFns) {
           updateHOCHostEl(instance, nextTree.el);
         }
         if (u) {
-          queuePostRenderEffect(u, parentSuspense);
+          queuePostRenderEffect(u, void 0, parentSuspense);
         }
         if (vnodeHook = next.props && next.props.onVnodeUpdated) {
           queuePostRenderEffect(
             () => invokeVNodeHook(vnodeHook, parent, next, vnode),
+            void 0,
             parentSuspense
           );
         }
         if (isCompatEnabled$1("INSTANCE_EVENT_HOOKS", instance)) {
           queuePostRenderEffect(
             () => instance.emit("hook:updated"),
+            void 0,
             parentSuspense
           );
         }
       }
-    };
-    instance.scope.on();
-    const effect = instance.effect = new ReactiveEffect(componentUpdateFn);
-    instance.scope.off();
-    const update = instance.update = effect.run.bind(effect);
-    const job = instance.job = effect.runIfDirty.bind(effect);
-    job.i = instance;
-    job.id = instance.uid;
-    effect.scheduler = () => queueJob(job);
+    }
+  }
+  const setupRenderEffect = (instance, initialVNode, container, anchor, parentSuspense, namespace, optimized) => {
+    const effect = instance.effect = new SetupRenderEffect(
+      instance,
+      initialVNode,
+      container,
+      anchor,
+      parentSuspense,
+      namespace,
+      optimized
+    );
+    instance.update = effect.run.bind(effect);
     toggleRecurse(instance, true);
-    update();
+    effect.run();
   };
   const updateComponentPreRender = (instance, nextVNode, optimized) => {
     nextVNode.component = instance;
@@ -7500,9 +7754,9 @@ function baseCreateRenderer(options, createHydrationFns) {
     instance.next = null;
     updateProps(instance, nextVNode.props, prevProps, optimized);
     updateSlots(instance, nextVNode.children, optimized);
-    pauseTracking();
+    const prevSub = setActiveSub();
     flushPreFlushCbs(instance);
-    resetTracking();
+    setActiveSub(prevSub);
   };
   const patchChildren = (n1, n2, container, anchor, parentComponent, parentSuspense, namespace, slotScopeIds, optimized = false) => {
     const c1 = n1 && n1.children;
@@ -7772,7 +8026,13 @@ function baseCreateRenderer(options, createHydrationFns) {
           );
         } else if (moved) {
           if (j < 0 || i !== increasingNewIndexSequence[j]) {
-            move(nextChild, container, anchor, 2);
+            move(
+              nextChild,
+              container,
+              anchor,
+              2,
+              parentComponent
+            );
           } else {
             j--;
           }
@@ -7780,10 +8040,20 @@ function baseCreateRenderer(options, createHydrationFns) {
       }
     }
   };
-  const move = (vnode, container, anchor, moveType, parentSuspense = null) => {
+  const move = (vnode, container, anchor, moveType, parentComponent, parentSuspense = null) => {
     const { el, type, transition, children, shapeFlag } = vnode;
     if (shapeFlag & 6) {
-      move(vnode.component.subTree, container, anchor, moveType);
+      if (type.__vapor) {
+        getVaporInterface(parentComponent, vnode).move(vnode, container, anchor);
+      } else {
+        move(
+          vnode.component.subTree,
+          container,
+          anchor,
+          moveType,
+          parentComponent
+        );
+      }
       return;
     }
     if (shapeFlag & 128) {
@@ -7791,13 +8061,25 @@ function baseCreateRenderer(options, createHydrationFns) {
       return;
     }
     if (shapeFlag & 64) {
-      type.move(vnode, container, anchor, internals);
+      type.move(
+        vnode,
+        container,
+        anchor,
+        internals,
+        parentComponent
+      );
       return;
     }
     if (type === Fragment) {
       hostInsert(el, container, anchor);
       for (let i = 0; i < children.length; i++) {
-        move(children[i], container, anchor, moveType);
+        move(
+          children[i],
+          container,
+          anchor,
+          moveType,
+          parentComponent
+        );
       }
       hostInsert(vnode.anchor, container, anchor);
       return;
@@ -7811,7 +8093,11 @@ function baseCreateRenderer(options, createHydrationFns) {
       if (moveType === 0) {
         transition.beforeEnter(el);
         hostInsert(el, container, anchor);
-        queuePostRenderEffect(() => transition.enter(el), parentSuspense);
+        queuePostRenderEffect(
+          () => transition.enter(el),
+          void 0,
+          parentSuspense
+        );
       } else {
         const { leave, delayLeave, afterLeave } = transition;
         const remove2 = () => {
@@ -7853,9 +8139,9 @@ function baseCreateRenderer(options, createHydrationFns) {
       optimized = false;
     }
     if (ref != null) {
-      pauseTracking();
+      const prevSub = setActiveSub();
       setRef(ref, null, parentSuspense, vnode, true);
-      resetTracking();
+      setActiveSub(prevSub);
     }
     if (cacheIndex != null) {
       parentComponent.renderCache[cacheIndex] = void 0;
@@ -7871,7 +8157,12 @@ function baseCreateRenderer(options, createHydrationFns) {
       invokeVNodeHook(vnodeHook, parentComponent, vnode);
     }
     if (shapeFlag & 6) {
-      unmountComponent(vnode.component, parentSuspense, doRemove);
+      if (type.__vapor) {
+        getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove);
+        return;
+      } else {
+        unmountComponent(vnode.component, parentSuspense, doRemove);
+      }
     } else {
       if (shapeFlag & 128) {
         vnode.suspense.unmount(parentSuspense, doRemove);
@@ -7905,15 +8196,23 @@ function baseCreateRenderer(options, createHydrationFns) {
       } else if (type === Fragment && patchFlag & (128 | 256) || !optimized && shapeFlag & 16) {
         unmountChildren(children, parentComponent, parentSuspense);
       }
+      if (type === VaporSlot) {
+        getVaporInterface(parentComponent, vnode).unmount(vnode, doRemove);
+        return;
+      }
       if (doRemove) {
         remove(vnode);
       }
     }
     if (shouldInvokeVnodeHook && (vnodeHook = props && props.onVnodeUnmounted) || shouldInvokeDirs) {
-      queuePostRenderEffect(() => {
-        vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
-        shouldInvokeDirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
-      }, parentSuspense);
+      queuePostRenderEffect(
+        () => {
+          vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, vnode);
+          shouldInvokeDirs && invokeDirectiveHook(vnode, null, parentComponent, "unmounted");
+        },
+        void 0,
+        parentSuspense
+      );
     }
   };
   const remove = (vnode) => {
@@ -7959,7 +8258,7 @@ function baseCreateRenderer(options, createHydrationFns) {
     const {
       bum,
       scope,
-      job,
+      effect,
       subTree,
       um,
       m,
@@ -7981,22 +8280,25 @@ function baseCreateRenderer(options, createHydrationFns) {
       instance.emit("hook:beforeDestroy");
     }
     scope.stop();
-    if (job) {
-      job.flags |= 8;
+    if (effect) {
+      effect.stop();
       unmount(subTree, instance, parentSuspense, doRemove);
     }
     if (um) {
-      queuePostRenderEffect(um, parentSuspense);
+      queuePostRenderEffect(um, void 0, parentSuspense);
     }
     if (isCompatEnabled$1("INSTANCE_EVENT_HOOKS", instance)) {
       queuePostRenderEffect(
         () => instance.emit("hook:destroyed"),
+        void 0,
         parentSuspense
       );
     }
-    queuePostRenderEffect(() => {
-      instance.isUnmounted = true;
-    }, parentSuspense);
+    queuePostRenderEffect(
+      () => instance.isUnmounted = true,
+      void 0,
+      parentSuspense
+    );
     if (parentSuspense && parentSuspense.pendingBranch && !parentSuspense.isUnmounted && instance.asyncDep && !instance.asyncResolved && instance.suspenseId === parentSuspense.pendingId) {
       parentSuspense.deps--;
       if (parentSuspense.deps === 0) {
@@ -8011,6 +8313,9 @@ function baseCreateRenderer(options, createHydrationFns) {
   };
   const getNextHostNode = (vnode) => {
     if (vnode.shapeFlag & 6) {
+      if (vnode.type.__vapor) {
+        return hostNextSibling(vnode.component.block);
+      }
       return getNextHostNode(vnode.component.subTree);
     }
     if (vnode.shapeFlag & 128) {
@@ -8020,7 +8325,6 @@ function baseCreateRenderer(options, createHydrationFns) {
     const teleportEnd = el && el[TeleportEndKey];
     return teleportEnd ? hostNextSibling(teleportEnd) : el;
   };
-  let isFlushing = false;
   const render = (vnode, container, namespace) => {
     if (vnode == null) {
       if (container._vnode) {
@@ -8038,12 +8342,7 @@ function baseCreateRenderer(options, createHydrationFns) {
       );
     }
     container._vnode = vnode;
-    if (!isFlushing) {
-      isFlushing = true;
-      flushPreFlushCbs();
-      flushPostFlushCbs();
-      isFlushing = false;
-    }
+    flushOnAppMount();
   };
   const internals = {
     p: patch,
@@ -8051,6 +8350,7 @@ function baseCreateRenderer(options, createHydrationFns) {
     m: move,
     r: remove,
     mt: mountComponent,
+    umt: unmountComponent,
     mc: mountChildren,
     pc: patchChildren,
     pbc: patchBlockChildren,
@@ -8064,22 +8364,48 @@ function baseCreateRenderer(options, createHydrationFns) {
       internals
     );
   }
+  const mountApp = (app, container, isHydrate, namespace) => {
+    const vnode = app._ceVNode || createVNode(app._component, app._props);
+    vnode.appContext = app._context;
+    if (namespace === true) {
+      namespace = "svg";
+    } else if (namespace === false) {
+      namespace = void 0;
+    }
+    if (isHydrate && hydrate) {
+      hydrate(vnode, container);
+    } else {
+      render(vnode, container, namespace);
+    }
+    return vnode.component;
+  };
+  const unmountApp = (app) => {
+    render(null, app._container);
+  };
   return {
     render,
     hydrate,
-    createApp: createAppAPI(render, hydrate)
+    internals,
+    createApp: createAppAPI(
+      mountApp,
+      unmountApp,
+      getComponentPublicInstance,
+      render
+    )
   };
 }
 function resolveChildrenNamespace({ type, props }, currentNamespace) {
   return currentNamespace === "svg" && type === "foreignObject" || currentNamespace === "mathml" && type === "annotation-xml" && props && props.encoding && props.encoding.includes("html") ? void 0 : currentNamespace;
 }
-function toggleRecurse({ effect, job }, allowed) {
-  if (allowed) {
-    effect.flags |= 32;
-    job.flags |= 4;
-  } else {
-    effect.flags &= -33;
-    job.flags &= -5;
+function toggleRecurse({ effect, job, vapor }, allowed) {
+  if (!vapor) {
+    if (allowed) {
+      effect.flags |= 128;
+      job.flags |= 2;
+    } else {
+      effect.flags &= -129;
+      job.flags &= -3;
+    }
   }
 }
 function needTransition(parentSuspense, transition) {
@@ -8109,48 +8435,8 @@ function traverseStaticChildren(n1, n2, shallow = false) {
     }
   }
 }
-function getSequence(arr) {
-  const p = arr.slice();
-  const result = [0];
-  let i, j, u, v, c;
-  const len = arr.length;
-  for (i = 0; i < len; i++) {
-    const arrI = arr[i];
-    if (arrI !== 0) {
-      j = result[result.length - 1];
-      if (arr[j] < arrI) {
-        p[i] = j;
-        result.push(i);
-        continue;
-      }
-      u = 0;
-      v = result.length - 1;
-      while (u < v) {
-        c = u + v >> 1;
-        if (arr[result[c]] < arrI) {
-          u = c + 1;
-        } else {
-          v = c;
-        }
-      }
-      if (arrI < arr[result[u]]) {
-        if (u > 0) {
-          p[i] = result[u - 1];
-        }
-        result[u] = i;
-      }
-    }
-  }
-  u = result.length;
-  v = result[u - 1];
-  while (u-- > 0) {
-    result[u] = v;
-    v = p[v];
-  }
-  return result;
-}
 function locateNonHydratedAsyncRoot(instance) {
-  const subComponent = instance.subTree.component;
+  const subComponent = instance.vapor ? null : instance.subTree.component;
   if (subComponent) {
     if (subComponent.asyncDep && !subComponent.asyncResolved) {
       return subComponent;
@@ -8162,9 +8448,14 @@ function locateNonHydratedAsyncRoot(instance) {
 function invalidateMount(hooks) {
   if (hooks) {
     for (let i = 0; i < hooks.length; i++)
-      hooks[i].flags |= 8;
+      hooks[i].flags |= 4;
   }
 }
+function getVaporInterface(instance, vnode) {
+  const ctx = instance ? instance.appContext : vnode.appContext;
+  const res = ctx && ctx.vapor;
+  return res;
+}
 
 const ssrContextKey = Symbol.for("v-scx");
 const useSSRContext = () => {
@@ -8194,9 +8485,42 @@ function watchSyncEffect(effect, options) {
 function watch(source, cb, options) {
   return doWatch(source, cb, options);
 }
+class RenderWatcherEffect extends WatcherEffect {
+  constructor(instance, source, cb, options, flush) {
+    super(source, cb, options);
+    this.flush = flush;
+    const job = () => {
+      if (this.dirty) {
+        this.run();
+      }
+    };
+    if (cb) {
+      this.flags |= 128;
+      job.flags |= 2;
+    }
+    if (instance) {
+      job.i = instance;
+    }
+    this.job = job;
+  }
+  notify() {
+    const flags = this.flags;
+    if (!(flags & 256)) {
+      const flush = this.flush;
+      const job = this.job;
+      if (flush === "post") {
+        queuePostRenderEffect(job, void 0, job.i ? job.i.suspense : null);
+      } else if (flush === "pre") {
+        queueJob(job, job.i ? job.i.uid : void 0, true);
+      } else {
+        job();
+      }
+    }
+  }
+}
 function doWatch(source, cb, options = EMPTY_OBJ) {
-  const { immediate, deep, flush, once } = options;
-  const baseWatchOptions = extend$1({}, options);
+  const { immediate, deep, flush = "pre", once } = options;
+  const baseWatchOptions = extend({}, options);
   const runsImmediately = cb && immediate || !cb && flush !== "post";
   let ssrCleanup;
   if (isInSSRComponentSetup) {
@@ -8214,42 +8538,32 @@ function doWatch(source, cb, options = EMPTY_OBJ) {
   }
   const instance = currentInstance;
   baseWatchOptions.call = (fn, type, args) => callWithAsyncErrorHandling(fn, instance, type, args);
-  let isPre = false;
-  if (flush === "post") {
-    baseWatchOptions.scheduler = (job) => {
-      queuePostRenderEffect(job, instance && instance.suspense);
-    };
-  } else if (flush !== "sync") {
-    isPre = true;
-    baseWatchOptions.scheduler = (job, isFirstRun) => {
-      if (isFirstRun) {
-        job();
-      } else {
-        queueJob(job);
-      }
-    };
+  const effect = new RenderWatcherEffect(
+    instance,
+    source,
+    cb,
+    baseWatchOptions,
+    flush
+  );
+  if (cb) {
+    effect.run(true);
+  } else if (flush === "post") {
+    queuePostRenderEffect(effect.job, void 0, instance && instance.suspense);
+  } else {
+    effect.run(true);
   }
-  baseWatchOptions.augmentJob = (job) => {
-    if (cb) {
-      job.flags |= 4;
-    }
-    if (isPre) {
-      job.flags |= 2;
-      if (instance) {
-        job.id = instance.uid;
-        job.i = instance;
-      }
-    }
-  };
-  const watchHandle = watch$1(source, cb, baseWatchOptions);
+  const stop = effect.stop.bind(effect);
+  stop.pause = effect.pause.bind(effect);
+  stop.resume = effect.resume.bind(effect);
+  stop.stop = stop;
   if (isInSSRComponentSetup) {
     if (ssrCleanup) {
-      ssrCleanup.push(watchHandle);
+      ssrCleanup.push(stop);
     } else if (runsImmediately) {
-      watchHandle();
+      stop();
     }
   }
-  return watchHandle;
+  return stop;
 }
 function instanceWatch(source, value, options) {
   const publicThis = this.proxy;
@@ -8261,9 +8575,9 @@ function instanceWatch(source, value, options) {
     cb = value.handler;
     options = value;
   }
-  const reset = setCurrentInstance(this);
+  const prev = setCurrentInstance(this);
   const res = doWatch(getter, cb.bind(publicThis), options);
-  reset();
+  setCurrentInstance(...prev);
   return res;
 }
 function createPathGetter(ctx, path) {
@@ -8278,10 +8592,10 @@ function createPathGetter(ctx, path) {
 }
 
 function useModel(props, name, options = EMPTY_OBJ) {
-  const i = getCurrentInstance();
+  const i = getCurrentGenericInstance();
   const camelizedName = camelize(name);
   const hyphenatedName = hyphenate(name);
-  const modifiers = getModelModifiers(props, camelizedName);
+  const modifiers = getModelModifiers(props, camelizedName, defaultPropGetter);
   const res = customRef((track, trigger) => {
     let localValue;
     let prevSetValue = EMPTY_OBJ;
@@ -8303,9 +8617,25 @@ function useModel(props, name, options = EMPTY_OBJ) {
         if (!hasChanged(emittedValue, localValue) && !(prevSetValue !== EMPTY_OBJ && hasChanged(value, prevSetValue))) {
           return;
         }
-        const rawProps = i.vnode.props;
-        if (!(rawProps && // check if parent has passed v-model
-        (name in rawProps || camelizedName in rawProps || hyphenatedName in rawProps) && (`onUpdate:${name}` in rawProps || `onUpdate:${camelizedName}` in rawProps || `onUpdate:${hyphenatedName}` in rawProps))) {
+        let rawPropKeys;
+        let parentPassedModelValue = false;
+        let parentPassedModelUpdater = false;
+        if (i.rawKeys) {
+          rawPropKeys = i.rawKeys();
+        } else {
+          const rawProps = i.vnode.props;
+          rawPropKeys = rawProps && Object.keys(rawProps);
+        }
+        if (rawPropKeys) {
+          for (const key of rawPropKeys) {
+            if (key === name || key === camelizedName || key === hyphenatedName) {
+              parentPassedModelValue = true;
+            } else if (key === `onUpdate:${name}` || key === `onUpdate:${camelizedName}` || key === `onUpdate:${hyphenatedName}`) {
+              parentPassedModelUpdater = true;
+            }
+          }
+        }
+        if (!parentPassedModelValue || !parentPassedModelUpdater) {
           localValue = value;
           trigger();
         }
@@ -8332,17 +8662,25 @@ function useModel(props, name, options = EMPTY_OBJ) {
   };
   return res;
 }
-const getModelModifiers = (props, modelName) => {
-  return modelName === "modelValue" || modelName === "model-value" ? props.modelModifiers : props[`${modelName}Modifiers`] || props[`${camelize(modelName)}Modifiers`] || props[`${hyphenate(modelName)}Modifiers`];
+const getModelModifiers = (props, modelName, getter) => {
+  return modelName === "modelValue" || modelName === "model-value" ? getter(props, "modelModifiers") : getter(props, `${modelName}Modifiers`) || getter(props, `${camelize(modelName)}Modifiers`) || getter(props, `${hyphenate(modelName)}Modifiers`);
 };
 
 function emit(instance, event, ...rawArgs) {
+  return baseEmit(
+    instance,
+    instance.vnode.props || EMPTY_OBJ,
+    defaultPropGetter,
+    event,
+    ...rawArgs
+  );
+}
+function baseEmit(instance, props, getter, event, ...rawArgs) {
   if (instance.isUnmounted) return;
-  const props = instance.vnode.props || EMPTY_OBJ;
   let args = rawArgs;
   const isCompatModelListener = compatModelEventPrefix + event in props;
   const isModelListener = isCompatModelListener || event.startsWith("update:");
-  const modifiers = isCompatModelListener ? props.modelModifiers : isModelListener && getModelModifiers(props, event.slice(7));
+  const modifiers = isCompatModelListener ? props.modelModifiers : isModelListener && getModelModifiers(props, event.slice(7), getter);
   if (modifiers) {
     if (modifiers.trim) {
       args = rawArgs.map((a) => isString(a) ? a.trim() : a);
@@ -8352,10 +8690,10 @@ function emit(instance, event, ...rawArgs) {
     }
   }
   let handlerName;
-  let handler = props[handlerName = toHandlerKey(event)] || // also try camelCase event handler (#2249)
-  props[handlerName = toHandlerKey(camelize(event))];
+  let handler = getter(props, handlerName = toHandlerKey(event)) || // also try camelCase event handler (#2249)
+  getter(props, handlerName = toHandlerKey(camelize(event)));
   if (!handler && isModelListener) {
-    handler = props[handlerName = toHandlerKey(hyphenate(event))];
+    handler = getter(props, handlerName = toHandlerKey(hyphenate(event)));
   }
   if (handler) {
     callWithAsyncErrorHandling(
@@ -8365,7 +8703,7 @@ function emit(instance, event, ...rawArgs) {
       args
     );
   }
-  const onceHandler = props[handlerName + `Once`];
+  const onceHandler = getter(props, handlerName + `Once`);
   if (onceHandler) {
     if (!instance.emitted) {
       instance.emitted = {};
@@ -8380,11 +8718,18 @@ function emit(instance, event, ...rawArgs) {
       args
     );
   }
-  {
+  if (args) {
     compatModelEmit(instance, event, args);
-    return emit$1(instance, event, args);
+    return emit$1(
+      instance,
+      event,
+      args
+    );
   }
 }
+function defaultPropGetter(props, key) {
+  return props[key];
+}
 function normalizeEmitsOptions(comp, appContext, asMixin = false) {
   const cache = appContext.emitsCache;
   const cached = cache.get(comp);
@@ -8399,7 +8744,7 @@ function normalizeEmitsOptions(comp, appContext, asMixin = false) {
       const normalizedFromExtend = normalizeEmitsOptions(raw2, appContext, true);
       if (normalizedFromExtend) {
         hasExtends = true;
-        extend$1(normalized, normalizedFromExtend);
+        extend(normalized, normalizedFromExtend);
       }
     };
     if (!asMixin && appContext.mixins.length) {
@@ -8421,7 +8766,7 @@ function normalizeEmitsOptions(comp, appContext, asMixin = false) {
   if (isArray(raw)) {
     raw.forEach((key) => normalized[key] = null);
   } else {
-    extend$1(normalized, raw);
+    extend(normalized, raw);
   }
   if (isObject(comp)) {
     cache.set(comp, normalized);
@@ -8650,7 +8995,7 @@ function hasPropsChanged(prevProps, nextProps, emitsOptions) {
   return false;
 }
 function updateHOCHostEl({ vnode, parent }, el) {
-  while (parent) {
+  while (parent && !parent.vapor) {
     const root = parent.subTree;
     if (root.suspense && root.suspense.activeBranch === vnode) {
       root.el = vnode.el;
@@ -8979,7 +9324,8 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
                 pendingBranch,
                 container2,
                 anchor === initialAnchor ? next(activeBranch) : anchor,
-                0
+                0,
+                parentComponent2
               );
               queuePostFlushCb(effects);
             }
@@ -8992,7 +9338,13 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
           unmount(activeBranch, parentComponent2, suspense, true);
         }
         if (!delayEnter) {
-          move(pendingBranch, container2, anchor, 0);
+          move(
+            pendingBranch,
+            container2,
+            anchor,
+            0,
+            parentComponent2
+          );
         }
       }
       setActiveBranch(suspense, pendingBranch);
@@ -9065,7 +9417,7 @@ function createSuspenseBoundary(vnode, parentSuspense, parentComponent, containe
       }
     },
     move(container2, anchor2, type) {
-      suspense.activeBranch && move(suspense.activeBranch, container2, anchor2, type);
+      suspense.activeBranch && move(suspense.activeBranch, container2, anchor2, type, parentComponent);
       suspense.container = container2;
     },
     next() {
@@ -9196,7 +9548,7 @@ function normalizeSuspenseSlot(s) {
   }
   return s;
 }
-function queueEffectWithSuspense(fn, suspense) {
+function queueEffectWithSuspense(fn, id, suspense) {
   if (suspense && suspense.pendingBranch) {
     if (isArray(fn)) {
       suspense.effects.push(...fn);
@@ -9204,7 +9556,7 @@ function queueEffectWithSuspense(fn, suspense) {
       suspense.effects.push(fn);
     }
   } else {
-    queuePostFlushCb(fn);
+    queuePostFlushCb(fn, id);
   }
 }
 function setActiveBranch(suspense, branch) {
@@ -9287,6 +9639,7 @@ const Fragment = Symbol.for("v-fgt");
 const Text = Symbol.for("v-txt");
 const Comment = Symbol.for("v-cmt");
 const Static = Symbol.for("v-stc");
+const VaporSlot = Symbol.for("v-vps");
 const blockStack = [];
 let currentBlock = null;
 function openBlock(disableTracking = false) {
@@ -9449,7 +9802,7 @@ function _createVNode(type, props = null, children = null, patchFlag = 0, dynami
     }
     if (isObject(style)) {
       if (isProxy(style) && !isArray(style)) {
-        style = extend$1({}, style);
+        style = extend({}, style);
       }
       props.style = normalizeStyle(style);
     }
@@ -9468,7 +9821,7 @@ function _createVNode(type, props = null, children = null, patchFlag = 0, dynami
 }
 function guardReactiveProps(props) {
   if (!props) return null;
-  return isProxy(props) || isInternalObject(props) ? extend$1({}, props) : props;
+  return isProxy(props) || isInternalObject(props) ? extend({}, props) : props;
 }
 function cloneVNode(vnode, extraProps, mergeRef = false, cloneTransition = false) {
   const { props, ref, patchFlag, children, transition } = vnode;
@@ -9633,6 +9986,40 @@ function invokeVNodeHook(hook, instance, vnode, prevVNode = null) {
   ]);
 }
 
+let currentInstance = null;
+const getCurrentGenericInstance = () => currentInstance || currentRenderingInstance;
+const getCurrentInstance = () => currentInstance && !currentInstance.vapor ? currentInstance : currentRenderingInstance;
+let isInSSRComponentSetup = false;
+let setInSSRSetupState;
+let simpleSetCurrentInstance;
+{
+  const g = getGlobalThis();
+  const registerGlobalSetter = (key, setter) => {
+    let setters;
+    if (!(setters = g[key])) setters = g[key] = [];
+    setters.push(setter);
+    return (v) => {
+      if (setters.length > 1) setters.forEach((set) => set(v));
+      else setters[0](v);
+    };
+  };
+  simpleSetCurrentInstance = registerGlobalSetter(
+    `__VUE_INSTANCE_SETTERS__`,
+    (v) => currentInstance = v
+  );
+  setInSSRSetupState = registerGlobalSetter(
+    `__VUE_SSR_SETTERS__`,
+    (v) => isInSSRComponentSetup = v
+  );
+}
+const setCurrentInstance = (instance, scope = instance !== null ? instance.scope : void 0) => {
+  try {
+    return [currentInstance, setCurrentScope(scope)];
+  } finally {
+    simpleSetCurrentInstance(instance);
+  }
+};
+
 const emptyAppContext = createAppContext();
 let uid = 0;
 function createComponentInstance(vnode, parent, suspense) {
@@ -9677,7 +10064,7 @@ function createComponentInstance(vnode, parent, suspense) {
     // to be set immediately
     emitted: null,
     // props default value
-    propsDefaults: EMPTY_OBJ,
+    propsDefaults: null,
     // inheritAttrs
     inheritAttrs: type.inheritAttrs,
     // state
@@ -9724,53 +10111,19 @@ function createComponentInstance(vnode, parent, suspense) {
   }
   return instance;
 }
-let currentInstance = null;
-const getCurrentInstance = () => currentInstance || currentRenderingInstance;
-let internalSetCurrentInstance;
-let setInSSRSetupState;
-{
-  const g = getGlobalThis();
-  const registerGlobalSetter = (key, setter) => {
-    let setters;
-    if (!(setters = g[key])) setters = g[key] = [];
-    setters.push(setter);
-    return (v) => {
-      if (setters.length > 1) setters.forEach((set) => set(v));
-      else setters[0](v);
-    };
-  };
-  internalSetCurrentInstance = registerGlobalSetter(
-    `__VUE_INSTANCE_SETTERS__`,
-    (v) => currentInstance = v
-  );
-  setInSSRSetupState = registerGlobalSetter(
-    `__VUE_SSR_SETTERS__`,
-    (v) => isInSSRComponentSetup = v
-  );
-}
-const setCurrentInstance = (instance) => {
-  const prev = currentInstance;
-  internalSetCurrentInstance(instance);
-  instance.scope.on();
-  return () => {
-    instance.scope.off();
-    internalSetCurrentInstance(prev);
-  };
-};
-const unsetCurrentInstance = () => {
-  currentInstance && currentInstance.scope.off();
-  internalSetCurrentInstance(null);
-};
 function isStatefulComponent(instance) {
   return instance.vnode.shapeFlag & 4;
 }
-let isInSSRComponentSetup = false;
 function setupComponent(instance, isSSR = false, optimized = false) {
   isSSR && setInSSRSetupState(isSSR);
-  const { props, children } = instance.vnode;
+  const { props, children, vi } = instance.vnode;
   const isStateful = isStatefulComponent(instance);
-  initProps(instance, props, isStateful, isSSR);
-  initSlots(instance, children, optimized || isSSR);
+  if (vi) {
+    vi(instance);
+  } else {
+    initProps(instance, props, isStateful, isSSR);
+    initSlots(instance, children, optimized || isSSR);
+  }
   const setupResult = isStateful ? setupStatefulComponent(instance, isSSR) : void 0;
   isSSR && setInSSRSetupState(false);
   return setupResult;
@@ -9781,9 +10134,9 @@ function setupStatefulComponent(instance, isSSR) {
   instance.proxy = new Proxy(instance.ctx, PublicInstanceProxyHandlers);
   const { setup } = Component;
   if (setup) {
-    pauseTracking();
+    const prevSub = setActiveSub();
     const setupContext = instance.setupContext = setup.length > 1 ? createSetupContext(instance) : null;
-    const reset = setCurrentInstance(instance);
+    const prev = setCurrentInstance(instance);
     const setupResult = callWithErrorHandling(
       setup,
       instance,
@@ -9794,12 +10147,15 @@ function setupStatefulComponent(instance, isSSR) {
       ]
     );
     const isAsyncSetup = isPromise(setupResult);
-    resetTracking();
-    reset();
+    setActiveSub(prevSub);
+    setCurrentInstance(...prev);
     if ((isAsyncSetup || instance.sp) && !isAsyncWrapper(instance)) {
       markAsyncBoundary(instance);
     }
     if (isAsyncSetup) {
+      const unsetCurrentInstance = () => {
+        setCurrentInstance(null, void 0);
+      };
       setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
       if (isSSR) {
         return setupResult.then((resolvedResult) => {
@@ -9851,8 +10207,8 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
       if (template) {
         const { isCustomElement, compilerOptions } = instance.appContext.config;
         const { delimiters, compilerOptions: componentCompilerOptions } = Component;
-        const finalCompilerOptions = extend$1(
-          extend$1(
+        const finalCompilerOptions = extend(
+          extend(
             {
               isCustomElement,
               delimiters
@@ -9864,7 +10220,7 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
         {
           finalCompilerOptions.compatConfig = Object.create(globalCompatConfig);
           if (Component.compatConfig) {
-            extend$1(finalCompilerOptions.compatConfig, Component.compatConfig);
+            extend(finalCompilerOptions.compatConfig, Component.compatConfig);
           }
         }
         Component.render = compile$1(template, finalCompilerOptions);
@@ -9876,13 +10232,13 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
     }
   }
   if (!skipOptions) {
-    const reset = setCurrentInstance(instance);
-    pauseTracking();
+    const prevInstance = setCurrentInstance(instance);
+    const prevSub = setActiveSub();
     try {
       applyOptions(instance);
     } finally {
-      resetTracking();
-      reset();
+      setActiveSub(prevSub);
+      setCurrentInstance(...prevInstance);
     }
   }
 }
@@ -9893,18 +10249,18 @@ const attrsProxyHandlers = {
   }
 };
 function createSetupContext(instance) {
-  const expose = (exposed) => {
-    instance.exposed = exposed || {};
-  };
   {
     return {
       attrs: new Proxy(instance.attrs, attrsProxyHandlers),
       slots: instance.slots,
       emit: instance.emit,
-      expose
+      expose: (exposed) => expose(instance, exposed)
     };
   }
 }
+function expose(instance, exposed) {
+  instance.exposed = exposed || {};
+}
 function getComponentPublicInstance(instance) {
   if (instance.exposed) {
     return instance.exposeProxy || (instance.exposeProxy = new Proxy(proxyRefs(markRaw(instance.exposed)), {
@@ -9912,7 +10268,9 @@ function getComponentPublicInstance(instance) {
         if (key in target) {
           return target[key];
         } else if (key in publicPropertiesMap) {
-          return publicPropertiesMap[key](instance);
+          return publicPropertiesMap[key](
+            instance
+          );
         }
       },
       has(target, key) {
@@ -9931,8 +10289,7 @@ function isClassComponent(value) {
 }
 
 const computed = (getterOrOptions, debugOptions) => {
-  const c = computed$1(getterOrOptions, debugOptions, isInSSRComponentSetup);
-  return c;
+  return computed$1(getterOrOptions, debugOptions, isInSSRComponentSetup);
 };
 
 function h(type, propsOrChildren, children) {
@@ -9988,7 +10345,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.5.17";
+const version = "3.6.0-alpha.2";
 const warn$1 = NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = void 0;
@@ -10118,7 +10475,7 @@ const DOMTransitionPropsValidators = {
   leaveActiveClass: String,
   leaveToClass: String
 };
-const TransitionPropsValidators = /* @__PURE__ */ extend$1(
+const TransitionPropsValidators = /* @__PURE__ */ extend(
   {},
   BaseTransitionPropsValidators,
   DOMTransitionPropsValidators
@@ -10230,7 +10587,7 @@ function resolveTransitionProps(rawProps) {
       });
     };
   };
-  return extend$1(baseProps, {
+  return extend(baseProps, {
     onBeforeEnter(el) {
       callHook(onBeforeEnter, [el]);
       addTransitionClass(el, enterFromClass);
@@ -10528,11 +10885,11 @@ function patchStyle(el, prev, next) {
   }
 }
 const importantRE = /\s*!important$/;
-function setStyle(style, name, val) {
-  if (isArray(val)) {
-    val.forEach((v) => setStyle(style, name, v));
+function setStyle(style, name, rawVal) {
+  if (isArray(rawVal)) {
+    rawVal.forEach((v) => setStyle(style, name, v));
   } else {
-    if (val == null) val = "";
+    const val = rawVal == null ? "" : String(rawVal);
     if (name.startsWith("--")) {
       style.setProperty(name, val);
     } else {
@@ -10626,8 +10983,7 @@ function patchDOMProp(el, key, value, parentComponent, attrName) {
     return;
   }
   const tag = el.tagName;
-  if (key === "value" && tag !== "PROGRESS" && // custom elements may use _value internally
-  !tag.includes("-")) {
+  if (key === "value" && canSetValueDirectly(tag)) {
     const oldValue = tag === "OPTION" ? el.getAttribute("value") || "" : el.value;
     const newValue = value == null ? (
       // #11647: value should be set as empty string for null and undefined,
@@ -10750,8 +11106,6 @@ function patchStopImmediatePropagation(e, value) {
   }
 }
 
-const isNativeOn = (key) => key.charCodeAt(0) === 111 && key.charCodeAt(1) === 110 && // lowercase letter
-key.charCodeAt(2) > 96 && key.charCodeAt(2) < 123;
 const patchProp = (el, key, prevValue, nextValue, namespace, parentComponent) => {
   const isSVG = namespace === "svg";
   if (key === "class") {
@@ -10791,24 +11145,9 @@ function shouldSetAsProp(el, key, value, isSVG) {
     }
     return false;
   }
-  if (key === "spellcheck" || key === "draggable" || key === "translate" || key === "autocorrect") {
-    return false;
-  }
-  if (key === "form") {
-    return false;
-  }
-  if (key === "list" && el.tagName === "INPUT") {
-    return false;
-  }
-  if (key === "type" && el.tagName === "TEXTAREA") {
+  if (shouldSetAsAttr(el.tagName, key)) {
     return false;
   }
-  if (key === "width" || key === "height") {
-    const tag = el.tagName;
-    if (tag === "IMG" || tag === "VIDEO" || tag === "CANVAS" || tag === "SOURCE") {
-      return false;
-    }
-  }
   if (isNativeOn(key) && isString(value)) {
     return false;
   }
@@ -10820,7 +11159,7 @@ const REMOVAL = {};
 // @__NO_SIDE_EFFECTS__
 function defineCustomElement(options, extraOptions, _createApp) {
   const Comp = defineComponent(options, extraOptions);
-  if (isPlainObject(Comp)) extend$1(Comp, extraOptions);
+  if (isPlainObject(Comp)) extend(Comp, extraOptions);
   class VueCustomElement extends VueElement {
     constructor(initialProps) {
       super(Comp, initialProps, _createApp);
@@ -11069,7 +11408,7 @@ class VueElement extends BaseClass {
     if (!this.shadowRoot) {
       baseProps.onVnodeMounted = baseProps.onVnodeUpdated = this._renderSlots.bind(this);
     }
-    const vnode = createVNode(this._def, extend$1(baseProps, this._props));
+    const vnode = createVNode(this._def, extend(baseProps, this._props));
     if (!this._instance) {
       vnode.ce = (instance) => {
         this._instance = instance;
@@ -11079,7 +11418,7 @@ class VueElement extends BaseClass {
           this.dispatchEvent(
             new CustomEvent(
               event,
-              isPlainObject(args[0]) ? extend$1({ detail: args }, args[0]) : { detail: args }
+              isPlainObject(args[0]) ? extend({ detail: args }, args[0]) : { detail: args }
             )
           );
         };
@@ -11208,7 +11547,7 @@ const decorate = (t) => {
 };
 const TransitionGroupImpl = /* @__PURE__ */ decorate({
   name: "TransitionGroup",
-  props: /* @__PURE__ */ extend$1({}, TransitionPropsValidators, {
+  props: /* @__PURE__ */ extend({}, TransitionPropsValidators, {
     tag: String,
     moveClass: String
   }),
@@ -11359,28 +11698,12 @@ const assignKey = Symbol("_assign");
 const vModelText = {
   created(el, { modifiers: { lazy, trim, number } }, vnode) {
     el[assignKey] = getModelAssigner(vnode);
-    const castToNumber = number || vnode.props && vnode.props.type === "number";
-    addEventListener(el, lazy ? "change" : "input", (e) => {
-      if (e.target.composing) return;
-      let domValue = el.value;
-      if (trim) {
-        domValue = domValue.trim();
-      }
-      if (castToNumber) {
-        domValue = looseToNumber(domValue);
-      }
-      el[assignKey](domValue);
-    });
-    if (trim) {
-      addEventListener(el, "change", () => {
-        el.value = el.value.trim();
-      });
-    }
-    if (!lazy) {
-      addEventListener(el, "compositionstart", onCompositionStart);
-      addEventListener(el, "compositionend", onCompositionEnd);
-      addEventListener(el, "change", onCompositionEnd);
-    }
+    vModelTextInit(
+      el,
+      trim,
+      number || !!(vnode.props && vnode.props.type === "number"),
+      lazy
+    );
   },
   // set value on mounted so it's after min/max for type="range"
   mounted(el, { value }) {
@@ -11388,70 +11711,111 @@ const vModelText = {
   },
   beforeUpdate(el, { value, oldValue, modifiers: { lazy, trim, number } }, vnode) {
     el[assignKey] = getModelAssigner(vnode);
-    if (el.composing) return;
-    const elValue = (number || el.type === "number") && !/^0\d/.test(el.value) ? looseToNumber(el.value) : el.value;
-    const newValue = value == null ? "" : value;
-    if (elValue === newValue) {
+    vModelTextUpdate(el, oldValue, value, trim, number, lazy);
+  }
+};
+const vModelTextInit = (el, trim, number, lazy, set) => {
+  addEventListener(el, lazy ? "change" : "input", (e) => {
+    if (e.target.composing) return;
+    let domValue = el.value;
+    if (trim) {
+      domValue = domValue.trim();
+    }
+    if (number || el.type === "number") {
+      domValue = looseToNumber(domValue);
+    }
+    (0, el[assignKey])(domValue);
+  });
+  if (trim) {
+    addEventListener(el, "change", () => {
+      el.value = el.value.trim();
+    });
+  }
+  if (!lazy) {
+    addEventListener(el, "compositionstart", onCompositionStart);
+    addEventListener(el, "compositionend", onCompositionEnd);
+    addEventListener(el, "change", onCompositionEnd);
+  }
+};
+const vModelTextUpdate = (el, oldValue, value, trim, number, lazy) => {
+  if (el.composing) return;
+  const elValue = (number || el.type === "number") && !/^0\d/.test(el.value) ? looseToNumber(el.value) : el.value;
+  const newValue = value == null ? "" : value;
+  if (elValue === newValue) {
+    return;
+  }
+  if (document.activeElement === el && el.type !== "range") {
+    if (lazy && value === oldValue) {
       return;
     }
-    if (document.activeElement === el && el.type !== "range") {
-      if (lazy && value === oldValue) {
-        return;
-      }
-      if (trim && el.value.trim() === newValue) {
-        return;
-      }
+    if (trim && el.value.trim() === newValue) {
+      return;
     }
-    el.value = newValue;
   }
+  el.value = newValue;
 };
 const vModelCheckbox = {
   // #4096 array checkboxes need to be deep traversed
   deep: true,
   created(el, _, vnode) {
     el[assignKey] = getModelAssigner(vnode);
-    addEventListener(el, "change", () => {
-      const modelValue = el._modelValue;
-      const elementValue = getValue(el);
-      const checked = el.checked;
-      const assign = el[assignKey];
-      if (isArray(modelValue)) {
-        const index = looseIndexOf(modelValue, elementValue);
-        const found = index !== -1;
-        if (checked && !found) {
-          assign(modelValue.concat(elementValue));
-        } else if (!checked && found) {
-          const filtered = [...modelValue];
-          filtered.splice(index, 1);
-          assign(filtered);
-        }
-      } else if (isSet(modelValue)) {
-        const cloned = new Set(modelValue);
-        if (checked) {
-          cloned.add(elementValue);
-        } else {
-          cloned.delete(elementValue);
-        }
-        assign(cloned);
-      } else {
-        assign(getCheckboxValue(el, checked));
-      }
-    });
+    vModelCheckboxInit(el);
   },
   // set initial checked on mount to wait for true-value/false-value
-  mounted: setChecked,
+  mounted(el, binding, vnode) {
+    vModelCheckboxUpdate(
+      el,
+      binding.oldValue,
+      binding.value,
+      vnode.props.value
+    );
+  },
   beforeUpdate(el, binding, vnode) {
     el[assignKey] = getModelAssigner(vnode);
-    setChecked(el, binding, vnode);
+    vModelCheckboxUpdate(
+      el,
+      binding.oldValue,
+      binding.value,
+      vnode.props.value
+    );
   }
 };
-function setChecked(el, { value, oldValue }, vnode) {
+const vModelCheckboxInit = (el, set) => {
+  addEventListener(el, "change", () => {
+    const assign = el[assignKey];
+    const modelValue = el._modelValue;
+    const elementValue = getValue(el);
+    const checked = el.checked;
+    if (isArray(modelValue)) {
+      const index = looseIndexOf(modelValue, elementValue);
+      const found = index !== -1;
+      if (checked && !found) {
+        assign(modelValue.concat(elementValue));
+      } else if (!checked && found) {
+        const filtered = [...modelValue];
+        filtered.splice(index, 1);
+        assign(filtered);
+      }
+    } else if (isSet(modelValue)) {
+      const cloned = new Set(modelValue);
+      if (checked) {
+        cloned.add(elementValue);
+      } else {
+        cloned.delete(elementValue);
+      }
+      assign(cloned);
+    } else {
+      assign(getCheckboxValue(el, checked));
+    }
+  });
+};
+const vModelCheckboxUpdate = (el, oldValue, value, rawValue = getValue(el)) => {
   el._modelValue = value;
   let checked;
   if (isArray(value)) {
-    checked = looseIndexOf(value, vnode.props.value) > -1;
+    checked = looseIndexOf(value, rawValue) > -1;
   } else if (isSet(value)) {
-    checked = value.has(vnode.props.value);
+    checked = value.has(rawValue);
   } else {
     if (value === oldValue) return;
     checked = looseEqual(value, getCheckboxValue(el, true));
@@ -11459,7 +11823,7 @@ function setChecked(el, { value, oldValue }, vnode) {
   if (el.checked !== checked) {
     el.checked = checked;
   }
-}
+};
 const vModelRadio = {
   created(el, { value }, vnode) {
     el.checked = looseEqual(value, vnode.props.value);
@@ -11479,36 +11843,38 @@ const vModelSelect = {
   // <select multiple> value need to be deep traversed
   deep: true,
   created(el, { value, modifiers: { number } }, vnode) {
-    const isSetModel = isSet(value);
-    addEventListener(el, "change", () => {
-      const selectedVal = Array.prototype.filter.call(el.options, (o) => o.selected).map(
-        (o) => number ? looseToNumber(getValue(o)) : getValue(o)
-      );
-      el[assignKey](
-        el.multiple ? isSetModel ? new Set(selectedVal) : selectedVal : selectedVal[0]
-      );
-      el._assigning = true;
-      nextTick(() => {
-        el._assigning = false;
-      });
-    });
+    vModelSelectInit(el, value, number);
     el[assignKey] = getModelAssigner(vnode);
   },
   // set value in mounted & updated because <select> relies on its children
   // <option>s.
   mounted(el, { value }) {
-    setSelected(el, value);
+    vModelSetSelected(el, value);
   },
   beforeUpdate(el, _binding, vnode) {
     el[assignKey] = getModelAssigner(vnode);
   },
   updated(el, { value }) {
-    if (!el._assigning) {
-      setSelected(el, value);
-    }
+    vModelSetSelected(el, value);
   }
 };
-function setSelected(el, value) {
+const vModelSelectInit = (el, value, number, set) => {
+  const isSetModel = isSet(value);
+  addEventListener(el, "change", () => {
+    const selectedVal = Array.prototype.filter.call(el.options, (o) => o.selected).map(
+      (o) => number ? looseToNumber(getValue(o)) : getValue(o)
+    );
+    (0, el[assignKey])(
+      el.multiple ? isSetModel ? new Set(selectedVal) : selectedVal : selectedVal[0]
+    );
+    el._assigning = true;
+    nextTick(() => {
+      el._assigning = false;
+    });
+  });
+};
+const vModelSetSelected = (el, value) => {
+  if (el._assigning) return;
   const isMultiple = el.multiple;
   const isArrayValue = isArray(value);
   if (isMultiple && !isArrayValue && !isSet(value)) {
@@ -11536,13 +11902,20 @@ function setSelected(el, value) {
   if (!isMultiple && el.selectedIndex !== -1) {
     el.selectedIndex = -1;
   }
-}
+};
 function getValue(el) {
   return "_value" in el ? el._value : el.value;
 }
 function getCheckboxValue(el, checked) {
   const key = checked ? "_trueValue" : "_falseValue";
-  return key in el ? el[key] : checked;
+  if (key in el) {
+    return el[key];
+  }
+  const attr = checked ? "true-value" : "false-value";
+  if (el.hasAttribute(attr)) {
+    return el.getAttribute(attr);
+  }
+  return checked;
 }
 const vModelDynamic = {
   created(el, binding, vnode) {
@@ -11698,7 +12071,7 @@ const withKeys = (fn, modifiers) => {
   });
 };
 
-const rendererOptions = /* @__PURE__ */ extend$1({ patchProp }, nodeOps);
+const rendererOptions = /* @__PURE__ */ extend({ patchProp }, nodeOps);
 let renderer;
 let enabledHydration = false;
 function ensureRenderer() {
@@ -11957,7 +12330,7 @@ function wrappedCreateApp(...args) {
 }
 function createCompatVue() {
   const Vue = compatUtils.createCompatVue(createApp, wrappedCreateApp);
-  extend$1(Vue, runtimeDom);
+  extend(Vue, runtimeDom);
   return Vue;
 }
 
@@ -13384,7 +13757,7 @@ function markScopeIdentifier(node, child, knownIds) {
 const isFunctionType = (node) => {
   return /Function(?:Expression|Declaration)$|Method$/.test(node.type);
 };
-const isStaticProperty = (node) => node && (node.type === "ObjectProperty" || node.type === "ObjectMethod") && !node.computed;
+const isStaticProperty = (node) => !!node && (node.type === "ObjectProperty" || node.type === "ObjectMethod") && !node.computed;
 const isStaticPropertyKey = (node, parent) => isStaticProperty(parent) && parent.key === node;
 function isReferenced(node, parent, grandparent) {
   switch (parent.type) {
@@ -14236,9 +14609,9 @@ function onCloseTag(el, end, isImplied = false) {
   }
   if (tokenizer.inSFCRoot) {
     if (el.children.length) {
-      el.innerLoc.end = extend$1({}, el.children[el.children.length - 1].loc.end);
+      el.innerLoc.end = extend({}, el.children[el.children.length - 1].loc.end);
     } else {
-      el.innerLoc.end = extend$1({}, el.innerLoc.start);
+      el.innerLoc.end = extend({}, el.innerLoc.start);
     }
     el.innerLoc.source = getSlice(
       el.innerLoc.start.offset,
@@ -14508,7 +14881,7 @@ function reset() {
 function baseParse(input, options) {
   reset();
   currentInput = input;
-  currentOptions = extend$1({}, defaultParserOptions);
+  currentOptions = extend({}, defaultParserOptions);
   if (options) {
     let key;
     for (key in options) {
@@ -14829,6 +15202,10 @@ function getNodeProps(node) {
   }
 }
 
+function getSelfName(filename) {
+  const nameMatch = filename.replace(/\?.*$/, "").match(/([^/\\]+)\.\w+$/);
+  return nameMatch ? capitalize(camelize(nameMatch[1])) : null;
+}
 function createTransformContext(root, {
   filename = "",
   prefixIdentifiers = false,
@@ -14853,11 +15230,10 @@ function createTransformContext(root, {
   onWarn = defaultOnWarn,
   compatConfig
 }) {
-  const nameMatch = filename.replace(/\?.*$/, "").match(/([^/\\]+)\.\w+$/);
   const context = {
     // options
     filename,
-    selfName: nameMatch && capitalize(camelize(nameMatch[1])),
+    selfName: getSelfName(filename),
     prefixIdentifiers,
     hoistStatic,
     hmr,
@@ -15177,7 +15553,7 @@ function createCodegenContext(ast, {
     helper(key) {
       return `_${helperNameMap[key]}`;
     },
-    push(code, newlineIndex = -2 /* None */, node) {
+    push(code, newlineIndex = -2, node) {
       context.code += code;
       if (context.map) {
         if (node) {
@@ -15192,14 +15568,14 @@ function createCodegenContext(ast, {
             addMapping(node.loc.start, name);
           }
         }
-        if (newlineIndex === -3 /* Unknown */) {
+        if (newlineIndex === -3) {
           advancePositionWithMutation(context, code);
         } else {
           context.offset += code.length;
-          if (newlineIndex === -2 /* None */) {
+          if (newlineIndex === -2) {
             context.column += code.length;
           } else {
-            if (newlineIndex === -1 /* End */) {
+            if (newlineIndex === -1) {
               newlineIndex = code.length - 1;
             }
             context.line++;
@@ -15226,7 +15602,7 @@ function createCodegenContext(ast, {
     }
   };
   function newline(n) {
-    context.push("\n" + `  `.repeat(n), 0 /* Start */);
+    context.push("\n" + `  `.repeat(n), 0);
   }
   function addMapping(loc, name = null) {
     const { _names, _mappings } = context.map;
@@ -15291,7 +15667,7 @@ function generate(ast, options = {}) {
       push(
         `const { ${helpers.map(aliasHelper).join(", ")} } = _Vue
 `,
-        -1 /* End */
+        -1
       );
       newline();
     }
@@ -15321,7 +15697,7 @@ function generate(ast, options = {}) {
   }
   if (ast.components.length || ast.directives.length || ast.temps) {
     push(`
-`, 0 /* Start */);
+`, 0);
     newline();
   }
   if (!ssr) {
@@ -15342,7 +15718,8 @@ function generate(ast, options = {}) {
     ast,
     code: context.code,
     preamble: isSetupInlined ? preambleContext.code : ``,
-    map: context.map ? context.map.toJSON() : void 0
+    map: context.map ? context.map.toJSON() : void 0,
+    helpers: ast.helpers
   };
 }
 function genFunctionPreamble(ast, context) {
@@ -15362,11 +15739,11 @@ function genFunctionPreamble(ast, context) {
       push(
         `const { ${helpers.map(aliasHelper).join(", ")} } = ${VueBinding}
 `,
-        -1 /* End */
+        -1
       );
     } else {
       push(`const _Vue = ${VueBinding}
-`, -1 /* End */);
+`, -1);
       if (ast.hoists.length) {
         const staticHelpers = [
           CREATE_VNODE,
@@ -15376,7 +15753,7 @@ function genFunctionPreamble(ast, context) {
           CREATE_STATIC
         ].filter((helper) => helpers.includes(helper)).map(aliasHelper).join(", ");
         push(`const { ${staticHelpers} } = _Vue
-`, -1 /* End */);
+`, -1);
       }
     }
   }
@@ -15384,7 +15761,7 @@ function genFunctionPreamble(ast, context) {
     push(
       `const { ${ast.ssrHelpers.map(aliasHelper).join(", ")} } = require("${ssrRuntimeModuleName}")
 `,
-      -1 /* End */
+      -1
     );
   }
   genHoists(ast.hoists, context);
@@ -15405,20 +15782,20 @@ function genModulePreamble(ast, context, genScopeId, inline) {
       push(
         `import { ${helpers.map((s) => helperNameMap[s]).join(", ")} } from ${JSON.stringify(runtimeModuleName)}
 `,
-        -1 /* End */
+        -1
       );
       push(
         `
 // Binding optimization for webpack code-split
 const ${helpers.map((s) => `_${helperNameMap[s]} = ${helperNameMap[s]}`).join(", ")}
 `,
-        -1 /* End */
+        -1
       );
     } else {
       push(
         `import { ${helpers.map((s) => `${helperNameMap[s]} as _${helperNameMap[s]}`).join(", ")} } from ${JSON.stringify(runtimeModuleName)}
 `,
-        -1 /* End */
+        -1
       );
     }
   }
@@ -15426,7 +15803,7 @@ const ${helpers.map((s) => `_${helperNameMap[s]} = ${helperNameMap[s]}`).join(",
     push(
       `import { ${ast.ssrHelpers.map((s) => `${helperNameMap[s]} as _${helperNameMap[s]}`).join(", ")} } from "${ssrRuntimeModuleName}"
 `,
-      -1 /* End */
+      -1
     );
   }
   if (ast.imports.length) {
@@ -15501,7 +15878,7 @@ function genNodeList(nodes, context, multilines = false, comma = true) {
   for (let i = 0; i < nodes.length; i++) {
     const node = nodes[i];
     if (isString(node)) {
-      push(node, -3 /* Unknown */);
+      push(node, -3);
     } else if (isArray(node)) {
       genNodeListAsArray(node, context);
     } else {
@@ -15519,7 +15896,7 @@ function genNodeList(nodes, context, multilines = false, comma = true) {
 }
 function genNode(node, context) {
   if (isString(node)) {
-    context.push(node, -3 /* Unknown */);
+    context.push(node, -3);
     return;
   }
   if (isSymbol(node)) {
@@ -15593,13 +15970,13 @@ function genNode(node, context) {
   }
 }
 function genText(node, context) {
-  context.push(JSON.stringify(node.content), -3 /* Unknown */, node);
+  context.push(JSON.stringify(node.content), -3, node);
 }
 function genExpression(node, context) {
   const { content, isStatic } = node;
   context.push(
     isStatic ? JSON.stringify(content) : content,
-    -3 /* Unknown */,
+    -3,
     node
   );
 }
@@ -15614,7 +15991,7 @@ function genCompoundExpression(node, context) {
   for (let i = 0; i < node.children.length; i++) {
     const child = node.children[i];
     if (isString(child)) {
-      context.push(child, -3 /* Unknown */);
+      context.push(child, -3);
     } else {
       genNode(child, context);
     }
@@ -15628,9 +16005,9 @@ function genExpressionAsPropertyKey(node, context) {
     push(`]`);
   } else if (node.isStatic) {
     const text = isSimpleIdentifier(node.content) ? node.content : JSON.stringify(node.content);
-    push(text, -2 /* None */, node);
+    push(text, -2, node);
   } else {
-    push(`[${node.content}]`, -3 /* Unknown */, node);
+    push(`[${node.content}]`, -3, node);
   }
 }
 function genComment(node, context) {
@@ -15640,7 +16017,7 @@ function genComment(node, context) {
   }
   push(
     `${helper(CREATE_COMMENT)}(${JSON.stringify(node.content)})`,
-    -3 /* Unknown */,
+    -3,
     node
   );
 }
@@ -15673,7 +16050,7 @@ function genVNodeCall(node, context) {
     push(PURE_ANNOTATION);
   }
   const callHelper = isBlock ? getVNodeBlockHelper(context.inSSR, isComponent) : getVNodeHelper(context.inSSR, isComponent);
-  push(helper(callHelper) + `(`, -2 /* None */, node);
+  push(helper(callHelper) + `(`, -2, node);
   genNodeList(
     genNullableArgs([tag, props, children, patchFlagString, dynamicProps]),
     context
@@ -15701,7 +16078,7 @@ function genCallExpression(node, context) {
   if (pure) {
     push(PURE_ANNOTATION);
   }
-  push(callee + `(`, -2 /* None */, node);
+  push(callee + `(`, -2, node);
   genNodeList(node.arguments, context);
   push(`)`);
 }
@@ -15709,7 +16086,7 @@ function genObjectExpression(node, context) {
   const { push, indent, deindent, newline } = context;
   const { properties } = node;
   if (!properties.length) {
-    push(`{}`, -2 /* None */, node);
+    push(`{}`, -2, node);
     return;
   }
   const multilines = properties.length > 1 || properties.some((p) => p.value.type !== 4);
@@ -15737,7 +16114,7 @@ function genFunctionExpression(node, context) {
   if (isSlot) {
     push(`_${helperNameMap[WITH_CTX]}(`);
   }
-  push(`(`, -2 /* None */, node);
+  push(`(`, -2, node);
   if (isArray(params)) {
     genNodeList(params, context);
   } else if (params) {
@@ -15844,7 +16221,7 @@ function genTemplateLiteral(node, context) {
   for (let i = 0; i < l; i++) {
     const e = node.elements[i];
     if (isString(e)) {
-      push(e.replace(/(`|\$|\\)/g, "\\$1"), -3 /* Unknown */);
+      push(e.replace(/(`|\$|\\)/g, "\\$1"), -3);
     } else {
       push("${");
       if (multilines) indent();
@@ -18100,7 +18477,7 @@ function baseCompile(source, options = {}) {
   if (options.scopeId && !isModuleMode) {
     onError(createCompilerError(50));
   }
-  const resolvedOptions = extend$1({}, options, {
+  const resolvedOptions = extend({}, options, {
     prefixIdentifiers
   });
   const ast = isString(source) ? baseParse(source, resolvedOptions) : source;
@@ -18113,13 +18490,13 @@ function baseCompile(source, options = {}) {
   }
   transform(
     ast,
-    extend$1({}, resolvedOptions, {
+    extend({}, resolvedOptions, {
       nodeTransforms: [
         ...nodeTransforms,
         ...options.nodeTransforms || []
         // user transforms
       ],
-      directiveTransforms: extend$1(
+      directiveTransforms: extend(
         {},
         directiveTransforms,
         options.directiveTransforms || {}
@@ -18258,7 +18635,9 @@ const DOMErrorMessages = {
   [60]: `Unnecessary value binding used alongside v-model. It will interfere with v-model's behavior.`,
   [61]: `v-show is missing expression.`,
   [62]: `<Transition> expects exactly one child element or component.`,
-  [63]: `Tags with side effect (<script> and <style>) are ignored in client component templates.`
+  [63]: `Tags with side effect (<script> and <style>) are ignored in client component templates.`,
+  // just to fulfill types
+  [64]: ``
 };
 
 const transformVHtml = (dir, node, context) => {
@@ -18389,16 +18768,17 @@ const resolveModifiers = (key, modifiers, context, loc) => {
   const eventOptionModifiers = [];
   for (let i = 0; i < modifiers.length; i++) {
     const modifier = modifiers[i].content;
-    if (modifier === "native" && checkCompatEnabled(
+    if (modifier === "native" && context && checkCompatEnabled(
       "COMPILER_V_ON_NATIVE",
       context)) {
       eventOptionModifiers.push(modifier);
     } else if (isEventOptionModifier(modifier)) {
       eventOptionModifiers.push(modifier);
     } else {
+      const keyString = isString(key) ? key : isStaticExp(key) ? key.content : null;
       if (maybeKeyModifier(modifier)) {
-        if (isStaticExp(key)) {
-          if (isKeyboardEvent(key.content.toLowerCase())) {
+        if (keyString) {
+          if (isKeyboardEvent(keyString.toLowerCase())) {
             keyModifiers.push(modifier);
           } else {
             nonKeyModifiers.push(modifier);
@@ -18734,7 +19114,7 @@ const DOMDirectiveTransforms = {
 function compile(src, options = {}) {
   return baseCompile(
     src,
-    extend$1({}, parserOptions, options, {
+    extend({}, parserOptions, options, {
       nodeTransforms: [
         // ignore <script> and <tag>
         // this is not put inside DOMNodeTransforms because that list is used
@@ -18743,7 +19123,7 @@ function compile(src, options = {}) {
         ...DOMNodeTransforms,
         ...options.nodeTransforms || []
       ],
-      directiveTransforms: extend$1(
+      directiveTransforms: extend(
         {},
         DOMDirectiveTransforms,
         options.directiveTransforms || {}
@@ -18773,7 +19153,7 @@ function compileToFunction(template, options) {
   }
   const { code } = compile(
     template,
-    extend$1(
+    extend(
       {
         hoistStatic: true,
         whitespace: "preserve",