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

Merged
merged 6 commits into from
Jun 22, 2023
Merged

Bump router #6662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64db07d
Bump router
brophdawg11 Jun 21, 2023
38b0ed0
Add sleep for safari to pass E2E tests
brophdawg11 Jun 22, 2023
88fa55e
Switch to requestAnimationFrame
brophdawg11 Jun 22, 2023
64901fd
Avoid rAF on chrome
brophdawg11 Jun 22, 2023
023b2c7
Download playwright back to 1.28.1 to keep node 14 support
brophdawg11 Jun 22, 2023
2b97222
Update to playwright 1.33.0
brophdawg11 Jun 22, 2023
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/chatty-birds-sing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/react": patch
---

Bump router 6.14.0-pre.1
21 changes: 21 additions & 0 deletions integration/helpers/playwright-fixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,27 @@ async function doAndWait(
console.log(`action done, ${requestCounter} requests pending`);
}
await networkSettledPromise;

// I wish I knew why but Safari seems to get all screwed up without this.
// When you run doAndWait (via clicking a blink or submitting a form) and
// then waitForSelector(). It finds the selector element but thinks it's
// hidden for some unknown reason. It's intermittent, but waiting for the
// next animation frame delaying slightly before the waitForSelector() calls
// seems to fix it 🤷‍♂️
//
// Test timeout of 30000ms exceeded.
//
// Error: page.waitForSelector: Target closed
// =========================== logs ===========================
// waiting for locator('text=ROOT_BOUNDARY_TEXT') to be visible
// locator resolved to hidden <div id="root-boundary">ROOT_BOUNDARY_TEXT</div>
// locator resolved to hidden <div id="root-boundary">ROOT_BOUNDARY_TEXT</div>
// ... and so on until the test times out
let userAgent = await page.evaluate(() => navigator.userAgent);
if (/Safari\//i.test(userAgent) && !/Chrome\//i.test(userAgent)) {
await page.evaluate(() => new Promise((r) => requestAnimationFrame(r)));
}

if (DEBUG) {
console.log(`action done, network settled`);
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@octokit/graphql": "^4.8.0",
"@octokit/plugin-paginate-rest": "^2.17.0",
"@octokit/rest": "^18.12.0",
"@playwright/test": "^1.35.1",
"@playwright/test": "1.33.0",
"@remix-run/changelog-github": "^0.0.5",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-json": "^4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"module": "dist/esm/index.js",
"dependencies": {
"@remix-run/router": "1.7.0-pre.0",
"react-router-dom": "6.14.0-pre.0"
"react-router-dom": "6.14.0-pre.1"
},
"devDependencies": {
"@remix-run/server-runtime": "1.18.0-pre.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-testing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@remix-run/node": "1.18.0-pre.0",
"@remix-run/react": "1.18.0-pre.0",
"@remix-run/router": "1.7.0-pre.0",
"react-router-dom": "6.14.0-pre.0"
"react-router-dom": "6.14.0-pre.1"
},
"devDependencies": {
"@types/node": "^18.11.9",
Expand Down
36 changes: 18 additions & 18 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2569,13 +2569,13 @@
tiny-glob "^0.2.9"
tslib "^2.4.0"

"@playwright/test@^1.35.1":
version "1.35.1"
resolved "https://registry.npmjs.org/@playwright/test/-/test-1.35.1.tgz#a596b61e15b980716696f149cc7a2002f003580c"
integrity sha512-b5YoFe6J9exsMYg0pQAobNDR85T1nLumUYgUTtKm4d21iX2L7WqKq9dW8NGJ+2vX0etZd+Y7UeuqsxDXm9+5ZA==
"@playwright/test@1.33.0":
version "1.33.0"
resolved "https://registry.npmjs.org/@playwright/test/-/test-1.33.0.tgz#669ef859efb81b143dfc624eef99d1dd92a81b67"
integrity sha512-YunBa2mE7Hq4CfPkGzQRK916a4tuZoVx/EpLjeWlTVOnD4S2+fdaQZE0LJkbfhN5FTSKNLdcl7MoT5XB37bTkg==
dependencies:
"@types/node" "*"
playwright-core "1.35.1"
playwright-core "1.33.0"
optionalDependencies:
fsevents "2.3.2"

Expand Down Expand Up @@ -10983,10 +10983,10 @@ pkg-types@^1.0.1:
mlly "^1.0.0"
pathe "^1.0.0"

playwright-core@1.35.1:
version "1.35.1"
resolved "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz#52c1e6ffaa6a8c29de1a5bdf8cce0ce290ffb81d"
integrity sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg==
playwright-core@1.33.0:
version "1.33.0"
resolved "https://registry.npmjs.org/playwright-core/-/playwright-core-1.33.0.tgz#269efe29a927cd6d144d05f3c2d2f72bd72447a1"
integrity sha512-aizyPE1Cj62vAECdph1iaMILpT0WUDCq3E6rW6I+dleSbBoGbktvJtzS6VHkZ4DKNEOG9qJpiom/ZxO+S15LAw==

pointer-symbol@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -11437,18 +11437,18 @@ react-refresh@^0.14.0:
resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz"
integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==

react-router-dom@6.14.0-pre.0:
version "6.14.0-pre.0"
resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.0-pre.0.tgz#8e106739c776f48c0d3710aae69bac42ddf09a3f"
integrity sha512-NndsLa0FHP8BDUePOnpiQqunDaoY1e0PljjqTQDxHMeCZqf1148S8hl54ZF6rXoA4EuACszVSrURIrAhZ++ljg==
react-router-dom@6.14.0-pre.1:
version "6.14.0-pre.1"
resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.0-pre.1.tgz#7d88b8d2547f74780d8b84fe17d92866655b3409"
integrity sha512-BJb1N+NOOSt9Wr+wFnXGsQhgWgA5fbEbvqNGJjdwDqlfkdCpgLE6V2DdS4klvvBYlSSZwV/xMbXEtN4rwTyydQ==
dependencies:
"@remix-run/router" "1.7.0-pre.0"
react-router "6.14.0-pre.0"
react-router "6.14.0-pre.1"

react-router@6.14.0-pre.0:
version "6.14.0-pre.0"
resolved "https://registry.npmjs.org/react-router/-/react-router-6.14.0-pre.0.tgz#38d8ace45232b5d6cbcaf8b68d6af76a584f5e02"
integrity sha512-xNXcEDQ7pjKpw4ueFhmbksnVaRuyXng4OXXBg9RsM16FyJDSUUKXruygjrDiVeyGeAGjIiDDNUX/G6EwF3aS9w==
react-router@6.14.0-pre.1:
version "6.14.0-pre.1"
resolved "https://registry.npmjs.org/react-router/-/react-router-6.14.0-pre.1.tgz#e14b217c0b445c2f42a1ed556ee9c820ae6a86bc"
integrity sha512-ZXGINPC0OgunHSqgiUjJqQh+TmPHT+kEO03WacCaYgEZWLDjL9FowXSqvdBUFU20sDnMdN5QmqPLHIK+v3B2BA==
dependencies:
"@remix-run/router" "1.7.0-pre.0"

Expand Down