Merge branch 'release-next' into dev

Author: brophdawg11

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -16,8 +16,8 @@ body:
         you ask a question, here are some resources to get help first:
 
         - Read the docs: https://reactrouter.com
-        - Check out the list of frequently asked questions: https://reactrouter.com/docs/en/v6/getting-started/faq
-        - Explore examples: https://reactrouter.com/docs/en/v6/examples/basic
+        - Check out the list of frequently asked questions: https://reactrouter.com/start/faq
+        - Explore examples: https://reactrouter.com/start/examples
         - Look for/ask questions on Stack Overflow: https://stackoverflow.com/questions/tagged/react-router
         - Ask in chat: https://discord.gg/6RyV8n8yyM
 

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -16,8 +16,8 @@ body:
         you ask a question, here are some resources to get help first:
 
         - Read the docs: https://reactrouter.com
-        - Check out the list of frequently asked questions: https://reactrouter.com/docs/en/v6/getting-started/faq
-        - Explore examples: https://reactrouter.com/docs/en/v6/examples/basic
+        - Check out the list of frequently asked questions: https://reactrouter.com/start/faq
+        - Explore examples: https://reactrouter.com/start/examples
         - Look for/ask questions on Stack Overflow: https://stackoverflow.com/questions/tagged/react-router
         - Ask in chat: https://discord.gg/6RyV8n8yyM
   - type: textarea

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/format.yml

@@ -1,4 +1,4 @@
-name: Format
+name: 👔 Format
 
 on:
   push:
@@ -12,26 +12,27 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
 
-      - name: Checkout Repository
-        uses: actions/checkout@v2
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.FORMAT_PAT }}
 
-      - name: Use Node.js
-        uses: actions/setup-node@v2
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v3
         with:
-          node-version: 14
+          cache: yarn
+          node-version-file: ".nvmrc"
 
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
+      - name: 📥 Install deps
+        run: yarn --frozen-lockfile
 
-      - name: Format
-        run: npm run format --if-present
+      - name: 👔 Format
+        run: yarn format
 
-      - name: Commit
+      - name: 💪 Commit
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Remix Run Bot"

.github/workflows/no-response.yml

@@ -1,26 +1,34 @@
 name: 🥺 No Response
 
 on:
-  issue_comment:
-    types: [created]
   schedule:
     # Schedule for five minutes after the hour, every hour
     - cron: "5 * * * *"
 
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
-  noResponse:
+  stale:
     if: github.repository == 'remix-run/react-router'
     runs-on: ubuntu-latest
-
     steps:
       - name: 🥺 Handle Ghosting
-        uses: lee-dohm/[email protected]
+        uses: actions/stale@v6
         with:
-          closeComment: >
+          days-before-close: 10
+          close-issue-message: >
             This issue has been automatically closed because we haven't received a
             response from the original author 🙈. This automation helps keep the issue
-            tracker clean from issues that are unactionable. Please reach out if you
+            tracker clean from issues that aren't actionable. Please reach out if you
+            have more information for us! 🙂
+          close-pr-message: >
+            This PR has been automatically closed because we haven't received a
+            response from the original author 🙈. This automation helps keep the issue
+            tracker clean from PRs that aren't actionable. Please reach out if you
             have more information for us! 🙂
-          daysUntilClose: 10
-          responseRequiredLabel: needs-response
-          token: ${{ github.token }}
+          # don't automatically mark issues/PRs as stale
+          days-before-stale: -1
+          stale-issue-label: needs-response
+          stale-pr-label: needs-response

.github/workflows/release-experimental.yml

@@ -1,7 +1,6 @@
-name: 🧪 Release (experimental)
+name: 🚀 Release (experimental)
 on:
-  release:
-    types: [published]
+  push:
     tags:
       - "v0.0.0-experimental*"
 
@@ -23,16 +22,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: ⎔ Setup Node
+      - name: ⎔ Setup node
         uses: actions/setup-node@v3
         with:
-          node-version-file: ".nvmrc"
           cache: yarn
+          node-version-file: ".nvmrc"
 
       - name: 📥 Install deps
-        # even though this is called "npm-install" it does use yarn to install
-        # because we have a yarn.lock and caches efficiently.
-        uses: bahmutov/npm-install@v1
+        run: yarn --frozen-lockfile
 
       - name: 🏗 Build
         run: yarn build

.github/workflows/support.yml

@@ -11,7 +11,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/support-requests@v2
+      - uses: dessant/support-requests@v3
         with:
           issue-comment: >
             :wave: @{issue-author}, we use the issue tracker exclusively for bug reports

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: test
+name: 🧪 Test
 
 on:
   push:
@@ -11,36 +11,36 @@ on:
       - "docs/**"
       - "**/README.md"
   pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
     paths-ignore:
       - "docs/**"
       - "**/*.md"
 
 jobs:
   test:
+    name: 🧪 Test
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/[email protected]
 
-      - name: Set up Node
-        uses: actions/setup-node@v2
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v3
         with:
-          node-version: 14
-          check-latest: true
           cache: yarn
+          check-latest: true
+          node-version-file: ".nvmrc"
 
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
+      - name: 📥 Install deps
+        run: yarn --frozen-lockfile
 
-      - name: Build
+      - name: 🏗 Build
         run: yarn build
 
-      - name: Test
+      - name: 🧪 Run tests
         run: yarn test
 
       - name: Check bundle size

contributors.yml

@@ -2,6 +2,7 @@
 - abhi-kr-2100
 - AchThomas
 - adamdotjs
+- afzalsayed96
 - Ajayff4
 - alany411
 - alexlbr
@@ -41,12 +42,14 @@
 - elanis
 - elylucas
 - emzoumpo
+- engpetermwangi
 - FilipJirsak
 - frontsideair
 - fz6m
 - gianlucca
 - gijo-varghese
 - goldins
+- goodrone
 - gowthamvbhat
 - GraxMonzo
 - GuptaSiddhant
@@ -88,6 +91,7 @@
 - loun4
 - lqze
 - lukerSpringTree
+- m-shojaei
 - Manc
 - manzano78
 - marc2332
@@ -135,16 +139,16 @@
 - TkDodo
 - tkindy
 - tlinhart
+- tom-sherman
 - triangularcube
 - turansky
 - tyankatsu0105
 - underager
 - vijaypushkin
-- vishwast03
 - vikingviolinist
+- vishwast03
 - willemarcel
 - williamsdyyz
 - xavier-lc
 - xcsnowcity
 - yuleicul
-- m-shojaei

docs/guides/deferred.md

@@ -66,7 +66,11 @@ Let's take a dive into how to accomplish this.
 Start by adding `<Await />` for your slow data requests where you'd rather render a fallback UI. Let's do that for our example above:
 
 ```jsx lines=[1,5,10,20-33]
-import { defer, useLoaderData } from "react-router-dom";
+import {
+  Await,
+  defer,
+  useLoaderData,
+} from "react-router-dom";
 import { getPackageLocation } from "./api/packages";
 
 async function loader({ params }) {