@react-router/dev 0.0.0-experimental-df0f1dfda → 0.0.0-experimental-a383e1e6e

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # `@react-router/dev`
 
+## 7.1.4
+
+### 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`
+  - `@react-router/node@7.1.4`
+  - `@react-router/serve@7.1.4`
+
 ## 7.1.3
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-df0f1dfda
+ * @react-router/dev v0.0.0-experimental-a383e1e6e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -706,6 +706,8 @@ function generate(ctx, route) {
       export type HeadersArgs = T.HeadersArgs
       export type HeadersFunction = (args: HeadersArgs) => Headers | HeadersInit
 
+      export type unstable_MiddlewareArgs = T.CreateServerMiddlewareArgs<Info>
+      export type unstable_ClientMiddlewareArgs = T.CreateClientMiddlewareArgs<Info>
       export type LoaderArgs = T.CreateServerLoaderArgs<Info>
       export type ClientLoaderArgs = T.CreateClientLoaderArgs<Info>
       export type ActionArgs = T.CreateServerActionArgs<Info>
@@ -983,7 +985,7 @@ async function resolveViteConfig({
 async function extractPluginContext(viteConfig) {
   return viteConfig["__reactRouterPluginContext"];
 }
-var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_jsesc, import_picocolors4, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_ONLY_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
@@ -996,6 +998,7 @@ var init_plugin = __esm({
     import_es_module_lexer = require("es-module-lexer");
     import_jsesc = __toESM(require("jsesc"));
     import_picocolors4 = __toESM(require("picocolors"));
+    import_kebabCase = __toESM(require("lodash/kebabCase"));
     init_typegen();
     init_invariant();
     init_babel();
@@ -1009,6 +1012,22 @@ var init_plugin = __esm({
     init_vite();
     init_config();
     init_with_props();
+    CLIENT_ONLY_NON_COMPONENT_EXPORTS = [
+      "clientAction",
+      "clientLoader",
+      "unstable_clientMiddleware",
+      "handle",
+      "meta",
+      "links",
+      "shouldRevalidate"
+    ];
+    CLIENT_ROUTE_EXPORTS = [
+      ...CLIENT_ONLY_NON_COMPONENT_EXPORTS,
+      "default",
+      "ErrorBoundary",
+      "HydrateFallback",
+      "Layout"
+    ];
     virtualHmrRuntime = create("hmr-runtime");
     virtualInjectHmrRuntime = create("inject-hmr-runtime");
     virtual = {

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

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

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-df0f1dfda
+ * @react-router/dev v0.0.0-experimental-a383e1e6e
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -54,6 +54,7 @@ var import_react_router2 = require("react-router");
 var import_es_module_lexer = require("es-module-lexer");
 var import_jsesc = __toESM(require("jsesc"));
 var import_picocolors3 = __toESM(require("picocolors"));
+var import_kebabCase = __toESM(require("lodash/kebabCase"));
 
 // typegen/index.ts
 var import_node_fs2 = __toESM(require("fs"));
@@ -693,6 +694,8 @@ function generate(ctx, route) {
       export type HeadersArgs = T.HeadersArgs
       export type HeadersFunction = (args: HeadersArgs) => Headers | HeadersInit
 
+      export type unstable_MiddlewareArgs = T.CreateServerMiddlewareArgs<Info>
+      export type unstable_ClientMiddlewareArgs = T.CreateClientMiddlewareArgs<Info>
       export type LoaderArgs = T.CreateServerLoaderArgs<Info>
       export type ClientLoaderArgs = T.CreateClientLoaderArgs<Info>
       export type ActionArgs = T.CreateServerActionArgs<Info>
@@ -1890,19 +1893,28 @@ function toFunctionExpression(decl) {
 }
 
 // vite/plugin.ts
-var SERVER_ONLY_ROUTE_EXPORTS = ["loader", "action", "headers"];
-var CLIENT_ROUTE_EXPORTS = [
+var SERVER_ONLY_ROUTE_EXPORTS = [
+  "loader",
+  "action",
+  "unstable_middleware",
+  "headers"
+];
+var CLIENT_ONLY_NON_COMPONENT_EXPORTS = [
   "clientAction",
   "clientLoader",
-  "default",
-  "ErrorBoundary",
+  "unstable_clientMiddleware",
   "handle",
-  "HydrateFallback",
-  "Layout",
-  "links",
   "meta",
+  "links",
   "shouldRevalidate"
 ];
+var CLIENT_ROUTE_EXPORTS = [
+  ...CLIENT_ONLY_NON_COMPONENT_EXPORTS,
+  "default",
+  "ErrorBoundary",
+  "HydrateFallback",
+  "Layout"
+];
 var BUILD_CLIENT_ROUTE_QUERY_STRING = "?__react-router-build-client-route";
 var isRouteEntryModuleId = (id) => {
   return id.endsWith(BUILD_CLIENT_ROUTE_QUERY_STRING);
@@ -2177,7 +2189,8 @@ var reactRouterVitePlugin = () => {
     )};
       export const basename = ${JSON.stringify(ctx.reactRouterConfig.basename)};
       export const future = ${JSON.stringify(ctx.reactRouterConfig.future)};
-      export const isSpaMode = ${!ctx.reactRouterConfig.ssr && ctx.reactRouterConfig.prerender == null};
+      export const ssr = ${ctx.reactRouterConfig.ssr};
+      export const isSpaMode = ${isSpaModeEnabled(ctx.reactRouterConfig)};
       export const publicPath = ${JSON.stringify(ctx.publicPath)};
       export const entry = { module: entryServer };
       export const routes = {
@@ -2527,6 +2540,16 @@ var reactRouterVitePlugin = () => {
                 rollupOptions: {
                   ...baseRollupOptions,
                   preserveEntrySignatures: "exports-only",
+                  output: {
+                    entryFileNames({ moduleIds }) {
+                      let routeChunkModuleId = moduleIds.find(isRouteChunkModuleId);
+                      let routeChunkName = routeChunkModuleId ? getRouteChunkNameFromModuleId(
+                        routeChunkModuleId
+                      ) : null;
+                      let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
+                      return `assets/[name]${routeChunkSuffix}-[hash].js`;
+                    }
+                  },
                   input: [
                     ctx.entryClientFilePath,
                     ...Object.values(
@@ -3046,7 +3069,7 @@ var reactRouterVitePlugin = () => {
         }
         let route = getRoute(ctx.reactRouterConfig, id);
         if (!route) return;
-        if (!options?.ssr && !ctx.reactRouterConfig.ssr) {
+        if (!options?.ssr && isSpaModeEnabled(ctx.reactRouterConfig)) {
           let exportNames = getExportNames(code);
           let serverOnlyExports = exportNames.filter(
             (exp) => SERVER_ONLY_ROUTE_EXPORTS.includes(exp)
@@ -3248,14 +3271,7 @@ function uniqueNodes(nodes) {
 }
 function addRefreshWrapper(reactRouterConfig, code, id) {
   let route = getRoute(reactRouterConfig, id);
-  let acceptExports = route ? [
-    "clientAction",
-    "clientLoader",
-    "handle",
-    "meta",
-    "links",
-    "shouldRevalidate"
-  ] : [];
+  let acceptExports = route ? CLIENT_ONLY_NON_COMPONENT_EXPORTS : [];
   return REACT_REFRESH_HEADER.replaceAll("__SOURCE__", JSON.stringify(id)) + code + REACT_REFRESH_FOOTER.replaceAll("__SOURCE__", JSON.stringify(id)).replaceAll("__ACCEPT_EXPORTS__", JSON.stringify(acceptExports)).replaceAll("__ROUTE_ID__", JSON.stringify(route?.id));
 }
 var REACT_REFRESH_HEADER = `
@@ -3354,6 +3370,9 @@ async function getRouteMetadata(cache, ctx, viteChildCompiler, route, readRouteF
   };
   return info;
 }
+function isSpaModeEnabled(reactRouterConfig) {
+  return reactRouterConfig.ssr === false && (reactRouterConfig.prerender == null || reactRouterConfig.prerender === false || Array.isArray(reactRouterConfig.prerender) && reactRouterConfig.prerender.length === 1 && reactRouterConfig.prerender[0] === "/");
+}
 async function getPrerenderBuildAndHandler(viteConfig, serverBuildDirectory, serverBuildFile) {
   let serverBuildPath = path6.join(serverBuildDirectory, serverBuildFile);
   let build = await import(url.pathToFileURL(serverBuildPath).toString());
@@ -3448,12 +3467,6 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
       );
     }
   }
-  await prerenderManifest(
-    build,
-    clientBuildDirectory,
-    reactRouterConfig,
-    viteConfig
-  );
 }
 function determineStaticPrerenderRoutes(routes, viteConfig, isBooleanUsage = false) {
   let paths = ["/"];
@@ -3529,18 +3542,6 @@ async function prerenderResourceRoute(handler, prerenderPath, clientBuildDirecto
   await fse.outputFile(outfile, text);
   viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
 }
-async function prerenderManifest(build, clientBuildDirectory, reactRouterConfig, viteConfig) {
-  let normalizedPath = `${reactRouterConfig.basename}/__manifest`.replace(
-    /\/\/+/g,
-    "/"
-  );
-  let outdir = path6.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path6.join(outdir, ...normalizedPath.split("/"));
-  await fse.ensureDir(path6.dirname(outfile));
-  let manifestData = JSON.stringify(build.assets.routes);
-  await fse.outputFile(outfile, manifestData);
-  viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
-}
 function validatePrerenderedResponse(response, html, prefix, path7) {
   if (response.status !== 200) {
     throw new Error(
@@ -3579,6 +3580,8 @@ function createPrerenderRoutes(manifest, parentId = "", routesByParentId = group
       loader: route.module.loader ? () => null : void 0,
       action: void 0,
       handle: route.module.handle
+      // middleware is not necessary here since we just need to know which
+      // routes have loaders so we know what paths to prerender
     };
     return route.index ? {
       index: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-df0f1dfda",
+  "version": "0.0.0-experimental-a383e1e6e",
   "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": "0.0.0-experimental-df0f1dfda"
+    "@react-router/node": "0.0.0-experimental-a383e1e6e"
   },
   "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": "0.0.0-experimental-df0f1dfda",
-    "react-router": "^0.0.0-experimental-df0f1dfda"
+    "@react-router/serve": "0.0.0-experimental-a383e1e6e",
+    "react-router": "^0.0.0-experimental-a383e1e6e"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-df0f1dfda",
-    "react-router": "^0.0.0-experimental-df0f1dfda"
+    "@react-router/serve": "^0.0.0-experimental-a383e1e6e",
+    "react-router": "^0.0.0-experimental-a383e1e6e"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {