Fix runtime paths

Author: lxsmnsyc

packages/start/src/config/index.ts

@@ -1,7 +1,8 @@
 import { defu } from "defu";
 import { globSync } from "node:fs";
 import { extname, isAbsolute, join } from "node:path";
-import { type PluginOption } from "vite";
+import { fileURLToPath } from "node:url";
+import { normalizePath, type PluginOption } from "vite";
 import solid, { type Options as SolidOptions } from "vite-plugin-solid";
 import { serverFunctionsPlugin } from "../directives/index.ts";
 import { DEFAULT_EXTENSIONS, VIRTUAL_MODULES, VITE_ENVIRONMENTS } from "./constants.ts";
@@ -180,6 +181,14 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
     // server fn exports added in by this plugin
     serverFunctionsPlugin({
       manifest: VIRTUAL_MODULES.serverFnManifest,
+      runtime: {
+        server: normalizePath(
+          fileURLToPath(new URL("../server/server-fns-runtime.ts", import.meta.url)),
+        ),
+        client: normalizePath(
+          fileURLToPath(new URL("../server/server-runtime.ts", import.meta.url)),
+        ),
+      },
     }),
     {
       name: "solid-start:virtual-modules",

packages/start/src/directives/index.ts

@@ -1,9 +1,7 @@
-import { fileURLToPath } from "node:url";
 import {
   createFilter,
   type EnvironmentModuleGraph,
   type FilterPattern,
-  normalizePath,
   type Plugin,
   type ViteDevServer,
 } from "vite";
@@ -16,51 +14,17 @@ export interface ServerFunctionsFilter {
 
 export interface ServerFunctionsOptions {
   manifest: string;
+  runtime: {
+    server: string;
+    client: string;
+  };
   filter?: ServerFunctionsFilter;
 }
 
-const CLIENT_PATH = normalizePath(
-  fileURLToPath(new URL("../server/server-runtime.ts", import.meta.url)),
-);
-const SERVER_PATH = normalizePath(
-  fileURLToPath(new URL("../server/server-fns-runtime.ts", import.meta.url)),
-);
-
 const DEFAULT_INCLUDE = "src/**/*.{jsx,tsx,ts,js,mjs,cjs}";
 const DEFAULT_EXCLUDE = "node_modules/**/*.{jsx,tsx,ts,js,mjs,cjs}";
 const DIRECTIVE = "use server";
 
-const CLIENT_OPTIONS: Pick<CompileOptions, "directive" | "definitions"> = {
-  directive: DIRECTIVE,
-  definitions: {
-    register: {
-      kind: "named",
-      name: "createServerReference",
-      source: CLIENT_PATH,
-    },
-    clone: {
-      kind: "named",
-      name: "cloneServerReference",
-      source: CLIENT_PATH,
-    },
-  },
-};
-const SERVER_OPTIONS: Pick<CompileOptions, "directive" | "definitions"> = {
-  directive: DIRECTIVE,
-  definitions: {
-    register: {
-      kind: "named",
-      name: "createServerReference",
-      source: SERVER_PATH,
-    },
-    clone: {
-      kind: "named",
-      name: "cloneServerReference",
-      source: SERVER_PATH,
-    },
-  },
-};
-
 type Manifest = Record<CompileOptions["mode"], Set<string>>;
 
 function createManifest(): Manifest {
@@ -165,6 +129,37 @@ export function serverFunctionsPlugin(options: ServerFunctionsOptions): Plugin[]
   };
   let currentServer: ViteDevServer;
 
+  const clientOptions: Pick<CompileOptions, "directive" | "definitions"> = {
+    directive: DIRECTIVE,
+    definitions: {
+      register: {
+        kind: "named",
+        name: "createServerReference",
+        source: options.runtime.client,
+      },
+      clone: {
+        kind: "named",
+        name: "cloneServerReference",
+        source: options.runtime.client,
+      },
+    },
+  };
+  const serverOptions: Pick<CompileOptions, "directive" | "definitions"> = {
+    directive: DIRECTIVE,
+    definitions: {
+      register: {
+        kind: "named",
+        name: "createServerReference",
+        source: options.runtime.server,
+      },
+      clone: {
+        kind: "named",
+        name: "cloneServerReference",
+        source: options.runtime.server,
+      },
+    },
+  };
+
   return [
     {
       name: "solid-start:server-functions/setup",
@@ -208,7 +203,7 @@ export function serverFunctionsPlugin(options: ServerFunctionsOptions): Plugin[]
         }
 
         const result = await compile(id!, code, {
-          ...(mode === "server" ? SERVER_OPTIONS : CLIENT_OPTIONS),
+          ...(mode === "server" ? serverOptions : clientOptions),
           mode,
           env,
         });