@nifrajs/web 2.14.1 → 3.2.0

package/src/vite.ts

@@ -16,11 +16,12 @@ import {
   type IncomingMessage,
   type ServerResponse,
 } from "node:http"
-import { relative, resolve as resolvePath } from "node:path"
+import { isAbsolute, join, relative, resolve as resolvePath, sep } from "node:path"
 import { createDevDiagnostics } from "./dev-diagnostics.ts"
 import { listenOrExplain } from "./dev-port.ts"
 import { discoverRoutes } from "./fs.ts"
 import { DEFAULT_DEV_PORT, generateClientEntry, setSsrModuleLoader } from "./index.ts"
+import { viteDedupePackages } from "./internal/identity-policy.ts"
 import {
   assertIdentityParity,
   collectIdentityParity,
@@ -30,7 +31,13 @@ import {
 import { vitePublicEnvPrefix } from "./internal/server-boundary.ts"
 import { importVite } from "./internal/vite-import.ts"
 import { scopedName } from "./plugins/css-modules.ts"
-import { DEV_ROOT_ENV, DEV_ROUTES_ENV, reproduciblePath } from "./plugins/kit.ts"
+import {
+  DEV_ROOT_ENV,
+  DEV_ROUTES_ENV,
+  normalizeFilePath,
+  portablePath,
+  reproduciblePath,
+} from "./plugins/kit.ts"
 import { viteServerFnStub } from "./plugins/vite-server-fn.ts"
 import { viteServerOnlyEmpty } from "./plugins/vite-server-only.ts"
 
@@ -138,6 +145,19 @@ export { LAST_ERROR_PATH } from "./diagnostic.ts"
 // The codegen'd client entry is written here (at the Vite root) so Vite serves + HMRs it.
 const DEV_ENTRY = ".nifra-vite-entry.tsx"
 
+/** Candidate spellings for Vite's module-graph map. Vite has used native and slash-normalized
+ * absolute Windows paths across versions, while watcher events can additionally arrive as a file URL. */
+const modulePathCandidates = (path: string): string[] => {
+  const native = normalizeFilePath(path)
+  const portable = portablePath(path)
+  return [...new Set([path, native, portable])]
+}
+
+const pathInside = (root: string, path: string): boolean => {
+  const rel = relative(resolvePath(root), resolvePath(normalizeFilePath(path)))
+  return rel === "" || (rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel))
+}
+
 const readNodeBody = async (req: IncomingMessage): Promise<Buffer | undefined> => {
   if (req.method === "GET" || req.method === "HEAD") return undefined
   const chunks: Buffer[] = []
@@ -343,7 +363,8 @@ export async function createViteDevServer(options: ViteDevServerOptions): Promis
   process.env[DEV_ROUTES_ENV] = routesDir
 
   // Codegen the client entry with Vite-servable, root-relative specifiers (e.g. `/routes/index.tsx`).
-  const toUrl = (file: string): string => `/${relative(root, `${routesDir}/${file}`)}`
+  const toUrl = (file: string): string =>
+    `/${relative(root, join(routesDir, file)).replaceAll("\\", "/")}`
   const writeClientEntry = (): void => {
     const manifest = discoverRoutes(routesDir)
     writeFileSync(
@@ -467,12 +488,13 @@ export async function createViteDevServer(options: ViteDevServerOptions): Promis
     plugins: [viteServerFnStub(), viteServerOnlyEmpty(), ...plugins],
     resolve: {
       conditions: resolveConditions,
-      // Dedupe React to ONE copy. In a multi-root workspace a shared package can pull react/react-dom
-      // from a SIBLING app's node_modules, so the dev server loads two React cores → a second hook
-      // dispatcher → `resolveDispatcher().useState` null on any hook-using route (the error points at the
-      // component, not the resolution - brutal to diagnose). Mirrors the build-time reactDedupePlugin so
-      // dev matches prod. No-op for non-React apps (the package simply isn't present to dedupe).
-      dedupe: ["react", "react-dom"],
+      // Dedupe each framework runtime to ONE copy. In a multi-root workspace a shared package can pull
+      // react/react-dom (or preact, or svelte) from a SIBLING app's node_modules, so the dev server
+      // loads two cores → a second hook dispatcher/options global → `resolveDispatcher().useState` null
+      // on any hook-using route (the error points at the component, not the resolution - brutal to
+      // diagnose). Same policy table the production builds read, so dev matches prod. No-op per
+      // framework the app does not use (the package simply isn't present to dedupe).
+      dedupe: [...viteDedupePackages()],
     },
     ssr: {
       // Explicit listing forces external even for workspace-LINKED packages (Vite's default keeps
@@ -521,10 +543,13 @@ export async function createViteDevServer(options: ViteDevServerOptions): Promis
   const invalidateImporterClosure = (path: string): void => {
     const graph = vite.moduleGraph
     if (graph === undefined) return
-    const roots = graph.getModulesByFile(path)
-    if (roots === undefined) return
     const seen = new Set<ViteModuleNode>()
-    const stack = [...roots]
+    const stack: ViteModuleNode[] = []
+    for (const candidate of modulePathCandidates(path)) {
+      const roots = graph.getModulesByFile(candidate)
+      if (roots !== undefined) stack.push(...roots)
+    }
+    if (stack.length === 0) return
     for (let mod = stack.pop(); mod !== undefined; mod = stack.pop()) {
       if (seen.has(mod)) continue
       seen.add(mod)
@@ -547,11 +572,12 @@ export async function createViteDevServer(options: ViteDevServerOptions): Promis
       })
       .catch((err) => console.error("[nifra/web/vite] app re-create failed:", err))
   }
-  vite.watcher.on("change", refreshApp)
+  vite.watcher.on("change", (path) => refreshApp(normalizeFilePath(path)))
   for (const event of ["add", "unlink"] as const) {
     vite.watcher.on(event, (path) => {
-      if (path.startsWith(`${routesDir}/`) || path.startsWith(`${routesDir}\\`)) writeClientEntry()
-      refreshApp(path)
+      const filePath = normalizeFilePath(path)
+      if (pathInside(routesDir, filePath)) writeClientEntry()
+      refreshApp(filePath)
     })
   }