merge upstream/canary

Author: xusd320

Cargo.lock

@@ -337,7 +337,7 @@ turbopack-trace-utils = { path = "turbopack/crates/turbopack-trace-utils" }
 turbopack-wasm = { path = "turbopack/crates/turbopack-wasm" }
 
 # SWC crates
-swc_core = { version = "48.0.1", features = [
+swc_core = { version = "48.0.4", features = [
   "ecma_loader_lru",
   "ecma_loader_parking_lot",
   "parallel_rayon",

Cargo.toml

@@ -0,0 +1 @@
+/next-env.d.ts

apps/bundle-analyzer/.gitignore

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer-ui",
-  "version": "16.0.2-canary.16",
+  "version": "0.0.1",
   "private": true,
   "scripts": {
     "build": "cross-env NEXT_TEST_NATIVE_DIR=no next build --no-mangling",

apps/bundle-analyzer/next-env.d.ts

@@ -51,7 +51,7 @@ use turbopack_core::{
     error::PrettyPrintError,
     issue::PlainIssue,
     output::{OutputAsset, OutputAssets},
-    source_map::{OptionStringifiedSourceMap, SourceMap, Token},
+    source_map::{SourceMap, Token},
     version::{PartialUpdate, TotalUpdate, Update, VersionState},
 };
 use turbopack_ecmascript_hmr_protocol::{ClientUpdateInstruction, Issue, ResourceIdentifier};
@@ -1550,7 +1550,7 @@ pub struct OptionStackFrame(Option<StackFrame>);
 pub async fn get_source_map_rope(
     container: Vc<ProjectContainer>,
     source_url: RcStr,
-) -> Result<Vc<OptionStringifiedSourceMap>> {
+) -> Result<Vc<FileContent>> {
     let (file_path_sys, module) = match Url::parse(&source_url) {
         Ok(url) => match url.scheme() {
             "file" => {
@@ -1579,7 +1579,7 @@ pub async fn get_source_map_rope(
             Some(relative_path) => sys_to_unix(relative_path),
             None => {
                 // File doesn't exist within the dist dir
-                return Ok(OptionStringifiedSourceMap::none());
+                return Ok(FileContent::NotFound.cell());
             }
         };
 
@@ -1597,13 +1597,13 @@ pub async fn get_source_map_rope(
 
     let mut map = container.get_source_map(server_path, module.clone());
 
-    if map.await?.is_none() {
+    if !map.await?.is_content() {
         // If the chunk doesn't exist as a server chunk, try a client chunk.
         // TODO: Properly tag all server chunks and use the `isServer` query param.
         // Currently, this is inaccurate as it does not cover RSC server
         // chunks.
         map = container.get_source_map(client_path, module);
-        if map.await?.is_none() {
+        if !map.await?.is_content() {
             bail!("chunk/module '{}' is missing a sourcemap", source_url);
         }
     }
@@ -1615,7 +1615,7 @@ pub async fn get_source_map_rope(
 pub fn get_source_map_rope_operation(
     container: ResolvedVc<ProjectContainer>,
     file_path: RcStr,
-) -> Vc<OptionStringifiedSourceMap> {
+) -> Vc<FileContent> {
     get_source_map_rope(*container, file_path)
 }
 
@@ -1782,13 +1782,13 @@ pub async fn project_get_source_map(
     let ctx = &project.turbopack_ctx;
     ctx.turbo_tasks()
         .run(async move {
-            let Some(map) = &*get_source_map_rope_operation(container, file_path)
+            let source_map = get_source_map_rope_operation(container, file_path)
                 .read_strongly_consistent()
-                .await?
-            else {
+                .await?;
+            let Some(map) = source_map.as_content() else {
                 return Ok(None);
             };
-            Ok(Some(map.to_str()?.to_string()))
+            Ok(Some(map.content().to_str()?.to_string()))
         })
         // HACK: Don't use `TurbopackInternalError`, this function is race-condition prone (the
         // source files may have changed or been deleted), so these probably aren't internal errors?

apps/bundle-analyzer/package.json

@@ -430,15 +430,17 @@ pub async fn analyze_module_graphs(module_graphs: Vc<ModuleGraphs>) -> Result<Vc
     let mut all_async_edges = FxIndexSet::default();
     for &module_graph in module_graphs.await? {
         let module_graph = module_graph.read_graphs().await?;
-        module_graph.traverse_all_edges_unordered(|(parent_node, reference), node| {
-            all_modules.insert(parent_node);
-            all_modules.insert(node);
-            match reference.chunking_type {
-                ChunkingType::Async => {
-                    all_async_edges.insert((parent_node, node));
-                }
-                _ => {
-                    all_edges.insert((parent_node, node));
+        module_graph.traverse_all_edges_unordered(|parent, node| {
+            if let Some((parent_node, reference)) = parent {
+                all_modules.insert(parent_node);
+                all_modules.insert(node);
+                match reference.chunking_type {
+                    ChunkingType::Async => {
+                        all_async_edges.insert((parent_node, node));
+                    }
+                    _ => {
+                        all_edges.insert((parent_node, node));
+                    }
                 }
             }
             Ok(())

crates/napi/src/next_api/project.rs

@@ -59,6 +59,7 @@ use turbopack_core::{
     module::Module,
     module_graph::{
         GraphEntries, ModuleGraph, SingleModuleGraph, VisitedModules,
+        binding_usage_info::compute_binding_usage_info,
         chunk_group_info::{ChunkGroup, ChunkGroupEntry},
     },
     output::{OutputAsset, OutputAssets, OutputAssetsWithReferenced},
@@ -856,7 +857,8 @@ impl AppProject {
         has_layout_segments: bool,
     ) -> Result<Vc<BaseAndFullModuleGraph>> {
         if *self.project.per_page_module_graph().await? {
-            let should_trace = self.project.next_mode().await?.is_production();
+            let next_mode = self.project.next_mode();
+            let should_trace = next_mode.await?.is_production();
             let client_shared_entries = client_shared_entries
                 .await?
                 .into_iter()
@@ -949,10 +951,31 @@ impl AppProject {
                 );
                 graphs.push(additional_module_graph);
 
-                let full = ModuleGraph::from_graphs(graphs);
+                let full_with_unused_references =
+                    ModuleGraph::from_graphs(graphs).to_resolved().await?;
+
+                let full = if *self
+                    .project
+                    .next_config()
+                    .turbopack_remove_unused_imports(next_mode)
+                    .await?
+                {
+                    full_with_unused_references
+                        .without_unused_references(
+                            *compute_binding_usage_info(full_with_unused_references, true)
+                                .resolve_strongly_consistent()
+                                .await?,
+                        )
+                        .to_resolved()
+                        .await?
+                } else {
+                    full_with_unused_references
+                };
+
                 Ok(BaseAndFullModuleGraph {
                     base: base.to_resolved().await?,
-                    full: full.to_resolved().await?,
+                    full_with_unused_references,
+                    full,
                 }
                 .cell())
             }
@@ -1357,7 +1380,10 @@ impl AppEndpoint {
                         "server/app{manifest_path_prefix}/webpack-stats.json",
                     ))?,
                     AssetContent::file(
-                        File::from(serde_json::to_string_pretty(&webpack_stats)?).into(),
+                        FileContent::Content(File::from(serde_json::to_string_pretty(
+                            &webpack_stats,
+                        )?))
+                        .cell(),
                     ),
                 )
                 .to_resolved()
@@ -1886,7 +1912,10 @@ async fn create_app_paths_manifest(
         VirtualOutputAsset::new(
             path,
             AssetContent::file(
-                File::from(serde_json::to_string_pretty(&app_paths_manifest)?).into(),
+                FileContent::Content(File::from(serde_json::to_string_pretty(
+                    &app_paths_manifest,
+                )?))
+                .cell(),
             ),
         )
         .to_resolved()

crates/next-api/src/analyze.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use next_core::next_manifests::NextFontManifest;
 use turbo_rcstr::RcStr;
 use turbo_tasks::{ResolvedVc, Vc};
-use turbo_tasks_fs::{File, FileSystemPath};
+use turbo_tasks_fs::{File, FileContent, FileSystemPath};
 use turbopack_core::{
     asset::{Asset, AssetContent},
     output::{OutputAsset, OutputAssets, OutputAssetsReference},
@@ -94,7 +94,10 @@ impl Asset for FontManifest {
         };
 
         Ok(AssetContent::file(
-            File::from(serde_json::to_string_pretty(&next_font_manifest)?).into(),
+            FileContent::Content(File::from(serde_json::to_string_pretty(
+                &next_font_manifest,
+            )?))
+            .cell(),
         ))
     }
 }