Merge branch 'main' into enhanced-logs-flag

Author: AlemTuzlak

src/vite/file.ts

@@ -18,6 +18,7 @@ export type WriteFileData = {
 		meta: boolean
 		links: boolean
 	}
+	appDir: string
 }
 const defaultGenerationOrder: Exclude<Generator, "dependencies">[] = [
 	"links",
@@ -32,15 +33,15 @@ const defaultGenerationOrder: Exclude<Generator, "dependencies">[] = [
 	"errorBoundary",
 	"revalidate",
 ]
-export const handleWriteFile = async ({ path, options, openInEditor }: WriteFileData) => {
+export const handleWriteFile = async ({ path, options, openInEditor, appDir }: WriteFileData) => {
 	const generatorOptions = Object.entries(options)
 		.map(([key, value]) => {
 			if (value) {
 				return { key }
 			}
 		})
 		.filter(Boolean) as unknown as { key: Exclude<Generator, "dependencies"> }[]
-	let outputFile = `${resolve("app", "routes", path)}`
+	let outputFile = `${resolve(appDir, "routes", path)}`
 	const extensions = [".tsx", ".jsx", ".ts", ".js"]
 	if (!extensions.some((ext) => outputFile.endsWith(ext))) {
 		outputFile = `${outputFile}.tsx`

src/vite/plugin.tsx

@@ -107,7 +107,7 @@ export const reactRouterDevTools: (args?: ReactRouterViteConfig) => Plugin[] = (
 				try {
 					const path = await import("node:path")
 					// Set the route config
-					const routeConfigExport = (await runner.executeFile(path.join(process.cwd(), "./app/routes.ts"))).default
+					const routeConfigExport = (await runner.executeFile(path.join(process.cwd(), appDir, "routes.ts"))).default
 					const routeConfig = await routeConfigExport
 					routesMap.set("routes", routeConfig)
 
@@ -344,7 +344,7 @@ export const reactRouterDevTools: (args?: ReactRouterViteConfig) => Plugin[] = (
 					})
 
 					server.hot.on("open-source", (data: OpenSourceData) => handleOpenSource({ data, openInEditor, appDir }))
-					server.hot.on("add-route", (data: WriteFileData) => handleWriteFile({ ...data, openInEditor }))
+					server.hot.on("add-route", (data: WriteFileData) => handleWriteFile({ ...data, openInEditor, appDir }))
 				}
 			},
 		},