diff --git a/Cargo.lock b/Cargo.lock
index 18828bebd386d..55d6f19edbe6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -321,7 +321,7 @@ dependencies = [
 [[package]]
 name = "auto-hash-map"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "serde",
  "smallvec",
@@ -3090,7 +3090,7 @@ dependencies = [
 [[package]]
 name = "node-file-trace"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "serde",
@@ -6888,12 +6888,12 @@ dependencies = [
 [[package]]
 name = "turbo-prehash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 
 [[package]]
 name = "turbo-tasks"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6927,7 +6927,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "cargo-lock",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-bytes"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "bytes",
@@ -6954,7 +6954,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "dotenvs",
@@ -6968,7 +6968,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fetch"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -6984,7 +6984,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7015,7 +7015,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-hash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "md4",
  "turbo-tasks-macros",
@@ -7025,7 +7025,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "either",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros-shared"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7050,7 +7050,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-malloc"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "mimalloc",
 ]
@@ -7058,7 +7058,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-memory"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7086,7 +7086,7 @@ dependencies = [
 [[package]]
 name = "turbopack"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7116,7 +7116,7 @@ dependencies = [
 [[package]]
 name = "turbopack-binding"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "auto-hash-map",
  "mdxjs",
@@ -7157,7 +7157,7 @@ dependencies = [
 [[package]]
 name = "turbopack-browser"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7180,7 +7180,7 @@ dependencies = [
 [[package]]
 name = "turbopack-cli-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "clap",
@@ -7197,7 +7197,7 @@ dependencies = [
 [[package]]
 name = "turbopack-core"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7226,7 +7226,7 @@ dependencies = [
 [[package]]
 name = "turbopack-css"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7253,7 +7253,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -7289,7 +7289,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7324,7 +7324,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-hmr-protocol"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "serde",
  "serde_json",
@@ -7335,7 +7335,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-plugins"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7360,7 +7360,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-runtime"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "indoc",
@@ -7376,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "turbopack-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7392,7 +7392,7 @@ dependencies = [
 [[package]]
 name = "turbopack-image"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "base64 0.21.4",
@@ -7411,7 +7411,7 @@ dependencies = [
 [[package]]
 name = "turbopack-json"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "serde",
@@ -7426,7 +7426,7 @@ dependencies = [
 [[package]]
 name = "turbopack-mdx"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "mdxjs",
@@ -7441,7 +7441,7 @@ dependencies = [
 [[package]]
 name = "turbopack-node"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -7475,7 +7475,7 @@ dependencies = [
 [[package]]
 name = "turbopack-nodejs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7495,7 +7495,7 @@ dependencies = [
 [[package]]
 name = "turbopack-resolve"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7513,7 +7513,7 @@ dependencies = [
 [[package]]
 name = "turbopack-static"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "serde",
@@ -7529,7 +7529,7 @@ dependencies = [
 [[package]]
 name = "turbopack-swc-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "swc_core",
  "turbo-tasks",
@@ -7540,7 +7540,7 @@ dependencies = [
 [[package]]
 name = "turbopack-trace-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "either",
@@ -7560,7 +7560,7 @@ dependencies = [
 [[package]]
 name = "turbopack-trace-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "turbopack-wasm"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240722.3#7677ac8f23775c5ff10bf23fa43b2097975a7f85"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
diff --git a/Cargo.toml b/Cargo.toml
index bed1d551671b1..28b2e5e336a27 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,11 +38,11 @@ swc_core = { version = "0.96.9", features = [
 testing = { version = "0.36.0" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240722.3" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240724.2" }
 # [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-240722.3" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240724.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240722.3" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240724.2" }
 
 # General Deps
 
diff --git a/crates/next-api/src/dynamic_imports.rs b/crates/next-api/src/dynamic_imports.rs
index fea92c76dfaa7..ca6e10bf3ed15 100644
--- a/crates/next-api/src/dynamic_imports.rs
+++ b/crates/next-api/src/dynamic_imports.rs
@@ -272,7 +272,7 @@ async fn build_dynamic_imports_map_for_module(
 
     // https://github.com/vercel/next.js/pull/56389#discussion_r1349336374
     // don't emit specific error as we expect there's a parse error already reported
-    let ParseResult::Ok { program, .. } = &*ecmascript_asset.parse().await? else {
+    let ParseResult::Ok { program, .. } = &*ecmascript_asset.failsafe_parse().await? else {
         return Ok(Vc::cell(None));
     };
 
diff --git a/crates/next-api/src/server_actions.rs b/crates/next-api/src/server_actions.rs
index 172c62fc7e71c..3a16c0f52ff7b 100644
--- a/crates/next-api/src/server_actions.rs
+++ b/crates/next-api/src/server_actions.rs
@@ -301,7 +301,7 @@ async fn parse_actions(module: Vc<Box<dyn Module>>) -> Result<Vc<OptionActionMap
     };
     let ParseResult::Ok {
         comments, program, ..
-    } = &*ecmascript_asset.parse().await?
+    } = &*ecmascript_asset.failsafe_parse().await?
     else {
         // The file might be be parse-able, but this is reported separately.
         return Ok(OptionActionMap::none());
diff --git a/crates/next-core/src/next_server/resolve.rs b/crates/next-core/src/next_server/resolve.rs
index f9a9e5eb6504c..408a40aa74cb4 100644
--- a/crates/next-core/src/next_server/resolve.rs
+++ b/crates/next-core/src/next_server/resolve.rs
@@ -24,8 +24,10 @@ use turbopack_binding::{
 #[turbo_tasks::value(into = "shared")]
 pub enum ExternalPredicate {
     /// Mark all modules as external if they're not listed in the list.
+    /// Applies only to imports outside of node_modules.
     AllExcept(Vc<Vec<RcStr>>),
-    /// Only mark modules listed as external.
+    /// Only mark modules listed as external, whether inside node_modules or
+    /// not.
     Only(Vc<Vec<RcStr>>),
 }
 
@@ -76,13 +78,10 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
     async fn after_resolve(
         &self,
         fs_path: Vc<FileSystemPath>,
-        context: Vc<FileSystemPath>,
+        lookup_path: Vc<FileSystemPath>,
         reference_type: Value<ReferenceType>,
         request: Vc<Request>,
     ) -> Result<Vc<ResolveResultOption>> {
-        if *condition(self.root).matches(context).await? {
-            return Ok(ResolveResultOption::none());
-        }
         let request_value = &*request.await?;
         if !matches!(request_value, Request::Module { .. }) {
             return Ok(ResolveResultOption::none());
@@ -104,6 +103,10 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
         let predicate = self.predicate.await?;
         let must_be_external = match &*predicate {
             ExternalPredicate::AllExcept(exceptions) => {
+                if *condition(self.root).matches(lookup_path).await? {
+                    return Ok(ResolveResultOption::none());
+                }
+
                 let exception_glob = packages_glob(*exceptions).await?;
 
                 if let Some(PackagesGlobs {
@@ -205,13 +208,13 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
         let mut request = request;
 
         let node_resolve_options = if is_esm {
-            node_esm_resolve_options(context.root())
+            node_esm_resolve_options(lookup_path.root())
         } else {
-            node_cjs_resolve_options(context.root())
+            node_cjs_resolve_options(lookup_path.root())
         };
         let result_from_original_location = loop {
             let node_resolved_from_original_location = resolve(
-                context,
+                lookup_path,
                 reference_type.clone(),
                 request,
                 node_resolve_options,
@@ -367,7 +370,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
                 // It would be more efficient to use an CJS external instead of an ESM external,
                 // but we need to verify if that would be correct (as in resolves to the same
                 // file).
-                let node_resolve_options = node_cjs_resolve_options(context.root());
+                let node_resolve_options = node_cjs_resolve_options(lookup_path.root());
                 let node_resolved = resolve(
                     self.project_path,
                     reference_type.clone(),
diff --git a/crates/next-core/src/next_shared/resolve.rs b/crates/next-core/src/next_shared/resolve.rs
index 9214f07636fde..26a7956dfd322 100644
--- a/crates/next-core/src/next_shared/resolve.rs
+++ b/crates/next-core/src/next_shared/resolve.rs
@@ -232,7 +232,7 @@ impl AfterResolvePlugin for NextExternalResolvePlugin {
     async fn after_resolve(
         &self,
         fs_path: Vc<FileSystemPath>,
-        _context: Vc<FileSystemPath>,
+        _lookup_path: Vc<FileSystemPath>,
         _reference_type: Value<ReferenceType>,
         _request: Vc<Request>,
     ) -> Result<Vc<ResolveResultOption>> {
@@ -282,7 +282,7 @@ impl AfterResolvePlugin for NextNodeSharedRuntimeResolvePlugin {
     async fn after_resolve(
         &self,
         fs_path: Vc<FileSystemPath>,
-        _context: Vc<FileSystemPath>,
+        _lookup_path: Vc<FileSystemPath>,
         _reference_type: Value<ReferenceType>,
         _request: Vc<Request>,
     ) -> Result<Vc<ResolveResultOption>> {
@@ -406,7 +406,7 @@ impl AfterResolvePlugin for NextSharedRuntimeResolvePlugin {
     async fn after_resolve(
         &self,
         fs_path: Vc<FileSystemPath>,
-        _context: Vc<FileSystemPath>,
+        _lookup_path: Vc<FileSystemPath>,
         _reference_type: Value<ReferenceType>,
         _request: Vc<Request>,
     ) -> Result<Vc<ResolveResultOption>> {
diff --git a/crates/next-core/src/util.rs b/crates/next-core/src/util.rs
index fc3d233c34387..d844394c34977 100644
--- a/crates/next-core/src/util.rs
+++ b/crates/next-core/src/util.rs
@@ -380,7 +380,7 @@ pub async fn parse_config_from_source(module: Vc<Box<dyn Module>>) -> Result<Vc<
             globals,
             eval_context,
             ..
-        } = &*ecmascript_asset.parse().await?
+        } = &*ecmascript_asset.failsafe_parse().await?
         {
             for item in &module_ast.body {
                 if let Some(decl) = item
diff --git a/crates/next-custom-transforms/src/transforms/debug_fn_name.rs b/crates/next-custom-transforms/src/transforms/debug_fn_name.rs
index 769e3fec585a9..713053786f7b1 100644
--- a/crates/next-custom-transforms/src/transforms/debug_fn_name.rs
+++ b/crates/next-custom-transforms/src/transforms/debug_fn_name.rs
@@ -124,7 +124,7 @@ impl VisitMut for DebugFnName {
                 if !self.path.is_empty() {
                     self.path.push('.');
                 }
-                let _ = write!(self.path, "{target}({name})");
+                let _ = write!(self.path, "{target}[{name}]");
 
                 n.visit_mut_children_with(self);
 
diff --git a/crates/next-custom-transforms/tests/fixture/debug-fn-name/anonymous-component/output.js b/crates/next-custom-transforms/tests/fixture/debug-fn-name/anonymous-component/output.js
index cd0b8ba7c6212..4f65ebb7b4290 100644
--- a/crates/next-custom-transforms/tests/fixture/debug-fn-name/anonymous-component/output.js
+++ b/crates/next-custom-transforms/tests/fixture/debug-fn-name/anonymous-component/output.js
@@ -6,9 +6,9 @@ const Component = ()=>{
         "Component.useEffect": ()=>{}
     }["Component.useEffect"]);
     const onClick = useCallback({
-        "Component.useCallback(onClick)": ()=>[]
-    }["Component.useCallback(onClick)"]);
+        "Component.useCallback[onClick]": ()=>[]
+    }["Component.useCallback[onClick]"]);
     const computed = useMemo({
-        "Component.useMemo(computed)": ()=>{}
-    }["Component.useMemo(computed)"]);
+        "Component.useMemo[computed]": ()=>{}
+    }["Component.useMemo[computed]"]);
 };
diff --git a/crates/next-custom-transforms/tests/fixture/debug-fn-name/composite-hook/output.js b/crates/next-custom-transforms/tests/fixture/debug-fn-name/composite-hook/output.js
index dff6ea08cdc61..2c216531c6033 100644
--- a/crates/next-custom-transforms/tests/fixture/debug-fn-name/composite-hook/output.js
+++ b/crates/next-custom-transforms/tests/fixture/debug-fn-name/composite-hook/output.js
@@ -6,9 +6,9 @@ function useSomething() {
         "useSomething.useEffect": ()=>{}
     }["useSomething.useEffect"]);
     const onClick = useCallback({
-        "useSomething.useCallback(onClick)": ()=>[]
-    }["useSomething.useCallback(onClick)"]);
+        "useSomething.useCallback[onClick]": ()=>[]
+    }["useSomething.useCallback[onClick]"]);
     const computed = useMemo({
-        "useSomething.useMemo(computed)": ()=>{}
-    }["useSomething.useMemo(computed)"]);
+        "useSomething.useMemo[computed]": ()=>{}
+    }["useSomething.useMemo[computed]"]);
 }
diff --git a/crates/next-custom-transforms/tests/fixture/debug-fn-name/export-default/output.js b/crates/next-custom-transforms/tests/fixture/debug-fn-name/export-default/output.js
index 4323650b80467..638fa086c1163 100644
--- a/crates/next-custom-transforms/tests/fixture/debug-fn-name/export-default/output.js
+++ b/crates/next-custom-transforms/tests/fixture/debug-fn-name/export-default/output.js
@@ -6,9 +6,9 @@ export default (()=>{
         "useEffect": ()=>{}
     }["useEffect"]);
     const onClick = useCallback({
-        "useCallback(onClick)": ()=>[]
-    }["useCallback(onClick)"]);
+        "useCallback[onClick]": ()=>[]
+    }["useCallback[onClick]"]);
     const computed = useMemo({
-        "useMemo(computed)": ()=>{}
-    }["useMemo(computed)"]);
+        "useMemo[computed]": ()=>{}
+    }["useMemo[computed]"]);
 });
diff --git a/crates/next-custom-transforms/tests/fixture/debug-fn-name/hoc/output.js b/crates/next-custom-transforms/tests/fixture/debug-fn-name/hoc/output.js
index 0a84ae7849d71..d2b20defa00f2 100644
--- a/crates/next-custom-transforms/tests/fixture/debug-fn-name/hoc/output.js
+++ b/crates/next-custom-transforms/tests/fixture/debug-fn-name/hoc/output.js
@@ -6,9 +6,9 @@ const Component = someHoC(()=>{
         "Component.useEffect": ()=>{}
     }["Component.useEffect"]);
     const onClick = useCallback({
-        "Component.useCallback(onClick)": ()=>[]
-    }["Component.useCallback(onClick)"]);
+        "Component.useCallback[onClick]": ()=>[]
+    }["Component.useCallback[onClick]"]);
     const computed = useMemo({
-        "Component.useMemo(computed)": ()=>{}
-    }["Component.useMemo(computed)"]);
+        "Component.useMemo[computed]": ()=>{}
+    }["Component.useMemo[computed]"]);
 });
diff --git a/crates/next-custom-transforms/tests/fixture/debug-fn-name/normal/output.js b/crates/next-custom-transforms/tests/fixture/debug-fn-name/normal/output.js
index 8a88618f87afc..423b8955560b7 100644
--- a/crates/next-custom-transforms/tests/fixture/debug-fn-name/normal/output.js
+++ b/crates/next-custom-transforms/tests/fixture/debug-fn-name/normal/output.js
@@ -6,9 +6,9 @@ function MyComponent() {
         "MyComponent.useEffect": ()=>{}
     }["MyComponent.useEffect"]);
     const onClick = useCallback({
-        "MyComponent.useCallback(onClick)": ()=>[]
-    }["MyComponent.useCallback(onClick)"]);
+        "MyComponent.useCallback[onClick]": ()=>[]
+    }["MyComponent.useCallback[onClick]"]);
     const computed = useMemo({
-        "MyComponent.useMemo(computed)": ()=>{}
-    }["MyComponent.useMemo(computed)"]);
+        "MyComponent.useMemo[computed]": ()=>{}
+    }["MyComponent.useMemo[computed]"]);
 }
diff --git a/docs/02-app/02-api-reference/05-next-config-js/serverExternalPackages.mdx b/docs/02-app/02-api-reference/05-next-config-js/serverExternalPackages.mdx
index 45e2afe74524b..2583ab63d98ce 100644
--- a/docs/02-app/02-api-reference/05-next-config-js/serverExternalPackages.mdx
+++ b/docs/02-app/02-api-reference/05-next-config-js/serverExternalPackages.mdx
@@ -47,6 +47,7 @@ Next.js includes a [short list of popular packages](https://github.com/vercel/ne
 - `isolated-vm`
 - `jest`
 - `jsdom`
+- `keyv`
 - `libsql`
 - `mdx-bundler`
 - `mongodb`
diff --git a/docs/03-pages/02-api-reference/03-next-config-js/serverExternalPackages.mdx b/docs/03-pages/02-api-reference/03-next-config-js/serverExternalPackages.mdx
index f869796edf7a8..dcb66eb0abdeb 100644
--- a/docs/03-pages/02-api-reference/03-next-config-js/serverExternalPackages.mdx
+++ b/docs/03-pages/02-api-reference/03-next-config-js/serverExternalPackages.mdx
@@ -47,6 +47,7 @@ Next.js includes a [short list of popular packages](https://github.com/vercel/ne
 - `isolated-vm`
 - `jest`
 - `jsdom`
+- `keyv`
 - `libsql`
 - `mdx-bundler`
 - `mongodb`
diff --git a/examples/with-slate/app/api/editor-state/route.ts b/examples/with-slate/app/api/editor-state/route.ts
new file mode 100644
index 0000000000000..a07ea10895948
--- /dev/null
+++ b/examples/with-slate/app/api/editor-state/route.ts
@@ -0,0 +1,8 @@
+export async function POST(req: Request) {
+  const editorState = await req.json();
+  console.log("TODO: Save editorState on the server", editorState);
+
+  return Response.json({
+    status: "ok",
+  });
+}
diff --git a/examples/with-slate/app/layout.tsx b/examples/with-slate/app/layout.tsx
new file mode 100644
index 0000000000000..5ff842ef07b83
--- /dev/null
+++ b/examples/with-slate/app/layout.tsx
@@ -0,0 +1,16 @@
+export const metadata = {
+  title: "Next.js",
+  description: "Generated by Next.js",
+};
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  );
+}
diff --git a/examples/with-slate/pages/index.tsx b/examples/with-slate/app/page.tsx
similarity index 56%
rename from examples/with-slate/pages/index.tsx
rename to examples/with-slate/app/page.tsx
index 4471917c2c7d0..b3c3c67c83974 100644
--- a/examples/with-slate/pages/index.tsx
+++ b/examples/with-slate/app/page.tsx
@@ -1,39 +1,32 @@
+"use client";
+
 import { useState } from "react";
 import { createEditor, Descendant } from "slate";
 import { Slate, Editable, withReact } from "slate-react";
-import { withHistory } from "slate-history";
-import { InferGetServerSidePropsType } from "next";
 
-export async function getServerSideProps() {
-  return {
-    props: {
-      editorState: [
-        {
-          children: [
-            { text: "This is editable plain text, just like a <textarea>!" },
-          ],
-        },
-      ],
-    },
-  };
-}
+const initialValue: Descendant[] = [
+  {
+    children: [
+      { text: "This is editable plain text, just like a <textarea>!" },
+    ],
+  },
+];
 
 async function saveEditorState(edtorState: Descendant[]) {
-  const response = await fetch("/api/editor-state", {
+  const response = await fetch("/api/editor-state/", {
     method: "POST",
     body: JSON.stringify(edtorState),
   });
   return response.json();
 }
 
-export default function IndexPage({
-  editorState,
-}: InferGetServerSidePropsType<typeof getServerSideProps>) {
-  const [editor] = useState(() => withReact(withHistory(createEditor())));
+export default function IndexPage() {
+  const [editor] = useState(() => withReact(createEditor()));
+
   return (
     <Slate
       editor={editor}
-      value={editorState}
+      initialValue={initialValue}
       onChange={async (value) => {
         const isAstChange = editor.operations.some(
           (op) => "set_selection" !== op.type,
diff --git a/examples/with-slate/package.json b/examples/with-slate/package.json
index 32984b4628ba4..2da6737116908 100644
--- a/examples/with-slate/package.json
+++ b/examples/with-slate/package.json
@@ -7,15 +7,16 @@
   },
   "dependencies": {
     "next": "latest",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "slate": "^0.82.0",
-    "slate-history": "0.93.0",
-    "slate-react": "^0.98.3"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "slate": "^0.103.0",
+    "slate-history": "0.100.0",
+    "slate-react": "^0.107.1"
   },
   "devDependencies": {
-    "@types/node": "18.7.5",
-    "@types/react": "18.2.8",
-    "typescript": "4.7.4"
+    "@types/node": "^20.14.12",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
+    "typescript": "^5.5.4"
   }
 }
diff --git a/examples/with-slate/pages/api/editor-state.ts b/examples/with-slate/pages/api/editor-state.ts
deleted file mode 100644
index 999ca41109b88..0000000000000
--- a/examples/with-slate/pages/api/editor-state.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NextApiRequest, NextApiResponse } from "next";
-
-export default async function handleEditorStateChange(
-  req: NextApiRequest,
-  res: NextApiResponse,
-) {
-  if (req.method !== "POST") {
-    return res
-      .setHeader("Allow", ["POST"])
-      .status(405)
-      .end(`Method ${req.method} Not Allowed`);
-  }
-
-  const editorState = JSON.parse(req.body);
-  console.log("TODO: Save editorState on the server", editorState);
-
-  res.json({
-    status: "ok",
-  });
-}
diff --git a/lerna.json b/lerna.json
index e8df035854397..1e3d44ec44a5f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "15.0.0-canary.79"
+  "version": "15.0.0-canary.83"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 4af871ffea467..fbd6e743c230d 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index d3a3f9ee2e1ec..95dbbced49212 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
   "dependencies": {
-    "@next/eslint-plugin-next": "15.0.0-canary.79",
+    "@next/eslint-plugin-next": "15.0.0-canary.83",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index e51a6e0db845a..1d3b5f00763b1 100644
--- a/packages/eslint-plugin-next/package.json
+++ b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",
diff --git a/packages/font/package.json b/packages/font/package.json
index 3c1a174bc71b3..6ed3e776c07d0 100644
--- a/packages/font/package.json
+++ b/packages/font/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
index 1170d893e54aa..e13f1b04f977c 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 4633c08328319..3b2ab89dc5a36 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index b0761002b756f..99b4ceda07478 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index bbf7f86a8d038..479cbef66903e 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index 60189ed58ca3a..cd61e3cbf115e 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"
diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
index 3c2d3073c5ad2..1119d28a83e7f 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",
diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
index e09e402e2dce7..d8f3a6d6ae358 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",
diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
index 0b9208220b3b1..d704ad2727b5e 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",
diff --git a/packages/next/package.json b/packages/next/package.json
index 3a7c529ee7293..09de147c6e0d8 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -93,7 +93,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.0.0-canary.79",
+    "@next/env": "15.0.0-canary.83",
     "@swc/counter": "0.1.3",
     "@swc/helpers": "0.5.12",
     "busboy": "1.6.0",
@@ -158,10 +158,10 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/polyfill-module": "15.0.0-canary.79",
-    "@next/polyfill-nomodule": "15.0.0-canary.79",
-    "@next/react-refresh-utils": "15.0.0-canary.79",
-    "@next/swc": "15.0.0-canary.79",
+    "@next/polyfill-module": "15.0.0-canary.83",
+    "@next/polyfill-nomodule": "15.0.0-canary.83",
+    "@next/react-refresh-utils": "15.0.0-canary.83",
+    "@next/swc": "15.0.0-canary.83",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@swc/core": "1.7.0-nightly-20240714.1",
@@ -206,7 +206,7 @@
     "@types/ws": "8.2.0",
     "@vercel/ncc": "0.34.0",
     "@vercel/nft": "0.27.1",
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240722.3",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2",
     "acorn": "8.11.3",
     "amphtml-validator": "1.0.35",
     "anser": "1.4.9",
diff --git a/packages/next/src/build/flying-shuttle/detect-changed-entries.ts b/packages/next/src/build/flying-shuttle/detect-changed-entries.ts
index 25b504673a2df..a4db8e6be3183 100644
--- a/packages/next/src/build/flying-shuttle/detect-changed-entries.ts
+++ b/packages/next/src/build/flying-shuttle/detect-changed-entries.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import crypto from 'crypto'
 import { getPageFromPath } from '../entries'
 import { Sema } from 'next/dist/compiled/async-sema'
-import { generateShuttleManifest } from './store-shuttle'
+import { generateShuttleManifest, type ShuttleManifest } from './store-shuttle'
 import type { NextConfigComplete } from '../../server/config-shared'
 
 export interface DetectedEntriesResult {
@@ -11,6 +11,32 @@ export interface DetectedEntriesResult {
   pages: string[]
 }
 
+function deepEqual(obj1: any, obj2: any) {
+  if (obj1 === obj2) return true
+
+  if (
+    typeof obj1 !== 'object' ||
+    obj1 === null ||
+    typeof obj2 !== 'object' ||
+    obj2 === null
+  ) {
+    return false
+  }
+
+  let keys1 = Object.keys(obj1)
+  let keys2 = Object.keys(obj2)
+
+  if (keys1.length !== keys2.length) return false
+
+  for (let key of keys1) {
+    if (!keys2.includes(key) || !deepEqual(obj1[key], obj2[key])) {
+      return false
+    }
+  }
+
+  return true
+}
+
 let _hasShuttle: undefined | boolean = undefined
 export async function hasShuttle(
   config: NextConfigComplete,
@@ -19,40 +45,41 @@ export async function hasShuttle(
   if (typeof _hasShuttle === 'boolean') {
     return _hasShuttle
   }
-  let foundShuttleManifest:
-    | ReturnType<typeof generateShuttleManifest>
-    | undefined
+  let foundShuttleManifest: ShuttleManifest
 
   try {
     foundShuttleManifest = JSON.parse(
-      await fs.promises
-        .readFile(path.join(shuttleDir, 'shuttle-manifest.json'), 'utf8')
-        .catch(() => '{}')
+      await fs.promises.readFile(
+        path.join(shuttleDir, 'shuttle-manifest.json'),
+        'utf8'
+      )
     )
+    _hasShuttle = true
   } catch (err: unknown) {
     _hasShuttle = false
+    console.log(`Failed to read shuttle manifest`)
     return _hasShuttle
   }
-  const currentShuttleManifest = generateShuttleManifest(config)
+  const currentShuttleManifest = JSON.parse(generateShuttleManifest(config))
 
-  if (
-    _hasShuttle !== false &&
-    currentShuttleManifest.nextVersion !== foundShuttleManifest?.nextVersion
-  ) {
+  if (currentShuttleManifest.nextVersion !== foundShuttleManifest.nextVersion) {
     // we don't allow using shuttle from differing Next.js version
     // as it could have internal changes
-    console.log(`shuttle has differing Next.js version, skipping.`)
+    console.log(
+      `shuttle has differing Next.js version ${foundShuttleManifest.nextVersion} versus current ${currentShuttleManifest.nextVersion}, skipping.`
+    )
     _hasShuttle = false
   }
 
-  if (
-    _hasShuttle !== false &&
-    currentShuttleManifest.globalHash !== foundShuttleManifest?.globalHash
-  ) {
-    // if the global hash was invalidated we bypass the cache to be safe
-    console.log(`shuttle has differing global hash, skipping.`)
+  if (!deepEqual(currentShuttleManifest.config, foundShuttleManifest.config)) {
     _hasShuttle = false
+    console.log(
+      `Mismatching shuttle configs`,
+      currentShuttleManifest.config,
+      foundShuttleManifest.config
+    )
   }
+
   return _hasShuttle
 }
 
@@ -210,7 +237,7 @@ export async function detectChangedEntries({
 
     if (changed || isGlobalEntry) {
       // if a global entry changed all entries are changed
-      if (!globalEntryChanged && isGlobalEntry) {
+      if (changed && !globalEntryChanged && isGlobalEntry) {
         console.log(`global entry ${entry} changed invalidating all entries`)
         globalEntryChanged = true
         // move unchanged to changed
@@ -238,18 +265,6 @@ export async function detectChangedEntries({
     await detectChange({ entry, normalizedEntry, type: 'app' })
   }
 
-  console.log(
-    'changed entries',
-    JSON.stringify(
-      {
-        changedEntries,
-        unchangedEntries,
-      },
-      null,
-      2
-    )
-  )
-
   return {
     changed: changedEntries,
     unchanged: unchangedEntries,
diff --git a/packages/next/src/build/flying-shuttle/store-shuttle.ts b/packages/next/src/build/flying-shuttle/store-shuttle.ts
index 656499c727b0f..9aa0859a8a8d0 100644
--- a/packages/next/src/build/flying-shuttle/store-shuttle.ts
+++ b/packages/next/src/build/flying-shuttle/store-shuttle.ts
@@ -1,6 +1,5 @@
 import fs from 'fs'
 import path from 'path'
-import crypto from 'crypto'
 import { recursiveCopy } from '../../lib/recursive-copy'
 import { version as nextVersion } from 'next/package.json'
 import type { NextConfigComplete } from '../../server/config-shared'
@@ -12,35 +11,31 @@ import {
   PAGES_MANIFEST,
   ROUTES_MANIFEST,
 } from '../../shared/lib/constants'
-import { getNextPublicEnvironmentVariables } from '../webpack/plugins/define-env-plugin'
 
-export function generateShuttleManifest(config: NextConfigComplete) {
-  // NEXT_PUBLIC_ changes for now since they are inlined
-  // and specific next config values that can impact the build
-  const globalHash = crypto.createHash('sha256')
-  const nextPublicEnv = getNextPublicEnvironmentVariables()
-  for (const key in nextPublicEnv) {
-    globalHash.update(`${key}=${nextPublicEnv[key]}`)
-  }
-
-  const omittedConfigKeys = ['headers', 'rewrites', 'redirects']
-
-  for (const key in config) {
-    if (omittedConfigKeys.includes(key)) {
-      continue
-    }
-    let serializedConfig =
-      typeof config[key] === 'function'
-        ? config[key].toString()
-        : JSON.stringify(config[key])
-
-    globalHash.update(`${key}=${serializedConfig}`)
-  }
+export interface ShuttleManifest {
+  nextVersion: string
+  config: Record<string, any>
+}
 
-  return {
+export function generateShuttleManifest(config: NextConfigComplete) {
+  return JSON.stringify({
     nextVersion,
-    globalHash: globalHash.digest('hex'),
-  }
+    config: {
+      env: config.env,
+      i18n: config.i18n,
+      basePath: config.basePath,
+      sassOptions: config.sassOptions,
+      trailingSlash: config.trailingSlash,
+      productionBrowserSourceMaps: config.productionBrowserSourceMaps,
+
+      experimental: {
+        ppr: config.experimental.ppr,
+        reactCompiler: config.experimental.reactCompiler,
+        serverSourceMaps: config.experimental.serverSourceMaps,
+        serverMinification: config.experimental.serverMinification,
+      },
+    },
+  } satisfies ShuttleManifest)
 }
 
 // we can create a new shuttle with the outputs before env values have
@@ -57,10 +52,9 @@ export async function storeShuttle({
   await fs.promises.rm(shuttleDir, { force: true, recursive: true })
   await fs.promises.mkdir(shuttleDir, { recursive: true })
 
-  const shuttleManifest = generateShuttleManifest(config)
   await fs.promises.writeFile(
     path.join(shuttleDir, 'shuttle-manifest.json'),
-    JSON.stringify(shuttleManifest)
+    generateShuttleManifest(config)
   )
 
   // copy all server entries
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
index fe3148a1facef..598c359f4ab61 100644
--- a/packages/next/src/build/index.ts
+++ b/packages/next/src/build/index.ts
@@ -872,7 +872,15 @@ export default async function build(
           shuttleDir,
           config,
         })
-        console.log({ changedPagePathsResult })
+        console.log(
+          JSON.stringify(
+            {
+              changedPagePathsResult: changedPagePathsResult.changed.pages,
+            },
+            null,
+            2
+          )
+        )
         pagesPaths = changedPagePathsResult.changed.pages
       }
 
@@ -964,7 +972,15 @@ export default async function build(
             shuttleDir,
             config,
           })
-          console.log({ changedAppPathsResult })
+          console.log(
+            JSON.stringify(
+              {
+                changedAppPathsResult: changedAppPathsResult.changed.app,
+              },
+              null,
+              2
+            )
+          )
           appPaths = changedAppPathsResult.changed.app
         }
 
@@ -2482,6 +2498,8 @@ export default async function build(
 
       if (!isGenerateMode) {
         if (config.experimental.flyingShuttle) {
+          await buildTracesPromise
+
           console.log('stitching builds...')
           const stitchResult = await stitchBuilds(
             {
diff --git a/packages/next/src/build/utils.ts b/packages/next/src/build/utils.ts
index d46e817d80f99..8f8a212da99cd 100644
--- a/packages/next/src/build/utils.ts
+++ b/packages/next/src/build/utils.ts
@@ -89,6 +89,7 @@ import type { PageExtensions } from './page-extensions-type'
 import { formatDynamicImportPath } from '../lib/format-dynamic-import-path'
 import { isInterceptionRouteAppPath } from '../server/lib/interception-routes'
 import { checkIsRoutePPREnabled } from '../server/lib/experimental/ppr'
+import type { Params } from '../client/components/params'
 
 export type ROUTER_TYPE = 'pages' | 'app'
 
@@ -1194,8 +1195,6 @@ export type AppConfig = {
   experimental_ppr?: boolean
 }
 
-type Params = Record<string, string | string[]>
-
 type GenerateStaticParams = (options: { params?: Params }) => Promise<Params[]>
 
 type GenerateParamsResult = {
diff --git a/packages/next/src/client/components/navigation.ts b/packages/next/src/client/components/navigation.ts
index 05e217bf76e7d..15d891437b4a5 100644
--- a/packages/next/src/client/components/navigation.ts
+++ b/packages/next/src/client/components/navigation.ts
@@ -13,6 +13,7 @@ import {
 import { getSegmentValue } from './router-reducer/reducers/get-segment-value'
 import { PAGE_SEGMENT_KEY, DEFAULT_SEGMENT_KEY } from '../../shared/lib/segment'
 import { ReadonlyURLSearchParams } from './navigation.react-server'
+import type { Params } from './params'
 
 /**
  * A [Client Component](https://nextjs.org/docs/app/building-your-application/rendering/client-components) hook
@@ -120,10 +121,6 @@ export function useRouter(): AppRouterInstance {
   return router
 }
 
-interface Params {
-  [key: string]: string | string[]
-}
-
 /**
  * A [Client Component](https://nextjs.org/docs/app/building-your-application/rendering/client-components) hook
  * that lets you read a route's dynamic params filled in by the current URL.
diff --git a/packages/next/src/client/components/params.ts b/packages/next/src/client/components/params.ts
new file mode 100644
index 0000000000000..a3e8c24c9cd3d
--- /dev/null
+++ b/packages/next/src/client/components/params.ts
@@ -0,0 +1 @@
+export type Params = Record<string, string | string[] | undefined>
diff --git a/packages/next/src/client/components/react-dev-overlay/pages/hot-reloader-client.ts b/packages/next/src/client/components/react-dev-overlay/pages/hot-reloader-client.ts
index eba2ff3b8637e..1a0e87a740987 100644
--- a/packages/next/src/client/components/react-dev-overlay/pages/hot-reloader-client.ts
+++ b/packages/next/src/client/components/react-dev-overlay/pages/hot-reloader-client.ts
@@ -316,7 +316,9 @@ function processMessage(obj: HMR_ACTION_TYPES) {
       return handleSuccess()
     }
     case HMR_ACTIONS_SENT_TO_BROWSER.SERVER_COMPONENT_CHANGES: {
-      window.location.reload()
+      if (hasCompileErrors || RuntimeErrorHandler.hadRuntimeError) {
+        window.location.reload()
+      }
       return
     }
     case HMR_ACTIONS_SENT_TO_BROWSER.SERVER_ERROR: {
diff --git a/packages/next/src/client/components/router-reducer/compute-changed-path.ts b/packages/next/src/client/components/router-reducer/compute-changed-path.ts
index eb40c45cfe258..bba25ddf76875 100644
--- a/packages/next/src/client/components/router-reducer/compute-changed-path.ts
+++ b/packages/next/src/client/components/router-reducer/compute-changed-path.ts
@@ -3,7 +3,7 @@ import type {
   Segment,
 } from '../../../server/app-render/types'
 import { INTERCEPTION_ROUTE_MARKERS } from '../../../server/lib/interception-routes'
-import type { Params } from '../../../shared/lib/router/utils/route-matcher'
+import type { Params } from '../params'
 import {
   isGroupSegment,
   DEFAULT_SEGMENT_KEY,
diff --git a/packages/next/src/client/image-component.tsx b/packages/next/src/client/image-component.tsx
index a4ef2efe32f8b..d5b8ca56ebdcc 100644
--- a/packages/next/src/client/image-component.tsx
+++ b/packages/next/src/client/image-component.tsx
@@ -31,6 +31,7 @@ import { RouterContext } from '../shared/lib/router-context.shared-runtime'
 
 // @ts-ignore - This is replaced by webpack alias
 import defaultLoader from 'next/dist/shared/lib/image-loader'
+import { useMergedRef } from './use-merged-ref'
 
 // This is replaced by webpack define plugin
 const configEnv = process.env.__NEXT_IMAGE_OPTS as any as ImageConfigComplete
@@ -206,6 +207,54 @@ const ImageElement = forwardRef<HTMLImageElement | null, ImageElementProps>(
     },
     forwardedRef
   ) => {
+    const ownRef = useCallback(
+      (img: ImgElementWithDataProp | null) => {
+        if (!img) {
+          return
+        }
+        if (onError) {
+          // If the image has an error before react hydrates, then the error is lost.
+          // The workaround is to wait until the image is mounted which is after hydration,
+          // then we set the src again to trigger the error handler (if there was an error).
+          // eslint-disable-next-line no-self-assign
+          img.src = img.src
+        }
+        if (process.env.NODE_ENV !== 'production') {
+          if (!src) {
+            console.error(`Image is missing required "src" property:`, img)
+          }
+          if (img.getAttribute('alt') === null) {
+            console.error(
+              `Image is missing required "alt" property. Please add Alternative Text to describe the image for screen readers and search engines.`
+            )
+          }
+        }
+        if (img.complete) {
+          handleLoading(
+            img,
+            placeholder,
+            onLoadRef,
+            onLoadingCompleteRef,
+            setBlurComplete,
+            unoptimized,
+            sizesInput
+          )
+        }
+      },
+      [
+        src,
+        placeholder,
+        onLoadRef,
+        onLoadingCompleteRef,
+        setBlurComplete,
+        onError,
+        unoptimized,
+        sizesInput,
+      ]
+    )
+
+    const ref = useMergedRef(forwardedRef, ownRef)
+
     return (
       <img
         {...rest}
@@ -229,59 +278,7 @@ const ImageElement = forwardRef<HTMLImageElement | null, ImageElementProps>(
         sizes={sizes}
         srcSet={srcSet}
         src={src}
-        ref={useCallback(
-          (img: ImgElementWithDataProp | null) => {
-            if (forwardedRef) {
-              if (typeof forwardedRef === 'function') forwardedRef(img)
-              else if (typeof forwardedRef === 'object') {
-                // @ts-ignore - .current is read only it's usually assigned by react internally
-                forwardedRef.current = img
-              }
-            }
-            if (!img) {
-              return
-            }
-            if (onError) {
-              // If the image has an error before react hydrates, then the error is lost.
-              // The workaround is to wait until the image is mounted which is after hydration,
-              // then we set the src again to trigger the error handler (if there was an error).
-              // eslint-disable-next-line no-self-assign
-              img.src = img.src
-            }
-            if (process.env.NODE_ENV !== 'production') {
-              if (!src) {
-                console.error(`Image is missing required "src" property:`, img)
-              }
-              if (img.getAttribute('alt') === null) {
-                console.error(
-                  `Image is missing required "alt" property. Please add Alternative Text to describe the image for screen readers and search engines.`
-                )
-              }
-            }
-            if (img.complete) {
-              handleLoading(
-                img,
-                placeholder,
-                onLoadRef,
-                onLoadingCompleteRef,
-                setBlurComplete,
-                unoptimized,
-                sizesInput
-              )
-            }
-          },
-          [
-            src,
-            placeholder,
-            onLoadRef,
-            onLoadingCompleteRef,
-            setBlurComplete,
-            onError,
-            unoptimized,
-            sizesInput,
-            forwardedRef,
-          ]
-        )}
+        ref={ref}
         onLoad={(event) => {
           const img = event.currentTarget as ImgElementWithDataProp
           handleLoading(
diff --git a/packages/next/src/client/link.tsx b/packages/next/src/client/link.tsx
index e84a9d6ab1de5..9bb7bc5e457f2 100644
--- a/packages/next/src/client/link.tsx
+++ b/packages/next/src/client/link.tsx
@@ -22,6 +22,7 @@ import { useIntersection } from './use-intersection'
 import { getDomainLocale } from './get-domain-locale'
 import { addBasePath } from './add-base-path'
 import { PrefetchKind } from './components/router-reducer/router-reducer-types'
+import { useMergedRef } from './use-merged-ref'
 
 type Url = string | UrlObject
 type RequiredKeys<T> = {
@@ -546,7 +547,7 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkPropsReal>(
       rootMargin: '200px',
     })
 
-    const setRef = React.useCallback(
+    const setIntersectionWithResetRef = React.useCallback(
       (el: Element) => {
         // Before the link getting observed, check if visible state need to be reset
         if (previousAs.current !== as || previousHref.current !== href) {
@@ -556,16 +557,12 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkPropsReal>(
         }
 
         setIntersectionRef(el)
-        if (childRef) {
-          if (typeof childRef === 'function') childRef(el)
-          else if (typeof childRef === 'object') {
-            childRef.current = el
-          }
-        }
       },
-      [as, childRef, href, resetVisible, setIntersectionRef]
+      [as, href, resetVisible, setIntersectionRef]
     )
 
+    const setRef = useMergedRef(setIntersectionWithResetRef, childRef)
+
     // Prefetch the URL if we haven't already and it's visible.
     React.useEffect(() => {
       // in dev, we only prefetch on hover to avoid wasting resources as the prefetch will trigger compiling the page.
diff --git a/packages/next/src/client/use-merged-ref.ts b/packages/next/src/client/use-merged-ref.ts
new file mode 100644
index 0000000000000..7fce7fb1f0ee1
--- /dev/null
+++ b/packages/next/src/client/use-merged-ref.ts
@@ -0,0 +1,46 @@
+import { useMemo, type Ref } from 'react'
+
+export function useMergedRef<TElement>(
+  refA: Ref<TElement>,
+  refB: Ref<TElement>
+): Ref<TElement> {
+  return useMemo(() => mergeRefs(refA, refB), [refA, refB])
+}
+
+export function mergeRefs<TElement>(
+  refA: Ref<TElement>,
+  refB: Ref<TElement>
+): Ref<TElement> {
+  if (!refA || !refB) {
+    return refA || refB
+  }
+
+  return (current: TElement) => {
+    const cleanupA = applyRef(refA, current)
+    const cleanupB = applyRef(refB, current)
+
+    return () => {
+      cleanupA()
+      cleanupB()
+    }
+  }
+}
+
+function applyRef<TElement>(
+  refA: NonNullable<Ref<TElement>>,
+  current: TElement
+) {
+  if (typeof refA === 'function') {
+    const cleanup = refA(current)
+    if (typeof cleanup === 'function') {
+      return cleanup
+    } else {
+      return () => refA(null)
+    }
+  } else {
+    refA.current = current
+    return () => {
+      refA.current = null
+    }
+  }
+}
diff --git a/packages/next/src/export/routes/app-route.ts b/packages/next/src/export/routes/app-route.ts
index 6ac3155a69db9..2113627dd7ef0 100644
--- a/packages/next/src/export/routes/app-route.ts
+++ b/packages/next/src/export/routes/app-route.ts
@@ -27,6 +27,7 @@ import { isStaticGenEnabled } from '../../server/route-modules/app-route/helpers
 import type { ExperimentalConfig } from '../../server/config-shared'
 import { isMetadataRouteFile } from '../../lib/metadata/is-metadata-route'
 import { normalizeAppPath } from '../../shared/lib/router/utils/app-paths'
+import type { Params } from '../../client/components/params'
 
 export const enum ExportedAppRouteFiles {
   BODY = 'BODY',
@@ -36,7 +37,7 @@ export const enum ExportedAppRouteFiles {
 export async function exportAppRoute(
   req: MockedRequest,
   res: MockedResponse,
-  params: { [key: string]: string | string[] } | undefined,
+  params: Params | undefined,
   page: string,
   incrementalCache: IncrementalCache | undefined,
   distDir: string,
diff --git a/packages/next/src/export/worker.ts b/packages/next/src/export/worker.ts
index 40d233e8e3096..2324e65ba8385 100644
--- a/packages/next/src/export/worker.ts
+++ b/packages/next/src/export/worker.ts
@@ -39,6 +39,7 @@ import {
   turborepoTraceAccess,
   TurborepoAccessTraceResult,
 } from '../build/turborepo-access-trace'
+import type { Params } from '../client/components/params'
 
 const envConfig = require('../shared/lib/runtime-config.external')
 
@@ -100,8 +101,6 @@ async function exportPageImpl(
     const isDynamic = isDynamicRoute(page)
     const outDir = isAppDir ? join(distDir, 'server/app') : input.outDir
 
-    let params: { [key: string]: string | string[] } | undefined
-
     const filePath = normalizePagePath(path)
     const ampPath = `${filePath}.amp`
     let renderAmpPath = ampPath
@@ -138,6 +137,8 @@ async function exportPageImpl(
       input.renderOpts.locales
     )
 
+    let params: Params | undefined
+
     if (isDynamic && page !== nonLocalizedPath) {
       const normalizedPage = isAppDir ? normalizeAppPath(page) : page
 
diff --git a/packages/next/src/lib/server-external-packages.json b/packages/next/src/lib/server-external-packages.json
index f49323e2f25de..6dde1971f0667 100644
--- a/packages/next/src/lib/server-external-packages.json
+++ b/packages/next/src/lib/server-external-packages.json
@@ -28,6 +28,7 @@
   "isolated-vm",
   "jest",
   "jsdom",
+  "keyv",
   "libsql",
   "mdx-bundler",
   "mongodb",
diff --git a/packages/next/src/server/app-render/create-component-tree.tsx b/packages/next/src/server/app-render/create-component-tree.tsx
index 475b114fc89cc..91e7a62a3f402 100644
--- a/packages/next/src/server/app-render/create-component-tree.tsx
+++ b/packages/next/src/server/app-render/create-component-tree.tsx
@@ -19,10 +19,7 @@ import { getTracer } from '../lib/trace/tracer'
 import { NextNodeServerSpan } from '../lib/trace/constants'
 import { StaticGenBailoutError } from '../../client/components/static-generation-bailout'
 import type { LoadingModuleData } from '../../shared/lib/app-router-context.shared-runtime'
-
-type Params = {
-  [key: string]: string | string[]
-}
+import type { Params } from '../../client/components/params'
 
 /**
  * Use the provided loader tree to create the React Component tree.
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
index 5014e78ee4066..7fecf7328f998 100644
--- a/packages/next/src/server/base-server.ts
+++ b/packages/next/src/server/base-server.ts
@@ -2,7 +2,7 @@ import type { __ApiPreviewProps } from './api-utils'
 import type { FontManifest, FontConfig } from './font-utils'
 import type { LoadComponentsReturnType } from './load-components'
 import type { MiddlewareRouteMatch } from '../shared/lib/router/utils/middleware-route-matcher'
-import type { Params } from '../shared/lib/router/utils/route-matcher'
+import type { Params } from '../client/components/params'
 import type { NextConfig, NextConfigComplete } from './config-shared'
 import type {
   NextParsedUrlQuery,
diff --git a/packages/next/src/server/dev/next-dev-server.ts b/packages/next/src/server/dev/next-dev-server.ts
index 40cdfb2778d94..29c4e2a899625 100644
--- a/packages/next/src/server/dev/next-dev-server.ts
+++ b/packages/next/src/server/dev/next-dev-server.ts
@@ -1,7 +1,7 @@
 import type { FindComponentsResult } from '../next-server'
 import type { LoadComponentsReturnType } from '../load-components'
 import type { Options as ServerOptions } from '../next-server'
-import type { Params } from '../../shared/lib/router/utils/route-matcher'
+import type { Params } from '../../client/components/params'
 import type { ParsedUrl } from '../../shared/lib/router/utils/parse-url'
 import type { ParsedUrlQuery } from 'querystring'
 import type { UrlWithParsedQuery } from 'url'
diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
index 216a1ece2f838..4c1251c12aabc 100644
--- a/packages/next/src/server/next-server.ts
+++ b/packages/next/src/server/next-server.ts
@@ -14,7 +14,7 @@ import type { FetchEventResult } from './web/types'
 import type { PrerenderManifest } from '../build'
 import type { PagesManifest } from '../build/webpack/plugins/pages-manifest-plugin'
 import type { NextParsedUrlQuery, NextUrlWithParsedQuery } from './request-meta'
-import type { Params } from '../shared/lib/router/utils/route-matcher'
+import type { Params } from '../client/components/params'
 import type { MiddlewareRouteMatch } from '../shared/lib/router/utils/middleware-route-matcher'
 import type { RouteMatch } from './route-matches/route-match'
 import type { IncomingMessage, ServerResponse } from 'http'
diff --git a/packages/next/src/server/route-matchers/route-matcher.ts b/packages/next/src/server/route-matchers/route-matcher.ts
index 376f3a48ed14b..d02b10f29b152 100644
--- a/packages/next/src/server/route-matchers/route-matcher.ts
+++ b/packages/next/src/server/route-matchers/route-matcher.ts
@@ -1,5 +1,6 @@
 import type { RouteMatch } from '../route-matches/route-match'
 import type { RouteDefinition } from '../route-definitions/route-definition'
+import type { Params } from '../../client/components/params'
 
 import { isDynamicRoute } from '../../shared/lib/router/utils'
 import {
@@ -9,7 +10,7 @@ import {
 import { getRouteRegex } from '../../shared/lib/router/utils/route-regex'
 
 type RouteMatchResult = {
-  params?: Record<string, string | string[]>
+  params?: Params
 }
 
 export class RouteMatcher<D extends RouteDefinition = RouteDefinition> {
diff --git a/packages/next/src/server/route-matches/route-match.ts b/packages/next/src/server/route-matches/route-match.ts
index 3a4444f17573b..dc5112e37ad5d 100644
--- a/packages/next/src/server/route-matches/route-match.ts
+++ b/packages/next/src/server/route-matches/route-match.ts
@@ -1,3 +1,4 @@
+import type { Params } from '../../client/components/params'
 import type { RouteDefinition } from '../route-definitions/route-definition'
 
 /**
@@ -12,5 +13,5 @@ export interface RouteMatch<D extends RouteDefinition = RouteDefinition> {
    * the incoming request pathname. If a route match is returned without any
    * params, it should be considered a static route.
    */
-  readonly params: Record<string, string | string[]> | undefined
+  readonly params: Params | undefined
 }
diff --git a/packages/next/src/server/web-server.ts b/packages/next/src/server/web-server.ts
index 92e23b56a5a49..12a5ac9e829a2 100644
--- a/packages/next/src/server/web-server.ts
+++ b/packages/next/src/server/web-server.ts
@@ -1,7 +1,7 @@
 import type { WebNextRequest, WebNextResponse } from './base-http/web'
 import type RenderResult from './render-result'
 import type { NextParsedUrlQuery, NextUrlWithParsedQuery } from './request-meta'
-import type { Params } from '../shared/lib/router/utils/route-matcher'
+import type { Params } from '../client/components/params'
 import type { LoadComponentsReturnType } from './load-components'
 import type {
   LoadedRenderOpts,
diff --git a/packages/next/src/server/web/types.ts b/packages/next/src/server/web/types.ts
index c27d3135f066b..1132da6bfd2fb 100644
--- a/packages/next/src/server/web/types.ts
+++ b/packages/next/src/server/web/types.ts
@@ -27,7 +27,7 @@ export interface RequestData {
   }
   page?: {
     name?: string
-    params?: { [key: string]: string | string[] }
+    params?: { [key: string]: string | string[] | undefined }
   }
   url: string
   body?: ReadableStream<Uint8Array>
diff --git a/packages/next/src/shared/lib/hooks-client-context.shared-runtime.ts b/packages/next/src/shared/lib/hooks-client-context.shared-runtime.ts
index deba78ddf9bc6..44b146375f309 100644
--- a/packages/next/src/shared/lib/hooks-client-context.shared-runtime.ts
+++ b/packages/next/src/shared/lib/hooks-client-context.shared-runtime.ts
@@ -1,7 +1,7 @@
 'use client'
 
 import { createContext } from 'react'
-import type { Params } from '../../shared/lib/router/utils/route-matcher'
+import type { Params } from '../../client/components/params'
 
 export const SearchParamsContext = createContext<URLSearchParams | null>(null)
 export const PathnameContext = createContext<string | null>(null)
diff --git a/packages/next/src/shared/lib/router/adapters.tsx b/packages/next/src/shared/lib/router/adapters.tsx
index ae131fd3406a8..61dff439024cb 100644
--- a/packages/next/src/shared/lib/router/adapters.tsx
+++ b/packages/next/src/shared/lib/router/adapters.tsx
@@ -1,5 +1,5 @@
 import type { AppRouterInstance } from '../app-router-context.shared-runtime'
-import type { Params } from './utils/route-matcher'
+import type { Params } from '../../../client/components/params'
 import type { NextRouter } from './router'
 
 import React, { useMemo, useRef } from 'react'
diff --git a/packages/next/src/shared/lib/router/router.ts b/packages/next/src/shared/lib/router/router.ts
index fee787615db4d..daace88f84f55 100644
--- a/packages/next/src/shared/lib/router/router.ts
+++ b/packages/next/src/shared/lib/router/router.ts
@@ -43,6 +43,7 @@ import { isBot } from './utils/is-bot'
 import { omit } from './utils/omit'
 import { interpolateAs } from './utils/interpolate-as'
 import { handleSmoothScroll } from './utils/handle-smooth-scroll'
+import type { Params } from '../../../client/components/params'
 
 declare global {
   interface Window {
@@ -1486,7 +1487,7 @@ export default class Router implements BaseRouter {
     resolvedAs = removeLocale(removeBasePath(resolvedAs), nextState.locale)
 
     route = removeTrailingSlash(pathname)
-    let routeMatch: { [paramName: string]: string | string[] } | false = false
+    let routeMatch: Params | false = false
 
     if (isDynamicRoute(route)) {
       const parsedAs = parseRelativeUrl(resolvedAs)
diff --git a/packages/next/src/shared/lib/router/utils/middleware-route-matcher.ts b/packages/next/src/shared/lib/router/utils/middleware-route-matcher.ts
index 3ab5c3b047219..21dc83f65ee77 100644
--- a/packages/next/src/shared/lib/router/utils/middleware-route-matcher.ts
+++ b/packages/next/src/shared/lib/router/utils/middleware-route-matcher.ts
@@ -1,6 +1,6 @@
 import type { BaseNextRequest } from '../../../../server/base-http'
 import type { MiddlewareMatcher } from '../../../../build/analysis/get-page-static-info'
-import type { Params } from './route-matcher'
+import type { Params } from '../../../../client/components/params'
 import { matchHas } from './prepare-destination'
 
 export interface MiddlewareRouteMatch {
diff --git a/packages/next/src/shared/lib/router/utils/prepare-destination.ts b/packages/next/src/shared/lib/router/utils/prepare-destination.ts
index 22a589af6f1aa..89a519c68876f 100644
--- a/packages/next/src/shared/lib/router/utils/prepare-destination.ts
+++ b/packages/next/src/shared/lib/router/utils/prepare-destination.ts
@@ -1,7 +1,6 @@
 import type { IncomingMessage } from 'http'
 import type { Key } from 'next/dist/compiled/path-to-regexp'
 import type { NextParsedUrlQuery } from '../../../../server/request-meta'
-import type { Params } from './route-matcher'
 import type { RouteHas } from '../../../../lib/load-custom-routes'
 import type { BaseNextRequest } from '../../../../server/base-http'
 
@@ -14,6 +13,7 @@ import {
 } from '../../../../server/lib/interception-routes'
 import { NEXT_RSC_UNION_QUERY } from '../../../../client/components/app-router-headers'
 import { getCookieParser } from '../../../../server/api-utils/get-cookie-parser'
+import type { Params } from '../../../../client/components/params'
 
 /**
  * Ensure only a-zA-Z are used for param names for proper interpolating
@@ -55,7 +55,7 @@ export function matchHas(
   const params: Params = {}
 
   const hasMatch = (hasItem: RouteHas) => {
-    let value: undefined | string
+    let value
     let key = hasItem.key
 
     switch (hasItem.type) {
diff --git a/packages/next/src/shared/lib/router/utils/route-matcher.ts b/packages/next/src/shared/lib/router/utils/route-matcher.ts
index 8115d0ade92d1..6c5cf560fbc18 100644
--- a/packages/next/src/shared/lib/router/utils/route-matcher.ts
+++ b/packages/next/src/shared/lib/router/utils/route-matcher.ts
@@ -1,14 +1,11 @@
 import type { RouteRegex } from './route-regex'
 import { DecodeError } from '../../utils'
+import type { Params } from '../../../../client/components/params'
 
 export interface RouteMatchFn {
   (pathname: string | null | undefined): false | Params
 }
 
-export interface Params {
-  [param: string]: any
-}
-
 export function getRouteMatcher({ re, groups }: RouteRegex): RouteMatchFn {
   return (pathname: string | null | undefined) => {
     const routeMatch = re.exec(pathname!)
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
index 988533d4f3a24..59a70fbc8301b 100644
--- a/packages/react-refresh-utils/package.json
+++ b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json
index ae0c758ff7749..6817ff1382a46 100644
--- a/packages/third-parties/package.json
+++ b/packages/third-parties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "15.0.0-canary.79",
+  "version": "15.0.0-canary.83",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "15.0.0-canary.79",
+    "next": "15.0.0-canary.83",
     "outdent": "0.8.0",
     "prettier": "2.5.1"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 26b73a2d5d49d..f1a7d2c009879 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -783,7 +783,7 @@ importers:
   packages/eslint-config-next:
     dependencies:
       '@next/eslint-plugin-next':
-        specifier: 15.0.0-canary.79
+        specifier: 15.0.0-canary.83
         version: link:../eslint-plugin-next
       '@rushstack/eslint-patch':
         specifier: ^1.3.3
@@ -844,7 +844,7 @@ importers:
   packages/next:
     dependencies:
       '@next/env':
-        specifier: 15.0.0-canary.79
+        specifier: 15.0.0-canary.83
         version: link:../next-env
       '@swc/counter':
         specifier: 0.1.3
@@ -975,16 +975,16 @@ importers:
         specifier: 1.2.0
         version: 1.2.0
       '@next/polyfill-module':
-        specifier: 15.0.0-canary.79
+        specifier: 15.0.0-canary.83
         version: link:../next-polyfill-module
       '@next/polyfill-nomodule':
-        specifier: 15.0.0-canary.79
+        specifier: 15.0.0-canary.83
         version: link:../next-polyfill-nomodule
       '@next/react-refresh-utils':
-        specifier: 15.0.0-canary.79
+        specifier: 15.0.0-canary.83
         version: link:../react-refresh-utils
       '@next/swc':
-        specifier: 15.0.0-canary.79
+        specifier: 15.0.0-canary.83
         version: link:../next-swc
       '@opentelemetry/api':
         specifier: 1.6.0
@@ -1119,8 +1119,8 @@ importers:
         specifier: 0.27.1
         version: 0.27.1(encoding@0.1.13)
       '@vercel/turbopack-ecmascript-runtime':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240722.3
-        version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240722.3
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2
+        version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2
       acorn:
         specifier: 8.11.3
         version: 8.11.3
@@ -1597,7 +1597,7 @@ importers:
         version: 1.0.20
     devDependencies:
       next:
-        specifier: 15.0.0-canary.79
+        specifier: 15.0.0-canary.83
         version: link:../next
       outdent:
         specifier: 0.8.0
@@ -5234,8 +5234,8 @@ packages:
     resolution: {integrity: sha512-OTe0KE37F5Y2eTys6eMnfopC+P4qr2ooXUTFyFPTplYSPwowmFk/HLD1FXtbKLjqsIH0SgekcJWad+C5uX4nkg==}
     engines: {node: '>=16'}
 
-  '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240722.3':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240722.3}
+  '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2}
     version: 0.0.0
 
   '@webassemblyjs/ast@1.11.6':
@@ -19827,7 +19827,7 @@ snapshots:
       satori: 0.10.9
       yoga-wasm-web: 0.3.3
 
-  '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240722.3':
+  '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2':
     dependencies:
       '@types/node': 20.12.3
 
diff --git a/test/development/app-dir/hmr-shared-css/app/layout.tsx b/test/development/app-dir/hmr-shared-css/app/layout.tsx
new file mode 100644
index 0000000000000..3e8ab4c4f95a0
--- /dev/null
+++ b/test/development/app-dir/hmr-shared-css/app/layout.tsx
@@ -0,0 +1,10 @@
+import { ReactNode } from 'react'
+import './styles.css'
+
+export default function Root({ children }: { children: ReactNode }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/development/app-dir/hmr-shared-css/app/page.tsx b/test/development/app-dir/hmr-shared-css/app/page.tsx
new file mode 100644
index 0000000000000..8de4a8f041d1f
--- /dev/null
+++ b/test/development/app-dir/hmr-shared-css/app/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>/</p>
+}
diff --git a/test/development/app-dir/hmr-shared-css/app/styles.css b/test/development/app-dir/hmr-shared-css/app/styles.css
new file mode 100644
index 0000000000000..19399ca05babe
--- /dev/null
+++ b/test/development/app-dir/hmr-shared-css/app/styles.css
@@ -0,0 +1,3 @@
+body {
+  background-color: rgb(255, 255, 255);
+}
diff --git a/test/development/app-dir/hmr-shared-css/hmr-shared-css.test.ts b/test/development/app-dir/hmr-shared-css/hmr-shared-css.test.ts
new file mode 100644
index 0000000000000..d93e7ccbbc152
--- /dev/null
+++ b/test/development/app-dir/hmr-shared-css/hmr-shared-css.test.ts
@@ -0,0 +1,53 @@
+import { nextTestSetup } from 'e2e-utils'
+import { assertNoRedbox } from 'next-test-utils'
+
+describe('hmr-app-and-pages', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  it('should do HMR when app router and pages router have shared CSS', async () => {
+    let browser = await next.browser('/')
+    await browser.eval('window.notReloaded = true')
+
+    expect(
+      await browser.elementByCss('body').getComputedCss('background-color')
+    ).toEqual('rgb(255, 255, 255)')
+
+    await next.patchFile('app/styles.css', (content) =>
+      content.replace(
+        'background-color: rgb(255, 255, 255);',
+        'background-color: rgb(255, 0, 0);'
+      )
+    )
+
+    await assertNoRedbox(browser)
+    expect(
+      await browser.elementByCss('body').getComputedCss('background-color')
+    ).toEqual('rgb(255, 0, 0)')
+    expect(await browser.eval('window.notReloaded')).toBe(true)
+
+    browser = await next.browser('/pages-router')
+    await browser.eval('window.notReloaded = true')
+
+    expect(
+      await browser.elementByCss('body').getComputedCss('background-color')
+    ).toEqual('rgb(255, 0, 0)')
+
+    await next.patchFile('app/styles.css', (content) =>
+      content.replace(
+        'background-color: rgb(255, 0, 0);',
+        'background-color: rgb(255, 255, 255);'
+      )
+    )
+
+    await assertNoRedbox(browser)
+    expect(
+      await browser.elementByCss('body').getComputedCss('background-color')
+    ).toEqual('rgb(255, 255, 255)')
+    expect(await browser.eval('window.notReloaded')).toBe(true)
+
+    await next.stop()
+    await next.clean()
+  })
+})
diff --git a/test/development/app-dir/hmr-shared-css/next.config.js b/test/development/app-dir/hmr-shared-css/next.config.js
new file mode 100644
index 0000000000000..807126e4cf0bf
--- /dev/null
+++ b/test/development/app-dir/hmr-shared-css/next.config.js
@@ -0,0 +1,6 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {}
+
+module.exports = nextConfig
diff --git a/test/development/app-dir/hmr-shared-css/pages/pages-router.tsx b/test/development/app-dir/hmr-shared-css/pages/pages-router.tsx
new file mode 100644
index 0000000000000..cc993edd9a5bf
--- /dev/null
+++ b/test/development/app-dir/hmr-shared-css/pages/pages-router.tsx
@@ -0,0 +1,5 @@
+import '../app/styles.css'
+
+export default function PagesRouterPage() {
+  return <p>/pages-router</p>
+}
diff --git a/test/e2e/app-dir/app/flying-shuttle.test.ts b/test/e2e/app-dir/app/flying-shuttle.test.ts
index 29bbb7db43380..cb5a97493bc93 100644
--- a/test/e2e/app-dir/app/flying-shuttle.test.ts
+++ b/test/e2e/app-dir/app/flying-shuttle.test.ts
@@ -1,5 +1,6 @@
 import fs from 'fs'
 import path from 'path'
+import { version as nextVersion } from 'next/package.json'
 import type { Route } from 'playwright'
 import { retry } from 'next-test-utils'
 import { nextTestSetup, isNextStart } from 'e2e-utils'
@@ -22,6 +23,25 @@ import { nextTestSetup, isNextStart } from 'e2e-utils'
         NEXT_PRIVATE_FLYING_SHUTTLE: 'true',
       },
     })
+    let initialConfig: Record<string, any> = {}
+
+    beforeAll(async () => {
+      const manifest = await next.readJSON(
+        '.next/cache/shuttle/shuttle-manifest.json'
+      )
+      initialConfig = manifest.config
+    })
+
+    async function checkShuttleManifest() {
+      const manifest = await next.readJSON(
+        '.next/cache/shuttle/shuttle-manifest.json'
+      )
+
+      expect(manifest).toEqual({
+        nextVersion,
+        config: initialConfig,
+      })
+    }
 
     it('should have file hashes in trace files', async () => {
       const deploymentsTracePath = path.join(
@@ -181,6 +201,11 @@ import { nextTestSetup, isNextStart } from 'e2e-utils'
         await next.patchFile(dataPath, JSON.stringify({ hello: 'again' }))
         await next.start()
 
+        expect(next.cliOutput).not.toContain('/catch-all')
+        expect(next.cliOutput).not.toContain('/blog/[slug]')
+        expect(next.cliOutput).toContain('/dashboard/deployments/[id]')
+
+        await checkShuttleManifest()
         await checkAppPagesNavigation()
       } finally {
         await next.patchFile(dataPath, originalContent)
@@ -203,6 +228,11 @@ import { nextTestSetup, isNextStart } from 'e2e-utils'
         )
         await next.start()
 
+        expect(next.cliOutput).toContain('/')
+        expect(next.cliOutput).not.toContain('/catch-all')
+        expect(next.cliOutput).not.toContain('/blog/[slug]')
+
+        await checkShuttleManifest()
         await checkAppPagesNavigation()
       } finally {
         await next.patchFile(pagePath, originalContent)
@@ -228,6 +258,12 @@ import { nextTestSetup, isNextStart } from 'e2e-utils'
         await next.patchFile(dataPath, JSON.stringify({ hello: 'again' }))
         await next.start()
 
+        expect(next.cliOutput).toContain('/')
+        expect(next.cliOutput).toContain('/dashboard/deployments/[id]')
+        expect(next.cliOutput).not.toContain('/catch-all')
+        expect(next.cliOutput).not.toContain('/blog/[slug]')
+
+        await checkShuttleManifest()
         await checkAppPagesNavigation()
       } finally {
         await next.patchFile(pagePath, originalPageContent)
diff --git a/test/integration/css/test/__snapshots__/basic-global-support.test.js.snap b/test/integration/css/test/__snapshots__/basic-global-support.test.js.snap
deleted file mode 100644
index cd4322b39dd68..0000000000000
--- a/test/integration/css/test/__snapshots__/basic-global-support.test.js.snap
+++ /dev/null
@@ -1,17 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`CSS URL via \`file-loader\` production mode useLightnincsss(false) should've emitted expected files 1`] = `".red-text{color:red;background-image:url(/_next/static/media/dark.6b01655b.svg) url(/_next/static/media/dark2.6b01655b.svg)}.blue-text{color:orange;font-weight:bolder;background-image:url(/_next/static/media/light.2da1d3d6.svg);color:blue}"`;
-
-exports[`CSS URL via \`file-loader\` production mode useLightnincsss(true) should've emitted expected files 1`] = `".red-text{color:red;background-image:url(/_next/static/media/dark.6b01655b.svg) url(/_next/static/media/dark2.6b01655b.svg)}.blue-text{color:orange;background-image:url(/_next/static/media/light.2da1d3d6.svg);font-weight:bolder;color:#00f}"`;
-
-exports[`Multi Global Support (reversed) production mode useLightnincsss(false) should've emitted a single CSS file 1`] = `".blue-text{color:blue}.red-text{color:red}"`;
-
-exports[`Multi Global Support (reversed) production mode useLightnincsss(true) should've emitted a single CSS file 1`] = `".blue-text{color:#00f}.red-text{color:red}"`;
-
-exports[`Multi Global Support production mode useLightnincsss(false) should've emitted a single CSS file 1`] = `".red-text{color:red}.blue-text{color:blue}"`;
-
-exports[`Multi Global Support production mode useLightnincsss(true) should've emitted a single CSS file 1`] = `".red-text{color:red}.blue-text{color:#00f}"`;
-
-exports[`Nested @import() Global Support production mode useLightnincsss(false) should've emitted a single CSS file 1`] = `".red-text{color:purple;font-weight:bolder;color:red}.blue-text{color:orange;font-weight:bolder;color:blue}"`;
-
-exports[`Nested @import() Global Support production mode useLightnincsss(true) should've emitted a single CSS file 1`] = `".red-text{color:purple;font-weight:bolder;color:red}.blue-text{color:orange;font-weight:bolder;color:#00f}"`;
diff --git a/test/integration/css/test/basic-global-support.test.js b/test/integration/css/test/basic-global-support.test.js
index 501af8474a7ed..9f96185447d5f 100644
--- a/test/integration/css/test/basic-global-support.test.js
+++ b/test/integration/css/test/basic-global-support.test.js
@@ -1,6 +1,15 @@
 /* eslint-env jest */
-import { readdir, readFile, remove } from 'fs-extra'
-import { nextBuild, File } from 'next-test-utils'
+import cheerio from 'cheerio'
+import { remove } from 'fs-extra'
+import {
+  nextBuild,
+  File,
+  findPort,
+  nextStart,
+  killApp,
+  fetchViaHTTP,
+  renderViaHTTP,
+} from 'next-test-utils'
 import { join } from 'path'
 
 const fixturesDir = join(__dirname, '../..', 'css-fixtures')
@@ -9,6 +18,8 @@ describe('Basic Global Support', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(fixturesDir, 'single-global')
       const nextConfig = new File(join(appDir, 'next.config.js'))
 
@@ -28,26 +39,50 @@ module.exports = {
 
         beforeAll(async () => {
           await remove(join(appDir, '.next'))
+          const { code } = await nextBuild(appDir)
+          if (code !== 0) {
+            throw new Error('Failed to build')
+          }
+
+          appPort = await findPort()
+          app = await nextStart(appDir, appPort)
         })
 
-        it('should compile successfully', async () => {
-          const { code, stdout } = await nextBuild(appDir, [], {
-            stdout: true,
-          })
-          expect(code).toBe(0)
-          expect(stdout).toMatch(/Compiled successfully/)
+        afterAll(async () => {
+          await killApp(app)
         })
 
         it(`should've emitted a single CSS file`, async () => {
-          const cssFolder = join(appDir, '.next/static/css')
+          const content = await renderViaHTTP(appPort, '/')
+          const $ = cheerio.load(content)
 
-          const files = await readdir(cssFolder)
-          const cssFiles = files.filter((f) => /\.css$/.test(f))
+          const cssSheet = $('link[rel="stylesheet"]')
+          expect(cssSheet.length).toBe(1)
+          const stylesheet = cssSheet.attr('href')
 
-          expect(cssFiles.length).toBe(1)
-          expect(
-            await readFile(join(cssFolder, cssFiles[0]), 'utf8')
-          ).toContain('color:red')
+          const cssContent = (
+            await fetchViaHTTP(appPort, stylesheet).then((res) => res.text())
+          )
+            .replace(/\/\*.*?\*\//g, '')
+            .trim()
+
+          if (process.env.TURBOPACK && useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+              }"
+            `)
+          } else if (process.env.TURBOPACK && !useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+              }"
+            `)
+          } else if (useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`".red-text{color:red}"`)
+          } else {
+            expect(cssContent).toMatchInlineSnapshot(`".red-text{color:red}"`)
+          }
         })
       })
     }
@@ -58,6 +93,8 @@ describe('Basic Global Support with special characters in path', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(
         fixturesDir,
         'single-global-special-characters',
@@ -81,26 +118,50 @@ module.exports = {
 
         beforeAll(async () => {
           await remove(join(appDir, '.next'))
+          const { code } = await nextBuild(appDir)
+          if (code !== 0) {
+            throw new Error('Failed to build')
+          }
+
+          appPort = await findPort()
+          app = await nextStart(appDir, appPort)
         })
 
-        it('should compile successfully', async () => {
-          const { code, stdout } = await nextBuild(appDir, [], {
-            stdout: true,
-          })
-          expect(code).toBe(0)
-          expect(stdout).toMatch(/Compiled successfully/)
+        afterAll(async () => {
+          await killApp(app)
         })
 
         it(`should've emitted a single CSS file`, async () => {
-          const cssFolder = join(appDir, '.next/static/css')
+          const content = await renderViaHTTP(appPort, '/')
+          const $ = cheerio.load(content)
 
-          const files = await readdir(cssFolder)
-          const cssFiles = files.filter((f) => /\.css$/.test(f))
+          const cssSheet = $('link[rel="stylesheet"]')
+          expect(cssSheet.length).toBe(1)
+          const stylesheet = cssSheet.attr('href')
 
-          expect(cssFiles.length).toBe(1)
-          expect(
-            await readFile(join(cssFolder, cssFiles[0]), 'utf8')
-          ).toContain('color:red')
+          const cssContent = (
+            await fetchViaHTTP(appPort, stylesheet).then((res) => res.text())
+          )
+            .replace(/\/\*.*?\*\//g, '')
+            .trim()
+
+          if (process.env.TURBOPACK && useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+              }"
+            `)
+          } else if (process.env.TURBOPACK && !useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+              }"
+            `)
+          } else if (useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`".red-text{color:red}"`)
+          } else {
+            expect(cssContent).toMatchInlineSnapshot(`".red-text{color:red}"`)
+          }
         })
       })
     }
@@ -111,6 +172,8 @@ describe('Basic Global Support with src/ dir', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(fixturesDir, 'single-global-src')
       const nextConfig = new File(join(appDir, 'next.config.js'))
 
@@ -130,26 +193,49 @@ module.exports = {
 
         beforeAll(async () => {
           await remove(join(appDir, '.next'))
-        })
+          const { code } = await nextBuild(appDir)
+          if (code !== 0) {
+            throw new Error('Failed to build')
+          }
 
-        it('should compile successfully', async () => {
-          const { code, stdout } = await nextBuild(appDir, [], {
-            stdout: true,
-          })
-          expect(code).toBe(0)
-          expect(stdout).toMatch(/Compiled successfully/)
+          appPort = await findPort()
+          app = await nextStart(appDir, appPort)
         })
 
+        afterAll(async () => {
+          await killApp(app)
+        })
         it(`should've emitted a single CSS file`, async () => {
-          const cssFolder = join(appDir, '.next/static/css')
+          const content = await renderViaHTTP(appPort, '/')
+          const $ = cheerio.load(content)
 
-          const files = await readdir(cssFolder)
-          const cssFiles = files.filter((f) => /\.css$/.test(f))
+          const cssSheet = $('link[rel="stylesheet"]')
+          expect(cssSheet.length).toBe(1)
+          const stylesheet = cssSheet.attr('href')
 
-          expect(cssFiles.length).toBe(1)
-          expect(
-            await readFile(join(cssFolder, cssFiles[0]), 'utf8')
-          ).toContain('color:red')
+          const cssContent = (
+            await fetchViaHTTP(appPort, stylesheet).then((res) => res.text())
+          )
+            .replace(/\/\*.*?\*\//g, '')
+            .trim()
+
+          if (process.env.TURBOPACK && useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+              }"
+            `)
+          } else if (process.env.TURBOPACK && !useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+              }"
+            `)
+          } else if (useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`".red-text{color:red}"`)
+          } else {
+            expect(cssContent).toMatchInlineSnapshot(`".red-text{color:red}"`)
+          }
         })
       })
     }
@@ -160,6 +246,8 @@ describe('Multi Global Support', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(fixturesDir, 'multi-global')
       const nextConfig = new File(join(appDir, 'next.config.js'))
 
@@ -179,30 +267,66 @@ module.exports = {
 
         beforeAll(async () => {
           await remove(join(appDir, '.next'))
+          const { code } = await nextBuild(appDir)
+          if (code !== 0) {
+            throw new Error('Failed to build')
+          }
+
+          appPort = await findPort()
+          app = await nextStart(appDir, appPort)
         })
 
-        it('should compile successfully', async () => {
-          const { code, stdout } = await nextBuild(appDir, [], {
-            stdout: true,
-          })
-          expect(code).toBe(0)
-          expect(stdout).toMatch(/Compiled successfully/)
+        afterAll(async () => {
+          await killApp(app)
         })
 
         it(`should've emitted a single CSS file`, async () => {
-          const cssFolder = join(appDir, '.next/static/css')
+          const content = await renderViaHTTP(appPort, '/')
+          const $ = cheerio.load(content)
 
-          const files = await readdir(cssFolder)
-          const cssFiles = files.filter((f) => /\.css$/.test(f))
+          const cssSheet = $('link[rel="stylesheet"]')
+          expect(cssSheet.length).toBe(1)
+          const stylesheet = cssSheet.attr('href')
 
-          expect(cssFiles.length).toBe(1)
-          const cssContent = await readFile(
-            join(cssFolder, cssFiles[0]),
-            'utf8'
+          const cssContent = (
+            await fetchViaHTTP(appPort, stylesheet).then((res) => res.text())
           )
-          expect(
-            cssContent.replace(/\/\*.*?\*\//g, '').trim()
-          ).toMatchSnapshot()
+            .replace(/\/\*.*?\*\//g, '')
+            .trim()
+
+          if (process.env.TURBOPACK && useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+              }
+
+
+
+              .blue-text {
+                color: #00f;
+              }"
+            `)
+          } else if (process.env.TURBOPACK && !useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+              }
+
+
+
+              .blue-text {
+                color: #00f;
+              }"
+            `)
+          } else if (useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(
+              `".red-text{color:red}.blue-text{color:#00f}"`
+            )
+          } else {
+            expect(cssContent).toMatchInlineSnapshot(
+              `".red-text{color:red}.blue-text{color:blue}"`
+            )
+          }
         })
       })
     }
@@ -213,6 +337,8 @@ describe('Nested @import() Global Support', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(fixturesDir, 'nested-global')
       const nextConfig = new File(join(appDir, 'next.config.js'))
 
@@ -232,30 +358,94 @@ module.exports = {
 
         beforeAll(async () => {
           await remove(join(appDir, '.next'))
+          const { code } = await nextBuild(appDir)
+          if (code !== 0) {
+            throw new Error('Failed to build')
+          }
+
+          appPort = await findPort()
+          app = await nextStart(appDir, appPort)
         })
 
-        it('should compile successfully', async () => {
-          const { code, stdout } = await nextBuild(appDir, [], {
-            stdout: true,
-          })
-          expect(code).toBe(0)
-          expect(stdout).toMatch(/Compiled successfully/)
+        afterAll(async () => {
+          await killApp(app)
         })
 
         it(`should've emitted a single CSS file`, async () => {
-          const cssFolder = join(appDir, '.next/static/css')
+          const content = await renderViaHTTP(appPort, '/')
+          const $ = cheerio.load(content)
 
-          const files = await readdir(cssFolder)
-          const cssFiles = files.filter((f) => /\.css$/.test(f))
+          const cssSheet = $('link[rel="stylesheet"]')
+          expect(cssSheet.length).toBe(1)
+          const stylesheet = cssSheet.attr('href')
 
-          expect(cssFiles.length).toBe(1)
-          const cssContent = await readFile(
-            join(cssFolder, cssFiles[0]),
-            'utf8'
+          const cssContent = (
+            await fetchViaHTTP(appPort, stylesheet).then((res) => res.text())
           )
-          expect(
-            cssContent.replace(/\/\*.*?\*\//g, '').trim()
-          ).toMatchSnapshot()
+            .replace(/\/\*.*?\*\//g, '')
+            .trim()
+
+          if (process.env.TURBOPACK && useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: purple;
+                font-weight: bolder;
+              }
+
+
+
+              .red-text {
+                color: red;
+              }
+
+
+
+              .blue-text {
+                color: orange;
+                font-weight: bolder;
+              }
+
+
+
+              .blue-text {
+                color: #00f;
+              }"
+            `)
+          } else if (process.env.TURBOPACK && !useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: purple;
+                font-weight: bolder;
+              }
+
+
+
+              .red-text {
+                color: red;
+              }
+
+
+
+              .blue-text {
+                color: orange;
+                font-weight: bolder;
+              }
+
+
+
+              .blue-text {
+                color: #00f;
+              }"
+            `)
+          } else if (useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(
+              `".red-text{color:purple;font-weight:bolder;color:red}.blue-text{color:orange;font-weight:bolder;color:#00f}"`
+            )
+          } else {
+            expect(cssContent).toMatchInlineSnapshot(
+              `".red-text{color:purple;font-weight:bolder;color:red}.blue-text{color:orange;font-weight:bolder;color:blue}"`
+            )
+          }
         })
       })
     }
@@ -267,6 +457,8 @@ describe('Multi Global Support (reversed)', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(fixturesDir, 'multi-global-reversed')
       const nextConfig = new File(join(appDir, 'next.config.js'))
 
@@ -286,30 +478,66 @@ module.exports = {
 
         beforeAll(async () => {
           await remove(join(appDir, '.next'))
+          const { code } = await nextBuild(appDir)
+          if (code !== 0) {
+            throw new Error('Failed to build')
+          }
+
+          appPort = await findPort()
+          app = await nextStart(appDir, appPort)
         })
 
-        it('should compile successfully', async () => {
-          const { code, stdout } = await nextBuild(appDir, [], {
-            stdout: true,
-          })
-          expect(code).toBe(0)
-          expect(stdout).toMatch(/Compiled successfully/)
+        afterAll(async () => {
+          await killApp(app)
         })
 
         it(`should've emitted a single CSS file`, async () => {
-          const cssFolder = join(appDir, '.next/static/css')
+          const content = await renderViaHTTP(appPort, '/')
+          const $ = cheerio.load(content)
 
-          const files = await readdir(cssFolder)
-          const cssFiles = files.filter((f) => /\.css$/.test(f))
+          const cssSheet = $('link[rel="stylesheet"]')
+          expect(cssSheet.length).toBe(1)
+          const stylesheet = cssSheet.attr('href')
 
-          expect(cssFiles.length).toBe(1)
-          const cssContent = await readFile(
-            join(cssFolder, cssFiles[0]),
-            'utf8'
+          const cssContent = (
+            await fetchViaHTTP(appPort, stylesheet).then((res) => res.text())
           )
-          expect(
-            cssContent.replace(/\/\*.*?\*\//g, '').trim()
-          ).toMatchSnapshot()
+            .replace(/\/\*.*?\*\//g, '')
+            .trim()
+
+          if (process.env.TURBOPACK && useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".blue-text {
+                color: #00f;
+              }
+
+
+
+              .red-text {
+                color: red;
+              }"
+            `)
+          } else if (process.env.TURBOPACK && !useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".blue-text {
+                color: #00f;
+              }
+
+
+
+              .red-text {
+                color: red;
+              }"
+            `)
+          } else if (useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(
+              `".blue-text{color:#00f}.red-text{color:red}"`
+            )
+          } else {
+            expect(cssContent).toMatchInlineSnapshot(
+              `".blue-text{color:blue}.red-text{color:red}"`
+            )
+          }
         })
       })
     }
@@ -320,6 +548,8 @@ describe('CSS URL via `file-loader`', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(fixturesDir, 'url-global')
       const nextConfig = new File(join(appDir, 'next.config.js'))
 
@@ -339,47 +569,84 @@ module.exports = {
 
         beforeAll(async () => {
           await remove(join(appDir, '.next'))
+          const { code } = await nextBuild(appDir)
+          if (code !== 0) {
+            throw new Error('Failed to build')
+          }
+
+          appPort = await findPort()
+          app = await nextStart(appDir, appPort)
         })
 
-        it('should compile successfully', async () => {
-          const { code, stdout } = await nextBuild(appDir, [], {
-            stdout: true,
-          })
-          expect(code).toBe(0)
-          expect(stdout).toMatch(/Compiled successfully/)
+        afterAll(async () => {
+          await killApp(app)
         })
 
         it(`should've emitted expected files`, async () => {
-          const cssFolder = join(appDir, '.next/static/css')
-          const mediaFolder = join(appDir, '.next/static/media')
+          const content = await renderViaHTTP(appPort, '/')
+          const $ = cheerio.load(content)
 
-          const files = await readdir(cssFolder)
-          const cssFiles = files.filter((f) => /\.css$/.test(f))
+          const cssSheet = $('link[rel="stylesheet"]')
+          expect(cssSheet.length).toBe(1)
+          const stylesheet = cssSheet.attr('href')
 
-          expect(cssFiles.length).toBe(1)
-          const cssContent = await readFile(
-            join(cssFolder, cssFiles[0]),
-            'utf8'
+          const cssContent = (
+            await fetchViaHTTP(appPort, stylesheet).then((res) => res.text())
           )
-          expect(
-            cssContent.replace(/\/\*.*?\*\//g, '').trim()
-          ).toMatchSnapshot()
-
-          const mediaFiles = await readdir(mediaFolder)
-          expect(mediaFiles.length).toBe(3)
-          expect(
-            mediaFiles
-              .map((fileName) =>
-                /^(.+?)\..{8}\.(.+?)$/.exec(fileName).slice(1).join('.')
-              )
-              .sort()
-          ).toMatchInlineSnapshot(`
-        [
-          "dark.svg",
-          "dark2.svg",
-          "light.svg",
-        ]
-      `)
+            .replace(/\/\*.*?\*\//g, '')
+            .trim()
+
+          if (process.env.TURBOPACK && useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+                background-image: url("../media/dark.993bedd3.svg") url("../media/dark2.993bedd3.svg");
+              }
+
+
+
+              .blue-text {
+                color: orange;
+                font-weight: bolder;
+                background-image: url("../media/light.180573e4.svg");
+              }
+
+
+
+              .blue-text {
+                color: #00f;
+              }"
+            `)
+          } else if (process.env.TURBOPACK && !useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(`
+              ".red-text {
+                color: red;
+                background-image: url("../media/dark.993bedd3.svg") url("../media/dark2.993bedd3.svg");
+              }
+
+
+
+              .blue-text {
+                color: orange;
+                font-weight: bolder;
+                background-image: url("../media/light.180573e4.svg");
+              }
+
+
+
+              .blue-text {
+                color: #00f;
+              }"
+            `)
+          } else if (useLightningcss) {
+            expect(cssContent).toMatchInlineSnapshot(
+              `".red-text{color:red;background-image:url(/_next/static/media/dark.6b01655b.svg) url(/_next/static/media/dark2.6b01655b.svg)}.blue-text{color:orange;background-image:url(/_next/static/media/light.2da1d3d6.svg);font-weight:bolder;color:#00f}"`
+            )
+          } else {
+            expect(cssContent).toMatchInlineSnapshot(
+              `".red-text{color:red;background-image:url(/_next/static/media/dark.6b01655b.svg) url(/_next/static/media/dark2.6b01655b.svg)}.blue-text{color:orange;font-weight:bolder;background-image:url(/_next/static/media/light.2da1d3d6.svg);color:blue}"`
+            )
+          }
         })
       })
     }
@@ -390,48 +657,67 @@ describe('CSS URL via `file-loader` and asset prefix (1)', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(fixturesDir, 'url-global-asset-prefix-1')
 
       beforeAll(async () => {
         await remove(join(appDir, '.next'))
+        const { code } = await nextBuild(appDir)
+        if (code !== 0) {
+          throw new Error('Failed to build')
+        }
+
+        appPort = await findPort()
+        app = await nextStart(appDir, appPort)
       })
 
-      it('should compile successfully', async () => {
-        const { code, stdout } = await nextBuild(appDir, [], {
-          stdout: true,
-        })
-        expect(code).toBe(0)
-        expect(stdout).toMatch(/Compiled successfully/)
+      afterAll(async () => {
+        await killApp(app)
       })
 
       it(`should've emitted expected files`, async () => {
-        const cssFolder = join(appDir, '.next/static/css')
-        const mediaFolder = join(appDir, '.next/static/media')
+        const content = await renderViaHTTP(appPort, '/')
+        const $ = cheerio.load(content)
 
-        const files = await readdir(cssFolder)
-        const cssFiles = files.filter((f) => /\.css$/.test(f))
+        const cssSheet = $('link[rel="stylesheet"]')
+        expect(cssSheet.length).toBe(1)
+        const stylesheet = cssSheet.attr('href')
 
-        expect(cssFiles.length).toBe(1)
-        const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')
-        expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatch(
-          /^\.red-text\{color:red;background-image:url\(\/foo\/_next\/static\/media\/dark\.[a-f0-9]{8}\.svg\) url\(\/foo\/_next\/static\/media\/dark2\.[a-f0-9]{8}\.svg\)\}\.blue-text\{color:orange;font-weight:bolder;background-image:url\(\/foo\/_next\/static\/media\/light\.[a-f0-9]{8}\.svg\);color:blue\}$/
+        const cssContent = (
+          await fetchViaHTTP(appPort, stylesheet.replace('/foo/', '/')).then(
+            (res) => res.text()
+          )
         )
+          .replace(/\/\*.*?\*\//g, '')
+          .trim()
 
-        const mediaFiles = await readdir(mediaFolder)
-        expect(mediaFiles.length).toBe(3)
-        expect(
-          mediaFiles
-            .map((fileName) =>
-              /^(.+?)\..{8}\.(.+?)$/.exec(fileName).slice(1).join('.')
-            )
-            .sort()
-        ).toMatchInlineSnapshot(`
-      [
-        "dark.svg",
-        "dark2.svg",
-        "light.svg",
-      ]
-    `)
+        if (process.env.TURBOPACK) {
+          expect(cssContent).toMatchInlineSnapshot(`
+            ".red-text {
+              color: red;
+              background-image: url("../media/dark.993bedd3.svg") url("../media/dark2.993bedd3.svg");
+            }
+
+
+
+            .blue-text {
+              color: orange;
+              font-weight: bolder;
+              background-image: url("../media/light.180573e4.svg");
+            }
+
+
+
+            .blue-text {
+              color: #00f;
+            }"
+          `)
+        } else {
+          expect(cssContent).toMatchInlineSnapshot(
+            `".red-text{color:red;background-image:url(/foo/_next/static/media/dark.6b01655b.svg) url(/foo/_next/static/media/dark2.6b01655b.svg)}.blue-text{color:orange;font-weight:bolder;background-image:url(/foo/_next/static/media/light.2da1d3d6.svg);color:blue}"`
+          )
+        }
       })
     }
   )
@@ -441,48 +727,65 @@ describe('CSS URL via `file-loader` and asset prefix (2)', () => {
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
     'production mode',
     () => {
+      let appPort
+      let app
       const appDir = join(fixturesDir, 'url-global-asset-prefix-2')
 
       beforeAll(async () => {
         await remove(join(appDir, '.next'))
+        const { code } = await nextBuild(appDir)
+        if (code !== 0) {
+          throw new Error('Failed to build')
+        }
+
+        appPort = await findPort()
+        app = await nextStart(appDir, appPort)
       })
 
-      it('should compile successfully', async () => {
-        const { code, stdout } = await nextBuild(appDir, [], {
-          stdout: true,
-        })
-        expect(code).toBe(0)
-        expect(stdout).toMatch(/Compiled successfully/)
+      afterAll(async () => {
+        await killApp(app)
       })
 
       it(`should've emitted expected files`, async () => {
-        const cssFolder = join(appDir, '.next/static/css')
-        const mediaFolder = join(appDir, '.next/static/media')
+        const content = await renderViaHTTP(appPort, '/')
+        const $ = cheerio.load(content)
 
-        const files = await readdir(cssFolder)
-        const cssFiles = files.filter((f) => /\.css$/.test(f))
+        const cssSheet = $('link[rel="stylesheet"]')
+        expect(cssSheet.length).toBe(1)
+        const stylesheet = cssSheet.attr('href')
 
-        expect(cssFiles.length).toBe(1)
-        const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')
-        expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatch(
-          /^\.red-text\{color:red;background-image:url\(\/foo\/_next\/static\/media\/dark\.[a-f0-9]{8}\.svg\) url\(\/foo\/_next\/static\/media\/dark2\.[a-f0-9]{8}\.svg\)\}\.blue-text\{color:orange;font-weight:bolder;background-image:url\(\/foo\/_next\/static\/media\/light\.[a-f0-9]{8}\.svg\);color:blue\}$/
+        const cssContent = (
+          await fetchViaHTTP(appPort, stylesheet).then((res) => res.text())
         )
+          .replace(/\/\*.*?\*\//g, '')
+          .trim()
 
-        const mediaFiles = await readdir(mediaFolder)
-        expect(mediaFiles.length).toBe(3)
-        expect(
-          mediaFiles
-            .map((fileName) =>
-              /^(.+?)\..{8}\.(.+?)$/.exec(fileName).slice(1).join('.')
-            )
-            .sort()
-        ).toMatchInlineSnapshot(`
-      [
-        "dark.svg",
-        "dark2.svg",
-        "light.svg",
-      ]
-    `)
+        if (process.env.TURBOPACK) {
+          expect(cssContent).toMatchInlineSnapshot(`
+            ".red-text {
+              color: red;
+              background-image: url("../media/dark.993bedd3.svg") url("../media/dark2.993bedd3.svg");
+            }
+
+
+
+            .blue-text {
+              color: orange;
+              font-weight: bolder;
+              background-image: url("../media/light.180573e4.svg");
+            }
+
+
+
+            .blue-text {
+              color: #00f;
+            }"
+          `)
+        } else {
+          expect(cssContent).toMatchInlineSnapshot(
+            `".red-text{color:red;background-image:url(/foo/_next/static/media/dark.6b01655b.svg) url(/foo/_next/static/media/dark2.6b01655b.svg)}.blue-text{color:orange;font-weight:bolder;background-image:url(/foo/_next/static/media/light.2da1d3d6.svg);color:blue}"`
+          )
+        }
       })
     }
   )
diff --git a/test/integration/link-ref/pages/child-ref-func-cleanup.js b/test/integration/link-ref/pages/child-ref-func-cleanup.js
new file mode 100644
index 0000000000000..50d9be294c717
--- /dev/null
+++ b/test/integration/link-ref/pages/child-ref-func-cleanup.js
@@ -0,0 +1,52 @@
+import React from 'react'
+import Link from 'next/link'
+import { useCallback, useRef, useEffect, useState } from 'react'
+import { flushSync } from 'react-dom'
+
+export default function Page() {
+  const [isVisible, setIsVisible] = useState(true)
+
+  const statusRef = useRef({ wasInitialized: false, wasCleanedUp: false })
+
+  const refWithCleanup = useCallback((el) => {
+    if (!el) {
+      console.error(
+        'callback refs that returned a cleanup should never be called with null'
+      )
+      return
+    }
+
+    statusRef.current.wasInitialized = true
+    return () => {
+      statusRef.current.wasCleanedUp = true
+    }
+  }, [])
+
+  useEffect(() => {
+    const timeout = setTimeout(
+      () => {
+        flushSync(() => {
+          setIsVisible(false)
+        })
+        if (!statusRef.current.wasInitialized) {
+          console.error('callback ref was not initialized')
+        }
+        if (!statusRef.current.wasCleanedUp) {
+          console.error('callback ref was not cleaned up')
+        }
+      },
+      100 // if we hide the Link too quickly, the prefetch won't fire, failing a test
+    )
+    return () => clearTimeout(timeout)
+  }, [])
+
+  if (!isVisible) {
+    return null
+  }
+
+  return (
+    <Link href="/" ref={refWithCleanup}>
+      Click me
+    </Link>
+  )
+}
diff --git a/test/integration/link-ref/test/index.test.js b/test/integration/link-ref/test/index.test.js
index 387e08ae5303a..433a3fcec87db 100644
--- a/test/integration/link-ref/test/index.test.js
+++ b/test/integration/link-ref/test/index.test.js
@@ -84,6 +84,10 @@ describe('Invalid hrefs', () => {
       it('should handle child ref that is a function', async () => {
         await noError('/child-ref-func')
       })
+
+      it('should handle child ref that is a function that returns a cleanup function', async () => {
+        await noError('/child-ref-func-cleanup')
+      })
     }
   )
   ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
@@ -109,6 +113,10 @@ describe('Invalid hrefs', () => {
       it('should preload with child ref with function', async () => {
         await didPrefetch('/child-ref-func')
       })
+
+      it('should preload with child ref with function that returns a cleanup function', async () => {
+        await didPrefetch('/child-ref-func-cleanup')
+      })
     }
   )
 })
diff --git a/test/integration/next-image-new/app-dir/app/ref-cleanup/page.js b/test/integration/next-image-new/app-dir/app/ref-cleanup/page.js
new file mode 100644
index 0000000000000..98b0dca18430f
--- /dev/null
+++ b/test/integration/next-image-new/app-dir/app/ref-cleanup/page.js
@@ -0,0 +1,43 @@
+'use client'
+import Image from 'next/image'
+import { useCallback, useEffect, useState } from 'react'
+
+export default function Home() {
+  const [displayImage, setDisplayImage] = useState(true)
+
+  const refWithCleanup = useCallback((el) => {
+    if (!el) {
+      throw new Error(
+        'callback refs that returned a cleanup should never be called with null'
+      )
+    }
+
+    return () => {
+      console.log('callback ref was cleaned up')
+    }
+  }, [])
+
+  useEffect(() => {
+    setDisplayImage(false)
+  }, [])
+
+  return (
+    <main>
+      <h1>Should call ref cleanup on unmount</h1>
+      <section>
+        {displayImage ? (
+          <div style={{ position: 'relative', width: 10, height: 10 }}>
+            <Image
+              ref={refWithCleanup}
+              priority
+              fill
+              src="/test.jpg"
+              alt="alt"
+              sizes="10px"
+            />
+          </div>
+        ) : null}
+      </section>
+    </main>
+  )
+}
diff --git a/test/integration/next-image-new/app-dir/test/index.test.ts b/test/integration/next-image-new/app-dir/test/index.test.ts
index baa09158b5df2..9917e4d24ddf6 100644
--- a/test/integration/next-image-new/app-dir/test/index.test.ts
+++ b/test/integration/next-image-new/app-dir/test/index.test.ts
@@ -14,6 +14,7 @@ import {
   nextBuild,
   nextStart,
   renderViaHTTP,
+  retry,
   waitFor,
 } from 'next-test-utils'
 import webdriver from 'next-webdriver'
@@ -1574,6 +1575,19 @@ function runTests(mode) {
       }
     }
   })
+
+  it('should call callback ref cleanups when unmounting', async () => {
+    const browser = await webdriver(appPort, '/ref-cleanup')
+    const getLogs = async () => (await browser.log()).map((log) => log.message)
+
+    await retry(async () => {
+      expect(await getLogs()).toContain('callback ref was cleaned up')
+    })
+
+    expect(await getLogs()).not.toContain(
+      'callback refs that returned a cleanup should never be called with null'
+    )
+  })
 }
 
 describe('Image Component Default Tests', () => {
diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
index dbbf50fd0952d..c35762b4aa94d 100644
--- a/test/turbopack-build-tests-manifest.json
+++ b/test/turbopack-build-tests-manifest.json
@@ -521,7 +521,9 @@
         "app-dir with middleware Mutate request headers for next/headers Supports draft mode",
         "app-dir with middleware Mutate request headers for next/headers Updates headers",
         "app-dir with middleware should be possible to modify cookies & read them in an RSC in a single request",
-        "app-dir with middleware should filter correctly after middleware rewrite"
+        "app-dir with middleware should be possible to read cookies that are set during the middleware handling of a server action",
+        "app-dir with middleware should filter correctly after middleware rewrite",
+        "app-dir with middleware should respect cookie options of merged middleware cookies"
       ],
       "failed": [],
       "pending": [],
@@ -1043,6 +1045,7 @@
         "app dir - basic next/script should pass on extra props for beforeInteractive scripts with a src prop",
         "app dir - basic next/script should pass on extra props for beforeInteractive scripts without a src prop",
         "app dir - basic next/script should support next/script and render in correct order",
+        "app dir - basic outputs correct build-diagnostics.json",
         "app dir - basic rewrites should support rewrites on client-side navigation",
         "app dir - basic rewrites should support rewrites on client-side navigation from pages to app with existing pages path",
         "app dir - basic rewrites should support rewrites on initial load",
@@ -1076,6 +1079,7 @@
         "app dir - basic server components should serve client component should serve client-side",
         "app dir - basic server components should serve client component should serve server-side",
         "app dir - basic server components should serve shared component",
+        "app dir - basic should contain framework.json",
         "app dir - basic should ensure the </body></html> suffix is at the end of the stream",
         "app dir - basic should handle hash in initial url",
         "app dir - basic should have correct searchParams and params (client)",
@@ -1130,7 +1134,11 @@
       "passed": [],
       "failed": [],
       "pending": [
-        "should output updated trace files should have file hashes in trace files"
+        "should output updated trace files should hard navigate on chunk load failure",
+        "should output updated trace files should have file hashes in trace files",
+        "should output updated trace files should only rebuild a changed app and pages route correctly",
+        "should output updated trace files should only rebuild just a changed app route correctly",
+        "should output updated trace files should only rebuild just a changed pages route correctly"
       ],
       "flakey": [],
       "runtimeError": false
@@ -1169,6 +1177,7 @@
         "app dir - basic next/script should pass on extra props for beforeInteractive scripts with a src prop",
         "app dir - basic next/script should pass on extra props for beforeInteractive scripts without a src prop",
         "app dir - basic next/script should support next/script and render in correct order",
+        "app dir - basic outputs correct build-diagnostics.json",
         "app dir - basic rewrites should support rewrites on client-side navigation",
         "app dir - basic rewrites should support rewrites on client-side navigation from pages to app with existing pages path",
         "app dir - basic rewrites should support rewrites on initial load",
@@ -1202,6 +1211,7 @@
         "app dir - basic server components should serve client component should serve client-side",
         "app dir - basic server components should serve client component should serve server-side",
         "app dir - basic server components should serve shared component",
+        "app dir - basic should contain framework.json",
         "app dir - basic should ensure the </body></html> suffix is at the end of the stream",
         "app dir - basic should handle hash in initial url",
         "app dir - basic should have correct preferredRegion values in manifest",
@@ -1214,7 +1224,6 @@
         "app dir - basic should match redirects in pages correctly $path",
         "app dir - basic should not apply client router filter on shallow",
         "app dir - basic should not create new root layout when nested (optional)",
-        "app dir - basic should not have entire prerender-manifest for edge",
         "app dir - basic should not include parent when not in parent directory",
         "app dir - basic should not rerender layout when navigating between routes in the same layout",
         "app dir - basic should not serve when layout is provided but no folder index",
@@ -1243,9 +1252,7 @@
       "failed": [
         "app dir - basic should encode chunk path correctly",
         "app dir - basic should generate build traces correctly",
-        "app dir - basic should not have loader generated function for edge runtime",
-        "app dir - basic should contain framework.json",
-        "app dir - basic outputs correct build-diagnostics.json"
+        "app dir - basic should not have loader generated function for edge runtime"
       ],
       "pending": [
         "app dir - basic known bugs should support React fetch instrumentation client component",
@@ -1257,15 +1264,6 @@
       "flakey": [],
       "runtimeError": false
     },
-    "test/e2e/app-dir/app/provide-paths.test.ts": {
-      "passed": [],
-      "failed": [
-        "Provided page/app paths should only build the provided paths"
-      ],
-      "pending": [],
-      "flakey": [],
-      "runtimeError": false
-    },
     "test/e2e/app-dir/app/standalone-gsp.test.ts": {
       "passed": [],
       "failed": [
@@ -1542,6 +1540,15 @@
       "flakey": [],
       "runtimeError": false
     },
+    "test/e2e/app-dir/disable-logging-route/disable-logging-route.test.ts": {
+      "passed": [
+        "app-dir - disable-logging-route should not log if disabled logging"
+      ],
+      "failed": [],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
     "test/e2e/app-dir/draft-mode-middleware/draft-mode-middleware.test.ts": {
       "passed": [
         "app-dir - draft-mode-middleware should be able to disable draft mode with middleware present",
@@ -2001,7 +2008,7 @@
         "app-dir - logging with default logging should not log fetch requests at all",
         "app-dir - logging with fetches default logging should only log requests in development mode",
         "app-dir - logging with fetches verbose logging should only log requests in development mode",
-        "app-dir - logging with verbose logging for edge runtime should not log fetch requests at all"
+        "app-dir - logging with verbose logging for edge runtime should only log requests in development mode"
       ],
       "failed": [],
       "pending": [],
@@ -2010,9 +2017,7 @@
     },
     "test/e2e/app-dir/logging/fetch-warning.test.ts": {
       "passed": [
-        "app-dir - fetch warnings should log when request input is a Request instance",
-        "app-dir - fetch warnings should log when request input is a string",
-        "app-dir - fetch warnings should not log when overriding cache within the Request object"
+        "app-dir - fetch warnings should not log fetch warnings in production"
       ],
       "failed": [],
       "pending": [],
@@ -3277,6 +3282,13 @@
       "flakey": [],
       "runtimeError": false
     },
+    "test/e2e/app-dir/remove-console/remove-console.test.ts": {
+      "passed": ["remove-console should remove console.log"],
+      "failed": [],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
     "test/e2e/app-dir/resolve-extensions/resolve-extensions.test.ts": {
       "passed": [
         "turbo-resolve-extensions should SSR",
@@ -4961,6 +4973,15 @@
       "flakey": [],
       "runtimeError": false
     },
+    "test/e2e/instrumentation-hook/register-once/register-once.test.ts": {
+      "passed": [
+        "instrumentation-hook - register-once should only register once"
+      ],
+      "failed": [],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
     "test/e2e/link-with-api-rewrite/index.test.ts": {
       "passed": [
         "link-with-api-rewrite should perform hard navigation for direct urls",
@@ -5665,6 +5686,31 @@
       "flakey": [],
       "runtimeError": false
     },
+    "test/e2e/on-request-error/dynamic-routes/dynamic-routes.test.ts": {
+      "passed": [
+        "on-request-error - dynamic-routes app router should catch app router dynamic page error with search params",
+        "on-request-error - dynamic-routes app router should catch app router dynamic routes error with search params",
+        "on-request-error - dynamic-routes app router should catch suspense rendering page error in node runtime",
+        "on-request-error - dynamic-routes pages router should catch pages router dynamic API route error with search params",
+        "on-request-error - dynamic-routes pages router should catch pages router dynamic page error with search params"
+      ],
+      "failed": [],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
+    "test/e2e/on-request-error/server-action-error/server-action-error.test.ts": {
+      "passed": [
+        "on-request-error - server-action-error should catch server action error in listener callback in edge runtime",
+        "on-request-error - server-action-error should catch server action error in listener callback in nodejs runtime",
+        "on-request-error - server-action-error should catch the server action form error in edge runtime",
+        "on-request-error - server-action-error should catch the server action form error in nodejs runtime"
+      ],
+      "failed": [],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
     "test/e2e/on-request-error/skip-next-internal-error/skip-next-internal-error.test.ts": {
       "passed": [
         "on-request-error - skip-next-internal-error app router API should not catch server component not-found errors",
@@ -5673,6 +5719,8 @@
         "on-request-error - skip-next-internal-error app router render should not catch client component not-found errors",
         "on-request-error - skip-next-internal-error app router render should not catch client component redirect errors",
         "on-request-error - skip-next-internal-error app router render should not catch next dynamic no-ssr errors",
+        "on-request-error - skip-next-internal-error app router render should not catch server action not-found errors",
+        "on-request-error - skip-next-internal-error app router render should not catch server action redirect errors",
         "on-request-error - skip-next-internal-error app router render should not catch server component dynamic usage errors",
         "on-request-error - skip-next-internal-error app router render should not catch server component not-found errors",
         "on-request-error - skip-next-internal-error app router render should not catch server component redirect errors"
@@ -6470,8 +6518,18 @@
       "passed": [],
       "failed": [],
       "pending": [
-        "AMP Usage production mode With basic AMP usage should not output client pages for AMP only",
-        "AMP Usage production mode With basic AMP usage should not output client pages for AMP only with config exported after declaration",
+        "AMP Usage AMP dev no-warn should not warn on valid amp",
+        "AMP Usage AMP development mode should add data-ampdevmode to development script tags",
+        "AMP Usage AMP development mode should detect amp validator warning on custom scripts",
+        "AMP Usage AMP development mode should detect amp validator warning on invalid amp",
+        "AMP Usage AMP development mode should detect changes and refresh a hybrid AMP page",
+        "AMP Usage AMP development mode should detect changes and refresh an AMP page",
+        "AMP Usage AMP development mode should detect changes and refresh an AMP page at root pages/",
+        "AMP Usage AMP development mode should detect changes to component and refresh an AMP page",
+        "AMP Usage AMP development mode should detect the changes and display it",
+        "AMP Usage AMP development mode should navigate from non-AMP to AMP without error",
+        "AMP Usage AMP development mode should not contain missing files warning",
+        "AMP Usage AMP development mode should not reload unless the page is edited for an AMP page",
         "AMP Usage production mode With AMP context should render nested AMP page with AMP hook",
         "AMP Usage production mode With AMP context should render nested normal page with AMP hook",
         "AMP Usage production mode With AMP context should render the AMP page that uses the AMP hook",
@@ -6479,6 +6537,8 @@
         "AMP Usage production mode With basic AMP usage should auto import extensions",
         "AMP Usage production mode With basic AMP usage should drop custom scripts",
         "AMP Usage production mode With basic AMP usage should not drop custom amp scripts",
+        "AMP Usage production mode With basic AMP usage should not output client pages for AMP only",
+        "AMP Usage production mode With basic AMP usage should not output client pages for AMP only with config exported after declaration",
         "AMP Usage production mode With basic AMP usage should optimize clean",
         "AMP Usage production mode With basic AMP usage should render the page as valid AMP",
         "AMP Usage production mode With basic AMP usage should render the page without leaving render target",
@@ -6495,19 +6555,7 @@
         "AMP Usage production mode combined styles should combine style tags",
         "AMP Usage production mode combined styles should remove sourceMaps from styles",
         "AMP Usage production mode should have amp optimizer in trace",
-        "AMP Usage production mode should not contain missing files warning",
-        "AMP Usage AMP dev no-warn should not warn on valid amp",
-        "AMP Usage AMP development mode should add data-ampdevmode to development script tags",
-        "AMP Usage AMP development mode should detect amp validator warning on custom scripts",
-        "AMP Usage AMP development mode should detect amp validator warning on invalid amp",
-        "AMP Usage AMP development mode should navigate from non-AMP to AMP without error",
-        "AMP Usage AMP development mode should not contain missing files warning",
-        "AMP Usage AMP development mode should detect changes and refresh a hybrid AMP page",
-        "AMP Usage AMP development mode should detect changes and refresh an AMP page",
-        "AMP Usage AMP development mode should detect changes and refresh an AMP page at root pages/",
-        "AMP Usage AMP development mode should detect changes to component and refresh an AMP page",
-        "AMP Usage AMP development mode should detect the changes and display it",
-        "AMP Usage AMP development mode should not reload unless the page is edited for an AMP page"
+        "AMP Usage production mode should not contain missing files warning"
       ],
       "flakey": [],
       "runtimeError": false
@@ -7646,9 +7694,7 @@
         "Multi Global Support production mode useLightnincsss(false) should compile successfully",
         "Multi Global Support production mode useLightnincsss(true) should compile successfully",
         "Nested @import() Global Support production mode useLightnincsss(false) should compile successfully",
-        "Nested @import() Global Support production mode useLightnincsss(true) should compile successfully"
-      ],
-      "failed": [
+        "Nested @import() Global Support production mode useLightnincsss(true) should compile successfully",
         "Basic Global Support production mode useLightnincsss(false) should've emitted a single CSS file",
         "Basic Global Support production mode useLightnincsss(true) should've emitted a single CSS file",
         "Basic Global Support with special characters in path production mode useLightnincsss(false) should've emitted a single CSS file",
@@ -7666,6 +7712,7 @@
         "Nested @import() Global Support production mode useLightnincsss(false) should've emitted a single CSS file",
         "Nested @import() Global Support production mode useLightnincsss(true) should've emitted a single CSS file"
       ],
+      "failed": [],
       "pending": [],
       "flakey": [],
       "runtimeError": false
@@ -12757,14 +12804,14 @@
     },
     "test/integration/next-image-legacy/base-path/test/static.test.ts": {
       "passed": [
+        "Build Error Tests for basePath production mode should throw build error when import statement is used with missing file",
         "Static Image Component Tests for basePath production mode Should add a blur placeholder to statically imported jpg",
         "Static Image Component Tests for basePath production mode Should add a blur placeholder to statically imported png",
         "Static Image Component Tests for basePath production mode Should allow an image with a static src to omit height and width",
         "Static Image Component Tests for basePath production mode Should allow provided width and height to override intrinsic",
         "Static Image Component Tests for basePath production mode Should automatically provide an image height and width",
         "Static Image Component Tests for basePath production mode Should use immutable cache-control header even when unoptimized",
-        "Static Image Component Tests for basePath production mode Should use immutable cache-control header for static import",
-        "Build Error Tests for basePath production mode should throw build error when import statement is used with missing file"
+        "Static Image Component Tests for basePath production mode Should use immutable cache-control header for static import"
       ],
       "failed": [],
       "pending": [
@@ -15518,6 +15565,16 @@
       "flakey": [],
       "runtimeError": false
     },
+    "test/production/app-dir/ssg-single-pass/ssg-single-pass.test.ts": {
+      "passed": [
+        "ssg-single-pass should only render the page once during an ISR revalidation",
+        "ssg-single-pass should only render the page once during build"
+      ],
+      "failed": [],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
     "test/production/app-dir/subresource-integrity/subresource-integrity.test.ts": {
       "passed": [],
       "failed": [],
@@ -15901,7 +15958,7 @@
       "failed": [],
       "pending": [],
       "flakey": [],
-      "runtimeError": true
+      "runtimeError": false
     },
     "test/production/jest/new-link-behavior.test.ts": {
       "passed": ["next/jest newLinkBehavior should use new link behavior"],
@@ -15929,7 +15986,7 @@
       "failed": [],
       "pending": [],
       "flakey": [],
-      "runtimeError": true
+      "runtimeError": false
     },
     "test/production/jest/rsc/lib/utils.test.js": {
       "passed": ["works with server-only code"],
@@ -16065,6 +16122,7 @@
         "Production Usage should handle query/hash correctly during query updating #hello? $search",
         "Production Usage should handle query/hash correctly during query updating #hello?world $search",
         "Production Usage should have defer on all script tags",
+        "Production Usage should navigate through history after query update",
         "Production Usage should navigate to external site and back",
         "Production Usage should navigate to external site and back (with query)",
         "Production Usage should navigate to page with CSS and back",
@@ -16084,7 +16142,6 @@
       "failed": [
         "Production Usage process.browser should eliminate client only code on the server",
         "Production Usage process.browser should eliminate server only code on the client",
-        "Production Usage should navigate through history after query update",
         "Production Usage should output traces"
       ],
       "pending": [