diff --git a/.changeset/twenty-nails-occur.md b/.changeset/twenty-nails-occur.md new file mode 100644 index 00000000000..2a5c2e42de8 --- /dev/null +++ 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 index dc378790cbd..9531d0d804c 100644 --- 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 index eebc4fb7c72..80364c730e1 100644 --- 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 index 0216d422d34..c272e9b901b 100644 --- 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 index d17bcca979e..19188746ade 100644 --- 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 index 07d6d41b5d6..1b656ac9427 100644 --- 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 index def0f01e15b..7a84eab529c 100644 --- 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 index 6bccd256a4f..8d0c13699c5 100644 --- 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('

Loading SPA...

'); 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 index c285e9141c2..13af302a7df 100644 --- 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 index 62a0a063d26..ed9477e8dad 100644 --- 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 index f129a9517cb..770f7dfd6e4 100644 --- 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 index 7369a7cc343..2e764e0f408 100644 --- 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 index 49fd5e65507..d98e0fb1035 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -323,8 +323,8 @@ importers: specifier: workspace:* version: link:../packages/remix-node '@remix-run/router': - specifier: 1.20.0 - version: 1.20.0 + specifier: 1.21.0-pre.0 + version: 1.21.0-pre.0 '@remix-run/server-runtime': specifier: workspace:* version: link:../packages/remix-server-runtime @@ -883,8 +883,8 @@ importers: specifier: ^2.13.1 version: link:../remix-react '@remix-run/router': - specifier: 1.20.0 - version: 1.20.0 + specifier: 1.21.0-pre.0 + version: 1.21.0-pre.0 '@remix-run/server-runtime': specifier: workspace:* version: link:../remix-server-runtime @@ -1247,17 +1247,17 @@ importers: packages/remix-react: dependencies: '@remix-run/router': - specifier: 1.20.0 - version: 1.20.0 + specifier: 1.21.0-pre.0 + version: 1.21.0-pre.0 '@remix-run/server-runtime': specifier: workspace:* version: link:../remix-server-runtime react-router: - specifier: 6.27.0 - version: 6.27.0(react@18.2.0) + specifier: 6.28.0-pre.0 + version: 6.28.0-pre.0(react@18.2.0) react-router-dom: - specifier: 6.27.0 - version: 6.27.0(react-dom@18.2.0)(react@18.2.0) + specifier: 6.28.0-pre.0 + version: 6.28.0-pre.0(react-dom@18.2.0)(react@18.2.0) turbo-stream: specifier: 2.4.0 version: 2.4.0 @@ -1364,8 +1364,8 @@ importers: packages/remix-server-runtime: dependencies: '@remix-run/router': - specifier: 1.20.0 - version: 1.20.0 + specifier: 1.21.0-pre.0 + version: 1.21.0-pre.0 '@types/cookie': specifier: ^0.6.0 version: 0.6.0 @@ -1401,11 +1401,11 @@ importers: specifier: workspace:* version: link:../remix-react '@remix-run/router': - specifier: 1.20.0 - version: 1.20.0 + specifier: 1.21.0-pre.0 + version: 1.21.0-pre.0 react-router-dom: - specifier: 6.27.0 - version: 6.27.0(react-dom@18.2.0)(react@18.2.0) + specifier: 6.28.0-pre.0 + version: 6.28.0-pre.0(react-dom@18.2.0)(react@18.2.0) devDependencies: '@remix-run/server-runtime': specifier: workspace:* @@ -4267,8 +4267,8 @@ packages: - encoding dev: false - /@remix-run/router@1.20.0: - resolution: {integrity: sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==} + /@remix-run/router@1.21.0-pre.0: + resolution: {integrity: sha512-Aszc+xJozCmJhfJzggVSwOXJg6SH2GAU9/49YZGc9bmj7gmmgCmlyFRdXbRE50Hq6Ug6NxlP2KjGnUyLKcUNkw==} engines: {node: '>=14.0.0'} dev: false @@ -12838,26 +12838,26 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-router-dom@6.27.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==} + /react-router-dom@6.28.0-pre.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-sXpwvX6y1/7jwdhIrsYgmA/6C9IJpLImqE3XP5Gc/Ew9IBBbtD9q+WzRs86qsmjYx+670/MnLg6FaTK+KlS5WQ==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 1.20.0 + '@remix-run/router': 1.21.0-pre.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.27.0(react@18.2.0) + react-router: 6.28.0-pre.0(react@18.2.0) dev: false - /react-router@6.27.0(react@18.2.0): - resolution: {integrity: sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==} + /react-router@6.28.0-pre.0(react@18.2.0): + resolution: {integrity: sha512-Oc07BehryS1xQEgM5vEsj4SPg7tgd4lkk3qsHb93WOzf3REpwMNNQalu2klxpDWGdirCNCB0+YYoqg3zpWa5gw==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 1.20.0 + '@remix-run/router': 1.21.0-pre.0 react: 18.2.0 dev: false