Merge branch 'release-next' into dev

remix-run · May 10, 2024 · 58dcfbb · 58dcfbb
2 parents cbb6ac3 + aef5c4a
commit 58dcfbb
Show file tree

Hide file tree

Showing 22 changed files with 159 additions and 96 deletions.
diff --git a/.changeset/clever-pumas-arrive.md b/.changeset/clever-pumas-arrive.md
diff --git a/.changeset/heavy-lies-ring.md b/.changeset/heavy-lies-ring.md
diff --git a/.changeset/little-ghosts-give.md b/.changeset/little-ghosts-give.md
diff --git a/.github/workflows/release-experimental.yml b/.github/workflows/release-experimental.yml
@@ -1,25 +1,28 @@
-name: 🚀 Release (experimental)
+name: 🧪 Experimental Release
+
 on:
-  push:
-    tags:
-      - "v0.0.0-experimental*"
+  workflow_dispatch:
+    inputs:
+      branch:
+        required: true
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
 env:
   CI: true
 
 jobs:
-  release:
-    name: 🧑‍🔬 Experimental Release
-    if: |
-      github.repository == 'remix-run/react-router' &&
-      contains(github.ref, 'experimental')
+  experimental:
+    name: 🧪 Experimental Release
+    if: github.repository == 'remix-run/react-router'
     runs-on: ubuntu-latest
     steps:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v4
         with:
+          ref: ${{ github.event.inputs.branch }}
+          # checkout using a custom token so that we can push later on
+          token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
 
       - name: 📦 Setup pnpm
@@ -28,12 +31,22 @@ jobs:
       - name: ⎔ Setup node
         uses: actions/setup-node@v4
         with:
-          cache: pnpm
           node-version-file: ".nvmrc"
+          cache: "pnpm"
 
       - name: 📥 Install deps
         run: pnpm install --frozen-lockfile
 
+      - name: ⤴️ Update version
+        run: |
+          git config --local user.email "hello@remix.run"
+          git config --local user.name "Remix Run Bot"
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          NEXT_VERSION=0.0.0-experimental-${SHORT_SHA}
+          git checkout -b experimental/${NEXT_VERSION}
+          pnpm run version ${NEXT_VERSION}
+          git push origin --tags
+
       - name: 🏗 Build
         run: pnpm build
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,152 +13,154 @@ We manage release notes in this file instead of the paginated Github Releases Pa
   <summary>Table of Contents</summary>
 
 - [React Router Releases](#react-router-releases)
+  - [v6.23.1](#v6231)
+    - [Patch Changes](#patch-changes)
   - [v6.23.0](#v6230)
     - [What's Changed](#whats-changed)
       - [Data Strategy (unstable)](#data-strategy-unstable)
       - [Skip Action Error Revalidation (unstable)](#skip-action-error-revalidation-unstable)
     - [Minor Changes](#minor-changes)
   - [v6.22.3](#v6223)
-    - [Patch Changes](#patch-changes)
-  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-1)
-  - [v6.22.1](#v6221)
+  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-2)
+  - [v6.22.1](#v6221)
+    - [Patch Changes](#patch-changes-3)
   - [v6.22.0](#v6220)
     - [What's Changed](#whats-changed-1)
       - [Core Web Vitals Technology Report Flag](#core-web-vitals-technology-report-flag)
     - [Minor Changes](#minor-changes-1)
-    - [Patch Changes](#patch-changes-3)
-  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-4)
-  - [v6.21.2](#v6212)
+  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-5)
-  - [v6.21.1](#v6211)
+  - [v6.21.2](#v6212)
     - [Patch Changes](#patch-changes-6)
+  - [v6.21.1](#v6211)
+    - [Patch Changes](#patch-changes-7)
   - [v6.21.0](#v6210)
     - [What's Changed](#whats-changed-2)
       - [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
       - [Partial Hydration](#partial-hydration)
     - [Minor Changes](#minor-changes-2)
-    - [Patch Changes](#patch-changes-7)
-  - [v6.20.1](#v6201)
     - [Patch Changes](#patch-changes-8)
+  - [v6.20.1](#v6201)
+    - [Patch Changes](#patch-changes-9)
   - [v6.20.0](#v6200)
     - [Minor Changes](#minor-changes-3)
-    - [Patch Changes](#patch-changes-9)
+    - [Patch Changes](#patch-changes-10)
   - [v6.19.0](#v6190)
     - [What's Changed](#whats-changed-3)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes-4)
-    - [Patch Changes](#patch-changes-10)
+    - [Patch Changes](#patch-changes-11)
   - [v6.18.0](#v6180)
     - [What's Changed](#whats-changed-4)
       - [New Fetcher APIs](#new-fetcher-apis)
       - [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
     - [Minor Changes](#minor-changes-5)
-    - [Patch Changes](#patch-changes-11)
+    - [Patch Changes](#patch-changes-12)
   - [v6.17.0](#v6170)
     - [What's Changed](#whats-changed-5)
       - [View Transitions 🚀](#view-transitions-)
     - [Minor Changes](#minor-changes-6)
-    - [Patch Changes](#patch-changes-12)
+    - [Patch Changes](#patch-changes-13)
   - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-7)
-    - [Patch Changes](#patch-changes-13)
+    - [Patch Changes](#patch-changes-14)
   - [v6.15.0](#v6150)
     - [Minor Changes](#minor-changes-8)
-    - [Patch Changes](#patch-changes-14)
-  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-15)
-  - [v6.14.1](#v6141)
+  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-16)
+  - [v6.14.1](#v6141)
+    - [Patch Changes](#patch-changes-17)
   - [v6.14.0](#v6140)
     - [What's Changed](#whats-changed-6)
       - [JSON/Text Submissions](#jsontext-submissions)
     - [Minor Changes](#minor-changes-9)
-    - [Patch Changes](#patch-changes-17)
+    - [Patch Changes](#patch-changes-18)
   - [v6.13.0](#v6130)
     - [What's Changed](#whats-changed-7)
     - [Minor Changes](#minor-changes-10)
-    - [Patch Changes](#patch-changes-18)
-  - [v6.12.1](#v6121)
     - [Patch Changes](#patch-changes-19)
+  - [v6.12.1](#v6121)
+    - [Patch Changes](#patch-changes-20)
   - [v6.12.0](#v6120)
     - [What's Changed](#whats-changed-8)
       - [`React.startTransition` support](#reactstarttransition-support)
     - [Minor Changes](#minor-changes-11)
-    - [Patch Changes](#patch-changes-20)
-  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-21)
-  - [v6.11.1](#v6111)
+  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-22)
+  - [v6.11.1](#v6111)
+    - [Patch Changes](#patch-changes-23)
   - [v6.11.0](#v6110)
     - [Minor Changes](#minor-changes-12)
-    - [Patch Changes](#patch-changes-23)
+    - [Patch Changes](#patch-changes-24)
   - [v6.10.0](#v6100)
     - [What's Changed](#whats-changed-9)
     - [Minor Changes](#minor-changes-13)
-    - [Patch Changes](#patch-changes-24)
+    - [Patch Changes](#patch-changes-25)
   - [v6.9.0](#v690)
     - [What's Changed](#whats-changed-10)
       - [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
       - [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
     - [Minor Changes](#minor-changes-14)
-    - [Patch Changes](#patch-changes-25)
-  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-26)
-  - [v6.8.1](#v681)
+  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-27)
+  - [v6.8.1](#v681)
+    - [Patch Changes](#patch-changes-28)
   - [v6.8.0](#v680)
     - [Minor Changes](#minor-changes-15)
-    - [Patch Changes](#patch-changes-28)
+    - [Patch Changes](#patch-changes-29)
   - [v6.7.0](#v670)
     - [Minor Changes](#minor-changes-16)
-    - [Patch Changes](#patch-changes-29)
-  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-30)
-  - [v6.6.1](#v661)
+  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-31)
+  - [v6.6.1](#v661)
+    - [Patch Changes](#patch-changes-32)
   - [v6.6.0](#v660)
     - [What's Changed](#whats-changed-11)
     - [Minor Changes](#minor-changes-17)
-    - [Patch Changes](#patch-changes-32)
+    - [Patch Changes](#patch-changes-33)
   - [v6.5.0](#v650)
     - [What's Changed](#whats-changed-12)
     - [Minor Changes](#minor-changes-18)
-    - [Patch Changes](#patch-changes-33)
-  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-34)
-  - [v6.4.4](#v644)
+  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-35)
-  - [v6.4.3](#v643)
+  - [v6.4.4](#v644)
     - [Patch Changes](#patch-changes-36)
-  - [v6.4.2](#v642)
+  - [v6.4.3](#v643)
     - [Patch Changes](#patch-changes-37)
-  - [v6.4.1](#v641)
+  - [v6.4.2](#v642)
     - [Patch Changes](#patch-changes-38)
+  - [v6.4.1](#v641)
+    - [Patch Changes](#patch-changes-39)
   - [v6.4.0](#v640)
     - [What's Changed](#whats-changed-13)
       - [Remix Data APIs](#remix-data-apis)
-    - [Patch Changes](#patch-changes-39)
+    - [Patch Changes](#patch-changes-40)
   - [v6.3.0](#v630)
     - [Minor Changes](#minor-changes-19)
   - [v6.2.2](#v622)
-    - [Patch Changes](#patch-changes-40)
-  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-41)
+  - [v6.2.1](#v621)
+    - [Patch Changes](#patch-changes-42)
   - [v6.2.0](#v620)
     - [Minor Changes](#minor-changes-20)
-    - [Patch Changes](#patch-changes-42)
-  - [v6.1.1](#v611)
     - [Patch Changes](#patch-changes-43)
+  - [v6.1.1](#v611)
+    - [Patch Changes](#patch-changes-44)
   - [v6.1.0](#v610)
     - [Minor Changes](#minor-changes-21)
-    - [Patch Changes](#patch-changes-44)
-  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-45)
-  - [v6.0.1](#v601)
+  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-46)
+  - [v6.0.1](#v601)
+    - [Patch Changes](#patch-changes-47)
   - [v6.0.0](#v600)
 
 </details>
@@ -182,6 +184,19 @@ Date: YYYY-MM-DD
 **Full Changelog**: [`v6.X.Y...v6.X.Y`](https://github.com/remix-run/react-router/compare/react-router@6.X.Y...react-router@6.X.Y)
 -->
 
+## v6.23.1
+
+Date: 2024-05-10
+
+### Patch Changes
+
+- Allow `undefined` to be resolved through `<Await>` ([#11513](https://github.com/remix-run/react-router/pull/11513))
+- Add defensive `document` check when checking for `document.startViewTransition` availability ([#11544](https://github.com/remix-run/react-router/pull/11544))
+- Change the `react-router-dom/server` import back to `react-router-dom` instead of `index.ts` ([#11514](https://github.com/remix-run/react-router/pull/11514))
+- `@remix-run/router` - Support `unstable_dataStrategy` on `staticHandler.queryRoute` ([#11515](https://github.com/remix-run/react-router/pull/11515))
+
+**Full Changelog**: [`v6.23.0...v6.23.1`](https://github.com/remix-run/react-router/compare/react-router@6.23.0...react-router@6.23.1)
+
 ## v6.23.0
 
 Date: 2024-04-23

diff --git a/contributors.yml b/contributors.yml
@@ -49,6 +49,7 @@
 - chensokheng
 - chrisngobanh
 - christopherchudzicki
+- ChristophP
 - christowiz
 - codeape2
 - coryhouse
@@ -60,6 +61,7 @@
 - david-bezero
 - david-crespo
 - decadentsavant
+- dgrijuela
 - DigitalNaut
 - dmitrytarassov
 - dokeet
@@ -75,6 +77,7 @@
 - ericschn
 - faergeek
 - FilipJirsak
+- focusotter
 - frontsideair
 - fyzhu
 - fz6m
@@ -126,6 +129,8 @@
 - kachun333
 - Kakamotobi
 - kantuni
+- kapil-patel
+- kapilepatel
 - KaranRandhir
 - kark
 - KAROTT7
@@ -175,9 +180,11 @@
 - mikib0
 - minami-minami
 - minthulim
+- mlewando
 - modex98
 - morleytatro
 - ms10596
+- mtliendo
 - ned-park
 - nilubisan
 - Nismit
@@ -203,6 +210,7 @@
 - ryanflorence
 - ryanhiebert
 - sanketshah19
+- saul-atomrigs
 - sbolel
 - scarf005
 - senseibarni
@@ -234,6 +242,7 @@
 - tlinhart
 - tom-sherman
 - tomasr8
+- TooTallNate
 - triangularcube
 - trungpv1601
 - turansky

diff --git a/docs/components/link.md b/docs/components/link.md
@@ -91,7 +91,7 @@ function EditContact() {
 }
 ```
 
-Please note that `relative: "path"` only impacts the resolution of a relative path. It does not change the the "starting" location for that relative path resolution. This resolution is always relative to the current location in the Route hierarchy (i.e., the route `Link` is rendered in).
+Please note that `relative: "path"` only impacts the resolution of a relative path. It does not change the "starting" location for that relative path resolution. This resolution is always relative to the current location in the Route hierarchy (i.e., the route `Link` is rendered in).
 
 If you wish to use path-relative routing against the current URL instead of the route hierarchy, you can do that with the current [`location`][use-location] and the `URL` constructor (note the trailing slash behavior):
 
@@ -107,7 +107,7 @@ new URL("..", window.origin + location.pathname);
 
 // With trailing slashes:
 new URL(".", window.origin + location.pathname + "/");
-// 'https://remix.run/docs/en/main/start/future-flags/'
+// 'https://remix.run/docs/en/main/start/quickstart/'
 new URL("..", window.origin + location.pathname + "/");
 // 'https://remix.run/docs/en/main/start/'
 ```

diff --git a/docs/route/loader.md b/docs/route/loader.md
@@ -87,7 +87,7 @@ Note that the APIs here are not React Router specific, but rather standard web o
 
 ## `loader.hydrate`
 
-If you are [Server-Side Rendering][ssr] and leveraging the `fututre.v7_partialHydration` flag for [Partial Hydration][partialhydration], then you may wish to opt-into running a route `loader` on initial hydration _even though it has hydration data_ (for example, to let a user prime a cache with the hydration data). To force a `loader` to run on hydration in a partial hydration scenario, you can set a `hydrate` property on the `loader` function:
+If you are [Server-Side Rendering][ssr] and leveraging the `future.v7_partialHydration` flag for [Partial Hydration][partialhydration], then you may wish to opt-into running a route `loader` on initial hydration _even though it has hydration data_ (for example, to let a user prime a cache with the hydration data). To force a `loader` to run on hydration in a partial hydration scenario, you can set a `hydrate` property on the `loader` function:
 
 ## Returning Responses