fix: generator fixes (#4362)

Author: schiller-manuel

.github/workflows/ci.yml

@@ -26,15 +26,13 @@ jobs:
     name: Test & Publish
     if: github.repository_owner == 'TanStack'
     runs-on: ubuntu-latest
-    env:
-      TSR_TMP_DIR: ./tmp
     steps:
       - name: Checkout
         uses: actions/[email protected]
         with:
           fetch-depth: 0
       - name: Start Nx Agents
-        run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml" --with-env-vars="TSR_TMP_DIR"
+        run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml"
       - name: Setup Tools
         uses: tanstack/config/.github/setup@main
       - name: Run Tests

.github/workflows/pr.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Start Nx Agents
-        run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml" --with-env-vars="TSR_TMP_DIR"
+        run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml"
       - name: Setup Tools
         uses: tanstack/config/.github/setup@main
       - name: Get base and head commits for `nx affected`

.gitignore

@@ -74,6 +74,7 @@ vite.config.ts.timestamp_*
 # Handling VSCode settings
 /.vscode/
 !/examples/react/**/.vscode/settings.json
-**/.tanstack-start/build
 
 **/llms
+
+**/.tanstack

docs/router/api/file-based-routing.md

@@ -200,4 +200,4 @@ Atomic file writes (route files and the generated route tree file) are implement
 This config option allows to configure the path of the temp directory that will be used for creating those temporary files.
 If it is a relative path, it will be resolved to the current working directory.
 If this value is not set, `process.env.TSR_TMP_DIR` will be used.
-If `process.env.TSR_TMP_DIR` is not set, it will default to `os.tmpdir()`.
+If `process.env.TSR_TMP_DIR` is not set, it will default to `.tanstack/tmp` relative to the current working directory.

e2e/react-start/website/.gitignore

@@ -17,4 +17,4 @@ yarn.lock
 /blob-report/
 /playwright/.cache/
 
-.tanstack-start/build
+.tanstack

examples/react/start-basic/.gitignore

@@ -17,4 +17,4 @@ yarn.lock
 /playwright-report/
 /blob-report/
 /playwright/.cache/
-.tanstack-start/build
+.tanstack

examples/react/start-tailwind-v4/.gitignore

@@ -17,4 +17,4 @@ yarn.lock
 /playwright-report/
 /blob-report/
 /playwright/.cache/
-.tanstack-start/build
+.tanstack

packages/router-generator/src/config.ts

@@ -1,5 +1,4 @@
 import path from 'node:path'
-import { tmpdir } from 'node:os'
 import { existsSync, mkdirSync, readFileSync } from 'node:fs'
 import { z } from 'zod'
 import { virtualRootRouteSchema } from './filesystem/virtual/config'
@@ -121,7 +120,10 @@ export function getConfig(
     }
   }
 
-  const resolveTmpDir = (dir: string) => {
+  const resolveTmpDir = (dir: string | Array<string>) => {
+    if (Array.isArray(dir)) {
+      dir = path.join(...dir)
+    }
     if (!path.isAbsolute(dir)) {
       dir = path.resolve(process.cwd(), dir)
     }
@@ -134,7 +136,7 @@ export function getConfig(
   } else if (process.env.TSR_TMP_DIR) {
     config.tmpDir = resolveTmpDir(process.env.TSR_TMP_DIR)
   } else {
-    config.tmpDir = tmpdir()
+    config.tmpDir = resolveTmpDir(['.tanstack', 'tmp'])
   }
 
   validateConfig(config)

packages/router-generator/src/generator.ts

@@ -178,7 +178,7 @@ export class Generator {
     this.root = opts.root
     this.fs = opts.fs || DefaultFileSystem
     this.tmpDir = this.fs.mkdtempSync(
-      path.join(this.config.tmpDir, 'tanstack-router-'),
+      path.join(this.config.tmpDir, 'router-generator-'),
     )
     this.generatedRouteTreePath = path.resolve(this.config.generatedRouteTree)
     this.targetTemplate = getTargetTemplate(this.config)
@@ -1050,7 +1050,9 @@ ${acc.routeTree.map((child) => `${child.variableName}${exportName}: typeof ${get
     const result = await this.isRouteFileCacheFresh(node)
 
     if (result.status === 'fresh') {
-      return false
+      node.exports = result.cacheEntry.exports
+      this.routeNodeShadowCache.set(node.fullPath, result.cacheEntry)
+      return result.exportsChanged
     }
     const rootNodeFile = await this.fs.readFile(node.fullPath)
     if (rootNodeFile === 'file-not-existing') {

packages/router-generator/src/transform/transform.ts

@@ -290,7 +290,7 @@ async function fixTransformedOutputText({
   originalCode: string
   transformedCode: string
   sourceMap: RawSourceMap
-  preferredQuote: '"' | "'" | '`'
+  preferredQuote: '"' | "'"
 }) {
   const originalLines = originalCode.split('\n')
   const transformedLines = transformedCode.split('\n')
@@ -302,11 +302,10 @@ async function fixTransformedOutputText({
   const fixedLines = transformedLines.map((line, i) => {
     const transformedLineNum = i + 1
 
-    let mapped = null
-    let origLineText = null
+    let origLineText: string | undefined = undefined
 
     for (let col = 0; col < line.length; col++) {
-      mapped = consumer.originalPositionFor({
+      const mapped = consumer.originalPositionFor({
         line: transformedLineNum,
         column: col,
       })
@@ -316,7 +315,7 @@ async function fixTransformedOutputText({
       }
     }
 
-    if (origLineText != null) {
+    if (origLineText !== undefined) {
       if (origLineText === line) {
         return origLineText
       }
@@ -409,10 +408,9 @@ function detectSemicolonUsage(code: string) {
   return withSemis > total / 2
 }
 
-export function detectPreferredQuoteStyle(ast: types.ASTNode): "'" | '"' | '`' {
+export function detectPreferredQuoteStyle(ast: types.ASTNode): "'" | '"' {
   let single = 0
   let double = 0
-  let backtick = 0
 
   visit(ast, {
     visitStringLiteral(path) {
@@ -423,17 +421,10 @@ export function detectPreferredQuoteStyle(ast: types.ASTNode): "'" | '"' | '`' {
       }
       return false
     },
-    visitTemplateLiteral(path) {
-      if (path.parent.type !== 'JSXAttribute') {
-        backtick++
-      }
-      return false
-    },
   })
 
-  return single >= double && single >= backtick
-    ? "'"
-    : double >= single && double >= backtick
-      ? '"'
-      : '`'
+  if (single >= double) {
+    return "'"
+  }
+  return '"'
 }