@react-router/express 0.0.0-experimental-7c6c0664d → 0.0.0-experimental-9f7fdccd4

package/dist/index.d.mts

@@ -0,0 +1,25 @@
+import * as express from 'express';
+import { AppLoadContext, ServerBuild } from 'react-router';
+
+/// <reference lib="dom.iterable" />
+
+/**
+ * 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) => Promise<AppLoadContext> | 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,2 +1,25 @@
-export type { GetLoadContextFunction, RequestHandler } from "./server";
-export { createRequestHandler } from "./server";
+import * as express from 'express';
+import { AppLoadContext, ServerBuild } from 'react-router';
+
+/// <reference lib="dom.iterable" />
+
+/**
+ * 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) => Promise<AppLoadContext> | 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.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/express v0.0.0-experimental-7c6c0664d
+ * @react-router/express v0.0.0-experimental-9f7fdccd4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,12 +8,103 @@
  *
  * @license MIT
  */
-'use strict';
+"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);
 
-Object.defineProperty(exports, '__esModule', { value: true });
+// index.ts
+var react_router_express_exports = {};
+__export(react_router_express_exports, {
+  createRequestHandler: () => createRequestHandler
+});
+module.exports = __toCommonJS(react_router_express_exports);
 
-var server = require('./server.js');
-
-
-
-exports.createRequestHandler = server.createRequestHandler;
+// 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;
+}
+function createRemixRequest(req, res) {
+  let [, hostnamePort] = req.get("X-Forwarded-Host")?.split(":") ?? [];
+  let [, hostPort] = req.get("host")?.split(":") ?? [];
+  let port = hostnamePort || 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) {
+  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) {
+    await (0, import_node.writeReadableStreamToWritable)(nodeResponse.body, res);
+  } else {
+    res.end();
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createRequestHandler
+});

package/dist/index.mjs

@@ -0,0 +1,87 @@
+/**
+ * @react-router/express v0.0.0-experimental-9f7fdccd4
+ *
+ * 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 [, hostnamePort] = req.get("X-Forwarded-Host")?.split(":") ?? [];
+  let [, hostPort] = req.get("host")?.split(":") ?? [];
+  let port = hostnamePort || 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) {
+  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) {
+    await writeReadableStreamToWritable(nodeResponse.body, res);
+  } else {
+    res.end();
+  }
+}
+export {
+  createRequestHandler
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/express",
-  "version": "0.0.0-experimental-7c6c0664d",
+  "version": "0.0.0-experimental-9f7fdccd4",
   "description": "Express server request handler for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -15,13 +15,37 @@
   "typings": "dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "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": "tsup",
+      "files": [
+        "*.ts",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": [
+        "dist/**"
+      ]
+    }
+  },
   "dependencies": {
-    "@react-router/node": "0.0.0-experimental-7c6c0664d"
+    "@react-router/node": "0.0.0-experimental-9f7fdccd4"
   },
   "devDependencies": {
     "@types/express": "^4.17.9",
@@ -30,12 +54,14 @@
     "express": "^4.19.2",
     "node-mocks-http": "^1.10.1",
     "supertest": "^6.3.3",
-    "typescript": "^5.1.6"
+    "tsup": "^8.3.0",
+    "typescript": "^5.1.6",
+    "wireit": "0.14.9"
   },
   "peerDependencies": {
     "express": "^4.17.1",
     "typescript": "^5.1.0",
-    "react-router": "0.0.0-experimental-7c6c0664d"
+    "react-router": "0.0.0-experimental-9f7fdccd4"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -52,6 +78,6 @@
     "README.md"
   ],
   "scripts": {
-    "tsc": "tsc"
+    "build": "wireit"
   }
 }

package/dist/server.d.ts

@@ -1,24 +0,0 @@
-/// <reference lib="dom.iterable" />
-import type * as express from "express";
-import type { AppLoadContext, ServerBuild } from "react-router";
-/**
- * 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`.
- */
-export type GetLoadContextFunction = (req: express.Request, res: express.Response) => Promise<AppLoadContext> | AppLoadContext;
-export 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.
- */
-export declare function createRequestHandler({ build, getLoadContext, mode, }: {
-    build: ServerBuild | (() => Promise<ServerBuild>);
-    getLoadContext?: GetLoadContextFunction;
-    mode?: string;
-}): RequestHandler;
-export declare function createRemixHeaders(requestHeaders: express.Request["headers"]): Headers;
-export declare function createRemixRequest(req: express.Request, res: express.Response): Request;
-export declare function sendRemixResponse(res: express.Response, nodeResponse: Response): Promise<void>;

package/dist/server.js

@@ -1,121 +0,0 @@
-/**
- * @react-router/express v0.0.0-experimental-7c6c0664d
- *
- * 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
- */
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var reactRouter = require('react-router');
-var node = require('@react-router/node');
-
-// IDK why this is needed when it's in the tsconfig..........
-
-/**
- * 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`.
- */
-
-/**
- * Returns a request handler for Express that serves the response using Remix.
- */
-function createRequestHandler({
-  build,
-  getLoadContext,
-  mode = process.env.NODE_ENV
-}) {
-  let handleRequest = reactRouter.createRequestHandler(build, mode);
-  return async (req, res, next) => {
-    try {
-      let request = createRemixRequest(req, res);
-      let loadContext = await (getLoadContext === null || getLoadContext === void 0 ? void 0 : getLoadContext(req, res));
-      let response = await handleRequest(request, loadContext);
-      await sendRemixResponse(res, response);
-    } catch (error) {
-      // Express doesn't support async functions, so we have to pass along the
-      // error manually using next().
-      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) {
-  var _req$get, _req$get2;
-  // req.hostname doesn't include port information so grab that from
-  // `X-Forwarded-Host` or `Host`
-  let [, hostnamePort] = ((_req$get = req.get("X-Forwarded-Host")) === null || _req$get === void 0 ? void 0 : _req$get.split(":")) ?? [];
-  let [, hostPort] = ((_req$get2 = req.get("host")) === null || _req$get2 === void 0 ? void 0 : _req$get2.split(":")) ?? [];
-  let port = hostnamePort || hostPort;
-  // Use req.hostname here as it respects the "trust proxy" setting
-  let resolvedHost = `${req.hostname}${port ? `:${port}` : ""}`;
-  // Use `req.originalUrl` so Remix is aware of the full path
-  let url = new URL(`${req.protocol}://${resolvedHost}${req.originalUrl}`);
-
-  // Abort action/loaders once we can no longer write a response
-  let controller = new AbortController();
-  let init = {
-    method: req.method,
-    headers: createRemixHeaders(req.headers),
-    signal: controller.signal
-  };
-
-  // Abort action/loaders once we can no longer write a response iff we have
-  // not yet sent a response (i.e., `close` without `finish`)
-  // `finish` -> done rendering the response
-  // `close` -> response can no longer be written to
-  res.on("finish", () => controller = null);
-  res.on("close", () => {
-    var _controller;
-    return (_controller = controller) === null || _controller === void 0 ? void 0 : _controller.abort();
-  });
-  if (req.method !== "GET" && req.method !== "HEAD") {
-    init.body = node.createReadableStreamFromReadable(req);
-    init.duplex = "half";
-  }
-  return new Request(url.href, init);
-}
-async function sendRemixResponse(res, nodeResponse) {
-  var _nodeResponse$headers;
-  res.statusMessage = nodeResponse.statusText;
-  res.status(nodeResponse.status);
-  for (let [key, value] of nodeResponse.headers.entries()) {
-    res.append(key, value);
-  }
-  if ((_nodeResponse$headers = nodeResponse.headers.get("Content-Type")) !== null && _nodeResponse$headers !== void 0 && _nodeResponse$headers.match(/text\/event-stream/i)) {
-    res.flushHeaders();
-  }
-  if (nodeResponse.body) {
-    await node.writeReadableStreamToWritable(nodeResponse.body, res);
-  } else {
-    res.end();
-  }
-}
-
-exports.createRemixHeaders = createRemixHeaders;
-exports.createRemixRequest = createRemixRequest;
-exports.createRequestHandler = createRequestHandler;
-exports.sendRemixResponse = sendRemixResponse;