Revert "Implement Turbopack trace server bindings"

Cargo.toml

@@ -37,11 +37,11 @@ swc_core = { version = "0.90.33", features = [
 testing = { version = "0.35.22" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240506.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240503.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-240506.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240503.1" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240506.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240503.1" }
 
 # General Deps
 

packages/next-swc/crates/napi/src/lib.rs

@@ -58,8 +58,6 @@ pub mod next_api;
 pub mod parse;
 pub mod transform;
 #[cfg(not(target_arch = "wasm32"))]
-pub mod turbo_trace_server;
-#[cfg(not(target_arch = "wasm32"))]
 pub mod turbopack;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod turbotrace;

packages/next-swc/crates/napi/src/next_api/project.rs

@@ -1,4 +1,4 @@
-use std::{path::PathBuf, sync::Arc, thread, time::Duration};
+use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use anyhow::{anyhow, bail, Context, Result};
 use napi::{
@@ -249,22 +249,12 @@
             .context("Unable to create .next directory")
             .unwrap();
         let trace_file = internal_dir.join("trace.log");
-        let trace_writer = std::fs::File::create(trace_file.clone()).unwrap();
+        let trace_writer = std::fs::File::create(trace_file).unwrap();
         let (trace_writer, guard) = TraceWriter::new(trace_writer);
         let subscriber = subscriber.with(RawTraceLayer::new(trace_writer));
 
         let guard = ExitGuard::new(guard).unwrap();
 
-        let trace_server = std::env::var("NEXT_TURBOPACK_TRACE_SERVER").ok();
-        if trace_server.is_some() {
-            thread::spawn(move || {
-                turbopack_binding::turbopack::trace_server::start_turbopack_trace_server(
-                    trace_file,
-                );
-            });
-            println!("Turbopack trace server started. View trace at https://turbo-trace-viewer.vercel.app/");
-        }
-
         subscriber.init();
 
         Some(guard)
@@ -771,7 +761,7 @@
     }
 }
 
 /// Subscribes to lifecycle events of the compilation.
 /// Emits an [UpdateMessage::Start] event when any computation starts.
 /// Emits an [UpdateMessage::End] event when there was no computation for the
 /// specified time (`aggregation_ms`). The [UpdateMessage::End] event contains

packages/next-swc/crates/next-core/Cargo.toml

@@ -55,7 +55,6 @@ turbopack-binding = { workspace = true, features = [
   "__turbopack_image",
   "__turbopack_node",
   "__turbopack_trace_utils",
-  "__turbopack_trace_server",
 ] }
 
 turbo-tasks = { workspace = true }

packages/next/package.json

@@ -200,7 +200,7 @@
     "@types/ws": "8.2.0",
     "@vercel/ncc": "0.34.0",
     "@vercel/nft": "0.26.4",
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240506.2",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240503.1",
     "acorn": "8.5.0",
     "amphtml-validator": "1.0.35",
     "anser": "1.4.9",

packages/next/src/bin/next.ts

@@ -383,19 +383,4 @@ program
   })
   .usage('[directory] [options]')
 
-const internal = program
-  .command('internal')
-  .description(
-    'Internal debugging commands. Use with caution. Not covered by semver.'
-  )
-
-internal
-  .command('turbo-trace-server')
-  .argument('[file]', 'Trace file to serve.')
-  .action((file) => {
-    return import('../cli/internal/turbo-trace-server.js').then((mod) =>
-      mod.startTurboTraceServerCli(file)
-    )
-  })
-
 program.parse(process.argv)

packages/next/src/build/swc/index.ts

@@ -137,7 +137,7 @@ let lastNativeBindingsLoadErrorCode:
   | 'unsupported_target'
   | string
   | undefined = undefined
-let nativeBindings: Binding
+let nativeBindings: any
 let wasmBindings: any
 let downloadWasmPromise: any
 let pendingBindings: any
@@ -157,21 +157,21 @@ export interface Binding {
       stream: any
       get: any
     }
+    mdx: {
+      compile: any
+      compileSync: any
+    }
     createProject: (
       options: ProjectOptions,
       turboEngineOptions?: TurboEngineOptions
     ) => Promise<Project>
-    startTurbopackTraceServer: (path: string) => void
-  }
-  mdx: {
-    compile: any
-    compileSync: any
   }
   minify: any
   minifySync: any
   transform: any
   transformSync: any
   parse: any
+  parseSync: any
 
   getTargetTriple(): string | undefined
 
@@ -752,10 +752,7 @@ function rustifyEnv(env: Record<string, string>): RustifiedEnv {
 }
 
 // TODO(sokra) Support wasm option.
-function bindingToApi(
-  binding: any,
-  _wasm: boolean
-): Binding['turbo']['createProject'] {
+function bindingToApi(binding: any, _wasm: boolean) {
   type NativeFunction<T> = (
     callback: (err: Error, value: T) => void
   ) => Promise<{ __napiType: 'RootTask' }>
@@ -1197,10 +1194,10 @@ function bindingToApi(
     }
   }
 
-  const createProject: Binding['turbo']['createProject'] = async (
-    options,
-    turboEngineOptions
-  ) => {
+  async function createProject(
+    options: ProjectOptions,
+    turboEngineOptions: TurboEngineOptions
+  ) {
     return new ProjectImpl(
       await binding.projectNew(
         await rustifyProjectOptions(options),
@@ -1258,6 +1255,9 @@ async function loadWasm(importPath = '') {
             ? bindings.parse(src.toString(), options)
             : Promise.resolve(bindings.parseSync(src.toString(), options))
         },
+        parseSync(src: string, options: any) {
+          return bindings.parseSync(src.toString(), options)
+        },
         getTargetTriple() {
           return undefined
         },
@@ -1483,12 +1483,6 @@ function loadNative(importPath?: string) {
           },
         },
         createProject: bindingToApi(customBindings ?? bindings, false),
-        startTurbopackTraceServer: (traceFilePath) => {
-          Log.warn(
-            'Turbopack trace server started. View trace at https://turbo-trace-viewer.vercel.app/'
-          )
-          ;(customBindings ?? bindings).startTurbopackTraceServer(traceFilePath)
-        },
       },
       mdx: {
         compile: (src: string, options: any) =>