Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions decisions/0014-context-middleware.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ We've done a lot of work since then to get us to a place where we could ship a m

- Shipped [Single Fetch][single-fetch]
- Shipped [`dataStrategy`][data-strategy] for DIY middleware in React Router SPAs
- Iterated on middleware/context APIs in the [Remix the Web][remix-the-web] project
- Iterated on middleware/context APIs in the [Remix 3][remix-3] project
- Developed a non-invasive type-safe + composable [context][async-provider] API

## Decision
Expand Down Expand Up @@ -276,5 +276,5 @@ If `clientLoaders` do call `serverLoaders` it gets trickier since they make indi
[client-context]: https://github.com/remix-run/react-router/discussions/9856
[single-fetch]: https://remix.run/docs/en/main/guides/single-fetch
[data-strategy]: https://reactrouter.com/v6/routers/create-browser-router#optsdatastrategy
[remix-the-web]: https://github.com/mjackson/remix-the-web
[remix-3]: https://github.com/remix-run/remix
[async-provider]: https://github.com/ryanflorence/async-provider
2 changes: 1 addition & 1 deletion integration/helpers/express.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function server() {

export function rsc() {
return tsx`
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";

const port = process.env.PORT ?? 3000
Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/rsc-parcel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"url": "^0.11.0"
},
"dependencies": {
"@mjackson/node-fetch-server": "0.6.1",
"@parcel/runtime-rsc": "2.15.0",
"@remix-run/node-fetch-server": "^0.10.0",
"cross-env": "^7.0.3",
"express": "^4.21.2",
"react": "^19.1.0",
Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/rsc-parcel/src/server.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { parseArgs } from "node:util";
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";
import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
import {
Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/rsc-vite-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"vite-tsconfig-paths": "^4.2.1"
},
"dependencies": {
"@mjackson/node-fetch-server": "0.6.1",
"@remix-run/node-fetch-server": "^0.10.0",
"@react-router/serve": "workspace:*",
"compression": "^1.8.0",
"express": "^4.21.2",
Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/rsc-vite-framework/start.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";
import reactRouterRequestHandler from "./build/server/index.js";

Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/rsc-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"vite": "^6.2.0"
},
"dependencies": {
"@mjackson/node-fetch-server": "0.6.1",
"@remix-run/node-fetch-server": "^0.10.0",
"compression": "^1.8.0",
"cross-env": "^7.0.3",
"express": "^4.21.2",
Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/rsc-vite/server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { parseArgs } from "node:util";
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";

import rscRequestHandler from "./dist/rsc/index.js";
Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/vite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export const EXPRESS_SERVER = (args: {
}) => {
if (args.templateName?.includes("rsc")) {
return String.raw`
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";

const viteDevServer =
Expand Down
4 changes: 2 additions & 2 deletions integration/vite-basename-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const customServerFile = ({

if (templateName.includes("rsc")) {
return js`
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";

const viteDevServer =
Expand Down Expand Up @@ -516,7 +516,7 @@ test.describe("Vite base + React Router basename", () => {
// Slim server that only serves basename (route) requests from the React Router handler
"server.mjs": templateName.includes("rsc")
? String.raw`
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";

const app = express();
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"@babel/types": "^7.27.7",
"@npmcli/package-json": "^4.0.1",
"@react-router/node": "workspace:*",
"@remix-run/node-fetch-server": "^0.9.0",
"@remix-run/node-fetch-server": "^0.10.0",
"arg": "^5.0.1",
"babel-dead-code-elimination": "^1.0.6",
"chokidar": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
}
},
"dependencies": {
"@mjackson/node-fetch-server": "^0.2.0"
"@remix-run/node-fetch-server": "^0.10.0"
},
"devDependencies": {
"react-router": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-router-node/server.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import type { RequestListener } from "node:http";

import type { ClientAddress } from "@remix-run/node-fetch-server";
import { createRequestListener as createRequestListener_ } from "@remix-run/node-fetch-server";
import type {
AppLoadContext,
ServerBuild,
UNSAFE_MiddlewareEnabled,
RouterContextProvider,
} from "react-router";
import { createRequestHandler } from "react-router";
import type { ClientAddress } from "@mjackson/node-fetch-server";
import { createRequestListener as createRequestListener_ } from "@mjackson/node-fetch-server";

type MaybePromise<T> = T | Promise<T>;

Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-serve/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import path from "node:path";
import url from "node:url";
import type { ServerBuild } from "react-router";
import { createRequestHandler } from "@react-router/express";
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import compression from "compression";
import express from "express";
import morgan from "morgan";
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-serve/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
}
},
"dependencies": {
"@mjackson/node-fetch-server": "^0.2.0",
"@react-router/express": "workspace:*",
"@react-router/node": "workspace:*",
"@remix-run/node-fetch-server": "^0.10.0",
"compression": "^1.7.4",
"express": "^4.19.2",
"get-port": "5.1.1",
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-parcel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"url": "^0.11.0"
},
"dependencies": {
"@mjackson/node-fetch-server": "0.6.1",
"@parcel/runtime-rsc": "2.15.0",
"@remix-run/node-fetch-server": "^0.10.0",
"express": "^4.21.2",
"react": "^19.0.0",
"react-dom": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-parcel/src/entry.ssr.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";
// @ts-expect-error - no types
import { renderToReadableStream as renderHTMLToReadableStream } from "react-dom/server.edge" assert { env: "react-client" };
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"vite": "^6.2.0"
},
"dependencies": {
"@mjackson/node-fetch-server": "0.6.1",
"@remix-run/node-fetch-server": "^0.10.0",
"compression": "^1.8.0",
"express": "^4.21.2",
"react": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite-framework/start-vite-middleware.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";

const viteDevServer =
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite-framework/start.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import express from "express";
import reactRouterRequestHandler from "./build/server/index.js";

Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"vite": "^6.2.0"
},
"dependencies": {
"@mjackson/node-fetch-server": "0.6.1",
"@remix-run/node-fetch-server": "^0.10.0",
"compression": "^1.8.0",
"express": "^4.21.2",
"react": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite/server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { parseArgs } from "node:util";
import { createRequestListener } from "@mjackson/node-fetch-server";
import { createRequestListener } from "@remix-run/node-fetch-server";
import compression from "compression";
import express from "express";

Expand Down
Loading
Loading