@solidjs/start 2.0.0-alpha.0 → 2.0.0-alpha.2

package/dist/config/index.js

@@ -1,8 +1,9 @@
 import { TanStackServerFnPlugin } from "@tanstack/server-functions-plugin";
 import { defu } from "defu";
 import { globSync } from "node:fs";
-import { extname, isAbsolute, join, normalize } from "node:path";
+import { extname, isAbsolute, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
 import solid from "vite-plugin-solid";
 import { DEFAULT_EXTENSIONS, VIRTUAL_MODULES, VITE_ENVIRONMENTS } from "./constants.js";
 import { devServer } from "./dev-server.js";
@@ -19,10 +20,10 @@ export function solidStart(options) {
         ssr: true,
         devOverlay: true,
         experimental: {
-            islands: false
+            islands: false,
         },
         solid: {},
-        extensions: []
+        extensions: [],
     });
     const extensions = [...DEFAULT_EXTENSIONS, ...(start.extensions || [])];
     const routeDir = join(start.appRoot, start.routeDir);
@@ -34,7 +35,7 @@ export function solidStart(options) {
     const entryExtension = extname(appEntryPath);
     const handlers = {
         client: `${start.appRoot}/entry-client${entryExtension}`,
-        server: `${start.appRoot}/entry-server${entryExtension}`
+        server: `${start.appRoot}/entry-server${entryExtension}`,
     };
     return [
         {
@@ -42,13 +43,10 @@ export function solidStart(options) {
             enforce: "pre",
             configEnvironment(name) {
                 return {
-                    define: {
-                        "import.meta.env.SSR": JSON.stringify(name === VITE_ENVIRONMENTS.server)
-                    },
                     resolve: {
                         // remove when https://github.com/solidjs/vite-plugin-solid/pull/228 is released
-                        externalConditions: ["solid", "node"]
-                    }
+                        externalConditions: ["solid", "node"],
+                    },
                 };
             },
             async config(_, env) {
@@ -79,9 +77,9 @@ export function solidStart(options) {
                                 rollupOptions: {
                                     input: clientInput,
                                     treeshake: true,
-                                    preserveEntrySignatures: "exports-only"
-                                }
-                            }
+                                    preserveEntrySignatures: "exports-only",
+                                },
+                            },
                         },
                         [VITE_ENVIRONMENTS.server]: {
                             consumer: "server",
@@ -91,14 +89,14 @@ export function solidStart(options) {
                                 manifest: true,
                                 copyPublicDir: false,
                                 rollupOptions: {
-                                    input: "~/entry-server.tsx"
+                                    input: "~/entry-server.tsx",
                                 },
                                 outDir: "dist/server",
                                 commonjsOptions: {
-                                    include: [/node_modules/]
-                                }
-                            }
-                        }
+                                    include: [/node_modules/],
+                                },
+                            },
+                        },
                     },
                     resolve: {
                         alias: {
@@ -107,17 +105,19 @@ export function solidStart(options) {
                             ...(!start.ssr
                                 ? {
                                     "@solidjs/start/server": "@solidjs/start/server/spa",
-                                    "@solidjs/start/client": "@solidjs/start/client/spa"
+                                    "@solidjs/start/client": "@solidjs/start/client/spa",
                                 }
-                                : {})
-                        }
+                                : {}),
+                        },
                     },
                     define: {
                         "import.meta.env.MANIFEST": `globalThis.MANIFEST`,
                         "import.meta.env.START_SSR": JSON.stringify(start.ssr),
-                        "import.meta.env.START_APP_ENTRY": `"${appEntryPath}"`,
-                        "import.meta.env.START_CLIENT_ENTRY": `"${handlers.client}"`,
-                        "import.meta.env.START_DEV_OVERLAY": JSON.stringify(start.devOverlay)
+                        // Use JSON.stringify so backslashes on Windows are escaped and
+                        // esbuild receives a valid JS string literal for the define value
+                        "import.meta.env.START_APP_ENTRY": JSON.stringify(appEntryPath),
+                        "import.meta.env.START_CLIENT_ENTRY": JSON.stringify(handlers.client),
+                        "import.meta.env.START_DEV_OVERLAY": JSON.stringify(start.devOverlay),
                     },
                     builder: {
                         sharedPlugins: true,
@@ -132,24 +132,24 @@ export function solidStart(options) {
                                 await builder.build(client);
                             if (!server.isBuilt)
                                 await builder.build(server);
-                        }
-                    }
+                        },
+                    },
                 };
-            }
+            },
         },
         manifest(start),
         fsRoutes({
             routers: {
                 client: new SolidStartClientFileRouter({
                     dir: absolute(routeDir, root),
-                    extensions
+                    extensions,
                 }),
                 ssr: new SolidStartServerFileRouter({
                     dir: absolute(routeDir, root),
                     extensions,
-                    dataOnly: !start.ssr
-                })
-            }
+                    dataOnly: !start.ssr,
+                }),
+            },
         }),
         lazy(),
         // Must be placed after fsRoutes, as treeShake will remove the
@@ -163,21 +163,21 @@ export function solidStart(options) {
                 {
                     envConsumer: "client",
                     envName: VITE_ENVIRONMENTS.client,
-                    getRuntimeCode: () => `import { createServerReference } from "${normalize(fileURLToPath(new URL("../server/server-runtime", import.meta.url)))}"`,
-                    replacer: opts => `createServerReference('${opts.functionId}')`
+                    getRuntimeCode: () => `import { createServerReference } from "${normalizePath(fileURLToPath(new URL("../server/server-runtime", import.meta.url)))}"`,
+                    replacer: opts => `createServerReference('${opts.functionId}')`,
                 },
                 {
                     envConsumer: "server",
                     envName: VITE_ENVIRONMENTS.server,
-                    getRuntimeCode: () => `import { createServerReference } from '${normalize(fileURLToPath(new URL("../server/server-fns-runtime", import.meta.url)))}'`,
-                    replacer: opts => `createServerReference(${opts.fn}, '${opts.functionId}')`
-                }
+                    getRuntimeCode: () => `import { createServerReference } from '${normalizePath(fileURLToPath(new URL("../server/server-fns-runtime", import.meta.url)))}'`,
+                    replacer: opts => `createServerReference(${opts.fn}, '${opts.functionId}')`,
+                },
             ],
             provider: {
                 envName: VITE_ENVIRONMENTS.server,
-                getRuntimeCode: () => `import { createServerReference } from '${normalize(fileURLToPath(new URL("../server/server-fns-runtime", import.meta.url)))}'`,
-                replacer: opts => `createServerReference(${opts.fn}, '${opts.functionId}')`
-            }
+                getRuntimeCode: () => `import { createServerReference } from '${normalizePath(fileURLToPath(new URL("../server/server-fns-runtime", import.meta.url)))}'`,
+                replacer: opts => `createServerReference(${opts.fn}, '${opts.functionId}')`,
+            },
         }),
         {
             name: "solid-start:virtual-modules",
@@ -198,20 +198,20 @@ export function solidStart(options) {
                         id += `?${query.toString()}`;
                     return id;
                 }
-            }
+            },
         },
         {
             name: "solid-start:capture-client-bundle",
             enforce: "post",
             generateBundle(_options, bundle) {
                 globalThis.START_CLIENT_BUNDLE = bundle;
-            }
+            },
         },
         devServer(),
         solid({
             ...start.solid,
             ssr: true,
-            extensions: extensions.map(ext => `.${ext}`)
-        })
+            extensions: extensions.map(ext => `.${ext}`),
+        }),
     ];
 }

package/dist/config/lazy.js

@@ -8,10 +8,10 @@ const idTransform = (id) => {
         visitor: {
             Program(path) {
                 path.node.body.unshift(t.exportNamedDeclaration(t.variableDeclaration("const", [
-                    t.variableDeclarator(t.identifier("id$$"), t.stringLiteral(id))
+                    t.variableDeclarator(t.identifier("id$$"), t.stringLiteral(id)),
                 ])));
-            }
-        }
+            },
+        },
     };
 };
 const importTransform = () => {
@@ -26,22 +26,51 @@ const importTransform = () => {
                             return;
                         subPath.remove();
                         path.insertAfter(t.importDeclaration([t.importSpecifier(t.identifier("lazy"), t.identifier("lazy"))], t.stringLiteral("@solidjs/start/server")));
-                    }
+                    },
                 });
-            }
-        }
+            },
+        },
     };
 };
 const fileEndingRegex = /(ts|js)x(\?.*)?$/;
 const lazy = () => {
     const cwd = process.cwd().replaceAll(osSep, sep);
+    /**
+     * Maps module ids to their client-specific shared chunk names.
+     * Modules in shared chunks need to find their assets via the chunk name, instead of their module id.
+     *
+     * Vite includes assets of such modules in the manifest via the chunk name:
+     * https://github.com/vitejs/vite/blob/4be37a8389c67873880f826b01fe40137e1c29a7/packages/vite/src/node/plugins/manifest.ts#L179
+     * https://github.com/vitejs/vite/blob/4be37a8389c67873880f826b01fe40137e1c29a7/packages/vite/src/node/plugins/manifest.ts#L319
+     *
+     * Rollup occassionally creates shared chunks automatically,
+     * but they can also be manually created by the user via:
+     * https://rollupjs.org/configuration-options/#output-manualchunks
+     *
+     * More infos on Rollup's logic:
+     * https://github.com/rollup/rollup/issues/3772#issuecomment-689955168
+     */
+    const sharedChunkNames = {};
     return {
         name: "solid-lazy-css",
         enforce: "pre",
-        applyToEnvironment(env) {
-            return env.name === VITE_ENVIRONMENTS.server;
+        generateBundle(_, bundle) {
+            if (this.environment.name !== VITE_ENVIRONMENTS.client)
+                return;
+            for (const chunk of Object.values(bundle)) {
+                if (chunk.type !== "chunk" || !chunk.isDynamicEntry || chunk.facadeModuleId)
+                    continue;
+                // Has to follow Vites implementation:
+                // https://github.com/vitejs/vite/blob/4be37a8389c67873880f826b01fe40137e1c29a7/packages/vite/src/node/plugins/manifest.ts#L179
+                const chunkName = `_${basename(chunk.fileName)}`;
+                for (const id of chunk.moduleIds) {
+                    sharedChunkNames[id] = chunkName;
+                }
+            }
         },
         async transform(src, id) {
+            if (this.environment.name !== VITE_ENVIRONMENTS.server)
+                return;
             if (!id.match(fileEndingRegex))
                 return;
             // The transformed files either import "lazy" or css files
@@ -52,7 +81,8 @@ const lazy = () => {
             const hasDefaultExport = src.indexOf("export default") !== -1;
             if (hasDefaultExport) {
                 const localId = relative(cwd, id);
-                plugins.push(idTransform(localId));
+                const chunkName = sharedChunkNames[id];
+                plugins.push(idTransform(chunkName ?? localId));
             }
             const hasLazy = src.indexOf("lazy(") !== -1;
             if (hasLazy)
@@ -63,20 +93,20 @@ const lazy = () => {
             const transformed = await babel.transformAsync(src, {
                 plugins,
                 parserOpts: {
-                    plugins: ["jsx", "typescript"]
+                    plugins: ["jsx", "typescript"],
                 },
                 filename: basename(id),
                 ast: false,
                 sourceMaps: true,
                 configFile: false,
                 babelrc: false,
-                sourceFileName: id
+                sourceFileName: id,
             });
             if (!transformed?.code)
                 return;
             const { code, map } = transformed;
             return { code, map };
-        }
+        },
     };
 };
 export default lazy;

package/dist/config/manifest.js

@@ -1,5 +1,6 @@
 import { findStylesInModuleGraph } from "../server/collect-styles.js";
 import { VIRTUAL_MODULES } from "./constants.js";
+import { wrapId } from "./vite-utils.js";
 export function manifest(start) {
     let devServer = undefined;
     return {
@@ -61,14 +62,14 @@ export function manifest(start) {
 						tag: "style",
 						attrs: {
 							type: "text/css",
-							"data-vite-dev-id": "${key}",
+							"data-vite-dev-id": "${wrapId(key)}",
 							"data-vite-ref": "0",
 						},
-						children: () => import("${value}?inline").then(mod => mod.default),
+						children: () => import("${wrapId(value)}?inline").then(mod => mod.default),
 					}`);
                     return `export default [${cssAssets.join(",")}]`;
                 }
             }
-        }
+        },
     };
 }

package/dist/config/vite-utils.d.ts

@@ -4,6 +4,11 @@ export declare const FS_PREFIX = "/@fs/";
 export declare const VALID_ID_PREFIX = "/@id/";
 export declare const NULL_BYTE_PLACEHOLDER = "__x00__";
 export declare function normalizeResolvedIdToUrl(environment: DevEnvironment, url: string, resolved: Rollup.PartialResolvedId): string;
+/**
+ * Inspired by:
+ * https://github.com/withastro/astro/blob/fddde5fad81007795eb263c7fd0cea096b8e2cba/packages/astro/src/core/util.ts#L115
+ * https://github.com/vitejs/vite/blob/130e7181a55c524383c63bbfb1749d0ff7185cad/packages/vite/src/shared/utils.ts#L11
+ */
 export declare function wrapId(id: string): string;
 export declare function unwrapId(id: string): string;
 export declare function normalizeViteImportAnalysisUrl(environment: DevEnvironment, id: string): string;

package/dist/config/vite-utils.js

@@ -7,6 +7,7 @@ export function cleanUrl(url) {
 export const FS_PREFIX = `/@fs/`;
 export const VALID_ID_PREFIX = `/@id/`;
 export const NULL_BYTE_PLACEHOLDER = `__x00__`;
+const NULL_BYTE_REGEX = /^\0/;
 export function normalizeResolvedIdToUrl(environment, url, resolved) {
     const root = environment.config.root;
     const depsOptimizer = environment.depsOptimizer;
@@ -38,10 +39,13 @@ export function normalizeResolvedIdToUrl(environment, url, resolved) {
     }
     return url;
 }
+/**
+ * Inspired by:
+ * https://github.com/withastro/astro/blob/fddde5fad81007795eb263c7fd0cea096b8e2cba/packages/astro/src/core/util.ts#L115
+ * https://github.com/vitejs/vite/blob/130e7181a55c524383c63bbfb1749d0ff7185cad/packages/vite/src/shared/utils.ts#L11
+ */
 export function wrapId(id) {
-    return id.startsWith(VALID_ID_PREFIX)
-        ? id
-        : VALID_ID_PREFIX + id.replace("\0", NULL_BYTE_PLACEHOLDER);
+    return id.replace(NULL_BYTE_REGEX, `${VALID_ID_PREFIX}${NULL_BYTE_PLACEHOLDER}`);
 }
 export function unwrapId(id) {
     return id.startsWith(VALID_ID_PREFIX)

package/dist/http/index.d.ts

@@ -9,10 +9,7 @@ export declare function isEvent(obj: any): obj is h3.H3Event | {
 };
 type Tail<T> = T extends [any, ...infer U] ? U : never;
 type PrependOverload<TOriginal extends (...args: Array<any>) => any, TOverload extends (...args: Array<any>) => any> = TOverload & TOriginal;
-type WrapFunction<TFn extends (...args: Array<any>) => any> = PrependOverload<TFn, (...args: Parameters<TFn> extends [
-    h3.HTTPEvent<any> | h3.H3Event<any>,
-    ...infer TArgs
-] ? TArgs : Parameters<TFn>) => ReturnType<TFn>>;
+type WrapFunction<TFn extends (...args: Array<any>) => any> = PrependOverload<TFn, (...args: Parameters<TFn> extends [h3.HTTPEvent<any> | h3.H3Event<any>, ...infer TArgs] ? TArgs : Parameters<TFn>) => ReturnType<TFn>>;
 type WrappedReadBody = <T, TEventInput = InferEventInput<"body", H3Event, T>>(...args: Tail<Parameters<typeof h3.readBody<T, H3Event, TEventInput>>>) => ReturnType<typeof h3.readBody<T, h3.H3Event, TEventInput>>;
 export declare const readBody: PrependOverload<typeof h3.readBody, WrappedReadBody>;
 type WrappedGetQuery = <T, TEventInput = Exclude<InferEventInput<"query", H3Event, T>, undefined>>(...args: Tail<Parameters<typeof h3.getQuery<T, H3Event, TEventInput>>>) => ReturnType<typeof h3.getQuery<T, H3Event, TEventInput>>;

package/dist/http/index.js

@@ -28,9 +28,7 @@ function createWrapperFunction(h3Function) {
         }
         else {
             args[0] =
-                event instanceof h3.H3Event || event.__is_event__
-                    ? event
-                    : event[HTTPEventSymbol];
+                event instanceof h3.H3Event || event.__is_event__ ? event : event[HTTPEventSymbol];
         }
         return h3Function(...args);
     });
@@ -69,7 +67,7 @@ export const setResponseHeaders = (values) => {
 };
 export const setResponseHeader = (name, value) => {
     const headers = getEvent().res.headers;
-    (Array.isArray(value) ? value : [value]).forEach((value) => {
+    (Array.isArray(value) ? value : [value]).forEach(value => {
         headers.set(name, value);
     });
 };
@@ -81,7 +79,7 @@ export const appendResponseHeaders = (values) => {
 };
 export const appendResponseHeader = (name, value) => {
     const headers = getEvent().res.headers;
-    (Array.isArray(value) ? value : [value]).forEach((value) => {
+    (Array.isArray(value) ? value : [value]).forEach(value => {
         headers.append(name, value);
     });
 };

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export type { APIEvent, APIHandler, Asset, ContextMatches, DocumentComponentProps, FetchEvent, HandlerOptions, PageEvent, ResponseStub, ServerFunctionMeta } from "./server/types.ts";
 export { default as clientOnly } from "./shared/clientOnly.ts";
 export { GET } from "./shared/GET.ts";
 export { HttpHeader } from "./shared/HttpHeader.tsx";

package/dist/middleware/index.d.ts

@@ -9,10 +9,13 @@ type ResponseMiddlewareResponseParam = {
     body?: Awaited<EventHandlerResponse>;
 };
 export type ResponseMiddleware = (event: FetchEvent, response: ResponseMiddlewareResponseParam) => Response | Promise<Response> | void | Promise<void>;
+/**
+ * Creates middleware for handling requests and responses.
+ *
+ * @see https://docs.solidjs.com/solid-start/reference/server/create-middleware
+ */
 export declare function createMiddleware(args: {
-    /** @deprecated Use H3 `Middleware` */
     onRequest?: RequestMiddleware | RequestMiddleware[] | undefined;
-    /** @deprecated Use H3 `Middleware` */
     onBeforeResponse?: ResponseMiddleware | ResponseMiddleware[] | undefined;
 } | Middleware[]): Middleware[];
 export {};

package/dist/middleware/index.js

@@ -13,12 +13,17 @@ function wrapResponseMiddleware(onBeforeResponse) {
         const resp = await next();
         const fetchEvent = getFetchEvent(h3Event);
         const mwResponse = await onBeforeResponse(fetchEvent, {
-            body: resp?.body,
+            body: resp,
         });
         if (mwResponse)
             return mwResponse;
     };
 }
+/**
+ * Creates middleware for handling requests and responses.
+ *
+ * @see https://docs.solidjs.com/solid-start/reference/server/create-middleware
+ */
 export function createMiddleware(args) {
     if (Array.isArray(args))
         return args;

package/dist/router.jsx

@@ -10,10 +10,10 @@ export function createRoutes() {
             ...(route.$$route ? route.$$route.require().route : undefined),
             info: {
                 ...(route.$$route ? route.$$route.require().route.info : {}),
-                filesystem: true
+                filesystem: true,
             },
             component,
-            children: route.children ? route.children.map(createRoute) : undefined
+            children: route.children ? route.children.map(createRoute) : undefined,
         };
     }
     const routes = routeConfigs.map(createRoute);

package/dist/server/StartServer.jsx

@@ -2,6 +2,7 @@ import { Hydration, HydrationScript, NoHydration, getRequestEvent, ssr } from "s
 import App from "solid-start:app";
 import { ErrorBoundary, TopErrorBoundary } from "../shared/ErrorBoundary.jsx";
 import { useAssets } from "./assets/index.js";
+import PatchVirtualDevStyles from "./assets/PatchVirtualDevStyles.jsx";
 import { getSsrManifest } from "./manifest/ssr-manifest.js";
 const docType = ssr("<!DOCTYPE html>");
 /**
@@ -17,6 +18,7 @@ export function StartServer(props) {
       {docType}
       <TopErrorBoundary>
         <props.document assets={<HydrationScript />} scripts={<>
+              <PatchVirtualDevStyles nonce={nonce}/>
               <script type="module" nonce={nonce} async src={getSsrManifest("client").path(import.meta.env.START_CLIENT_ENTRY)}/>
             </>}>
           {!import.meta.env.START_ISLANDS ? (<Hydration>

package/dist/server/assets/PatchVirtualDevStyles.d.ts

@@ -0,0 +1,4 @@
+declare const PatchVirtualDevStyles: (props: {
+    nonce?: string;
+}) => import("solid-js").JSX.Element;
+export default PatchVirtualDevStyles;

package/dist/server/assets/PatchVirtualDevStyles.jsx

@@ -0,0 +1,28 @@
+/**
+ * Patches the data-vite-dev-id attribute for style tags of virtual modules
+ *
+ * Per Vite's convention, virtual module ids are prefixed with \0 (null byte):
+ * https://vite.dev/guide/api-plugin#virtual-modules-convention
+ *
+ * However this null byte cannot be server rendered properly.
+ * Vite client runtime then fails to find style's with wrong null bytes,
+ * and instead inserts duplicate style's.
+ *
+ * This patch replaces the serializable /@id/__x00__ with the proper null byte,
+ * and has to run before Vite's client runtime:
+ * https://github.com/vitejs/vite/blob/130e7181a55c524383c63bbfb1749d0ff7185cad/packages/vite/src/client/client.ts#L529
+ *
+ * TODO: This should be solved in Vite directly!
+ */
+const patch = function () {
+    document.querySelectorAll("style[data-vite-dev-id]").forEach(function (el) {
+        el.setAttribute("data-vite-dev-id", el.dataset.viteDevId.replace("/@id/__x00__", "\0"));
+    });
+};
+const serializedPatch = `(${patch.toString()})();`;
+const PatchVirtualDevStyles = (props) => {
+    if (!import.meta.env.PROD) {
+        return <script nonce={props.nonce} innerHTML={serializedPatch}/>;
+    }
+};
+export default PatchVirtualDevStyles;

package/dist/server/assets/index.js

@@ -13,7 +13,7 @@ const getEntity = (registry, asset) => {
     }
     const entity = (registry[key] ??= {
         key,
-        consumers: 0
+        consumers: 0,
     });
     return entity;
 };

package/dist/server/assets/render.jsx

@@ -6,9 +6,9 @@ const assetMap = {
         {" "}
       </script>) : null;
     },
-    noscript: (props) => (<noscript {...props.attrs}>{props.children}</noscript>)
+    noscript: (props) => (<noscript {...props.attrs}>{props.children}</noscript>),
 };
 export function renderAsset(asset, nonce) {
-    let { tag, attrs: { key, ...attrs } = { key: undefined }, children } = asset;
+    let { tag, attrs: { key, ...attrs } = { key: undefined }, children, } = asset;
     return assetMap[tag]({ attrs: { ...attrs, nonce }, key, children });
 }

package/dist/server/collect-styles.js

@@ -1,28 +1,16 @@
 import path from "node:path";
-import { resolve } from "pathe";
-async function getViteModuleNode(vite, file) {
-    let nodePath = file;
-    let node = vite.moduleGraph.getModuleById(file);
-    if (!node) {
-        const resolvedId = await vite.pluginContainer.resolveId(file, undefined);
-        if (!resolvedId)
+async function getViteModuleNode(vite, file, importer) {
+    try {
+        const res = await vite.fetchModule(file, importer);
+        if (!("id" in res))
             return;
-        nodePath = resolvedId.id;
-        node = vite.moduleGraph.getModuleById(file);
-    }
-    if (!node) {
-        nodePath = resolve(nodePath);
-        node = await vite.moduleGraph.getModuleByUrl(file);
-    }
-    if (!node) {
-        await vite.moduleGraph.ensureEntryFromUrl(nodePath, false);
-        node = vite.moduleGraph.getModuleById(nodePath);
+        return vite.moduleGraph.getModuleById(res.id);
     }
-    return node;
+    catch (err) { }
 }
-async function findModuleDependencies(vite, file, deps, crawledFiles = new Set()) {
+async function findModuleDependencies(vite, file, deps, crawledFiles = new Set(), importer) {
     crawledFiles.add(file);
-    const module = await getViteModuleNode(vite, file);
+    const module = await getViteModuleNode(vite, file, importer);
     if (!module?.id || deps.has(module))
         return;
     deps.add(module);
@@ -40,7 +28,7 @@ async function findModuleDependencies(vite, file, deps, crawledFiles = new Set()
         if (crawledFiles.has(dep)) {
             continue;
         }
-        await findModuleDependencies(vite, dep, deps, crawledFiles);
+        await findModuleDependencies(vite, dep, deps, crawledFiles, module.id);
     }
 }
 // Vite doesn't expose these so we just copy the list for now

package/dist/server/fetchEvent.spec.js

@@ -1,6 +1,6 @@
 import * as h3 from "h3";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { createFetchEvent, getFetchEvent, mergeResponseHeaders, } from "./fetchEvent.js";
+import { createFetchEvent, getFetchEvent, mergeResponseHeaders } from "./fetchEvent.js";
 vi.mock(import("h3"), async (mod) => {
     return {
         ...(await mod()),