Bump router (#10175)

remix-run · Oct 29, 2024 · ed76436 · ed76436
1 parent 152eb87
commit ed76436
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 40 deletions.
diff --git a/.changeset/twenty-nails-occur.md b/.changeset/twenty-nails-occur.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+[REMOVE] Bump router
diff --git a/integration/action-test.ts b/integration/action-test.ts
@@ -121,7 +121,9 @@ test.describe("actions", () => {
 
   test.beforeEach(({ page }) => {
     page.on("console", (msg) => {
-      logs.push(msg.text());
+      if (!msg.text().includes("React Router Future Flag Warning")) {
+        logs.push(msg.text());
+      }
     });
   });
 
@@ -333,7 +335,9 @@ test.describe("single fetch", () => {
 
     test.beforeEach(({ page }) => {
       page.on("console", (msg) => {
-        logs.push(msg.text());
+        if (!msg.text().includes("React Router Future Flag Warning")) {
+          logs.push(msg.text());
+        }
       });
     });
 

diff --git a/integration/client-data-test.ts b/integration/client-data-test.ts
@@ -940,9 +940,10 @@ test.describe("Client Data", () => {
       page.on("console", (msg) => {
         let text = msg.text();
         if (
+          text.includes("React Router Future Flag Warning") ||
           // Ignore any dev tools messages. This may only happen locally when dev
           // tools is installed and not in CI but either way we don't care
-          /Download the React DevTools/.test(text)
+          text.includes("Download the React DevTools")
         ) {
           return;
         }

diff --git a/integration/defer-test.ts b/integration/defer-test.ts
@@ -2620,7 +2620,9 @@ async function ensureInteractivity(page: Page, id: string, expect: number = 1) {
 function monitorConsole(page: Page) {
   let messages: ConsoleMessage[] = [];
   page.on("console", (message) => {
-    messages.push(message);
+    if (!message.text().includes("React Router Future Flag Warning")) {
+      messages.push(message);
+    }
   });
 
   return async () => {

diff --git a/integration/package.json b/integration/package.json
@@ -14,7 +14,7 @@
     "@remix-run/dev": "workspace:*",
     "@remix-run/express": "workspace:*",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.20.0",
+    "@remix-run/router": "1.21.0-pre.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/express": "^4.17.9",
     "@vanilla-extract/css": "^1.10.0",

diff --git a/integration/prefetch-test.ts b/integration/prefetch-test.ts
@@ -791,7 +791,9 @@ test.describe("single fetch", () => {
 
       let consoleLogs: string[] = [];
       page.on("console", (msg) => {
-        consoleLogs.push(msg.text());
+        if (!msg.text().includes("React Router Future Flag Warning")) {
+          consoleLogs.push(msg.text());
+        }
       });
 
       let selectors = {

diff --git a/integration/resource-routes-test.ts b/integration/resource-routes-test.ts
@@ -247,7 +247,11 @@ test.describe("loader in an app", async () => {
     page,
   }) => {
     let logs: string[] = [];
-    page.on("console", (msg) => logs.push(msg.text()));
+    page.on("console", (msg) => {
+      if (!msg.text().includes("React Router Future Flag Warning")) {
+        logs.push(msg.text());
+      }
+    });
     let app = new PlaywrightFixture(appFixture, page);
     await app.goto("/");
     await app.clickSubmitButton("/no-action");

diff --git a/integration/vite-spa-mode-test.ts b/integration/vite-spa-mode-test.ts
@@ -504,7 +504,11 @@ test.describe("SPA Mode", () => {
       expect(html).toMatch('<h1 data-loading="true">Loading SPA...</h1>');
 
       let logs: string[] = [];
-      page.on("console", (msg) => logs.push(msg.text()));
+      page.on("console", (msg) => {
+        if (!msg.text().includes("React Router Future Flag Warning")) {
+          logs.push(msg.text());
+        }
+      });
 
       let app = new PlaywrightFixture(appFixture, page);
       await app.goto("/");

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -32,7 +32,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.20.0",
+    "@remix-run/router": "1.21.0-pre.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",

diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
@@ -19,10 +19,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.20.0",
+    "@remix-run/router": "1.21.0-pre.0",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "6.27.0",
-    "react-router-dom": "6.27.0",
+    "react-router": "6.28.0-pre.0",
+    "react-router-dom": "6.28.0-pre.0",
     "turbo-stream": "2.4.0"
   },
   "devDependencies": {

diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
@@ -19,7 +19,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.20.0",
+    "@remix-run/router": "1.21.0-pre.0",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",

diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
-    "@remix-run/router": "1.20.0",
-    "react-router-dom": "6.27.0"
+    "@remix-run/router": "1.21.0-pre.0",
+    "react-router-dom": "6.28.0-pre.0"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml