Skip to content

[pull] main from remix-run:main #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
- maruffahmed
- marvinruder
- mathpaquette
- matmilbury
- matt-harro
- matthewlynch
- maximevtush
Expand Down Expand Up @@ -295,6 +296,7 @@
- senseibarni
- sergiodxa
- serranoarevalo
- sevignator
- sgalhs
- sgrishchenko
- shamsup
Expand Down
2 changes: 1 addition & 1 deletion docs/api/hooks/useViewTransitionState.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: useViewTransitionState

# useViewTransitionState

[MODES: framework, data, declarative]
[MODES: framework, data]

## Summary

Expand Down
2 changes: 1 addition & 1 deletion docs/explanation/sessions-and-cookies.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export async function action({
}
```

See the [Session API][session-api] for more all the methods available on the session object.
See the [Session API][session-api] for all methods available on the session object.

### Login form example

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/address-book.md
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ Now the child route should be rendering through the outlet.

## Client Side Routing

You may or may not have noticed, but when we click the links in the sidebar, the browser is doing a full document request for the next URL instead of client side routing, which completely remounts our app
You may or may not have noticed, but when we click the links in the sidebar, the browser is doing a full document request for the next URL instead of client side routing, which completely remounts our app.

Client side routing allows our app to update the URL without reloading the entire page. Instead, the app can immediately render new UI. Let's make it happen with [`<Link>`][link-component].

Expand Down
3 changes: 1 addition & 2 deletions docs/upgrading/component-routes.md
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ The first few routes you migrate are the hardest because you often have to acces

## Enable SSR and/or Pre-rendering

If you want to enable server rendering and static pre-rendering, you can do so with the `ssr` and `prerender` options in the bundler plugin. For SSR you'll need to also deploy the server build to a server. See [Deploying][deploying] for more information.
If you want to enable server rendering and static pre-rendering, you can do so with the `ssr` and `prerender` options in the bundler plugin. For SSR you'll need to also deploy the server build to a server.

```ts filename=react-router.config.ts
import type { Config } from "@react-router/dev/config";
Expand All @@ -357,7 +357,6 @@ export default {
```

[upgrade-router-provider]: ./router-provider
[deploying]: ../start/deploying
[configuring-routes]: ../start/framework/routing
[route-modules]: ../start/framework/route-module
[type-safety]: ../how-to/route-module-type-safety
3 changes: 1 addition & 2 deletions docs/upgrading/router-provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ You can checkout [Type Safety][type-safety] to learn how to fully setup and use

## Enable SSR and/or Pre-rendering

If you want to enable server rendering and static pre-rendering, you can do so with the `ssr` and `prerender` options in the bundler plugin. For SSR you'll need to also deploy the server build to a server. See [Deploying][deploying] for more information.
If you want to enable server rendering and static pre-rendering, you can do so with the `ssr` and `prerender` options in the bundler plugin. For SSR you'll need to also deploy the server build to a server.

```ts filename=react-router.config.ts
import type { Config } from "@react-router/dev/config";
Expand All @@ -436,7 +436,6 @@ export default {
```

[upgrade-component-routes]: ./component-routes
[deploying]: ../start/deploying
[configuring-routes]: ../start/framework/routing
[route-modules]: ../start/framework/route-module
[type-safety]: ../how-to/route-module-type-safety
Loading