specify dev importer in start-plugin-core

Author: schiller-manuel

packages/directive-functions-plugin/src/index.ts

@@ -46,8 +46,11 @@ export function TanStackDirectiveFunctionsPlugin(
     configResolved: (config) => {
       root = config.root
     },
-    transform(code, id) {
-      return transformCode({ ...opts, code, id, directiveRx, root })
+    transform: {
+      filter: {
+        code: directiveRx,
+      },
+      handler: (code, id) => transformCode({ ...opts, code, id, root }),
     },
   }
 }
@@ -96,32 +99,33 @@ export function TanStackDirectiveFunctionsPluginEnv(
     //     opts.environments.server.envName,
     //   ].includes(env.name)
     // },
-    transform(code, id) {
-      const envOptions = [
-        opts.environments.client,
-        opts.environments.server,
-      ].find((e) => e.envName === this.environment.name)
-
-      if (!envOptions) {
-        throw new Error(`Environment ${this.environment.name} not found`)
-      }
-
-      return transformCode({
-        ...opts,
-        ...envOptions,
-        code,
-        id,
-        directiveRx,
-        root,
-      })
+    transform: {
+      filter: { code: directiveRx },
+      handler(code, id) {
+        const envOptions = [
+          opts.environments.client,
+          opts.environments.server,
+        ].find((e) => e.envName === this.environment.name)
+
+        if (!envOptions) {
+          throw new Error(`Environment ${this.environment.name} not found`)
+        }
+
+        return transformCode({
+          ...opts,
+          ...envOptions,
+          code,
+          id,
+          root,
+        })
+      },
     },
   }
 }
 
 function transformCode({
   code,
   id,
-  directiveRx,
   envLabel,
   directive,
   directiveLabel,
@@ -132,17 +136,12 @@ function transformCode({
 }: DirectiveFunctionsViteOptions & {
   code: string
   id: string
-  directiveRx: RegExp
   root: string
 }) {
   const url = pathToFileURL(id)
   url.searchParams.delete('v')
   id = fileURLToPath(url).replace(/\\/g, '/')
 
-  if (!code.match(directiveRx)) {
-    return null
-  }
-
   if (debug) console.info(`${envLabel}: Compiling Directives: `, id)
 
   const { compiledResult, directiveFnsById } = compileDirectives({

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

@@ -156,6 +156,15 @@ export function TanStackStartVitePluginCore(
           `createServerRpc('${d.functionId}', '${startConfig.serverFns.base}', ${d.fn})`,
         envName: VITE_ENVIRONMENT_NAMES.server,
       },
+      importer: (fn) => {
+        const serverEnv = (globalThis as any).viteDevServer.environments[
+          VITE_ENVIRONMENT_NAMES.server
+        ]
+        if (!serverEnv) {
+          throw new Error(`'ssr' vite dev environment not found`)
+        }
+        return serverEnv.runner.import(fn.extractedFilename)
+      },
     }),
     startManifestPlugin(startConfig),
     nitroPlugin(startConfig, () => ssrBundle),

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

@@ -5,10 +5,6 @@ import { startSerializer } from '@tanstack/start-client-core'
 import _serverFnManifest from 'tanstack:server-fn-manifest'
 import { getEvent, getResponseStatus } from './h3'
 
-// NOTE: This is a dummy export to silence warnings about
-// only having a default export.
-export const dummy = 2
-
 const serverFnManifest = _serverFnManifest as Record<
   string,
   {
@@ -66,15 +62,7 @@ export const handleServerAction = async ({ request }: { request: Request }) => {
 
   let fnModule: undefined | { [key: string]: any }
 
-  if (process.env.NODE_ENV === 'development') {
-    const serverEnv = (globalThis as any).viteDevServer.environments['server']
-    if (!serverEnv) {
-      throw new Error(`'server' vite dev environment not found`)
-    }
-    fnModule = await serverEnv.runner.import(serverFnInfo.extractedFilename)
-  } else {
-    fnModule = await serverFnInfo.importer()
-  }
+  fnModule = await serverFnInfo.importer()
 
   if (!fnModule) {
     console.info('serverFnInfo', serverFnInfo)