From 050cf16e599106767c10253b6be1b540400d6950 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 13 Dec 2022 15:40:37 +0000 Subject: [PATCH 1/2] chore: Update version for release (pre) --- .changeset/pre.json | 9 ++- .../react-router-dom-v5-compat/CHANGELOG.md | 8 +++ .../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 | 61 ++++++++++++++++++ packages/react-router/package.json | 4 +- packages/router/CHANGELOG.md | 63 +++++++++++++++++++ packages/router/package.json | 2 +- 11 files changed, 165 insertions(+), 11 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index e2ea29bddf..24c79f4c7a 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -8,5 +8,12 @@ "react-router-native": "6.4.5", "@remix-run/router": "1.0.5" }, - "changesets": [] + "changesets": [ + "happy-balloons-buy", + "kind-dodos-shop", + "new-taxis-stare", + "pretty-kiwis-study", + "thin-kids-eat", + "violet-rules-rest" + ] } diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md index 46a230d119..4a3eb7e4bb 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.5.0-pre.0 + +### Patch Changes + +- Updated dependencies: + - `react-router@6.5.0-pre.0` + - `react-router-dom@6.5.0-pre.0` + ## 6.4.5 ### Patch Changes diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json index b1f3a034f9..436b452257 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.4.5", + "version": "6.5.0-pre.0", "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.4.5" + "react-router": "6.5.0-pre.0" }, "peerDependencies": { "react": ">=16.8", diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md index 11701d11d2..74140c87f4 100644 --- a/packages/react-router-dom/CHANGELOG.md +++ b/packages/react-router-dom/CHANGELOG.md @@ -1,5 +1,13 @@ # `react-router-dom` +## 6.5.0-pre.0 + +### Patch Changes + +- Updated dependencies: + - `react-router@6.5.0-pre.0` + - `@remix-run/router@1.1.0-pre.0` + ## 6.4.5 ### Patch Changes diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json index fb8b2e908e..2df1528b2f 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.4.5", + "version": "6.5.0-pre.0", "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.0.5", - "react-router": "6.4.5" + "@remix-run/router": "1.1.0-pre.0", + "react-router": "6.5.0-pre.0" }, "devDependencies": { "react": "^18.2.0", diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md index da971c2b00..31798595ef 100644 --- a/packages/react-router-native/CHANGELOG.md +++ b/packages/react-router-native/CHANGELOG.md @@ -1,5 +1,12 @@ # `react-router-native` +## 6.5.0-pre.0 + +### Patch Changes + +- Updated dependencies: + - `react-router@6.5.0-pre.0` + ## 6.4.5 ### Patch Changes diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json index 64c9ff5c89..30c7921686 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.4.5", + "version": "6.5.0-pre.0", "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.4.5" + "react-router": "6.5.0-pre.0" }, "devDependencies": { "react": "^18.2.0", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 758289dd11..b3d8eacd11 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,66 @@ # `react-router` +## 6.5.0-pre.0 + +### Minor Changes + +- Allows optional routes and optional static segments ([#9650](https://github.com/remix-run/react-router/pull/9650)) + + **Optional params examples** + + `:lang?/about` will get expanded matched with + + ``` + /:lang/about + /about + ``` + + `/multistep/:widget1?/widget2?/widget3?` + Will get expanded matched with: + + ``` + /multistep + /multistep/:widget1 + /multistep/:widget1/:widget2 + /multistep/:widget1/:widget2/:widget3 + ``` + + **optional static segment example** + + `/fr?/about` will get expanded and matched with: + + ``` + /about + /fr/about + ``` + +### Patch Changes + +- Stop incorrectly matching on partial named parameters, i.e. ``, to align with how splat parameters work. If you were previously relying on this behavior then it's recommended to extract the static portion of the path at the `useParams` call site: ([#9506](https://github.com/remix-run/react-router/pull/9506)) + + ```jsx + // Old behavior at URL /prefix-123 + }> + + function Comp() { + let params = useParams(); // { id: '123' } + let id = params.id; // "123" + ... + } + + // New behavior at URL /prefix-123 + }> + + function Comp() { + let params = useParams(); // { id: 'prefix-123' } + let id = params.id.replace(/^prefix-/, ''); // "123" + ... + } + ``` + +- Updated dependencies: + - `@remix-run/router@1.1.0-pre.0` + ## 6.4.5 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index e3047888f5..901d1ed1fd 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "react-router", - "version": "6.4.5", + "version": "6.5.0-pre.0", "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.0.5" + "@remix-run/router": "1.1.0-pre.0" }, "devDependencies": { "react": "^18.2.0" diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index 941d1bb0a8..1e32f7a055 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -1,5 +1,68 @@ # `@remix-run/router` +## 1.1.0-pre.0 + +### Minor Changes + +- Allows optional routes and optional static segments ([#9650](https://github.com/remix-run/react-router/pull/9650)) + + **Optional params examples** + + `:lang?/about` will get expanded matched with + + ``` + /:lang/about + /about + ``` + + `/multistep/:widget1?/widget2?/widget3?` + Will get expanded matched with: + + ``` + /multistep + /multistep/:widget1 + /multistep/:widget1/:widget2 + /multistep/:widget1/:widget2/:widget3 + ``` + + **optional static segment example** + + `/fr?/about` will get expanded and matched with: + + ``` + /about + /fr/about + ``` + +### Patch Changes + +- Stop incorrectly matching on partial named parameters, i.e. ``, to align with how splat parameters work. If you were previously relying on this behavior then it's recommended to extract the static portion of the path at the `useParams` call site: ([#9506](https://github.com/remix-run/react-router/pull/9506)) + + ```jsx + // Old behavior at URL /prefix-123 + }> + + function Comp() { + let params = useParams(); // { id: '123' } + let id = params.id; // "123" + ... + } + + // New behavior at URL /prefix-123 + }> + + function Comp() { + let params = useParams(); // { id: 'prefix-123' } + let id = params.id.replace(/^prefix-/, ''); // "123" + ... + } + ``` + +- Persist `headers` on `loader` `request`'s after SSR document `action` request ([#9721](https://github.com/remix-run/react-router/pull/9721)) +- Fix requests sent to revalidating loaders so they reflect a GET request ([#9660](https://github.com/remix-run/react-router/pull/9660)) +- GET forms now expose a submission on the loading navigation ([#9695](https://github.com/remix-run/react-router/pull/9695)) +- Fix error boundary tracking for multiple errors bubbling to the same boundary ([#9702](https://github.com/remix-run/react-router/pull/9702)) + ## 1.0.5 ### Patch Changes diff --git a/packages/router/package.json b/packages/router/package.json index 568161bcd6..1f43fa946b 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/router", - "version": "1.0.5", + "version": "1.1.0-pre.0", "description": "Nested/Data-driven/Framework-agnostic Routing", "keywords": [ "remix", From 135c3f746a8d919537c4c4d2d25adc9ac74ffb6d Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 13 Dec 2022 10:55:53 -0500 Subject: [PATCH 2/2] updates --- packages/react-router/CHANGELOG.md | 82 +++++++++++++----------------- packages/router/CHANGELOG.md | 80 ++++++++++++----------------- 2 files changed, 67 insertions(+), 95 deletions(-) diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index b3d8eacd11..bf9c8ebb2a 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -4,59 +4,45 @@ ### Minor Changes -- Allows optional routes and optional static segments ([#9650](https://github.com/remix-run/react-router/pull/9650)) - - **Optional params examples** - - `:lang?/about` will get expanded matched with - - ``` - /:lang/about - /about - ``` - - `/multistep/:widget1?/widget2?/widget3?` - Will get expanded matched with: - - ``` - /multistep - /multistep/:widget1 - /multistep/:widget1/:widget2 - /multistep/:widget1/:widget2/:widget3 - ``` - - **optional static segment example** - - `/fr?/about` will get expanded and matched with: - - ``` - /about - /fr/about - ``` +- Support for optional path segments ([#9650](https://github.com/remix-run/react-router/pull/9650)) + - You can now denote optional path segments with a `?` as the last character in a path segment + - Optional params examples + - `:lang?/about` will get expanded and match: + - `/:lang/about` + - `/about` + - `/multistep/:widget1?/widget2?/widget3?` will get expanded and match: + - `/multistep/:widget1/:widget2/:widget3` + - `/multistep/:widget1/:widget2` + - `/multistep/:widget1` + - `/multistep` + - Optional static segment example + - `/fr?/about` will get expanded and match: + - `/fr/about` + - `/about` ### Patch Changes - Stop incorrectly matching on partial named parameters, i.e. ``, to align with how splat parameters work. If you were previously relying on this behavior then it's recommended to extract the static portion of the path at the `useParams` call site: ([#9506](https://github.com/remix-run/react-router/pull/9506)) - ```jsx - // Old behavior at URL /prefix-123 - }> - - function Comp() { - let params = useParams(); // { id: '123' } - let id = params.id; // "123" - ... - } - - // New behavior at URL /prefix-123 - }> - - function Comp() { - let params = useParams(); // { id: 'prefix-123' } - let id = params.id.replace(/^prefix-/, ''); // "123" - ... - } - ``` +```jsx +// Old behavior at URL /prefix-123 + }> + +function Comp() { + let params = useParams(); // { id: '123' } + let id = params.id; // "123" + ... +} + +// New behavior at URL /prefix-123 + }> + +function Comp() { + let params = useParams(); // { id: 'prefix-123' } + let id = params.id.replace(/^prefix-/, ''); // "123" + ... +} +``` - Updated dependencies: - `@remix-run/router@1.1.0-pre.0` diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index 1e32f7a055..0fc718304e 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -4,63 +4,49 @@ ### Minor Changes -- Allows optional routes and optional static segments ([#9650](https://github.com/remix-run/react-router/pull/9650)) - - **Optional params examples** - - `:lang?/about` will get expanded matched with - - ``` - /:lang/about - /about - ``` - - `/multistep/:widget1?/widget2?/widget3?` - Will get expanded matched with: - - ``` - /multistep - /multistep/:widget1 - /multistep/:widget1/:widget2 - /multistep/:widget1/:widget2/:widget3 - ``` - - **optional static segment example** - - `/fr?/about` will get expanded and matched with: - - ``` - /about - /fr/about - ``` +- Support for optional path segments ([#9650](https://github.com/remix-run/react-router/pull/9650)) + - You can now denote optional path segments with a `?` as the last character in a path segment + - Optional params examples + - `:lang?/about` will get expanded and match: + - `/:lang/about` + - `/about` + - `/multistep/:widget1?/widget2?/widget3?` will get expanded and match: + - `/multistep/:widget1/:widget2/:widget3` + - `/multistep/:widget1/:widget2` + - `/multistep/:widget1` + - `/multistep` + - Optional static segment example + - `/fr?/about` will get expanded and match: + - `/fr/about` + - `/about` ### Patch Changes - Stop incorrectly matching on partial named parameters, i.e. ``, to align with how splat parameters work. If you were previously relying on this behavior then it's recommended to extract the static portion of the path at the `useParams` call site: ([#9506](https://github.com/remix-run/react-router/pull/9506)) - ```jsx - // Old behavior at URL /prefix-123 - }> +```jsx +// Old behavior at URL /prefix-123 + }> - function Comp() { - let params = useParams(); // { id: '123' } - let id = params.id; // "123" - ... - } +function Comp() { + let params = useParams(); // { id: '123' } + let id = params.id; // "123" + ... +} - // New behavior at URL /prefix-123 - }> +// New behavior at URL /prefix-123 + }> - function Comp() { - let params = useParams(); // { id: 'prefix-123' } - let id = params.id.replace(/^prefix-/, ''); // "123" - ... - } - ``` +function Comp() { + let params = useParams(); // { id: 'prefix-123' } + let id = params.id.replace(/^prefix-/, ''); // "123" + ... +} +``` -- Persist `headers` on `loader` `request`'s after SSR document `action` request ([#9721](https://github.com/remix-run/react-router/pull/9721)) - Fix requests sent to revalidating loaders so they reflect a GET request ([#9660](https://github.com/remix-run/react-router/pull/9660)) -- GET forms now expose a submission on the loading navigation ([#9695](https://github.com/remix-run/react-router/pull/9695)) +- Persist `headers` on `loader` `request`'s after SSR document `action` request ([#9721](https://github.com/remix-run/react-router/pull/9721)) +- `GET` forms now expose a submission on the loading navigation ([#9695](https://github.com/remix-run/react-router/pull/9695)) - Fix error boundary tracking for multiple errors bubbling to the same boundary ([#9702](https://github.com/remix-run/react-router/pull/9702)) ## 1.0.5