@tanstack/start-plugin-core 1.169.12 → 1.169.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-plugin-core",
-  "version": "1.169.12",
+  "version": "1.169.14",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -87,11 +87,11 @@
     "xmlbuilder2": "^4.0.3",
     "zod": "^3.24.2",
     "@tanstack/router-core": "1.169.1",
+    "@tanstack/router-plugin": "1.167.32",
     "@tanstack/router-generator": "1.166.39",
-    "@tanstack/router-plugin": "1.167.31",
-    "@tanstack/router-utils": "1.161.7",
     "@tanstack/start-client-core": "1.168.1",
-    "@tanstack/start-server-core": "1.167.26"
+    "@tanstack/start-server-core": "1.167.26",
+    "@tanstack/router-utils": "1.161.7"
   },
   "devDependencies": {
     "@rsbuild/core": "^2.0.1",

package/src/index.ts

@@ -1,3 +1,8 @@
 export type { TanStackStartInputConfig } from './schema'
-export type { TanStackStartCoreOptions } from './types'
+export type {
+  StartCompilerImportTransform,
+  StartCompilerTransformCandidate,
+  StartCompilerTransformContext,
+  TanStackStartCoreOptions,
+} from './types'
 export { START_ENVIRONMENT_NAMES } from './constants'

package/src/rsbuild/index.ts

@@ -1,4 +1,9 @@
 export { RSBUILD_ENVIRONMENT_NAMES } from './planning'
 export type { TanStackStartRsbuildPluginCoreOptions } from './types'
 export type { TanStackStartRsbuildInputConfig } from './schema'
+export type {
+  StartCompilerImportTransform,
+  StartCompilerTransformCandidate,
+  StartCompilerTransformContext,
+} from '../types'
 export { tanStackStartRsbuild } from './plugin'

package/src/rsbuild/plugin.ts

@@ -239,6 +239,9 @@ export function tanStackStartRsbuild(
         root: () => resolvedStartConfig.root || process.cwd(),
         providerEnvName: serverFnProviderEnv,
         generateFunctionId: startPluginOpts.serverFns?.generateFunctionId,
+        compilerTransforms: corePluginOpts.compilerTransforms,
+        serverFnProviderModuleDirectives:
+          corePluginOpts.serverFnProviderModuleDirectives,
         serverFnsById,
         onServerFnsByIdChange: () => {
           updateServerFnResolver?.()

package/src/rsbuild/start-compiler-host.ts

@@ -11,7 +11,10 @@ import {
 import { cleanId } from '../start-compiler/utils'
 import { RSBUILD_ENVIRONMENT_NAMES } from './planning'
 import type { RsbuildPluginAPI, Rspack } from '@rsbuild/core'
-import type { CompileStartFrameworkOptions } from '../types'
+import type {
+  CompileStartFrameworkOptions,
+  StartCompilerImportTransform,
+} from '../types'
 import type {
   DevServerFnModuleSpecifierEncoder,
   GenerateFunctionIdFnOptional,
@@ -36,6 +39,8 @@ export interface StartCompilerHostOptions {
   root: string | (() => string)
   providerEnvName: string
   generateFunctionId?: GenerateFunctionIdFnOptional
+  compilerTransforms?: Array<StartCompilerImportTransform> | undefined
+  serverFnProviderModuleDirectives?: ReadonlyArray<string> | undefined
   serverFnsById?: Record<string, ServerFn>
   onServerFnsByIdChange?: () => void
 }
@@ -79,11 +84,21 @@ export function registerStartCompilerTransforms(
   // Pre-compute code filter patterns per environment type
   const codeFilters: Record<'client' | 'server', Array<RegExp>> = {
     client: getTransformCodeFilterForEnv('client'),
-    server: getTransformCodeFilterForEnv('server'),
+    server: getTransformCodeFilterForEnv('server', {
+      compilerTransforms: opts.compilerTransforms,
+    }),
   }
 
   for (const env of environments) {
     const envCodeFilters = codeFilters[env.type]
+    const compilerTransforms =
+      env.name === RSBUILD_ENVIRONMENT_NAMES.server
+        ? opts.compilerTransforms
+        : undefined
+    const serverFnProviderModuleDirectives =
+      env.name === opts.providerEnvName
+        ? opts.serverFnProviderModuleDirectives
+        : undefined
 
     api.transform(
       {
@@ -113,6 +128,8 @@ export function registerStartCompilerTransforms(
               framework: opts.framework,
               providerEnvName: opts.providerEnvName,
               generateFunctionId: opts.generateFunctionId,
+              compilerTransforms,
+              serverFnProviderModuleDirectives,
               onServerFnsById,
               getKnownServerFns: () => serverFnsById,
               encodeModuleSpecifierInDev: isDev
@@ -180,7 +197,9 @@ export function registerStartCompilerTransforms(
             compilers.set(env.name, compiler)
           }
 
-          const detectedKinds = detectKindsInCode(code, env.type)
+          const detectedKinds = detectKindsInCode(code, env.type, {
+            compilerTransforms,
+          })
           const result = await compiler.compile({ id, code, detectedKinds })
 
           if (!result) {

package/src/rsbuild/start-router-plugin.ts

@@ -1,4 +1,9 @@
 import path from 'pathe'
+import { createRouterPluginContext } from '@tanstack/router-plugin/context'
+import {
+  TanStackRouterCodeSplitterRspack,
+  TanStackRouterGeneratorRspack,
+} from '@tanstack/router-plugin/rspack'
 import { routesManifestPlugin } from '../start-router-plugin/generator-plugins/routes-manifest-plugin'
 import { prerenderRoutesPlugin } from '../start-router-plugin/generator-plugins/prerender-routes-plugin'
 import { buildRouteTreeFileFooterFromConfig } from '../start-router-plugin/route-tree-footer'
@@ -14,8 +19,6 @@ import type { TanStackStartRsbuildInputConfig } from './schema'
  * The router-plugin package exports rspack-compatible unplugin wrappers:
  * - TanStackRouterGeneratorRspack: file-based route generation
  * - TanStackRouterCodeSplitterRspack: route code splitting
- *
- * These are dynamically imported to avoid hard dependency on router-plugin/rspack.
  */
 export function registerRouterPlugins(
   api: RsbuildPluginAPI,
@@ -25,17 +28,17 @@ export function registerRouterPlugins(
     startPluginOpts: TanStackStartRsbuildInputConfig
   },
 ): void {
-  api.modifyRspackConfig(async (config, utils) => {
+  const routerPluginContext = createRouterPluginContext()
+
+  api.modifyRspackConfig((config, utils) => {
     const envName = utils.environment.name
     const { startConfig } = opts.getConfig()
     const routerConfig = startConfig.router
 
     // Generator only runs once — register for the client environment
     if (envName === RSBUILD_ENVIRONMENT_NAMES.client) {
-      try {
-        const { TanStackRouterGeneratorRspack } =
-          await import('@tanstack/router-plugin/rspack')
-        const generatorPlugin = TanStackRouterGeneratorRspack({
+      const generatorPlugin = TanStackRouterGeneratorRspack(
+        {
           ...routerConfig,
           target: opts.corePluginOpts.framework,
           routeTreeFileFooter: () => {
@@ -53,11 +56,10 @@ export function registerRouterPlugins(
               ? [prerenderRoutesPlugin()]
               : []),
           ],
-        })
-        utils.appendPlugins(generatorPlugin as any)
-      } catch {
-        // router-plugin/rspack not available — skip
-      }
+        },
+        routerPluginContext,
+      )
+      utils.appendPlugins(generatorPlugin as any)
     }
 
     if (
@@ -65,10 +67,8 @@ export function registerRouterPlugins(
       envName === RSBUILD_ENVIRONMENT_NAMES.server
     ) {
       const isClient = envName === RSBUILD_ENVIRONMENT_NAMES.client
-      try {
-        const { TanStackRouterCodeSplitterRspack } =
-          await import('@tanstack/router-plugin/rspack')
-        const splitterPlugin = TanStackRouterCodeSplitterRspack({
+      const splitterPlugin = TanStackRouterCodeSplitterRspack(
+        {
           ...routerConfig,
           target: opts.corePluginOpts.framework,
           codeSplittingOptions: {
@@ -76,11 +76,10 @@ export function registerRouterPlugins(
             deleteNodes: isClient ? ['ssr', 'server', 'headers'] : undefined,
             addHmr: isClient,
           },
-        })
-        utils.appendPlugins(splitterPlugin as any)
-      } catch {
-        // router-plugin/rspack not available — skip
-      }
+        },
+        routerPluginContext,
+      )
+      utils.appendPlugins(splitterPlugin as any)
     }
   })
 }