From 7fa39b1f669f304ec1d6f4ce34090511191de79a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 17 May 2023 15:15:42 +0000 Subject: [PATCH 1/3] chore: Update version for release --- .changeset/fix-basename-duplication.md | 5 ----- .changeset/hmr-error-boundary.md | 5 ----- .changeset/initialize-with-hash.md | 5 ----- .changeset/pre.json | 17 ----------------- .changeset/set-search-params-type.md | 6 ------ .../react-router-dom-v5-compat/CHANGELOG.md | 8 ++++++++ .../react-router-dom-v5-compat/package.json | 4 ++-- packages/react-router-dom/CHANGELOG.md | 9 +++++++++ packages/react-router-dom/package.json | 6 +++--- packages/react-router-native/CHANGELOG.md | 8 ++++++++ packages/react-router-native/package.json | 4 ++-- packages/react-router/CHANGELOG.md | 8 ++++++++ packages/react-router/package.json | 4 ++-- packages/router/CHANGELOG.md | 7 +++++++ packages/router/package.json | 2 +- 15 files changed, 50 insertions(+), 48 deletions(-) delete mode 100644 .changeset/fix-basename-duplication.md delete mode 100644 .changeset/hmr-error-boundary.md delete mode 100644 .changeset/initialize-with-hash.md delete mode 100644 .changeset/pre.json delete mode 100644 .changeset/set-search-params-type.md diff --git a/.changeset/fix-basename-duplication.md b/.changeset/fix-basename-duplication.md deleted file mode 100644 index 13c1963ed1..0000000000 --- a/.changeset/fix-basename-duplication.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"react-router": patch ---- - -Fix `basename` duplication in descenant `` inside a `` diff --git a/.changeset/hmr-error-boundary.md b/.changeset/hmr-error-boundary.md deleted file mode 100644 index b5d111361b..0000000000 --- a/.changeset/hmr-error-boundary.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Fix HMR-driven error boundaries by properly reconstructing new routes and `manifest` in `\_internalSetRoutes` diff --git a/.changeset/initialize-with-hash.md b/.changeset/initialize-with-hash.md deleted file mode 100644 index 6ab0915ee9..0000000000 --- a/.changeset/initialize-with-hash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Fix bug where initial data load would not kick off when hash is present diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 1f614cae48..0000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "mode": "exit", - "tag": "pre", - "initialVersions": { - "react-router": "6.11.1", - "react-router-dom": "6.11.1", - "react-router-dom-v5-compat": "6.11.1", - "react-router-native": "6.11.1", - "@remix-run/router": "1.6.1" - }, - "changesets": [ - "fix-basename-duplication", - "hmr-error-boundary", - "initialize-with-hash", - "set-search-params-type" - ] -} diff --git a/.changeset/set-search-params-type.md b/.changeset/set-search-params-type.md deleted file mode 100644 index 0b808c64c5..0000000000 --- a/.changeset/set-search-params-type.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"react-router-dom": patch -"react-router-native": patch ---- - -Export `SetURLSearchParams` type diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md index d77e81654b..de1f6c0cdd 100644 --- a/packages/react-router-dom-v5-compat/CHANGELOG.md +++ b/packages/react-router-dom-v5-compat/CHANGELOG.md @@ -1,5 +1,13 @@ # `react-router-dom-v5-compat` +## 6.11.2 + +### Patch Changes + +- Updated dependencies: + - `react-router@6.11.2` + - `react-router-dom@6.11.2` + ## 6.11.2-pre.0 ### Patch Changes diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json index d7ca0b28a9..3d0f4012f9 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.11.2-pre.0", + "version": "6.11.2", "description": "Migration path to React Router v6 from v4/5", "keywords": [ "react", @@ -24,7 +24,7 @@ "types": "./dist/index.d.ts", "dependencies": { "history": "^5.3.0", - "react-router": "6.11.2-pre.0" + "react-router": "6.11.2" }, "peerDependencies": { "react": ">=16.8", diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md index 182e9ada0b..8ad4058ec2 100644 --- a/packages/react-router-dom/CHANGELOG.md +++ b/packages/react-router-dom/CHANGELOG.md @@ -1,5 +1,14 @@ # `react-router-dom` +## 6.11.2 + +### Patch Changes + +- Export `SetURLSearchParams` type ([#10444](https://github.com/remix-run/react-router/pull/10444)) +- Updated dependencies: + - `react-router@6.11.2` + - `@remix-run/router@1.6.2` + ## 6.11.2-pre.0 ### Patch Changes diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json index 4939aa6adc..8835047042 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.11.2-pre.0", + "version": "6.11.2", "description": "Declarative routing for React web applications", "keywords": [ "react", @@ -23,8 +23,8 @@ "module": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@remix-run/router": "1.6.2-pre.0", - "react-router": "6.11.2-pre.0" + "@remix-run/router": "1.6.2", + "react-router": "6.11.2" }, "devDependencies": { "react": "^18.2.0", diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md index debb8cbd5c..41395340c3 100644 --- a/packages/react-router-native/CHANGELOG.md +++ b/packages/react-router-native/CHANGELOG.md @@ -1,5 +1,13 @@ # `react-router-native` +## 6.11.2 + +### Patch Changes + +- Export `SetURLSearchParams` type ([#10444](https://github.com/remix-run/react-router/pull/10444)) +- Updated dependencies: + - `react-router@6.11.2` + ## 6.11.2-pre.0 ### Patch Changes diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json index f2c4d3e950..7e9dfa1853 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.11.2-pre.0", + "version": "6.11.2", "description": "Declarative routing for React Native applications", "keywords": [ "react", @@ -22,7 +22,7 @@ "types": "./dist/index.d.ts", "dependencies": { "@ungap/url-search-params": "^0.1.4", - "react-router": "6.11.2-pre.0" + "react-router": "6.11.2" }, "devDependencies": { "react": "^18.2.0", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 6aa821b5e2..ab3e6fc424 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,13 @@ # `react-router` +## 6.11.2 + +### Patch Changes + +- Fix `basename` duplication in descenant `` inside a `` ([#10492](https://github.com/remix-run/react-router/pull/10492)) +- Updated dependencies: + - `@remix-run/router@1.6.2` + ## 6.11.2-pre.0 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 6585451d8d..d8205fbff5 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "react-router", - "version": "6.11.2-pre.0", + "version": "6.11.2", "description": "Declarative routing for React", "keywords": [ "react", @@ -23,7 +23,7 @@ "module": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@remix-run/router": "1.6.2-pre.0" + "@remix-run/router": "1.6.2" }, "devDependencies": { "react": "^18.2.0" diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index 2252b4b7b7..ddd13a87db 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -1,5 +1,12 @@ # `@remix-run/router` +## 1.6.2 + +### Patch Changes + +- Fix HMR-driven error boundaries by properly reconstructing new routes and `manifest` in `\_internalSetRoutes` ([#10437](https://github.com/remix-run/react-router/pull/10437)) +- Fix bug where initial data load would not kick off when hash is present ([#10493](https://github.com/remix-run/react-router/pull/10493)) + ## 1.6.2-pre.0 ### Patch Changes diff --git a/packages/router/package.json b/packages/router/package.json index c68cacc1f9..fb5ed5a0bf 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/router", - "version": "1.6.2-pre.0", + "version": "1.6.2", "description": "Nested/Data-driven/Framework-agnostic Routing", "keywords": [ "remix", From 26bfa7a6e62b7d3a0a8c00e1c3ebc400d37cc666 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 17 May 2023 11:19:12 -0400 Subject: [PATCH 2/3] Update changelogs --- packages/react-router-dom-v5-compat/CHANGELOG.md | 8 -------- packages/react-router-dom/CHANGELOG.md | 9 --------- packages/react-router-native/CHANGELOG.md | 8 -------- packages/react-router/CHANGELOG.md | 8 -------- packages/router/CHANGELOG.md | 7 ------- 5 files changed, 40 deletions(-) diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md index de1f6c0cdd..560e8f9c23 100644 --- a/packages/react-router-dom-v5-compat/CHANGELOG.md +++ b/packages/react-router-dom-v5-compat/CHANGELOG.md @@ -8,14 +8,6 @@ - `react-router@6.11.2` - `react-router-dom@6.11.2` -## 6.11.2-pre.0 - -### Patch Changes - -- Updated dependencies: - - `react-router@6.11.2-pre.0` - - `react-router-dom@6.11.2-pre.0` - ## 6.11.1 ### Patch Changes diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md index 8ad4058ec2..169c24d230 100644 --- a/packages/react-router-dom/CHANGELOG.md +++ b/packages/react-router-dom/CHANGELOG.md @@ -9,15 +9,6 @@ - `react-router@6.11.2` - `@remix-run/router@1.6.2` -## 6.11.2-pre.0 - -### Patch Changes - -- Export `SetURLSearchParams` type ([#10444](https://github.com/remix-run/react-router/pull/10444)) -- Updated dependencies: - - `react-router@6.11.2-pre.0` - - `@remix-run/router@1.6.2-pre.0` - ## 6.11.1 ### Patch Changes diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md index 41395340c3..fb8506ba4e 100644 --- a/packages/react-router-native/CHANGELOG.md +++ b/packages/react-router-native/CHANGELOG.md @@ -8,14 +8,6 @@ - Updated dependencies: - `react-router@6.11.2` -## 6.11.2-pre.0 - -### Patch Changes - -- Export `SetURLSearchParams` type ([#10444](https://github.com/remix-run/react-router/pull/10444)) -- Updated dependencies: - - `react-router@6.11.2-pre.0` - ## 6.11.1 ### Patch Changes diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index ab3e6fc424..3303c6a792 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -8,14 +8,6 @@ - Updated dependencies: - `@remix-run/router@1.6.2` -## 6.11.2-pre.0 - -### Patch Changes - -- Fix `basename` duplication in descenant `` inside a `` ([#10492](https://github.com/remix-run/react-router/pull/10492)) -- Updated dependencies: - - `@remix-run/router@1.6.2-pre.0` - ## 6.11.1 ### Patch Changes diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index ddd13a87db..0385eac66c 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -7,13 +7,6 @@ - Fix HMR-driven error boundaries by properly reconstructing new routes and `manifest` in `\_internalSetRoutes` ([#10437](https://github.com/remix-run/react-router/pull/10437)) - Fix bug where initial data load would not kick off when hash is present ([#10493](https://github.com/remix-run/react-router/pull/10493)) -## 1.6.2-pre.0 - -### Patch Changes - -- Fix HMR-driven error boundaries by properly reconstructing new routes and `manifest` in `\_internalSetRoutes` ([#10437](https://github.com/remix-run/react-router/pull/10437)) -- Fix bug where initial data load would not kick off when hash is present ([#10493](https://github.com/remix-run/react-router/pull/10493)) - ## 1.6.1 ### Patch Changes From 823a51e834ebd5eaffe259a19694203b58179f14 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 17 May 2023 11:21:38 -0400 Subject: [PATCH 3/3] Fix typo --- packages/react-router/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 3303c6a792..ff46eeb2bc 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -4,7 +4,7 @@ ### Patch Changes -- Fix `basename` duplication in descenant `` inside a `` ([#10492](https://github.com/remix-run/react-router/pull/10492)) +- Fix `basename` duplication in descendant `` inside a `` ([#10492](https://github.com/remix-run/react-router/pull/10492)) - Updated dependencies: - `@remix-run/router@1.6.2`