Merge #1051

meili-bors[bot] · dependabot[bot] · web-flow · commit 77f7da1903ba · 2023-04-03T09:27:00.000Z
1051: Bump react-router-dom from 6.8.1 to 6.10.0 r=bidoubiwa a=dependabot[bot] Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.8.1 to 6.10.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/remix-run/react-router/releases">react-router-dom's releases</a>.</em></p> <blockquote> <h2>react-router-dom-v5-compat@6.4.0-pre.15</h2> <h3>Patch Changes</h3> <ul> <li>Updated dependencies <ul> <li>react-router@6.4.0-pre.15</li> <li>react-router-dom@6.4.0-pre.15</li> </ul> </li> </ul> <h2>react-router-dom-v5-compat@6.4.0-pre.11</h2> <h3>Patch Changes</h3> <ul> <li>Updated dependencies <ul> <li>react-router@6.4.0-pre.11</li> <li>react-router-dom@6.4.0-pre.11</li> </ul> </li> </ul> <h2>react-router-dom-v5-compat@6.4.0-pre.10</h2> <h3>Patch Changes</h3> <ul> <li>Updated dependencies <ul> <li>react-router@6.4.0-pre.10</li> <li>react-router-dom@6.4.0-pre.10</li> </ul> </li> </ul> <h2>react-router-dom-v5-compat@6.4.0-pre.9</h2> <h3>Patch Changes</h3> <ul> <li>Updated dependencies <ul> <li>react-router@6.4.0-pre.9</li> <li>react-router-dom@6.4.0-pre.9</li> </ul> </li> </ul> <h2>react-router-dom-v5-compat@6.4.0-pre.8</h2> <h3>Patch Changes</h3> <ul> <li>Updated dependencies <ul> <li>react-router@6.4.0-pre.8</li> <li>react-router-dom@6.4.0-pre.8</li> </ul> </li> </ul> <h2>react-router-dom-v5-compat@6.4.0-pre.7</h2> <h3>Patch Changes</h3> <ul> <li>Updated dependencies <ul> <li><code>react-router@6.4.0-pre.7</code></li> <li><code>react-router-dom@6.4.0-pre.7</code></li> </ul> </li> </ul> <h2>react-router-dom-v5-compat@6.4.0-pre.6</h2> <h3>Patch Changes</h3> <ul> <li>44bce3c6: Fix <code>react-router-dom</code> peer dependency version <ul> <li>react-router@6.4.0-pre.6</li> <li>react-router-dom@6.4.0-pre.6</li> </ul> </li> </ul> <h2>react-router-dom-v5-compat@6.4.0-pre.5</h2>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md">react-router-dom's changelog</a>.</em></p> <blockquote> <h2>6.10.0</h2> <h3>Minor Changes</h3> <ul> <li> <p>Added support for <a href="https://reactrouter.com/en/main/guides/api-development-strategy"><strong>Future Flags</strong></a> in React Router. The first flag being introduced is <code>future.v7_normalizeFormMethod</code> which will normalize the exposed <code>useNavigation()/useFetcher()</code> <code>formMethod</code> fields as uppercase HTTP methods to align with the <code>fetch()</code> behavior. (<a href="https://redirect.github.com/remix-run/react-router/pull/10207">#10207</a>)</p> <ul> <li>When <code>future.v7_normalizeFormMethod === false</code> (default v6 behavior), <ul> <li><code>useNavigation().formMethod</code> is lowercase</li> <li><code>useFetcher().formMethod</code> is lowercase</li> </ul> </li> <li>When <code>future.v7_normalizeFormMethod === true</code>: <ul> <li><code>useNavigation().formMethod</code> is uppercase</li> <li><code>useFetcher().formMethod</code> is uppercase</li> </ul> </li> </ul> </li> </ul> <h3>Patch Changes</h3> <ul> <li>Fix <code>createStaticHandler</code> to also check for <code>ErrorBoundary</code> on routes in addition to <code>errorElement</code> (<a href="https://redirect.github.com/remix-run/react-router/pull/10190">#10190</a>)</li> <li>Updated dependencies: <ul> <li><code>`@remix-run/router@1.5.0</code></li>` <li><code>react-router@6.10.0</code></li> </ul> </li> </ul> <h2>6.9.0</h2> <h3>Minor Changes</h3> <ul> <li> <p>React Router now supports an alternative way to define your route <code>element</code> and <code>errorElement</code> fields as React Components instead of React Elements. You can instead pass a React Component to the new <code>Component</code> and <code>ErrorBoundary</code> fields if you choose. There is no functional difference between the two, so use whichever approach you prefer 😀. You shouldn't be defining both, but if you do <code>Component</code>/<code>ErrorBoundary</code> will &quot;win&quot;. (<a href="https://redirect.github.com/remix-run/react-router/pull/10045">#10045</a>)</p> <p><strong>Example JSON Syntax</strong></p> <pre lang="jsx"><code>// Both of these work the same: const elementRoutes = [{ path: '/', element: &lt;Home /&gt;, errorElement: &lt;HomeError /&gt;, }] <p>const componentRoutes = [{ path: '/', Component: Home, ErrorBoundary: HomeError, }]</p> <p>function Home() { ... } function HomeError() { ... } </code></pre></p> <p><strong>Example JSX Syntax</strong></p> <pre lang="jsx"><code>// Both of these work the same: </code></pre> </li> </ul>  </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/remix-run/react-router/commit/a3927fe5f718f7c105aab4ad4faa9108ee62efcc"><code>a3927fe</code></a> chore: Update version for release (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10284">#10284</a>)</li> <li><a href="https://github.com/remix-run/react-router/commit/8f7939c9b66f261df0e70731bdf3dba30cfcff13"><code>8f7939c</code></a> chore: Update version for release (pre) (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10260">#10260</a>)</li> <li><a href="https://github.com/remix-run/react-router/commit/7799f6c7ace0e25d3f2b64babb1c8895416d4717"><code>7799f6c</code></a> chore: Update version for release (pre) (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10248">#10248</a>)</li> <li><a href="https://github.com/remix-run/react-router/commit/97b5c424152a40c298ac25cc8ed3ff9dfc5f838c"><code>97b5c42</code></a> chore: Update version for release (pre) (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10243">#10243</a>)</li> <li><a href="https://github.com/remix-run/react-router/commit/dff7e6498c65d84bb1738413e9063d82089e6070"><code>dff7e64</code></a> Add future.v7_normalizeFormMethod flag (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10207">#10207</a>)</li> <li><a href="https://github.com/remix-run/react-router/commit/6c68e1e2cfd3616dd27a9022640b24affbea9374"><code>6c68e1e</code></a> Properly handle lazy errors during router initialization (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10201">#10201</a>)</li> <li><a href="https://github.com/remix-run/react-router/commit/474feb7793fa9f9e9c6f75d957dcafb22550b534"><code>474feb7</code></a> Remove wrapper API from data browser router tests (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10196">#10196</a>)</li> <li><a href="https://github.com/remix-run/react-router/commit/7ba352eddc7a9daaa3366094a78b275521b869fc"><code>7ba352e</code></a> chore: format</li> <li><a href="https://github.com/remix-run/react-router/commit/0f561ee0079a044d828c49780ae0ac13057b53e7"><code>0f561ee</code></a> fix(react-router-dom): fix <code>detectErrorBoundary</code> function (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10190">#10190</a>)</li> <li><a href="https://github.com/remix-run/react-router/commit/4ec107a69b2c6b2ea7482a5a5138c035ce0ab8c2"><code>4ec107a</code></a> chore: Update version for release (<a href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom/issues/10185">#10185</a>)</li> <li>Additional commits viewable in <a href="https://github.com/remix-run/react-router/commits/react-router-dom@6.10.0/packages/react-router-dom">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=react-router-dom&package-manager=npm_and_yarn&previous-version=6.8.1&new-version=6.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
diff --git a/playgrounds/local-react/package.json b/playgrounds/local-react/package.json
@@ -29,7 +29,7 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-instantsearch-dom": "^6.12.1",
-    "react-router-dom": "^6.4.3"
+    "react-router-dom": "^6.10.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.5",
diff --git a/yarn.lock b/yarn.lock
@@ -2522,10 +2522,10 @@
     "@parcel/utils" "^1.11.0"
     physical-cpu-count "^2.0.0"
 
-"@remix-run/router@1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.3.2.tgz#58cd2bd25df2acc16c628e1b6f6150ea6c7455bc"
-  integrity sha512-t54ONhl/h75X94SWsHGQ4G/ZrCEguKSRQr7DrjTciJXW0YU1QhlwYeycvK5JgkzlxmvrK7wq1NB/PLtHxoiDcA==
+"@remix-run/router@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.5.0.tgz#57618e57942a5f0131374a9fdb0167e25a117fdc"
+  integrity sha512-bkUDCp8o1MvFO+qxkODcbhSqRa6P2GXgrGZVpt0dCXNW2HCSCqYI0ZoAqEOSAjRWmmlKcYgFvN4B4S+zo/f8kg==
 
 "@rollup/plugin-commonjs@^17.1.0":
   version "17.1.0"
@@ -11822,20 +11822,20 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
   integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
 
-react-router-dom@^6.4.3:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.8.1.tgz#7e136b67d9866f55999e9a8482c7008e3c575ac9"
-  integrity sha512-67EXNfkQgf34P7+PSb6VlBuaacGhkKn3kpE51+P6zYSG2kiRoumXEL6e27zTa9+PGF2MNXbgIUHTVlleLbIcHQ==
+react-router-dom@^6.10.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.10.0.tgz#090ddc5c84dc41b583ce08468c4007c84245f61f"
+  integrity sha512-E5dfxRPuXKJqzwSe/qGcqdwa18QiWC6f3H3cWXM24qj4N0/beCIf/CWTipop2xm7mR0RCS99NnaqPNjHtrAzCg==
   dependencies:
-    "@remix-run/router" "1.3.2"
-    react-router "6.8.1"
+    "@remix-run/router" "1.5.0"
+    react-router "6.10.0"
 
-react-router@6.8.1:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.8.1.tgz#e362caf93958a747c649be1b47cd505cf28ca63e"
-  integrity sha512-Jgi8BzAJQ8MkPt8ipXnR73rnD7EmZ0HFFb7jdQU24TynGW1Ooqin2KVDN9voSC+7xhqbbCd2cjGUepb6RObnyg==
+react-router@6.10.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.10.0.tgz#230f824fde9dd0270781b5cb497912de32c0a971"
+  integrity sha512-Nrg0BWpQqrC3ZFFkyewrflCud9dio9ME3ojHCF/WLsprJVzkq3q3UeEhMCAW1dobjeGbWgjNn/PVF6m46ANxXQ==
   dependencies:
-    "@remix-run/router" "1.3.2"
+    "@remix-run/router" "1.5.0"
 
 react@^17.0.1:
   version "17.0.2"
