Merge branch 'canary' into fix-intercepted-segments-with-basepath

.github/workflows/update-turbopack-test-manifest.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   update_manifest:
     name: Update and upload Turbopack test manifest
+    if: github.repository_owner == 'vercel'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

Cargo.toml

@@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [
 testing = { version = "0.35.14" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.4" }
 # [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-240110.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.4" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240110.4" }
 
 # General Deps
 

docs/02-app/01-building-your-application/06-optimizing/09-instrumentation.mdx

@@ -5,7 +5,9 @@ description: Learn how to use instrumentation to run code at server startup in y
 
 {/* The content of this doc is shared between the app and pages router. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
 
-If you export a function named `register` from a `instrumentation.ts` (or `.js`) file in the **root directory** of your project (or inside the `src` folder if using one), we will call that function whenever a new Next.js server instance is bootstrapped.
+Instrumentation is the process of using code to integrate monitoring and logging tools into your application. This allows you to track the performance and behavior of your application, and to debug issues in production.
+
+Next.js provides a `register` function that can be exported from a `instrumentation.ts|js` file in the **root directory** of your project (or inside the `src` folder if using one). Next.js will then call `register` whenever a new Next.js server instance is bootstrapped.
 
 <AppOnly>