vue 3.4.6 → 3.4.7

package/dist/vue.global.js

@@ -3507,14 +3507,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) {
@@ -3566,12 +3561,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];
@@ -4351,9 +4345,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;
       });
@@ -5738,12 +5732,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;
@@ -8990,14 +8984,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;
   {
@@ -9009,8 +8996,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();
@@ -9072,7 +9064,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,
@@ -9084,7 +9076,7 @@ Component that was made reactive: `,
         ]
       );
       resetTracking();
-      unsetCurrentInstance();
+      reset();
       if (isPromise(setupResult)) {
         setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
         if (isSSR) {
@@ -9178,13 +9170,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) {
@@ -9311,25 +9303,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);
   };
 
@@ -9555,7 +9529,7 @@ Component that was made reactive: `,
     return true;
   }
 
-  const version = "3.4.6";
+  const version = "3.4.7";
   const warn = warn$1 ;
   const ErrorTypeStrings = ErrorTypeStrings$1 ;
   const devtools = devtools$1 ;
@@ -13453,8 +13427,7 @@ Use a v-bind binding combined with a v-on listener that emits update:x event ins
         }
         context.parent.children.splice(removalIndex, 1);
       },
-      onNodeRemoved: () => {
-      },
+      onNodeRemoved: NOOP,
       addIdentifiers(exp) {
       },
       removeIdentifiers(exp) {