Skip to content

Commit 2a2dcaf

Browse files
authored
Merge branch 'canary' into fix/custom-loader-config
2 parents 82eeab4 + 4c128a5 commit 2a2dcaf

File tree

42 files changed

+433
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+433
-150
lines changed

Cargo.lock

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ swc_core = { version = "0.90.24", features = [
3737
testing = { version = "0.35.21" }
3838

3939
# Turbo crates
40-
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }
40+
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240409.3" }
4141
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
42-
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }
42+
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240409.3" }
4343
# [TODO]: need to refactor embed_directory! macro usage in next-core
44-
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }
44+
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240409.3" }
4545

4646
# General Deps
4747

docs/02-app/01-building-your-application/01-routing/06-redirecting.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export default function Page() {
215215

216216
> **Good to know**:
217217
>
218-
> - If you don't need to programatically navigate a user, you should use a [`<Link>`](/docs/app/api-reference/components/link) component.
218+
> - If you don't need to programmatically navigate a user, you should use a [`<Link>`](/docs/app/api-reference/components/link) component.
219219
220220
<AppOnly>
221221

docs/02-app/01-building-your-application/06-optimizing/13-memory-usage.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you wish to break before any user code starts, you can pass `--inspect-brk` i
3636

3737
Now, you can use a tool such as Chrome DevTools to connect to the debugging port to record and analyze a snapshot of the heap to see what memory is being retained.
3838

39-
See [how to recored and analyze heap snapshots](https://developer.chrome.com/docs/devtools/memory-problems/heap-snapshots) for more information.
39+
See [how to record and analyze heap snapshots](https://developer.chrome.com/docs/devtools/memory-problems/heap-snapshots) for more information.
4040

4141
## Webpack build worker
4242

docs/02-app/02-api-reference/05-next-config-js/staleTimes.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The `static` and `dynamic` properties correspond with the time period (in second
3636
>
3737
> - [Loading boundaries](/docs/app/api-reference/file-conventions/loading) are considered reusable for the `static` period defined in this configuration.
3838
> - This doesn't disable [partial rendering support](/docs/app/building-your-application/routing/linking-and-navigating#4-partial-rendering), **meaning shared layouts won't automatically be refetched every navigation, only the new segment data.**
39-
> - This doesn't change [back/forward caching](/app/building-your-application/caching#router-cache) behavior to prevent layout shift & to prevent losing the browser scroll position.
39+
> - This doesn't change [back/forward caching](/docs/app/building-your-application/caching#router-cache) behavior to prevent layout shift & to prevent losing the browser scroll position.
4040
> - The different properties of this config refer to variable levels of "liveness" and are unrelated to whether the segment itself is opting into static or dynamic rendering. In other words, the current `static` default of 5 minutes suggests that data feels static by virtue of it being revalidated infrequently.
4141
4242
You can learn more about the Client Router Cache [here](/docs/app/building-your-application/caching#router-cache).

docs/02-app/02-api-reference/08-next-cli.mdx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -191,16 +191,6 @@ Options:
191191
-h, --help Displays this message.
192192
```
193193
194-
### Profiling
195-
196-
You can enable production profiling for React with the `--profile` flag in `next build`.
197-
198-
```bash filename="Terminal"
199-
next build --profile
200-
```
201-
202-
After that, you can use the profiler in the same way as you would in development.
203-
204194
### Debug
205195
206196
You can enable more verbose build output with the `--debug` flag in `next build`.
@@ -229,6 +219,16 @@ next build --no-mangling
229219
230220
> **Good to know**: This may affect performance and should only be used for debugging purposes.
231221
222+
### Profiling
223+
224+
You can enable production profiling for React with the `--profile` flag in `next build`.
225+
226+
```bash filename="Terminal"
227+
next build --profile
228+
```
229+
230+
After that, you can use the profiler in the same way as you would in development.
231+
232232
## Production
233233
234234
`next start` starts the application in production mode. The application should be compiled with [`next build`](#build) first.
@@ -401,7 +401,7 @@ x"])
401401
-h, --help Displays this message.
402402
```
403403
404-
If you have other directories that you would like to lint, you can specfy them using the `--dir` flag:
404+
If you have other directories that you would like to lint, you can specify them using the `--dir` flag:
405405
406406
```bash filename="Terminal"
407407
next lint --dir utils

0 commit comments

Comments
 (0)