Collapse Packages

.changeset/collapse-packages.md

@@ -0,0 +1,7 @@
+---
+"react-router": major
+---
+
+- Collapse `@remix-run/router` into `react-router`
+- Collapse `react-router-dom` into `react-router`
+- Collapse `@remix-run/testing` into `react-router`

.changeset/config.json

@@ -13,8 +13,7 @@
       "@react-router/express",
       "@react-router/node",
       "@react-router/serve",
-      "@react-router/server-runtime",
-      "@react-router/testing"
+      "@react-router/server-runtime"
     ]
   ],
   "linked": [],

.changeset/drop-node-16.md

@@ -1,7 +1,5 @@
 ---
-"react-router-dom": major
 "react-router": major
-"@remix-run/router": major
 ---
 
 Drop support for Node 16, React Router SSR now requires Node 18 or higher

README.md

@@ -26,7 +26,6 @@ This repository is a monorepo containing the following packages:
 - [`@react-router/node`](/packages/remix-node)
 - [`@react-router/serve`](/packages/remix-serve)
 - [`@react-router/server-runtime`](/packages/remix-server-runtime)
-- [`@react-router/testing`](/packages/remix-testing)
 - [`react-router`](/packages/react-router)
 - [`react-router-dom`](/packages/react-router-dom)
 

integration/error-data-request-test.ts

@@ -1,5 +1,5 @@
 import { test, expect } from "@playwright/test";
-import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "@remix-run/router";
+import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "react-router";
 
 import {
   createAppFixture,

integration/error-sanitization-test.ts

@@ -1,5 +1,5 @@
 import { test, expect } from "@playwright/test";
-import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "@remix-run/router";
+import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "react-router";
 
 import { UNSAFE_ServerMode as ServerMode } from "@react-router/server-runtime";
 import type { Fixture } from "./helpers/create-fixture.js";

integration/helpers/cf-template/app/root.tsx

@@ -1,10 +1,4 @@
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from "react-router-dom";
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 
 export default function App() {
   return (

integration/helpers/create-fixture.ts

@@ -13,7 +13,7 @@ import type { ServerBuild } from "@react-router/server-runtime";
 import { createRequestHandler } from "@react-router/server-runtime";
 import { createRequestHandler as createExpressHandler } from "@react-router/express";
 import { installGlobals } from "@react-router/node";
-import { UNSAFE_decodeViaTurboStream as decodeViaTurboStream } from "react-router-dom";
+import { UNSAFE_decodeViaTurboStream as decodeViaTurboStream } from "react-router";
 
 import { viteConfig } from "./vite.js";
 

integration/helpers/deno-template/app/root.tsx

@@ -1,10 +1,4 @@
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from "react-router-dom";
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 import * as React from "react";
 
 export default function App() {

integration/helpers/node-template/app/root.tsx

@@ -1,10 +1,4 @@
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from "react-router-dom";
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 
 export default function App() {
   return (

integration/helpers/vite-cloudflare-template/app/root.tsx

@@ -1,10 +1,4 @@
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from "react-router-dom";
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 
 export default function App() {
   return (

integration/helpers/vite-template/app/root.tsx

@@ -1,10 +1,4 @@
-import {
-  Links,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from "react-router-dom";
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 
 export default function App() {
   return (

integration/package.json

@@ -14,7 +14,6 @@
     "@react-router/dev": "workspace:*",
     "@react-router/express": "workspace:*",
     "@react-router/node": "workspace:*",
-    "@remix-run/router": "workspace:*",
     "@react-router/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",
@@ -35,7 +34,7 @@
     "prettier": "^2.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "workspace:*",
+    "react-router": "workspace:*",
     "serialize-javascript": "^6.0.1",
     "shelljs": "^0.8.5",
     "strip-ansi": "^6.0.1",

jest/jest.config.shared.js

@@ -9,9 +9,13 @@ const ignorePatterns = [
 /** @type {import('jest').Config} */
 module.exports = {
   moduleNameMapper: {
-    "^@remix-run/router$": "<rootDir>/../router/index.ts",
+    "@react-router/dev$": "<rootDir>/../remix-dev/index.ts",
+    "@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",
-    "^react-router-dom$": "<rootDir>/../react-router-dom/index.tsx",
     "^@web3-storage/multipart-parser$": require.resolve(
       "@web3-storage/multipart-parser"
     ),
@@ -23,4 +27,7 @@ module.exports = {
     "\\.[jt]sx?$": require.resolve("./transform"),
   },
   watchPathIgnorePatterns: [...ignorePatterns, "\\/node_modules\\/"],
+  globals: {
+    __DEV__: true,
+  },
 };

package.json

@@ -4,6 +4,7 @@
   "scripts": {
     "build": "rollup -c",
     "clean": "git clean -fdX .",
+    "clean:build": "git clean -fdx -e node_modules .",
     "clean:integration": "node ./integration/helpers/cleanup.mjs",
     "format": "prettier --ignore-path .eslintignore --write .",
     "format:check": "prettier --ignore-path .eslintignore --check .",