Move server-runtime into react-router (#11698)

* Move server-runtime into react-router * Clean up comments * Remove unused index * Update changeset * Fix test imports * Set test env to jsdom * Clean redundant diffs * Fix EntryContext type errors * Remove stray comment * Fix tests in Node 18 * Lower filesize limit * Remove server-runtime reexport modules
remix-run · Jun 21, 2024 · 559b0eb · 559b0eb
1 parent 97be8ab
commit 559b0eb
Show file tree

Hide file tree

Showing 96 changed files with 315 additions and 1,805 deletions.
diff --git a/.changeset/collapse-packages.md b/.changeset/collapse-packages.md
@@ -4,4 +4,5 @@
 
 - Collapse `@remix-run/router` into `react-router`
 - Collapse `react-router-dom` into `react-router`
+- Collapse `@remix-run/server-runtime` into `react-router`
 - Collapse `@remix-run/testing` into `react-router`
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -12,8 +12,7 @@
       "@react-router/dev",
       "@react-router/express",
       "@react-router/node",
-      "@react-router/serve",
-      "@react-router/server-runtime"
+      "@react-router/serve"
     ]
   ],
   "linked": [],

diff --git a/README.md b/README.md
@@ -25,7 +25,6 @@ This repository is a monorepo containing the following packages:
 - [`@react-router/express`](/packages/remix-express)
 - [`@react-router/node`](/packages/remix-node)
 - [`@react-router/serve`](/packages/remix-serve)
-- [`@react-router/server-runtime`](/packages/remix-server-runtime)
 - [`react-router`](/packages/react-router)
 - [`react-router-dom`](/packages/react-router-dom)
 

diff --git a/integration/client-data-test.ts b/integration/client-data-test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
 
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
+import { UNSAFE_ServerMode as ServerMode } from "react-router";
 import {
   createAppFixture,
   createFixture,

diff --git a/integration/error-boundary-test.ts b/integration/error-boundary-test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
 
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
+import { UNSAFE_ServerMode as ServerMode } from "react-router";
 import {
   createAppFixture,
   createFixture,

diff --git a/integration/error-boundary-v2-test.ts b/integration/error-boundary-v2-test.ts
@@ -1,7 +1,7 @@
 import type { Page } from "@playwright/test";
 import { test, expect } from "@playwright/test";
 
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
+import { UNSAFE_ServerMode as ServerMode } from "react-router";
 import {
   createAppFixture,
   createFixture,

diff --git a/integration/error-data-request-test.ts b/integration/error-data-request-test.ts
@@ -58,7 +58,7 @@ test.describe("ErrorBoundary", () => {
         `,
 
         [`app/routes/loader-return-json.jsx`]: js`
-          import { json } from "@react-router/server-runtime";
+          import { json } from "react-router";
 
           export async function loader() {
             return json({ ok: true });
@@ -80,7 +80,7 @@ test.describe("ErrorBoundary", () => {
         `,
 
         [`app/routes/action-return-json.jsx`]: js`
-          import { json } from "@react-router/server-runtime";
+          import { json } from "react-router";
 
           export async function action() {
             return json({ ok: true });

diff --git a/integration/error-sanitization-test.ts b/integration/error-sanitization-test.ts
@@ -1,7 +1,9 @@
 import { test, expect } from "@playwright/test";
-import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "react-router";
+import {
+  UNSAFE_ErrorResponseImpl as ErrorResponseImpl,
+  UNSAFE_ServerMode as ServerMode,
+} from "react-router";
 
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
 import type { Fixture } from "./helpers/create-fixture.js";
 import {
   createAppFixture,
@@ -77,8 +79,7 @@ const routeFiles = {
 
   "app/routes/defer.tsx": js`
     import * as React from 'react';
-    import { defer } from "@react-router/server-runtime";
-    import { Await, useAsyncError, useLoaderData, useRouteError  } from "react-router";
+    import { defer, Await, useAsyncError, useLoaderData, useRouteError } from "react-router";
 
     export function loader({ request }) {
       if (new URL(request.url).searchParams.has('loader')) {

diff --git a/integration/form-test.ts b/integration/form-test.ts
@@ -394,8 +394,7 @@ test.describe("Forms", () => {
           `,
 
         "app/routes/empty-file-upload.tsx": js`
-            import { json } from "@react-router/server-runtime";
-            import { Form, useActionData } from "react-router";
+            import { json, Form, useActionData } from "react-router";
 
             export async function action({ request }) {
               let formData = await request.formData();
@@ -454,8 +453,7 @@ test.describe("Forms", () => {
         "myfile.txt": "stuff",
 
         "app/routes/pathless-layout-parent.tsx": js`
-            import { json } from '@react-router/server-runtime'
-            import { Form, Outlet, useActionData } from "react-router"
+            import { json, Form, Outlet, useActionData } from "react-router"
 
             export async function action({ request }) {
               return json({ submitted: true });

diff --git a/integration/headers-test.ts b/integration/headers-test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
 
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
+import { UNSAFE_ServerMode as ServerMode } from "react-router";
 import { createFixture, js } from "./helpers/create-fixture.js";
 import type { Fixture } from "./helpers/create-fixture.js";
 
@@ -159,8 +159,7 @@ test.describe.skip("headers export", () => {
           `,
 
           "app/routes/cookie.tsx": js`
-            import { json } from "@react-router/server-runtime";
-            import { Outlet } from "react-router";
+            import { json, Outlet } from "react-router";
 
             export function loader({ request }) {
               if (new URL(request.url).searchParams.has("parent-throw")) {

diff --git a/integration/helpers/create-fixture.ts b/integration/helpers/create-fixture.ts
@@ -8,12 +8,14 @@ import stripIndent from "strip-indent";
 import { sync as spawnSync, spawn } from "cross-spawn";
 import type { JsonObject } from "type-fest";
 
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
-import type { ServerBuild } from "@react-router/server-runtime";
-import { createRequestHandler } from "@react-router/server-runtime";
+import {
+  type ServerBuild,
+  createRequestHandler,
+  UNSAFE_ServerMode as ServerMode,
+  UNSAFE_decodeViaTurboStream as decodeViaTurboStream,
+} from "react-router";
 import { createRequestHandler as createExpressHandler } from "@react-router/express";
 import { installGlobals } from "@react-router/node";
-import { UNSAFE_decodeViaTurboStream as decodeViaTurboStream } from "react-router";
 
 import { viteConfig } from "./vite.js";
 

diff --git a/integration/helpers/node-template/package.json b/integration/helpers/node-template/package.json
@@ -14,7 +14,6 @@
     "@react-router/express": "workspace:*",
     "@react-router/node": "workspace:*",
     "@react-router/serve": "workspace:*",
-    "@react-router/server-runtime": "workspace:*",
     "express": "^4.17.1",
     "isbot": "^4.1.0",
     "react": "^18.2.0",

diff --git a/integration/package.json b/integration/package.json
@@ -12,7 +12,6 @@
     "@react-router/dev": "workspace:*",
     "@react-router/express": "workspace:*",
     "@react-router/node": "workspace:*",
-    "@react-router/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",
     "@vanilla-extract/vite-plugin": "^3.9.2",

diff --git a/integration/resource-routes-test.ts b/integration/resource-routes-test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
 
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
+import { UNSAFE_ServerMode as ServerMode } from "react-router";
 import {
   createAppFixture,
   createFixture,

diff --git a/integration/root-route-test.ts b/integration/root-route-test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@playwright/test";
 
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
+import { UNSAFE_ServerMode as ServerMode } from "react-router";
 import {
   createAppFixture,
   createFixture,

diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts
@@ -6,7 +6,7 @@ import {
   js,
 } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
-import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
+import { UNSAFE_ServerMode as ServerMode } from "react-router";
 
 const ISO_DATE = "2024-03-12T12:00:00.000Z";
 

diff --git a/jest/jest.config.shared.js b/jest/jest.config.shared.js
@@ -13,8 +13,6 @@ module.exports = {
     "@react-router/express$": "<rootDir>/../remix-express/index.ts",
     "@react-router/node$": "<rootDir>/../remix-node/index.ts",
     "@react-router/serve$": "<rootDir>/../remix-serve/index.ts",
-    "@react-router/server-runtime$":
-      "<rootDir>/../remix-server-runtime/index.ts",
     "^react-router$": "<rootDir>/../react-router/index.ts",
     "^@web3-storage/multipart-parser$": require.resolve(
       "@web3-storage/multipart-parser"

diff --git a/package.json b/package.json
@@ -131,10 +131,10 @@
   },
   "filesize": {
     "packages/react-router/dist/react-router.production.min.js": {
-      "none": "120 kB"
+      "none": "124 kB"
     },
     "packages/react-router/dist/umd/react-router.production.min.js": {
-      "none": "125 kB"
+      "none": "130 kB"
     }
   },
   "pnpm": {

diff --git a/packages/react-router/.eslintrc b/packages/react-router/.eslintrc
diff --git a/packages/remix-server-runtime/.eslintrc.js → packages/react-router/.eslintrc.js b/packages/remix-server-runtime/.eslintrc.js → packages/react-router/.eslintrc.js
@@ -1,8 +1,13 @@
 let restrictedGlobalsError = `Node globals are not allowed in this package.`;
 
 module.exports = {
-  extends: "../../.eslintrc",
+  env: {
+    browser: true,
+    commonjs: true,
+  },
   rules: {
+    strict: 0,
+    "no-restricted-syntax": ["error", "LogicalExpression[operator='??']"],
     "no-restricted-globals": [
       "error",
       { name: "__dirname", message: restrictedGlobalsError },

diff --git a/packages/react-router/__tests__/.eslintrc b/packages/react-router/__tests__/.eslintrc
@@ -3,6 +3,8 @@
     "jest": true
   },
   "rules": {
-    "no-console": 0
+    "no-console": 0,
+    "no-restricted-globals": "off",
+    "import/no-nodejs-modules": "off"
   }
 }
diff --git a/packages/react-router/__tests__/router/data-strategy-test.ts b/packages/react-router/__tests__/router/data-strategy-test.ts
@@ -1,4 +1,7 @@
-import type { DataStrategyFunction, DataStrategyMatch } from "../../lib/router";
+import type {
+  unstable_DataStrategyFunction as DataStrategyFunction,
+  unstable_DataStrategyMatch as DataStrategyMatch,
+} from "../../lib/router";
 import { json } from "../../lib/router";
 import { createDeferred, setup } from "./utils/data-router-setup";
 import { createFormData, tick } from "./utils/utils";

diff --git a/...-server-runtime/__tests__/cookies-test.ts → .../__tests__/server-runtime/cookies-test.ts b/...-server-runtime/__tests__/cookies-test.ts → .../__tests__/server-runtime/cookies-test.ts
@@ -1,5 +1,11 @@
-import { createCookieFactory, isCookie } from "../cookies";
-import type { SignFunction, UnsignFunction } from "../crypto";
+import {
+  createCookieFactory,
+  isCookie,
+} from "../../lib/server-runtime/cookies";
+import type {
+  SignFunction,
+  UnsignFunction,
+} from "../../lib/server-runtime/crypto";
 
 const sign: SignFunction = async (value, secret) => {
   return JSON.stringify({ value, secret });

diff --git a/...mix-server-runtime/__tests__/data-test.ts → ...ter/__tests__/server-runtime/data-test.ts b/...mix-server-runtime/__tests__/data-test.ts → ...ter/__tests__/server-runtime/data-test.ts
@@ -1,7 +1,7 @@
 import { UNSAFE_decodeViaTurboStream as decodeViaTurboStream } from "react-router";
 
-import type { ServerBuild } from "../build";
-import { createRequestHandler } from "../server";
+import type { ServerBuild } from "../../lib/server-runtime/build";
+import { createRequestHandler } from "../../lib/server-runtime/server";
 
 describe("loaders", () => {
   // so that HTML/Fetch requests are the same, and so redirects don't hang on to

diff --git a/...server-runtime/__tests__/formData-test.ts → ...__tests__/server-runtime/formData-test.ts b/...server-runtime/__tests__/formData-test.ts → ...__tests__/server-runtime/formData-test.ts
@@ -1,4 +1,8 @@
-import { parseMultipartFormData } from "../formData";
+/**
+ * @jest-environment node
+ */
+
+import { parseMultipartFormData } from "../../lib/server-runtime/formData";
 
 declare global {
   interface RequestInit {

diff --git a/...er-runtime/__tests__/handle-error-test.ts → ...sts__/server-runtime/handle-error-test.ts b/...er-runtime/__tests__/handle-error-test.ts → ...sts__/server-runtime/handle-error-test.ts
@@ -1,8 +1,8 @@
 import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "react-router";
 
-import type { ServerBuild } from "../build";
-import { createRequestHandler } from "../server";
-import { json } from "../responses";
+import type { ServerBuild } from "../../lib/server-runtime/build";
+import { createRequestHandler } from "../../lib/server-runtime/server";
+import { json } from "../../lib/server-runtime/responses";
 
 function getHandler(routeModule = {}, entryServerModule = {}) {
   let routeId = "root";

diff --git a/...-server-runtime/__tests__/handler-test.ts → .../__tests__/server-runtime/handler-test.ts b/...-server-runtime/__tests__/handler-test.ts → .../__tests__/server-runtime/handler-test.ts
@@ -1,5 +1,5 @@
-import { json } from "../responses";
-import { createRequestHandler } from "../server";
+import { json } from "../../lib/server-runtime/responses";
+import { createRequestHandler } from "../../lib/server-runtime/server";
 
 describe("createRequestHandler", () => {
   it("retains request headers when stripping body off for loaders", async () => {

diff --git a/...x-server-runtime/__tests__/markup-test.ts → ...r/__tests__/server-runtime/markup-test.ts b/...x-server-runtime/__tests__/markup-test.ts → ...r/__tests__/server-runtime/markup-test.ts
@@ -1,6 +1,6 @@
 import vm from "vm";
 
-import { escapeHtml } from "../markup";
+import { escapeHtml } from "../../lib/server-runtime/markup";
 
 describe("escapeHtml", () => {
   // These tests are based on https://github.com/zertosh/htmlescape/blob/3e6cf0614dd0f778fd0131e69070b77282150c15/test/htmlescape-test.js

diff --git a/...erver-runtime/__tests__/responses-test.ts → ..._tests__/server-runtime/responses-test.ts b/...erver-runtime/__tests__/responses-test.ts → ..._tests__/server-runtime/responses-test.ts
@@ -1,5 +1,9 @@
-import type { TypedResponse } from "../index";
-import { json, redirect } from "../index";
+/**
+ * @jest-environment node
+ */
+
+import type { TypedResponse } from "../../lib/server-runtime/responses";
+import { json, redirect } from "../../lib/server-runtime/responses";
 import { isEqual } from "./utils";
 
 describe("json", () => {

diff --git a/...x-server-runtime/__tests__/server-test.ts → ...r/__tests__/server-runtime/server-test.ts b/...x-server-runtime/__tests__/server-test.ts → ...r/__tests__/server-runtime/server-test.ts
@@ -1,9 +1,13 @@
+/**
+ * @jest-environment node
+ */
+
 import type { StaticHandlerContext } from "react-router";
 import { json } from "react-router";
 
-import { createRequestHandler } from "..";
-import { ServerMode } from "../mode";
-import type { ServerBuild } from "../build";
+import { createRequestHandler } from "../../lib/server-runtime/server";
+import { ServerMode } from "../../lib/server-runtime/mode";
+import type { ServerBuild } from "../../lib/server-runtime/build";
 import { mockServerBuild } from "./utils";
 
 function spyConsole() {

diff --git a/...server-runtime/__tests__/sessions-test.ts → ...__tests__/server-runtime/sessions-test.ts b/...server-runtime/__tests__/sessions-test.ts → ...__tests__/server-runtime/sessions-test.ts
@@ -1,12 +1,15 @@
-import { createCookieFactory } from "../cookies";
-import type { SignFunction, UnsignFunction } from "../crypto";
+import { createCookieFactory } from "../../lib/server-runtime/cookies";
+import type {
+  SignFunction,
+  UnsignFunction,
+} from "../../lib/server-runtime/crypto";
 import {
   createSession,
   createSessionStorageFactory,
   isSession,
-} from "../sessions";
-import { createCookieSessionStorageFactory } from "../sessions/cookieStorage";
-import { createMemorySessionStorageFactory } from "../sessions/memoryStorage";
+} from "../../lib/server-runtime/sessions";
+import { createCookieSessionStorageFactory } from "../../lib/server-runtime/sessions/cookieStorage";
+import { createMemorySessionStorageFactory } from "../../lib/server-runtime/sessions/memoryStorage";
 
 function getCookieFromSetCookie(setCookie: string): string {
   return setCookie.split(/;\s*/)[0];

diff --git a/...s/remix-server-runtime/__tests__/utils.ts → ...-router/__tests__/server-runtime/utils.ts b/...s/remix-server-runtime/__tests__/utils.ts → ...-router/__tests__/server-runtime/utils.ts
@@ -5,9 +5,13 @@ import type {
   HandleErrorFunction,
   HeadersFunction,
   LoaderFunction,
-} from "../";
-import type { FutureConfig } from "../entry";
-import type { EntryRoute, ServerRoute, ServerRouteManifest } from "../routes";
+} from "../../lib/server-runtime";
+import type { FutureConfig } from "../../lib/server-runtime/entry";
+import type {
+  EntryRoute,
+  ServerRoute,
+  ServerRouteManifest,
+} from "../../lib/server-runtime/routes";
 
 export function mockServerBuild(
   routes: Record<

diff --git a/packages/react-router/__tests__/setup.ts b/packages/react-router/__tests__/setup.ts
@@ -40,3 +40,8 @@ if (!globalThis.TransformStream) {
   const { TransformStream } = require("node:stream/web");
   globalThis.TransformStream = TransformStream;
 }
+
+if (!globalThis.File) {
+  const { File } = require("undici");
+  globalThis.File = File;
+}