Skip to content

Commit e50f59e

Browse files
specify dev importer in start-plugin-core
1 parent 1cde331 commit e50f59e

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

packages/start-plugin-core/src/plugin.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,15 @@ export function TanStackStartVitePluginCore(
155155
`createServerRpc('${d.functionId}', '${startConfig.serverFns.base}', ${d.fn})`,
156156
envName: VITE_ENVIRONMENT_NAMES.server,
157157
},
158+
importer: (fn) => {
159+
const serverEnv = (globalThis as any).viteDevServer.environments[
160+
VITE_ENVIRONMENT_NAMES.server
161+
]
162+
if (!serverEnv) {
163+
throw new Error(`'ssr' vite dev environment not found`)
164+
}
165+
return serverEnv.runner.import(fn.extractedFilename)
166+
},
158167
}),
159168
startManifestPlugin(startConfig),
160169
nitroPlugin(startConfig, () => ssrBundle),

packages/start-server-core/src/server-functions-handler.ts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ import { startSerializer } from '@tanstack/start-client-core'
55
import _serverFnManifest from 'tanstack:server-fn-manifest'
66
import { getEvent, getResponseStatus } from './h3'
77

8-
// NOTE: This is a dummy export to silence warnings about
9-
// only having a default export.
10-
export const dummy = 2
11-
128
const serverFnManifest = _serverFnManifest as Record<
139
string,
1410
{
@@ -66,15 +62,7 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
6662

6763
let fnModule: undefined | { [key: string]: any }
6864

69-
if (process.env.NODE_ENV === 'development') {
70-
const serverEnv = (globalThis as any).viteDevServer.environments['server']
71-
if (!serverEnv) {
72-
throw new Error(`'server' vite dev environment not found`)
73-
}
74-
fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename)
75-
} else {
76-
fnModule = await serverFnInfo.importer()
77-
}
65+
fnModule = await serverFnInfo.importer()
7866

7967
if (!fnModule) {
8068
console.info('serverFnInfo', serverFnInfo)

0 commit comments

Comments
 (0)