diff --git a/Cargo.lock b/Cargo.lock
index c5b50d389c9d4..5fa5380946e6d 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-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "serde",
  "smallvec",
@@ -769,9 +769,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "concurrent-queue"
-version = "2.1.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -3097,7 +3097,7 @@ dependencies = [
 [[package]]
 name = "node-file-trace"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "serde",
@@ -6909,12 +6909,12 @@ dependencies = [
 [[package]]
 name = "turbo-prehash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 
 [[package]]
 name = "turbo-tasks"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6948,7 +6948,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "cargo-lock",
@@ -6961,7 +6961,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-bytes"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "bytes",
@@ -6975,7 +6975,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "dotenvs",
@@ -6989,7 +6989,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fetch"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -7005,7 +7005,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7037,7 +7037,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-hash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "md4",
  "turbo-tasks-macros",
@@ -7047,7 +7047,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "either",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros-shared"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7072,7 +7072,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-malloc"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "mimalloc",
 ]
@@ -7080,7 +7080,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-memory"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7108,7 +7108,7 @@ dependencies = [
 [[package]]
 name = "turbopack"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7138,7 +7138,7 @@ dependencies = [
 [[package]]
 name = "turbopack-binding"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "auto-hash-map",
  "mdxjs",
@@ -7179,7 +7179,7 @@ dependencies = [
 [[package]]
 name = "turbopack-browser"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7202,7 +7202,7 @@ dependencies = [
 [[package]]
 name = "turbopack-cli-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "clap",
@@ -7219,7 +7219,7 @@ dependencies = [
 [[package]]
 name = "turbopack-core"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7248,7 +7248,7 @@ dependencies = [
 [[package]]
 name = "turbopack-css"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7275,7 +7275,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7346,7 +7346,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-hmr-protocol"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "serde",
  "serde_json",
@@ -7357,7 +7357,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-plugins"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7382,7 +7382,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-runtime"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "indoc",
@@ -7398,7 +7398,7 @@ dependencies = [
 [[package]]
 name = "turbopack-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7414,7 +7414,7 @@ dependencies = [
 [[package]]
 name = "turbopack-image"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "base64 0.21.4",
@@ -7433,7 +7433,7 @@ dependencies = [
 [[package]]
 name = "turbopack-json"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "serde",
@@ -7448,7 +7448,7 @@ dependencies = [
 [[package]]
 name = "turbopack-mdx"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "mdxjs",
@@ -7463,7 +7463,7 @@ dependencies = [
 [[package]]
 name = "turbopack-node"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -7497,7 +7497,7 @@ dependencies = [
 [[package]]
 name = "turbopack-nodejs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7517,7 +7517,7 @@ dependencies = [
 [[package]]
 name = "turbopack-resolve"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7535,7 +7535,7 @@ dependencies = [
 [[package]]
 name = "turbopack-static"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "serde",
@@ -7551,7 +7551,7 @@ dependencies = [
 [[package]]
 name = "turbopack-swc-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "swc_core",
  "turbo-tasks",
@@ -7562,7 +7562,7 @@ dependencies = [
 [[package]]
 name = "turbopack-trace-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "either",
@@ -7582,7 +7582,7 @@ dependencies = [
 [[package]]
 name = "turbopack-trace-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -7598,7 +7598,7 @@ dependencies = [
 [[package]]
 name = "turbopack-wasm"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240716.1#99119e25be0f8df7a49a86e78516778b89a805fb"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240718.2#2ad0240c4693c123dcb05487d4dd0b6e625d4aab"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
diff --git a/Cargo.toml b/Cargo.toml
index 649b73ab9b4a3..a6a19d3ee448b 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-240716.1" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240718.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-240716.1" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240718.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240716.1" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240718.2" }
 
 # General Deps
 
diff --git a/packages/next-swc/crates/next-api/src/pages.rs b/packages/next-swc/crates/next-api/src/pages.rs
index e25e617f352cc..c10d371164f08 100644
--- a/packages/next-swc/crates/next-api/src/pages.rs
+++ b/packages/next-swc/crates/next-api/src/pages.rs
@@ -574,7 +574,9 @@ struct PageEndpoint {
     pages_structure: Vc<PagesStructure>,
 }
 
-#[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TaskInput, TraceRawVcs)]
+#[derive(
+    Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs,
+)]
 enum PageEndpointType {
     Api,
     Html,
@@ -582,7 +584,9 @@ enum PageEndpointType {
     SsrOnly,
 }
 
-#[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Debug, TaskInput, TraceRawVcs)]
+#[derive(
+    Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Debug, TaskInput, TraceRawVcs,
+)]
 enum SsrChunkType {
     Page,
     Data,
diff --git a/packages/next-swc/crates/next-api/src/project.rs b/packages/next-swc/crates/next-api/src/project.rs
index f47d1c9f4de00..a2d9e6a94da62 100644
--- a/packages/next-swc/crates/next-api/src/project.rs
+++ b/packages/next-swc/crates/next-api/src/project.rs
@@ -67,7 +67,7 @@ use crate::{
     versioned_content_map::{OutputAssetsOperation, VersionedContentMap},
 };
 
-#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)]
+#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)]
 #[serde(rename_all = "camelCase")]
 pub struct DraftModeOptions {
     pub preview_mode_id: RcStr,
@@ -75,7 +75,7 @@ pub struct DraftModeOptions {
     pub preview_mode_signing_key: RcStr,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)]
+#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)]
 #[serde(rename_all = "camelCase")]
 pub struct ProjectOptions {
     /// A root path from which all files must be nested under. Trying to access
@@ -114,7 +114,7 @@ pub struct ProjectOptions {
     pub preview_props: DraftModeOptions,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)]
+#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)]
 #[serde(rename_all = "camelCase")]
 pub struct PartialProjectOptions {
     /// A root path from which all files must be nested under. Trying to access
@@ -153,7 +153,7 @@ pub struct PartialProjectOptions {
     pub preview_props: Option<DraftModeOptions>,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, TraceRawVcs)]
+#[derive(Debug, Serialize, Deserialize, Clone, TaskInput, PartialEq, Eq, Hash, TraceRawVcs)]
 #[serde(rename_all = "camelCase")]
 pub struct DefineEnv {
     pub client: Vec<(RcStr, RcStr)>,
diff --git a/packages/next-swc/crates/next-core/src/app_structure.rs b/packages/next-swc/crates/next-core/src/app_structure.rs
index 42404bec9c070..c6de21beced87 100644
--- a/packages/next-swc/crates/next-core/src/app_structure.rs
+++ b/packages/next-swc/crates/next-core/src/app_structure.rs
@@ -100,7 +100,9 @@ pub enum MetadataWithAltItem {
 }
 
 /// A single metadata file.
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, TaskInput, TraceRawVcs)]
+#[derive(
+    Copy, Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq, TaskInput, TraceRawVcs,
+)]
 pub enum MetadataItem {
     Static { path: Vc<FileSystemPath> },
     Dynamic { path: Vc<FileSystemPath> },
@@ -472,7 +474,16 @@ impl LoaderTree {
 }
 
 #[derive(
-    Clone, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, ValueDebugFormat, Debug, TaskInput,
+    Clone,
+    PartialEq,
+    Eq,
+    Hash,
+    Serialize,
+    Deserialize,
+    TraceRawVcs,
+    ValueDebugFormat,
+    Debug,
+    TaskInput,
 )]
 pub enum Entrypoint {
     AppPage {
diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs
index 525f68ea1f72d..a952f1aedbfcd 100644
--- a/packages/next-swc/crates/next-core/src/next_client/context.rs
+++ b/packages/next-swc/crates/next-core/src/next_client/context.rs
@@ -128,7 +128,7 @@ pub fn get_client_compile_time_info(
 }
 
 #[turbo_tasks::value(serialization = "auto_for_input")]
-#[derive(Debug, Copy, Clone, Hash, PartialOrd, Ord)]
+#[derive(Debug, Copy, Clone, Hash)]
 pub enum ClientContextType {
     Pages { pages_dir: Vc<FileSystemPath> },
     App { app_dir: Vc<FileSystemPath> },
diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs
index 5b3176c089d2d..cee3671f7c24f 100644
--- a/packages/next-swc/crates/next-core/src/next_server/context.rs
+++ b/packages/next-swc/crates/next-core/src/next_server/context.rs
@@ -79,7 +79,7 @@ use crate::{
 };
 
 #[turbo_tasks::value(serialization = "auto_for_input")]
-#[derive(Debug, Copy, Clone, Hash, PartialOrd, Ord)]
+#[derive(Debug, Copy, Clone, Hash)]
 pub enum ServerContextType {
     Pages {
         pages_dir: Vc<FileSystemPath>,
diff --git a/packages/next-swc/crates/next-core/src/util.rs b/packages/next-swc/crates/next-core/src/util.rs
index 474ff6217d606..fc3d233c34387 100644
--- a/packages/next-swc/crates/next-core/src/util.rs
+++ b/packages/next-swc/crates/next-core/src/util.rs
@@ -36,7 +36,7 @@ use crate::{
 
 const NEXT_TEMPLATE_PATH: &str = "dist/esm/build/templates";
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, TaskInput)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, TaskInput, Serialize, Deserialize)]
 pub enum PathType {
     PagesPage,
     PagesApi,
diff --git a/packages/next/package.json b/packages/next/package.json
index 8c2dbe4e256c8..f15c464cafd8b 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -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-240716.1",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2",
     "acorn": "8.11.3",
     "amphtml-validator": "1.0.35",
     "anser": "1.4.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4c33b158bd13d..9a218451eb3f2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1113,8 +1113,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-240716.1
-        version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240716.1
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2
+        version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2
       acorn:
         specifier: 8.11.3
         version: 8.11.3
@@ -5230,8 +5230,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-240716.1':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240716.1}
+  '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2}
     version: 0.0.0
 
   '@webassemblyjs/ast@1.11.6':
@@ -19823,7 +19823,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-240716.1':
+  '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240718.2':
     dependencies:
       '@types/node': 20.12.3