From 409bd433edf433fdc0a644b2987910f5e2c8fd0e Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 14 Aug 2024 12:09:47 -0400 Subject: [PATCH 1/4] Enter prerelease mode --- .changeset/pre.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 0000000000..c5ab891b93 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,12 @@ +{ + "mode": "pre", + "tag": "pre", + "initialVersions": { + "react-router": "6.26.0", + "react-router-dom": "6.26.0", + "react-router-dom-v5-compat": "6.26.0", + "react-router-native": "6.26.0", + "@remix-run/router": "1.19.0" + }, + "changesets": [] +} From f806fa4693d2f55f56f3e8decb715b91d0d25aae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:26:26 -0400 Subject: [PATCH 2/4] chore: Update version for release (pre) (#11889) --- .changeset/pre.json | 5 ++++- .changeset/silver-coats-work.md | 2 +- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- packages/react-router-dom-v5-compat/CHANGELOG.md | 9 +++++++++ packages/react-router-dom-v5-compat/package.json | 2 +- packages/react-router-dom/CHANGELOG.md | 9 +++++++++ packages/react-router-dom/package.json | 2 +- packages/react-router-native/CHANGELOG.md | 7 +++++++ packages/react-router-native/package.json | 2 +- packages/react-router/CHANGELOG.md | 8 ++++++++ packages/react-router/package.json | 2 +- packages/router/CHANGELOG.md | 10 ++++++++++ packages/router/package.json | 2 +- 14 files changed, 66 insertions(+), 8 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index c5ab891b93..acd97249ce 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -8,5 +8,8 @@ "react-router-native": "6.26.0", "@remix-run/router": "1.19.0" }, - "changesets": [] + "changesets": [ + "cyan-bobcats-notice", + "silver-coats-work" + ] } diff --git a/.changeset/silver-coats-work.md b/.changeset/silver-coats-work.md index 6fd814c3f7..9eb1416062 100644 --- a/.changeset/silver-coats-work.md +++ b/.changeset/silver-coats-work.md @@ -4,4 +4,4 @@ "@remix-run/router": patch --- -Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` because it will now be called on the first navigation to paths matching splat/param routes in case there exists a higher-scoring route match not yet discovered +Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` to match new behavior diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b4451730d..8957fe7539 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -203,6 +203,18 @@ Date: YYYY-MM-DD **Full Changelog**: [`v6.X.Y...v6.X.Y`](https://github.com/remix-run/react-router/compare/react-router@6.X.Y...react-router@6.X.Y) --> +## v6.26.1 + +Date: 2024-08-15 + +### Patch Changes + +- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` to match new behavior ([#11888](https://github.com/remix-run/react-router/pull/11888)) +- Update `unstable_patchRoutesOnNavigation` logic so that we call the method when we match routes with dynamic param or splat segments in case there exists a higher-scoring static route that we've not yet discovered ([#11883](https://github.com/remix-run/react-router/pull/11883)) + - We also now leverage an internal FIFO queue of previous paths we've already called `unstable_patchRoutesOnNavigation` against so that we don't re-call on subsequent navigations to the same path + +**Full Changelog**: [`v6.26.0...v6.26.1`](https://github.com/remix-run/react-router/compare/react-router@6.26.0...react-router@6.26.1) + ## v6.26.0 Date: 2024-08-01 diff --git a/package.json b/package.json index 4bf46e006f..b20fc13c0a 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "none": "17.3 kB" }, "packages/react-router-dom/dist/umd/react-router-dom.production.min.js": { - "none": "23.7 kB" + "none": "23.8 kB" } }, "pnpm": { diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md index 51677f954e..0c1bb88ce5 100644 --- a/packages/react-router-dom-v5-compat/CHANGELOG.md +++ b/packages/react-router-dom-v5-compat/CHANGELOG.md @@ -1,5 +1,14 @@ # `react-router-dom-v5-compat` +## 6.26.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/router@1.19.1-pre.0` + - `react-router-dom@6.26.1-pre.0` + - `react-router@6.26.1-pre.0` + ## 6.26.0 ### Patch Changes diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json index 5bb981bb10..a623ea30a3 100644 --- a/packages/react-router-dom-v5-compat/package.json +++ b/packages/react-router-dom-v5-compat/package.json @@ -1,6 +1,6 @@ { "name": "react-router-dom-v5-compat", - "version": "6.26.0", + "version": "6.26.1-pre.0", "description": "Migration path to React Router v6 from v4/5", "keywords": [ "react", diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md index 152d358a9b..35454adc05 100644 --- a/packages/react-router-dom/CHANGELOG.md +++ b/packages/react-router-dom/CHANGELOG.md @@ -1,5 +1,14 @@ # `react-router-dom` +## 6.26.1-pre.0 + +### Patch Changes + +- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` because it will now be called on the first navigation to paths matching splat/param routes in case there exists a higher-scoring route match not yet discovered ([#11888](https://github.com/remix-run/react-router/pull/11888)) +- Updated dependencies: + - `@remix-run/router@1.19.1-pre.0` + - `react-router@6.26.1-pre.0` + ## 6.26.0 ### Minor Changes diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json index 54ed162217..a7f33944e8 100644 --- a/packages/react-router-dom/package.json +++ b/packages/react-router-dom/package.json @@ -1,6 +1,6 @@ { "name": "react-router-dom", - "version": "6.26.0", + "version": "6.26.1-pre.0", "description": "Declarative routing for React web applications", "keywords": [ "react", diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md index 7f7b3d6108..7f425b0e44 100644 --- a/packages/react-router-native/CHANGELOG.md +++ b/packages/react-router-native/CHANGELOG.md @@ -1,5 +1,12 @@ # `react-router-native` +## 6.26.1-pre.0 + +### Patch Changes + +- Updated dependencies: + - `react-router@6.26.1-pre.0` + ## 6.26.0 ### Patch Changes diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json index c6833d0c15..207668fa9c 100644 --- a/packages/react-router-native/package.json +++ b/packages/react-router-native/package.json @@ -1,6 +1,6 @@ { "name": "react-router-native", - "version": "6.26.0", + "version": "6.26.1-pre.0", "description": "Declarative routing for React Native applications", "keywords": [ "react", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 083bdb9b16..c84a749401 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,13 @@ # `react-router` +## 6.26.1-pre.0 + +### Patch Changes + +- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` because it will now be called on the first navigation to paths matching splat/param routes in case there exists a higher-scoring route match not yet discovered ([#11888](https://github.com/remix-run/react-router/pull/11888)) +- Updated dependencies: + - `@remix-run/router@1.19.1-pre.0` + ## 6.26.0 ### Minor Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index be90f5b3e5..1a5a31f2fa 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "react-router", - "version": "6.26.0", + "version": "6.26.1-pre.0", "description": "Declarative routing for React", "keywords": [ "react", diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index d250f4ab2d..b17bd83e77 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -1,5 +1,15 @@ # `@remix-run/router` +## 1.19.1-pre.0 + +### Patch Changes + +- Fog of War: Update `unstable_patchRoutesOnMiss` logic so that we call the method when we match routes with dynamic param or splat segments in case there exists a higher-scoring static route that we've not yet discovered. ([#11883](https://github.com/remix-run/react-router/pull/11883)) + + - We also now leverage an internal FIFO queue of previous paths we've already called `unstable_patchRouteOnMiss` against so that we don't re-call on subsequent navigations to the same path + +- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` because it will now be called on the first navigation to paths matching splat/param routes in case there exists a higher-scoring route match not yet discovered ([#11888](https://github.com/remix-run/react-router/pull/11888)) + ## 1.19.0 ### Minor Changes diff --git a/packages/router/package.json b/packages/router/package.json index 2369d2ade1..a54499cb4f 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/router", - "version": "1.19.0", + "version": "1.19.1-pre.0", "description": "Nested/Data-driven/Framework-agnostic Routing", "keywords": [ "remix", From 8b436b8c1f745460034032067e5e18b3b6ceaf94 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Thu, 15 Aug 2024 11:10:57 -0400 Subject: [PATCH 3/4] Exit prerelease mode --- .changeset/pre.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index acd97249ce..e0c00f6785 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -1,5 +1,5 @@ { - "mode": "pre", + "mode": "exit", "tag": "pre", "initialVersions": { "react-router": "6.26.0", From 04d09c3d57193c14275631ee5c24abe8a4409cfb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 11:23:56 -0400 Subject: [PATCH 4/4] chore: Update version for release (#11895) Co-authored-by: github-actions[bot] --- .changeset/cyan-bobcats-notice.md | 7 ------- .changeset/pre.json | 15 --------------- .changeset/silver-coats-work.md | 7 ------- packages/react-router-dom-v5-compat/CHANGELOG.md | 8 ++++---- packages/react-router-dom-v5-compat/package.json | 2 +- packages/react-router-dom/CHANGELOG.md | 8 ++++---- packages/react-router-dom/package.json | 2 +- packages/react-router-native/CHANGELOG.md | 4 ++-- packages/react-router-native/package.json | 2 +- packages/react-router/CHANGELOG.md | 6 +++--- packages/react-router/package.json | 2 +- packages/router/CHANGELOG.md | 4 ++-- packages/router/package.json | 2 +- 13 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 .changeset/cyan-bobcats-notice.md delete mode 100644 .changeset/pre.json delete mode 100644 .changeset/silver-coats-work.md diff --git a/.changeset/cyan-bobcats-notice.md b/.changeset/cyan-bobcats-notice.md deleted file mode 100644 index cb696a9fe8..0000000000 --- a/.changeset/cyan-bobcats-notice.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Fog of War: Update `unstable_patchRoutesOnMiss` logic so that we call the method when we match routes with dynamic param or splat segments in case there exists a higher-scoring static route that we've not yet discovered. - -- We also now leverage an internal FIFO queue of previous paths we've already called `unstable_patchRouteOnMiss` against so that we don't re-call on subsequent navigations to the same path diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index e0c00f6785..0000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "mode": "exit", - "tag": "pre", - "initialVersions": { - "react-router": "6.26.0", - "react-router-dom": "6.26.0", - "react-router-dom-v5-compat": "6.26.0", - "react-router-native": "6.26.0", - "@remix-run/router": "1.19.0" - }, - "changesets": [ - "cyan-bobcats-notice", - "silver-coats-work" - ] -} diff --git a/.changeset/silver-coats-work.md b/.changeset/silver-coats-work.md deleted file mode 100644 index 9eb1416062..0000000000 --- a/.changeset/silver-coats-work.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"react-router-dom": patch -"react-router": patch -"@remix-run/router": patch ---- - -Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` to match new behavior diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md index 0c1bb88ce5..8cabb0d5e1 100644 --- a/packages/react-router-dom-v5-compat/CHANGELOG.md +++ b/packages/react-router-dom-v5-compat/CHANGELOG.md @@ -1,13 +1,13 @@ # `react-router-dom-v5-compat` -## 6.26.1-pre.0 +## 6.26.1 ### Patch Changes - Updated dependencies: - - `@remix-run/router@1.19.1-pre.0` - - `react-router-dom@6.26.1-pre.0` - - `react-router@6.26.1-pre.0` + - `@remix-run/router@1.19.1` + - `react-router-dom@6.26.1` + - `react-router@6.26.1` ## 6.26.0 diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json index a623ea30a3..5a30e2489f 100644 --- a/packages/react-router-dom-v5-compat/package.json +++ b/packages/react-router-dom-v5-compat/package.json @@ -1,6 +1,6 @@ { "name": "react-router-dom-v5-compat", - "version": "6.26.1-pre.0", + "version": "6.26.1", "description": "Migration path to React Router v6 from v4/5", "keywords": [ "react", diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md index 35454adc05..fff536fecc 100644 --- a/packages/react-router-dom/CHANGELOG.md +++ b/packages/react-router-dom/CHANGELOG.md @@ -1,13 +1,13 @@ # `react-router-dom` -## 6.26.1-pre.0 +## 6.26.1 ### Patch Changes -- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` because it will now be called on the first navigation to paths matching splat/param routes in case there exists a higher-scoring route match not yet discovered ([#11888](https://github.com/remix-run/react-router/pull/11888)) +- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` to match new behavior ([#11888](https://github.com/remix-run/react-router/pull/11888)) - Updated dependencies: - - `@remix-run/router@1.19.1-pre.0` - - `react-router@6.26.1-pre.0` + - `@remix-run/router@1.19.1` + - `react-router@6.26.1` ## 6.26.0 diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json index a7f33944e8..f0dc27ce8e 100644 --- a/packages/react-router-dom/package.json +++ b/packages/react-router-dom/package.json @@ -1,6 +1,6 @@ { "name": "react-router-dom", - "version": "6.26.1-pre.0", + "version": "6.26.1", "description": "Declarative routing for React web applications", "keywords": [ "react", diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md index 7f425b0e44..8a08692665 100644 --- a/packages/react-router-native/CHANGELOG.md +++ b/packages/react-router-native/CHANGELOG.md @@ -1,11 +1,11 @@ # `react-router-native` -## 6.26.1-pre.0 +## 6.26.1 ### Patch Changes - Updated dependencies: - - `react-router@6.26.1-pre.0` + - `react-router@6.26.1` ## 6.26.0 diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json index 207668fa9c..6d693a8f79 100644 --- a/packages/react-router-native/package.json +++ b/packages/react-router-native/package.json @@ -1,6 +1,6 @@ { "name": "react-router-native", - "version": "6.26.1-pre.0", + "version": "6.26.1", "description": "Declarative routing for React Native applications", "keywords": [ "react", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index c84a749401..dbde50bfec 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,12 +1,12 @@ # `react-router` -## 6.26.1-pre.0 +## 6.26.1 ### Patch Changes -- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` because it will now be called on the first navigation to paths matching splat/param routes in case there exists a higher-scoring route match not yet discovered ([#11888](https://github.com/remix-run/react-router/pull/11888)) +- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` to match new behavior ([#11888](https://github.com/remix-run/react-router/pull/11888)) - Updated dependencies: - - `@remix-run/router@1.19.1-pre.0` + - `@remix-run/router@1.19.1` ## 6.26.0 diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 1a5a31f2fa..db7f9b2a3a 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "react-router", - "version": "6.26.1-pre.0", + "version": "6.26.1", "description": "Declarative routing for React", "keywords": [ "react", diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index b17bd83e77..b24d37ebb5 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -1,6 +1,6 @@ # `@remix-run/router` -## 1.19.1-pre.0 +## 1.19.1 ### Patch Changes @@ -8,7 +8,7 @@ - We also now leverage an internal FIFO queue of previous paths we've already called `unstable_patchRouteOnMiss` against so that we don't re-call on subsequent navigations to the same path -- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` because it will now be called on the first navigation to paths matching splat/param routes in case there exists a higher-scoring route match not yet discovered ([#11888](https://github.com/remix-run/react-router/pull/11888)) +- Rename `unstable_patchRoutesOnMiss` to `unstable_patchRoutesOnNavigation` to match new behavior ([#11888](https://github.com/remix-run/react-router/pull/11888)) ## 1.19.0 diff --git a/packages/router/package.json b/packages/router/package.json index a54499cb4f..0a978727e2 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/router", - "version": "1.19.1-pre.0", + "version": "1.19.1", "description": "Nested/Data-driven/Framework-agnostic Routing", "keywords": [ "remix",