Skip to content

Commit

Permalink
Merge branch 'dev' into markdalgleish/remove-v1-headers
Browse files Browse the repository at this point in the history
  • Loading branch information
markdalgleish committed Jul 31, 2023
2 parents 14dd46e + 6323600 commit f1379c0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion docs/guides/routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ app
└── sales.tsx
```


- `root.tsx` is the "root route" that serves as the layout for the entire application. Every route will render inside its `<Outlet/>`.
- Note that there are files with `.` delimiters. The `.` creates a `/` in the URL for that route, as well as layout nesting with another route that matches the segments before the `.`. For example, `sales.tsx` is the **parent route** for all the **child routes** that look like `sales.[the nested path].tsx`. The `<Outlet />` in `sales.tsx` will render the matching child route.
- The `_index.tsx` routes will render inside the parent `<Outlet>` when the url is only as deep as the parent's path (like `example.com/sales` instead of `example.com/sales/customers`)
Expand Down
8 changes: 4 additions & 4 deletions docs/pages/api-development-strategy.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ The lifecycle is thus either:

## Current Future Flags

| Flag | Description |
| -------------------- | --------------------------------------------------------------- |
| `v2_dev` | Enable the new development server (including HMR/HDR support) |
| `v2_meta` | Enable the new API for your `meta` functions |
| Flag | Description |
| --------- | ------------------------------------------------------------- |
| `v2_dev` | Enable the new development server (including HMR/HDR support) |
| `v2_meta` | Enable the new API for your `meta` functions |

[future-flags-blog-post]: https://remix.run/blog/future-flags
[feature-flowchart]: /docs-images/feature-flowchart.png

0 comments on commit f1379c0

Please sign in to comment.