fix: stable integrations setup to have consistent plugins order (#542)

nuxt · Dec 13, 2023 · 310929b · 310929b
1 parent d9394b5
commit 310929b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/packages/devtools/src/integrations/plugin-metrics.ts b/packages/devtools/src/integrations/plugin-metrics.ts
@@ -1,6 +1,6 @@
 import type { NuxtDevtoolsServerContext } from '../types'
 
-export async function setup({ nuxt }: NuxtDevtoolsServerContext) {
+export function setup({ nuxt }: NuxtDevtoolsServerContext) {
   if (!nuxt.options.dev || nuxt.options.test)
     return
 

diff --git a/packages/devtools/src/integrations/timeline.ts b/packages/devtools/src/integrations/timeline.ts
@@ -4,7 +4,7 @@ import semver from 'semver'
 import type { NuxtDevtoolsServerContext } from '../types'
 import { runtimeDir } from '../dirs'
 
-export async function setup({ nuxt, options }: NuxtDevtoolsServerContext) {
+export function setup({ nuxt, options }: NuxtDevtoolsServerContext) {
   const helperPath = resolve(runtimeDir, 'function-metrics-helpers')
 
   const includeFrom = options.timeline?.functions?.includeFrom || [

diff --git a/packages/devtools/src/integrations/vite-inspect.ts b/packages/devtools/src/integrations/vite-inspect.ts
@@ -4,7 +4,7 @@ import Inspect from 'vite-plugin-inspect'
 import { addCustomTab } from '@nuxt/devtools-kit'
 import type { NuxtDevtoolsServerContext } from '../types'
 
-export async function setup({ nuxt, rpc }: NuxtDevtoolsServerContext) {
+export function setup({ nuxt, rpc }: NuxtDevtoolsServerContext) {
   const plugin = Inspect()
   addVitePlugin(plugin)
 

diff --git a/packages/devtools/src/integrations/vue-inspector.ts b/packages/devtools/src/integrations/vue-inspector.ts
@@ -3,7 +3,7 @@ import type { Plugin } from 'vite'
 import VueInspector from 'vite-plugin-vue-inspector'
 import type { NuxtDevtoolsServerContext } from '../types'
 
-export async function setup({ nuxt, options }: NuxtDevtoolsServerContext) {
+export function setup({ nuxt, options }: NuxtDevtoolsServerContext) {
   if (!nuxt.options.dev || nuxt.options.test)
     return
 

diff --git a/packages/devtools/src/module-main.ts b/packages/devtools/src/module-main.ts
@@ -19,15 +19,15 @@ import { readLocalOptions } from './utils/local-options'
 
 export async function enableModule(options: ModuleOptions, nuxt: Nuxt) {
   // Disable in test mode
-  if (process.env.TEST || process.env.NODE_ENV === 'test')
+  if (process.env.TEST || process.env.NODE_ENV === 'test' || nuxt.options.test)
     return
 
   if (nuxt.options.builder !== '@nuxt/vite-builder') {
     logger.warn('Nuxt DevTools only supports Vite mode, module is disabled.')
     return
   }
 
-  if (!nuxt.options.dev || nuxt.options.test) {
+  if (!nuxt.options.dev) {
     if (nuxt.options.build.analyze)
       await import('./integrations/analyze-build').then(({ setup }) => setup(nuxt, options))
     return
@@ -178,14 +178,15 @@ window.__NUXT_DEVTOOLS_TIME_METRIC__.appInit = Date.now()
     })
   })
 
+  await import('./integrations/plugin-metrics').then(({ setup }) => setup(ctx))
+
+  if (options.viteInspect !== false)
+    await import('./integrations/vite-inspect').then(({ setup }) => setup(ctx))
+
+  if (options.componentInspector !== false)
+    await import('./integrations/vue-inspector').then(({ setup }) => setup(ctx))
+
   const integrations = [
-    import('./integrations/plugin-metrics').then(({ setup }) => setup(ctx)),
-    options.viteInspect !== false
-      ? import('./integrations/vite-inspect').then(({ setup }) => setup(ctx))
-      : null,
-    options.componentInspector !== false
-      ? import('./integrations/vue-inspector').then(({ setup }) => setup(ctx))
-      : null,
     options.vscode?.enabled
       ? import('./integrations/vscode').then(({ setup }) => setup(ctx))
       : null,