diff --git a/.changeset/happy-balloons-buy.md b/.changeset/happy-balloons-buy.md deleted file mode 100644 index 1c612530da..0000000000 --- a/.changeset/happy-balloons-buy.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -"react-router": patch -"@remix-run/router": patch ---- - -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: - -```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" - ... -} -``` diff --git a/.changeset/kind-dodos-shop.md b/.changeset/kind-dodos-shop.md deleted file mode 100644 index 339f506e08..0000000000 --- a/.changeset/kind-dodos-shop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Persist `headers` on `loader` `request`'s after SSR document `action` request diff --git a/.changeset/new-taxis-stare.md b/.changeset/new-taxis-stare.md deleted file mode 100644 index b3085a58cd..0000000000 --- a/.changeset/new-taxis-stare.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -"react-router": minor -"@remix-run/router": minor ---- - -Allows optional routes and optional static segments - -**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 -``` diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 1bbefd9bd3..0000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "mode": "exit", - "tag": "pre", - "initialVersions": { - "react-router": "6.4.5", - "react-router-dom": "6.4.5", - "react-router-dom-v5-compat": "6.4.5", - "react-router-native": "6.4.5", - "@remix-run/router": "1.0.5" - }, - "changesets": [ - "happy-balloons-buy", - "kind-dodos-shop", - "new-taxis-stare", - "pretty-kiwis-study", - "slow-drinks-cheer", - "thin-kids-eat", - "violet-rules-rest" - ] -} diff --git a/.changeset/pretty-kiwis-study.md b/.changeset/pretty-kiwis-study.md deleted file mode 100644 index 6daffaf6ed..0000000000 --- a/.changeset/pretty-kiwis-study.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Fix requests sent to revalidating loaders so they reflect a GET request diff --git a/.changeset/slow-drinks-cheer.md b/.changeset/slow-drinks-cheer.md deleted file mode 100644 index 828e8119ac..0000000000 --- a/.changeset/slow-drinks-cheer.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Fix issue with deeply nested optional segments diff --git a/.changeset/thin-kids-eat.md b/.changeset/thin-kids-eat.md deleted file mode 100644 index e5f6cedf81..0000000000 --- a/.changeset/thin-kids-eat.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -GET forms now expose a submission on the loading navigation diff --git a/.changeset/violet-rules-rest.md b/.changeset/violet-rules-rest.md deleted file mode 100644 index d83ee36ce6..0000000000 --- a/.changeset/violet-rules-rest.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@remix-run/router": patch ---- - -Fix error boundary tracking for multiple errors bubbling to the same boundary diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md index 2add001fb4..44a87272e8 100644 --- a/packages/react-router-dom-v5-compat/CHANGELOG.md +++ b/packages/react-router-dom-v5-compat/CHANGELOG.md @@ -1,20 +1,12 @@ # `react-router-dom-v5-compat` -## 6.5.0-pre.1 +## 6.5.0 ### Patch Changes - Updated dependencies: - - `react-router@6.5.0-pre.1` - - `react-router-dom@6.5.0-pre.1` - -## 6.5.0-pre.0 - -### Patch Changes - -- Updated dependencies: - - `react-router@6.5.0-pre.0` - - `react-router-dom@6.5.0-pre.0` + - `react-router@6.5.0` + - `react-router-dom@6.5.0` ## 6.4.5 diff --git a/packages/react-router-dom-v5-compat/package.json b/packages/react-router-dom-v5-compat/package.json index e16a8da51e..537c71a690 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.5.0-pre.1", + "version": "6.5.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.5.0-pre.1" + "react-router": "6.5.0" }, "peerDependencies": { "react": ">=16.8", diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md index 8a153573dc..06a7a2048c 100644 --- a/packages/react-router-dom/CHANGELOG.md +++ b/packages/react-router-dom/CHANGELOG.md @@ -1,20 +1,12 @@ # `react-router-dom` -## 6.5.0-pre.1 +## 6.5.0 ### Patch Changes - Updated dependencies: - - `@remix-run/router@1.1.0-pre.1` - - `react-router@6.5.0-pre.1` - -## 6.5.0-pre.0 - -### Patch Changes - -- Updated dependencies: - - `react-router@6.5.0-pre.0` - - `@remix-run/router@1.1.0-pre.0` + - `react-router@6.5.0` + - `@remix-run/router@1.1.0` ## 6.4.5 diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json index f7549b3fa4..fa45c8fe26 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.5.0-pre.1", + "version": "6.5.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.1.0-pre.1", - "react-router": "6.5.0-pre.1" + "@remix-run/router": "1.1.0", + "react-router": "6.5.0" }, "devDependencies": { "react": "^18.2.0", diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md index 54c91595fa..eebcbfce2a 100644 --- a/packages/react-router-native/CHANGELOG.md +++ b/packages/react-router-native/CHANGELOG.md @@ -1,18 +1,11 @@ # `react-router-native` -## 6.5.0-pre.1 +## 6.5.0 ### Patch Changes - Updated dependencies: - - `react-router@6.5.0-pre.1` - -## 6.5.0-pre.0 - -### Patch Changes - -- Updated dependencies: - - `react-router@6.5.0-pre.0` + - `react-router@6.5.0` ## 6.4.5 diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json index ff87295b41..65026834cf 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.5.0-pre.1", + "version": "6.5.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.5.0-pre.1" + "react-router": "6.5.0" }, "devDependencies": { "react": "^18.2.0", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index a3fde0cd32..e75245c875 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,31 +1,32 @@ # `react-router` -## 6.5.0-pre.1 +## 6.5.0 -### Patch Changes +This release introduces support for [Optional Route Segments](https://github.com/remix-run/react-router/issues/9546). Now, adding a `?` to the end of any path segment will make that entire segment optional. This works for both static segments and dynamic parameters. -- Updated dependencies: - - `@remix-run/router@1.1.0-pre.1` +**Optional Params Examples** + +- `` will match: + - `/multistep` + - `/multistep/:widget1` + - `/multistep/:widget1/:widget2` + - `/multistep/:widget1/:widget2/:widget3` + +**Optional Static Segment Example** -## 6.5.0-pre.0 +- `` will match: + - `/` + - `/home` +- `` will match: + - `/about` + - `/fr/about` ### Minor Changes -- 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` +- Allows optional routes and optional static segments ([#9650](https://github.com/remix-run/react-router/pull/9650)) ### Patch Changes @@ -52,7 +53,7 @@ function Comp() { ``` - Updated dependencies: - - `@remix-run/router@1.1.0-pre.0` + - `@remix-run/router@1.1.0` ## 6.4.5 diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 5aa554d238..4261eb0243 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "react-router", - "version": "6.5.0-pre.1", + "version": "6.5.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.1.0-pre.1" + "@remix-run/router": "1.1.0" }, "devDependencies": { "react": "^18.2.0" diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index 2fe696321c..8697435ea8 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -1,30 +1,32 @@ # `@remix-run/router` -## 1.1.0-pre.1 +## 1.1.0 -### Patch Changes +This release introduces support for [Optional Route Segments](https://github.com/remix-run/react-router/issues/9546). Now, adding a `?` to the end of any path segment will make that entire segment optional. This works for both static segments and dynamic parameters. -- Fix issue with deeply nested optional segments ([#9727](https://github.com/remix-run/react-router/pull/9727)) +**Optional Params Examples** + +- Path `lang?/about` will match: + - `/:lang/about` + - `/about` +- Path `/multistep/:widget1?/widget2?/widget3?` will match: + - `/multistep` + - `/multistep/:widget1` + - `/multistep/:widget1/:widget2` + - `/multistep/:widget1/:widget2/:widget3` + +**Optional Static Segment Example** -## 1.1.0-pre.0 +- Path `/home?` will match: + - `/` + - `/home` +- Path `/fr?/about` will match: + - `/about` + - `/fr/about` ### Minor Changes -- 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` +- Allows optional routes and optional static segments ([#9650](https://github.com/remix-run/react-router/pull/9650)) ### Patch Changes @@ -50,9 +52,10 @@ function Comp() { } ``` -- Fix requests sent to revalidating loaders so they reflect a GET request ([#9660](https://github.com/remix-run/react-router/pull/9660)) - 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 requests sent to revalidating loaders so they reflect a GET request ([#9660](https://github.com/remix-run/react-router/pull/9660)) +- Fix issue with deeply nested optional segments ([#9727](https://github.com/remix-run/react-router/pull/9727)) +- 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 diff --git a/packages/router/package.json b/packages/router/package.json index 615202dc2b..74431b6262 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "@remix-run/router", - "version": "1.1.0-pre.1", + "version": "1.1.0", "description": "Nested/Data-driven/Framework-agnostic Routing", "keywords": [ "remix",