Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump router #10175

Merged
merged 3 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/twenty-nails-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/react": patch
---

[REMOVE] Bump router
8 changes: 6 additions & 2 deletions integration/action-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
});
});

Expand Down Expand Up @@ -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());
}
});
});

Expand Down
3 changes: 2 additions & 1 deletion integration/client-data-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 3 additions & 1 deletion integration/defer-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion integration/prefetch-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
6 changes: 5 additions & 1 deletion integration/resource-routes-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
6 changes: 5 additions & 1 deletion integration/vite-spa-mode-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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("/");
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/remix-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-server-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/remix-testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand Down
50 changes: 25 additions & 25 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading