Merge branch 'canary' into kdy1/conflict

vercel · Apr 10, 2024 · bf150d3 · bf150d3
2 parents af2b8ec + 22754fa
commit bf150d3
Show file tree

Hide file tree

Showing 136 changed files with 11,320 additions and 737 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,11 +37,11 @@ swc_core = { version = "0.90.24", features = [
 testing = { version = "0.35.21" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240409.3" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240409.3" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240409.3" }
 
 # General Deps
 

diff --git a/docs/02-app/01-building-your-application/01-routing/06-redirecting.mdx b/docs/02-app/01-building-your-application/01-routing/06-redirecting.mdx
@@ -215,7 +215,7 @@ export default function Page() {
 
 > **Good to know**:
 >
-> - If you don't need to programatically navigate a user, you should use a [`<Link>`](/docs/app/api-reference/components/link) component.
+> - If you don't need to programmatically navigate a user, you should use a [`<Link>`](/docs/app/api-reference/components/link) component.
 
 <AppOnly>
 

diff --git a/docs/02-app/01-building-your-application/06-optimizing/13-memory-usage.mdx b/docs/02-app/01-building-your-application/06-optimizing/13-memory-usage.mdx
@@ -36,7 +36,7 @@ If you wish to break before any user code starts, you can pass `--inspect-brk` i
 
 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.
 
-See [how to recored and analyze heap snapshots](https://developer.chrome.com/docs/devtools/memory-problems/heap-snapshots) for more information.
+See [how to record and analyze heap snapshots](https://developer.chrome.com/docs/devtools/memory-problems/heap-snapshots) for more information.
 
 ## Webpack build worker