@react-router/dev 0.0.0-experimental-5bbc45fb6 → 0.0.0-experimental-b7b187661

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-5bbc45fb6
+ * @react-router/dev v0.0.0-experimental-b7b187661
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1007,81 +1007,85 @@ function generateRoutes(ctx) {
   return { filename: filename2, content };
 }
 function generateRouteModuleAnnotations(ctx) {
-  return Object.values(ctx.config.routes).map((route) => {
+  return Object.values(ctx.config.routes).filter((route) => isRouteInAppDirectory(ctx, route)).map((route) => {
     const filename2 = getRouteModuleAnnotationsFilepath(ctx, route);
     const parents = getParents(ctx, route);
     const content = import_dedent.default`
-      // Generated by React Router
+        // Generated by React Router
 
-      import type {
-        Params,
-        RouteModuleAnnotations,
-        CreateLoaderData,
-        CreateActionData,
-      } from "react-router/internal";
+        import type {
+          Params,
+          RouteModuleAnnotations,
+          CreateLoaderData,
+          CreateActionData,
+        } from "react-router/internal";
 
-      ${parents.map((parent) => parent.import).join("\n" + "  ".repeat(3))}
-      type Parents = [${parents.map((parent) => parent.name).join(", ")}]
+        ${parents.map((parent) => parent.import).join("\n" + "  ".repeat(3))}
+        type Parents = [${parents.map((parent) => parent.name).join(", ")}]
 
-      type Id = "${route.id}"
-      type Module = typeof import("../${Pathe.filename(route.file)}.js")
+        type Id = "${route.id}"
+        type Module = typeof import("../${Pathe.filename(route.file)}.js")
 
-      export type unstable_Props = {
-        params: Params[Id]
-        loaderData: CreateLoaderData<Module>
-        actionData: CreateActionData<Module>
-      }
+        export type unstable_Props = {
+          params: Params[Id]
+          loaderData: CreateLoaderData<Module>
+          actionData: CreateActionData<Module>
+        }
 
-      type Annotations = RouteModuleAnnotations<unstable_Props & {
-        parents: Parents,
-        module: Module,
-      }>;
+        type Annotations = RouteModuleAnnotations<unstable_Props & {
+          parents: Parents,
+          module: Module,
+        }>;
 
-      export namespace Route {
-        // links
-        export type LinkDescriptors = Annotations["LinkDescriptors"];
-        export type LinksFunction = Annotations["LinksFunction"];
+        export namespace Route {
+          // links
+          export type LinkDescriptors = Annotations["LinkDescriptors"];
+          export type LinksFunction = Annotations["LinksFunction"];
 
-        // meta
-        export type MetaArgs = Annotations["MetaArgs"];
-        export type MetaDescriptors = Annotations["MetaDescriptors"];
-        export type MetaFunction = Annotations["MetaFunction"];
+          // meta
+          export type MetaArgs = Annotations["MetaArgs"];
+          export type MetaDescriptors = Annotations["MetaDescriptors"];
+          export type MetaFunction = Annotations["MetaFunction"];
 
-        // headers
-        export type HeadersArgs = Annotations["HeadersArgs"];
-        export type HeadersFunction = Annotations["HeadersFunction"];
+          // headers
+          export type HeadersArgs = Annotations["HeadersArgs"];
+          export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // unstable_middleware
-        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+          // unstable_middleware
+          export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
 
-        // unstable_clientMiddleware
-        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+          // unstable_clientMiddleware
+          export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
 
-        // loader
-        export type LoaderArgs = Annotations["LoaderArgs"];
+          // loader
+          export type LoaderArgs = Annotations["LoaderArgs"];
 
-        // clientLoader
-        export type ClientLoaderArgs = Annotations["ClientLoaderArgs"];
+          // clientLoader
+          export type ClientLoaderArgs = Annotations["ClientLoaderArgs"];
 
-        // action
-        export type ActionArgs = Annotations["ActionArgs"];
+          // action
+          export type ActionArgs = Annotations["ActionArgs"];
 
-        // clientAction
-        export type ClientActionArgs = Annotations["ClientActionArgs"];
+          // clientAction
+          export type ClientActionArgs = Annotations["ClientActionArgs"];
 
-        // HydrateFallback
-        export type HydrateFallbackProps = Annotations["HydrateFallbackProps"];
+          // HydrateFallback
+          export type HydrateFallbackProps = Annotations["HydrateFallbackProps"];
 
-        // Component
-        export type ComponentProps = Annotations["ComponentProps"];
+          // Component
+          export type ComponentProps = Annotations["ComponentProps"];
 
-        // ErrorBoundary
-        export type ErrorBoundaryProps = Annotations["ErrorBoundaryProps"];
-      }
-    `;
+          // ErrorBoundary
+          export type ErrorBoundaryProps = Annotations["ErrorBoundaryProps"];
+        }
+      `;
     return { filename: filename2, content };
   });
 }
+function isRouteInAppDirectory(ctx, route) {
+  const absoluteRoutePath = Path3.resolve(ctx.config.appDirectory, route.file);
+  return absoluteRoutePath.startsWith(ctx.config.appDirectory);
+}
 function getRouteModuleAnnotationsFilepath(ctx, route) {
   return Path3.join(
     typesDirectory(ctx),
@@ -1155,7 +1159,7 @@ async function write(...files) {
 }
 async function run(rootDirectory, { mode }) {
   const ctx = await createContext2({ rootDirectory, mode, watch: false });
-  await clearRouteModuleAnnotations(ctx);
+  await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
     generatePages(ctx),
@@ -1166,7 +1170,7 @@ async function run(rootDirectory, { mode }) {
 }
 async function watch(rootDirectory, { mode, logger }) {
   const ctx = await createContext2({ rootDirectory, mode, watch: true });
-  await clearRouteModuleAnnotations(ctx);
+  await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
     generatePages(ctx),

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-5bbc45fb6
+ * @react-router/dev v0.0.0-experimental-b7b187661
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-5bbc45fb6
+ * @react-router/dev v0.0.0-experimental-b7b187661
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-5bbc45fb6
+ * @react-router/dev v0.0.0-experimental-b7b187661
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-5bbc45fb6
+ * @react-router/dev v0.0.0-experimental-b7b187661
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -994,81 +994,85 @@ function generateRoutes(ctx) {
   return { filename: filename2, content };
 }
 function generateRouteModuleAnnotations(ctx) {
-  return Object.values(ctx.config.routes).map((route) => {
+  return Object.values(ctx.config.routes).filter((route) => isRouteInAppDirectory(ctx, route)).map((route) => {
     const filename2 = getRouteModuleAnnotationsFilepath(ctx, route);
     const parents = getParents(ctx, route);
     const content = import_dedent.default`
-      // Generated by React Router
+        // Generated by React Router
 
-      import type {
-        Params,
-        RouteModuleAnnotations,
-        CreateLoaderData,
-        CreateActionData,
-      } from "react-router/internal";
+        import type {
+          Params,
+          RouteModuleAnnotations,
+          CreateLoaderData,
+          CreateActionData,
+        } from "react-router/internal";
 
-      ${parents.map((parent) => parent.import).join("\n" + "  ".repeat(3))}
-      type Parents = [${parents.map((parent) => parent.name).join(", ")}]
+        ${parents.map((parent) => parent.import).join("\n" + "  ".repeat(3))}
+        type Parents = [${parents.map((parent) => parent.name).join(", ")}]
 
-      type Id = "${route.id}"
-      type Module = typeof import("../${Pathe.filename(route.file)}.js")
+        type Id = "${route.id}"
+        type Module = typeof import("../${Pathe.filename(route.file)}.js")
 
-      export type unstable_Props = {
-        params: Params[Id]
-        loaderData: CreateLoaderData<Module>
-        actionData: CreateActionData<Module>
-      }
+        export type unstable_Props = {
+          params: Params[Id]
+          loaderData: CreateLoaderData<Module>
+          actionData: CreateActionData<Module>
+        }
 
-      type Annotations = RouteModuleAnnotations<unstable_Props & {
-        parents: Parents,
-        module: Module,
-      }>;
+        type Annotations = RouteModuleAnnotations<unstable_Props & {
+          parents: Parents,
+          module: Module,
+        }>;
 
-      export namespace Route {
-        // links
-        export type LinkDescriptors = Annotations["LinkDescriptors"];
-        export type LinksFunction = Annotations["LinksFunction"];
+        export namespace Route {
+          // links
+          export type LinkDescriptors = Annotations["LinkDescriptors"];
+          export type LinksFunction = Annotations["LinksFunction"];
 
-        // meta
-        export type MetaArgs = Annotations["MetaArgs"];
-        export type MetaDescriptors = Annotations["MetaDescriptors"];
-        export type MetaFunction = Annotations["MetaFunction"];
+          // meta
+          export type MetaArgs = Annotations["MetaArgs"];
+          export type MetaDescriptors = Annotations["MetaDescriptors"];
+          export type MetaFunction = Annotations["MetaFunction"];
 
-        // headers
-        export type HeadersArgs = Annotations["HeadersArgs"];
-        export type HeadersFunction = Annotations["HeadersFunction"];
+          // headers
+          export type HeadersArgs = Annotations["HeadersArgs"];
+          export type HeadersFunction = Annotations["HeadersFunction"];
 
-        // unstable_middleware
-        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+          // unstable_middleware
+          export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
 
-        // unstable_clientMiddleware
-        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+          // unstable_clientMiddleware
+          export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
 
-        // loader
-        export type LoaderArgs = Annotations["LoaderArgs"];
+          // loader
+          export type LoaderArgs = Annotations["LoaderArgs"];
 
-        // clientLoader
-        export type ClientLoaderArgs = Annotations["ClientLoaderArgs"];
+          // clientLoader
+          export type ClientLoaderArgs = Annotations["ClientLoaderArgs"];
 
-        // action
-        export type ActionArgs = Annotations["ActionArgs"];
+          // action
+          export type ActionArgs = Annotations["ActionArgs"];
 
-        // clientAction
-        export type ClientActionArgs = Annotations["ClientActionArgs"];
+          // clientAction
+          export type ClientActionArgs = Annotations["ClientActionArgs"];
 
-        // HydrateFallback
-        export type HydrateFallbackProps = Annotations["HydrateFallbackProps"];
+          // HydrateFallback
+          export type HydrateFallbackProps = Annotations["HydrateFallbackProps"];
 
-        // Component
-        export type ComponentProps = Annotations["ComponentProps"];
+          // Component
+          export type ComponentProps = Annotations["ComponentProps"];
 
-        // ErrorBoundary
-        export type ErrorBoundaryProps = Annotations["ErrorBoundaryProps"];
-      }
-    `;
+          // ErrorBoundary
+          export type ErrorBoundaryProps = Annotations["ErrorBoundaryProps"];
+        }
+      `;
     return { filename: filename2, content };
   });
 }
+function isRouteInAppDirectory(ctx, route) {
+  const absoluteRoutePath = Path3.resolve(ctx.config.appDirectory, route.file);
+  return absoluteRoutePath.startsWith(ctx.config.appDirectory);
+}
 function getRouteModuleAnnotationsFilepath(ctx, route) {
   return Path3.join(
     typesDirectory(ctx),
@@ -1129,7 +1133,7 @@ async function write(...files) {
 }
 async function watch(rootDirectory, { mode, logger }) {
   const ctx = await createContext2({ rootDirectory, mode, watch: true });
-  await clearRouteModuleAnnotations(ctx);
+  await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
     generatePages(ctx),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-5bbc45fb6",
+  "version": "0.0.0-experimental-b7b187661",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-5bbc45fb6"
+    "@react-router/node": "0.0.0-experimental-b7b187661"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -110,15 +110,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.2.0",
-    "@react-router/serve": "0.0.0-experimental-5bbc45fb6",
-    "react-router": "^0.0.0-experimental-5bbc45fb6"
+    "react-router": "^0.0.0-experimental-b7b187661",
+    "@react-router/serve": "0.0.0-experimental-b7b187661"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-5bbc45fb6",
-    "react-router": "^0.0.0-experimental-5bbc45fb6"
+    "@react-router/serve": "^0.0.0-experimental-b7b187661",
+    "react-router": "^0.0.0-experimental-b7b187661"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {