From 6b38b05e6b236ba857cc139bf4b1ee03746e0e09 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 23 Dec 2022 15:31:59 +0000 Subject: [PATCH 1/2] chore: Update version for release --- .changeset/fifty-kiwis-sniff.md | 5 ----- .changeset/new-news-remember.md | 5 ----- .changeset/pre.json | 16 ---------------- .changeset/swift-bottles-cheat.md | 5 ----- packages/react-router-dom-v5-compat/CHANGELOG.md | 8 ++++++++ packages/react-router-dom-v5-compat/package.json | 4 ++-- packages/react-router-dom/CHANGELOG.md | 8 ++++++++ packages/react-router-dom/package.json | 6 +++--- packages/react-router-native/CHANGELOG.md | 7 +++++++ packages/react-router-native/package.json | 4 ++-- packages/react-router/CHANGELOG.md | 7 +++++++ packages/react-router/package.json | 4 ++-- packages/router/CHANGELOG.md | 8 ++++++++ packages/router/package.json | 2 +- 14 files changed, 48 insertions(+), 41 deletions(-) delete mode 100644 .changeset/fifty-kiwis-sniff.md delete mode 100644 .changeset/new-news-remember.md delete mode 100644 .changeset/pre.json delete mode 100644 .changeset/swift-bottles-cheat.md diff --git a/.changeset/fifty-kiwis-sniff.md b/.changeset/fifty-kiwis-sniff.md deleted file mode 100644 index 4f18a301c1..0000000000 --- a/.changeset/fifty-kiwis-sniff.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Include submission info in `shouldRevalidate` on action redirects diff --git a/.changeset/new-news-remember.md b/.changeset/new-news-remember.md deleted file mode 100644 index 061d229339..0000000000 --- a/.changeset/new-news-remember.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Reset `actionData` on action redirect to current location diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 2f65da26fe..0000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "mode": "exit", - "tag": "pre", - "initialVersions": { - "react-router": "6.6.0", - "react-router-dom": "6.6.0", - "react-router-dom-v5-compat": "6.6.0", - "react-router-native": "6.6.0", - "@remix-run/router": "1.2.0" - }, - "changesets": [ - "fifty-kiwis-sniff", - "new-news-remember", - "swift-bottles-cheat" - ] -} diff --git a/.changeset/swift-bottles-cheat.md b/.changeset/swift-bottles-cheat.md deleted file mode 100644 index 4b6bb491d1..0000000000 --- a/.changeset/swift-bottles-cheat.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Fix fetcher shouldRevalidate diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md index 27870aded9..c9efde3779 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.6.1 + +### Patch Changes + +- Updated dependencies: + - `react-router@6.6.1` + - `react-router-dom@6.6.1` + ## 6.6.1-pre.1 ### Patch Changes diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json index 5807f061a0..b9a7b00a1a 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.6.1-pre.1", + "version": "6.6.1", "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.6.1-pre.1" + "react-router": "6.6.1" }, "peerDependencies": { "react": ">=16.8", diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md index 2fe6a42e51..def6b7c6ec 100644 --- a/packages/react-router-dom/CHANGELOG.md +++ b/packages/react-router-dom/CHANGELOG.md @@ -1,5 +1,13 @@ # `react-router-dom` +## 6.6.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/router@1.2.1` + - `react-router@6.6.1` + ## 6.6.1-pre.1 ### Patch Changes diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json index 22a1ab1af6..bbde9d87e7 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.6.1-pre.1", + "version": "6.6.1", "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.2.1-pre.1", - "react-router": "6.6.1-pre.1" + "@remix-run/router": "1.2.1", + "react-router": "6.6.1" }, "devDependencies": { "react": "^18.2.0", diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md index 7ff58cf06b..7f6f96752c 100644 --- a/packages/react-router-native/CHANGELOG.md +++ b/packages/react-router-native/CHANGELOG.md @@ -1,5 +1,12 @@ # `react-router-native` +## 6.6.1 + +### Patch Changes + +- Updated dependencies: + - `react-router@6.6.1` + ## 6.6.1-pre.1 ### Patch Changes diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json index 16d9d3a622..bce3be5157 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.6.1-pre.1", + "version": "6.6.1", "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.6.1-pre.1" + "react-router": "6.6.1" }, "devDependencies": { "react": "^18.2.0", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index b3320e7685..c169d974ed 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,12 @@ # `react-router` +## 6.6.1 + +### Patch Changes + +- Updated dependencies: + - `@remix-run/router@1.2.1` + ## 6.6.1-pre.1 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 8c01cad1e4..8d1e0d5669 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "react-router", - "version": "6.6.1-pre.1", + "version": "6.6.1", "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.2.1-pre.1" + "@remix-run/router": "1.2.1" }, "devDependencies": { "react": "^18.2.0" diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index f3a182747e..4d63eccaa9 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -1,5 +1,13 @@ # `@remix-run/router` +## 1.2.1 + +### Patch Changes + +- Include submission info in `shouldRevalidate` on action redirects ([#9777](https://github.com/remix-run/react-router/pull/9777)) +- Reset `actionData` on action redirect to current location ([#9772](https://github.com/remix-run/react-router/pull/9772)) +- Fix fetcher shouldRevalidate ([#9782](https://github.com/remix-run/react-router/pull/9782)) + ## 1.2.1-pre.1 ### Patch Changes diff --git a/packages/router/package.json b/packages/router/package.json index 5cb139259d..bfb01fc5a4 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/router", - "version": "1.2.1-pre.1", + "version": "1.2.1", "description": "Nested/Data-driven/Framework-agnostic Routing", "keywords": [ "remix", From 32f55b7d5143ee53fee23f334ea07251d585bc95 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Fri, 23 Dec 2022 10:46:09 -0500 Subject: [PATCH 2/2] Update changelogs --- packages/react-router-dom-v5-compat/CHANGELOG.md | 16 ---------------- packages/react-router-dom/CHANGELOG.md | 16 ---------------- packages/react-router-native/CHANGELOG.md | 14 -------------- packages/react-router/CHANGELOG.md | 14 -------------- packages/router/CHANGELOG.md | 16 +--------------- 5 files changed, 1 insertion(+), 75 deletions(-) diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md index c9efde3779..59975ed736 100644 --- a/packages/react-router-dom-v5-compat/CHANGELOG.md +++ b/packages/react-router-dom-v5-compat/CHANGELOG.md @@ -8,22 +8,6 @@ - `react-router@6.6.1` - `react-router-dom@6.6.1` -## 6.6.1-pre.1 - -### Patch Changes - -- Updated dependencies: - - `react-router@6.6.1-pre.1` - - `react-router-dom@6.6.1-pre.1` - -## 6.6.1-pre.0 - -### Patch Changes - -- Updated dependencies: - - `react-router@6.6.1-pre.0` - - `react-router-dom@6.6.1-pre.0` - ## 6.6.0 ### Patch Changes diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md index def6b7c6ec..0e33dbcebc 100644 --- a/packages/react-router-dom/CHANGELOG.md +++ b/packages/react-router-dom/CHANGELOG.md @@ -8,22 +8,6 @@ - `@remix-run/router@1.2.1` - `react-router@6.6.1` -## 6.6.1-pre.1 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/router@1.2.1-pre.1` - - `react-router@6.6.1-pre.1` - -## 6.6.1-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/router@1.2.1-pre.0` - - `react-router@6.6.1-pre.0` - ## 6.6.0 ### Minor Changes diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md index 7f6f96752c..6194c061c1 100644 --- a/packages/react-router-native/CHANGELOG.md +++ b/packages/react-router-native/CHANGELOG.md @@ -7,20 +7,6 @@ - Updated dependencies: - `react-router@6.6.1` -## 6.6.1-pre.1 - -### Patch Changes - -- Updated dependencies: - - `react-router@6.6.1-pre.1` - -## 6.6.1-pre.0 - -### Patch Changes - -- Updated dependencies: - - `react-router@6.6.1-pre.0` - ## 6.6.0 ### Patch Changes diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index c169d974ed..80e11f3bfc 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -7,20 +7,6 @@ - Updated dependencies: - `@remix-run/router@1.2.1` -## 6.6.1-pre.1 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/router@1.2.1-pre.1` - -## 6.6.1-pre.0 - -### Patch Changes - -- Updated dependencies: - - `@remix-run/router@1.2.1-pre.0` - ## 6.6.0 ### Patch Changes diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index 4d63eccaa9..ce2a6d35ff 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -4,22 +4,8 @@ ### Patch Changes -- Include submission info in `shouldRevalidate` on action redirects ([#9777](https://github.com/remix-run/react-router/pull/9777)) +- Include submission info in `shouldRevalidate` on action redirects ([#9777](https://github.com/remix-run/react-router/pull/9777), [#9782](https://github.com/remix-run/react-router/pull/9782)) - Reset `actionData` on action redirect to current location ([#9772](https://github.com/remix-run/react-router/pull/9772)) -- Fix fetcher shouldRevalidate ([#9782](https://github.com/remix-run/react-router/pull/9782)) - -## 1.2.1-pre.1 - -### Patch Changes - -- Reset `actionData` on action redirect to current location ([#9772](https://github.com/remix-run/react-router/pull/9772)) -- Fix fetcher shouldRevalidate ([#9782](https://github.com/remix-run/react-router/pull/9782)) - -## 1.2.1-pre.0 - -### Patch Changes - -- Include submission info in `shouldRevalidate` on action redirects ([#9777](https://github.com/remix-run/react-router/pull/9777)) ## 1.2.0