Skip to content

Commit 788c921

Browse files
committed
refactor: use rpc exports for server functions
1 parent 94ff8e3 commit 788c921

4 files changed

Lines changed: 10 additions & 15 deletions

File tree

packages/start/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
".": "./src/index.ts",
1414
"./config": "./src/config/index.ts",
1515
"./server": "./src/server/index.tsx",
16+
"./server/rpc": "./src/server/rpc.ts",
1617
"./client": "./src/client/index.tsx",
18+
"./client/rpc": "./src/client/rpc.ts",
1719
"./router": "./src/router.tsx",
1820
"./server/spa": "./src/server/spa/index.tsx",
1921
"./client/spa": "./src/client/spa/index.tsx",
@@ -26,7 +28,9 @@
2628
".": "./dist/index.js",
2729
"./config": "./dist/config/index.js",
2830
"./server": "./dist/server/index.jsx",
31+
"./server/rpc": "./dist/server/rpc.js",
2932
"./client": "./dist/client/index.jsx",
33+
"./client/rpc": "./dist/client/rpc.js",
3034
"./router": "./dist/router.jsx",
3135
"./server/spa": "./dist/server/spa/index.jsx",
3236
"./client/spa": "./dist/client/spa/index.jsx",

packages/start/src/client/rpc.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { createServerReference } from "../server/server-runtime.ts";

packages/start/src/config/index.ts

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { TanStackServerFnPlugin } from "@tanstack/server-functions-plugin";
22
import { defu } from "defu";
33
import { globSync } from "node:fs";
4-
import { extname, isAbsolute, join, normalize } from "node:path";
5-
import { fileURLToPath } from "node:url";
4+
import { extname, isAbsolute, join } from "node:path";
65
import { type PluginOption } from "vite";
76
import solid, { type Options as SolidOptions } from "vite-plugin-solid";
87

@@ -184,33 +183,23 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
184183
envConsumer: "client",
185184
envName: VITE_ENVIRONMENTS.client,
186185
getRuntimeCode: () =>
187-
`import { createServerReference } from "${normalize(
188-
fileURLToPath(new URL("../server/server-runtime", import.meta.url)),
189-
)}"`,
186+
`import { createServerReference } from "@solidjs/start/client/rpc"`,
190187
replacer: (opts) =>
191188
`createServerReference(${() => {}}, '${opts.functionId}', '${opts.extractedFilename}')`,
192189
},
193190
{
194191
envConsumer: "server",
195192
envName: VITE_ENVIRONMENTS.server,
196193
getRuntimeCode: () =>
197-
`import { createServerReference } from '${normalize(
198-
fileURLToPath(
199-
new URL("../server/server-fns-runtime", import.meta.url),
200-
),
201-
)}'`,
194+
`import { createServerReference } from "@solidjs/start/server/rpc"`,
202195
replacer: (opts) =>
203196
`createServerReference(${opts.fn}, '${opts.functionId}', '${opts.extractedFilename}')`,
204197
}
205198
],
206199
provider: {
207200
envName: VITE_ENVIRONMENTS.server,
208201
getRuntimeCode: () =>
209-
`import { createServerReference } from '${normalize(
210-
fileURLToPath(
211-
new URL("../server/server-fns-runtime", import.meta.url),
212-
),
213-
)}'`,
202+
`import { createServerReference } from "@solidjs/start/server/rpc"`,
214203
replacer: (opts) =>
215204
`createServerReference(${opts.fn}, '${opts.functionId}', '${opts.extractedFilename}')`,
216205
},

packages/start/src/server/rpc.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { createServerReference } from "./server-fns-runtime.ts";

0 commit comments

Comments
 (0)