diff --git a/packages/devtools/src/server-rpc/server-data.ts b/packages/devtools/src/server-rpc/server-data.ts index 57ecac6073..f5d9d24caa 100644 --- a/packages/devtools/src/server-rpc/server-data.ts +++ b/packages/devtools/src/server-rpc/server-data.ts @@ -1,7 +1,6 @@ import type { Nitro } from 'nitropack' import type { ResolvedConfig } from 'vite' import type { NuxtDevtoolsServerContext, ServerFunctions } from '../types' -import { addVitePlugin } from '@nuxt/kit' export function setupServerDataRPC({ nuxt, @@ -33,28 +32,11 @@ export function setupServerDataRPC({ nitro = _nitro }) - addVitePlugin({ - name: 'nuxt:devtools:config', - applyToEnvironment(environment) { - if (environment.name === 'ssr') { - return { - name: 'nuxt:devtools:config-retriever', - enforce: 'post', - configResolved(config) { - viteServer = normalizeViteConfig(config) - }, - } - } - if (environment.name === 'client') { - return { - name: 'nuxt:devtools:config-retriever', - enforce: 'post', - configResolved(config) { - viteClient = normalizeViteConfig(config) - }, - } - } - }, + nuxt.hook('vite:serverCreated', (server, { isClient, isServer }) => { + if (isClient) + viteClient = normalizeViteConfig({ ...server.config, ...server.environments.client.config, plugins: server.environments.client.plugins }) + if (isServer) + viteServer = normalizeViteConfig({ ...server.config, ...server.environments.ssr.config, plugins: server.environments.ssr.plugins }) }) return {