@tanstack/router-plugin 1.121.7 → 1.121.10

package/src/core/code-splitter/compilers.ts

@@ -706,12 +706,9 @@ export function compileCodeSplitVirtualRoute(
  */
 export function detectCodeSplitGroupingsFromRoute(opts: ParseAstOptions): {
   groupings: CodeSplitGroupings | undefined
-  routeId: string
 } {
   const ast = parseAst(opts)
 
-  let routeId = ''
-
   let codeSplitGroupings: CodeSplitGroupings | undefined = undefined
 
   babel.traverse(ast, {
@@ -732,26 +729,11 @@ export function detectCodeSplitGroupingsFromRoute(opts: ParseAstOptions): {
               return
             }
 
-            if (t.isCallExpression(path.parentPath.node)) {
-              // Extract out the routeId
-              if (t.isCallExpression(path.parentPath.node.callee)) {
-                const callee = path.parentPath.node.callee
-
-                if (t.isIdentifier(callee.callee)) {
-                  const firstArg = callee.arguments[0]
-                  if (t.isStringLiteral(firstArg)) {
-                    routeId = firstArg.value
-                  }
-                }
-              }
-
-              // Extracting the codeSplitGroupings
-              const options = resolveIdentifier(
-                path,
-                path.parentPath.node.arguments[0],
-              )
-              if (t.isObjectExpression(options)) {
-                options.properties.forEach((prop) => {
+            function babelHandleSplittingGroups(
+              routeOptions: t.Node | undefined,
+            ) {
+              if (t.isObjectExpression(routeOptions)) {
+                routeOptions.properties.forEach((prop) => {
                   if (t.isObjectProperty(prop)) {
                     if (t.isIdentifier(prop.key)) {
                       if (prop.key.name === 'codeSplitGroupings') {
@@ -786,13 +768,32 @@ export function detectCodeSplitGroupingsFromRoute(opts: ParseAstOptions): {
                 })
               }
             }
+
+            // Extracting the codeSplitGroupings
+            if (t.isCallExpression(path.parentPath.node)) {
+              // createFileRoute('/')({ ... })
+              const options = resolveIdentifier(
+                path,
+                path.parentPath.node.arguments[0],
+              )
+
+              babelHandleSplittingGroups(options)
+            } else if (t.isVariableDeclarator(path.parentPath.node)) {
+              // createFileRoute({ ... })
+              const caller = resolveIdentifier(path, path.parentPath.node.init)
+
+              if (t.isCallExpression(caller)) {
+                const options = resolveIdentifier(path, caller.arguments[0])
+                babelHandleSplittingGroups(options)
+              }
+            }
           },
         })
       },
     },
   })
 
-  return { groupings: codeSplitGroupings, routeId }
+  return { groupings: codeSplitGroupings }
 }
 
 function getImportSpecifierAndPathFromLocalName(

package/src/core/route-autoimport-plugin.ts

@@ -24,7 +24,7 @@ export const unpluginRouteAutoImportFactory: UnpluginFactory<
         code: /createFileRoute\(|createLazyFileRoute\(/,
       },
       handler(code, id) {
-        if (!globalThis.TSR_ROUTE_FILES?.has(id)) {
+        if (!globalThis.TSR_ROUTES_BY_ID_MAP?.has(id)) {
           return null
         }
         let routeType: 'createFileRoute' | 'createLazyFileRoute'

package/src/core/router-code-splitter-plugin.ts

@@ -19,7 +19,7 @@ import {
 import { decodeIdentifier } from './code-splitter/path-ids'
 import { debug } from './utils'
 import type { CodeSplitGroupings, SplitRouteIdentNodes } from './constants'
-
+import type { GetRoutesByFileMapResultValue } from '@tanstack/router-generator'
 import type { Config } from './config'
 import type {
   UnpluginContextMeta,
@@ -44,8 +44,11 @@ const bannedBeforeExternalPlugins: Array<BannedBeforeExternalPlugin> = [
 ]
 
 class FoundPluginInBeforeCode extends Error {
-  constructor(externalPlugin: BannedBeforeExternalPlugin, framework: string) {
-    super(`We detected that the '${externalPlugin.pkg}' was passed before '@tanstack/router-plugin'. Please make sure that '@tanstack/router-plugin' is passed before '${externalPlugin.pkg}' and try again: 
+  constructor(
+    externalPlugin: BannedBeforeExternalPlugin,
+    pluginFramework: string,
+  ) {
+    super(`We detected that the '${externalPlugin.pkg}' was passed before '@tanstack/router-plugin/${pluginFramework}'. Please make sure that '@tanstack/router-plugin' is passed before '${externalPlugin.pkg}' and try again: 
 e.g.
 plugins: [
   tanstackRouter(), // Place this before ${externalPlugin.usage}
@@ -78,6 +81,7 @@ export const unpluginRouterCodeSplitterFactory: UnpluginFactory<
   const handleCompilingReferenceFile = (
     code: string,
     id: string,
+    generatorNodeInfo: GetRoutesByFileMapResultValue,
   ): UnpluginTransformResult => {
     if (debug) console.info('Compiling Route: ', id)
 
@@ -98,7 +102,7 @@ export const unpluginRouterCodeSplitterFactory: UnpluginFactory<
     const userShouldSplitFn = getShouldSplitFn()
 
     const pluginSplitBehavior = userShouldSplitFn?.({
-      routeId: fromCode.routeId,
+      routeId: generatorNodeInfo.routePath,
     }) as CodeSplitGroupings | undefined
 
     if (pluginSplitBehavior) {
@@ -180,10 +184,8 @@ export const unpluginRouterCodeSplitterFactory: UnpluginFactory<
           code: 'createFileRoute(',
         },
         handler(code, id) {
-          if (
-            globalThis.TSR_ROUTE_FILES?.has(id) &&
-            code.includes('createFileRoute(')
-          ) {
+          const generatorFileInfo = globalThis.TSR_ROUTES_BY_ID_MAP?.get(id)
+          if (generatorFileInfo && code.includes('createFileRoute(')) {
             for (const externalPlugin of bannedBeforeExternalPlugins) {
               if (!externalPlugin.frameworks.includes(framework)) {
                 continue
@@ -194,7 +196,7 @@ export const unpluginRouterCodeSplitterFactory: UnpluginFactory<
               }
             }
 
-            return handleCompilingReferenceFile(code, id)
+            return handleCompilingReferenceFile(code, id, generatorFileInfo)
           }
 
           return null

package/src/core/router-generator-plugin.ts

@@ -51,7 +51,7 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory<
 
     try {
       await generator.run(generatorEvent)
-      globalThis.TSR_ROUTE_FILES = generator.getRouteFileList()
+      globalThis.TSR_ROUTES_BY_ID_MAP = generator.getRoutesByFileMap()
     } catch (e) {
       console.error(e)
     }
@@ -74,7 +74,9 @@ export const unpluginRouterGeneratorFactory: UnpluginFactory<
         initConfigAndGenerator()
       },
       async buildStart() {
-        if (this.environment.config.consumer === 'server') {
+        // to support vite 5, we need to optionally chain the access to the environment
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        if (this.environment?.config?.consumer === 'server') {
           // When building in environment mode, we only need to generate routes
           // for the client environment
           return

package/src/core/router-hmr-plugin.ts

@@ -25,7 +25,7 @@ export const unpluginRouterHmrFactory: UnpluginFactory<
         code: 'createFileRoute(',
       },
       handler(code, id) {
-        if (!globalThis.TSR_ROUTE_FILES?.has(id)) {
+        if (!globalThis.TSR_ROUTES_BY_ID_MAP?.has(id)) {
           return null
         }
 

package/src/global.d.ts

@@ -1,5 +1,7 @@
 /* eslint-disable no-var */
+import type { GetRoutesByFileMapResult } from '@tanstack/router-generator'
+
 declare global {
-  var TSR_ROUTE_FILES: Set<string> | undefined
+  var TSR_ROUTES_BY_ID_MAP: GetRoutesByFileMapResult | undefined
 }
 export {}