@react-router/dev 0.0.0-experimental-8677247c0 → 0.0.0-experimental-1ab091485

package/dist/cli/index.js

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

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

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

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-8677247c0
+ * @react-router/dev v0.0.0-experimental-1ab091485
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -867,7 +867,18 @@ 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(nodeHeaders) {
+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"];
+  }
   let headers = new Headers();
   for (let [key, values] of Object.entries(nodeHeaders)) {
     if (values) {
@@ -892,7 +903,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
   let controller = new AbortController();
   let init = {
     method: nodeReq.method,
-    headers: fromNodeHeaders(nodeReq.headers),
+    headers: fromNodeHeaders(nodeReq),
     signal: controller.signal
   };
   nodeRes.on("finish", () => controller = null);
@@ -2802,9 +2813,21 @@ var reactRouterVitePlugin = () => {
           if (!viteDevServer.config.server.middlewareMode) {
             viteDevServer.middlewares.use(async (req, res, next) => {
               try {
-                let build = await viteDevServer.ssrLoadModule(
-                  virtual.serverBuild.id
-                );
+                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 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-8677247c0",
+  "version": "0.0.0-experimental-1ab091485",
   "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-8677247c0"
+    "@react-router/node": "0.0.0-experimental-1ab091485"
   },
   "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-8677247c0",
-    "react-router": "^0.0.0-experimental-8677247c0"
+    "@react-router/serve": "0.0.0-experimental-1ab091485",
+    "react-router": "^0.0.0-experimental-1ab091485"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-8677247c0",
-    "react-router": "^0.0.0-experimental-8677247c0"
+    "@react-router/serve": "^0.0.0-experimental-1ab091485",
+    "react-router": "^0.0.0-experimental-1ab091485"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {