From 990ac999a3c6841926a820b3613f614656a537a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Dec 2023 11:23:44 -0500
Subject: [PATCH] Bump react-router-dom-v5-compat from 6.20.0 to 6.21.1 (#2075)

Bumps
[react-router-dom-v5-compat](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat)
from 6.20.0 to 6.21.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/remix-run/react-router/releases">react-router-dom-v5-compat'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>
<!-- raw HTML omitted -->
</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-v5-compat/CHANGELOG.md">react-router-dom-v5-compat's
changelog</a>.</em></p>
<blockquote>
<h2>6.21.1</h2>
<h3>Patch Changes</h3>
<ul>
<li>Updated dependencies:
<ul>
<li><code>react-router@6.21.1</code></li>
<li><code>react-router-dom@6.21.1</code></li>
</ul>
</li>
</ul>
<h2>6.21.0</h2>
<h3>Minor Changes</h3>
<ul>
<li>
<p>Add a new <code>future.v7_relativeSplatPath</code> flag to implement
a breaking bug fix to relative routing when inside a splat route. (<a
href="https://redirect.github.com/remix-run/react-router/pull/11087">#11087</a>)</p>
<p>This fix was originally added in <a
href="https://redirect.github.com/remix-run/react-router/issues/10983">#10983</a>
and was later reverted in <a
href="https://redirect.github.com/remix-run/react-router/pull/11078">#11078</a>
because it was determined that a large number of existing applications
were relying on the buggy behavior (see <a
href="https://redirect.github.com/remix-run/react-router/issues/11052">#11052</a>)</p>
<p><strong>The Bug</strong>
The buggy behavior is that without this flag, the default behavior when
resolving relative paths is to <em>ignore</em> any splat
(<code>*</code>) portion of the current route path.</p>
<p><strong>The Background</strong>
This decision was originally made thinking that it would make the
concept of nested different sections of your apps in
<code>&lt;Routes&gt;</code> easier if relative routing would
<em>replace</em> the current splat:</p>
<pre lang="jsx"><code>&lt;BrowserRouter&gt;
  &lt;Routes&gt;
    &lt;Route path=&quot;/&quot; element={&lt;Home /&gt;} /&gt;
&lt;Route path=&quot;dashboard/*&quot; element={&lt;Dashboard /&gt;}
/&gt;
  &lt;/Routes&gt;
&lt;/BrowserRouter&gt;
</code></pre>
<p>Any paths like <code>/dashboard</code>, <code>/dashboard/team</code>,
<code>/dashboard/projects</code> will match the <code>Dashboard</code>
route. The dashboard component itself can then render nested
<code>&lt;Routes&gt;</code>:</p>
<pre lang="jsx"><code>function Dashboard() {
  return (
    &lt;div&gt;
      &lt;h2&gt;Dashboard&lt;/h2&gt;
      &lt;nav&gt;
        &lt;Link to=&quot;/&quot;&gt;Dashboard Home&lt;/Link&gt;
        &lt;Link to=&quot;team&quot;&gt;Team&lt;/Link&gt;
        &lt;Link to=&quot;projects&quot;&gt;Projects&lt;/Link&gt;
      &lt;/nav&gt;
<pre><code>  &amp;lt;Routes&amp;gt;
&amp;lt;Route path=&amp;quot;/&amp;quot; element={&amp;lt;DashboardHome
/&amp;gt;} /&amp;gt;
&amp;lt;Route path=&amp;quot;team&amp;quot;
element={&amp;lt;DashboardTeam /&amp;gt;} /&amp;gt;
&amp;lt;Route path=&amp;quot;projects&amp;quot;
element={&amp;lt;DashboardProjects /&amp;gt;} /&amp;gt;
  &amp;lt;/Routes&amp;gt;
&amp;lt;/div&amp;gt;
</code></pre>
<p></code></pre></p>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/remix-run/react-router/commit/08cda17f450ebe19481be3fc080d243ec5ef509f"><code>08cda17</code></a>
chore: Update version for release (<a
href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat/issues/11132">#11132</a>)</li>
<li><a
href="https://github.com/remix-run/react-router/commit/e5d73cf2251bf99d3113695a57c34c84e0ac92e5"><code>e5d73cf</code></a>
chore: Update version for release (pre) (<a
href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat/issues/11131">#11131</a>)</li>
<li><a
href="https://github.com/remix-run/react-router/commit/cc4436c544300a09d9d95c5f733d3b00fd7d426f"><code>cc4436c</code></a>
Update changelogs for useResolvedSplat example</li>
<li><a
href="https://github.com/remix-run/react-router/commit/69ba50e06633fd4add234fb47f2d49b0a5ee41f9"><code>69ba50e</code></a>
chore: Update version for release (<a
href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat/issues/11114">#11114</a>)</li>
<li><a
href="https://github.com/remix-run/react-router/commit/ea0ffeef8a0c353f8ef402b5df2ac7c60a4d0b49"><code>ea0ffee</code></a>
chore: Update version for release (pre) (<a
href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat/issues/11095">#11095</a>)</li>
<li><a
href="https://github.com/remix-run/react-router/commit/373b30cdfb4a770e77f6ded25e94ba72fbde4e23"><code>373b30c</code></a>
chore: Update version for release (pre) (<a
href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat/issues/11091">#11091</a>)</li>
<li><a
href="https://github.com/remix-run/react-router/commit/56b2944ef18307fa6d5e432b52eead38eeda3402"><code>56b2944</code></a>
chore: Update version for release (pre) (<a
href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat/issues/11090">#11090</a>)</li>
<li><a
href="https://github.com/remix-run/react-router/commit/ee5fcd54af4784d58191d97a7117fa4d75378946"><code>ee5fcd5</code></a>
Generate release notes</li>
<li><a
href="https://github.com/remix-run/react-router/commit/ddc2b94c26ac4a12b5a8e37dc4179e1b10644e1b"><code>ddc2b94</code></a>
chore: Update version for release (pre) (<a
href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat/issues/11089">#11089</a>)</li>
<li><a
href="https://github.com/remix-run/react-router/commit/149ad65a8dfb90b18835ec784792b6a86e4427a9"><code>149ad65</code></a>
Add future.v7_relativeSplatPath flag (<a
href="https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom-v5-compat/issues/11087">#11087</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/remix-run/react-router/commits/react-router-dom-v5-compat@6.21.1/packages/react-router-dom-v5-compat">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=react-router-dom-v5-compat&package-manager=npm_and_yarn&previous-version=6.20.0&new-version=6.21.1)](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 show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@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>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/jaeger-ui/package.json |  2 +-
 yarn.lock                       | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json
index f5ab3af15f..42dc712686 100644
--- a/packages/jaeger-ui/package.json
+++ b/packages/jaeger-ui/package.json
@@ -81,7 +81,7 @@
     "react-json-view-lite": "1.2.0",
     "react-redux": "^8.1.2",
     "react-router-dom": "5.3.4",
-    "react-router-dom-v5-compat": "^6.20.0",
+    "react-router-dom-v5-compat": "^6.21.1",
     "react-vis": "^1.7.2",
     "react-vis-force": "^0.3.1",
     "react-window": "^1.8.10",
diff --git a/yarn.lock b/yarn.lock
index ab474b503b..ceff9ce41e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1843,10 +1843,10 @@
     rc-resize-observer "^1.3.1"
     rc-util "^5.38.0"
 
-"@remix-run/router@1.13.0":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.13.0.tgz#7e29c4ee85176d9c08cb0f4456bff74d092c5065"
-  integrity sha512-5dMOnVnefRsl4uRnAdoWjtVTdh8e6aZqgM4puy9nmEADH72ck+uXwzpJLEKE9Q6F8ZljNewLgmTfkxUrBdv4WA==
+"@remix-run/router@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.14.1.tgz#6d2dd03d52e604279c38911afc1079d58c50a755"
+  integrity sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow==
 
 "@rollup/rollup-android-arm-eabi@4.4.1":
   version "4.4.1"
@@ -8574,13 +8574,13 @@ react-refresh@^0.14.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
   integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
 
-react-router-dom-v5-compat@^6.20.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom-v5-compat/-/react-router-dom-v5-compat-6.20.0.tgz#9241b7ea0856af16b88371619bea518f8fd2e359"
-  integrity sha512-13xJxgmDmmCZwxVxTNJkxrlDtuNiNPNWNYuJO6CMqHloqjSzi+Xaq2dy9ZknS71NNvOHwzOmcF4rPK6fv0B4+Q==
+react-router-dom-v5-compat@^6.21.1:
+  version "6.21.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom-v5-compat/-/react-router-dom-v5-compat-6.21.1.tgz#09d6d0ba66763a52bb0779d55888d934e3a8cc94"
+  integrity sha512-EpPPdT3STH6TsgLuPap/f+C10A2TZICOpi6kKtK8M7DUVDJfAzxv3C39JL+SX5zuKvPO89Zy9WecVVozoCtkfA==
   dependencies:
     history "^5.3.0"
-    react-router "6.20.0"
+    react-router "6.21.1"
 
 react-router-dom@5.3.4:
   version "5.3.4"
@@ -8610,12 +8610,12 @@ react-router@5.3.4:
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-react-router@6.20.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.20.0.tgz#4275a3567ecc55f7703073158048db10096bb539"
-  integrity sha512-pVvzsSsgUxxtuNfTHC4IxjATs10UaAtvLGVSA1tbUE4GDaOSU1Esu2xF5nWLz7KPiMuW8BJWuPFdlGYJ7/rW0w==
+react-router@6.21.1:
+  version "6.21.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.21.1.tgz#8db7ee8d7cfc36513c9a66b44e0897208c33be34"
+  integrity sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==
   dependencies:
-    "@remix-run/router" "1.13.0"
+    "@remix-run/router" "1.14.1"
 
 react-shallow-renderer@^16.13.1, react-shallow-renderer@^16.15.0:
   version "16.15.0"