From 1d8a633595fbbeb80848961c71ff33135313292f Mon Sep 17 00:00:00 2001
From: Will Binns-Smith <wbinnssmith@gmail.com>
Date: Fri, 4 Aug 2023 14:51:35 -0700
Subject: [PATCH] Update to turbopack-230804.2 (#53588)

- vercel/turbo#5671
- vercel/turbo#5675
- vercel/turbo#5676
- vercel/turbo#5662
- vercel/turbo#5663
---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    |  6 +-
 .../crates/napi/src/next_api/utils.rs         |  2 +-
 .../crates/next-build/src/next_build.rs       |  2 +-
 .../next-swc/crates/next-core/js/package.json |  4 +-
 .../crates/next-core/src/app_source.rs        |  6 +-
 .../crates/next-core/src/next_config.rs       |  2 +-
 .../crates/next-core/src/page_source.rs       |  8 +-
 .../next-swc/crates/next-core/src/router.rs   |  2 +-
 pnpm-lock.yaml                                | 18 ++---
 10 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 135741a3eb..3ed86a0a47 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -412,7 +412,7 @@ dependencies = [
 [[package]]
 name = "auto-hash-map"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "serde",
 ]
@@ -3632,7 +3632,7 @@ dependencies = [
 [[package]]
 name = "node-file-trace"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "serde",
@@ -7317,7 +7317,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7349,7 +7349,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "cargo-lock",
@@ -7361,7 +7361,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-bytes"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "bytes",
@@ -7376,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "dotenvs",
@@ -7390,7 +7390,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fetch"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7407,7 +7407,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7437,7 +7437,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-hash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "base16",
  "hex",
@@ -7449,7 +7449,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -7463,7 +7463,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros-shared"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7473,7 +7473,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-malloc"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "mimalloc",
 ]
@@ -7481,7 +7481,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-memory"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7504,7 +7504,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-testing"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7517,7 +7517,7 @@ dependencies = [
 [[package]]
 name = "turbopack"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7548,7 +7548,7 @@ dependencies = [
 [[package]]
 name = "turbopack-bench"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "chromiumoxide",
@@ -7578,7 +7578,7 @@ dependencies = [
 [[package]]
 name = "turbopack-binding"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "auto-hash-map",
  "mdxjs",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "turbopack-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7642,7 +7642,7 @@ dependencies = [
 [[package]]
 name = "turbopack-cli-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "clap 4.1.11",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "turbopack-core"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7695,7 +7695,7 @@ dependencies = [
 [[package]]
 name = "turbopack-create-test-app"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "clap 4.1.11",
@@ -7708,7 +7708,7 @@ dependencies = [
 [[package]]
 name = "turbopack-css"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7730,7 +7730,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7754,7 +7754,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -7791,7 +7791,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7825,7 +7825,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-hmr-protocol"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "serde",
  "serde_json",
@@ -7836,7 +7836,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-plugins"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7859,7 +7859,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-runtime"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "indoc",
@@ -7876,7 +7876,7 @@ dependencies = [
 [[package]]
 name = "turbopack-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "turbopack-image"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "base64 0.21.0",
@@ -7912,7 +7912,7 @@ dependencies = [
 [[package]]
 name = "turbopack-json"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "serde",
@@ -7927,7 +7927,7 @@ dependencies = [
 [[package]]
 name = "turbopack-mdx"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "mdxjs",
@@ -7942,7 +7942,7 @@ dependencies = [
 [[package]]
 name = "turbopack-node"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -7977,7 +7977,7 @@ dependencies = [
 [[package]]
 name = "turbopack-static"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "serde",
@@ -7993,7 +7993,7 @@ dependencies = [
 [[package]]
 name = "turbopack-swc-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "swc_core",
  "turbo-tasks",
@@ -8004,7 +8004,7 @@ dependencies = [
 [[package]]
 name = "turbopack-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "once_cell",
@@ -8022,7 +8022,7 @@ dependencies = [
 [[package]]
 name = "turbopack-wasm"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.1#d8f738fcedd77b7d03685c969163e6e630deaea7"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
diff --git a/Cargo.toml b/Cargo.toml
index cf7c7c0ebc..158655de22 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,11 +44,11 @@ swc_core = { version = "0.79.40" }
 testing = { version = "0.33.21" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.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-230804.1" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.2" }
 
 # General Deps
 
diff --git a/packages/next-swc/crates/napi/src/next_api/utils.rs b/packages/next-swc/crates/napi/src/next_api/utils.rs
index 691a2e62fd..0b7b3eb8cd 100644
--- a/packages/next-swc/crates/napi/src/next_api/utils.rs
+++ b/packages/next-swc/crates/napi/src/next_api/utils.rs
@@ -13,7 +13,7 @@ use turbopack_binding::{
     turbopack::core::{
         diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic},
         error::PrettyPrintError,
-        issue::{IssueFilePathExt, PlainIssue, PlainIssueSource, PlainSource},
+        issue::{IssueDescriptionExt, PlainIssue, PlainIssueSource, PlainSource},
         source_pos::SourcePos,
     },
 };
diff --git a/packages/next-swc/crates/next-build/src/next_build.rs b/packages/next-swc/crates/next-build/src/next_build.rs
index 6a8fa85808..b71d42f718 100644
--- a/packages/next-swc/crates/next-build/src/next_build.rs
+++ b/packages/next-swc/crates/next-build/src/next_build.rs
@@ -35,7 +35,7 @@ use turbopack_binding::{
             asset::Asset,
             chunk::ChunkingContext,
             environment::ServerAddr,
-            issue::{IssueFilePathExt, IssueReporter, IssueSeverity},
+            issue::{IssueDescriptionExt, IssueReporter, IssueSeverity},
             output::{OutputAsset, OutputAssets},
             virtual_fs::VirtualFileSystem,
         },
diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json
index 409dc63496..36f81f0579 100644
--- a/packages/next-swc/crates/next-core/js/package.json
+++ b/packages/next-swc/crates/next-core/js/package.json
@@ -10,8 +10,8 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1",
-    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2",
+    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",
diff --git a/packages/next-swc/crates/next-core/src/app_source.rs b/packages/next-swc/crates/next-core/src/app_source.rs
index dc969f6d7d..5f2723a6b6 100644
--- a/packages/next-swc/crates/next-core/src/app_source.rs
+++ b/packages/next-swc/crates/next-core/src/app_source.rs
@@ -772,7 +772,7 @@ async fn create_app_page_source_for_route(
         should_debug("app_source"),
     );
 
-    Ok(source.issue_context(app_dir, format!("Next.js App Page Route {pathname}")))
+    Ok(source.issue_file_path(app_dir, format!("Next.js App Page Route {pathname}")))
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -818,7 +818,7 @@ async fn create_app_not_found_page_source(
         should_debug("app_source"),
     );
 
-    Ok(source.issue_context(app_dir, "Next.js App Page Route /404".to_string()))
+    Ok(source.issue_file_path(app_dir, "Next.js App Page Route /404".to_string()))
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -866,7 +866,7 @@ async fn create_app_route_source_for_route(
         should_debug("app_source"),
     );
 
-    Ok(source.issue_context(app_dir, format!("Next.js App Route {pathname}")))
+    Ok(source.issue_file_path(app_dir, format!("Next.js App Route {pathname}")))
 }
 
 /// The renderer for pages in app directory
diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs
index d708764bbf..4c61e995c3 100644
--- a/packages/next-swc/crates/next-core/src/next_config.rs
+++ b/packages/next-swc/crates/next-core/src/next_config.rs
@@ -13,7 +13,7 @@ use turbopack_binding::{
             context::AssetContext,
             file_source::FileSource,
             ident::AssetIdent,
-            issue::{Issue, IssueExt, IssueFilePathExt, IssueSeverity},
+            issue::{Issue, IssueDescriptionExt, IssueExt, IssueSeverity},
             reference_type::{EntryReferenceSubType, InnerAssets, ReferenceType},
             resolve::{
                 find_context_file,
diff --git a/packages/next-swc/crates/next-core/src/page_source.rs b/packages/next-swc/crates/next-core/src/page_source.rs
index f4be6d3e0a..3cb6faaf0b 100644
--- a/packages/next-swc/crates/next-core/src/page_source.rs
+++ b/packages/next-swc/crates/next-core/src/page_source.rs
@@ -278,7 +278,7 @@ pub async fn create_page_source(
             Vc::upcast(NextExactMatcher::new(Vc::cell("_next/404".to_string()))),
             render_data,
         )
-        .issue_context(pages_dir, "Next.js pages directory not found".to_string()),
+        .issue_file_path(pages_dir, "Next.js pages directory not found".to_string()),
         create_page_source_for_root_directory(
             pages_structure,
             project_root,
@@ -297,7 +297,7 @@ pub async fn create_page_source(
             client_root,
             Vc::upcast(fallback_page),
         ))
-        .issue_context(pages_dir, "Next.js pages directory fallback".to_string()),
+        .issue_file_path(pages_dir, "Next.js pages directory fallback".to_string()),
         create_not_found_page_source(
             project_root,
             env,
@@ -315,7 +315,7 @@ pub async fn create_page_source(
             Vc::upcast(NextFallbackMatcher::new()),
             render_data,
         )
-        .issue_context(
+        .issue_file_path(
             pages_dir,
             "Next.js pages directory not found fallback".to_string(),
         ),
@@ -701,7 +701,7 @@ async fn create_page_source_for_directory(
             node_root,
             render_data,
         )
-        .issue_context(
+        .issue_file_path(
             project_path,
             if is_api_path {
                 "Next.js page API file"
diff --git a/packages/next-swc/crates/next-core/src/router.rs b/packages/next-swc/crates/next-core/src/router.rs
index 15650d606b..be57a839b7 100644
--- a/packages/next-swc/crates/next-core/src/router.rs
+++ b/packages/next-swc/crates/next-core/src/router.rs
@@ -19,7 +19,7 @@ use turbopack_binding::{
             environment::{ServerAddr, ServerInfo},
             file_source::FileSource,
             ident::AssetIdent,
-            issue::IssueFilePathExt,
+            issue::IssueDescriptionExt,
             module::Module,
             reference_type::{EcmaScriptModulesReferenceSubType, InnerAssets, ReferenceType},
             resolve::{find_context_file, FindContextFileResult},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index defb24bcf4..f89dd76fd4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1416,11 +1416,11 @@ importers:
   packages/next-swc/crates/next-core/js:
     dependencies:
       '@vercel/turbopack-ecmascript-runtime':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1(react-refresh@0.12.0)(webpack@5.86.0)'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2(react-refresh@0.12.0)(webpack@5.86.0)'
       '@vercel/turbopack-node':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2'
       anser:
         specifier: ^2.1.1
         version: 2.1.1
@@ -26060,9 +26060,9 @@ packages:
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
 
-  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1(react-refresh@0.12.0)(webpack@5.86.0)':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1}
-    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.1'
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2(react-refresh@0.12.0)(webpack@5.86.0)':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2}
+    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2'
     name: '@vercel/turbopack-ecmascript-runtime'
     version: 0.0.0
     dependencies:
@@ -26073,8 +26073,8 @@ packages:
       - webpack
     dev: false
 
-  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.1}
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2}
     name: '@vercel/turbopack-node'
     version: 0.0.0
     dependencies: