@react-router/dev 0.0.0-experimental-1ab091485 → 0.0.0-experimental-1b454267f

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-1ab091485
+ * @react-router/dev v0.0.0-experimental-1b454267f
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1ab091485
+ * @react-router/dev v0.0.0-experimental-1b454267f
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -64,18 +64,7 @@ function invariant(value, message) {
 }
 
 // vite/node-adapter.ts
-function fromNodeHeaders(nodeReq) {
-  let nodeHeaders = nodeReq.headers;
-  if (nodeReq.httpVersionMajor >= 2) {
-    nodeHeaders = { ...nodeHeaders };
-    if (nodeHeaders[":authority"]) {
-      nodeHeaders.host = nodeHeaders[":authority"];
-    }
-    delete nodeHeaders[":authority"];
-    delete nodeHeaders[":method"];
-    delete nodeHeaders[":path"];
-    delete nodeHeaders[":scheme"];
-  }
+function fromNodeHeaders(nodeHeaders) {
   let headers = new Headers();
   for (let [key, values] of Object.entries(nodeHeaders)) {
     if (values) {
@@ -100,7 +89,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
   let controller = new AbortController();
   let init = {
     method: nodeReq.method,
-    headers: fromNodeHeaders(nodeReq),
+    headers: fromNodeHeaders(nodeReq.headers),
     signal: controller.signal
   };
   nodeRes.on("finish", () => controller = null);

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-1ab091485
+ * @react-router/dev v0.0.0-experimental-1b454267f
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -867,18 +867,7 @@ var import_node_events = require("events");
 var import_node_stream = require("stream");
 var import_set_cookie_parser = require("set-cookie-parser");
 var import_node = require("@react-router/node");
-function fromNodeHeaders(nodeReq) {
-  let nodeHeaders = nodeReq.headers;
-  if (nodeReq.httpVersionMajor >= 2) {
-    nodeHeaders = { ...nodeHeaders };
-    if (nodeHeaders[":authority"]) {
-      nodeHeaders.host = nodeHeaders[":authority"];
-    }
-    delete nodeHeaders[":authority"];
-    delete nodeHeaders[":method"];
-    delete nodeHeaders[":path"];
-    delete nodeHeaders[":scheme"];
-  }
+function fromNodeHeaders(nodeHeaders) {
   let headers = new Headers();
   for (let [key, values] of Object.entries(nodeHeaders)) {
     if (values) {
@@ -903,7 +892,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
   let controller = new AbortController();
   let init = {
     method: nodeReq.method,
-    headers: fromNodeHeaders(nodeReq),
+    headers: fromNodeHeaders(nodeReq.headers),
     signal: controller.signal
   };
   nodeRes.on("finish", () => controller = null);
@@ -1058,27 +1047,35 @@ var groupRoutesByParentId = (manifest) => {
   });
   return routes;
 };
-var createRoutes = (manifest, parentId = "", routesByParentId = groupRoutesByParentId(manifest)) => {
+var createRoutesWithChildren = (manifest, parentId = "", routesByParentId = groupRoutesByParentId(manifest)) => {
   return (routesByParentId[parentId] || []).map((route) => ({
     ...route,
-    children: createRoutes(manifest, route.id, routesByParentId)
+    ...route.index ? {
+      index: true
+    } : {
+      index: false,
+      children: createRoutesWithChildren(
+        manifest,
+        route.id,
+        routesByParentId
+      )
+    }
   }));
 };
-var getStylesForUrl = async ({
+var getStylesForPathname = async ({
   viteDevServer,
   rootDirectory,
   reactRouterConfig,
   entryClientFilePath,
   loadCssContents,
-  build,
-  url: url2
+  pathname
 }) => {
-  if (url2 === void 0 || url2.includes("?_data=")) {
+  if (pathname === void 0 || pathname.includes("?_data=")) {
     return void 0;
   }
-  let routes = createRoutes(build.routes);
+  let routesWithChildren = createRoutesWithChildren(reactRouterConfig.routes);
   let appPath = path5.relative(process.cwd(), reactRouterConfig.appDirectory);
-  let documentRouteFiles = (0, import_react_router.matchRoutes)(routes, url2, build.basename)?.map(
+  let documentRouteFiles = (0, import_react_router.matchRoutes)(routesWithChildren, pathname, reactRouterConfig.basename)?.map(
     (match) => path5.resolve(appPath, reactRouterConfig.routes[match.route.id].file)
   ) ?? [];
   let styles = await getStylesForFiles({
@@ -2238,10 +2235,10 @@ var reactRouterVitePlugin = () => {
       routes
     );
     return `
-    import * as entryServer from ${JSON.stringify(
+      import * as entryServer from ${JSON.stringify(
       resolveFileUrl(ctx, ctx.entryServerFilePath)
     )};
-    ${Object.keys(routes).map((key, index) => {
+      ${Object.keys(routes).map((key, index) => {
       let route = routes[key];
       return `import * as route${index} from ${JSON.stringify(
         resolveFileUrl(
@@ -2278,7 +2275,15 @@ var reactRouterVitePlugin = () => {
           module: route${index}
         }`;
     }).join(",\n  ")}
-      };`;
+      };
+      ${ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve" ? `
+              export const getCriticalCss = ({ pathname }) => {
+                return {
+                  rel: "stylesheet",
+                  href: "${viteUserConfig.base ?? "/"}@react-router/critical.css?pathname=" + pathname,
+                };
+              }
+            ` : ""}`;
   };
   let loadViteManifest = async (directory) => {
     let manifestContents = await fse.readFile(
@@ -2758,15 +2763,14 @@ var reactRouterVitePlugin = () => {
         (0, import_react_router2.unstable_setDevServerHooks)({
           // Give the request handler access to the critical CSS in dev to avoid a
           // flash of unstyled content since Vite injects CSS file contents via JS
-          getCriticalCss: async (build, url2) => {
-            return getStylesForUrl({
+          getCriticalCss: async (pathname) => {
+            return getStylesForPathname({
               rootDirectory: ctx.rootDirectory,
               entryClientFilePath: ctx.entryClientFilePath,
               reactRouterConfig: ctx.reactRouterConfig,
               viteDevServer,
               loadCssContents,
-              build,
-              url: url2
+              pathname
             });
           },
           // If an error is caught within the request handler, let Vite fix the
@@ -2809,25 +2813,36 @@ var reactRouterVitePlugin = () => {
             }
           }
         );
+        if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) {
+          viteDevServer.middlewares.use(async (req, res, next) => {
+            let [reqPathname, reqSearch] = (req.url ?? "").split("?");
+            if (reqPathname === "/@react-router/critical.css") {
+              let pathname = new URLSearchParams(reqSearch).get("pathname");
+              if (!pathname) {
+                return next("No pathname provided");
+              }
+              let css = await getStylesForPathname({
+                rootDirectory: ctx.rootDirectory,
+                entryClientFilePath: ctx.entryClientFilePath,
+                reactRouterConfig: ctx.reactRouterConfig,
+                viteDevServer,
+                loadCssContents,
+                pathname
+              });
+              res.setHeader("Content-Type", "text/css");
+              res.end(css);
+            } else {
+              next();
+            }
+          });
+        }
         return () => {
           if (!viteDevServer.config.server.middlewareMode) {
             viteDevServer.middlewares.use(async (req, res, next) => {
               try {
-                let build;
-                if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi) {
-                  let vite2 = getVite();
-                  let ssrEnvironment = viteDevServer.environments.ssr;
-                  if (!vite2.isRunnableDevEnvironment(ssrEnvironment)) {
-                    return;
-                  }
-                  build = await ssrEnvironment.runner.import(
-                    virtual.serverBuild.id
-                  );
-                } else {
-                  build = await viteDevServer.ssrLoadModule(
-                    virtual.serverBuild.id
-                  );
-                }
+                let build = await viteDevServer.ssrLoadModule(
+                  virtual.serverBuild.id
+                );
                 let handler = (0, import_react_router2.createRequestHandler)(build, "development");
                 let nodeHandler = async (nodeReq, nodeRes) => {
                   let req2 = fromNodeRequest(nodeReq, nodeRes);

package/package.json

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