Merge branch 'dev' into brophdawg11/form-action-params

packages/react-router-dom/index.tsx

@@ -852,7 +852,7 @@ function useSubmitImpl(fetcherKey?: string, routeId?: string): SubmitFunction {
 }
 
 export function useFormAction(action?: string): string {
-  let routeContext = React.useContext(UNSAFE_RouteContext);
+  let routeContext = React.useContext(RouteContext);
   invariant(routeContext, "useFormAction must be used inside a RouteContext");
 
   let location = useLocation();