Merge branch 'canary' into jamesdaniels_onBuildCompleteFixes

Author: ijjk

Cargo.lock

@@ -308,7 +308,6 @@ turbo-tasks-fetch = { path = "turbopack/crates/turbo-tasks-fetch" }
 turbo-tasks-fs = { path = "turbopack/crates/turbo-tasks-fs" }
 turbo-tasks-hash = { path = "turbopack/crates/turbo-tasks-hash" }
 turbo-tasks-macros = { path = "turbopack/crates/turbo-tasks-macros" }
-turbo-tasks-macros-shared = { path = "turbopack/crates/turbo-tasks-macros-shared" }
 turbo-tasks-testing = { path = "turbopack/crates/turbo-tasks-testing" }
 turbopack = { path = "turbopack/crates/turbopack" }
 turbopack-bench = { path = "turbopack/crates/turbopack-bench" }
@@ -371,7 +370,7 @@ tungstenite = "0.20.1"
 allsorts = { version = "0.14.0", default-features = false, features = [
   "flate2_rust",
 ] }
-anyhow = "1.0.98"
+anyhow = "1.0.100"
 async-compression = { version = "0.3.13", default-features = false, features = [
   "gzip",
   "tokio",

Cargo.toml

@@ -13,7 +13,7 @@ bench = false
 workspace = true
 
 [dependencies]
-anyhow = { workspace = true, features = ["backtrace"] }
+anyhow = { workspace = true }
 byteorder = { workspace = true }
 either = { workspace = true }
 futures = { workspace = true }
@@ -27,7 +27,7 @@ serde_json = { workspace = true }
 swc_core = { workspace = true }
 tracing = { workspace = true }
 turbo-rcstr = { workspace = true }
-turbo-tasks = { workspace = true, features = ["non_operation_vc_strongly_consistent"] }
+turbo-tasks = { workspace = true }
 turbo-tasks-env = { workspace = true }
 turbo-tasks-fs = { workspace = true }
 turbo-unix-path = { workspace = true }

crates/next-api/Cargo.toml

@@ -50,10 +50,9 @@ pub async fn get_app_client_references_chunks(
             //     .client_references
             //     .iter()
             //     .map(|client_reference| async move {
-            //         let client_reference_ty = client_reference.ty();
             //         Ok((
-            //             client_reference_ty,
-            //             match client_reference_ty {
+            //             client_reference.ty,
+            //             match client_reference.ty {
             //                 ClientReferenceType::EcmascriptClientReference(
             //                     ecmascript_client_reference,
             //                 ) => {
@@ -141,13 +140,13 @@ pub async fn get_app_client_references_chunks(
                     .or_default();
             }
             for client_reference in app_client_references.client_references.iter() {
-                if let Some(server_component) = client_reference.server_component() {
+                if let Some(server_component) = client_reference.server_component {
                     client_references_by_server_component
                         .entry(server_component)
                         .or_default()
-                        .push(client_reference.ty());
+                        .push(client_reference.ty);
                 } else {
-                    framework_reference_types.push(client_reference.ty());
+                    framework_reference_types.push(client_reference.ty);
                 }
             }
             // Framework components need to go into first layout segment

crates/next-core/src/next_app/app_client_references_chunks.rs

@@ -11,6 +11,6 @@ pub use ecmascript_client_reference::{
     ecmascript_client_reference_transition::NextEcmascriptClientReferenceTransition,
 };
 pub use visit_client_reference::{
-    ClientReference, ClientReferenceGraphResult, ClientReferenceType, ClientReferenceTypes,
-    ServerEntries, VisitedClientReferenceGraphNodes, find_server_entries,
+    ClientReference, ClientReferenceGraphResult, ClientReferenceType, ServerEntries,
+    find_server_entries,
 };

crates/next-core/src/next_client_reference/mod.rs

@@ -1,12 +1,11 @@
 use std::future::Future;
 
 use anyhow::Result;
-use rustc_hash::FxHashSet;
 use serde::{Deserialize, Serialize};
 use tracing::{Instrument, Level, Span};
 use turbo_rcstr::RcStr;
 use turbo_tasks::{
-    FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TryJoinIterExt, Vc,
+    NonLocalValue, ReadRef, ResolvedVc, TryJoinIterExt, Vc,
     debug::ValueDebugFormat,
     graph::{AdjacencyMap, GraphTraversal, Visit, VisitControlFlow},
     trace::TraceRawVcs,
@@ -43,19 +42,6 @@ pub struct ClientReference {
     pub ty: ClientReferenceType,
 }
 
-impl ClientReference {
-    pub fn server_component(&self) -> Option<ResolvedVc<NextServerComponentModule>> {
-        self.server_component
-    }
-
-    pub fn ty(&self) -> ClientReferenceType {
-        self.ty
-    }
-}
-
-#[turbo_tasks::value(transparent)]
-pub struct ClientReferences(Vec<ClientReference>);
-
 #[derive(
     Copy,
     Clone,
@@ -82,33 +68,6 @@ pub struct ClientReferenceGraphResult {
     pub server_utils: Vec<ResolvedVc<NextServerUtilityModule>>,
 }
 
-#[turbo_tasks::value(shared)]
-pub struct VisitedClientReferenceGraphNodes(FxHashSet<FindServerEntriesNode>);
-
-#[turbo_tasks::value_impl]
-impl VisitedClientReferenceGraphNodes {
-    #[turbo_tasks::function]
-    pub fn empty() -> Vc<Self> {
-        VisitedClientReferenceGraphNodes(Default::default()).cell()
-    }
-}
-
-#[turbo_tasks::value(transparent)]
-pub struct ClientReferenceTypes(FxIndexSet<ClientReferenceType>);
-
-#[turbo_tasks::value_impl]
-impl ClientReferenceGraphResult {
-    #[turbo_tasks::function]
-    pub fn types(&self) -> Vc<ClientReferenceTypes> {
-        Vc::cell(
-            self.client_references
-                .iter()
-                .map(|r| r.ty())
-                .collect::<FxIndexSet<_>>(),
-        )
-    }
-}
-
 #[turbo_tasks::value(shared)]
 #[derive(Clone, Debug)]
 pub struct ServerEntries {

crates/next-core/src/next_client_reference/visit_client_reference.rs

@@ -8,7 +8,6 @@ use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{Completion, FxIndexMap, ResolvedVc, Vc};
-use turbo_tasks_bytes::stream::SingleValue;
 use turbo_tasks_env::{CommandLineProcessEnv, ProcessEnv};
 use turbo_tasks_fetch::{FetchClientConfig, HttpResponseBody};
 use turbo_tasks_fs::{
@@ -768,10 +767,9 @@ async fn get_mock_stylesheet(
     )
     .await?;
 
-    match &val.try_into_single().await? {
-        SingleValue::Single(val) => {
-            let val: FxHashMap<RcStr, Option<RcStr>> =
-                parse_json_with_source_context(val.to_str()?)?;
+    match &*val {
+        Some(val) => {
+            let val: FxHashMap<RcStr, Option<RcStr>> = parse_json_with_source_context(val)?;
             Ok(val
                 .get(&stylesheet_url)
                 .context("url not found")?

crates/next-core/src/next_font/google/mod.rs

@@ -62,11 +62,17 @@ pub(super) async fn build_font_face_definitions(
         };
         let query_str = qstring::QString::from(serde_json::to_string(&query)?.as_str());
 
+        // Check if `font-family` is explicitly defined in `declarations`
+        let has_custom_font_family = options.declarations.as_ref().is_some_and(|declarations| {
+            declarations
+                .iter()
+                .any(|declaration| declaration.prop == "font-family")
+        });
+
         definitions.push_str(&formatdoc!(
             r#"
                 @font-face {{
-                    {}
-                    font-family: '{}';
+                    {}{}
                     src: url('@vercel/turbopack-next/internal/font/local/font?{}') format('{}');
                     font-display: {};
                     {}{}
@@ -79,20 +85,24 @@ pub(super) async fn build_font_face_definitions(
                     .map(|declaration| format!("{}: {};", declaration.prop, declaration.value))
                     .join("\n")
             ),
-            scoped_font_family,
+            if has_custom_font_family {
+                "".to_owned()
+            } else {
+                format!("\nfont-family: '{}';", scoped_font_family)
+            },
             query_str,
             ext_to_format(&font.ext)?,
             options.display,
             &font
                 .weight
                 .as_ref()
                 .or(options.default_weight.as_ref())
-                .map_or_else(|| "".to_owned(), |w| format!("font-weight: {w};")),
+                .map_or_else(|| "".to_owned(), |w| format!("\nfont-weight: {w};")),
             &font
                 .style
                 .as_ref()
                 .or(options.default_style.as_ref())
-                .map_or_else(|| "".to_owned(), |s| format!("font-style: {s};")),
+                .map_or_else(|| "".to_owned(), |s| format!("\nfont-style: {s};")),
         ));
     }
 

crates/next-core/src/next_font/local/stylesheet.rs

@@ -185,7 +185,7 @@ async fn build_manifest(
             .client_references
             .iter()
             .map(async |r| {
-                Ok(match r.ty() {
+                Ok(match r.ty {
                     ClientReferenceType::EcmascriptClientReference(r) => Some((r, r.await?)),
                     ClientReferenceType::CssClientReference(_) => None,
                 })

crates/next-core/src/next_manifests/client_reference_manifest.rs

@@ -1063,8 +1063,7 @@ pub async fn get_server_chunking_context_with_client_assets(
     builder = builder.source_map_source_type(if next_mode.is_development() {
         SourceMapSourceType::AbsoluteFileUri
     } else {
-        // TODO(lukesandberg): switch to relative once next is compatible.
-        SourceMapSourceType::TurbopackUri
+        SourceMapSourceType::RelativeUri
     });
     if next_mode.is_production() {
         builder = builder
@@ -1149,8 +1148,7 @@ pub async fn get_server_chunking_context(
         builder = builder.source_map_source_type(SourceMapSourceType::AbsoluteFileUri);
     } else {
         builder = builder
-            // TODO(lukesandberg): switch to relative once next is compatible.
-            .source_map_source_type(SourceMapSourceType::TurbopackUri)
+            .source_map_source_type(SourceMapSourceType::RelativeUri)
             .chunking_config(
                 Vc::<EcmascriptChunkType>::default().to_resolved().await?,
                 ChunkingConfig {