Merge branch 'release-next'

Author: brophdawg11

docs/components/form.md

@@ -179,11 +179,15 @@ Instructs the form to replace the current entry in the history stack, instead of
 <Form replace />
 ```
 
-The default behavior is conditional on the form `method`:
-
-- `get` defaults to `false`
-- every other method defaults to `true` if your `action` is successful
-- if your `action` redirects or throws, then it will still push by default
+The default behavior is conditional on the form behavior:
+
+- `method=get` forms default to `false`
+- submission methods depend on the `formAction` and `action` behavior:
+  - if your `action` throws, then it will default to `false`
+  - if your `action` redirects to the current location, it defaults to `true`
+  - if your `action` redirects elsewhere, it defaults to `false`
+  - if your `formAction` is the current location, it defaults to `true`
+  - otherwise it defaults to `false`
 
 We've found with `get` you often want the user to be able to click "back" to see the previous search results/filters, etc. But with the other methods the default is `true` to avoid the "are you sure you want to resubmit the form?" prompt. Note that even if `replace={false}` React Router _will not_ resubmit the form when the back button is clicked and the method is post, put, patch, or delete.
 

docs/hooks/use-before-unload.md

@@ -0,0 +1,32 @@
+---
+title: useBeforeUnload
+new: true
+---
+
+# `useBeforeUnload`
+
+This hook is just a helper around `window.onbeforeunload`. It can be useful to save important application state on the page (to something like the browser's local storage), before the user navigates away from your page. That way if they come back you can restore any stateful information (restore form input values, etc.)
+
+```tsx lines=[1,7-11]
+import { useBeforeUnload } from "react-router-dom";
+
+function SomeForm() {
+  const [state, setState] = React.useState(null);
+
+  // save it off before users navigate away
+  useBeforeUnload(
+    React.useCallback(() => {
+      localStorage.stuff = state;
+    }, [state])
+  );
+
+  // read it in when they return
+  React.useEffect(() => {
+    if (state === null && localStorage.stuff != null) {
+      setState(localStorage.stuff);
+    }
+  }, [state]);
+
+  return <>{/*... */}</>;
+}
+```

examples/ssr-data-router/README.md

@@ -13,7 +13,7 @@ This example contains a server (see [server.js](server.js)) that can run in both
 
 In the browser entry point (see [src/entry.client.tsx](src/entry.client.tsx)), we use React Router like we would traditionally do in a purely client-side app and render a `<DataBrowserRouter>` to provide routing context to the rest of the app. The main difference is that instead of using `ReactDOM.createRoot(el).render()` to render the app, since the HTML was already sent by the server, all we need is `ReactDOM.hydrateRoot()`.
 
-On the server (see [src/entry.server.tsx](src/entry.server.tsx)), we create a static request handler using `createStaticHandler` and query for the incoming `Request` we get from Express (note that we convert the Express request to a Web Fetch Request). Once the router is finished with data loading, we use React Router's `<unstable_DataStaticRouter>` to render the app in the correct state.
+On the server (see [src/entry.server.tsx](src/entry.server.tsx)), we create a static request handler using `createStaticHandler` and query for the incoming `Request` we get from Express (note that we convert the Express request to a Web Fetch Request). Once the router is finished with data loading, we use React Router's `<DataStaticRouter>` to render the app in the correct state.
 
 ## Preview
 

examples/ssr-data-router/src/entry.server.tsx

@@ -1,10 +1,10 @@
 import type * as express from "express";
-import { unstable_createStaticHandler as createStaticHandler } from "@remix-run/router";
+import { createStaticHandler } from "@remix-run/router";
 import * as React from "react";
 import ReactDOMServer from "react-dom/server";
 import {
-  unstable_createStaticRouter as createStaticRouter,
-  unstable_StaticRouterProvider as StaticRouterProvider,
+  createStaticRouter,
+  StaticRouterProvider,
 } from "react-router-dom/server";
 import { routes } from "./App";
 

package.json

@@ -107,16 +107,16 @@
   },
   "filesize": {
     "packages/router/dist/router.umd.min.js": {
-      "none": "36.5 kB"
+      "none": "37.5 kB"
     },
     "packages/react-router/dist/react-router.production.min.js": {
       "none": "12.5 kB"
     },
     "packages/react-router/dist/umd/react-router.production.min.js": {
-      "none": "14.5 kB"
+      "none": "15 kB"
     },
     "packages/react-router-dom/dist/react-router-dom.production.min.js": {
-      "none": "10.5 kB"
+      "none": "11 kB"
     },
     "packages/react-router-dom/dist/umd/react-router-dom.production.min.js": {
       "none": "16.5 kB"

packages/react-router-dom-v5-compat/CHANGELOG.md

@@ -1,5 +1,13 @@
 # `react-router-dom-v5-compat`
 
+## 6.6.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `[email protected]`
+  - `[email protected]`
+
 ## 6.5.0
 
 ### Patch Changes

packages/react-router-dom-v5-compat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom-v5-compat",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "description": "Migration path to React Router v6 from v4/5",
   "keywords": [
     "react",
@@ -24,7 +24,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "history": "^5.3.0",
-    "react-router": "6.5.0"
+    "react-router": "6.6.0"
   },
   "peerDependencies": {
     "react": ">=16.8",

packages/react-router-dom/.eslintrc

@@ -7,6 +7,7 @@
     "__DEV__": true
   },
   "rules": {
-    "strict": 0
+    "strict": 0,
+    "no-restricted-syntax": ["error", "LogicalExpression[operator='??']"]
   }
 }

packages/react-router-dom/CHANGELOG.md

@@ -1,5 +1,22 @@
 # `react-router-dom`
 
+## 6.6.0
+
+### Minor Changes
+
+- Add `useBeforeUnload()` hook ([#9664](https://github.com/remix-run/react-router/pull/9664))
+- Remove `unstable_` prefix from `createStaticHandler`/`createStaticRouter`/`StaticRouterProvider` ([#9738](https://github.com/remix-run/react-router/pull/9738))
+
+### Patch Changes
+
+- Proper hydration of `Error` objects from `StaticRouterProvider` ([#9664](https://github.com/remix-run/react-router/pull/9664))
+- Support uppercase `<Form method>` and `useSubmit` method values ([#9664](https://github.com/remix-run/react-router/pull/9664))
+- Skip initial scroll restoration for SSR apps with `hydrationData` ([#9664](https://github.com/remix-run/react-router/pull/9664))
+- Fix `<button formmethod>` form submission overriddes ([#9664](https://github.com/remix-run/react-router/pull/9664))
+- Updated dependencies:
+  - `@remix-run/[email protected]`
+  - `[email protected]`
+
 ## 6.5.0
 
 ### Patch Changes