@vue/runtime-core 3.4.6 → 3.4.7

package/dist/runtime-core.cjs.js

@@ -1985,14 +1985,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) {
@@ -2044,12 +2039,11 @@ function validateDirectiveName(name) {
   }
 }
 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 = shared.EMPTY_OBJ] = directives[i];
@@ -2835,9 +2829,9 @@ function injectHook(type, hook, target = currentInstance, prepend = false) {
         return;
       }
       reactivity.pauseTracking();
-      setCurrentInstance(target);
+      const reset = setCurrentInstance(target);
       const res = callWithAsyncErrorHandling(hook, target, type, args);
-      unsetCurrentInstance();
+      reset();
       reactivity.resetTracking();
       return res;
     });
@@ -4222,12 +4216,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(
             null,
             props
           );
-          unsetCurrentInstance();
+          reset();
         }
       } else {
         value = defaultValue;
@@ -7474,14 +7468,7 @@ function createComponentInstance(vnode, parent, suspense) {
   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;
 {
@@ -7508,8 +7495,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();
@@ -7571,7 +7563,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);
     reactivity.pauseTracking();
     const setupResult = callWithErrorHandling(
       setup,
@@ -7583,7 +7575,7 @@ function setupStatefulComponent(instance, isSSR) {
       ]
     );
     reactivity.resetTracking();
-    unsetCurrentInstance();
+    reset();
     if (shared.isPromise(setupResult)) {
       setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
       if (isSSR) {
@@ -7679,13 +7671,13 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
     }
   }
   {
-    setCurrentInstance(instance);
+    const reset = setCurrentInstance(instance);
     reactivity.pauseTracking();
     try {
       applyOptions(instance);
     } finally {
       reactivity.resetTracking();
-      unsetCurrentInstance();
+      reset();
     }
   }
   if (!Component.render && instance.render === shared.NOOP && !isSSR) {
@@ -7812,25 +7804,7 @@ function isClassComponent(value) {
   return shared.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 (shared.isFunction(getterOrOptions)) {
-      getterOrOptions = wrapComputedGetter(getterOrOptions);
-    } else {
-      getterOrOptions.get = wrapComputedGetter(getterOrOptions.get);
-    }
-  }
   return reactivity.computed(getterOrOptions, debugOptions, isInSSRComponentSetup);
 };
 
@@ -8060,7 +8034,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.4.6";
+const version = "3.4.7";
 const warn = warn$1 ;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = devtools$1 ;

package/dist/runtime-core.cjs.prod.js

@@ -1407,14 +1407,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) {
@@ -1461,11 +1456,10 @@ function traverse(value, depth, currentDepth = 0, seen) {
 }
 
 function withDirectives(vnode, directives) {
-  const internalInstance = currentRenderingInstance;
-  if (internalInstance === null) {
+  if (currentRenderingInstance === null) {
     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 = shared.EMPTY_OBJ] = directives[i];
@@ -2221,9 +2215,9 @@ function injectHook(type, hook, target = currentInstance, prepend = false) {
         return;
       }
       reactivity.pauseTracking();
-      setCurrentInstance(target);
+      const reset = setCurrentInstance(target);
       const res = callWithAsyncErrorHandling(hook, target, type, args);
-      unsetCurrentInstance();
+      reset();
       reactivity.resetTracking();
       return res;
     });
@@ -3281,12 +3275,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(
             null,
             props
           );
-          unsetCurrentInstance();
+          reset();
         }
       } else {
         value = defaultValue;
@@ -6015,9 +6009,7 @@ function createComponentInstance(vnode, parent, suspense) {
   return instance;
 }
 let currentInstance = null;
-const getCurrentInstance = () => {
-  return currentInstance || currentRenderingInstance;
-};
+const getCurrentInstance = () => currentInstance || currentRenderingInstance;
 let internalSetCurrentInstance;
 let setInSSRSetupState;
 {
@@ -6044,8 +6036,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();
@@ -6072,7 +6069,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);
     reactivity.pauseTracking();
     const setupResult = callWithErrorHandling(
       setup,
@@ -6084,7 +6081,7 @@ function setupStatefulComponent(instance, isSSR) {
       ]
     );
     reactivity.resetTracking();
-    unsetCurrentInstance();
+    reset();
     if (shared.isPromise(setupResult)) {
       setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
       if (isSSR) {
@@ -6153,13 +6150,13 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
     }
   }
   {
-    setCurrentInstance(instance);
+    const reset = setCurrentInstance(instance);
     reactivity.pauseTracking();
     try {
       applyOptions(instance);
     } finally {
       reactivity.resetTracking();
-      unsetCurrentInstance();
+      reset();
     }
   }
 }
@@ -6268,7 +6265,7 @@ function isMemoSame(cached, memo) {
   return true;
 }
 
-const version = "3.4.6";
+const version = "3.4.7";
 const warn$1 = shared.NOOP;
 const ErrorTypeStrings = ErrorTypeStrings$1 ;
 const devtools = void 0;

package/dist/runtime-core.d.ts

@@ -1395,7 +1395,7 @@ export declare function h(type: typeof Fragment, props?: RawProps | null, childr
 export declare function h(type: typeof Teleport, props: RawProps & TeleportProps, children: RawChildren | RawSlots): VNode;
 export declare function h(type: typeof Suspense, children?: RawChildren): VNode;
 export declare function h(type: typeof Suspense, props?: (RawProps & SuspenseProps) | null, children?: RawChildren | RawSlots): VNode;
-export declare function h<P, E extends EmitsOptions = {}, S extends Record<string, any> = {}>(type: FunctionalComponent<P, E, S>, props?: (RawProps & P) | ({} extends P ? null : never), children?: RawChildren | RawSlots): VNode;
+export declare function h<P, E extends EmitsOptions = {}, S extends Record<string, any> = any>(type: FunctionalComponent<P, any, S, any>, props?: (RawProps & P) | ({} extends P ? null : never), children?: RawChildren | IfAny<S, RawSlots, S>): VNode;
 export declare function h(type: Component, children?: RawChildren): VNode;
 export declare function h<P>(type: ConcreteComponent | string, children?: RawChildren): VNode;
 export declare function h<P>(type: ConcreteComponent<P> | string, props?: (RawProps & P) | ({} extends P ? null : never), children?: RawChildren): VNode;

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

@@ -1987,14 +1987,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) {
@@ -2046,12 +2041,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];
@@ -2839,9 +2833,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;
     });
@@ -4230,12 +4224,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(
             null,
             props
           );
-          unsetCurrentInstance();
+          reset();
         }
       } else {
         value = defaultValue;
@@ -7532,14 +7526,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;
 {
@@ -7566,8 +7553,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();
@@ -7629,7 +7621,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,
@@ -7641,7 +7633,7 @@ function setupStatefulComponent(instance, isSSR) {
       ]
     );
     resetTracking();
-    unsetCurrentInstance();
+    reset();
     if (isPromise(setupResult)) {
       setupResult.then(unsetCurrentInstance, unsetCurrentInstance);
       if (isSSR) {
@@ -7737,13 +7729,13 @@ function finishComponentSetup(instance, isSSR, skipOptions) {
     }
   }
   if (__VUE_OPTIONS_API__ && true) {
-    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) {
@@ -7884,25 +7876,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);
 };
 
@@ -8132,7 +8106,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/runtime-core",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "description": "@vue/runtime-core",
   "main": "index.js",
   "module": "dist/runtime-core.esm-bundler.js",
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-core#readme",
   "dependencies": {
-    "@vue/reactivity": "3.4.6",
-    "@vue/shared": "3.4.6"
+    "@vue/shared": "3.4.7",
+    "@vue/reactivity": "3.4.7"
   }
 }