Skip to content
Merged
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
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-vite-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
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 build 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.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",
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 @@ -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 =
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 @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Switch from `@mjackson/node-fetch-server` to `@remix-run/node-fetch-server` now that we can directly use ESM-only packages
2 changes: 1 addition & 1 deletion packages/react-router-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"dependencies": {
"@mjackson/node-fetch-server": "^0.2.0"
"@remix-run/node-fetch-server": "^0.13.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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Switch from `@mjackson/node-fetch-server` to `@remix-run/node-fetch-server` now that we can directly use ESM-only packages
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 @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite-7-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite-7-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-7-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-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
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.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",
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
52 changes: 21 additions & 31 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading