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.

Sign up for GitHub

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 #10086

Merged
merged 2 commits into from
Oct 10, 2024
Merged

Bump router #10086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc74b03
Bump router
brophdawg11 Oct 10, 2024
95c8a13
Update e2e test
brophdawg11 Oct 10, 2024
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/big-buckets-pretend.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/react": patch
---

[REMOVE] bump router versions
17 changes: 12 additions & 5 deletions integration/client-data-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,17 @@ test.describe("Client Data", () => {
let app = new PlaywrightFixture(appFixture, page);

let logs: string[] = [];
page.on("console", (msg) => logs.push(msg.text()));
page.on("console", (msg) => {
let text = msg.text();
if (
// 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)
) {
return;
}
logs.push(text);
});

await app.goto("/parent/child", false);
let html = await app.getHtml("main");
Expand All @@ -954,10 +964,7 @@ test.describe("Client Data", () => {
expect(html).toMatch("Child Server Error");
expect(html).not.toMatch("Should not see me");

expect(logs).toEqual([
expect.stringContaining("Download the React DevTools"),
"running parent client loader",
]);
expect(logs).toEqual(["running parent client loader"]);

console.error = _consoleError;
});
Expand Down
2 changes: 1 addition & 1 deletion integration/package.json
View file
Open in desktop
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-pre.0",
"@remix-run/router": "1.20.0-pre.1",
"@remix-run/server-runtime": "workspace:*",
"@types/express": "^4.17.9",
"@vanilla-extract/css": "^1.10.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-dev/package.json
View file
Open in desktop
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-pre.0",
"@remix-run/router": "1.20.0-pre.1",
"@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
View file
Open in desktop
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-pre.0",
"@remix-run/router": "1.20.0-pre.1",
"@remix-run/server-runtime": "workspace:*",
"react-router": "6.27.0-pre.0",
"react-router-dom": "6.27.0-pre.0",
"react-router": "6.27.0-pre.1",
"react-router-dom": "6.27.0-pre.1",
"turbo-stream": "2.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-server-runtime/package.json
View file
Open in desktop
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-pre.0",
"@remix-run/router": "1.20.0-pre.1",
"@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
View file
Open in desktop
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-pre.0",
"react-router-dom": "6.27.0-pre.0"
"@remix-run/router": "1.20.0-pre.1",
"react-router-dom": "6.27.0-pre.1"
},
"devDependencies": {
"@remix-run/server-runtime": "workspace:*",
Expand Down
50 changes: 25 additions & 25 deletions pnpm-lock.yaml
View file
Open in desktop

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