[turbopack] Compute transitive side effects and use them to trim imports

crates/next-core/src/hmr_entry.rs

@@ -3,15 +3,15 @@ use std::io::Write;
 use anyhow::Result;
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{ResolvedVc, ValueToString, Vc};
-use turbo_tasks_fs::{FileSystem, VirtualFileSystem, glob::Glob, rope::RopeBuilder};
+use turbo_tasks_fs::{FileSystem, VirtualFileSystem, rope::RopeBuilder};
 use turbopack_core::{
     asset::{Asset, AssetContent},
     chunk::{
         ChunkItem, ChunkType, ChunkableModule, ChunkableModuleReference, ChunkingContext,
         EvaluatableAsset,
     },
     ident::AssetIdent,
-    module::Module,
+    module::{Module, ModuleSideEffects},
     module_graph::ModuleGraph,
     output::OutputAssetsReference,
     reference::{ModuleReference, ModuleReferences},
@@ -76,10 +76,9 @@ impl Module for HmrEntryModule {
                 .await?,
         )]))
     }
-
     #[turbo_tasks::function]
-    fn is_marked_as_side_effect_free(self: Vc<Self>, _: Vc<Glob>) -> Vc<bool> {
-        Vc::cell(false)
+    fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
+        ModuleSideEffects::SideEffectful.cell()
     }
 }
 

crates/next-core/src/next_client/context.rs

@@ -6,9 +6,14 @@
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
 use turbo_tasks_fs::FileSystemPath;
-use turbopack::module_options::{
-    CssOptionsContext, EcmascriptOptionsContext, JsxTransformOptions, ModuleRule,
-    TypescriptTransformOptions, module_options_context::ModuleOptionsContext,
+use turbopack::{
+    css::chunk::CssChunkType,
+    module_options::{
+        CssOptionsContext, EcmascriptOptionsContext, JsxTransformOptions, ModuleRule,
+        TypescriptTransformOptions, module_options_context::ModuleOptionsContext,
+        side_effect_free_packages_glob,
+    },
+    resolve_options_context::ResolveOptionsContext,
 };
 use turbopack_browser::{
     BrowserChunkingContext, ChunkSuffix, ContentHashing, CurrentChunkMethod,
@@ -337,7 +342,11 @@
         execution_context: Some(execution_context),
         tree_shaking_mode: tree_shaking_mode_for_user_code,
         enable_postcss_transform,
-        side_effect_free_packages: next_config.optimize_package_imports().owned().await?,
+        side_effect_free_packages: Some(
+            side_effect_free_packages_glob(next_config.optimize_package_imports())
+                .to_resolved()
+                .await?,
+        ),
         keep_last_successful_parse: next_mode.is_development(),
         analyze_mode: if next_mode.is_development() {
             AnalyzeMode::CodeGeneration

crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs

@@ -2,11 +2,12 @@
 use turbo_rcstr::{RcStr, rcstr};
 use turbo_tasks::{ResolvedVc, ValueToString, Vc};
 use turbo_tasks_fs::FileContent;
+use turbopack::css::chunk::CssChunkPlaceable;
 use turbopack_core::{
     asset::{Asset, AssetContent},
     chunk::{ChunkGroupType, ChunkableModuleReference, ChunkingType, ChunkingTypeOption},
     ident::AssetIdent,
-    module::Module,
+    module::{Module, ModuleSideEffects},
     reference::{ModuleReference, ModuleReferences},
     resolve::ModuleResolveResult,
     source::OptionSource,
@@ -57,6 +58,10 @@
                 .await?,
         )]))
     }
+    #[turbo_tasks::function]
+    fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
+        ModuleSideEffects::SideEffectful.cell()
+    }
 }
 
 #[turbo_tasks::value_impl]

crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_module.rs

@@ -14,7 +14,7 @@ use turbopack_core::{
     code_builder::CodeBuilder,
     context::AssetContext,
     ident::AssetIdent,
-    module::Module,
+    module::{Module, ModuleSideEffects},
     module_graph::{ModuleGraph, binding_usage_info::ModuleExportUsageInfo},
     output::OutputAssetsReference,
     reference::{ModuleReference, ModuleReferences},
@@ -241,6 +241,11 @@ impl Module for EcmascriptClientReferenceModule {
 
         Ok(Vc::cell(references))
     }
+    #[turbo_tasks::function]
+    fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
+        // These just export some specially tagged functions
+        ModuleSideEffects::SideEffectFree.cell()
+    }
 }
 
 #[turbo_tasks::value_impl]

crates/next-core/src/next_dynamic/dynamic_module.rs

@@ -9,7 +9,7 @@ use turbopack_core::{
     asset::{Asset, AssetContent},
     chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
     ident::AssetIdent,
-    module::Module,
+    module::{Module, ModuleSideEffects},
     module_graph::ModuleGraph,
     output::OutputAssetsReference,
     reference::{ModuleReferences, SingleChunkableModuleReference},
@@ -71,6 +71,11 @@ impl Module for NextDynamicEntryModule {
             .await?,
         )]))
     }
+    #[turbo_tasks::function]
+    fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
+        // This just exports another import
+        ModuleSideEffects::ModuleEvaluationIsSideEffectFree.cell()
+    }
 }
 
 #[turbo_tasks::value_impl]

crates/next-core/src/next_server/context.rs

@@ -10,6 +10,7 @@ use turbopack::{
     module_options::{
         CssOptionsContext, EcmascriptOptionsContext, ExternalsTracingOptions, JsxTransformOptions,
         ModuleOptionsContext, ModuleRule, TypescriptTransformOptions,
+        side_effect_free_packages_glob,
     },
     transition::Transition,
 };
@@ -592,7 +593,11 @@ pub async fn get_server_module_options_context(
             ..Default::default()
         },
         tree_shaking_mode: tree_shaking_mode_for_user_code,
-        side_effect_free_packages: next_config.optimize_package_imports().owned().await?,
+        side_effect_free_packages: Some(
+            side_effect_free_packages_glob(next_config.optimize_package_imports())
+                .to_resolved()
+                .await?,
+        ),
         analyze_mode: if next_mode.is_development() {
             AnalyzeMode::CodeGeneration
         } else {

crates/next-core/src/next_server_component/server_component_module.rs

@@ -9,7 +9,7 @@ use turbopack_core::{
     asset::{Asset, AssetContent},
     chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
     ident::AssetIdent,
-    module::Module,
+    module::{Module, ModuleSideEffects},
     module_graph::ModuleGraph,
     output::OutputAssetsReference,
     reference::ModuleReferences,
@@ -67,6 +67,11 @@ impl Module for NextServerComponentModule {
                 .await?,
         )]))
     }
+    #[turbo_tasks::function]
+    fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
+        // This just exports another import
+        ModuleSideEffects::ModuleEvaluationIsSideEffectFree.cell()
+    }
 }
 
 #[turbo_tasks::value_impl]

crates/next-core/src/next_server_utility/server_utility_module.rs

@@ -9,7 +9,7 @@ use turbopack_core::{
     asset::{Asset, AssetContent},
     chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
     ident::AssetIdent,
-    module::Module,
+    module::{Module, ModuleSideEffects},
     module_graph::ModuleGraph,
     output::OutputAssetsReference,
     reference::ModuleReferences,
@@ -67,6 +67,12 @@ impl Module for NextServerUtilityModule {
                 .await?,
         )]))
     }
+
+    #[turbo_tasks::function]
+    fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
+        // This just exports another import
+        ModuleSideEffects::ModuleEvaluationIsSideEffectFree.cell()
+    }
 }
 
 #[turbo_tasks::value_impl]

crates/next-core/src/raw_ecmascript_module.rs

@@ -7,7 +7,7 @@ use regex::Regex;
 use tracing::Instrument;
 use turbo_rcstr::rcstr;
 use turbo_tasks::{FxIndexMap, FxIndexSet, ResolvedVc, TryJoinIterExt, ValueToString, Vc};
-use turbo_tasks_fs::{FileContent, glob::Glob, rope::Rope};
+use turbo_tasks_fs::{FileContent, rope::Rope};
 use turbopack::{ModuleAssetContext, module_options::CustomModuleType};
 use turbopack_core::{
     asset::{Asset, AssetContent},
@@ -18,7 +18,7 @@ use turbopack_core::{
     },
     context::AssetContext,
     ident::AssetIdent,
-    module::Module,
+    module::{Module, ModuleSideEffects},
     module_graph::ModuleGraph,
     output::OutputAssetsReference,
     resolve::ModulePart,
@@ -99,11 +99,8 @@ impl Module for RawEcmascriptModule {
     }
 
     #[turbo_tasks::function]
-    fn is_marked_as_side_effect_free(
-        self: Vc<Self>,
-        _side_effect_free_packages: Vc<Glob>,
-    ) -> Vc<bool> {
-        Vc::cell(false)
+    fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
+        ModuleSideEffects::SideEffectful.cell()
     }
 }
 

turbopack/crates/turbopack-core/src/context.rs

@@ -1,7 +1,7 @@
 use anyhow::{Result, bail};
 use turbo_rcstr::RcStr;
 use turbo_tasks::{ResolvedVc, Vc};
-use turbo_tasks_fs::{FileSystemPath, glob::Glob};
+use turbo_tasks_fs::FileSystemPath;
 
 use crate::{
     compile_time_info::CompileTimeInfo,
@@ -104,7 +104,4 @@ pub trait AssetContext {
     /// Gets a new AssetContext with the transition applied.
     #[turbo_tasks::function]
     fn with_transition(self: Vc<Self>, transition: RcStr) -> Vc<Box<dyn AssetContext>>;
-
-    #[turbo_tasks::function]
-    fn side_effect_free_packages(self: Vc<Self>) -> Vc<Glob>;
 }

turbopack/crates/turbopack-core/src/module.rs

@@ -1,7 +1,5 @@
-use serde::{Deserialize, Serialize};
 use turbo_rcstr::RcStr;
-use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, ValueToString, Vc, trace::TraceRawVcs};
-use turbo_tasks_fs::glob::Glob;
+use turbo_tasks::{ResolvedVc, TaskInput, ValueToString, Vc};
 
 use crate::{asset::Asset, ident::AssetIdent, reference::ModuleReferences, source::OptionSource};
 
@@ -12,18 +10,8 @@ pub enum StyleType {
     GlobalStyle,
 }
 
-#[derive(
-    Serialize,
-    Deserialize,
-    Hash,
-    Eq,
-    PartialEq,
-    Debug,
-    NonLocalValue,
-    TraceRawVcs,
-    bincode::Encode,
-    bincode::Decode,
-)]
+#[derive(Hash, Debug, Copy, Clone)]
+#[turbo_tasks::value(shared)]
 pub enum ModuleSideEffects {
     /// Analysis determined that the module evaluation is side effect free
     /// the module may still be side effectful based on its imports.
@@ -72,12 +60,7 @@ pub trait Module: Asset {
 
     /// Returns true if the module is marked as side effect free in package.json or by other means.
     #[turbo_tasks::function]
-    fn is_marked_as_side_effect_free(
-        self: Vc<Self>,
-        _side_effect_free_packages: Vc<Glob>,
-    ) -> Vc<bool> {
-        Vc::cell(false)
-    }
+    fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects>;
 }
 
 #[turbo_tasks::value_trait]

turbopack/crates/turbopack-core/src/module_graph/binding_usage_info.rs

@@ -9,7 +9,10 @@ use turbo_tasks::{ResolvedVc, Vc};
 
 use crate::{
     module::Module,
-    module_graph::{GraphEdgeIndex, GraphTraversalAction, ModuleGraph},
+    module_graph::{
+        GraphEdgeIndex, GraphTraversalAction, ModuleGraph,
+        side_effect_module_info::compute_side_effect_free_module_info,
+    },
     reference::ModuleReference,
     resolve::{ExportUsage, ImportUsage},
 };
@@ -121,6 +124,7 @@ pub async fn compute_binding_usage_info(
                  without_unused_references"
             );
         }
+        let side_effect_free_modules = compute_side_effect_free_module_info(*graph).await?;
 
         let graph = graph.read_graphs().await?;
 
@@ -147,6 +151,7 @@ pub async fn compute_binding_usage_info(
                                 .iter()
                                 .all(|e| !source_used_exports.is_export_used(e))
                             {
+                                // all exports are unused
                                 #[cfg(debug_assertions)]
                                 debug_unused_references_name.insert((
                                     parent,
@@ -170,15 +175,28 @@ pub async fn compute_binding_usage_info(
                             }
                         }
                         ImportUsage::SideEffects => {
-                            #[cfg(debug_assertions)]
-                            debug_unused_references_name.remove(&(
-                                parent,
-                                ref_data.binding_usage.export.clone(),
-                                target,
-                            ));
-                            unused_references_edges.remove(&edge);
-                            unused_references.remove(&ref_data.reference);
-                            // Continue, has to always be included
+                            if side_effect_free_modules.contains(&target) {
+                                #[cfg(debug_assertions)]
+                                debug_unused_references_name.insert((
+                                    parent,
+                                    ref_data.binding_usage.export.clone(),
+                                    target,
+                                ));
+                                unused_references_edges.insert(edge);
+                                unused_references.insert(ref_data.reference);
+
+                                return Ok(GraphTraversalAction::Skip);
+                            } else {
+                                #[cfg(debug_assertions)]
+                                debug_unused_references_name.remove(&(
+                                    parent,
+                                    ref_data.binding_usage.export.clone(),
+                                    target,
+                                ));
+                                unused_references_edges.remove(&edge);
+                                unused_references.remove(&ref_data.reference);
+                                // Continue, has to always be included
+                            }
                         }
                     }
                 }

turbopack/crates/turbopack-core/src/module_graph/mod.rs

@@ -48,6 +48,7 @@ pub mod chunk_group_info;
 pub mod merged_modules;
 pub mod module_batch;
 pub(crate) mod module_batches;
+mod side_effect_module_info;
 pub(crate) mod style_groups;
 mod traced_di_graph;
 
@@ -1959,7 +1960,7 @@ pub mod tests {
     use crate::{
         asset::{Asset, AssetContent},
         ident::AssetIdent,
-        module::Module,
+        module::{Module, ModuleSideEffects},
         module_graph::{
             GraphEntries, GraphTraversalAction, ModuleGraph, ModuleGraphRef, SingleModuleGraph,
             VisitedModules, chunk_group_info::ChunkGroupEntry,
@@ -2357,6 +2358,10 @@ pub mod tests {
 
             Ok(Vc::cell(references))
         }
+        #[turbo_tasks::function]
+        fn side_effects(self: Vc<Self>) -> Vc<ModuleSideEffects> {
+            ModuleSideEffects::SideEffectful.cell()
+        }
     }
 
     /// Constructs a graph based on the provided dependency adjacency lists and calls the given test