@react-router/express 0.0.0-experimental-8cee090e4 → 0.0.0-experimental-63fd291ad

package/dist/index.d.mts

@@ -0,0 +1,26 @@
+import * as express from 'express';
+import { UNSAFE_MiddlewareEnabled, RouterContextProvider, AppLoadContext, ServerBuild } from 'react-router';
+
+/// <reference lib="dom.iterable" />
+
+type MaybePromise<T> = T | Promise<T>;
+/**
+ * A function that returns the value to use as `context` in route `loader` and
+ * `action` functions.
+ *
+ * You can think of this as an escape hatch that allows you to pass
+ * environment/platform-specific values through to your loader/action, such as
+ * values that are generated by Express middleware like `req.session`.
+ */
+type GetLoadContextFunction = (req: express.Request, res: express.Response) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<RouterContextProvider> : MaybePromise<AppLoadContext>;
+type RequestHandler = (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
+/**
+ * Returns a request handler for Express that serves the response using Remix.
+ */
+declare function createRequestHandler({ build, getLoadContext, mode, }: {
+    build: ServerBuild | (() => Promise<ServerBuild>);
+    getLoadContext?: GetLoadContextFunction;
+    mode?: string;
+}): RequestHandler;
+
+export { type GetLoadContextFunction, type RequestHandler, createRequestHandler };

package/dist/index.d.ts

@@ -1,8 +1,8 @@
+import * as express from 'express';
+import { UNSAFE_MiddlewareEnabled, RouterContextProvider, AppLoadContext, ServerBuild } from 'react-router';
 
-import { RouterContextProvider, ServerBuild } from "react-router";
-import * as express from "express";
+/// <reference lib="dom.iterable" />
 
-//#region server.d.ts
 type MaybePromise<T> = T | Promise<T>;
 /**
  * A function that returns the value to use as `context` in route `loader` and
@@ -12,19 +12,15 @@ type MaybePromise<T> = T | Promise<T>;
  * environment/platform-specific values through to your loader/action, such as
  * values that are generated by Express middleware like `req.session`.
  */
-type GetLoadContextFunction = (req: express.Request, res: express.Response) => MaybePromise<RouterContextProvider>;
+type GetLoadContextFunction = (req: express.Request, res: express.Response) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<RouterContextProvider> : MaybePromise<AppLoadContext>;
 type RequestHandler = (req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>;
 /**
  * Returns a request handler for Express that serves the response using Remix.
  */
-declare function createRequestHandler({
-  build,
-  getLoadContext,
-  mode
-}: {
-  build: ServerBuild | (() => Promise<ServerBuild>);
-  getLoadContext?: GetLoadContextFunction;
-  mode?: string;
+declare function createRequestHandler({ build, getLoadContext, mode, }: {
+    build: ServerBuild | (() => Promise<ServerBuild>);
+    getLoadContext?: GetLoadContextFunction;
+    mode?: string;
 }): RequestHandler;
-//#endregion
-export { type GetLoadContextFunction, type RequestHandler, createRequestHandler };
+
+export { type GetLoadContextFunction, type RequestHandler, createRequestHandler };

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/express v0.0.0-experimental-8cee090e4
+ * @react-router/express v0.0.0-experimental-63fd291ad
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,69 +8,119 @@
  *
  * @license MIT
  */
-import { createRequestHandler as createRequestHandler$1 } from "react-router";
-import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "@react-router/node";
-//#region server.ts
-/**
-* Returns a request handler for Express that serves the response using Remix.
-*/
-function createRequestHandler({ build, getLoadContext, mode = process.env.NODE_ENV }) {
-	let handleRequest = createRequestHandler$1(build, mode);
-	return async (req, res, next) => {
-		try {
-			await sendRemixResponse(res, await handleRequest(createRemixRequest(req, res), await getLoadContext?.(req, res)));
-		} catch (error) {
-			next(error);
-		}
-	};
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// index.ts
+var index_exports = {};
+__export(index_exports, {
+  createRequestHandler: () => createRequestHandler
+});
+module.exports = __toCommonJS(index_exports);
+
+// server.ts
+var import_react_router = require("react-router");
+var import_node = require("@react-router/node");
+function createRequestHandler({
+  build,
+  getLoadContext,
+  mode = process.env.NODE_ENV
+}) {
+  let handleRequest = (0, import_react_router.createRequestHandler)(build, mode);
+  return async (req, res, next) => {
+    try {
+      let request = createRemixRequest(req, res);
+      let loadContext = await getLoadContext?.(req, res);
+      let response = await handleRequest(request, loadContext);
+      await sendRemixResponse(res, response);
+    } catch (error) {
+      next(error);
+    }
+  };
 }
 function createRemixHeaders(requestHeaders) {
-	let headers = new Headers();
-	for (let [key, values] of Object.entries(requestHeaders)) if (values) if (Array.isArray(values)) for (let value of values) headers.append(key, value);
-	else headers.set(key, values);
-	return headers;
+  let headers = new Headers();
+  for (let [key, values] of Object.entries(requestHeaders)) {
+    if (values) {
+      if (Array.isArray(values)) {
+        for (let value of values) {
+          headers.append(key, value);
+        }
+      } else {
+        headers.set(key, values);
+      }
+    }
+  }
+  return headers;
 }
 function createRemixRequest(req, res) {
-	let [, hostnamePortStr] = req.get("X-Forwarded-Host")?.split(":") ?? [];
-	let [, hostPortStr] = req.get("host")?.split(":") ?? [];
-	let hostnamePort = Number.parseInt(hostnamePortStr, 10);
-	let hostPort = Number.parseInt(hostPortStr, 10);
-	let port = Number.isSafeInteger(hostnamePort) ? hostnamePort : Number.isSafeInteger(hostPort) ? hostPort : "";
-	let resolvedHost = `${req.hostname}${port ? `:${port}` : ""}`;
-	let url = new URL(`${req.protocol}://${resolvedHost}${req.originalUrl}`);
-	let controller = new AbortController();
-	let init = {
-		method: req.method,
-		headers: createRemixHeaders(req.headers),
-		signal: controller.signal
-	};
-	res.on("finish", () => controller = null);
-	res.on("close", () => controller?.abort());
-	if (req.method !== "GET" && req.method !== "HEAD") {
-		init.body = createReadableStreamFromReadable(req);
-		init.duplex = "half";
-	}
-	return new Request(url.href, init);
+  let [, hostnamePortStr] = req.get("X-Forwarded-Host")?.split(":") ?? [];
+  let [, hostPortStr] = req.get("host")?.split(":") ?? [];
+  let hostnamePort = Number.parseInt(hostnamePortStr, 10);
+  let hostPort = Number.parseInt(hostPortStr, 10);
+  let port = Number.isSafeInteger(hostnamePort) ? hostnamePort : Number.isSafeInteger(hostPort) ? hostPort : "";
+  let resolvedHost = `${req.hostname}${port ? `:${port}` : ""}`;
+  let url = new URL(`${req.protocol}://${resolvedHost}${req.originalUrl}`);
+  let controller = new AbortController();
+  let init = {
+    method: req.method,
+    headers: createRemixHeaders(req.headers),
+    signal: controller.signal
+  };
+  res.on("finish", () => controller = null);
+  res.on("close", () => controller?.abort());
+  if (req.method !== "GET" && req.method !== "HEAD") {
+    init.body = (0, import_node.createReadableStreamFromReadable)(req);
+    init.duplex = "half";
+  }
+  return new Request(url.href, init);
 }
 async function sendRemixResponse(res, nodeResponse) {
-	if (isResponseClosed(res)) {
-		await nodeResponse.body?.cancel();
-		return;
-	}
-	res.statusMessage = nodeResponse.statusText;
-	res.status(nodeResponse.status);
-	for (let [key, value] of nodeResponse.headers.entries()) res.append(key, value);
-	if (nodeResponse.headers.get("Content-Type")?.match(/text\/event-stream/i)) res.flushHeaders();
-	if (nodeResponse.body) try {
-		await writeReadableStreamToWritable(nodeResponse.body, res);
-	} catch (error) {
-		if (isResponseClosed(res)) return;
-		throw error;
-	}
-	else res.end();
+  if (isResponseClosed(res)) {
+    await nodeResponse.body?.cancel();
+    return;
+  }
+  res.statusMessage = nodeResponse.statusText;
+  res.status(nodeResponse.status);
+  for (let [key, value] of nodeResponse.headers.entries()) {
+    res.append(key, value);
+  }
+  if (nodeResponse.headers.get("Content-Type")?.match(/text\/event-stream/i)) {
+    res.flushHeaders();
+  }
+  if (nodeResponse.body) {
+    try {
+      await (0, import_node.writeReadableStreamToWritable)(nodeResponse.body, res);
+    } catch (error) {
+      if (isResponseClosed(res)) {
+        return;
+      }
+      throw error;
+    }
+  } else {
+    res.end();
+  }
 }
 function isResponseClosed(res) {
-	return res.destroyed || res.writableEnded;
+  return res.destroyed || res.writableEnded;
 }
-//#endregion
-export { createRequestHandler };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createRequestHandler
+});

package/dist/index.mjs

@@ -0,0 +1,103 @@
+/**
+ * @react-router/express v0.0.0-experimental-63fd291ad
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+// server.ts
+import { createRequestHandler as createRemixRequestHandler } from "react-router";
+import {
+  createReadableStreamFromReadable,
+  writeReadableStreamToWritable
+} from "@react-router/node";
+function createRequestHandler({
+  build,
+  getLoadContext,
+  mode = process.env.NODE_ENV
+}) {
+  let handleRequest = createRemixRequestHandler(build, mode);
+  return async (req, res, next) => {
+    try {
+      let request = createRemixRequest(req, res);
+      let loadContext = await getLoadContext?.(req, res);
+      let response = await handleRequest(request, loadContext);
+      await sendRemixResponse(res, response);
+    } catch (error) {
+      next(error);
+    }
+  };
+}
+function createRemixHeaders(requestHeaders) {
+  let headers = new Headers();
+  for (let [key, values] of Object.entries(requestHeaders)) {
+    if (values) {
+      if (Array.isArray(values)) {
+        for (let value of values) {
+          headers.append(key, value);
+        }
+      } else {
+        headers.set(key, values);
+      }
+    }
+  }
+  return headers;
+}
+function createRemixRequest(req, res) {
+  let [, hostnamePortStr] = req.get("X-Forwarded-Host")?.split(":") ?? [];
+  let [, hostPortStr] = req.get("host")?.split(":") ?? [];
+  let hostnamePort = Number.parseInt(hostnamePortStr, 10);
+  let hostPort = Number.parseInt(hostPortStr, 10);
+  let port = Number.isSafeInteger(hostnamePort) ? hostnamePort : Number.isSafeInteger(hostPort) ? hostPort : "";
+  let resolvedHost = `${req.hostname}${port ? `:${port}` : ""}`;
+  let url = new URL(`${req.protocol}://${resolvedHost}${req.originalUrl}`);
+  let controller = new AbortController();
+  let init = {
+    method: req.method,
+    headers: createRemixHeaders(req.headers),
+    signal: controller.signal
+  };
+  res.on("finish", () => controller = null);
+  res.on("close", () => controller?.abort());
+  if (req.method !== "GET" && req.method !== "HEAD") {
+    init.body = createReadableStreamFromReadable(req);
+    init.duplex = "half";
+  }
+  return new Request(url.href, init);
+}
+async function sendRemixResponse(res, nodeResponse) {
+  if (isResponseClosed(res)) {
+    await nodeResponse.body?.cancel();
+    return;
+  }
+  res.statusMessage = nodeResponse.statusText;
+  res.status(nodeResponse.status);
+  for (let [key, value] of nodeResponse.headers.entries()) {
+    res.append(key, value);
+  }
+  if (nodeResponse.headers.get("Content-Type")?.match(/text\/event-stream/i)) {
+    res.flushHeaders();
+  }
+  if (nodeResponse.body) {
+    try {
+      await writeReadableStreamToWritable(nodeResponse.body, res);
+    } catch (error) {
+      if (isResponseClosed(res)) {
+        return;
+      }
+      throw error;
+    }
+  } else {
+    res.end();
+  }
+}
+function isResponseClosed(res) {
+  return res.destroyed || res.writableEnded;
+}
+export {
+  createRequestHandler
+};

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@react-router/express",
-  "type": "module",
-  "version": "0.0.0-experimental-8cee090e4",
+  "version": "0.0.0-experimental-63fd291ad",
   "description": "Express server request handler for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -16,15 +15,25 @@
   "typings": "dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "module-sync": "./dist/index.js",
-      "default": "./dist/index.js"
+      "node": {
+        "types": "./dist/index.d.ts",
+        "module-sync": "./dist/index.mjs",
+        "default": "./dist/index.js"
+      },
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "default": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     },
     "./package.json": "./package.json"
   },
   "wireit": {
     "build": {
-      "command": "tsdown",
+      "command": "tsup",
       "files": [
         "../../pnpm-workspace.yaml",
         "*.ts",
@@ -37,23 +46,23 @@
     }
   },
   "dependencies": {
-    "@react-router/node": "0.0.0-experimental-8cee090e4"
+    "@react-router/node": "0.0.0-experimental-63fd291ad"
   },
   "devDependencies": {
-    "@types/express": "^4.17.25",
-    "@types/node": "^22.19.19",
-    "@types/supertest": "^7.2.0",
-    "express": "^4.22.2",
-    "node-mocks-http": "^1.17.2",
-    "supertest": "^7.2.2",
-    "tsdown": "^0.22.0",
-    "typescript": "^6.0.3",
-    "wireit": "0.14.12"
+    "@types/express": "^4.17.9",
+    "@types/node": "^20.0.0",
+    "@types/supertest": "^2.0.10",
+    "express": "^4.19.2",
+    "node-mocks-http": "^1.10.1",
+    "supertest": "^6.3.3",
+    "tsup": "^8.3.0",
+    "typescript": "^5.4.5",
+    "wireit": "0.14.9"
   },
   "peerDependencies": {
-    "express": "^4.22.2 || ^5",
+    "express": "^4.17.1 || ^5",
     "typescript": "^5.1.0 || ^6.0.0",
-    "react-router": "0.0.0-experimental-8cee090e4"
+    "react-router": "0.0.0-experimental-63fd291ad"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -61,7 +70,7 @@
     }
   },
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "dist/",