@netlify/vite-plugin-react-router 3.1.0-next.0 → 3.1.0-next.2

package/dist/index.js

@@ -120,11 +120,12 @@ var import_promises = require("fs/promises");
 var import_node_path2 = require("path");
 var import_posix = require("path/posix");
 var import_vite_plugin = __toESM(require("@netlify/vite-plugin"));
+var import_node_fetch_server = require("@remix-run/node-fetch-server");
 var import_tinyglobby = require("tinyglobby");
 
 // package.json
 var name = "@netlify/vite-plugin-react-router";
-var version = "3.1.0-next.0";
+var version = "3.1.0-next.2";
 
 // src/lib/rollup.ts
 var import_node_path = require("path");
@@ -239,6 +240,7 @@ function netlifyPlugin(options = {}) {
   let isProductionSsrBuild = false;
   let currentCommand;
   let isHydrogenSite = false;
+  let userServerFile;
   const reactRouterPlugin = {
     name: "vite-plugin-netlify-react-router",
     config(_config, { command, isSsrBuild }) {
@@ -307,14 +309,52 @@ function netlifyPlugin(options = {}) {
       async handler(config) {
         resolvedConfig = config;
         isHydrogenSite = config.plugins.some((plugin) => plugin.name === "hydrogen:main");
-        if (isHydrogenSite && edge && isProductionSsrBuild) {
-          const userServerFile = await findUserEdgeFunctionHandlerFile(config.root);
-          if (config.build?.rollupOptions?.input && typeof config.build.rollupOptions.input === "object" && !Array.isArray(config.build.rollupOptions.input)) {
-            config.build.rollupOptions.input[FUNCTION_HANDLER_CHUNK] = userServerFile;
+        if (isHydrogenSite && edge) {
+          userServerFile = await findUserEdgeFunctionHandlerFile(config.root);
+          if (isProductionSsrBuild) {
+            if (config.build?.rollupOptions?.input && typeof config.build.rollupOptions.input === "object" && !Array.isArray(config.build.rollupOptions.input)) {
+              config.build.rollupOptions.input[FUNCTION_HANDLER_CHUNK] = userServerFile;
+            }
           }
         }
       }
     },
+    // In dev, Hydrogen sites need their server.ts to be loaded and called for each request so that
+    // it can provide `getLoadContext` (storefront, cart, session, etc.) to React Router's request
+    // handler. Without this, React Router's dev middleware would handle SSR with no load context.
+    configureServer: {
+      order: "pre",
+      handler(viteDevServer) {
+        if (!isHydrogenSite || !edge) return;
+        if (!userServerFile) {
+          viteDevServer.config.logger.warn(
+            "Hydrogen site detected but no server.ts found. Dev SSR will fall through to React Router defaults."
+          );
+          return;
+        }
+        const serverEntryFile = userServerFile;
+        return () => {
+          viteDevServer.middlewares.use(async (req, res, next) => {
+            try {
+              const serverModule = await viteDevServer.ssrLoadModule((0, import_node_path2.join)(viteDevServer.config.root, serverEntryFile));
+              const handler = serverModule.default;
+              req.url = req.originalUrl ?? req.url;
+              const request = (0, import_node_fetch_server.createRequest)(req, res);
+              const netlifyContext = { waitUntil: () => {
+              }, ...globalThis.Netlify?.context };
+              const response = await handler(request, netlifyContext);
+              if (response) {
+                await (0, import_node_fetch_server.sendResponse)(res, response);
+              } else {
+                next();
+              }
+            } catch (error) {
+              next(error);
+            }
+          });
+        };
+      }
+    },
     // See https://rollupjs.org/plugin-development/#writebundle.
     async writeBundle() {
       if (isProductionSsrBuild) {

package/dist/index.mjs

@@ -9,11 +9,12 @@ import { access, mkdir, writeFile } from "node:fs/promises";
 import { dirname, join, relative, resolve, sep } from "node:path";
 import { sep as posixSep } from "node:path/posix";
 import netlifyVitePlugin from "@netlify/vite-plugin";
+import { createRequest, sendResponse } from "@remix-run/node-fetch-server";
 import { glob } from "tinyglobby";
 
 // package.json
 var name = "@netlify/vite-plugin-react-router";
-var version = "3.1.0-next.0";
+var version = "3.1.0-next.2";
 
 // src/lib/rollup.ts
 import { basename, extname } from "node:path";
@@ -128,6 +129,7 @@ function netlifyPlugin(options = {}) {
   let isProductionSsrBuild = false;
   let currentCommand;
   let isHydrogenSite = false;
+  let userServerFile;
   const reactRouterPlugin = {
     name: "vite-plugin-netlify-react-router",
     config(_config, { command, isSsrBuild }) {
@@ -196,14 +198,52 @@ function netlifyPlugin(options = {}) {
       async handler(config) {
         resolvedConfig = config;
         isHydrogenSite = config.plugins.some((plugin) => plugin.name === "hydrogen:main");
-        if (isHydrogenSite && edge && isProductionSsrBuild) {
-          const userServerFile = await findUserEdgeFunctionHandlerFile(config.root);
-          if (config.build?.rollupOptions?.input && typeof config.build.rollupOptions.input === "object" && !Array.isArray(config.build.rollupOptions.input)) {
-            config.build.rollupOptions.input[FUNCTION_HANDLER_CHUNK] = userServerFile;
+        if (isHydrogenSite && edge) {
+          userServerFile = await findUserEdgeFunctionHandlerFile(config.root);
+          if (isProductionSsrBuild) {
+            if (config.build?.rollupOptions?.input && typeof config.build.rollupOptions.input === "object" && !Array.isArray(config.build.rollupOptions.input)) {
+              config.build.rollupOptions.input[FUNCTION_HANDLER_CHUNK] = userServerFile;
+            }
           }
         }
       }
     },
+    // In dev, Hydrogen sites need their server.ts to be loaded and called for each request so that
+    // it can provide `getLoadContext` (storefront, cart, session, etc.) to React Router's request
+    // handler. Without this, React Router's dev middleware would handle SSR with no load context.
+    configureServer: {
+      order: "pre",
+      handler(viteDevServer) {
+        if (!isHydrogenSite || !edge) return;
+        if (!userServerFile) {
+          viteDevServer.config.logger.warn(
+            "Hydrogen site detected but no server.ts found. Dev SSR will fall through to React Router defaults."
+          );
+          return;
+        }
+        const serverEntryFile = userServerFile;
+        return () => {
+          viteDevServer.middlewares.use(async (req, res, next) => {
+            try {
+              const serverModule = await viteDevServer.ssrLoadModule(join(viteDevServer.config.root, serverEntryFile));
+              const handler = serverModule.default;
+              req.url = req.originalUrl ?? req.url;
+              const request = createRequest(req, res);
+              const netlifyContext = { waitUntil: () => {
+              }, ...globalThis.Netlify?.context };
+              const response = await handler(request, netlifyContext);
+              if (response) {
+                await sendResponse(res, response);
+              } else {
+                next();
+              }
+            } catch (error) {
+              next(error);
+            }
+          });
+        };
+      }
+    },
     // See https://rollupjs.org/plugin-development/#writebundle.
     async writeBundle() {
       if (isProductionSsrBuild) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/vite-plugin-react-router",
-  "version": "3.1.0-next.0",
+  "version": "3.1.0-next.2",
   "description": "React Router 7+ Vite plugin for Netlify",
   "type": "commonjs",
   "main": "./dist/index.js",
@@ -54,7 +54,8 @@
   "dependencies": {
     "@netlify/edge-functions": "^3.0.4",
     "@netlify/functions": "^5.1.3",
-    "@netlify/vite-plugin": "^2.10.11",
+    "@netlify/vite-plugin": "^2.11.0",
+    "@remix-run/node-fetch-server": "^0.9.0",
     "isbot": "^5.1.25",
     "tinyglobby": "^0.2.10"
   },
@@ -65,7 +66,7 @@
     "react-dom": "^18.2.0",
     "react-router": "^7.9.4",
     "tsup": "^8.0.2",
-    "vite": "^6.2.5"
+    "vite": "^8.0.0"
   },
   "peerDependencies": {
     "react-router": ">=7.9.0",