update turbopack and update code for API changes (#53576)

* vercel/turbo#5640 * vercel/turbo#5661
vercel · Aug 4, 2023 · 94709ef · 94709ef
1 parent 324814f
commit 94709ef
Show file tree

Hide file tree

Showing 20 changed files with 77 additions and 90 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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-230803.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" }
 # [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-230803.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230803.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.1" }
 
 # 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
@@ -13,7 +13,7 @@ use turbopack_binding::{
     turbopack::core::{
         diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic},
         error::PrettyPrintError,
-        issue::{IssueContextExt, PlainIssue, PlainIssueSource, PlainSource},
+        issue::{IssueFilePathExt, PlainIssue, PlainIssueSource, PlainSource},
         source_pos::SourcePos,
     },
 };
@@ -107,7 +107,7 @@ pub async fn get_diagnostics<T>(source: Vc<T>) -> Result<Vec<ReadRef<PlainDiagno
 pub struct NapiIssue {
     pub severity: String,
     pub category: String,
-    pub context: String,
+    pub file_path: String,
     pub title: String,
     pub description: String,
     pub detail: String,
@@ -121,7 +121,7 @@ impl From<&PlainIssue> for NapiIssue {
         Self {
             description: issue.description.clone(),
             category: issue.category.clone(),
-            context: issue.context.clone(),
+            file_path: issue.file_path.clone(),
             detail: issue.detail.clone(),
             documentation_link: issue.documentation_link.clone(),
             severity: issue.severity.as_str().to_string(),

diff --git 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::{IssueContextExt, IssueReporter, IssueSeverity},
+            issue::{IssueFilePathExt, 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
@@ -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-230803.2",
-    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230803.2",
+    "@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",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",