Merge branch 'release-next'

remix-run · Jul 3, 2024 · 801d125 · 801d125
2 parents f8883e1 + 0a87644
commit 801d125
Show file tree

Hide file tree

Showing 18 changed files with 358 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,161 +13,163 @@ 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.24.1](#v6241)
+    - [Patch Changes](#patch-changes)
   - [v6.24.0](#v6240)
     - [What's Changed](#whats-changed)
       - [Lazy Route Discovery (a.k.a. "Fog of War")](#lazy-route-discovery-aka-fog-of-war)
     - [Minor Changes](#minor-changes)
-    - [Patch Changes](#patch-changes)
-  - [v6.23.1](#v6231)
     - [Patch Changes](#patch-changes-1)
+  - [v6.23.1](#v6231)
+    - [Patch Changes](#patch-changes-2)
   - [v6.23.0](#v6230)
     - [What's Changed](#whats-changed-1)
       - [Data Strategy (unstable)](#data-strategy-unstable)
       - [Skip Action Error Revalidation (unstable)](#skip-action-error-revalidation-unstable)
     - [Minor Changes](#minor-changes-1)
   - [v6.22.3](#v6223)
-    - [Patch Changes](#patch-changes-2)
-  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-3)
-  - [v6.22.1](#v6221)
+  - [v6.22.2](#v6222)
     - [Patch Changes](#patch-changes-4)
+  - [v6.22.1](#v6221)
+    - [Patch Changes](#patch-changes-5)
   - [v6.22.0](#v6220)
     - [What's Changed](#whats-changed-2)
       - [Core Web Vitals Technology Report Flag](#core-web-vitals-technology-report-flag)
     - [Minor Changes](#minor-changes-2)
-    - [Patch Changes](#patch-changes-5)
-  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-6)
-  - [v6.21.2](#v6212)
+  - [v6.21.3](#v6213)
     - [Patch Changes](#patch-changes-7)
-  - [v6.21.1](#v6211)
+  - [v6.21.2](#v6212)
     - [Patch Changes](#patch-changes-8)
+  - [v6.21.1](#v6211)
+    - [Patch Changes](#patch-changes-9)
   - [v6.21.0](#v6210)
     - [What's Changed](#whats-changed-3)
       - [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
       - [Partial Hydration](#partial-hydration)
     - [Minor Changes](#minor-changes-3)
-    - [Patch Changes](#patch-changes-9)
-  - [v6.20.1](#v6201)
     - [Patch Changes](#patch-changes-10)
+  - [v6.20.1](#v6201)
+    - [Patch Changes](#patch-changes-11)
   - [v6.20.0](#v6200)
     - [Minor Changes](#minor-changes-4)
-    - [Patch Changes](#patch-changes-11)
+    - [Patch Changes](#patch-changes-12)
   - [v6.19.0](#v6190)
     - [What's Changed](#whats-changed-4)
       - [`unstable_flushSync` API](#unstable_flushsync-api)
     - [Minor Changes](#minor-changes-5)
-    - [Patch Changes](#patch-changes-12)
+    - [Patch Changes](#patch-changes-13)
   - [v6.18.0](#v6180)
     - [What's Changed](#whats-changed-5)
       - [New Fetcher APIs](#new-fetcher-apis)
       - [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
     - [Minor Changes](#minor-changes-6)
-    - [Patch Changes](#patch-changes-13)
+    - [Patch Changes](#patch-changes-14)
   - [v6.17.0](#v6170)
     - [What's Changed](#whats-changed-6)
       - [View Transitions 🚀](#view-transitions-)
     - [Minor Changes](#minor-changes-7)
-    - [Patch Changes](#patch-changes-14)
+    - [Patch Changes](#patch-changes-15)
   - [v6.16.0](#v6160)
     - [Minor Changes](#minor-changes-8)
-    - [Patch Changes](#patch-changes-15)
+    - [Patch Changes](#patch-changes-16)
   - [v6.15.0](#v6150)
     - [Minor Changes](#minor-changes-9)
-    - [Patch Changes](#patch-changes-16)
-  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-17)
-  - [v6.14.1](#v6141)
+  - [v6.14.2](#v6142)
     - [Patch Changes](#patch-changes-18)
+  - [v6.14.1](#v6141)
+    - [Patch Changes](#patch-changes-19)
   - [v6.14.0](#v6140)
     - [What's Changed](#whats-changed-7)
       - [JSON/Text Submissions](#jsontext-submissions)
     - [Minor Changes](#minor-changes-10)
-    - [Patch Changes](#patch-changes-19)
+    - [Patch Changes](#patch-changes-20)
   - [v6.13.0](#v6130)
     - [What's Changed](#whats-changed-8)
       - [`future.v7_startTransition`](#futurev7_starttransition)
     - [Minor Changes](#minor-changes-11)
-    - [Patch Changes](#patch-changes-20)
-  - [v6.12.1](#v6121)
     - [Patch Changes](#patch-changes-21)
+  - [v6.12.1](#v6121)
+    - [Patch Changes](#patch-changes-22)
   - [v6.12.0](#v6120)
     - [What's Changed](#whats-changed-9)
       - [`React.startTransition` support](#reactstarttransition-support)
     - [Minor Changes](#minor-changes-12)
-    - [Patch Changes](#patch-changes-22)
-  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-23)
-  - [v6.11.1](#v6111)
+  - [v6.11.2](#v6112)
     - [Patch Changes](#patch-changes-24)
+  - [v6.11.1](#v6111)
+    - [Patch Changes](#patch-changes-25)
   - [v6.11.0](#v6110)
     - [Minor Changes](#minor-changes-13)
-    - [Patch Changes](#patch-changes-25)
+    - [Patch Changes](#patch-changes-26)
   - [v6.10.0](#v6100)
     - [What's Changed](#whats-changed-10)
     - [Minor Changes](#minor-changes-14)
       - [`future.v7_normalizeFormMethod`](#futurev7_normalizeformmethod)
-    - [Patch Changes](#patch-changes-26)
+    - [Patch Changes](#patch-changes-27)
   - [v6.9.0](#v690)
     - [What's Changed](#whats-changed-11)
       - [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
       - [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
     - [Minor Changes](#minor-changes-15)
-    - [Patch Changes](#patch-changes-27)
-  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-28)
-  - [v6.8.1](#v681)
+  - [v6.8.2](#v682)
     - [Patch Changes](#patch-changes-29)
+  - [v6.8.1](#v681)
+    - [Patch Changes](#patch-changes-30)
   - [v6.8.0](#v680)
     - [Minor Changes](#minor-changes-16)
-    - [Patch Changes](#patch-changes-30)
+    - [Patch Changes](#patch-changes-31)
   - [v6.7.0](#v670)
     - [Minor Changes](#minor-changes-17)
-    - [Patch Changes](#patch-changes-31)
-  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-32)
-  - [v6.6.1](#v661)
+  - [v6.6.2](#v662)
     - [Patch Changes](#patch-changes-33)
+  - [v6.6.1](#v661)
+    - [Patch Changes](#patch-changes-34)
   - [v6.6.0](#v660)
     - [What's Changed](#whats-changed-12)
     - [Minor Changes](#minor-changes-18)
-    - [Patch Changes](#patch-changes-34)
+    - [Patch Changes](#patch-changes-35)
   - [v6.5.0](#v650)
     - [What's Changed](#whats-changed-13)
     - [Minor Changes](#minor-changes-19)
-    - [Patch Changes](#patch-changes-35)
-  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-36)
-  - [v6.4.4](#v644)
+  - [v6.4.5](#v645)
     - [Patch Changes](#patch-changes-37)
-  - [v6.4.3](#v643)
+  - [v6.4.4](#v644)
     - [Patch Changes](#patch-changes-38)
-  - [v6.4.2](#v642)
+  - [v6.4.3](#v643)
     - [Patch Changes](#patch-changes-39)
-  - [v6.4.1](#v641)
+  - [v6.4.2](#v642)
     - [Patch Changes](#patch-changes-40)
+  - [v6.4.1](#v641)
+    - [Patch Changes](#patch-changes-41)
   - [v6.4.0](#v640)
     - [What's Changed](#whats-changed-14)
       - [Remix Data APIs](#remix-data-apis)
-    - [Patch Changes](#patch-changes-41)
+    - [Patch Changes](#patch-changes-42)
   - [v6.3.0](#v630)
     - [Minor Changes](#minor-changes-20)
   - [v6.2.2](#v622)
-    - [Patch Changes](#patch-changes-42)
-  - [v6.2.1](#v621)
     - [Patch Changes](#patch-changes-43)
+  - [v6.2.1](#v621)
+    - [Patch Changes](#patch-changes-44)
   - [v6.2.0](#v620)
     - [Minor Changes](#minor-changes-21)
-    - [Patch Changes](#patch-changes-44)
-  - [v6.1.1](#v611)
     - [Patch Changes](#patch-changes-45)
+  - [v6.1.1](#v611)
+    - [Patch Changes](#patch-changes-46)
   - [v6.1.0](#v610)
     - [Minor Changes](#minor-changes-22)
-    - [Patch Changes](#patch-changes-46)
-  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-47)
-  - [v6.0.1](#v601)
+  - [v6.0.2](#v602)
     - [Patch Changes](#patch-changes-48)
+  - [v6.0.1](#v601)
+    - [Patch Changes](#patch-changes-49)
   - [v6.0.0](#v600)
 
 </details>
@@ -191,6 +193,21 @@ 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.24.1
+
+Date: 2024-07-03
+
+### Patch Changes
+
+- Remove `polyfill.io` reference from warning message because the domain was sold and has since been determined to serve malware ([#11741](https://github.com/remix-run/react-router/pull/11741))
+  - See https://sansec.io/research/polyfill-supply-chain-attack
+- Export `NavLinkRenderProps` type for easier typing of custom `NavLink` callback ([#11553](https://github.com/remix-run/react-router/pull/11553))
+- When using `future.v7_relativeSplatPath`, properly resolve relative paths in splat routes that are children of pathless routes ([#11633](https://github.com/remix-run/react-router/pull/11633))
+- Fog of War (unstable): Trigger a new `router.routes` identity/reflow during route patching ([#11740](https://github.com/remix-run/react-router/pull/11740))
+- Fog of War (unstable): Fix initial matching when a splat route matches ([#11759](https://github.com/remix-run/react-router/pull/11759))
+
+**Full Changelog**: [`v6.24.0...v6.24.1`](https://github.com/remix-run/react-router/compare/react-router@6.24.0...react-router@6.24.1)
+
 ## v6.24.0
 
 Date: 2024-06-24

diff --git a/contributors.yml b/contributors.yml
@@ -192,6 +192,7 @@
 - modex98
 - morleytatro
 - ms10596
+- mspiess
 - mtliendo
 - ned-park
 - nilubisan
@@ -276,4 +277,5 @@
 - yionr
 - yracnet
 - yuleicul
+- zeromask1337
 - zheng-chuang
diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
   },
   "filesize": {
     "packages/router/dist/router.umd.min.js": {
-      "none": "56.3 kB"
+      "none": "56.4 kB"
     },
     "packages/react-router/dist/react-router.production.min.js": {
       "none": "14.9 kB"

diff --git a/packages/react-router-dom-v5-compat/CHANGELOG.md b/packages/react-router-dom-v5-compat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `react-router-dom-v5-compat`
 
+## 6.24.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router-dom@6.24.1`
+  - `@remix-run/router@1.17.1`
+  - `react-router@6.24.1`
+
 ## 6.24.0
 
 ### Patch Changes

diff --git 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.24.0",
+  "version": "6.24.1",
   "description": "Migration path to React Router v6 from v4/5",
   "keywords": [
     "react",

diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
@@ -1,5 +1,16 @@
 # `react-router-dom`
 
+## 6.24.1
+
+### Patch Changes
+
+- Remove `polyfill.io` reference from warning message because the domain was sold and has since been determined to serve malware ([#11741](https://github.com/remix-run/react-router/pull/11741))
+  - See <https://sansec.io/research/polyfill-supply-chain-attack>
+- Export `NavLinkRenderProps` type for easier typing of custom `NavLink` callback ([#11553](https://github.com/remix-run/react-router/pull/11553))
+- Updated dependencies:
+  - `@remix-run/router@1.17.1`
+  - `react-router@6.24.1`
+
 ## 6.24.0
 
 ### Minor Changes

diff --git a/packages/react-router-dom/index.tsx b/packages/react-router-dom/index.tsx
@@ -1024,7 +1024,7 @@ if (__DEV__) {
   Link.displayName = "Link";
 }
 
-type NavLinkRenderProps = {
+export type NavLinkRenderProps = {
   isActive: boolean;
   isPending: boolean;
   isTransitioning: boolean;
@@ -1464,11 +1464,7 @@ export function useSearchParams(
     `You cannot use the \`useSearchParams\` hook in a browser that does not ` +
       `support the URLSearchParams API. If you need to support Internet ` +
       `Explorer 11, we recommend you load a polyfill such as ` +
-      `https://github.com/ungap/url-search-params\n\n` +
-      `If you're unsure how to load polyfills, we recommend you check out ` +
-      `https://polyfill.io/v3/ which provides some recommendations about how ` +
-      `to load polyfills only for users that need them, instead of for every ` +
-      `user.`
+      `https://github.com/ungap/url-search-params.`
   );
 
   let defaultSearchParamsRef = React.useRef(createSearchParams(defaultInit));

diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "6.24.0",
+  "version": "6.24.1",
   "description": "Declarative routing for React web applications",
   "keywords": [
     "react",

diff --git a/packages/react-router-native/CHANGELOG.md b/packages/react-router-native/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `react-router-native`
 
+## 6.24.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@6.24.1`
+
 ## 6.24.0
 
 ### Patch Changes

diff --git a/packages/react-router-native/package.json b/packages/react-router-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-native",
-  "version": "6.24.0",
+  "version": "6.24.1",
   "description": "Declarative routing for React Native applications",
   "keywords": [
     "react",

diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `react-router`
 
+## 6.24.1
+
+### Patch Changes
+
+- When using `future.v7_relativeSplatPath`, properly resolve relative paths in splat routes that are children of pathless routes ([#11633](https://github.com/remix-run/react-router/pull/11633))
+- Updated dependencies:
+  - `@remix-run/router@1.17.1`
+
 ## 6.24.0
 
 ### Minor Changes