Fix integration tests

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/cf-template/package.json

@@ -15,7 +15,8 @@
     "isbot": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "workspace:*"
+    "react-router": "workspace:*",
+    "react-router-dom": "workspace:*"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",

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/deno-template/package.json

@@ -16,7 +16,8 @@
     "isbot": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "workspace:*"
+    "react-router": "workspace:*",
+    "react-router-dom": "workspace:*"
   },
   "devDependencies": {
     "@react-router/dev": "workspace:*"

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/node-template/package.json

@@ -19,7 +19,8 @@
     "isbot": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "workspace:*"
+    "react-router": "workspace:*",
+    "react-router-dom": "workspace:*"
   },
   "devDependencies": {
     "@react-router/dev": "workspace:*",

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-cloudflare-template/package.json

@@ -17,7 +17,8 @@
     "miniflare": "^3.20231030.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "workspace:*"
+    "react-router": "workspace:*",
+    "react-router-dom": "workspace:*"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230518.0",

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/helpers/vite-template/package.json

@@ -21,6 +21,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router": "workspace:*",
+    "react-router-dom": "workspace:*",
     "serialize-javascript": "^6.0.1"
   },
   "devDependencies": {

packages/remix-dev/config/defaults/entry.client.tsx

@@ -1,6 +1,6 @@
 import { startTransition, StrictMode } from "react";
 import { hydrateRoot } from "react-dom/client";
-import { HydratedRouter } from "react-router-dom";
+import { HydratedRouter } from "react-router";
 
 startTransition(() => {
   hydrateRoot(

packages/remix-dev/config/defaults/entry.server.cloudflare.tsx

@@ -1,5 +1,5 @@
 import type { AppLoadContext, EntryContext } from "@react-router/cloudflare";
-import { RemixServer } from "react-router-dom";
+import { RemixServer } from "react-router";
 import * as isbotModule from "isbot";
 import { renderToReadableStream } from "react-dom/server";
 

packages/remix-dev/config/defaults/entry.server.node.tsx

@@ -2,7 +2,7 @@ import { PassThrough } from "node:stream";
 
 import type { AppLoadContext, EntryContext } from "@react-router/node";
 import { createReadableStreamFromReadable } from "@react-router/node";
-import { RemixServer } from "react-router-dom";
+import { RemixServer } from "react-router";
 import * as isbotModule from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
 

packages/remix-dev/config/defaults/entry.server.spa.tsx

@@ -1,5 +1,5 @@
 import type { EntryContext } from "@react-router/node";
-import { RemixServer } from "react-router-dom";
+import { RemixServer } from "react-router";
 import * as React from "react";
 import { renderToString } from "react-dom/server";
 

pnpm-workspace.yaml

@@ -9,8 +9,6 @@ packages:
   - "packages/remix-node"
   - "packages/remix-serve"
   - "packages/remix-server-runtime"
-  - "packages/remix-testing"
-  - "packages/router"
   - "playground/compiler"
   - "playground/compiler-express"
   - "playground/compiler-spa"

rollup.config.js

@@ -3,22 +3,23 @@ const path = require("path");
 
 module.exports = function rollup(options) {
   return [
-    "router",
     "react-router",
     "react-router-dom",
     "remix-dev",
     "remix-express",
     "remix-node",
     "remix-serve",
     "remix-server-runtime",
-    "remix-testing",
   ]
     .flatMap((dir) => {
-      // if (dir !== "router") return null;
       let configPath = path.join("packages", dir, "rollup.config.js");
       try {
         fs.readFileSync(configPath);
       } catch (e) {
+        console.error(
+          "⚠️ Skipping build for package directory without rollup.config.js:",
+          dir
+        );
         return null;
       }
       let packageBuild = require(`.${path.sep}${configPath}`);

tsconfig.json

@@ -7,7 +7,6 @@
     { "path": "packages/remix-express" },
     { "path": "packages/remix-node" },
     { "path": "packages/remix-serve" },
-    { "path": "packages/remix-server-runtime" },
-    { "path": "packages/remix-testing" }
+    { "path": "packages/remix-server-runtime" }
   ]
 }