From: Wick <wick.linxunjie@gmail.com>
Date: Tue, 8 Jul 2025 06:30:43 +0000 (+0800)
Subject: refactor: migrate to getCurrentInstance API (#12958)
X-Git-Tag: v3.5.18~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0bd1f518e03818da6bbe7e6c47c4567722290e9;p=thirdparty%2Fvuejs%2Fcore.git

refactor: migrate to getCurrentInstance API (#12958)
---

diff --git a/packages/runtime-core/src/apiInject.ts b/packages/runtime-core/src/apiInject.ts
index 711c5d84de..d5c97a52b8 100644
--- a/packages/runtime-core/src/apiInject.ts
+++ b/packages/runtime-core/src/apiInject.ts
@@ -1,6 +1,5 @@
 import { isFunction } from '@vue/shared'
-import { currentInstance } from './component'
-import { currentRenderingInstance } from './componentRenderContext'
+import { currentInstance, getCurrentInstance } from './component'
 import { currentApp } from './apiCreateApp'
 import { warn } from './warning'
 
@@ -51,7 +50,7 @@ export function inject(
 ) {
   // fallback to `currentRenderingInstance` so that this can be called in
   // a functional component
-  const instance = currentInstance || currentRenderingInstance
+  const instance = getCurrentInstance()
 
   // also support looking up from app-level provides w/ `app.runWithContext()`
   if (instance || currentApp) {
@@ -90,5 +89,5 @@ export function inject(
  * user. One example is `useRoute()` in `vue-router`.
  */
 export function hasInjectionContext(): boolean {
-  return !!(currentInstance || currentRenderingInstance || currentApp)
+  return !!(getCurrentInstance() || currentApp)
 }