diff --git a/integration/helpers/express.ts b/integration/helpers/express.ts index b50523ea3b..9d1bf854a6 100644 --- a/integration/helpers/express.ts +++ b/integration/helpers/express.ts @@ -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 diff --git a/integration/helpers/rsc-vite-framework/package.json b/integration/helpers/rsc-vite-framework/package.json index 5e7de66bcd..f2a499dc91 100644 --- a/integration/helpers/rsc-vite-framework/package.json +++ b/integration/helpers/rsc-vite-framework/package.json @@ -28,7 +28,7 @@ "vite-env-only": "^3.0.1" }, "dependencies": { - "@mjackson/node-fetch-server": "0.6.1", + "@remix-run/node-fetch-server": "^0.13.0", "@react-router/serve": "workspace:*", "compression": "^1.8.1", "express": "^4.21.2", diff --git a/integration/helpers/rsc-vite-framework/start.js b/integration/helpers/rsc-vite-framework/start.js index 45fec2a637..d82d61e0b9 100644 --- a/integration/helpers/rsc-vite-framework/start.js +++ b/integration/helpers/rsc-vite-framework/start.js @@ -1,4 +1,4 @@ -import { createRequestListener } from "@mjackson/node-fetch-server"; +import { createRequestListener } from "@remix-run/node-fetch-server"; import express from "express"; import build from "./build/server/index.js"; diff --git a/integration/helpers/rsc-vite/package.json b/integration/helpers/rsc-vite/package.json index 2531e82cd8..92cb22c4b4 100644 --- a/integration/helpers/rsc-vite/package.json +++ b/integration/helpers/rsc-vite/package.json @@ -20,7 +20,7 @@ "vite": "^6.3.0" }, "dependencies": { - "@mjackson/node-fetch-server": "0.6.1", + "@remix-run/node-fetch-server": "^0.13.0", "compression": "^1.8.1", "cross-env": "^7.0.3", "express": "^4.21.2", diff --git a/integration/helpers/rsc-vite/server.js b/integration/helpers/rsc-vite/server.js index 6fbff3d78a..78cc5b087b 100644 --- a/integration/helpers/rsc-vite/server.js +++ b/integration/helpers/rsc-vite/server.js @@ -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"; diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts index 8f1d248338..905a2f38cb 100644 --- a/integration/helpers/vite.ts +++ b/integration/helpers/vite.ts @@ -155,7 +155,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 = diff --git a/integration/vite-basename-test.ts b/integration/vite-basename-test.ts index da77e4e36d..722d59a432 100644 --- a/integration/vite-basename-test.ts +++ b/integration/vite-basename-test.ts @@ -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 = @@ -540,7 +540,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(); diff --git a/packages/react-router-node/.changes/major.switch-mjacksonnodefetchserver-remixrunnodefetchserver-can-directly-use.md b/packages/react-router-node/.changes/major.switch-mjacksonnodefetchserver-remixrunnodefetchserver-can-directly-use.md new file mode 100644 index 0000000000..a8e09c7a0c --- /dev/null +++ b/packages/react-router-node/.changes/major.switch-mjacksonnodefetchserver-remixrunnodefetchserver-can-directly-use.md @@ -0,0 +1 @@ +Switch from `@mjackson/node-fetch-server` to `@remix-run/node-fetch-server` now that we can directly use ESM-only packages diff --git a/packages/react-router-node/package.json b/packages/react-router-node/package.json index b212793498..4fa493d538 100644 --- a/packages/react-router-node/package.json +++ b/packages/react-router-node/package.json @@ -42,7 +42,7 @@ } }, "dependencies": { - "@mjackson/node-fetch-server": "^0.2.0" + "@remix-run/node-fetch-server": "^0.13.0" }, "devDependencies": { "react-router": "workspace:*", diff --git a/packages/react-router-node/server.ts b/packages/react-router-node/server.ts index d4423bfb61..441597e60a 100644 --- a/packages/react-router-node/server.ts +++ b/packages/react-router-node/server.ts @@ -1,5 +1,7 @@ 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, @@ -7,8 +9,6 @@ import type { 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 | Promise; diff --git a/packages/react-router-serve/.changes/major.switch-mjacksonnodefetchserver-remixrunnodefetchserver-can-directly-use.md b/packages/react-router-serve/.changes/major.switch-mjacksonnodefetchserver-remixrunnodefetchserver-can-directly-use.md new file mode 100644 index 0000000000..a8e09c7a0c --- /dev/null +++ b/packages/react-router-serve/.changes/major.switch-mjacksonnodefetchserver-remixrunnodefetchserver-can-directly-use.md @@ -0,0 +1 @@ +Switch from `@mjackson/node-fetch-server` to `@remix-run/node-fetch-server` now that we can directly use ESM-only packages diff --git a/packages/react-router-serve/cli.ts b/packages/react-router-serve/cli.ts index a8d7144838..0b90375069 100644 --- a/packages/react-router-serve/cli.ts +++ b/packages/react-router-serve/cli.ts @@ -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"; diff --git a/packages/react-router-serve/package.json b/packages/react-router-serve/package.json index fe8de870d9..0fa2fd2331 100644 --- a/packages/react-router-serve/package.json +++ b/packages/react-router-serve/package.json @@ -38,7 +38,7 @@ } }, "dependencies": { - "@mjackson/node-fetch-server": "^0.2.0", + "@remix-run/node-fetch-server": "^0.13.0", "@react-router/express": "workspace:*", "@react-router/node": "workspace:*", "compression": "^1.8.1", diff --git a/playground/rsc-vite-7-framework/package.json b/playground/rsc-vite-7-framework/package.json index dec7b90fda..31808ff83d 100644 --- a/playground/rsc-vite-7-framework/package.json +++ b/playground/rsc-vite-7-framework/package.json @@ -28,7 +28,7 @@ "vite": "^7.3.1" }, "dependencies": { - "@mjackson/node-fetch-server": "0.6.1", + "@remix-run/node-fetch-server": "^0.13.0", "compression": "^1.8.1", "express": "^4.21.2", "react": "catalog:react-canary", diff --git a/playground/rsc-vite-7-framework/start-vite-middleware.js b/playground/rsc-vite-7-framework/start-vite-middleware.js index 33f48ef2c9..0d04e6e4b3 100644 --- a/playground/rsc-vite-7-framework/start-vite-middleware.js +++ b/playground/rsc-vite-7-framework/start-vite-middleware.js @@ -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 = diff --git a/playground/rsc-vite-7-framework/start.js b/playground/rsc-vite-7-framework/start.js index 91b7c93a3b..ee69fab674 100644 --- a/playground/rsc-vite-7-framework/start.js +++ b/playground/rsc-vite-7-framework/start.js @@ -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"; diff --git a/playground/rsc-vite-framework/package.json b/playground/rsc-vite-framework/package.json index b210dae97d..1289683bab 100644 --- a/playground/rsc-vite-framework/package.json +++ b/playground/rsc-vite-framework/package.json @@ -29,7 +29,7 @@ "vite": "^8.0.0" }, "dependencies": { - "@mjackson/node-fetch-server": "0.6.1", + "@remix-run/node-fetch-server": "^0.13.0", "compression": "^1.8.1", "express": "^4.21.2", "react": "catalog:react-canary", diff --git a/playground/rsc-vite-framework/start-vite-middleware.js b/playground/rsc-vite-framework/start-vite-middleware.js index 33f48ef2c9..0d04e6e4b3 100644 --- a/playground/rsc-vite-framework/start-vite-middleware.js +++ b/playground/rsc-vite-framework/start-vite-middleware.js @@ -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 = diff --git a/playground/rsc-vite-framework/start.js b/playground/rsc-vite-framework/start.js index 91b7c93a3b..ee69fab674 100644 --- a/playground/rsc-vite-framework/start.js +++ b/playground/rsc-vite-framework/start.js @@ -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"; diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json index 7f5b8e6767..c6cc1a72d2 100644 --- a/playground/rsc-vite/package.json +++ b/playground/rsc-vite/package.json @@ -21,7 +21,7 @@ "vite": "^6.3.0" }, "dependencies": { - "@mjackson/node-fetch-server": "0.6.1", + "@remix-run/node-fetch-server": "^0.13.0", "compression": "^1.8.1", "express": "^4.21.2", "react": "catalog:react-canary", diff --git a/playground/rsc-vite/server.js b/playground/rsc-vite/server.js index c897acd7ad..a572da1ec0 100644 --- a/playground/rsc-vite/server.js +++ b/playground/rsc-vite/server.js @@ -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"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bb9988f5ec..3dc2b1035b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -373,9 +373,9 @@ importers: integration/helpers/rsc-vite: dependencies: - '@mjackson/node-fetch-server': - specifier: 0.6.1 - version: 0.6.1 + '@remix-run/node-fetch-server': + specifier: ^0.13.0 + version: 0.13.0 compression: specifier: ^1.8.1 version: 1.8.1 @@ -425,12 +425,12 @@ importers: integration/helpers/rsc-vite-framework: dependencies: - '@mjackson/node-fetch-server': - specifier: 0.6.1 - version: 0.6.1 '@react-router/serve': specifier: workspace:* version: link:../../../packages/react-router-serve + '@remix-run/node-fetch-server': + specifier: ^0.13.0 + version: 0.13.0 compression: specifier: ^1.8.1 version: 1.8.1 @@ -1236,9 +1236,9 @@ importers: packages/react-router-node: dependencies: - '@mjackson/node-fetch-server': - specifier: ^0.2.0 - version: 0.2.0 + '@remix-run/node-fetch-server': + specifier: ^0.13.0 + version: 0.13.0 devDependencies: react-router: specifier: workspace:* @@ -1270,15 +1270,15 @@ importers: packages/react-router-serve: dependencies: - '@mjackson/node-fetch-server': - specifier: ^0.2.0 - version: 0.2.0 '@react-router/express': specifier: workspace:* version: link:../react-router-express '@react-router/node': specifier: workspace:* version: link:../react-router-node + '@remix-run/node-fetch-server': + specifier: ^0.13.0 + version: 0.13.0 compression: specifier: ^1.8.1 version: 1.8.1 @@ -1706,9 +1706,9 @@ importers: playground/rsc-vite: dependencies: - '@mjackson/node-fetch-server': - specifier: 0.6.1 - version: 0.6.1 + '@remix-run/node-fetch-server': + specifier: ^0.13.0 + version: 0.13.0 compression: specifier: ^1.8.1 version: 1.8.1 @@ -1758,9 +1758,9 @@ importers: playground/rsc-vite-7-framework: dependencies: - '@mjackson/node-fetch-server': - specifier: 0.6.1 - version: 0.6.1 + '@remix-run/node-fetch-server': + specifier: ^0.13.0 + version: 0.13.0 compression: specifier: ^1.8.1 version: 1.8.1 @@ -1828,9 +1828,9 @@ importers: playground/rsc-vite-framework: dependencies: - '@mjackson/node-fetch-server': - specifier: 0.6.1 - version: 0.6.1 + '@remix-run/node-fetch-server': + specifier: ^0.13.0 + version: 0.13.0 compression: specifier: ^1.8.1 version: 1.8.1 @@ -3941,12 +3941,6 @@ packages: peerDependencies: rollup: '>=2' - '@mjackson/node-fetch-server@0.2.0': - resolution: {integrity: sha512-EMlH1e30yzmTpGLQjlFmaDAjyOeZhng1/XCd7DExR8PNAnG/G1tyruZxEoUe11ClnwGhGrtsdnyyUx1frSzjng==} - - '@mjackson/node-fetch-server@0.6.1': - resolution: {integrity: sha512-9ZJnk/DJjt805uv5PPv11haJIW+HHf3YEEyVXv+8iLQxLD/iXA68FH220XoiTPBC4gCg5q+IMadDw8qPqlA5wg==} - '@mswjs/interceptors@0.37.6': resolution: {integrity: sha512-wK+5pLK5XFmgtH3aQ2YVvA3HohS3xqV/OxuVOdNx9Wpnz7VE/fnC+e1A7ln6LFYeck7gOJ/dsZV6OLplOtAJ2w==} engines: {node: '>=18'} @@ -11788,10 +11782,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@mjackson/node-fetch-server@0.2.0': {} - - '@mjackson/node-fetch-server@0.6.1': {} - '@mswjs/interceptors@0.37.6': dependencies: '@open-draft/deferred-promise': 2.2.0