@vue/runtime-dom 3.4.6 → 3.4.8

package/dist/runtime-dom.global.js

@@ -1,3 +1,8 @@
+/**
+* @vue/runtime-dom v3.4.8
+* (c) 2018-present Yuxi (Evan) You and Vue contributors
+* @license MIT
+**/
 var VueRuntimeDOM = (function (exports) {
   'use strict';
 
@@ -2580,8 +2585,6 @@ var VueRuntimeDOM = (function (exports) {
     return false;
   }
   function updateHOCHostEl({ vnode, parent }, el) {
-    if (!el)
-      return;
     while (parent) {
       const root = parent.subTree;
       if (root.suspense && root.suspense.activeBranch === vnode) {
@@ -3222,7 +3225,12 @@ If this is a native custom element, make sure to exclude it from component resol
   function setActiveBranch(suspense, branch) {
     suspense.activeBranch = branch;
     const { vnode, parentComponent } = suspense;
-    const el = vnode.el = branch.el;
+    let el = branch.el;
+    while (!el && branch.component) {
+      branch = branch.component.subTree;
+      el = branch.el;
+    }
+    vnode.el = el;
     if (parentComponent && parentComponent.subTree === vnode) {
       parentComponent.vnode.el = el;
       updateHOCHostEl(parentComponent, el);
@@ -3442,14 +3450,9 @@ If this is a native custom element, make sure to exclude it from component resol
       cb = value.handler;
       options = value;
     }
-    const cur = currentInstance;
-    setCurrentInstance(this);
+    const reset = setCurrentInstance(this);
     const res = doWatch(getter, cb.bind(publicThis), options);
-    if (cur) {
-      setCurrentInstance(cur);
-    } else {
-      unsetCurrentInstance();
-    }
+    reset();
     return res;
   }
   function createPathGetter(ctx, path) {
@@ -3501,12 +3504,11 @@ If this is a native custom element, make sure to exclude it from component resol
     }
   }
   function withDirectives(vnode, directives) {
-    const internalInstance = currentRenderingInstance;
-    if (internalInstance === null) {
+    if (currentRenderingInstance === null) {
       warn$1(`withDirectives can only be used inside render functions.`);
       return vnode;
     }
-    const instance = getExposeProxy(internalInstance) || internalInstance.proxy;
+    const instance = getExposeProxy(currentRenderingInstance) || currentRenderingInstance.proxy;
     const bindings = vnode.dirs || (vnode.dirs = []);
     for (let i = 0; i < directives.length; i++) {
       let [dir, value, arg, modifiers = EMPTY_OBJ] = directives[i];
@@ -4286,9 +4288,9 @@ If this is a native custom element, make sure to exclude it from component resol
           return;
         }
         pauseTracking();
-        setCurrentInstance(target);
+        const reset = setCurrentInstance(target);
         const res = callWithAsyncErrorHandling(hook, target, type, args);
-        unsetCurrentInstance();
+        reset();
         resetTracking();
         return res;
       });
@@ -5673,12 +5675,12 @@ If you want to remount the same app, move your app creation logic into a factory
           if (key in propsDefaults) {
             value = propsDefaults[key];
           } else {
-            setCurrentInstance(instance);
+            const reset = setCurrentInstance(instance);
             value = propsDefaults[key] = defaultValue.call(
               null,
               props
             );
-            unsetCurrentInstance();
+            reset();
           }
         } else {
           value = defaultValue;
@@ -6554,29 +6556,34 @@ Server rendered element contains fewer child nodes than client vdom.`
     let actual;
     let expected;
     if (key === "class") {
-      actual = toClassSet(el.getAttribute("class") || "");
-      expected = toClassSet(normalizeClass(clientValue));
-      if (!isSetEqual(actual, expected)) {
+      actual = el.getAttribute("class");
+      expected = normalizeClass(clientValue);
+      if (!isSetEqual(toClassSet(actual || ""), toClassSet(expected))) {
         mismatchType = mismatchKey = `class`;
       }
     } else if (key === "style") {
-      actual = toStyleMap(el.getAttribute("style") || "");
-      expected = toStyleMap(
-        isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue))
-      );
+      actual = el.getAttribute("style");
+      expected = isString(clientValue) ? clientValue : stringifyStyle(normalizeStyle(clientValue));
+      const actualMap = toStyleMap(actual);
+      const expectedMap = toStyleMap(expected);
       if (vnode.dirs) {
         for (const { dir, value } of vnode.dirs) {
           if (dir.name === "show" && !value) {
-            expected.set("display", "none");
+            expectedMap.set("display", "none");
           }
         }
       }
-      if (!isMapEqual(actual, expected)) {
+      if (!isMapEqual(actualMap, expectedMap)) {
         mismatchType = mismatchKey = "style";
       }
     } else if (el instanceof SVGElement && isKnownSvgAttr(key) || el instanceof HTMLElement && (isBooleanAttr(key) || isKnownHtmlAttr(key))) {
-      actual = el.hasAttribute(key) ? el.getAttribute(key) : key in el ? el[key] : "";
-      expected = isBooleanAttr(key) ? includeBooleanAttr(clientValue) ? "" : false : clientValue == null ? "" : String(clientValue);
+      if (isBooleanAttr(key)) {
+        actual = el.hasAttribute(key);
+        expected = includeBooleanAttr(clientValue);
+      } else {
+        actual = el.hasAttribute(key) ? el.getAttribute(key) : key in el ? el[key] : "";
+        expected = clientValue == null ? "" : String(clientValue);
+      }
       if (actual !== expected) {
         mismatchType = `attribute`;
         mismatchKey = key;
@@ -8925,14 +8932,7 @@ Component that was made reactive: `,
     return instance;
   }
   let currentInstance = null;
-  const getCurrentInstance = () => {
-    if (isInComputedGetter) {
-      warn$1(
-        `getCurrentInstance() called inside a computed getter. This is incorrect usage as computed getters are not guaranteed to be executed with an active component instance. If you are using a composable inside a computed getter, move it ouside to the setup scope.`
-      );
-    }
-    return currentInstance || currentRenderingInstance;
-  };
+  const getCurrentInstance = () => currentInstance || currentRenderingInstance;
   let internalSetCurrentInstance;
   let setInSSRSetupState;
   {
@@ -8944,8 +8944,13 @@ Component that was made reactive: `,
     };
   }
   const setCurrentInstance = (instance) => {
+    const prev = currentInstance;
     internalSetCurrentInstance(instance);
     instance.scope.on();
+    return () => {
+      instance.scope.off();
+      internalSetCurrentInstance(prev);
+    };
   };
   const unsetCurrentInstance = () => {
     currentInstance && currentInstance.scope.off();
@@ -9007,7 +9012,7 @@ Component that was made reactive: `,
     const { setup } = Component;
     if (setup) {
       const setupContext = instance.setupContext = setup.length > 1 ? createSetupContext(instance) : null;
-      setCurrentInstance(instance);
+      const reset = setCurrentInstance(instance);
       pauseTracking();
       const setupResult = callWithErrorHandling(
         setup,
@@ -9019,7 +9024,7 @@ Component that was made reactive: `,
         ]
       );
       resetTracking();
-      unsetCurrentInstance();
+      reset();
       if (isPromise(setupResult)) {
         setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
         if (isSSR) {
@@ -9113,13 +9118,13 @@ Component that was made reactive: `,
       }
     }
     {
-      setCurrentInstance(instance);
+      const reset = setCurrentInstance(instance);
       pauseTracking();
       try {
         applyOptions(instance);
       } finally {
         resetTracking();
-        unsetCurrentInstance();
+        reset();
       }
     }
     if (!Component.render && instance.render === NOOP && !isSSR) {
@@ -9246,25 +9251,7 @@ Component that was made reactive: `,
     return isFunction(value) && "__vccOpts" in value;
   }
 
-  let isInComputedGetter = false;
-  function wrapComputedGetter(getter) {
-    return () => {
-      isInComputedGetter = true;
-      try {
-        return getter();
-      } finally {
-        isInComputedGetter = false;
-      }
-    };
-  }
   const computed = (getterOrOptions, debugOptions) => {
-    {
-      if (isFunction(getterOrOptions)) {
-        getterOrOptions = wrapComputedGetter(getterOrOptions);
-      } else {
-        getterOrOptions.get = wrapComputedGetter(getterOrOptions.get);
-      }
-    }
     return computed$1(getterOrOptions, debugOptions, isInSSRComponentSetup);
   };
 
@@ -9490,7 +9477,7 @@ Component that was made reactive: `,
     return true;
   }
 
-  const version = "3.4.6";
+  const version = "3.4.8";
   const warn = warn$1 ;
   const ErrorTypeStrings = ErrorTypeStrings$1 ;
   const devtools = devtools$1 ;