@tanstack/start-plugin-core 1.134.20 → 1.135.1

package/dist/esm/create-server-fn-plugin/handleCreateServerFn.js

@@ -71,7 +71,7 @@ function handleCreateServerFn(path, opts) {
             )
           )
         ],
-        [t.directive(t.directiveLiteral("use server"))]
+        [t.directive(t.directiveLiteral(opts.directive))]
       )
     )
   );

package/dist/esm/create-server-fn-plugin/handleCreateServerFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleCreateServerFn.js","sources":["../../../src/create-server-fn-plugin/handleCreateServerFn.ts"],"sourcesContent":["import * as t from '@babel/types'\nimport {\n  codeFrameError,\n  getRootCallExpression,\n} from '../start-compiler-plugin/utils'\nimport type * as babel from '@babel/core'\n\nexport function handleCreateServerFn(\n  path: babel.NodePath<t.CallExpression>,\n  opts: {\n    env: 'client' | 'server'\n    code: string\n    directive: string\n  },\n) {\n  // Traverse the member expression and find the call expressions for\n  // the validator, handler, and middleware methods. Check to make sure they\n  // are children of the createServerFn call expression.\n\n  const validMethods = ['middleware', 'inputValidator', 'handler'] as const\n  type ValidMethods = (typeof validMethods)[number]\n  const callExpressionPaths: Record<\n    ValidMethods,\n    babel.NodePath<t.CallExpression> | null\n  > = {\n    middleware: null,\n    inputValidator: null,\n    handler: null,\n  }\n\n  const rootCallExpression = getRootCallExpression(path)\n\n  // if (debug)\n  //   console.info(\n  //     'Handling createServerFn call expression:',\n  //     rootCallExpression.toString(),\n  //   )\n\n  // Check if the call is assigned to a variable\n  if (!rootCallExpression.parentPath.isVariableDeclarator()) {\n    throw new Error('createServerFn must be assigned to a variable!')\n  }\n\n  // Get the identifier name of the variable\n  const variableDeclarator = rootCallExpression.parentPath.node\n  const existingVariableName = (variableDeclarator.id as t.Identifier).name\n\n  rootCallExpression.traverse({\n    MemberExpression(memberExpressionPath) {\n      if (t.isIdentifier(memberExpressionPath.node.property)) {\n        const name = memberExpressionPath.node.property.name as ValidMethods\n\n        if (\n          validMethods.includes(name) &&\n          memberExpressionPath.parentPath.isCallExpression()\n        ) {\n          callExpressionPaths[name] = memberExpressionPath.parentPath\n        }\n      }\n    },\n  })\n\n  if (callExpressionPaths.inputValidator) {\n    const innerInputExpression =\n      callExpressionPaths.inputValidator.node.arguments[0]\n\n    if (!innerInputExpression) {\n      throw new Error(\n        'createServerFn().inputValidator() must be called with a validator!',\n      )\n    }\n\n    // If we're on the client, remove the validator call expression\n    if (opts.env === 'client') {\n      if (\n        t.isMemberExpression(callExpressionPaths.inputValidator.node.callee)\n      ) {\n        callExpressionPaths.inputValidator.replaceWith(\n          callExpressionPaths.inputValidator.node.callee.object,\n        )\n      }\n    }\n  }\n\n  // First, we need to move the handler function to a nested function call\n  // that is applied to the arguments passed to the server function.\n\n  const handlerFnPath = callExpressionPaths.handler?.get(\n    'arguments.0',\n  ) as babel.NodePath<any>\n\n  if (!callExpressionPaths.handler || !handlerFnPath.node) {\n    throw codeFrameError(\n      opts.code,\n      path.node.callee.loc!,\n      `createServerFn must be called with a \"handler\" property!`,\n    )\n  }\n\n  const handlerFn = handlerFnPath.node\n\n  // So, the way we do this is we give the handler function a way\n  // to access the serverFn ctx on the server via function scope.\n  // The 'use server' extracted function will be called with the\n  // payload from the client, then use the scoped serverFn ctx\n  // to execute the handler function.\n  // This way, we can do things like data and middleware validation\n  // in the __execute function without having to AST transform the\n  // handler function too much itself.\n\n  // .handler((optsOut, ctx) => {\n  //   return ((optsIn) => {\n  //     'use server'\n  //     ctx.__execute(handlerFn, optsIn)\n  //   })(optsOut)\n  // })\n\n  // If the handler function is an identifier and we're on the client, we need to\n  // remove the bound function from the file.\n  // If we're on the server, you can leave it, since it will get referenced\n  // as a second argument.\n\n  if (t.isIdentifier(handlerFn)) {\n    if (opts.env === 'client') {\n      // Find the binding for the handler function\n      const binding = handlerFnPath.scope.getBinding(handlerFn.name)\n      // Remove it\n      if (binding) {\n        binding.path.remove()\n      }\n    }\n    // If the env is server, just leave it alone\n  }\n\n  handlerFnPath.replaceWith(\n    t.arrowFunctionExpression(\n      [t.identifier('opts'), t.identifier('signal')],\n      t.blockStatement(\n        // Everything in here is server-only, since the client\n        // will strip out anything in the 'use server' directive.\n        [\n          t.returnStatement(\n            t.callExpression(\n              t.identifier(`${existingVariableName}.__executeServer`),\n              [t.identifier('opts'), t.identifier('signal')],\n            ),\n          ),\n        ],\n        [t.directive(t.directiveLiteral('use server'))],\n      ),\n    ),\n  )\n\n  if (opts.env === 'server') {\n    callExpressionPaths.handler.node.arguments.push(handlerFn)\n  }\n}\n"],"names":[],"mappings":";;AAOO,SAAS,qBACd,MACA,MAKA;AAKA,QAAM,eAAe,CAAC,cAAc,kBAAkB,SAAS;AAE/D,QAAM,sBAGF;AAAA,IACF,YAAY;AAAA,IACZ,gBAAgB;AAAA,IAChB,SAAS;AAAA,EAAA;AAGX,QAAM,qBAAqB,sBAAsB,IAAI;AASrD,MAAI,CAAC,mBAAmB,WAAW,wBAAwB;AACzD,UAAM,IAAI,MAAM,gDAAgD;AAAA,EAClE;AAGA,QAAM,qBAAqB,mBAAmB,WAAW;AACzD,QAAM,uBAAwB,mBAAmB,GAAoB;AAErE,qBAAmB,SAAS;AAAA,IAC1B,iBAAiB,sBAAsB;AACrC,UAAI,EAAE,aAAa,qBAAqB,KAAK,QAAQ,GAAG;AACtD,cAAM,OAAO,qBAAqB,KAAK,SAAS;AAEhD,YACE,aAAa,SAAS,IAAI,KAC1B,qBAAqB,WAAW,oBAChC;AACA,8BAAoB,IAAI,IAAI,qBAAqB;AAAA,QACnD;AAAA,MACF;AAAA,IACF;AAAA,EAAA,CACD;AAED,MAAI,oBAAoB,gBAAgB;AACtC,UAAM,uBACJ,oBAAoB,eAAe,KAAK,UAAU,CAAC;AAErD,QAAI,CAAC,sBAAsB;AACzB,YAAM,IAAI;AAAA,QACR;AAAA,MAAA;AAAA,IAEJ;AAGA,QAAI,KAAK,QAAQ,UAAU;AACzB,UACE,EAAE,mBAAmB,oBAAoB,eAAe,KAAK,MAAM,GACnE;AACA,4BAAoB,eAAe;AAAA,UACjC,oBAAoB,eAAe,KAAK,OAAO;AAAA,QAAA;AAAA,MAEnD;AAAA,IACF;AAAA,EACF;AAKA,QAAM,gBAAgB,oBAAoB,SAAS;AAAA,IACjD;AAAA,EAAA;AAGF,MAAI,CAAC,oBAAoB,WAAW,CAAC,cAAc,MAAM;AACvD,UAAM;AAAA,MACJ,KAAK;AAAA,MACL,KAAK,KAAK,OAAO;AAAA,MACjB;AAAA,IAAA;AAAA,EAEJ;AAEA,QAAM,YAAY,cAAc;AAuBhC,MAAI,EAAE,aAAa,SAAS,GAAG;AAC7B,QAAI,KAAK,QAAQ,UAAU;AAEzB,YAAM,UAAU,cAAc,MAAM,WAAW,UAAU,IAAI;AAE7D,UAAI,SAAS;AACX,gBAAQ,KAAK,OAAA;AAAA,MACf;AAAA,IACF;AAAA,EAEF;AAEA,gBAAc;AAAA,IACZ,EAAE;AAAA,MACA,CAAC,EAAE,WAAW,MAAM,GAAG,EAAE,WAAW,QAAQ,CAAC;AAAA,MAC7C,EAAE;AAAA;AAAA;AAAA,QAGA;AAAA,UACE,EAAE;AAAA,YACA,EAAE;AAAA,cACA,EAAE,WAAW,GAAG,oBAAoB,kBAAkB;AAAA,cACtD,CAAC,EAAE,WAAW,MAAM,GAAG,EAAE,WAAW,QAAQ,CAAC;AAAA,YAAA;AAAA,UAC/C;AAAA,QACF;AAAA,QAEF,CAAC,EAAE,UAAU,EAAE,iBAAiB,YAAY,CAAC,CAAC;AAAA,MAAA;AAAA,IAChD;AAAA,EACF;AAGF,MAAI,KAAK,QAAQ,UAAU;AACzB,wBAAoB,QAAQ,KAAK,UAAU,KAAK,SAAS;AAAA,EAC3D;AACF;"}
+{"version":3,"file":"handleCreateServerFn.js","sources":["../../../src/create-server-fn-plugin/handleCreateServerFn.ts"],"sourcesContent":["import * as t from '@babel/types'\nimport {\n  codeFrameError,\n  getRootCallExpression,\n} from '../start-compiler-plugin/utils'\nimport type * as babel from '@babel/core'\n\nexport function handleCreateServerFn(\n  path: babel.NodePath<t.CallExpression>,\n  opts: {\n    env: 'client' | 'server'\n    code: string\n    directive: string\n  },\n) {\n  // Traverse the member expression and find the call expressions for\n  // the validator, handler, and middleware methods. Check to make sure they\n  // are children of the createServerFn call expression.\n\n  const validMethods = ['middleware', 'inputValidator', 'handler'] as const\n  type ValidMethods = (typeof validMethods)[number]\n  const callExpressionPaths: Record<\n    ValidMethods,\n    babel.NodePath<t.CallExpression> | null\n  > = {\n    middleware: null,\n    inputValidator: null,\n    handler: null,\n  }\n\n  const rootCallExpression = getRootCallExpression(path)\n\n  // if (debug)\n  //   console.info(\n  //     'Handling createServerFn call expression:',\n  //     rootCallExpression.toString(),\n  //   )\n\n  // Check if the call is assigned to a variable\n  if (!rootCallExpression.parentPath.isVariableDeclarator()) {\n    throw new Error('createServerFn must be assigned to a variable!')\n  }\n\n  // Get the identifier name of the variable\n  const variableDeclarator = rootCallExpression.parentPath.node\n  const existingVariableName = (variableDeclarator.id as t.Identifier).name\n\n  rootCallExpression.traverse({\n    MemberExpression(memberExpressionPath) {\n      if (t.isIdentifier(memberExpressionPath.node.property)) {\n        const name = memberExpressionPath.node.property.name as ValidMethods\n\n        if (\n          validMethods.includes(name) &&\n          memberExpressionPath.parentPath.isCallExpression()\n        ) {\n          callExpressionPaths[name] = memberExpressionPath.parentPath\n        }\n      }\n    },\n  })\n\n  if (callExpressionPaths.inputValidator) {\n    const innerInputExpression =\n      callExpressionPaths.inputValidator.node.arguments[0]\n\n    if (!innerInputExpression) {\n      throw new Error(\n        'createServerFn().inputValidator() must be called with a validator!',\n      )\n    }\n\n    // If we're on the client, remove the validator call expression\n    if (opts.env === 'client') {\n      if (\n        t.isMemberExpression(callExpressionPaths.inputValidator.node.callee)\n      ) {\n        callExpressionPaths.inputValidator.replaceWith(\n          callExpressionPaths.inputValidator.node.callee.object,\n        )\n      }\n    }\n  }\n\n  // First, we need to move the handler function to a nested function call\n  // that is applied to the arguments passed to the server function.\n\n  const handlerFnPath = callExpressionPaths.handler?.get(\n    'arguments.0',\n  ) as babel.NodePath<any>\n\n  if (!callExpressionPaths.handler || !handlerFnPath.node) {\n    throw codeFrameError(\n      opts.code,\n      path.node.callee.loc!,\n      `createServerFn must be called with a \"handler\" property!`,\n    )\n  }\n\n  const handlerFn = handlerFnPath.node\n\n  // So, the way we do this is we give the handler function a way\n  // to access the serverFn ctx on the server via function scope.\n  // The 'use server' extracted function will be called with the\n  // payload from the client, then use the scoped serverFn ctx\n  // to execute the handler function.\n  // This way, we can do things like data and middleware validation\n  // in the __execute function without having to AST transform the\n  // handler function too much itself.\n\n  // .handler((optsOut, ctx) => {\n  //   return ((optsIn) => {\n  //     'use server'\n  //     ctx.__execute(handlerFn, optsIn)\n  //   })(optsOut)\n  // })\n\n  // If the handler function is an identifier and we're on the client, we need to\n  // remove the bound function from the file.\n  // If we're on the server, you can leave it, since it will get referenced\n  // as a second argument.\n\n  if (t.isIdentifier(handlerFn)) {\n    if (opts.env === 'client') {\n      // Find the binding for the handler function\n      const binding = handlerFnPath.scope.getBinding(handlerFn.name)\n      // Remove it\n      if (binding) {\n        binding.path.remove()\n      }\n    }\n    // If the env is server, just leave it alone\n  }\n\n  handlerFnPath.replaceWith(\n    t.arrowFunctionExpression(\n      [t.identifier('opts'), t.identifier('signal')],\n      t.blockStatement(\n        // Everything in here is server-only, since the client\n        // will strip out anything in the 'use server' directive.\n        [\n          t.returnStatement(\n            t.callExpression(\n              t.identifier(`${existingVariableName}.__executeServer`),\n              [t.identifier('opts'), t.identifier('signal')],\n            ),\n          ),\n        ],\n        [t.directive(t.directiveLiteral(opts.directive))],\n      ),\n    ),\n  )\n\n  if (opts.env === 'server') {\n    callExpressionPaths.handler.node.arguments.push(handlerFn)\n  }\n}\n"],"names":[],"mappings":";;AAOO,SAAS,qBACd,MACA,MAKA;AAKA,QAAM,eAAe,CAAC,cAAc,kBAAkB,SAAS;AAE/D,QAAM,sBAGF;AAAA,IACF,YAAY;AAAA,IACZ,gBAAgB;AAAA,IAChB,SAAS;AAAA,EAAA;AAGX,QAAM,qBAAqB,sBAAsB,IAAI;AASrD,MAAI,CAAC,mBAAmB,WAAW,wBAAwB;AACzD,UAAM,IAAI,MAAM,gDAAgD;AAAA,EAClE;AAGA,QAAM,qBAAqB,mBAAmB,WAAW;AACzD,QAAM,uBAAwB,mBAAmB,GAAoB;AAErE,qBAAmB,SAAS;AAAA,IAC1B,iBAAiB,sBAAsB;AACrC,UAAI,EAAE,aAAa,qBAAqB,KAAK,QAAQ,GAAG;AACtD,cAAM,OAAO,qBAAqB,KAAK,SAAS;AAEhD,YACE,aAAa,SAAS,IAAI,KAC1B,qBAAqB,WAAW,oBAChC;AACA,8BAAoB,IAAI,IAAI,qBAAqB;AAAA,QACnD;AAAA,MACF;AAAA,IACF;AAAA,EAAA,CACD;AAED,MAAI,oBAAoB,gBAAgB;AACtC,UAAM,uBACJ,oBAAoB,eAAe,KAAK,UAAU,CAAC;AAErD,QAAI,CAAC,sBAAsB;AACzB,YAAM,IAAI;AAAA,QACR;AAAA,MAAA;AAAA,IAEJ;AAGA,QAAI,KAAK,QAAQ,UAAU;AACzB,UACE,EAAE,mBAAmB,oBAAoB,eAAe,KAAK,MAAM,GACnE;AACA,4BAAoB,eAAe;AAAA,UACjC,oBAAoB,eAAe,KAAK,OAAO;AAAA,QAAA;AAAA,MAEnD;AAAA,IACF;AAAA,EACF;AAKA,QAAM,gBAAgB,oBAAoB,SAAS;AAAA,IACjD;AAAA,EAAA;AAGF,MAAI,CAAC,oBAAoB,WAAW,CAAC,cAAc,MAAM;AACvD,UAAM;AAAA,MACJ,KAAK;AAAA,MACL,KAAK,KAAK,OAAO;AAAA,MACjB;AAAA,IAAA;AAAA,EAEJ;AAEA,QAAM,YAAY,cAAc;AAuBhC,MAAI,EAAE,aAAa,SAAS,GAAG;AAC7B,QAAI,KAAK,QAAQ,UAAU;AAEzB,YAAM,UAAU,cAAc,MAAM,WAAW,UAAU,IAAI;AAE7D,UAAI,SAAS;AACX,gBAAQ,KAAK,OAAA;AAAA,MACf;AAAA,IACF;AAAA,EAEF;AAEA,gBAAc;AAAA,IACZ,EAAE;AAAA,MACA,CAAC,EAAE,WAAW,MAAM,GAAG,EAAE,WAAW,QAAQ,CAAC;AAAA,MAC7C,EAAE;AAAA;AAAA;AAAA,QAGA;AAAA,UACE,EAAE;AAAA,YACA,EAAE;AAAA,cACA,EAAE,WAAW,GAAG,oBAAoB,kBAAkB;AAAA,cACtD,CAAC,EAAE,WAAW,MAAM,GAAG,EAAE,WAAW,QAAQ,CAAC;AAAA,YAAA;AAAA,UAC/C;AAAA,QACF;AAAA,QAEF,CAAC,EAAE,UAAU,EAAE,iBAAiB,KAAK,SAAS,CAAC,CAAC;AAAA,MAAA;AAAA,IAClD;AAAA,EACF;AAGF,MAAI,KAAK,QAAQ,UAAU;AACzB,wBAAoB,QAAQ,KAAK,UAAU,KAAK,SAAS;AAAA,EAC3D;AACF;"}

package/dist/esm/create-server-fn-plugin/plugin.d.ts

@@ -3,4 +3,8 @@ import { PluginOption } from 'vite';
 export declare function createServerFnPlugin(opts: {
     framework: CompileStartFrameworkOptions;
     directive: string;
+    environments: Array<{
+        name: string;
+        type: 'client' | 'server';
+    }>;
 }): PluginOption;

package/dist/esm/create-server-fn-plugin/plugin.js

@@ -1,4 +1,4 @@
-import { TRANSFORM_ID_REGEX, VITE_ENVIRONMENT_NAMES } from "../constants.js";
+import { TRANSFORM_ID_REGEX } from "../constants.js";
 import { ServerFnCompiler } from "./compiler.js";
 function cleanId(id) {
   return id.split("?")[0];
@@ -28,38 +28,16 @@ const getLookupConfigurationsForEnv = (env, framework) => {
     return [createServerFnConfig];
   }
 };
+const SERVER_FN_LOOKUP = "server-fn-module-lookup";
 function createServerFnPlugin(opts) {
-  const SERVER_FN_LOOKUP = "server-fn-module-lookup";
   const compilers = {};
-  return [
-    {
-      name: "tanstack-start-core:capture-server-fn-module-lookup",
-      // we only need this plugin in dev mode
-      apply: "serve",
-      applyToEnvironment(env) {
-        return [
-          VITE_ENVIRONMENT_NAMES.client,
-          VITE_ENVIRONMENT_NAMES.server
-        ].includes(env.name);
-      },
-      transform: {
-        filter: {
-          id: new RegExp(`${SERVER_FN_LOOKUP}$`)
-        },
-        handler(code, id) {
-          const compiler = compilers[this.environment.name];
-          compiler?.ingestModule({ code, id: cleanId(id) });
-        }
-      }
-    },
-    {
-      name: "tanstack-start-core::server-fn",
+  function perEnvServerFnPlugin(environment) {
+    const transformCodeFilter = environment.type === "client" ? [/\.\s*handler\(/, /\.\s*createMiddleware\(\)/] : [/\.\s*handler\(/];
+    return {
+      name: `tanstack-start-core::server-fn:${environment.name}`,
       enforce: "pre",
       applyToEnvironment(env) {
-        return [
-          VITE_ENVIRONMENT_NAMES.client,
-          VITE_ENVIRONMENT_NAMES.server
-        ].includes(env.name);
+        return env.name === environment.name;
       },
       transform: {
         filter: {
@@ -68,25 +46,18 @@ function createServerFnPlugin(opts) {
             include: TRANSFORM_ID_REGEX
           },
           code: {
-            // TODO apply this plugin with a different filter per environment so that .createMiddleware() calls are not scanned in server env
-            // only scan files that mention `.handler(` | `.createMiddleware()`
-            include: [/\.\s*handler\(/, /\.\s*createMiddleware\(\)/]
+            include: transformCodeFilter
           }
         },
         async handler(code, id) {
           let compiler = compilers[this.environment.name];
           if (!compiler) {
-            const env = this.environment.name === VITE_ENVIRONMENT_NAMES.client ? "client" : this.environment.name === VITE_ENVIRONMENT_NAMES.server ? "server" : (() => {
-              throw new Error(
-                `Environment ${this.environment.name} not configured`
-              );
-            })();
             compiler = new ServerFnCompiler({
-              env,
+              env: environment.type,
               directive: opts.directive,
-              lookupKinds: LookupKindsPerEnv[env],
+              lookupKinds: LookupKindsPerEnv[environment.type],
               lookupConfigurations: getLookupConfigurationsForEnv(
-                env,
+                environment.type,
                 opts.framework
               ),
               loadModule: async (id2) => {
@@ -138,6 +109,26 @@ function createServerFnPlugin(opts) {
           }
         });
       }
+    };
+  }
+  return [
+    ...opts.environments.map(perEnvServerFnPlugin),
+    {
+      name: "tanstack-start-core:capture-server-fn-module-lookup",
+      // we only need this plugin in dev mode
+      apply: "serve",
+      applyToEnvironment(env) {
+        return !!opts.environments.find((e) => e.name === env.name);
+      },
+      transform: {
+        filter: {
+          id: new RegExp(`${SERVER_FN_LOOKUP}$`)
+        },
+        handler(code, id) {
+          const compiler = compilers[this.environment.name];
+          compiler?.ingestModule({ code, id: cleanId(id) });
+        }
+      }
     }
   ];
 }

package/dist/esm/create-server-fn-plugin/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["../../../src/create-server-fn-plugin/plugin.ts"],"sourcesContent":["import { TRANSFORM_ID_REGEX, VITE_ENVIRONMENT_NAMES } from '../constants'\nimport { ServerFnCompiler } from './compiler'\nimport type { LookupConfig, LookupKind } from './compiler'\nimport type { CompileStartFrameworkOptions } from '../start-compiler-plugin/compilers'\nimport type { ViteEnvironmentNames } from '../constants'\nimport type { PluginOption } from 'vite'\n\nfunction cleanId(id: string): string {\n  return id.split('?')[0]!\n}\n\nconst LookupKindsPerEnv: Record<'client' | 'server', Set<LookupKind>> = {\n  client: new Set(['Middleware', 'ServerFn'] as const),\n  server: new Set(['ServerFn'] as const),\n}\n\nconst getLookupConfigurationsForEnv = (\n  env: 'client' | 'server',\n  framework: CompileStartFrameworkOptions,\n): Array<LookupConfig> => {\n  const createServerFnConfig: LookupConfig = {\n    libName: `@tanstack/${framework}-start`,\n    rootExport: 'createServerFn',\n  }\n  if (env === 'client') {\n    return [\n      {\n        libName: `@tanstack/${framework}-start`,\n        rootExport: 'createMiddleware',\n      },\n      {\n        libName: `@tanstack/${framework}-start`,\n        rootExport: 'createStart',\n      },\n\n      createServerFnConfig,\n    ]\n  } else {\n    return [createServerFnConfig]\n  }\n}\nexport function createServerFnPlugin(opts: {\n  framework: CompileStartFrameworkOptions\n  directive: string\n}): PluginOption {\n  const SERVER_FN_LOOKUP = 'server-fn-module-lookup'\n\n  const compilers: Partial<Record<ViteEnvironmentNames, ServerFnCompiler>> = {}\n  return [\n    {\n      name: 'tanstack-start-core:capture-server-fn-module-lookup',\n      // we only need this plugin in dev mode\n      apply: 'serve',\n      applyToEnvironment(env) {\n        return [\n          VITE_ENVIRONMENT_NAMES.client,\n          VITE_ENVIRONMENT_NAMES.server,\n        ].includes(env.name as ViteEnvironmentNames)\n      },\n      transform: {\n        filter: {\n          id: new RegExp(`${SERVER_FN_LOOKUP}$`),\n        },\n        handler(code, id) {\n          const compiler =\n            compilers[this.environment.name as ViteEnvironmentNames]\n          compiler?.ingestModule({ code, id: cleanId(id) })\n        },\n      },\n    },\n    {\n      name: 'tanstack-start-core::server-fn',\n      enforce: 'pre',\n\n      applyToEnvironment(env) {\n        return [\n          VITE_ENVIRONMENT_NAMES.client,\n          VITE_ENVIRONMENT_NAMES.server,\n        ].includes(env.name as ViteEnvironmentNames)\n      },\n      transform: {\n        filter: {\n          id: {\n            exclude: new RegExp(`${SERVER_FN_LOOKUP}$`),\n            include: TRANSFORM_ID_REGEX,\n          },\n          code: {\n            // TODO apply this plugin with a different filter per environment so that .createMiddleware() calls are not scanned in server env\n            // only scan files that mention `.handler(` | `.createMiddleware()`\n            include: [/\\.\\s*handler\\(/, /\\.\\s*createMiddleware\\(\\)/],\n          },\n        },\n        async handler(code, id) {\n          let compiler =\n            compilers[this.environment.name as ViteEnvironmentNames]\n          if (!compiler) {\n            const env =\n              this.environment.name === VITE_ENVIRONMENT_NAMES.client\n                ? 'client'\n                : this.environment.name === VITE_ENVIRONMENT_NAMES.server\n                  ? 'server'\n                  : (() => {\n                      throw new Error(\n                        `Environment ${this.environment.name} not configured`,\n                      )\n                    })()\n\n            compiler = new ServerFnCompiler({\n              env,\n              directive: opts.directive,\n              lookupKinds: LookupKindsPerEnv[env],\n              lookupConfigurations: getLookupConfigurationsForEnv(\n                env,\n                opts.framework,\n              ),\n              loadModule: async (id: string) => {\n                if (this.environment.mode === 'build') {\n                  const loaded = await this.load({ id })\n                  if (!loaded.code) {\n                    throw new Error(`could not load module ${id}`)\n                  }\n                  compiler!.ingestModule({ code: loaded.code, id })\n                } else if (this.environment.mode === 'dev') {\n                  /**\n                   * in dev, vite does not return code from `ctx.load()`\n                   * so instead, we need to take a different approach\n                   * we must force vite to load the module and run it through the vite plugin pipeline\n                   * we can do this by using the `fetchModule` method\n                   * the `captureServerFnModuleLookupPlugin` captures the module code via its transform hook and invokes analyzeModuleAST\n                   */\n                  await this.environment.fetchModule(\n                    id + '?' + SERVER_FN_LOOKUP,\n                  )\n                } else {\n                  throw new Error(\n                    `could not load module ${id}: unknown environment mode ${this.environment.mode}`,\n                  )\n                }\n              },\n              resolveId: async (source: string, importer?: string) => {\n                const r = await this.resolve(source, importer)\n                if (r) {\n                  if (!r.external) {\n                    return cleanId(r.id)\n                  }\n                }\n                return null\n              },\n            })\n            compilers[this.environment.name as ViteEnvironmentNames] = compiler\n          }\n\n          id = cleanId(id)\n          const result = await compiler.compile({ id, code })\n          return result\n        },\n      },\n\n      hotUpdate(ctx) {\n        const compiler =\n          compilers[this.environment.name as ViteEnvironmentNames]\n\n        ctx.modules.forEach((m) => {\n          if (m.id) {\n            const deleted = compiler?.invalidateModule(m.id)\n            if (deleted) {\n              m.importers.forEach((importer) => {\n                if (importer.id) {\n                  compiler?.invalidateModule(importer.id)\n                }\n              })\n            }\n          }\n        })\n      },\n    },\n  ]\n}\n"],"names":["id"],"mappings":"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"}
+{"version":3,"file":"plugin.js","sources":["../../../src/create-server-fn-plugin/plugin.ts"],"sourcesContent":["import { TRANSFORM_ID_REGEX } from '../constants'\nimport { ServerFnCompiler } from './compiler'\nimport type { LookupConfig, LookupKind } from './compiler'\nimport type { CompileStartFrameworkOptions } from '../start-compiler-plugin/compilers'\nimport type { PluginOption } from 'vite'\n\nfunction cleanId(id: string): string {\n  return id.split('?')[0]!\n}\n\nconst LookupKindsPerEnv: Record<'client' | 'server', Set<LookupKind>> = {\n  client: new Set(['Middleware', 'ServerFn'] as const),\n  server: new Set(['ServerFn'] as const),\n}\n\nconst getLookupConfigurationsForEnv = (\n  env: 'client' | 'server',\n  framework: CompileStartFrameworkOptions,\n): Array<LookupConfig> => {\n  const createServerFnConfig: LookupConfig = {\n    libName: `@tanstack/${framework}-start`,\n    rootExport: 'createServerFn',\n  }\n  if (env === 'client') {\n    return [\n      {\n        libName: `@tanstack/${framework}-start`,\n        rootExport: 'createMiddleware',\n      },\n      {\n        libName: `@tanstack/${framework}-start`,\n        rootExport: 'createStart',\n      },\n\n      createServerFnConfig,\n    ]\n  } else {\n    return [createServerFnConfig]\n  }\n}\nconst SERVER_FN_LOOKUP = 'server-fn-module-lookup'\nexport function createServerFnPlugin(opts: {\n  framework: CompileStartFrameworkOptions\n  directive: string\n  environments: Array<{ name: string; type: 'client' | 'server' }>\n}): PluginOption {\n  const compilers: Record<string /* envName */, ServerFnCompiler> = {}\n\n  function perEnvServerFnPlugin(environment: {\n    name: string\n    type: 'client' | 'server'\n  }): PluginOption {\n    // in server environments, we don't transform middleware calls\n    const transformCodeFilter =\n      environment.type === 'client'\n        ? [/\\.\\s*handler\\(/, /\\.\\s*createMiddleware\\(\\)/]\n        : [/\\.\\s*handler\\(/]\n\n    return {\n      name: `tanstack-start-core::server-fn:${environment.name}`,\n      enforce: 'pre',\n      applyToEnvironment(env) {\n        return env.name === environment.name\n      },\n      transform: {\n        filter: {\n          id: {\n            exclude: new RegExp(`${SERVER_FN_LOOKUP}$`),\n            include: TRANSFORM_ID_REGEX,\n          },\n          code: {\n            include: transformCodeFilter,\n          },\n        },\n        async handler(code, id) {\n          let compiler = compilers[this.environment.name]\n          if (!compiler) {\n            compiler = new ServerFnCompiler({\n              env: environment.type,\n              directive: opts.directive,\n              lookupKinds: LookupKindsPerEnv[environment.type],\n              lookupConfigurations: getLookupConfigurationsForEnv(\n                environment.type,\n                opts.framework,\n              ),\n              loadModule: async (id: string) => {\n                if (this.environment.mode === 'build') {\n                  const loaded = await this.load({ id })\n                  if (!loaded.code) {\n                    throw new Error(`could not load module ${id}`)\n                  }\n                  compiler!.ingestModule({ code: loaded.code, id })\n                } else if (this.environment.mode === 'dev') {\n                  /**\n                   * in dev, vite does not return code from `ctx.load()`\n                   * so instead, we need to take a different approach\n                   * we must force vite to load the module and run it through the vite plugin pipeline\n                   * we can do this by using the `fetchModule` method\n                   * the `captureServerFnModuleLookupPlugin` captures the module code via its transform hook and invokes analyzeModuleAST\n                   */\n                  await this.environment.fetchModule(\n                    id + '?' + SERVER_FN_LOOKUP,\n                  )\n                } else {\n                  throw new Error(\n                    `could not load module ${id}: unknown environment mode ${this.environment.mode}`,\n                  )\n                }\n              },\n              resolveId: async (source: string, importer?: string) => {\n                const r = await this.resolve(source, importer)\n                if (r) {\n                  if (!r.external) {\n                    return cleanId(r.id)\n                  }\n                }\n                return null\n              },\n            })\n            compilers[this.environment.name] = compiler\n          }\n\n          id = cleanId(id)\n          const result = await compiler.compile({ id, code })\n          return result\n        },\n      },\n\n      hotUpdate(ctx) {\n        const compiler = compilers[this.environment.name]\n\n        ctx.modules.forEach((m) => {\n          if (m.id) {\n            const deleted = compiler?.invalidateModule(m.id)\n            if (deleted) {\n              m.importers.forEach((importer) => {\n                if (importer.id) {\n                  compiler?.invalidateModule(importer.id)\n                }\n              })\n            }\n          }\n        })\n      },\n    }\n  }\n\n  return [\n    ...opts.environments.map(perEnvServerFnPlugin),\n    {\n      name: 'tanstack-start-core:capture-server-fn-module-lookup',\n      // we only need this plugin in dev mode\n      apply: 'serve',\n      applyToEnvironment(env) {\n        return !!opts.environments.find((e) => e.name === env.name)\n      },\n      transform: {\n        filter: {\n          id: new RegExp(`${SERVER_FN_LOOKUP}$`),\n        },\n        handler(code, id) {\n          const compiler = compilers[this.environment.name]\n          compiler?.ingestModule({ code, id: cleanId(id) })\n        },\n      },\n    },\n  ]\n}\n"],"names":["id"],"mappings":"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"}

package/dist/esm/plugin.d.ts

@@ -13,6 +13,7 @@ export interface TanStackStartVitePluginCoreOptions {
         ssr?: {
             getServerFnById?: string;
         };
+        providerEnv?: string;
     };
 }
 export interface ResolvedStartConfig {

package/dist/esm/plugin.js

@@ -7,7 +7,7 @@ import { join } from "pathe";
 import { escapePath } from "tinyglobby";
 import { startManifestPlugin } from "./start-manifest-plugin/plugin.js";
 import { startCompilerPlugin } from "./start-compiler-plugin/plugin.js";
-import { ENTRY_POINTS, VITE_ENVIRONMENT_NAMES } from "./constants.js";
+import { VITE_ENVIRONMENT_NAMES, ENTRY_POINTS } from "./constants.js";
 import { tanStackStartRouter } from "./start-router-plugin/plugin.js";
 import { loadEnvPlugin } from "./load-env-plugin/plugin.js";
 import { devServerPlugin } from "./dev-server-plugin/plugin.js";
@@ -55,6 +55,16 @@ function TanStackStartVitePluginCore(corePluginOpts, startPluginOpts) {
     }
     return bundle;
   }
+  const environments = [
+    { name: VITE_ENVIRONMENT_NAMES.client, type: "client" },
+    { name: VITE_ENVIRONMENT_NAMES.server, type: "server" }
+  ];
+  if (corePluginOpts.serverFn?.providerEnv && !environments.find((e) => e.name === corePluginOpts.serverFn?.providerEnv)) {
+    environments.push({
+      name: corePluginOpts.serverFn.providerEnv,
+      type: "server"
+    });
+  }
   return [
     {
       name: "tanstack-start-core:config",
@@ -254,8 +264,12 @@ function TanStackStartVitePluginCore(corePluginOpts, startPluginOpts) {
     },
     tanStackStartRouter(startPluginOpts, getConfig, corePluginOpts),
     // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPlugin
-    startCompilerPlugin(corePluginOpts.framework),
-    createServerFnPlugin({ framework: corePluginOpts.framework, directive }),
+    startCompilerPlugin({ framework: corePluginOpts.framework, environments }),
+    createServerFnPlugin({
+      framework: corePluginOpts.framework,
+      directive,
+      environments
+    }),
     TanStackServerFnPlugin({
       // This is the ID that will be available to look up and import
       // our server function manifest and resolve its module
@@ -280,7 +294,7 @@ function TanStackStartVitePluginCore(corePluginOpts, startPluginOpts) {
       provider: {
         getRuntimeCode: () => `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server-rpc'`,
         replacer: (d) => `createServerRpc('${d.functionId}', ${d.fn})`,
-        envName: VITE_ENVIRONMENT_NAMES.server
+        envName: corePluginOpts.serverFn?.providerEnv || VITE_ENVIRONMENT_NAMES.server
       }
     }),
     loadEnvPlugin(),

package/dist/esm/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["../../src/plugin.ts"],"sourcesContent":["import { joinPaths } from '@tanstack/router-core'\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { TanStackServerFnPlugin } from '@tanstack/server-functions-plugin'\nimport * as vite from 'vite'\nimport { crawlFrameworkPkgs } from 'vitefu'\nimport { join } from 'pathe'\nimport { escapePath } from 'tinyglobby'\nimport { startManifestPlugin } from './start-manifest-plugin/plugin'\nimport { startCompilerPlugin } from './start-compiler-plugin/plugin'\nimport { ENTRY_POINTS, VITE_ENVIRONMENT_NAMES } from './constants'\nimport { tanStackStartRouter } from './start-router-plugin/plugin'\nimport { loadEnvPlugin } from './load-env-plugin/plugin'\nimport { devServerPlugin } from './dev-server-plugin/plugin'\nimport { parseStartConfig } from './schema'\nimport { resolveEntry } from './resolve-entries'\nimport {\n  getClientOutputDirectory,\n  getServerOutputDirectory,\n} from './output-directory'\nimport { postServerBuild } from './post-server-build'\nimport { createServerFnPlugin } from './create-server-fn-plugin/plugin'\nimport type { ViteEnvironmentNames } from './constants'\nimport type {\n  TanStackStartInputConfig,\n  TanStackStartOutputConfig,\n} from './schema'\nimport type { PluginOption } from 'vite'\nimport type { CompileStartFrameworkOptions } from './start-compiler-plugin/compilers'\n\nexport interface TanStackStartVitePluginCoreOptions {\n  framework: CompileStartFrameworkOptions\n  defaultEntryPaths: {\n    client: string\n    server: string\n    start: string\n  }\n  serverFn?: {\n    directive?: string\n    ssr?: {\n      getServerFnById?: string\n    }\n  }\n}\n\nexport interface ResolvedStartConfig {\n  root: string\n  startFilePath: string | undefined\n  routerFilePath: string\n  srcDirectory: string\n  viteAppBase: string\n}\n\nexport type GetConfigFn = () => {\n  startConfig: TanStackStartOutputConfig\n  resolvedStartConfig: ResolvedStartConfig\n}\n\nfunction isFullUrl(str: string): boolean {\n  try {\n    new URL(str)\n    return true\n  } catch {\n    return false\n  }\n}\n\nexport function TanStackStartVitePluginCore(\n  corePluginOpts: TanStackStartVitePluginCoreOptions,\n  startPluginOpts: TanStackStartInputConfig,\n): Array<PluginOption> {\n  const resolvedStartConfig: ResolvedStartConfig = {\n    root: '',\n    startFilePath: undefined,\n    routerFilePath: '',\n    srcDirectory: '',\n    viteAppBase: '',\n  }\n\n  const directive = corePluginOpts.serverFn?.directive ?? 'use server'\n\n  let startConfig: TanStackStartOutputConfig | null\n  const getConfig: GetConfigFn = () => {\n    if (!resolvedStartConfig.root) {\n      throw new Error(`Cannot get config before root is resolved`)\n    }\n    if (!startConfig) {\n      startConfig = parseStartConfig(\n        startPluginOpts,\n        corePluginOpts,\n        resolvedStartConfig.root,\n      )\n    }\n    return { startConfig, resolvedStartConfig }\n  }\n\n  const capturedBundle: Partial<\n    Record<ViteEnvironmentNames, vite.Rollup.OutputBundle>\n  > = {}\n\n  function getBundle(envName: ViteEnvironmentNames): vite.Rollup.OutputBundle {\n    const bundle = capturedBundle[envName]\n    if (!bundle) {\n      throw new Error(`No bundle captured for environment: ${envName}`)\n    }\n    return bundle\n  }\n\n  return [\n    {\n      name: 'tanstack-start-core:config',\n      enforce: 'pre',\n      async config(viteConfig, { command }) {\n        resolvedStartConfig.viteAppBase = viteConfig.base ?? '/'\n        if (!isFullUrl(resolvedStartConfig.viteAppBase)) {\n          resolvedStartConfig.viteAppBase = joinPaths([\n            '/',\n            viteConfig.base,\n            '/',\n          ])\n        }\n        const root = viteConfig.root || process.cwd()\n        resolvedStartConfig.root = root\n\n        const { startConfig } = getConfig()\n        if (startConfig.router.basepath === undefined) {\n          if (!isFullUrl(resolvedStartConfig.viteAppBase)) {\n            startConfig.router.basepath =\n              resolvedStartConfig.viteAppBase.replace(/^\\/|\\/$/g, '')\n          } else {\n            startConfig.router.basepath = '/'\n          }\n        } else {\n          if (command === 'serve' && !viteConfig.server?.middlewareMode) {\n            // when serving, we must ensure that router basepath and viteAppBase are aligned\n            if (\n              !joinPaths(['/', startConfig.router.basepath, '/']).startsWith(\n                joinPaths(['/', resolvedStartConfig.viteAppBase, '/']),\n              )\n            ) {\n              this.error(\n                '[tanstack-start]: During `vite dev`, `router.basepath` must start with the vite `base` config value',\n              )\n            }\n          }\n        }\n\n        const TSS_SERVER_FN_BASE = joinPaths([\n          '/',\n          startConfig.router.basepath,\n          startConfig.serverFns.base,\n          '/',\n        ])\n        const resolvedSrcDirectory = join(root, startConfig.srcDirectory)\n        resolvedStartConfig.srcDirectory = resolvedSrcDirectory\n\n        const startFilePath = resolveEntry({\n          type: 'start entry',\n          configuredEntry: startConfig.start.entry,\n          defaultEntry: 'start',\n          resolvedSrcDirectory,\n          required: false,\n        })\n        resolvedStartConfig.startFilePath = startFilePath\n\n        const routerFilePath = resolveEntry({\n          type: 'router entry',\n          configuredEntry: startConfig.router.entry,\n          defaultEntry: 'router',\n          resolvedSrcDirectory,\n          required: true,\n        })\n        resolvedStartConfig.routerFilePath = routerFilePath\n\n        const clientEntryPath = resolveEntry({\n          type: 'client entry',\n          configuredEntry: startConfig.client.entry,\n          defaultEntry: 'client',\n          resolvedSrcDirectory,\n          required: false,\n        })\n\n        const serverEntryPath = resolveEntry({\n          type: 'server entry',\n          configuredEntry: startConfig.server.entry,\n          defaultEntry: 'server',\n          resolvedSrcDirectory,\n          required: false,\n        })\n\n        const clientAlias = vite.normalizePath(\n          clientEntryPath ?? corePluginOpts.defaultEntryPaths.client,\n        )\n        const serverAlias = vite.normalizePath(\n          serverEntryPath ?? corePluginOpts.defaultEntryPaths.server,\n        )\n        const startAlias = vite.normalizePath(\n          startFilePath ?? corePluginOpts.defaultEntryPaths.start,\n        )\n        const routerAlias = vite.normalizePath(routerFilePath)\n\n        const entryAliasConfiguration: Record<\n          (typeof ENTRY_POINTS)[keyof typeof ENTRY_POINTS],\n          string\n        > = {\n          [ENTRY_POINTS.client]: clientAlias,\n          [ENTRY_POINTS.server]: serverAlias,\n          [ENTRY_POINTS.start]: startAlias,\n          [ENTRY_POINTS.router]: routerAlias,\n        }\n\n        const startPackageName =\n          `@tanstack/${corePluginOpts.framework}-start` as const\n\n        // crawl packages that have start in \"peerDependencies\"\n        // see https://github.com/svitejs/vitefu/blob/d8d82fa121e3b2215ba437107093c77bde51b63b/src/index.js#L95-L101\n\n        // this is currently uncached; could be implemented similarly as vite handles lock file changes\n        // see https://github.com/vitejs/vite/blob/557f797d29422027e8c451ca50dd84bf8c41b5f0/packages/vite/src/node/optimizer/index.ts#L1282\n\n        const crawlFrameworkPkgsResult = await crawlFrameworkPkgs({\n          root: process.cwd(),\n          isBuild: command === 'build',\n          isFrameworkPkgByJson(pkgJson) {\n            const peerDependencies = pkgJson['peerDependencies']\n\n            if (peerDependencies) {\n              if (\n                startPackageName in peerDependencies ||\n                '@tanstack/start-client-core' in peerDependencies\n              ) {\n                return true\n              }\n            }\n\n            return false\n          },\n        })\n\n        return {\n          // see https://vite.dev/config/shared-options.html#apptype\n          // this will prevent vite from injecting middlewares that we don't want\n          appType: viteConfig.appType ?? 'custom',\n          environments: {\n            [VITE_ENVIRONMENT_NAMES.client]: {\n              consumer: 'client',\n              build: {\n                rollupOptions: {\n                  input: {\n                    main: ENTRY_POINTS.client,\n                  },\n                },\n                outDir: getClientOutputDirectory(viteConfig),\n              },\n              optimizeDeps: {\n                exclude: crawlFrameworkPkgsResult.optimizeDeps.exclude,\n                // Ensure user code can be crawled for dependencies\n                entries: [clientAlias, routerAlias].map((entry) =>\n                  // Entries are treated as `tinyglobby` patterns so need to be escaped\n                  escapePath(entry),\n                ),\n              },\n            },\n            [VITE_ENVIRONMENT_NAMES.server]: {\n              consumer: 'server',\n              build: {\n                ssr: true,\n                rollupOptions: {\n                  input:\n                    viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]\n                      ?.build?.rollupOptions?.input ?? ENTRY_POINTS.server,\n                },\n                outDir: getServerOutputDirectory(viteConfig),\n                commonjsOptions: {\n                  include: [/node_modules/],\n                },\n                copyPublicDir:\n                  viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]\n                    ?.build?.copyPublicDir ?? false,\n              },\n              optimizeDeps: {\n                // Ensure user code can be crawled for dependencies\n                entries: [serverAlias, startAlias, routerAlias].map((entry) =>\n                  // Entries are treated as `tinyglobby` patterns so need to be escaped\n                  escapePath(entry),\n                ),\n              },\n            },\n          },\n\n          resolve: {\n            noExternal: [\n              // ENTRY_POINTS.start,\n              '@tanstack/start**',\n              `@tanstack/${corePluginOpts.framework}-start**`,\n              ...crawlFrameworkPkgsResult.ssr.noExternal.sort(),\n            ],\n            alias: {\n              ...entryAliasConfiguration,\n            },\n          },\n          /* prettier-ignore */\n          define: {\n            // define is an esbuild function that replaces the any instances of given keys with the given values\n            // i.e: __FRAMEWORK_NAME__ can be replaced with JSON.stringify(\"TanStack Start\")\n            // This is not the same as injecting environment variables.\n\n            ...defineReplaceEnv('TSS_SERVER_FN_BASE', TSS_SERVER_FN_BASE),\n            ...defineReplaceEnv('TSS_CLIENT_OUTPUT_DIR', getClientOutputDirectory(viteConfig)),\n            ...defineReplaceEnv('TSS_ROUTER_BASEPATH', startConfig.router.basepath),\n            ...(command === 'serve' ? defineReplaceEnv('TSS_SHELL', startConfig.spa?.enabled ? 'true' : 'false') : {}),\n            ...defineReplaceEnv('TSS_DEV_SERVER', command === 'serve' ? 'true' : 'false'),\n          },\n          builder: {\n            sharedPlugins: true,\n            async buildApp(builder) {\n              const client = builder.environments[VITE_ENVIRONMENT_NAMES.client]\n              const server = builder.environments[VITE_ENVIRONMENT_NAMES.server]\n\n              if (!client) {\n                throw new Error('Client environment not found')\n              }\n\n              if (!server) {\n                throw new Error('SSR environment not found')\n              }\n\n              if (!client.isBuilt) {\n                // Build the client bundle first\n                await builder.build(client)\n              }\n              if (!server.isBuilt) {\n                // Build the SSR bundle\n                await builder.build(server)\n              }\n              const serverBundle = getBundle(VITE_ENVIRONMENT_NAMES.server)\n              await postServerBuild({ builder, startConfig, serverBundle })\n            },\n          },\n        }\n      },\n    },\n    tanStackStartRouter(startPluginOpts, getConfig, corePluginOpts),\n    // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPlugin\n    startCompilerPlugin(corePluginOpts.framework),\n    createServerFnPlugin({ framework: corePluginOpts.framework, directive }),\n\n    TanStackServerFnPlugin({\n      // This is the ID that will be available to look up and import\n      // our server function manifest and resolve its module\n      manifestVirtualImportId: VIRTUAL_MODULES.serverFnManifest,\n      directive,\n      generateFunctionId: startPluginOpts?.serverFns?.generateFunctionId,\n      callers: [\n        {\n          envConsumer: 'client',\n          getRuntimeCode: () =>\n            `import { createClientRpc } from '@tanstack/${corePluginOpts.framework}-start/client-rpc'`,\n          replacer: (d) => `createClientRpc('${d.functionId}')`,\n          envName: VITE_ENVIRONMENT_NAMES.client,\n        },\n        {\n          envConsumer: 'server',\n          getRuntimeCode: () =>\n            `import { createSsrRpc } from '@tanstack/${corePluginOpts.framework}-start/ssr-rpc'`,\n          envName: VITE_ENVIRONMENT_NAMES.server,\n          replacer: (d) => `createSsrRpc('${d.functionId}')`,\n          getServerFnById: corePluginOpts.serverFn?.ssr?.getServerFnById,\n        },\n      ],\n      provider: {\n        getRuntimeCode: () =>\n          `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server-rpc'`,\n        replacer: (d) => `createServerRpc('${d.functionId}', ${d.fn})`,\n        envName: VITE_ENVIRONMENT_NAMES.server,\n      },\n    }),\n    loadEnvPlugin(),\n    startManifestPlugin({\n      getClientBundle: () => getBundle(VITE_ENVIRONMENT_NAMES.client),\n      getConfig,\n    }),\n    devServerPlugin({ getConfig }),\n    {\n      name: 'tanstack-start:core:capture-bundle',\n      applyToEnvironment(e) {\n        return (\n          e.name === VITE_ENVIRONMENT_NAMES.client ||\n          e.name === VITE_ENVIRONMENT_NAMES.server\n        )\n      },\n      enforce: 'post',\n      generateBundle(_options, bundle) {\n        const environment = this.environment.name as ViteEnvironmentNames\n        if (!Object.values(VITE_ENVIRONMENT_NAMES).includes(environment)) {\n          throw new Error(`Unknown environment: ${environment}`)\n        }\n        capturedBundle[environment] = bundle\n      },\n    },\n  ]\n}\n\nfunction defineReplaceEnv<TKey extends string, TValue extends string>(\n  key: TKey,\n  value: TValue,\n): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } {\n  return {\n    [`process.env.${key}`]: JSON.stringify(value),\n    [`import.meta.env.${key}`]: JSON.stringify(value),\n  } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue }\n}\n"],"names":["startConfig"],"mappings":"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"}
+{"version":3,"file":"plugin.js","sources":["../../src/plugin.ts"],"sourcesContent":["import { joinPaths } from '@tanstack/router-core'\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { TanStackServerFnPlugin } from '@tanstack/server-functions-plugin'\nimport * as vite from 'vite'\nimport { crawlFrameworkPkgs } from 'vitefu'\nimport { join } from 'pathe'\nimport { escapePath } from 'tinyglobby'\nimport { startManifestPlugin } from './start-manifest-plugin/plugin'\nimport { startCompilerPlugin } from './start-compiler-plugin/plugin'\nimport { ENTRY_POINTS, VITE_ENVIRONMENT_NAMES } from './constants'\nimport { tanStackStartRouter } from './start-router-plugin/plugin'\nimport { loadEnvPlugin } from './load-env-plugin/plugin'\nimport { devServerPlugin } from './dev-server-plugin/plugin'\nimport { parseStartConfig } from './schema'\nimport { resolveEntry } from './resolve-entries'\nimport {\n  getClientOutputDirectory,\n  getServerOutputDirectory,\n} from './output-directory'\nimport { postServerBuild } from './post-server-build'\nimport { createServerFnPlugin } from './create-server-fn-plugin/plugin'\nimport type { ViteEnvironmentNames } from './constants'\nimport type {\n  TanStackStartInputConfig,\n  TanStackStartOutputConfig,\n} from './schema'\nimport type { PluginOption } from 'vite'\nimport type { CompileStartFrameworkOptions } from './start-compiler-plugin/compilers'\n\nexport interface TanStackStartVitePluginCoreOptions {\n  framework: CompileStartFrameworkOptions\n  defaultEntryPaths: {\n    client: string\n    server: string\n    start: string\n  }\n  serverFn?: {\n    directive?: string\n    ssr?: {\n      getServerFnById?: string\n    }\n    providerEnv?: string\n  }\n}\n\nexport interface ResolvedStartConfig {\n  root: string\n  startFilePath: string | undefined\n  routerFilePath: string\n  srcDirectory: string\n  viteAppBase: string\n}\n\nexport type GetConfigFn = () => {\n  startConfig: TanStackStartOutputConfig\n  resolvedStartConfig: ResolvedStartConfig\n}\n\nfunction isFullUrl(str: string): boolean {\n  try {\n    new URL(str)\n    return true\n  } catch {\n    return false\n  }\n}\n\nexport function TanStackStartVitePluginCore(\n  corePluginOpts: TanStackStartVitePluginCoreOptions,\n  startPluginOpts: TanStackStartInputConfig,\n): Array<PluginOption> {\n  const resolvedStartConfig: ResolvedStartConfig = {\n    root: '',\n    startFilePath: undefined,\n    routerFilePath: '',\n    srcDirectory: '',\n    viteAppBase: '',\n  }\n\n  const directive = corePluginOpts.serverFn?.directive ?? 'use server'\n\n  let startConfig: TanStackStartOutputConfig | null\n  const getConfig: GetConfigFn = () => {\n    if (!resolvedStartConfig.root) {\n      throw new Error(`Cannot get config before root is resolved`)\n    }\n    if (!startConfig) {\n      startConfig = parseStartConfig(\n        startPluginOpts,\n        corePluginOpts,\n        resolvedStartConfig.root,\n      )\n    }\n    return { startConfig, resolvedStartConfig }\n  }\n\n  const capturedBundle: Partial<\n    Record<ViteEnvironmentNames, vite.Rollup.OutputBundle>\n  > = {}\n\n  function getBundle(envName: ViteEnvironmentNames): vite.Rollup.OutputBundle {\n    const bundle = capturedBundle[envName]\n    if (!bundle) {\n      throw new Error(`No bundle captured for environment: ${envName}`)\n    }\n    return bundle\n  }\n\n  const environments: Array<{ name: string; type: 'client' | 'server' }> = [\n    { name: VITE_ENVIRONMENT_NAMES.client, type: 'client' },\n    { name: VITE_ENVIRONMENT_NAMES.server, type: 'server' },\n  ]\n  if (\n    corePluginOpts.serverFn?.providerEnv &&\n    !environments.find((e) => e.name === corePluginOpts.serverFn?.providerEnv)\n  ) {\n    environments.push({\n      name: corePluginOpts.serverFn.providerEnv,\n      type: 'server',\n    })\n  }\n  return [\n    {\n      name: 'tanstack-start-core:config',\n      enforce: 'pre',\n      async config(viteConfig, { command }) {\n        resolvedStartConfig.viteAppBase = viteConfig.base ?? '/'\n        if (!isFullUrl(resolvedStartConfig.viteAppBase)) {\n          resolvedStartConfig.viteAppBase = joinPaths([\n            '/',\n            viteConfig.base,\n            '/',\n          ])\n        }\n        const root = viteConfig.root || process.cwd()\n        resolvedStartConfig.root = root\n\n        const { startConfig } = getConfig()\n        if (startConfig.router.basepath === undefined) {\n          if (!isFullUrl(resolvedStartConfig.viteAppBase)) {\n            startConfig.router.basepath =\n              resolvedStartConfig.viteAppBase.replace(/^\\/|\\/$/g, '')\n          } else {\n            startConfig.router.basepath = '/'\n          }\n        } else {\n          if (command === 'serve' && !viteConfig.server?.middlewareMode) {\n            // when serving, we must ensure that router basepath and viteAppBase are aligned\n            if (\n              !joinPaths(['/', startConfig.router.basepath, '/']).startsWith(\n                joinPaths(['/', resolvedStartConfig.viteAppBase, '/']),\n              )\n            ) {\n              this.error(\n                '[tanstack-start]: During `vite dev`, `router.basepath` must start with the vite `base` config value',\n              )\n            }\n          }\n        }\n\n        const TSS_SERVER_FN_BASE = joinPaths([\n          '/',\n          startConfig.router.basepath,\n          startConfig.serverFns.base,\n          '/',\n        ])\n        const resolvedSrcDirectory = join(root, startConfig.srcDirectory)\n        resolvedStartConfig.srcDirectory = resolvedSrcDirectory\n\n        const startFilePath = resolveEntry({\n          type: 'start entry',\n          configuredEntry: startConfig.start.entry,\n          defaultEntry: 'start',\n          resolvedSrcDirectory,\n          required: false,\n        })\n        resolvedStartConfig.startFilePath = startFilePath\n\n        const routerFilePath = resolveEntry({\n          type: 'router entry',\n          configuredEntry: startConfig.router.entry,\n          defaultEntry: 'router',\n          resolvedSrcDirectory,\n          required: true,\n        })\n        resolvedStartConfig.routerFilePath = routerFilePath\n\n        const clientEntryPath = resolveEntry({\n          type: 'client entry',\n          configuredEntry: startConfig.client.entry,\n          defaultEntry: 'client',\n          resolvedSrcDirectory,\n          required: false,\n        })\n\n        const serverEntryPath = resolveEntry({\n          type: 'server entry',\n          configuredEntry: startConfig.server.entry,\n          defaultEntry: 'server',\n          resolvedSrcDirectory,\n          required: false,\n        })\n\n        const clientAlias = vite.normalizePath(\n          clientEntryPath ?? corePluginOpts.defaultEntryPaths.client,\n        )\n        const serverAlias = vite.normalizePath(\n          serverEntryPath ?? corePluginOpts.defaultEntryPaths.server,\n        )\n        const startAlias = vite.normalizePath(\n          startFilePath ?? corePluginOpts.defaultEntryPaths.start,\n        )\n        const routerAlias = vite.normalizePath(routerFilePath)\n\n        const entryAliasConfiguration: Record<\n          (typeof ENTRY_POINTS)[keyof typeof ENTRY_POINTS],\n          string\n        > = {\n          [ENTRY_POINTS.client]: clientAlias,\n          [ENTRY_POINTS.server]: serverAlias,\n          [ENTRY_POINTS.start]: startAlias,\n          [ENTRY_POINTS.router]: routerAlias,\n        }\n\n        const startPackageName =\n          `@tanstack/${corePluginOpts.framework}-start` as const\n\n        // crawl packages that have start in \"peerDependencies\"\n        // see https://github.com/svitejs/vitefu/blob/d8d82fa121e3b2215ba437107093c77bde51b63b/src/index.js#L95-L101\n\n        // this is currently uncached; could be implemented similarly as vite handles lock file changes\n        // see https://github.com/vitejs/vite/blob/557f797d29422027e8c451ca50dd84bf8c41b5f0/packages/vite/src/node/optimizer/index.ts#L1282\n\n        const crawlFrameworkPkgsResult = await crawlFrameworkPkgs({\n          root: process.cwd(),\n          isBuild: command === 'build',\n          isFrameworkPkgByJson(pkgJson) {\n            const peerDependencies = pkgJson['peerDependencies']\n\n            if (peerDependencies) {\n              if (\n                startPackageName in peerDependencies ||\n                '@tanstack/start-client-core' in peerDependencies\n              ) {\n                return true\n              }\n            }\n\n            return false\n          },\n        })\n\n        return {\n          // see https://vite.dev/config/shared-options.html#apptype\n          // this will prevent vite from injecting middlewares that we don't want\n          appType: viteConfig.appType ?? 'custom',\n          environments: {\n            [VITE_ENVIRONMENT_NAMES.client]: {\n              consumer: 'client',\n              build: {\n                rollupOptions: {\n                  input: {\n                    main: ENTRY_POINTS.client,\n                  },\n                },\n                outDir: getClientOutputDirectory(viteConfig),\n              },\n              optimizeDeps: {\n                exclude: crawlFrameworkPkgsResult.optimizeDeps.exclude,\n                // Ensure user code can be crawled for dependencies\n                entries: [clientAlias, routerAlias].map((entry) =>\n                  // Entries are treated as `tinyglobby` patterns so need to be escaped\n                  escapePath(entry),\n                ),\n              },\n            },\n            [VITE_ENVIRONMENT_NAMES.server]: {\n              consumer: 'server',\n              build: {\n                ssr: true,\n                rollupOptions: {\n                  input:\n                    viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]\n                      ?.build?.rollupOptions?.input ?? ENTRY_POINTS.server,\n                },\n                outDir: getServerOutputDirectory(viteConfig),\n                commonjsOptions: {\n                  include: [/node_modules/],\n                },\n                copyPublicDir:\n                  viteConfig.environments?.[VITE_ENVIRONMENT_NAMES.server]\n                    ?.build?.copyPublicDir ?? false,\n              },\n              optimizeDeps: {\n                // Ensure user code can be crawled for dependencies\n                entries: [serverAlias, startAlias, routerAlias].map((entry) =>\n                  // Entries are treated as `tinyglobby` patterns so need to be escaped\n                  escapePath(entry),\n                ),\n              },\n            },\n          },\n\n          resolve: {\n            noExternal: [\n              // ENTRY_POINTS.start,\n              '@tanstack/start**',\n              `@tanstack/${corePluginOpts.framework}-start**`,\n              ...crawlFrameworkPkgsResult.ssr.noExternal.sort(),\n            ],\n            alias: {\n              ...entryAliasConfiguration,\n            },\n          },\n          /* prettier-ignore */\n          define: {\n            // define is an esbuild function that replaces the any instances of given keys with the given values\n            // i.e: __FRAMEWORK_NAME__ can be replaced with JSON.stringify(\"TanStack Start\")\n            // This is not the same as injecting environment variables.\n\n            ...defineReplaceEnv('TSS_SERVER_FN_BASE', TSS_SERVER_FN_BASE),\n            ...defineReplaceEnv('TSS_CLIENT_OUTPUT_DIR', getClientOutputDirectory(viteConfig)),\n            ...defineReplaceEnv('TSS_ROUTER_BASEPATH', startConfig.router.basepath),\n            ...(command === 'serve' ? defineReplaceEnv('TSS_SHELL', startConfig.spa?.enabled ? 'true' : 'false') : {}),\n            ...defineReplaceEnv('TSS_DEV_SERVER', command === 'serve' ? 'true' : 'false'),\n          },\n          builder: {\n            sharedPlugins: true,\n            async buildApp(builder) {\n              const client = builder.environments[VITE_ENVIRONMENT_NAMES.client]\n              const server = builder.environments[VITE_ENVIRONMENT_NAMES.server]\n\n              if (!client) {\n                throw new Error('Client environment not found')\n              }\n\n              if (!server) {\n                throw new Error('SSR environment not found')\n              }\n\n              if (!client.isBuilt) {\n                // Build the client bundle first\n                await builder.build(client)\n              }\n              if (!server.isBuilt) {\n                // Build the SSR bundle\n                await builder.build(server)\n              }\n              const serverBundle = getBundle(VITE_ENVIRONMENT_NAMES.server)\n              await postServerBuild({ builder, startConfig, serverBundle })\n            },\n          },\n        }\n      },\n    },\n    tanStackStartRouter(startPluginOpts, getConfig, corePluginOpts),\n    // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPlugin\n    startCompilerPlugin({ framework: corePluginOpts.framework, environments }),\n    createServerFnPlugin({\n      framework: corePluginOpts.framework,\n      directive,\n      environments,\n    }),\n\n    TanStackServerFnPlugin({\n      // This is the ID that will be available to look up and import\n      // our server function manifest and resolve its module\n      manifestVirtualImportId: VIRTUAL_MODULES.serverFnManifest,\n      directive,\n      generateFunctionId: startPluginOpts?.serverFns?.generateFunctionId,\n      callers: [\n        {\n          envConsumer: 'client',\n          getRuntimeCode: () =>\n            `import { createClientRpc } from '@tanstack/${corePluginOpts.framework}-start/client-rpc'`,\n          replacer: (d) => `createClientRpc('${d.functionId}')`,\n          envName: VITE_ENVIRONMENT_NAMES.client,\n        },\n        {\n          envConsumer: 'server',\n          getRuntimeCode: () =>\n            `import { createSsrRpc } from '@tanstack/${corePluginOpts.framework}-start/ssr-rpc'`,\n          envName: VITE_ENVIRONMENT_NAMES.server,\n          replacer: (d) => `createSsrRpc('${d.functionId}')`,\n          getServerFnById: corePluginOpts.serverFn?.ssr?.getServerFnById,\n        },\n      ],\n      provider: {\n        getRuntimeCode: () =>\n          `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server-rpc'`,\n        replacer: (d) => `createServerRpc('${d.functionId}', ${d.fn})`,\n        envName:\n          corePluginOpts.serverFn?.providerEnv || VITE_ENVIRONMENT_NAMES.server,\n      },\n    }),\n    loadEnvPlugin(),\n    startManifestPlugin({\n      getClientBundle: () => getBundle(VITE_ENVIRONMENT_NAMES.client),\n      getConfig,\n    }),\n    devServerPlugin({ getConfig }),\n    {\n      name: 'tanstack-start:core:capture-bundle',\n      applyToEnvironment(e) {\n        return (\n          e.name === VITE_ENVIRONMENT_NAMES.client ||\n          e.name === VITE_ENVIRONMENT_NAMES.server\n        )\n      },\n      enforce: 'post',\n      generateBundle(_options, bundle) {\n        const environment = this.environment.name as ViteEnvironmentNames\n        if (!Object.values(VITE_ENVIRONMENT_NAMES).includes(environment)) {\n          throw new Error(`Unknown environment: ${environment}`)\n        }\n        capturedBundle[environment] = bundle\n      },\n    },\n  ]\n}\n\nfunction defineReplaceEnv<TKey extends string, TValue extends string>(\n  key: TKey,\n  value: TValue,\n): { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue } {\n  return {\n    [`process.env.${key}`]: JSON.stringify(value),\n    [`import.meta.env.${key}`]: JSON.stringify(value),\n  } as { [P in `process.env.${TKey}` | `import.meta.env.${TKey}`]: TValue }\n}\n"],"names":["startConfig"],"mappings":"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"}

package/dist/esm/start-compiler-plugin/plugin.d.ts

@@ -1,6 +1,12 @@
-import { Plugin } from 'vite';
+import { PluginOption } from 'vite';
 import { CompileStartFrameworkOptions } from './compilers.js';
 export type TanStackStartViteOptions = {
     globalMiddlewareEntry: string;
 };
-export declare function startCompilerPlugin(framework: CompileStartFrameworkOptions): Plugin;
+export declare function startCompilerPlugin(opts: {
+    framework: CompileStartFrameworkOptions;
+    environments: Array<{
+        name: string;
+        type: 'client' | 'server';
+    }>;
+}): PluginOption;

package/dist/esm/start-compiler-plugin/plugin.js

@@ -5,7 +5,7 @@ import { VIRTUAL_MODULES } from "@tanstack/start-server-core";
 import { normalizePath } from "vite";
 import path from "pathe";
 import { makeIdFiltersToMatchWithQuery } from "@rolldown/pluginutils";
-import { TRANSFORM_ID_REGEX, VITE_ENVIRONMENT_NAMES } from "../constants.js";
+import { TRANSFORM_ID_REGEX } from "../constants.js";
 import { compileStartOutputFactory } from "./compilers.js";
 import { transformFuncs } from "./constants.js";
 const debug = process.env.TSR_VITE_DEBUG && ["true", "start-plugin"].includes(process.env.TSR_VITE_DEBUG);
@@ -20,71 +20,67 @@ function resolvePackage(packageName) {
   const pkgRoot = path.dirname(require2.resolve(packageName + "/package.json"));
   return pkgRoot;
 }
-function startCompilerPlugin(framework) {
-  const compileStartOutput = compileStartOutputFactory(framework);
-  return {
-    name: "tanstack-start-core:compiler",
-    enforce: "pre",
-    applyToEnvironment(env) {
-      return [
-        VITE_ENVIRONMENT_NAMES.client,
-        VITE_ENVIRONMENT_NAMES.server
-      ].includes(env.name);
-    },
-    transform: {
-      filter: {
-        code: tokenRegex,
-        id: {
-          include: TRANSFORM_ID_REGEX,
-          exclude: [
-            VIRTUAL_MODULES.serverFnManifest,
-            // N.B. the following files either just re-export or provide the runtime implementation of those functions
-            // we do not want to include them in the transformation
-            // however, those packages (especially start-client-core ATM) also USE these functions
-            // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed
-            ...makeIdFiltersToMatchWithQuery([
-              ...resolveRuntimeFiles({
-                package: "@tanstack/start-client-core",
-                files: [
-                  "index.js",
-                  "createIsomorphicFn.js",
-                  "envOnly.js",
-                  "serverFnFetcher.js",
-                  "createStart.js",
-                  "createMiddleware.js"
-                ]
-              }),
-              ...resolveRuntimeFiles({
-                package: "@tanstack/start-server-core",
-                files: ["index.js", "server-functions-handler.js"]
-              })
-            ])
+const transformFilter = {
+  code: tokenRegex,
+  id: {
+    include: TRANSFORM_ID_REGEX,
+    exclude: [
+      VIRTUAL_MODULES.serverFnManifest,
+      // N.B. the following files either just re-export or provide the runtime implementation of those functions
+      // we do not want to include them in the transformation
+      // however, those packages (especially start-client-core ATM) also USE these functions
+      // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed
+      ...makeIdFiltersToMatchWithQuery([
+        ...resolveRuntimeFiles({
+          package: "@tanstack/start-client-core",
+          files: [
+            "index.js",
+            "createIsomorphicFn.js",
+            "envOnly.js",
+            "serverFnFetcher.js",
+            "createStart.js",
+            "createMiddleware.js"
           ]
-        }
+        }),
+        ...resolveRuntimeFiles({
+          package: "@tanstack/start-server-core",
+          files: ["index.js", "server-functions-handler.js"]
+        })
+      ])
+    ]
+  }
+};
+function startCompilerPlugin(opts) {
+  const compileStartOutput = compileStartOutputFactory(opts.framework);
+  function perEnvCompilerPlugin(environment) {
+    return {
+      name: `tanstack-start-core:compiler:${environment.name}`,
+      enforce: "pre",
+      applyToEnvironment(env) {
+        return env.name === environment.name;
       },
-      handler(code, id) {
-        const env = this.environment.name === VITE_ENVIRONMENT_NAMES.client ? "client" : this.environment.name === VITE_ENVIRONMENT_NAMES.server ? "server" : (() => {
-          throw new Error(
-            `Environment ${this.environment.name} not configured`
-          );
-        })();
-        const url = pathToFileURL(id);
-        url.searchParams.delete("v");
-        id = fileURLToPath(url).replace(/\\/g, "/");
-        if (debug) console.info(`${env} Compiling Start: `, id);
-        const compiled = compileStartOutput({
-          code,
-          filename: id,
-          env
-        });
-        if (debug) {
-          logDiff(code, compiled.code);
-          console.log("Output:\n", compiled.code + "\n\n");
+      transform: {
+        filter: transformFilter,
+        handler(code, id) {
+          const url = pathToFileURL(id);
+          url.searchParams.delete("v");
+          id = fileURLToPath(url).replace(/\\/g, "/");
+          if (debug) console.info(`${environment.name} Compiling Start: `, id);
+          const compiled = compileStartOutput({
+            code,
+            filename: id,
+            env: environment.type
+          });
+          if (debug) {
+            logDiff(code, compiled.code);
+            console.log("Output:\n", compiled.code + "\n\n");
+          }
+          return compiled;
         }
-        return compiled;
       }
-    }
-  };
+    };
+  }
+  return opts.environments.map(perEnvCompilerPlugin);
 }
 export {
   startCompilerPlugin

package/dist/esm/start-compiler-plugin/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["../../../src/start-compiler-plugin/plugin.ts"],"sourcesContent":["import { fileURLToPath, pathToFileURL } from 'node:url'\nimport { createRequire } from 'node:module'\nimport { logDiff } from '@tanstack/router-utils'\n\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { normalizePath } from 'vite'\nimport path from 'pathe'\nimport { makeIdFiltersToMatchWithQuery } from '@rolldown/pluginutils'\nimport { TRANSFORM_ID_REGEX, VITE_ENVIRONMENT_NAMES } from '../constants'\nimport { compileStartOutputFactory } from './compilers'\nimport { transformFuncs } from './constants'\nimport type { ViteEnvironmentNames } from '../constants'\nimport type { Plugin } from 'vite'\nimport type { CompileStartFrameworkOptions } from './compilers'\n\nconst debug =\n  process.env.TSR_VITE_DEBUG &&\n  ['true', 'start-plugin'].includes(process.env.TSR_VITE_DEBUG)\n\nexport type TanStackStartViteOptions = {\n  globalMiddlewareEntry: string\n}\n\nconst tokenRegex = new RegExp(transformFuncs.join('|'))\n\nconst require = createRequire(import.meta.url)\n\nfunction resolveRuntimeFiles(opts: { package: string; files: Array<string> }) {\n  const pkgRoot = resolvePackage(opts.package)\n  const basePath = path.join(pkgRoot, 'dist', 'esm')\n  return opts.files.map((file) => normalizePath(path.join(basePath, file)))\n}\n\nfunction resolvePackage(packageName: string): string {\n  const pkgRoot = path.dirname(require.resolve(packageName + '/package.json'))\n  return pkgRoot\n}\n\nexport function startCompilerPlugin(\n  framework: CompileStartFrameworkOptions,\n): Plugin {\n  const compileStartOutput = compileStartOutputFactory(framework)\n\n  return {\n    name: 'tanstack-start-core:compiler',\n    enforce: 'pre',\n    applyToEnvironment(env) {\n      return [\n        VITE_ENVIRONMENT_NAMES.client,\n        VITE_ENVIRONMENT_NAMES.server,\n      ].includes(env.name as ViteEnvironmentNames)\n    },\n    transform: {\n      filter: {\n        code: tokenRegex,\n        id: {\n          include: TRANSFORM_ID_REGEX,\n          exclude: [\n            VIRTUAL_MODULES.serverFnManifest,\n            // N.B. the following files either just re-export or provide the runtime implementation of those functions\n            // we do not want to include them in the transformation\n            // however, those packages (especially start-client-core ATM) also USE these functions\n            // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed\n            ...makeIdFiltersToMatchWithQuery([\n              ...resolveRuntimeFiles({\n                package: '@tanstack/start-client-core',\n                files: [\n                  'index.js',\n                  'createIsomorphicFn.js',\n                  'envOnly.js',\n                  'serverFnFetcher.js',\n                  'createStart.js',\n                  'createMiddleware.js',\n                ],\n              }),\n              ...resolveRuntimeFiles({\n                package: '@tanstack/start-server-core',\n                files: ['index.js', 'server-functions-handler.js'],\n              }),\n            ]),\n          ],\n        },\n      },\n      handler(code, id) {\n        const env =\n          this.environment.name === VITE_ENVIRONMENT_NAMES.client\n            ? 'client'\n            : this.environment.name === VITE_ENVIRONMENT_NAMES.server\n              ? 'server'\n              : (() => {\n                  throw new Error(\n                    `Environment ${this.environment.name} not configured`,\n                  )\n                })()\n\n        const url = pathToFileURL(id)\n        url.searchParams.delete('v')\n        id = fileURLToPath(url).replace(/\\\\/g, '/')\n\n        if (debug) console.info(`${env} Compiling Start: `, id)\n\n        const compiled = compileStartOutput({\n          code,\n          filename: id,\n          env,\n        })\n\n        if (debug) {\n          logDiff(code, compiled.code)\n          console.log('Output:\\n', compiled.code + '\\n\\n')\n        }\n\n        return compiled\n      },\n    },\n  }\n}\n"],"names":["require"],"mappings":";;;;;;;;;;AAeA,MAAM,QACJ,QAAQ,IAAI,kBACZ,CAAC,QAAQ,cAAc,EAAE,SAAS,QAAQ,IAAI,cAAc;AAM9D,MAAM,aAAa,IAAI,OAAO,eAAe,KAAK,GAAG,CAAC;AAEtD,MAAMA,WAAU,cAAc,YAAY,GAAG;AAE7C,SAAS,oBAAoB,MAAiD;AAC5E,QAAM,UAAU,eAAe,KAAK,OAAO;AAC3C,QAAM,WAAW,KAAK,KAAK,SAAS,QAAQ,KAAK;AACjD,SAAO,KAAK,MAAM,IAAI,CAAC,SAAS,cAAc,KAAK,KAAK,UAAU,IAAI,CAAC,CAAC;AAC1E;AAEA,SAAS,eAAe,aAA6B;AACnD,QAAM,UAAU,KAAK,QAAQA,SAAQ,QAAQ,cAAc,eAAe,CAAC;AAC3E,SAAO;AACT;AAEO,SAAS,oBACd,WACQ;AACR,QAAM,qBAAqB,0BAA0B,SAAS;AAE9D,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,mBAAmB,KAAK;AACtB,aAAO;AAAA,QACL,uBAAuB;AAAA,QACvB,uBAAuB;AAAA,MAAA,EACvB,SAAS,IAAI,IAA4B;AAAA,IAC7C;AAAA,IACA,WAAW;AAAA,MACT,QAAQ;AAAA,QACN,MAAM;AAAA,QACN,IAAI;AAAA,UACF,SAAS;AAAA,UACT,SAAS;AAAA,YACP,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA,YAKhB,GAAG,8BAA8B;AAAA,cAC/B,GAAG,oBAAoB;AAAA,gBACrB,SAAS;AAAA,gBACT,OAAO;AAAA,kBACL;AAAA,kBACA;AAAA,kBACA;AAAA,kBACA;AAAA,kBACA;AAAA,kBACA;AAAA,gBAAA;AAAA,cACF,CACD;AAAA,cACD,GAAG,oBAAoB;AAAA,gBACrB,SAAS;AAAA,gBACT,OAAO,CAAC,YAAY,6BAA6B;AAAA,cAAA,CAClD;AAAA,YAAA,CACF;AAAA,UAAA;AAAA,QACH;AAAA,MACF;AAAA,MAEF,QAAQ,MAAM,IAAI;AAChB,cAAM,MACJ,KAAK,YAAY,SAAS,uBAAuB,SAC7C,WACA,KAAK,YAAY,SAAS,uBAAuB,SAC/C,YACC,MAAM;AACL,gBAAM,IAAI;AAAA,YACR,eAAe,KAAK,YAAY,IAAI;AAAA,UAAA;AAAA,QAExC,GAAA;AAER,cAAM,MAAM,cAAc,EAAE;AAC5B,YAAI,aAAa,OAAO,GAAG;AAC3B,aAAK,cAAc,GAAG,EAAE,QAAQ,OAAO,GAAG;AAE1C,YAAI,MAAO,SAAQ,KAAK,GAAG,GAAG,sBAAsB,EAAE;AAEtD,cAAM,WAAW,mBAAmB;AAAA,UAClC;AAAA,UACA,UAAU;AAAA,UACV;AAAA,QAAA,CACD;AAED,YAAI,OAAO;AACT,kBAAQ,MAAM,SAAS,IAAI;AAC3B,kBAAQ,IAAI,aAAa,SAAS,OAAO,MAAM;AAAA,QACjD;AAEA,eAAO;AAAA,MACT;AAAA,IAAA;AAAA,EACF;AAEJ;"}
+{"version":3,"file":"plugin.js","sources":["../../../src/start-compiler-plugin/plugin.ts"],"sourcesContent":["import { fileURLToPath, pathToFileURL } from 'node:url'\nimport { createRequire } from 'node:module'\nimport { logDiff } from '@tanstack/router-utils'\n\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { normalizePath } from 'vite'\nimport path from 'pathe'\nimport { makeIdFiltersToMatchWithQuery } from '@rolldown/pluginutils'\nimport { TRANSFORM_ID_REGEX } from '../constants'\nimport { compileStartOutputFactory } from './compilers'\nimport { transformFuncs } from './constants'\nimport type { Plugin, PluginOption } from 'vite'\nimport type { CompileStartFrameworkOptions } from './compilers'\n\nconst debug =\n  process.env.TSR_VITE_DEBUG &&\n  ['true', 'start-plugin'].includes(process.env.TSR_VITE_DEBUG)\n\nexport type TanStackStartViteOptions = {\n  globalMiddlewareEntry: string\n}\n\nconst tokenRegex = new RegExp(transformFuncs.join('|'))\n\nconst require = createRequire(import.meta.url)\n\nfunction resolveRuntimeFiles(opts: { package: string; files: Array<string> }) {\n  const pkgRoot = resolvePackage(opts.package)\n  const basePath = path.join(pkgRoot, 'dist', 'esm')\n  return opts.files.map((file) => normalizePath(path.join(basePath, file)))\n}\n\nfunction resolvePackage(packageName: string): string {\n  const pkgRoot = path.dirname(require.resolve(packageName + '/package.json'))\n  return pkgRoot\n}\n\nconst transformFilter = {\n  code: tokenRegex,\n  id: {\n    include: TRANSFORM_ID_REGEX,\n    exclude: [\n      VIRTUAL_MODULES.serverFnManifest,\n      // N.B. the following files either just re-export or provide the runtime implementation of those functions\n      // we do not want to include them in the transformation\n      // however, those packages (especially start-client-core ATM) also USE these functions\n      // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed\n      ...makeIdFiltersToMatchWithQuery([\n        ...resolveRuntimeFiles({\n          package: '@tanstack/start-client-core',\n          files: [\n            'index.js',\n            'createIsomorphicFn.js',\n            'envOnly.js',\n            'serverFnFetcher.js',\n            'createStart.js',\n            'createMiddleware.js',\n          ],\n        }),\n        ...resolveRuntimeFiles({\n          package: '@tanstack/start-server-core',\n          files: ['index.js', 'server-functions-handler.js'],\n        }),\n      ]),\n    ],\n  },\n}\n\nexport function startCompilerPlugin(opts: {\n  framework: CompileStartFrameworkOptions\n  environments: Array<{ name: string; type: 'client' | 'server' }>\n}): PluginOption {\n  const compileStartOutput = compileStartOutputFactory(opts.framework)\n\n  function perEnvCompilerPlugin(environment: {\n    name: string\n    type: 'client' | 'server'\n  }): Plugin {\n    return {\n      name: `tanstack-start-core:compiler:${environment.name}`,\n      enforce: 'pre',\n      applyToEnvironment(env) {\n        return env.name === environment.name\n      },\n      transform: {\n        filter: transformFilter,\n        handler(code, id) {\n          const url = pathToFileURL(id)\n          url.searchParams.delete('v')\n          id = fileURLToPath(url).replace(/\\\\/g, '/')\n\n          if (debug) console.info(`${environment.name} Compiling Start: `, id)\n\n          const compiled = compileStartOutput({\n            code,\n            filename: id,\n            env: environment.type,\n          })\n\n          if (debug) {\n            logDiff(code, compiled.code)\n            console.log('Output:\\n', compiled.code + '\\n\\n')\n          }\n\n          return compiled\n        },\n      },\n    }\n  }\n  return opts.environments.map(perEnvCompilerPlugin)\n}\n"],"names":["require"],"mappings":";;;;;;;;;;AAcA,MAAM,QACJ,QAAQ,IAAI,kBACZ,CAAC,QAAQ,cAAc,EAAE,SAAS,QAAQ,IAAI,cAAc;AAM9D,MAAM,aAAa,IAAI,OAAO,eAAe,KAAK,GAAG,CAAC;AAEtD,MAAMA,WAAU,cAAc,YAAY,GAAG;AAE7C,SAAS,oBAAoB,MAAiD;AAC5E,QAAM,UAAU,eAAe,KAAK,OAAO;AAC3C,QAAM,WAAW,KAAK,KAAK,SAAS,QAAQ,KAAK;AACjD,SAAO,KAAK,MAAM,IAAI,CAAC,SAAS,cAAc,KAAK,KAAK,UAAU,IAAI,CAAC,CAAC;AAC1E;AAEA,SAAS,eAAe,aAA6B;AACnD,QAAM,UAAU,KAAK,QAAQA,SAAQ,QAAQ,cAAc,eAAe,CAAC;AAC3E,SAAO;AACT;AAEA,MAAM,kBAAkB;AAAA,EACtB,MAAM;AAAA,EACN,IAAI;AAAA,IACF,SAAS;AAAA,IACT,SAAS;AAAA,MACP,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA,MAKhB,GAAG,8BAA8B;AAAA,QAC/B,GAAG,oBAAoB;AAAA,UACrB,SAAS;AAAA,UACT,OAAO;AAAA,YACL;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,UAAA;AAAA,QACF,CACD;AAAA,QACD,GAAG,oBAAoB;AAAA,UACrB,SAAS;AAAA,UACT,OAAO,CAAC,YAAY,6BAA6B;AAAA,QAAA,CAClD;AAAA,MAAA,CACF;AAAA,IAAA;AAAA,EACH;AAEJ;AAEO,SAAS,oBAAoB,MAGnB;AACf,QAAM,qBAAqB,0BAA0B,KAAK,SAAS;AAEnE,WAAS,qBAAqB,aAGnB;AACT,WAAO;AAAA,MACL,MAAM,gCAAgC,YAAY,IAAI;AAAA,MACtD,SAAS;AAAA,MACT,mBAAmB,KAAK;AACtB,eAAO,IAAI,SAAS,YAAY;AAAA,MAClC;AAAA,MACA,WAAW;AAAA,QACT,QAAQ;AAAA,QACR,QAAQ,MAAM,IAAI;AAChB,gBAAM,MAAM,cAAc,EAAE;AAC5B,cAAI,aAAa,OAAO,GAAG;AAC3B,eAAK,cAAc,GAAG,EAAE,QAAQ,OAAO,GAAG;AAE1C,cAAI,MAAO,SAAQ,KAAK,GAAG,YAAY,IAAI,sBAAsB,EAAE;AAEnE,gBAAM,WAAW,mBAAmB;AAAA,YAClC;AAAA,YACA,UAAU;AAAA,YACV,KAAK,YAAY;AAAA,UAAA,CAClB;AAED,cAAI,OAAO;AACT,oBAAQ,MAAM,SAAS,IAAI;AAC3B,oBAAQ,IAAI,aAAa,SAAS,OAAO,MAAM;AAAA,UACjD;AAEA,iBAAO;AAAA,QACT;AAAA,MAAA;AAAA,IACF;AAAA,EAEJ;AACA,SAAO,KAAK,aAAa,IAAI,oBAAoB;AACnD;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-plugin-core",
-  "version": "1.134.20",
+  "version": "1.135.1",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -59,13 +59,13 @@
     "vitefu": "^1.1.1",
     "xmlbuilder2": "^3.1.1",
     "zod": "^3.24.2",
-    "@tanstack/router-core": "1.134.20",
-    "@tanstack/router-plugin": "1.134.20",
     "@tanstack/router-generator": "1.134.20",
+    "@tanstack/router-core": "1.134.20",
+    "@tanstack/router-plugin": "1.135.0",
     "@tanstack/router-utils": "1.133.19",
     "@tanstack/server-functions-plugin": "1.134.5",
-    "@tanstack/start-server-core": "1.134.20",
-    "@tanstack/start-client-core": "1.134.20"
+    "@tanstack/start-client-core": "1.134.20",
+    "@tanstack/start-server-core": "1.134.20"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.6",

package/src/create-server-fn-plugin/handleCreateServerFn.ts

@@ -146,7 +146,7 @@ export function handleCreateServerFn(
             ),
           ),
         ],
-        [t.directive(t.directiveLiteral('use server'))],
+        [t.directive(t.directiveLiteral(opts.directive))],
       ),
     ),
   )

package/src/create-server-fn-plugin/plugin.ts

@@ -1,8 +1,7 @@
-import { TRANSFORM_ID_REGEX, VITE_ENVIRONMENT_NAMES } from '../constants'
+import { TRANSFORM_ID_REGEX } from '../constants'
 import { ServerFnCompiler } from './compiler'
 import type { LookupConfig, LookupKind } from './compiler'
 import type { CompileStartFrameworkOptions } from '../start-compiler-plugin/compilers'
-import type { ViteEnvironmentNames } from '../constants'
 import type { PluginOption } from 'vite'
 
 function cleanId(id: string): string {
@@ -39,44 +38,29 @@ const getLookupConfigurationsForEnv = (
     return [createServerFnConfig]
   }
 }
+const SERVER_FN_LOOKUP = 'server-fn-module-lookup'
 export function createServerFnPlugin(opts: {
   framework: CompileStartFrameworkOptions
   directive: string
+  environments: Array<{ name: string; type: 'client' | 'server' }>
 }): PluginOption {
-  const SERVER_FN_LOOKUP = 'server-fn-module-lookup'
+  const compilers: Record<string /* envName */, ServerFnCompiler> = {}
 
-  const compilers: Partial<Record<ViteEnvironmentNames, ServerFnCompiler>> = {}
-  return [
-    {
-      name: 'tanstack-start-core:capture-server-fn-module-lookup',
-      // we only need this plugin in dev mode
-      apply: 'serve',
-      applyToEnvironment(env) {
-        return [
-          VITE_ENVIRONMENT_NAMES.client,
-          VITE_ENVIRONMENT_NAMES.server,
-        ].includes(env.name as ViteEnvironmentNames)
-      },
-      transform: {
-        filter: {
-          id: new RegExp(`${SERVER_FN_LOOKUP}$`),
-        },
-        handler(code, id) {
-          const compiler =
-            compilers[this.environment.name as ViteEnvironmentNames]
-          compiler?.ingestModule({ code, id: cleanId(id) })
-        },
-      },
-    },
-    {
-      name: 'tanstack-start-core::server-fn',
-      enforce: 'pre',
+  function perEnvServerFnPlugin(environment: {
+    name: string
+    type: 'client' | 'server'
+  }): PluginOption {
+    // in server environments, we don't transform middleware calls
+    const transformCodeFilter =
+      environment.type === 'client'
+        ? [/\.\s*handler\(/, /\.\s*createMiddleware\(\)/]
+        : [/\.\s*handler\(/]
 
+    return {
+      name: `tanstack-start-core::server-fn:${environment.name}`,
+      enforce: 'pre',
       applyToEnvironment(env) {
-        return [
-          VITE_ENVIRONMENT_NAMES.client,
-          VITE_ENVIRONMENT_NAMES.server,
-        ].includes(env.name as ViteEnvironmentNames)
+        return env.name === environment.name
       },
       transform: {
         filter: {
@@ -85,32 +69,18 @@ export function createServerFnPlugin(opts: {
             include: TRANSFORM_ID_REGEX,
           },
           code: {
-            // TODO apply this plugin with a different filter per environment so that .createMiddleware() calls are not scanned in server env
-            // only scan files that mention `.handler(` | `.createMiddleware()`
-            include: [/\.\s*handler\(/, /\.\s*createMiddleware\(\)/],
+            include: transformCodeFilter,
           },
         },
         async handler(code, id) {
-          let compiler =
-            compilers[this.environment.name as ViteEnvironmentNames]
+          let compiler = compilers[this.environment.name]
           if (!compiler) {
-            const env =
-              this.environment.name === VITE_ENVIRONMENT_NAMES.client
-                ? 'client'
-                : this.environment.name === VITE_ENVIRONMENT_NAMES.server
-                  ? 'server'
-                  : (() => {
-                      throw new Error(
-                        `Environment ${this.environment.name} not configured`,
-                      )
-                    })()
-
             compiler = new ServerFnCompiler({
-              env,
+              env: environment.type,
               directive: opts.directive,
-              lookupKinds: LookupKindsPerEnv[env],
+              lookupKinds: LookupKindsPerEnv[environment.type],
               lookupConfigurations: getLookupConfigurationsForEnv(
-                env,
+                environment.type,
                 opts.framework,
               ),
               loadModule: async (id: string) => {
@@ -147,7 +117,7 @@ export function createServerFnPlugin(opts: {
                 return null
               },
             })
-            compilers[this.environment.name as ViteEnvironmentNames] = compiler
+            compilers[this.environment.name] = compiler
           }
 
           id = cleanId(id)
@@ -157,8 +127,7 @@ export function createServerFnPlugin(opts: {
       },
 
       hotUpdate(ctx) {
-        const compiler =
-          compilers[this.environment.name as ViteEnvironmentNames]
+        const compiler = compilers[this.environment.name]
 
         ctx.modules.forEach((m) => {
           if (m.id) {
@@ -173,6 +142,27 @@ export function createServerFnPlugin(opts: {
           }
         })
       },
+    }
+  }
+
+  return [
+    ...opts.environments.map(perEnvServerFnPlugin),
+    {
+      name: 'tanstack-start-core:capture-server-fn-module-lookup',
+      // we only need this plugin in dev mode
+      apply: 'serve',
+      applyToEnvironment(env) {
+        return !!opts.environments.find((e) => e.name === env.name)
+      },
+      transform: {
+        filter: {
+          id: new RegExp(`${SERVER_FN_LOOKUP}$`),
+        },
+        handler(code, id) {
+          const compiler = compilers[this.environment.name]
+          compiler?.ingestModule({ code, id: cleanId(id) })
+        },
+      },
     },
   ]
 }

package/src/plugin.ts

@@ -39,6 +39,7 @@ export interface TanStackStartVitePluginCoreOptions {
     ssr?: {
       getServerFnById?: string
     }
+    providerEnv?: string
   }
 }
 
@@ -105,6 +106,19 @@ export function TanStackStartVitePluginCore(
     return bundle
   }
 
+  const environments: Array<{ name: string; type: 'client' | 'server' }> = [
+    { name: VITE_ENVIRONMENT_NAMES.client, type: 'client' },
+    { name: VITE_ENVIRONMENT_NAMES.server, type: 'server' },
+  ]
+  if (
+    corePluginOpts.serverFn?.providerEnv &&
+    !environments.find((e) => e.name === corePluginOpts.serverFn?.providerEnv)
+  ) {
+    environments.push({
+      name: corePluginOpts.serverFn.providerEnv,
+      type: 'server',
+    })
+  }
   return [
     {
       name: 'tanstack-start-core:config',
@@ -341,8 +355,12 @@ export function TanStackStartVitePluginCore(
     },
     tanStackStartRouter(startPluginOpts, getConfig, corePluginOpts),
     // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPlugin
-    startCompilerPlugin(corePluginOpts.framework),
-    createServerFnPlugin({ framework: corePluginOpts.framework, directive }),
+    startCompilerPlugin({ framework: corePluginOpts.framework, environments }),
+    createServerFnPlugin({
+      framework: corePluginOpts.framework,
+      directive,
+      environments,
+    }),
 
     TanStackServerFnPlugin({
       // This is the ID that will be available to look up and import
@@ -371,7 +389,8 @@ export function TanStackStartVitePluginCore(
         getRuntimeCode: () =>
           `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server-rpc'`,
         replacer: (d) => `createServerRpc('${d.functionId}', ${d.fn})`,
-        envName: VITE_ENVIRONMENT_NAMES.server,
+        envName:
+          corePluginOpts.serverFn?.providerEnv || VITE_ENVIRONMENT_NAMES.server,
       },
     }),
     loadEnvPlugin(),

package/src/start-compiler-plugin/plugin.ts

@@ -6,11 +6,10 @@ import { VIRTUAL_MODULES } from '@tanstack/start-server-core'
 import { normalizePath } from 'vite'
 import path from 'pathe'
 import { makeIdFiltersToMatchWithQuery } from '@rolldown/pluginutils'
-import { TRANSFORM_ID_REGEX, VITE_ENVIRONMENT_NAMES } from '../constants'
+import { TRANSFORM_ID_REGEX } from '../constants'
 import { compileStartOutputFactory } from './compilers'
 import { transformFuncs } from './constants'
-import type { ViteEnvironmentNames } from '../constants'
-import type { Plugin } from 'vite'
+import type { Plugin, PluginOption } from 'vite'
 import type { CompileStartFrameworkOptions } from './compilers'
 
 const debug =
@@ -36,82 +35,77 @@ function resolvePackage(packageName: string): string {
   return pkgRoot
 }
 
-export function startCompilerPlugin(
-  framework: CompileStartFrameworkOptions,
-): Plugin {
-  const compileStartOutput = compileStartOutputFactory(framework)
-
-  return {
-    name: 'tanstack-start-core:compiler',
-    enforce: 'pre',
-    applyToEnvironment(env) {
-      return [
-        VITE_ENVIRONMENT_NAMES.client,
-        VITE_ENVIRONMENT_NAMES.server,
-      ].includes(env.name as ViteEnvironmentNames)
-    },
-    transform: {
-      filter: {
-        code: tokenRegex,
-        id: {
-          include: TRANSFORM_ID_REGEX,
-          exclude: [
-            VIRTUAL_MODULES.serverFnManifest,
-            // N.B. the following files either just re-export or provide the runtime implementation of those functions
-            // we do not want to include them in the transformation
-            // however, those packages (especially start-client-core ATM) also USE these functions
-            // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed
-            ...makeIdFiltersToMatchWithQuery([
-              ...resolveRuntimeFiles({
-                package: '@tanstack/start-client-core',
-                files: [
-                  'index.js',
-                  'createIsomorphicFn.js',
-                  'envOnly.js',
-                  'serverFnFetcher.js',
-                  'createStart.js',
-                  'createMiddleware.js',
-                ],
-              }),
-              ...resolveRuntimeFiles({
-                package: '@tanstack/start-server-core',
-                files: ['index.js', 'server-functions-handler.js'],
-              }),
-            ]),
+const transformFilter = {
+  code: tokenRegex,
+  id: {
+    include: TRANSFORM_ID_REGEX,
+    exclude: [
+      VIRTUAL_MODULES.serverFnManifest,
+      // N.B. the following files either just re-export or provide the runtime implementation of those functions
+      // we do not want to include them in the transformation
+      // however, those packages (especially start-client-core ATM) also USE these functions
+      // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed
+      ...makeIdFiltersToMatchWithQuery([
+        ...resolveRuntimeFiles({
+          package: '@tanstack/start-client-core',
+          files: [
+            'index.js',
+            'createIsomorphicFn.js',
+            'envOnly.js',
+            'serverFnFetcher.js',
+            'createStart.js',
+            'createMiddleware.js',
           ],
-        },
-      },
-      handler(code, id) {
-        const env =
-          this.environment.name === VITE_ENVIRONMENT_NAMES.client
-            ? 'client'
-            : this.environment.name === VITE_ENVIRONMENT_NAMES.server
-              ? 'server'
-              : (() => {
-                  throw new Error(
-                    `Environment ${this.environment.name} not configured`,
-                  )
-                })()
+        }),
+        ...resolveRuntimeFiles({
+          package: '@tanstack/start-server-core',
+          files: ['index.js', 'server-functions-handler.js'],
+        }),
+      ]),
+    ],
+  },
+}
 
-        const url = pathToFileURL(id)
-        url.searchParams.delete('v')
-        id = fileURLToPath(url).replace(/\\/g, '/')
+export function startCompilerPlugin(opts: {
+  framework: CompileStartFrameworkOptions
+  environments: Array<{ name: string; type: 'client' | 'server' }>
+}): PluginOption {
+  const compileStartOutput = compileStartOutputFactory(opts.framework)
 
-        if (debug) console.info(`${env} Compiling Start: `, id)
+  function perEnvCompilerPlugin(environment: {
+    name: string
+    type: 'client' | 'server'
+  }): Plugin {
+    return {
+      name: `tanstack-start-core:compiler:${environment.name}`,
+      enforce: 'pre',
+      applyToEnvironment(env) {
+        return env.name === environment.name
+      },
+      transform: {
+        filter: transformFilter,
+        handler(code, id) {
+          const url = pathToFileURL(id)
+          url.searchParams.delete('v')
+          id = fileURLToPath(url).replace(/\\/g, '/')
+
+          if (debug) console.info(`${environment.name} Compiling Start: `, id)
 
-        const compiled = compileStartOutput({
-          code,
-          filename: id,
-          env,
-        })
+          const compiled = compileStartOutput({
+            code,
+            filename: id,
+            env: environment.type,
+          })
 
-        if (debug) {
-          logDiff(code, compiled.code)
-          console.log('Output:\n', compiled.code + '\n\n')
-        }
+          if (debug) {
+            logDiff(code, compiled.code)
+            console.log('Output:\n', compiled.code + '\n\n')
+          }
 
-        return compiled
+          return compiled
+        },
       },
-    },
+    }
   }
+  return opts.environments.map(perEnvCompilerPlugin)
 }