@react-router/serve 0.0.0-experimental-61f2749d7 → 0.0.0-experimental-6336d71a9

package/CHANGELOG.md

@@ -626,12 +626,10 @@
 - Introduces the `defer()` API from `@remix-run/router` with support for server-rendering and HTTP streaming. This utility allows you to defer values returned from `loader` functions by returning promises instead of resolved values. This has been refered to as _"sending a promise over the wire"_. ([#4920](https://github.com/remix-run/remix/pull/4920))
 
   Informational Resources:
-
   - <https://gist.github.com/jacob-ebey/9bde9546c1aafaa6bc8c242054b1be26>
   - <https://github.com/remix-run/remix/blob/main/decisions/0004-streaming-apis.md>
 
   Documentation Resources (better docs specific to Remix are in the works):
-
   - <https://reactrouter.com/en/main/utils/defer>
   - <https://reactrouter.com/en/main/components/await>
   - <https://reactrouter.com/en/main/hooks/use-async-value>

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/serve v0.0.0-experimental-61f2749d7
+ * @react-router/serve v0.0.0-experimental-6336d71a9
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -39,6 +39,7 @@ var import_node_os = __toESM(require("os"));
 var import_node_path = __toESM(require("path"));
 var import_node_url = __toESM(require("url"));
 var import_express = require("@react-router/express");
+var import_node_fetch_server = require("@mjackson/node-fetch-server");
 var import_compression = __toESM(require("compression"));
 var import_express2 = __toESM(require("express"));
 var import_morgan = __toESM(require("morgan"));
@@ -62,6 +63,9 @@ import_source_map_support.default.install({
   }
 });
 run();
+function isRSCServerBuild(build) {
+  return "fetch" in build && typeof build.fetch === "function";
+}
 function parseNumber(raw) {
   if (raw === void 0) return void 0;
   let maybe = Number(raw);
@@ -77,7 +81,25 @@ async function run() {
     process.exit(1);
   }
   let buildPath = import_node_path.default.resolve(buildPathArg);
-  let build = await import(import_node_url.default.pathToFileURL(buildPath).href);
+  let buildModule = await import(import_node_url.default.pathToFileURL(buildPath).href);
+  let build;
+  if (buildModule.default && typeof buildModule.default === "function") {
+    const config = {
+      publicPath: "/",
+      assetsBuildDirectory: "../client",
+      ...buildModule.unstable_reactRouterServeConfig || {}
+    };
+    build = {
+      fetch: buildModule.default,
+      publicPath: config.publicPath,
+      assetsBuildDirectory: import_node_path.default.resolve(
+        import_node_path.default.dirname(buildPath),
+        config.assetsBuildDirectory
+      )
+    };
+  } else {
+    build = buildModule;
+  }
   let onListen = () => {
     let address = process.env.HOST || Object.values(import_node_os.default.networkInterfaces()).flat().find((ip) => String(ip?.family).includes("4") && !ip?.internal)?.address;
     if (!address) {
@@ -101,13 +123,17 @@ async function run() {
   app.use(build.publicPath, import_express2.default.static(build.assetsBuildDirectory));
   app.use(import_express2.default.static("public", { maxAge: "1h" }));
   app.use((0, import_morgan.default)("tiny"));
-  app.all(
-    "*",
-    (0, import_express.createRequestHandler)({
-      build,
-      mode: process.env.NODE_ENV
-    })
-  );
+  if (isRSCServerBuild(build)) {
+    app.all("*", (0, import_node_fetch_server.createRequestListener)(build.fetch));
+  } else {
+    app.all(
+      "*",
+      (0, import_express.createRequestHandler)({
+        build,
+        mode: process.env.NODE_ENV
+      })
+    );
+  }
   let server = process.env.HOST ? app.listen(port, process.env.HOST, onListen) : app.listen(port, onListen);
   ["SIGTERM", "SIGINT"].forEach((signal) => {
     process.once(signal, () => server?.close(console.error));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/serve",
-  "version": "0.0.0-experimental-61f2749d7",
+  "version": "0.0.0-experimental-6336d71a9",
   "description": "Production application server for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -32,16 +32,17 @@
     }
   },
   "dependencies": {
+    "@mjackson/node-fetch-server": "^0.2.0",
     "compression": "^1.7.4",
     "express": "^4.19.2",
     "get-port": "5.1.1",
     "morgan": "^1.10.0",
     "source-map-support": "^0.5.21",
-    "@react-router/node": "0.0.0-experimental-61f2749d7",
-    "@react-router/express": "0.0.0-experimental-61f2749d7"
+    "@react-router/express": "0.0.0-experimental-6336d71a9",
+    "@react-router/node": "0.0.0-experimental-6336d71a9"
   },
   "peerDependencies": {
-    "react-router": "0.0.0-experimental-61f2749d7"
+    "react-router": "0.0.0-experimental-6336d71a9"
   },
   "devDependencies": {
     "@types/compression": "^1.7.0",