Trace server updates (#58694)

### What? some refactoring updates Closes PACK-1994
vercel · Nov 27, 2023 · f151151 · f151151
1 parent 8e6d51f
commit f151151
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,18 +36,18 @@ next-transform-dynamic = { path = "packages/next-swc/crates/next-transform-dynam
 next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-transform-strip-page-exports" }
 
 # SWC crates
-  swc_core = { version = "0.86.81", features = [
+swc_core = { version = "0.86.81", features = [
   "ecma_loader_lru",
   "ecma_loader_parking_lot",
 ] }
 testing = { version = "0.35.11" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231127.1" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231127.3" }
 # [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-231127.1" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231127.3" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231127.1" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231127.3" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/napi/src/next_api/project.rs b/packages/next-swc/crates/napi/src/next_api/project.rs
@@ -23,18 +23,18 @@ use turbopack_binding::{
         tasks_memory::MemoryBackend,
     },
     turbopack::{
-        cli_utils::{
-            exit::ExitGuard,
-            raw_trace::RawTraceLayer,
-            trace_writer::{TraceWriter, TraceWriterGuard},
-            tracing_presets::TRACING_OVERVIEW_TARGETS,
-        },
         core::{
             error::PrettyPrintError,
             source_map::{GenerateSourceMap, Token},
             version::{PartialUpdate, TotalUpdate, Update},
         },
         ecmascript_hmr_protocol::{ClientUpdateInstruction, ResourceIdentifier},
+        trace_utils::{
+            exit::ExitGuard,
+            raw_trace::RawTraceLayer,
+            trace_writer::{TraceWriter, TraceWriterGuard},
+            tracing_presets::TRACING_OVERVIEW_TARGETS,
+        },
     },
 };
 use url::Url;

diff --git a/packages/next-swc/crates/next-core/Cargo.toml b/packages/next-swc/crates/next-core/Cargo.toml
@@ -56,6 +56,7 @@ turbopack-binding = { workspace = true, features = [
   "__turbopack_static",
   "__turbopack_image",
   "__turbopack_node",
+  "__turbopack_trace_utils",
 ] }
 turbo-tasks = { workspace = true }
 turbo-tasks-fs = { workspace = true }

diff --git a/packages/next-swc/crates/next-core/src/tracing_presets.rs b/packages/next-swc/crates/next-core/src/tracing_presets.rs
@@ -1,5 +1,5 @@
 use once_cell::sync::Lazy;
-use turbopack_binding::turbopack::cli_utils::tracing_presets::{
+use turbopack_binding::turbopack::trace_utils::tracing_presets::{
     TRACING_OVERVIEW_TARGETS, TRACING_TURBOPACK_TARGETS, TRACING_TURBO_TASKS_TARGETS,
 };