diff --git a/packages/react-server/src/entry/ssr.tsx b/packages/react-server/src/entry/ssr.tsx index 1f4dfaa38..f7370a25d 100644 --- a/packages/react-server/src/entry/ssr.tsx +++ b/packages/react-server/src/entry/ssr.tsx @@ -1,7 +1,7 @@ import { createDebug, tinyassert } from "@hiogawa/utils"; import { createMemoryHistory } from "@tanstack/history"; import ReactDOMServer from "react-dom/server.edge"; -import type { ModuleNode, ViteDevServer } from "vite"; +import type { DevEnvironment, EnvironmentModuleNode } from "vite"; import type { SsrAssetsType } from "../features/assets/plugin"; import { DEV_SSR_CSS, SERVER_CSS_PROXY } from "../features/assets/shared"; import { @@ -265,21 +265,24 @@ async function devInspectHandler(request: Request) { tinyassert(request.method === "POST"); const data = await request.json(); if (data.type === "module") { - let mod: ModuleNode | undefined; + let mod: EnvironmentModuleNode | undefined; if (data.environment === "ssr") { - mod = await getModuleNode($__global.dev.server, data.url, true); + mod = await getModuleNode( + $__global.dev.server.environments.ssr, + data.url, + ); } if (data.environment === "react-server") { - // mod = await getModuleNode($__global.dev.reactServer, data.url, true); + mod = await getModuleNode( + $__global.dev.server.environments["react-server"]!, + data.url, + ); } const result = mod && { id: mod.id, lastInvalidationTimestamp: mod.lastInvalidationTimestamp, importers: [...(mod.importers ?? [])].map((m) => m.id), - ssrImportedModules: [...(mod.ssrImportedModules ?? [])].map((m) => m.id), - clientImportedModules: [...(mod.clientImportedModules ?? [])].map( - (m) => m.id, - ), + importedModules: [...(mod.importedModules ?? [])].map((m) => m.id), }; return new Response(JSON.stringify(result || false, null, 2), { headers: { "content-type": "application/json" }, @@ -288,8 +291,8 @@ async function devInspectHandler(request: Request) { tinyassert(false); } -async function getModuleNode(server: ViteDevServer, url: string, ssr: boolean) { - const resolved = await server.moduleGraph.resolveUrl(url, ssr); +async function getModuleNode(server: DevEnvironment, url: string) { + const resolved = await server.moduleGraph.resolveUrl(url); return server.moduleGraph.getModuleById(resolved[1]); } diff --git a/packages/react-server/src/features/assets/css.ts b/packages/react-server/src/features/assets/css.ts index a2c61b230..01b768079 100644 --- a/packages/react-server/src/features/assets/css.ts +++ b/packages/react-server/src/features/assets/css.ts @@ -25,7 +25,6 @@ export async function collectStyleUrls( server: DevEnvironment, { entries }: { entries: string[] }, ) { - // const visited = new Set(); const visited = new Set(); async function traverse(url: string) { diff --git a/packages/react-server/src/global.ts b/packages/react-server/src/global.ts index e2df4e803..796d0d704 100644 --- a/packages/react-server/src/global.ts +++ b/packages/react-server/src/global.ts @@ -8,7 +8,6 @@ import type { CallServerCallback } from "./types/react"; export const $__global: { dev: { server: ViteDevServer; - // reactServer: ViteDevServer; reactServerRunner: ModuleRunner; manager: PluginStateManager; };