Skip to content

Commit d0ea745

Browse files
committed
fix: init devtools after feature flag checks
1 parent d9f91e2 commit d0ea745

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

packages/runtime-core/src/renderer.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ import {
3636
NOOP,
3737
hasOwn,
3838
invokeArrayFns,
39-
isArray
39+
isArray,
40+
getGlobalThis
4041
} from '@vue/shared'
4142
import {
4243
queueJob,
@@ -75,7 +76,8 @@ import { ComponentPublicInstance } from './componentPublicInstance'
7576
import {
7677
devtoolsComponentAdded,
7778
devtoolsComponentRemoved,
78-
devtoolsComponentUpdated
79+
devtoolsComponentUpdated,
80+
setDevtoolsHook
7981
} from './devtools'
8082
import { initFeatureFlags } from './featureFlags'
8183
import { isAsyncWrapper } from './apiAsyncComponent'
@@ -430,6 +432,12 @@ function baseCreateRenderer(
430432
initFeatureFlags()
431433
}
432434

435+
if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
436+
const target = getGlobalThis()
437+
target.__VUE__ = true
438+
setDevtoolsHook(target.__VUE_DEVTOOLS_GLOBAL_HOOK__)
439+
}
440+
433441
const {
434442
insert: hostInsert,
435443
remove: hostRemove,

packages/vue/src/dev.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
import { setDevtoolsHook, initCustomFormatter } from '@vue/runtime-dom'
2-
import { getGlobalThis } from '@vue/shared'
1+
import { initCustomFormatter } from '@vue/runtime-dom'
32

43
export function initDev() {
5-
const target = getGlobalThis()
6-
7-
target.__VUE__ = true
8-
setDevtoolsHook(target.__VUE_DEVTOOLS_GLOBAL_HOOK__)
9-
104
if (__BROWSER__) {
115
if (!__ESM_BUNDLER__) {
126
console.info(

packages/vue/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as runtimeDom from '@vue/runtime-dom'
77
import { isString, NOOP, generateCodeFrame, extend } from '@vue/shared'
88
import { InternalRenderFunction } from 'packages/runtime-core/src/component'
99

10-
if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
10+
if (__DEV__) {
1111
initDev()
1212
}
1313

packages/vue/src/runtime.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { initDev } from './dev'
44
import { warn } from '@vue/runtime-dom'
55

6-
if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
6+
if (__DEV__) {
77
initDev()
88
}
99

0 commit comments

Comments
 (0)