Merge branch 'dev' into release-next

Author: brophdawg11

.changeset/few-stingrays-explain.md

@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+[REMOVE] Changeset to bump pre.4 release

packages/react-router-dev/tsup.config.ts

@@ -15,7 +15,7 @@ const entry = [
   "typescript/plugin.ts",
 ];
 
-const external = ["./static/refresh-utils.cjs", /^(?!\.)/];
+const external = ["./static/refresh-utils.cjs", /\.json$/];
 
 export default defineConfig([
   {

packages/react-router-dev/typescript/typegen.ts

@@ -28,7 +28,7 @@ function getDirectory(ctx: Context) {
 export function getPath(ctx: Context, route: RouteManifestEntry): string {
   return Path.join(
     getDirectory(ctx),
-    "app",
+    Path.basename(ctx.appDirectory),
     Path.dirname(route.file),
     "+types." + Pathe.filename(route.file) + ".d.ts"
   );