wip

Cargo.toml

@@ -44,11 +44,11 @@ swc_core = { version = "0.79.13" }
 testing = { version = "0.33.20" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.2" }
+turbopack-binding = { path = "../turbo_upstream/crates/turbopack-binding" }
 # [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-230718.2" }
+turbo-tasks = { path = "../turbo_upstream/crates/turbo-tasks" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230718.2" }
+turbo-tasks-fs = { path = "../turbo_upstream/crates/turbo-tasks-fs" }
 
 # General Deps
 

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

@@ -8,7 +8,11 @@ use next_api::{
 };
 use turbo_tasks::{TurboTasks, Vc};
 use turbopack_binding::{
-    turbo::tasks_memory::MemoryBackend, turbopack::core::error::PrettyPrintError,
+    turbo::{tasks::TryJoinIterExt, tasks_memory::MemoryBackend},
+    turbopack::core::{
+        diagnostics::{Diagnostic, DiagnosticContextExt},
+        error::PrettyPrintError,
+    },
 };
 
 use super::{
@@ -180,12 +184,27 @@ pub fn project_entrypoints_subscribe(
         func,
         move || async move {
             let entrypoints = project.entrypoints();
+            let captured_diags = entrypoints.peek_diagnostics().await?;
+
             let entrypoints = entrypoints.strongly_consistent().await?;
+            let captured_diags = captured_diags.strongly_consistent().await?;
+
+            let diags = captured_diags
+                .diagnostics
+                .iter()
+                .map(|d| d.into_plain())
+                .try_join()
+                .await?
+                .iter()
+                .map(|d| NapiDiagnostic::from(&d))
+                .collect::<Vec<NapiDiagnostic>>();
+
             // TODO peek_issues and diagnostics
-            Ok(entrypoints)
+            Ok((entrypoints, diags))
         },
         move |ctx| {
-            let entrypoints = ctx.value;
+            let (entrypoints, diags) = ctx.value;
+
             Ok(vec![NapiEntrypoints {
                 routes: entrypoints
                     .routes
@@ -200,7 +219,7 @@ pub fn project_entrypoints_subscribe(
                     .map(|m| NapiMiddleware::from_middleware(m, &turbo_tasks))
                     .transpose()?,
                 issues: vec![],
-                diagnostics: vec![],
+                diagnostics: diags,
             }])
         },
     )

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

@@ -1,4 +1,4 @@
-use std::{future::Future, ops::Deref, sync::Arc};
+use std::{future::Future, ops::Deref, sync::Arc, collections::HashMap};
 
 use anyhow::{anyhow, Context, Result};
 use napi::{
@@ -9,7 +9,8 @@ use napi::{
 use serde::Serialize;
 use turbo_tasks::{unit, TaskId, TurboTasks};
 use turbopack_binding::{
-    turbo::tasks_memory::MemoryBackend, turbopack::core::error::PrettyPrintError,
+    turbo::tasks_memory::MemoryBackend,
+    turbopack::core::{diagnostics::PlainDiagnostic, error::PrettyPrintError},
 };
 
 /// A helper type to hold both a Vc operation and the TurboTasks root process.
@@ -75,7 +76,21 @@ pub fn root_task_dispose(
 pub struct NapiIssue {}
 
 #[napi(object)]
-pub struct NapiDiagnostic {}
+pub struct NapiDiagnostic {
+    pub category: String,
+    pub name: String,
+    pub payload: HashMap<String, String>,
+}
+
+impl NapiDiagnostic {
+    pub fn from(diagnostic: &PlainDiagnostic) -> Self {
+        Self {
+            category: diagnostic.category.clone(),
+            name: diagnostic.name.clone(),
+            payload: diagnostic.payload.clone(),
+        }
+    }
+}
 
 pub struct TurbopackResult<T: ToNapiValue> {
     pub result: T,

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

@@ -36,6 +36,7 @@ mod next_route_matcher;
 pub mod next_server;
 pub mod next_server_component;
 pub mod next_shared;
+mod next_telemetry;
 mod page_loader;
 mod page_source;
 pub mod pages_structure;