@vue/compat 3.4.6 → 3.4.7

package/dist/vue.runtime.esm-bundler.js

@@ -4042,14 +4042,9 @@ function instanceWatch(source, value, options) {
     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) {
@@ -4101,12 +4096,11 @@ function validateDirectiveName(name) {
   }
 }
 function withDirectives(vnode, directives) {
-  const internalInstance = currentRenderingInstance;
-  if (internalInstance === null) {
+  if (currentRenderingInstance === null) {
     !!(process.env.NODE_ENV !== "production") && 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];
@@ -4903,9 +4897,9 @@ function injectHook(type, hook, target = currentInstance, prepend = false) {
         return;
       }
       pauseTracking();
-      setCurrentInstance(target);
+      const reset = setCurrentInstance(target);
       const res = callWithAsyncErrorHandling(hook, target, type, args);
-      unsetCurrentInstance();
+      reset();
       resetTracking();
       return res;
     });
@@ -6499,7 +6493,7 @@ function createCompatVue$1(createApp, createSingletonApp) {
       return vm;
     }
   }
-  Vue.version = `2.6.14-compat:${"3.4.6"}`;
+  Vue.version = `2.6.14-compat:${"3.4.7"}`;
   Vue.config = singletonApp.config;
   Vue.use = (p, ...options) => {
     if (p && isFunction(p.install)) {
@@ -7342,12 +7336,12 @@ function resolvePropValue(options, props, key, value, instance, isAbsent) {
         if (key in propsDefaults) {
           value = propsDefaults[key];
         } else {
-          setCurrentInstance(instance);
+          const reset = setCurrentInstance(instance);
           value = propsDefaults[key] = defaultValue.call(
             isCompatEnabled("PROPS_DEFAULT_THIS", instance) ? createPropsDefaultThis(instance, props, key) : null,
             props
           );
-          unsetCurrentInstance();
+          reset();
         }
       } else {
         value = defaultValue;
@@ -10744,14 +10738,7 @@ function createComponentInstance(vnode, parent, suspense) {
   return instance;
 }
 let currentInstance = null;
-const getCurrentInstance = () => {
-  if (!!(process.env.NODE_ENV !== "production") && 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;
 {
@@ -10778,8 +10765,13 @@ let setInSSRSetupState;
   );
 }
 const setCurrentInstance = (instance) => {
+  const prev = currentInstance;
   internalSetCurrentInstance(instance);
   instance.scope.on();
+  return () => {
+    instance.scope.off();
+    internalSetCurrentInstance(prev);
+  };
 };
 const unsetCurrentInstance = () => {
   currentInstance && currentInstance.scope.off();
@@ -10841,7 +10833,7 @@ function setupStatefulComponent(instance, isSSR) {
   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,
@@ -10853,7 +10845,7 @@ function setupStatefulComponent(instance, isSSR) {
       ]
     );
     resetTracking();
-    unsetCurrentInstance();
+    reset();
     if (isPromise(setupResult)) {
       setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
       if (isSSR) {
@@ -10961,13 +10953,13 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
     }
   }
   if (__VUE_OPTIONS_API__ && !skipOptions) {
-    setCurrentInstance(instance);
+    const reset = setCurrentInstance(instance);
     pauseTracking();
     try {
       applyOptions(instance);
     } finally {
       resetTracking();
-      unsetCurrentInstance();
+      reset();
     }
   }
   if (!!(process.env.NODE_ENV !== "production") && !Component.render && instance.render === NOOP && !isSSR) {
@@ -11108,25 +11100,7 @@ function isClassComponent(value) {
   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 (!!(process.env.NODE_ENV !== "production")) {
-    if (isFunction(getterOrOptions)) {
-      getterOrOptions = wrapComputedGetter(getterOrOptions);
-    } else {
-      getterOrOptions.get = wrapComputedGetter(getterOrOptions.get);
-    }
-  }
   return computed$1(getterOrOptions, debugOptions, isInSSRComponentSetup);
 };
 
@@ -11352,7 +11326,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.4.6";
+const version = "3.4.7";
 const warn = !!(process.env.NODE_ENV !== "production") ? warn$1 : NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = !!(process.env.NODE_ENV !== "production") || __VUE_PROD_DEVTOOLS__ ? devtools$1 : void 0;

package/dist/vue.runtime.global.js

@@ -4011,14 +4011,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) {
@@ -4070,12 +4065,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];
@@ -4864,9 +4858,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;
       });
@@ -6458,7 +6452,7 @@ If this is a native custom element, make sure to exclude it from component resol
         return vm;
       }
     }
-    Vue.version = `2.6.14-compat:${"3.4.6"}`;
+    Vue.version = `2.6.14-compat:${"3.4.7"}`;
     Vue.config = singletonApp.config;
     Vue.use = (p, ...options) => {
       if (p && isFunction(p.install)) {
@@ -7298,12 +7292,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(
               isCompatEnabled("PROPS_DEFAULT_THIS", instance) ? createPropsDefaultThis(instance, props, key) : null,
               props
             );
-            unsetCurrentInstance();
+            reset();
           }
         } else {
           value = defaultValue;
@@ -10650,14 +10644,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;
   {
@@ -10669,8 +10656,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();
@@ -10732,7 +10724,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,
@@ -10744,7 +10736,7 @@ Component that was made reactive: `,
         ]
       );
       resetTracking();
-      unsetCurrentInstance();
+      reset();
       if (isPromise(setupResult)) {
         setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
         if (isSSR) {
@@ -10850,13 +10842,13 @@ Component that was made reactive: `,
       }
     }
     if (!skipOptions) {
-      setCurrentInstance(instance);
+      const reset = setCurrentInstance(instance);
       pauseTracking();
       try {
         applyOptions(instance);
       } finally {
         resetTracking();
-        unsetCurrentInstance();
+        reset();
       }
     }
     if (!Component.render && instance.render === NOOP && !isSSR) {
@@ -10983,25 +10975,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);
   };
 
@@ -11227,7 +11201,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 ;