@react-router/dev 7.1.3-pre.0 → 7.1.4-pre.0

package/CHANGELOG.md

@@ -1,14 +1,25 @@
 # `@react-router/dev`
 
-## 7.1.3-pre.0
+## 7.1.4-pre.0
+
+### Patch Changes
+
+- Properly resolve Windows file paths to scan for Vite's dependency optimization when using the `unstable_optimizeDeps` future flag. ([#12637](https://github.com/remix-run/react-router/pull/12637))
+- Fix prerendering when using a custom server - previously we ended up trying to import the users custom server when we actually want to import the virtual server build module ([#12759](https://github.com/remix-run/react-router/pull/12759))
+- Updated dependencies:
+  - `react-router@7.1.4-pre.0`
+  - `@react-router/node@7.1.4-pre.0`
+  - `@react-router/serve@7.1.4-pre.0`
+
+## 7.1.3
 
 ### Patch Changes
 
 - Fix `reveal` and `routes` CLI commands ([#12745](https://github.com/remix-run/react-router/pull/12745))
 - Updated dependencies:
-  - `react-router@7.1.3-pre.0`
-  - `@react-router/node@7.1.3-pre.0`
-  - `@react-router/serve@7.1.3-pre.0`
+  - `react-router@7.1.3`
+  - `@react-router/node@7.1.3`
+  - `@react-router/serve@7.1.3`
 
 ## 7.1.2
 

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.1.3-pre.0
+ * @react-router/dev v7.1.4-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

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

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.1.3-pre.0
+ * @react-router/dev v7.1.4-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1767,9 +1767,9 @@ var reactRouterVitePlugin = () => {
           },
           optimizeDeps: {
             entries: ctx.reactRouterConfig.future.unstable_optimizeDeps ? [
-              ctx.entryClientFilePath,
+              vite2.normalizePath(ctx.entryClientFilePath),
               ...Object.values(ctx.reactRouterConfig.routes).map(
-                (route) => path6.join(ctx.reactRouterConfig.appDirectory, route.file)
+                (route) => resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
               )
             ] : [],
             include: [
@@ -2067,6 +2067,7 @@ var reactRouterVitePlugin = () => {
               viteConfig,
               ctx.reactRouterConfig,
               serverBuildDirectory,
+              ssrViteManifest[virtual.serverBuild.id].file,
               clientBuildDirectory
             );
           }
@@ -2075,6 +2076,7 @@ var reactRouterVitePlugin = () => {
               viteConfig,
               ctx.reactRouterConfig,
               serverBuildDirectory,
+              ssrViteManifest[virtual.serverBuild.id].file,
               clientBuildDirectory
             );
           }
@@ -2507,11 +2509,8 @@ async function getRouteMetadata(ctx, viteChildCompiler, route, readRouteFile) {
   };
   return info;
 }
-async function getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, serverBuildDirectory) {
-  let serverBuildPath = path6.join(
-    serverBuildDirectory,
-    reactRouterConfig.serverBuildFile
-  );
+async function getPrerenderBuildAndHandler(viteConfig, serverBuildDirectory, serverBuildFile) {
+  let serverBuildPath = path6.join(serverBuildDirectory, serverBuildFile);
   let build = await import(url.pathToFileURL(serverBuildPath).toString());
   let { createRequestHandler: createHandler } = await import("react-router");
   return {
@@ -2519,11 +2518,11 @@ async function getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, server
     handler: createHandler(build, viteConfig.mode)
   };
 }
-async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory, clientBuildDirectory) {
+async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory, serverBuildFile, clientBuildDirectory) {
   let { handler } = await getPrerenderBuildAndHandler(
     viteConfig,
-    reactRouterConfig,
-    serverBuildDirectory
+    serverBuildDirectory,
+    serverBuildFile
   );
   let request = new Request(`http://localhost${reactRouterConfig.basename}`);
   let response = await handler(request);
@@ -2535,11 +2534,11 @@ async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory
     "SPA Mode: index.html has been written to your " + import_picocolors3.default.bold(path6.relative(process.cwd(), clientBuildDirectory)) + " directory"
   );
 }
-async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirectory, clientBuildDirectory) {
+async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirectory, serverBuildPath, clientBuildDirectory) {
   let { build, handler } = await getPrerenderBuildAndHandler(
     viteConfig,
-    reactRouterConfig,
-    serverBuildDirectory
+    serverBuildDirectory,
+    serverBuildPath
   );
   let routes = createPrerenderRoutes(build.routes);
   let routesToPrerender;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.1.3-pre.0",
+  "version": "7.1.4-pre.0",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -88,7 +88,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "7.1.3-pre.0"
+    "@react-router/node": "7.1.4-pre.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -117,15 +117,15 @@
     "vite": "^6.0.0",
     "wireit": "0.14.9",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "7.1.3-pre.0",
-    "react-router": "^7.1.3-pre.0"
+    "@react-router/serve": "7.1.4-pre.0",
+    "react-router": "^7.1.4-pre.0"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^7.1.3-pre.0",
-    "react-router": "^7.1.3-pre.0"
+    "@react-router/serve": "^7.1.4-pre.0",
+    "react-router": "^7.1.4-pre.0"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {