@react-router/dev 7.0.0-pre.0 → 7.0.0-pre.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # `@remix-run/dev`
 
+## 7.0.0-pre.1
+
+### Minor Changes
+
+- Add `prefix` route config helper to `@react-router/dev/routes` ([#12094](https://github.com/remix-run/react-router/pull/12094))
+
+### Patch Changes
+
+- - Fix `react-router-serve` handling of prerendered HTML files by removing the `redirect: false` option so it now falls back on the default `redirect: true` behavior of redirecting from `/folder` -> `/folder/` which will then pick up `/folder/index.html` from disk. See https://expressjs.com/en/resources/middleware/serve-static.html ([#12071](https://github.com/remix-run/react-router/pull/12071))
+  - Proxy prerendered loader data into prerender pass for HTML files to avoid double-invocations of the loader at build time
+- Updated dependencies:
+  - `react-router@7.0.0-pre.1`
+  - `@react-router/serve@7.0.0-pre.1`
+  - `@react-router/node@7.0.0-pre.1`
+
 ## 7.0.0-pre.0
 
 ### Major Changes
@@ -75,12 +90,12 @@
 - ### Typesafety improvements ([#12019](https://github.com/remix-run/react-router/pull/12019))
 
   React Router now generates types for each of your route modules.
-  You can access those types by importing them from `./+types/<route filename without extension>`.
+  You can access those types by importing them from `./+types.<route filename without extension>`.
   For example:
 
   ```ts
   // app/routes/product.tsx
-  import type * as Route from "./+types/product";
+  import type * as Route from "./+types.product";
 
   export function loader({ params }: Route.LoaderArgs) {}
 

package/README.md

@@ -1,13 +1,7 @@
-# Welcome to Remix!
+# @react-router/dev
 
-[Remix](https://remix.run) is a web framework that helps you build better websites with React.
-
-To get started, open a new shell and run:
+Dev tools and CLI for [React Router.](https://github.com/remix-run/react-router)
 
 ```sh
-npx create-remix@latest
+npm install @react-router/dev
 ```
-
-Then follow the prompts you see in your terminal.
-
-For more information about Remix, [visit remix.run](https://remix.run)!

package/dist/cli/commands.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/detectPackageManager.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/run.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/cli/useJavascript.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/colors.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/format.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config/routes.d.ts

@@ -91,35 +91,39 @@ type CreateRouteOptions = Pick<RouteConfigEntry, (typeof createConfigRouteOption
  * Helper function for creating a route config entry, for use within
  * `routes.ts`.
  */
-declare function createRoute(path: string | null | undefined, file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
-declare function createRoute(path: string | null | undefined, file: string, options: CreateRouteOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare function route(path: string | null | undefined, file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare function route(path: string | null | undefined, file: string, options: CreateRouteOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
 declare const createIndexOptionKeys: ["id"];
 type CreateIndexOptions = Pick<RouteConfigEntry, (typeof createIndexOptionKeys)[number]>;
 /**
  * Helper function for creating a route config entry for an index route, for use
  * within `routes.ts`.
  */
-declare function createIndex(file: string, options?: CreateIndexOptions): RouteConfigEntry;
+declare function index(file: string, options?: CreateIndexOptions): RouteConfigEntry;
 declare const createLayoutOptionKeys: ["id"];
 type CreateLayoutOptions = Pick<RouteConfigEntry, (typeof createLayoutOptionKeys)[number]>;
 /**
  * Helper function for creating a route config entry for a layout route, for use
  * within `routes.ts`.
  */
-declare function createLayout(file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
-declare function createLayout(file: string, options: CreateLayoutOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
-export declare const route: typeof createRoute;
-export declare const index: typeof createIndex;
-export declare const layout: typeof createLayout;
+declare function layout(file: string, children?: RouteConfigEntry[]): RouteConfigEntry;
+declare function layout(file: string, options: CreateLayoutOptions, children?: RouteConfigEntry[]): RouteConfigEntry;
 /**
- * Creates a set of route config helpers that resolve file paths relative to the
- * given directory, for use within `routes.ts`. This is designed to support
- * splitting route config into multiple files within different directories.
+ * Helper function for adding a path prefix to a set of routes without needing
+ * to introduce a parent route file, for use within `routes.ts`.
  */
-export declare function relative(directory: string): {
+declare function prefix(prefixPath: string, routes: RouteConfigEntry[]): RouteConfigEntry[];
+declare const helpers: {
     route: typeof route;
     index: typeof index;
     layout: typeof layout;
+    prefix: typeof prefix;
 };
+export { route, index, layout, prefix };
+/**
+ * Creates a set of route config helpers that resolve file paths relative to the
+ * given directory, for use within `routes.ts`. This is designed to support
+ * splitting route config into multiple files within different directories.
+ */
+export declare function relative(directory: string): typeof helpers;
 export declare function configRoutesToRouteManifest(routes: RouteConfigEntry[], rootId?: string): RouteManifest;
-export {};

package/dist/config/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -97,7 +97,7 @@ function validateRouteConfig({
   };
 }
 const createConfigRouteOptionKeys = ["id", "index", "caseSensitive"];
-function createRoute(path, file, optionsOrChildren, children) {
+function route(path, file, optionsOrChildren, children) {
   let options = {};
   if (Array.isArray(optionsOrChildren) || !optionsOrChildren) {
     children = optionsOrChildren;
@@ -116,7 +116,7 @@ const createIndexOptionKeys = ["id"];
  * Helper function for creating a route config entry for an index route, for use
  * within `routes.ts`.
  */
-function createIndex(file, options) {
+function index(file, options) {
   return {
     file,
     index: true,
@@ -124,7 +124,7 @@ function createIndex(file, options) {
   };
 }
 const createLayoutOptionKeys = ["id"];
-function createLayout(file, optionsOrChildren, children) {
+function layout(file, optionsOrChildren, children) {
   let options = {};
   if (Array.isArray(optionsOrChildren) || !optionsOrChildren) {
     children = optionsOrChildren;
@@ -137,9 +137,27 @@ function createLayout(file, optionsOrChildren, children) {
     ...pick__default["default"](options, createLayoutOptionKeys)
   };
 }
-const route = createRoute;
-const index = createIndex;
-const layout = createLayout;
+/**
+ * Helper function for adding a path prefix to a set of routes without needing
+ * to introduce a parent route file, for use within `routes.ts`.
+ */
+function prefix(prefixPath, routes) {
+  return routes.map(route => {
+    if (route.index || typeof route.path === "string") {
+      return {
+        ...route,
+        path: route.path ? joinRoutePaths(prefixPath, route.path) : prefixPath,
+        children: route.children
+      };
+    } else if (route.children) {
+      return {
+        ...route,
+        children: prefix(prefixPath, route.children)
+      };
+    }
+    return route;
+  });
+}
 /**
  * Creates a set of route config helpers that resolve file paths relative to the
  * given directory, for use within `routes.ts`. This is designed to support
@@ -173,7 +191,10 @@ function relative(directory) {
      */
     layout: (file, ...rest) => {
       return layout(path.resolve(directory, file), ...rest);
-    }
+    },
+    // Passthrough of helper functions that don't need relative scoping so that
+    // a complete API is still provided.
+    prefix
   };
 }
 function configRoutesToRouteManifest(routes, rootId = "root") {
@@ -212,11 +233,18 @@ function normalizeSlashes(file) {
 function stripFileExtension(file) {
   return file.replace(/\.[a-z0-9]+$/i, "");
 }
+function joinRoutePaths(path1, path2) {
+  return [path1.replace(/\/+$/, ""),
+  // Remove trailing slashes
+  path2.replace(/^\/+/, "") // Remove leading slashes
+  ].join("/");
+}
 
 exports.configRoutesToRouteManifest = configRoutesToRouteManifest;
 exports.getAppDirectory = getAppDirectory;
 exports.index = index;
 exports.layout = layout;
+exports.prefix = prefix;
 exports.relative = relative;
 exports.resolvedRouteConfigSchema = resolvedRouteConfigSchema;
 exports.route = route;

package/dist/invariant.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.d.ts

@@ -1,2 +1,2 @@
 export type { RouteConfig, RouteConfigEntry } from "./config/routes";
-export { route, index, layout, relative, getAppDirectory, } from "./config/routes";
+export { route, index, layout, prefix, relative, getAppDirectory, } from "./config/routes";

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,5 +19,6 @@ var routes = require('./config/routes.js');
 exports.getAppDirectory = routes.getAppDirectory;
 exports.index = routes.index;
 exports.layout = routes.layout;
+exports.prefix = routes.prefix;
 exports.relative = routes.relative;
 exports.route = routes.route;

package/dist/typescript/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/typescript/typegen.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -74,10 +74,10 @@ async function watch(rootDirectory) {
     }
     routesViteNodeContext.devServer.moduleGraph.invalidateAll();
     routesViteNodeContext.runner.moduleCache.clear();
-    const result = await routesViteNodeContext.runner.executeFile(routesTsPath);
+    const routeConfig = (await routesViteNodeContext.runner.executeFile(routesTsPath)).routes;
     return {
       ...routes$1,
-      ...routes.configRoutesToRouteManifest(result.routes)
+      ...routes.configRoutesToRouteManifest(await routeConfig)
     };
   }
   const ctx = {

package/dist/vite/babel.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare-dev-proxy.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/combine-urls.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/import-vite-esm-sync.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -41,12 +41,20 @@ function fromNodeRequest(nodeReq, nodeRes) {
   let url = new URL(nodeReq.originalUrl, origin);
   // Abort action/loaders once we can no longer write a response
   let controller = new AbortController();
-  nodeRes.on("close", () => controller.abort());
   let init = {
     method: nodeReq.method,
     headers: fromNodeHeaders(nodeReq.headers),
     signal: controller.signal
   };
+  // Abort action/loaders once we can no longer write a response iff we have
+  // not yet sent a response (i.e., `close` without `finish`)
+  // `finish` -> done rendering the response
+  // `close` -> response can no longer be written to
+  nodeRes.on("finish", () => controller = null);
+  nodeRes.on("close", () => {
+    var _controller;
+    return (_controller = controller) === null || _controller === void 0 ? void 0 : _controller.abort();
+  });
   if (nodeReq.method !== "GET" && nodeReq.method !== "HEAD") {
     init.body = node.createReadableStreamFromReadable(nodeReq);
     init.duplex = "half";

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1155,20 +1155,28 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
   } else {
     routesToPrerender = reactRouterConfig.prerender || ["/"];
   }
-  let requestInit = {
-    headers: {
-      // Header that can be used in the loader to know if you're running at
-      // build time or runtime
-      "X-React-Router-Prerender": "yes"
-    }
+  let headers = {
+    // Header that can be used in the loader to know if you're running at
+    // build time or runtime
+    "X-React-Router-Prerender": "yes"
   };
   for (let path of routesToPrerender) {
     var _matchRoutes;
     let hasLoaders = (_matchRoutes = reactRouter.matchRoutes(routes, path)) === null || _matchRoutes === void 0 ? void 0 : _matchRoutes.some(m => m.route.loader);
+    let data;
     if (hasLoaders) {
-      await prerenderData(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit);
+      data = await prerenderData(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, {
+        headers
+      });
     }
-    await prerenderRoute(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit);
+    await prerenderRoute(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, data ? {
+      headers: {
+        ...headers,
+        "X-React-Router-Prerender-Data": data
+      }
+    } : {
+      headers
+    });
   }
   await prerenderManifest(build, clientBuildDirectory, reactRouterConfig, viteConfig);
 }
@@ -1194,8 +1202,8 @@ function determineStaticPrerenderRoutes(routes, viteConfig, isBooleanUsage = fal
     }
   }
   recurse(routes);
-  if (isBooleanUsage && paramRoutes) {
-    viteConfig.logger.warn("The following paths were not prerendered because Dynamic Param and Splat " + "routes cannot be prerendered when using `prerender:true`. You may want to " + "consider using the `prerender()` API if you wish to prerender slug and " + "splat routes.");
+  if (isBooleanUsage && paramRoutes.length > 0) {
+    viteConfig.logger.warn(["⚠️ Paths with dynamic/splat params cannot be prerendered when using `prerender: true`.", "You may want to use the `prerender()` API to prerender the following paths:", ...paramRoutes.map(p => "  - " + p)].join("\n"));
   }
   // Clean double slashes and remove trailing slashes
   return paths.map(p => p.replace(/\/\/+/g, "/").replace(/(.+)\/$/, "$1"));
@@ -1212,6 +1220,7 @@ async function prerenderData(handler, prerenderPath, clientBuildDirectory, react
   await fse__namespace.ensureDir(path__namespace.dirname(outfile));
   await fse__namespace.outputFile(outfile, data);
   viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
+  return data;
 }
 async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
   let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(/\/\/+/g, "/");

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/resolve-file-url.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/static/refresh-utils.cjs

@@ -49,21 +49,21 @@ const enqueueUpdate = debounce(async () => {
         .map((route) => route.id)
     );
 
-    let routes = __reactRouterInstance.createRoutesForHMR(
+    let routes = __reactRouterDataRouter.createRoutesForHMR(
       needsRevalidation,
       manifest.routes,
       window.__reactRouterRouteModules,
       window.__reactRouterContext.future,
       window.__reactRouterContext.isSpaMode
     );
-    __reactRouterInstance._internalSetRoutes(routes);
+    __reactRouterDataRouter._internalSetRoutes(routes);
     routeUpdates.clear();
     window.__reactRouterRouteModuleUpdates.clear();
   }
 
   try {
     window.__reactRouterHdrActive = true;
-    await __reactRouterInstance.revalidate();
+    await __reactRouterDataRouter.revalidate();
   } finally {
     window.__reactRouterHdrActive = false;
   }

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vite-node.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/with-props.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.0.0-pre.0
+ * @react-router/dev v7.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.0.0-pre.0",
+  "version": "7.0.0-pre.1",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -61,7 +61,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "^1.6.0",
-    "@react-router/node": "7.0.0-pre.0"
+    "@react-router/node": "7.0.0-pre.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -87,15 +87,15 @@
     "tiny-invariant": "^1.2.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "7.0.0-pre.0",
-    "react-router": "^7.0.0-pre.0"
+    "@react-router/serve": "7.0.0-pre.1",
+    "react-router": "^7.0.0-pre.1"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^7.0.0-pre.0",
-    "react-router": "^7.0.0-pre.0"
+    "@react-router/serve": "^7.0.0-pre.1",
+    "react-router": "^7.0.0-pre.1"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {