@react-router/dev 7.2.0 → 7.3.0-pre.1

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.2.0
+ * @react-router/dev v7.3.0-pre.1
  *
  * 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);
@@ -165,26 +176,47 @@ var import_package_json = __toESM(require("@npmcli/package-json"));
 var import_server = require("vite-node/server");
 var import_client = require("vite-node/client");
 var import_source_map = require("vite-node/source-map");
-async function createContext(viteConfig = {}) {
+
+// vite/ssr-externals.ts
+var ssrExternals = isReactRouterRepo() ? [
+  // This is only needed within this repo because these packages
+  // are linked to a directory outside of node_modules so Vite
+  // treats them as internal code by default.
+  "react-router",
+  "react-router-dom",
+  "@react-router/architect",
+  "@react-router/cloudflare",
+  "@react-router/dev",
+  "@react-router/express",
+  "@react-router/node",
+  "@react-router/serve"
+] : void 0;
+
+// vite/vite-node.ts
+async function createContext({
+  root,
+  mode
+}) {
   await preloadVite();
   const vite2 = getVite();
-  const devServer = await vite2.createServer(
-    vite2.mergeConfig(
-      {
-        server: {
-          preTransformRequests: false,
-          hmr: false
-        },
-        optimizeDeps: {
-          noDiscovery: true
-        },
-        configFile: false,
-        envFile: false,
-        plugins: []
-      },
-      viteConfig
-    )
-  );
+  const devServer = await vite2.createServer({
+    root,
+    mode,
+    server: {
+      preTransformRequests: false,
+      hmr: false,
+      watch: null
+    },
+    ssr: {
+      external: ssrExternals
+    },
+    optimizeDeps: {
+      noDiscovery: true
+    },
+    configFile: false,
+    envFile: false,
+    plugins: []
+  });
   await devServer.pluginContainer.buildStart({});
   const server = new import_server.ViteNodeServer(devServer);
   (0, import_source_map.installSourcemapsSupport)({
@@ -477,6 +509,7 @@ async function resolveConfig({
     );
   }
   let future = {
+    unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
@@ -506,11 +539,7 @@ async function createConfigLoader({
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode: watch ? "development" : "production",
-    server: !watch ? { watch: null } : {},
-    ssr: {
-      external: ssrExternals
-    }
+    mode: watch ? "development" : "production"
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -595,19 +624,6 @@ async function loadConfig({ rootDirectory }) {
   await configLoader.close();
   return config;
 }
-var ssrExternals = isReactRouterRepo() ? [
-  // This is only needed within this repo because these packages
-  // are linked to a directory outside of node_modules so Vite
-  // treats them as internal code by default.
-  "react-router",
-  "react-router-dom",
-  "@react-router/architect",
-  "@react-router/cloudflare",
-  "@react-router/dev",
-  "@react-router/express",
-  "@react-router/node",
-  "@react-router/serve"
-] : void 0;
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename, options) {
   for (let ext of entryExts) {
@@ -678,11 +694,14 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
       }
     },
     configureServer: async (viteDevServer) => {
-      let { getPlatformProxy } = await importWrangler();
-      let { dispose, ...cloudflare } = await getPlatformProxy(
-        restOptions
-      );
-      let context = { cloudflare };
+      let context;
+      let getContext = async () => {
+        let { getPlatformProxy } = await importWrangler();
+        let { dispose, ...cloudflare } = await getPlatformProxy(
+          restOptions
+        );
+        return { cloudflare };
+      };
       return () => {
         if (!viteDevServer.config.server.middlewareMode) {
           viteDevServer.middlewares.use(async (nodeReq, nodeRes, next) => {
@@ -692,6 +711,7 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
               );
               let handler = (0, import_react_router.createRequestHandler)(build, "development");
               let req = fromNodeRequest(nodeReq, nodeRes);
+              context ??= await getContext();
               let loadContext = getLoadContext ? await getLoadContext({ request: req, context }) : context;
               let res = await handler(req, loadContext);
               await toNodeRequest(res, nodeRes);