Bump router (#6662)

remix-run · Jun 22, 2023 · 46f3de3 · 46f3de3
1 parent f9e3db2
commit 46f3de3
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 21 deletions.
diff --git a/.changeset/chatty-birds-sing.md b/.changeset/chatty-birds-sing.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Bump router 6.14.0-pre.1
diff --git a/integration/helpers/playwright-fixture.ts b/integration/helpers/playwright-fixture.ts
@@ -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`);
   }

diff --git a/package.json b/package.json
@@ -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",

diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
@@ -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.2",

diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
@@ -19,7 +19,7 @@
     "@remix-run/node": "1.18.0-pre.2",
     "@remix-run/react": "1.18.0-pre.2",
     "@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",

diff --git a/yarn.lock b/yarn.lock
@@ -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"
 
@@ -10988,10 +10988,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"
@@ -11442,18 +11442,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"