.github/workflows/deduplicate-yarn.yml

@@ -0,0 +1,43 @@
+name: ⚙️ Deduplicate yarn.lock
+
+on:
+  push:
+    branches:
+      - dev
+    paths:
+      - ./yarn.lock
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  format:
+    if: github.repository == 'remix-run/react-router'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: ".nvmrc"
+          cache: "yarn"
+
+      - name: ⚙️ Dedupe yarn.lock
+        run: npx yarn-deduplicate && rm -rf ./node_modules && yarn
+
+      - name: 💪 Commit
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add .
+          if [ -z "$(git status --porcelain)" ]; then
+            echo "💿 no deduplication needed"
+            exit 0
+          fi
+          git commit -m "chore: deduplicate `yarn.lock`"
+          git push
+          echo "💿 https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"

.github/workflows/test.yml

@@ -21,7 +21,14 @@ concurrency:
 
 jobs:
   test:
-    name: 🧪 Test
+    name: "🧪 Test: (Node: ${{ matrix.node }})"
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - 16
+          - 18
+
     runs-on: ubuntu-latest
 
     steps:
@@ -33,7 +40,7 @@ jobs:
         with:
           cache: yarn
           check-latest: true
-          node-version-file: ".nvmrc"
+          node-version: ${{ matrix.node }}
 
       - name: Disable GitHub Actions Annotations
         run: |

DEVELOPMENT.md

@@ -4,7 +4,7 @@
 
 New releases should be created from release branches originating from the `dev` branch. When you are ready to begin the release process:
 
-- Make sure you've pulled all of the changes from GitHub for both `dev` and `main` branches.
+- Make sure you've pulled all the changes from GitHub for both `dev` and `main` branches.
 - Check out the `dev` branch.
 - Create a new release branch with the `release-` prefix (eg, `git checkout -b release-next`).
   - **IMPORTANT:** The `release-` prefix is important, as this is what triggers our GitHub CI workflow that will ultimately publish the release.
@@ -17,7 +17,7 @@ Changesets will do most of the heavy lifting for our releases. When changes are
 
 - Ensure you are on the new `release-*` branch.
 - Enter Changesets pre-release mode using the `pre` tag: `yarn changeset pre enter pre`.
-- Commit the change and push the the `release-*` branch to GitHub.
+- Commit the change and push the `release-*` branch to GitHub.
 - Wait for the release workflow to finish. The Changesets action in the workflow will open a PR that will increment all versions and generate the changelogs.
 - Review the updated `CHANGELOG` files and make any adjustments necessary, then merge the PR into the `release-*` branch.
   - `find packages -name 'CHANGELOG.md' -mindepth 2 -maxdepth 2 -exec code {} \;`
@@ -30,27 +30,31 @@ You may need to make changes to a pre-release prior to publishing a final stable
 - Make whatever changes you need.
 - Create a new changeset: `yarn changeset`.
   - **IMPORTANT:** This is required even if you ultimately don't want to include these changes in the logs. Remember, changelogs can be edited prior to publishing, but the Changeset version script needs to see new changesets in order to create a new version.
-- Commit the changesets and push the the `release-*` branch to GitHub.
+- Commit the changesets and push the `release-*` branch to GitHub.
 - Wait for the release workflow to finish and the Changesets action to open its PR that will increment all versions.
 - Review the PR, make any adjustments necessary, and merge it into the `release-*` branch.
 - Once the PR is merged, the release workflow will publish the updated packages to npm.
 
 ### Publishing the stable release
 
 - Exit Changesets pre-release mode: `yarn changeset pre exit`.
-- Commit the edited pre-release file along with any unpublished changesets, and push the the `release-*` branch to GitHub.
+- Commit the edited pre-release file along with any unpublished changesets, and push the `release-*` branch to GitHub.
 - Wait for the release workflow to finish. The Changesets action in the workflow will open a PR that will increment all versions and generate the changelogs for the stable release.
 - Review the updated `CHANGELOG` files and make any adjustments necessary.
+  - `find packages -name 'CHANGELOG.md' -mindepth 2 -maxdepth 2 -exec code {} \;`
   - We should remove the changelogs for all pre-releases ahead of publishing the stable version.
   - [TODO: We should automate this]
-- Prepare the github release notes
+- Prepare the GitHub release notes
   - Copy the relevant changelog entries from all packages into the Release Notes and adjust accordingly, matching the format used by prior releases
 - Merge the PR into the `release-*` branch.
 - Once the PR is merged, the release workflow will publish the updated packages to npm.
 - Once the release is published:
-  - merge the `release-*` branch into `main` and push it up to GitHub
-  - merge the `release-*` branch into `dev` and push it up to GitHub
-  - Convert the `react-router@6.x.y` tag to a Release on Github with the name `v6.x.y`
+  - Pull the latest `release-*` branch containing the PR you just merged
+  - Merge the `release-*` branch into `main` **using a non-fast-forward merge** and push it up to GitHub
+    - `git checkout main; git merge --no-ff release-next`
+  - Merge the `release-*` branch into `dev` **using a non-fast-forward merge** and push it up to GitHub
+    - `git checkout dev; git merge --no-ff release-next`
+  - Convert the `react-router@6.x.y` tag to a Release on GitHub with the name `v6.x.y`
 
 ### Hotfix releases
 

contributors.yml

@@ -1,9 +1,11 @@
 - 0xEddie
 - abdallah-nour
+- abeadam
 - abhi-kr-2100
 - AchThomas
 - adamdotjs
 - adil62
+- adrienharnay
 - afzalsayed96
 - Ajayff4
 - akamfoad
@@ -16,6 +18,8 @@
 - andreiduca
 - antonmontrezor
 - appden
+- arjunyel
+- arka1002
 - arnassavickas
 - aroyan
 - avipatel97
@@ -46,6 +50,7 @@
 - cvbuelow
 - damianstasik
 - danielberndt
+- daniilguit
 - dauletbaev
 - david-crespo
 - decadentsavant
@@ -74,6 +79,7 @@
 - GuptaSiddhant
 - haivuw
 - hernanif1
+- holynewbie
 - hongji00
 - hsbtr
 - hyesungoh
@@ -83,6 +89,7 @@
 - infoxicator
 - IsaiStormBlesed
 - Isammoc
+- istarkov
 - ivanjeremic
 - ivanjonas
 - Ivanrenes
@@ -105,6 +112,7 @@
 - jonkoops
 - jrakotoharisoa
 - kachun333
+- juanpprieto
 - kantuni
 - kark
 - KAROTT7
@@ -116,6 +124,7 @@
 - koojaa
 - KostiantynPopovych
 - KutnerUri
+- kylegirard
 - landisdesign
 - latin-1
 - lequangdongg
@@ -124,6 +133,7 @@
 - lopezac
 - lordofthecactus
 - LordThi
+- louis-young
 - loun4
 - lounsbrough
 - lpaube
@@ -139,6 +149,7 @@
 - markivancho
 - maruffahmed
 - marvinruder
+- mathpaquette
 - matt-harro
 - maxpou
 - mcansh
@@ -155,6 +166,7 @@
 - ms10596
 - ned-park
 - nilubisan
+- Nismit
 - nnhjs
 - noisypigeon
 - Obi-Dann
@@ -168,13 +180,16 @@
 - petersendidit
 - promet99
 - pyitphyoaung
+- refusado
 - rimian
+- robbtraister
 - RobHannay
 - rtmann
 - rubeonline
 - ryanflorence
 - ryanhiebert
 - sanketshah19
+- sbolel
 - scarf005
 - senseibarni
 - sergiodxa
@@ -184,10 +199,12 @@
 - shivamsinghchahar
 - SimenB
 - SkayuX
+- smithki
 - souzasmatheus
 - srmagura
 - stasundr
 - stmtk1
+- swalker326
 - tanayv
 - theostavrides
 - thisiskartik
@@ -204,6 +221,7 @@
 - turansky
 - tyankatsu0105
 - underager
+- valerii15298
 - ValiantCat
 - vijaypushkin
 - vikingviolinist

docs/components/form.md

@@ -215,6 +215,24 @@ See also:
 - [`useActionData`][useactiondata]
 - [`useSubmit`][usesubmit]
 
+## `state`
+
+The `state` property can be used to set a stateful value for the new location which is stored inside [history state][history-state]. This value can subsequently be accessed via `useLocation()`.
+
+```tsx
+<Form
+  method="post"
+  action="new-path"
+  state={{ some: "value" }}
+/>
+```
+
+You can access this state value while on the "new-path" route:
+
+```ts
+let { state } = useLocation();
+```
+
 ## `preventScrollReset`
 
 If you are using [`<ScrollRestoration>`][scrollrestoration], this lets you prevent the scroll position from being reset to the top of the window when the form action redirects to a new location.
@@ -330,3 +348,4 @@ You can access those values from the `request.url`
 [pickingarouter]: ../routers/picking-a-router
 [scrollrestoration]: ./scroll-restoration
 [link-preventscrollreset]: ./link#preventscrollreset
+[history-state]: https://developer.mozilla.org/en-US/docs/Web/API/History/state

docs/components/link.md

@@ -64,7 +64,7 @@ A relative `<Link to>` value (that does not begin with `/`) resolves relative to
 
 ## `relative`
 
-By default, links are relative to the route hierarchy, so `..` will go up one `Route` level. Occasionally, you may find that you have matching URL patterns that do not make sense to be nested, and you'd prefer to use relative _path_ routing. You can opt into this behavior with `relative`:
+By default, links are relative to the route hierarchy (`relative="route"`), so `..` will go up one `Route` level. Occasionally, you may find that you have matching URL patterns that do not make sense to be nested, and you'd prefer to use relative _path_ routing. You can opt into this behavior with `relative="path"`:
 
 ```jsx
 // Contact and EditContact do not share additional UI layout

docs/components/nav-link.md

@@ -84,29 +84,17 @@ You can pass a render prop as children to customize the content of the `<NavLink
 
 The `end` prop changes the matching logic for the `active` and `pending` states to only match to the "end" of the NavLink's `to` path. If the URL is longer than `to`, it will no longer be considered active.
 
-Without the end prop, this link is always active because every URL matches `/`.
-
-```tsx
-<NavLink to="/">Home</NavLink>
-```
-
-To match the URL "to the end" of `to`, use `end`:
-
-```tsx
-<NavLink to="/" end>
-  Home
-</NavLink>
-```
-
-Now this link will only be active at `"/"`. This works for paths with more segments as well:
-
 | Link                          | URL          | isActive |
 | ----------------------------- | ------------ | -------- |
 | `<NavLink to="/tasks" />`     | `/tasks`     | true     |
 | `<NavLink to="/tasks" />`     | `/tasks/123` | true     |
 | `<NavLink to="/tasks" end />` | `/tasks`     | true     |
 | `<NavLink to="/tasks" end />` | `/tasks/123` | false    |
 
+**A note on links to the root route**
+
+`<NavLink to="/">` is an exceptional case because _every_ URL matches `/`. To avoid this matching every single route by default, it effectively ignores the `end` prop and only matches when you're at the root route.
+
 ## `caseSensitive`
 
 Adding the `caseSensitive` prop changes the matching logic to make it case sensitive.

docs/fetch/redirectDocument.md

@@ -0,0 +1,46 @@
+---
+title: redirectDocument
+new: true
+---
+
+# `redirectDocument`
+
+This is a small wrapper around [`redirect`][redirect] that will trigger a document-level redirect to the new location instead of a client-side navigation.
+
+This is most useful when you have a React Router app living next to a separate app on the same domain and need to redirect from the React Router app to the other app via `window.location` instead of a React Router navigation:
+
+```jsx
+import { redirectDocument } from "react-router-dom";
+
+const loader = async () => {
+  const user = await getUser();
+  if (!user) {
+    return redirectDocument("/otherapp/login");
+  }
+  return null;
+};
+```
+
+## Type Declaration
+
+```ts
+type RedirectFunction = (
+  url: string,
+  init?: number | ResponseInit
+) => Response;
+```
+
+## `url`
+
+The URL to redirect to.
+
+```js
+redirectDocument("/otherapp/login");
+```
+
+## `init`
+
+The [Response][response] options to be used in the response.
+
+[response]: https://developer.mozilla.org/en-US/docs/Web/API/Response/Response
+[redirect]: ./redirect