Skip to content

Commit 310929b

Browse files
authored
fix: stable integrations setup to have consistent plugins order (#542)
1 parent d9394b5 commit 310929b

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

packages/devtools/src/integrations/plugin-metrics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { NuxtDevtoolsServerContext } from '../types'
22

3-
export async function setup({ nuxt }: NuxtDevtoolsServerContext) {
3+
export function setup({ nuxt }: NuxtDevtoolsServerContext) {
44
if (!nuxt.options.dev || nuxt.options.test)
55
return
66

packages/devtools/src/integrations/timeline.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import semver from 'semver'
44
import type { NuxtDevtoolsServerContext } from '../types'
55
import { runtimeDir } from '../dirs'
66

7-
export async function setup({ nuxt, options }: NuxtDevtoolsServerContext) {
7+
export function setup({ nuxt, options }: NuxtDevtoolsServerContext) {
88
const helperPath = resolve(runtimeDir, 'function-metrics-helpers')
99

1010
const includeFrom = options.timeline?.functions?.includeFrom || [

packages/devtools/src/integrations/vite-inspect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Inspect from 'vite-plugin-inspect'
44
import { addCustomTab } from '@nuxt/devtools-kit'
55
import type { NuxtDevtoolsServerContext } from '../types'
66

7-
export async function setup({ nuxt, rpc }: NuxtDevtoolsServerContext) {
7+
export function setup({ nuxt, rpc }: NuxtDevtoolsServerContext) {
88
const plugin = Inspect()
99
addVitePlugin(plugin)
1010

packages/devtools/src/integrations/vue-inspector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { Plugin } from 'vite'
33
import VueInspector from 'vite-plugin-vue-inspector'
44
import type { NuxtDevtoolsServerContext } from '../types'
55

6-
export async function setup({ nuxt, options }: NuxtDevtoolsServerContext) {
6+
export function setup({ nuxt, options }: NuxtDevtoolsServerContext) {
77
if (!nuxt.options.dev || nuxt.options.test)
88
return
99

packages/devtools/src/module-main.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ import { readLocalOptions } from './utils/local-options'
1919

2020
export async function enableModule(options: ModuleOptions, nuxt: Nuxt) {
2121
// Disable in test mode
22-
if (process.env.TEST || process.env.NODE_ENV === 'test')
22+
if (process.env.TEST || process.env.NODE_ENV === 'test' || nuxt.options.test)
2323
return
2424

2525
if (nuxt.options.builder !== '@nuxt/vite-builder') {
2626
logger.warn('Nuxt DevTools only supports Vite mode, module is disabled.')
2727
return
2828
}
2929

30-
if (!nuxt.options.dev || nuxt.options.test) {
30+
if (!nuxt.options.dev) {
3131
if (nuxt.options.build.analyze)
3232
await import('./integrations/analyze-build').then(({ setup }) => setup(nuxt, options))
3333
return
@@ -178,14 +178,15 @@ window.__NUXT_DEVTOOLS_TIME_METRIC__.appInit = Date.now()
178178
})
179179
})
180180

181+
await import('./integrations/plugin-metrics').then(({ setup }) => setup(ctx))
182+
183+
if (options.viteInspect !== false)
184+
await import('./integrations/vite-inspect').then(({ setup }) => setup(ctx))
185+
186+
if (options.componentInspector !== false)
187+
await import('./integrations/vue-inspector').then(({ setup }) => setup(ctx))
188+
181189
const integrations = [
182-
import('./integrations/plugin-metrics').then(({ setup }) => setup(ctx)),
183-
options.viteInspect !== false
184-
? import('./integrations/vite-inspect').then(({ setup }) => setup(ctx))
185-
: null,
186-
options.componentInspector !== false
187-
? import('./integrations/vue-inspector').then(({ setup }) => setup(ctx))
188-
: null,
189190
options.vscode?.enabled
190191
? import('./integrations/vscode').then(({ setup }) => setup(ctx))
191192
: null,

0 commit comments

Comments
 (0)