Merge branch 'remix-run:main' into fix/double-encoding

ynakoo · web-flow · commit 0e578e33fc00 · 2025-12-04T22:25:55.000+05:30
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/docs/api/components/Form.md b/docs/api/components/Form.md
@@ -62,17 +62,17 @@ closest route in context.
 
 ### discover
 
-Defines the link discovery behavior. See [`DiscoverBehavior`](https://api.reactrouter.com/v7/types/react_router.DiscoverBehavior.html).
+Defines the form [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+
+- **render** — default, discover the route when the form renders
+- **none** — don't eagerly discover, only discover if the form is submitted
 
 ```tsx
-<Link /> // default ("render")
-<Link discover="render" />
-<Link discover="none" />
+<Form /> // default ("render")
+<Form discover="render" />
+<Form discover="none" />
 ```
 
-- **render** — default, discover the route when the link renders
-- **none** — don't eagerly discover, only discover if the link is clicked
-
 ### encType
 
 The encoding type to use for the form submission.
diff --git a/docs/api/components/Link.md b/docs/api/components/Link.md
@@ -45,17 +45,17 @@ import { Link } from "react-router";
 
 [modes: framework]
 
-Defines the link discovery behavior
+Defines the link [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+
+- **render** — default, discover the route when the link renders
+- **none** — don't eagerly discover, only discover if the link is clicked
 
 ```tsx
 <Link /> // default ("render")
 <Link discover="render" />
 <Link discover="none" />
 ```
 
-- **render** — default, discover the route when the link renders
-- **none** — don't eagerly discover, only discover if the link is clicked
-
 ### prefetch
 
 [modes: framework]
diff --git a/docs/api/components/NavLink.md b/docs/api/components/NavLink.md
@@ -109,17 +109,17 @@ returns the `className`:
 
 [modes: framework]
 
-Defines the link discovery behavior
+Defines the link [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+
+- **render** — default, discover the route when the link renders
+- **none** — don't eagerly discover, only discover if the link is clicked
 
 ```tsx
 <Link /> // default ("render")
 <Link discover="render" />
 <Link discover="none" />
 ```
 
-- **render** — default, discover the route when the link renders
-- **none** — don't eagerly discover, only discover if the link is clicked
-
 ### end
 
 [modes: framework, data, declarative]
diff --git a/docs/api/hooks/useNavigate.md b/docs/api/hooks/useNavigate.md
@@ -78,14 +78,12 @@ navigate("/some/route?search=param");
 All properties are optional.
 
 ```tsx
-navigate(
-  {
-    pathname: "/some/route",
-    search: "?search=param",
-    hash: "#hash",
-  },
-  { state: { some: "state" } }
-);
+navigate({
+  pathname: "/some/route",
+  search: "?search=param",
+  hash: "#hash",
+  state: { some: "state" },
+});
 ```
 
 If you use `state`, that will be available on the [`Location`](https://api.reactrouter.com/v7/interfaces/react_router.Location.html) object on
diff --git a/packages/create-react-router/CHANGELOG.md b/packages/create-react-router/CHANGELOG.md
@@ -1,5 +1,9 @@
 # `create-react-router`
 
+## 7.10.1
+
+_No changes_
+
 ## 7.10.0
 
 _No changes_
diff --git a/packages/create-react-router/package.json b/packages/create-react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-react-router",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Create a new React Router app",
   "homepage": "https://reactrouter.com",
   "bugs": {
diff --git a/packages/react-router-architect/CHANGELOG.md b/packages/react-router-architect/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@react-router/architect`
 
+## 7.10.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.10.1`
+  - `@react-router/node@7.10.1`
+
 ## 7.10.0
 
 ### Patch Changes
diff --git a/packages/react-router-architect/package.json b/packages/react-router-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/architect",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Architect server request handler for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-cloudflare/CHANGELOG.md b/packages/react-router-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@react-router/cloudflare`
 
+## 7.10.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.10.1`
+
 ## 7.10.0
 
 ### Patch Changes
diff --git a/packages/react-router-cloudflare/package.json b/packages/react-router-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/cloudflare",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Cloudflare platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-dev/CHANGELOG.md b/packages/react-router-dev/CHANGELOG.md
@@ -1,5 +1,16 @@
 # `@react-router/dev`
 
+## 7.10.1
+
+### Patch Changes
+
+- Import ESM package `pkg-types` with a dynamic `import()` to fix issues on Node 20.18 ([#14624](https://github.com/remix-run/react-router/pull/14624))
+- Update `valibot` dependency to `^1.2.0` to address [GHSA-vqpr-j7v3-hqw9](https://github.com/advisories/GHSA-vqpr-j7v3-hqw9) ([#14608](https://github.com/remix-run/react-router/pull/14608))
+- Updated dependencies:
+  - `react-router@7.10.1`
+  - `@react-router/node@7.10.1`
+  - `@react-router/serve@7.10.1`
+
 ## 7.10.0
 
 ### Minor Changes
diff --git a/packages/react-router-dev/package.json b/packages/react-router-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
@@ -1,5 +1,12 @@
 # react-router-dom
 
+## 7.10.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.10.1`
+
 ## 7.10.0
 
 ### Patch Changes
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": "7.10.0",
+  "version": "7.10.1",
   "description": "Declarative routing for React web applications",
   "keywords": [
     "react",
diff --git a/packages/react-router-express/CHANGELOG.md b/packages/react-router-express/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@react-router/express`
 
+## 7.10.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.10.1`
+  - `@react-router/node@7.10.1`
+
 ## 7.10.0
 
 ### Patch Changes
diff --git a/packages/react-router-express/package.json b/packages/react-router-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/express",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Express server request handler for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-fs-routes/CHANGELOG.md b/packages/react-router-fs-routes/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@react-router/fs-routes`
 
+## 7.10.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@react-router/dev@7.10.1`
+
 ## 7.10.0
 
 ### Patch Changes
diff --git a/packages/react-router-fs-routes/package.json b/packages/react-router-fs-routes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/fs-routes",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "File system routing conventions for React Router, for use within routes.ts",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-node/CHANGELOG.md b/packages/react-router-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@react-router/node`
 
+## 7.10.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.10.1`
+
 ## 7.10.0
 
 ### Patch Changes
diff --git a/packages/react-router-node/package.json b/packages/react-router-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/node",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Node.js platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-remix-routes-option-adapter/CHANGELOG.md b/packages/react-router-remix-routes-option-adapter/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@react-router/remix-config-routes-adapter`
 
+## 7.10.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@react-router/dev@7.10.1`
+
 ## 7.10.0
 
 ### Patch Changes
diff --git a/packages/react-router-remix-routes-option-adapter/package.json b/packages/react-router-remix-routes-option-adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/remix-routes-option-adapter",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Adapter for Remix's \"routes\" config option, for use within routes.ts",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-serve/CHANGELOG.md b/packages/react-router-serve/CHANGELOG.md
@@ -1,5 +1,14 @@
 # `@react-router/serve`
 
+## 7.10.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.10.1`
+  - `@react-router/node@7.10.1`
+  - `@react-router/express@7.10.1`
+
 ## 7.10.0
 
 ### Patch Changes
diff --git a/packages/react-router-serve/package.json b/packages/react-router-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/serve",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Production application server for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
@@ -1,5 +1,11 @@
 # `react-router`
 
+## 7.10.1
+
+### Patch Changes
+
+- Update the `useOptimistic` stub we provide for React 18 users to use a stable setter function to avoid potential `useEffect` loops - specifically when using `<Link viewTransition>` ([#14628](https://github.com/remix-run/react-router/pull/14628))
+
 ## 7.10.0
 
 ### Minor Changes
diff --git a/packages/react-router/lib/dom/lib.tsx b/packages/react-router/lib/dom/lib.tsx
@@ -1039,16 +1039,16 @@ HistoryRouter.displayName = "unstable_HistoryRouter";
 export interface LinkProps
   extends Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href"> {
   /**
-   * Defines the link discovery behavior
+   * Defines the link [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+   *
+   * - **render** — default, discover the route when the link renders
+   * - **none** — don't eagerly discover, only discover if the link is clicked
    *
    * ```tsx
    * <Link /> // default ("render")
    * <Link discover="render" />
    * <Link discover="none" />
    * ```
-   *
-   * - **render** — default, discover the route when the link renders
-   * - **none** — don't eagerly discover, only discover if the link is clicked
    */
   discover?: DiscoverBehavior;
 
@@ -1687,16 +1687,16 @@ export interface FetcherFormProps extends SharedFormProps {}
  */
 export interface FormProps extends SharedFormProps {
   /**
-   * Defines the link discovery behavior. See {@link DiscoverBehavior}.
+   * Defines the form [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+   *
+   * - **render** — default, discover the route when the form renders
+   * - **none** — don't eagerly discover, only discover if the form is submitted
    *
    * ```tsx
-   * <Link /> // default ("render")
-   * <Link discover="render" />
-   * <Link discover="none" />
+   * <Form /> // default ("render")
+   * <Form discover="render" />
+   * <Form discover="none" />
    * ```
-   *
-   * - **render** — default, discover the route when the link renders
-   * - **none** — don't eagerly discover, only discover if the link is clicked
    */
   discover?: DiscoverBehavior;
 
diff --git a/packages/react-router/lib/dom/ssr/components.tsx b/packages/react-router/lib/dom/ssr/components.tsx
@@ -76,7 +76,8 @@ export function useFrameworkContext(): FrameworkContextObject {
 // Public API
 
 /**
- * Defines the discovery behavior of the link:
+ * Defines the [lazy route discovery](../../explanation/lazy-route-discovery)
+ * behavior of the link/form:
  *
  * - "render" - default, discover the route when the link renders
  * - "none" - don't eagerly discover, only discover if the link is clicked
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "7.10.0",
+  "version": "7.10.1",
   "description": "Declarative routing for React",
   "keywords": [
     "react",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-react-router",`
`3`		`- "version": "7.10.0",`
	`3`	`+ "version": "7.10.1",`
`4`	`4`	`"description": "Create a new React Router app",`
`5`	`5`	`"homepage": "https://reactrouter.com",`
`6`	`6`	`"bugs": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-router/architect",`
`3`		`- "version": "7.10.0",`
	`3`	`+ "version": "7.10.1",`
`4`	`4`	`"description": "Architect server request handler for React Router",`
`5`	`5`	`"bugs": {`
`6`	`6`	`"url": "https://github.com/remix-run/react-router/issues"`