Unverified Commit 87d865f6 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: refactor `evaluate` to take module_graph (#85971)

For some operations, we need the module graph (e.g. determining unused exports, and for the future inner graph tree shaking).

Previously, it was constructed inside of the evaluation machinery.
parent 41c1f870
...@@ -21,6 +21,7 @@ use turbopack_core::{ ...@@ -21,6 +21,7 @@ use turbopack_core::{
context::AssetContext, context::AssetContext,
ident::Layer, ident::Layer,
issue::{IssueExt, IssueSeverity, StyledString}, issue::{IssueExt, IssueSeverity, StyledString},
module_graph::ModuleGraph,
reference_type::{InnerAssets, ReferenceType}, reference_type::{InnerAssets, ReferenceType},
resolve::{ resolve::{
ResolveResult, ResolveResult,
...@@ -31,7 +32,9 @@ use turbopack_core::{ ...@@ -31,7 +32,9 @@ use turbopack_core::{
virtual_source::VirtualSource, virtual_source::VirtualSource,
}; };
use turbopack_node::{ use turbopack_node::{
debug::should_debug, evaluate::evaluate, execution_context::ExecutionContext, debug::should_debug,
evaluate::{evaluate, get_evaluate_entries},
execution_context::ExecutionContext,
}; };
use self::{ use self::{
...@@ -752,15 +755,17 @@ async fn get_mock_stylesheet( ...@@ -752,15 +755,17 @@ async fn get_mock_stylesheet(
) )
.module(); .module();
let entries = get_evaluate_entries(mocked_response_asset, asset_context, None);
let module_graph = ModuleGraph::from_modules(entries.graph_entries(), false);
let root = mock_fs.root().owned().await?; let root = mock_fs.root().owned().await?;
let val = evaluate( let val = evaluate(
mocked_response_asset, entries,
root, root,
*env, *env,
loader_source, loader_source,
asset_context,
*chunking_context, *chunking_context,
None, module_graph,
vec![], vec![],
Completion::immutable(), Completion::immutable(),
should_debug("next_font::google"), should_debug("next_font::google"),
......
...@@ -15,6 +15,7 @@ use turbopack_core::{ ...@@ -15,6 +15,7 @@ use turbopack_core::{
context::{AssetContext, ProcessResult}, context::{AssetContext, ProcessResult},
file_source::FileSource, file_source::FileSource,
ident::AssetIdent, ident::AssetIdent,
module_graph::ModuleGraph,
reference_type::{EntryReferenceSubType, InnerAssets, ReferenceType}, reference_type::{EntryReferenceSubType, InnerAssets, ReferenceType},
resolve::{FindContextFileResult, find_context_file_or_package_key, options::ImportMapping}, resolve::{FindContextFileResult, find_context_file_or_package_key, options::ImportMapping},
source::Source, source::Source,
...@@ -29,7 +30,7 @@ use super::{ ...@@ -29,7 +30,7 @@ use super::{
webpack::WebpackLoaderContext, webpack::WebpackLoaderContext,
}; };
use crate::{ use crate::{
embed_js::embed_file_path, execution_context::ExecutionContext, embed_js::embed_file_path, evaluate::get_evaluate_entries, execution_context::ExecutionContext,
transforms::webpack::evaluate_webpack_loader, transforms::webpack::evaluate_webpack_loader,
}; };
...@@ -485,10 +486,16 @@ impl PostCssTransformedAsset { ...@@ -485,10 +486,16 @@ impl PostCssTransformedAsset {
.await?; .await?;
let postcss_executor = let postcss_executor =
postcss_executor(*evaluate_context, project_path.clone(), config_path) postcss_executor(*evaluate_context, project_path.clone(), config_path).module();
.module()
.to_resolved() let entries = get_evaluate_entries(postcss_executor, *evaluate_context, None)
.await?; .to_resolved()
.await?;
let module_graph = ModuleGraph::from_modules(entries.graph_entries(), false)
.to_resolved()
.await?;
let css_fs_path = self.source.ident().path(); let css_fs_path = self.source.ident().path();
// We need to get a path relative to the project because the postcss loader // We need to get a path relative to the project because the postcss loader
...@@ -502,12 +509,12 @@ impl PostCssTransformedAsset { ...@@ -502,12 +509,12 @@ impl PostCssTransformedAsset {
}; };
let config_value = evaluate_webpack_loader(WebpackLoaderContext { let config_value = evaluate_webpack_loader(WebpackLoaderContext {
module_asset: postcss_executor, entries,
cwd: project_path.clone(), cwd: project_path.clone(),
env: *env, env: *env,
context_source_for_issue: self.source, context_source_for_issue: self.source,
asset_context: evaluate_context,
chunking_context: *chunking_context, chunking_context: *chunking_context,
module_graph,
resolve_options_context: None, resolve_options_context: None,
args: vec![ args: vec![
ResolvedVc::cell(content.into()), ResolvedVc::cell(content.into()),
......
...@@ -29,7 +29,7 @@ use turbopack_core::{ ...@@ -29,7 +29,7 @@ use turbopack_core::{
Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource, Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource,
OptionStyledString, StyledString, OptionStyledString, StyledString,
}, },
module::Module, module_graph::ModuleGraph,
reference_type::{InnerAssets, ReferenceType}, reference_type::{InnerAssets, ReferenceType},
resolve::{ resolve::{
options::{ConditionValue, ResolveInPackage, ResolveIntoPackage, ResolveOptions}, options::{ConditionValue, ResolveInPackage, ResolveIntoPackage, ResolveOptions},
...@@ -55,7 +55,8 @@ use crate::{ ...@@ -55,7 +55,8 @@ use crate::{
debug::should_debug, debug::should_debug,
embed_js::embed_file_path, embed_js::embed_file_path,
evaluate::{ evaluate::{
EnvVarTracking, EvaluateContext, EvaluationIssue, custom_evaluate, get_evaluate_pool, EnvVarTracking, EvaluateContext, EvaluateEntries, EvaluationIssue, custom_evaluate,
get_evaluate_entries, get_evaluate_pool,
}, },
execution_context::ExecutionContext, execution_context::ExecutionContext,
pool::{FormattingMode, NodeJsPool}, pool::{FormattingMode, NodeJsPool},
...@@ -240,8 +241,13 @@ impl WebpackLoadersProcessedAsset { ...@@ -240,8 +241,13 @@ impl WebpackLoadersProcessedAsset {
}; };
let evaluate_context = transform.evaluate_context; let evaluate_context = transform.evaluate_context;
let webpack_loaders_executor = webpack_loaders_executor(*evaluate_context) let webpack_loaders_executor = webpack_loaders_executor(*evaluate_context).module();
.module()
let entries = get_evaluate_entries(webpack_loaders_executor, *evaluate_context, None)
.to_resolved()
.await?;
let module_graph = ModuleGraph::from_modules(entries.graph_entries(), false)
.to_resolved() .to_resolved()
.await?; .await?;
...@@ -254,12 +260,12 @@ impl WebpackLoadersProcessedAsset { ...@@ -254,12 +260,12 @@ impl WebpackLoadersProcessedAsset {
}; };
let loaders = transform.loaders.await?; let loaders = transform.loaders.await?;
let config_value = evaluate_webpack_loader(WebpackLoaderContext { let config_value = evaluate_webpack_loader(WebpackLoaderContext {
module_asset: webpack_loaders_executor, entries,
cwd: project_path.clone(), cwd: project_path.clone(),
env: *env, env: *env,
context_source_for_issue: this.source, context_source_for_issue: this.source,
asset_context: evaluate_context,
chunking_context: *chunking_context, chunking_context: *chunking_context,
module_graph,
resolve_options_context: Some(transform.resolve_options_context), resolve_options_context: Some(transform.resolve_options_context),
args: vec![ args: vec![
ResolvedVc::cell(content), ResolvedVc::cell(content),
...@@ -410,11 +416,11 @@ pub enum ResponseMessage { ...@@ -410,11 +416,11 @@ pub enum ResponseMessage {
#[derive(Clone, PartialEq, Eq, Hash, TaskInput, Serialize, Deserialize, Debug, TraceRawVcs)] #[derive(Clone, PartialEq, Eq, Hash, TaskInput, Serialize, Deserialize, Debug, TraceRawVcs)]
pub struct WebpackLoaderContext { pub struct WebpackLoaderContext {
pub module_asset: ResolvedVc<Box<dyn Module>>, pub entries: ResolvedVc<EvaluateEntries>,
pub cwd: FileSystemPath, pub cwd: FileSystemPath,
pub env: ResolvedVc<Box<dyn ProcessEnv>>, pub env: ResolvedVc<Box<dyn ProcessEnv>>,
pub context_source_for_issue: ResolvedVc<Box<dyn Source>>, pub context_source_for_issue: ResolvedVc<Box<dyn Source>>,
pub asset_context: ResolvedVc<Box<dyn AssetContext>>, pub module_graph: ResolvedVc<ModuleGraph>,
pub chunking_context: ResolvedVc<Box<dyn ChunkingContext>>, pub chunking_context: ResolvedVc<Box<dyn ChunkingContext>>,
pub resolve_options_context: Option<ResolvedVc<ResolveOptionsContext>>, pub resolve_options_context: Option<ResolvedVc<ResolveOptionsContext>>,
pub args: Vec<ResolvedVc<JsonValue>>, pub args: Vec<ResolvedVc<JsonValue>>,
...@@ -429,12 +435,11 @@ impl EvaluateContext for WebpackLoaderContext { ...@@ -429,12 +435,11 @@ impl EvaluateContext for WebpackLoaderContext {
fn pool(&self) -> OperationVc<crate::pool::NodeJsPool> { fn pool(&self) -> OperationVc<crate::pool::NodeJsPool> {
get_evaluate_pool( get_evaluate_pool(
self.module_asset, self.entries,
self.cwd.clone(), self.cwd.clone(),
self.env, self.env,
self.asset_context,
self.chunking_context, self.chunking_context,
None, self.module_graph,
self.additional_invalidation, self.additional_invalidation,
should_debug("webpack_loader"), should_debug("webpack_loader"),
// Env vars are read untracked, since we want a more granular dependency on certain env // Env vars are read untracked, since we want a more granular dependency on certain env
......
...@@ -39,9 +39,7 @@ use turbopack_core::{ ...@@ -39,9 +39,7 @@ use turbopack_core::{
file_source::FileSource, file_source::FileSource,
ident::Layer, ident::Layer,
issue::CollectibleIssuesExt, issue::CollectibleIssuesExt,
module_graph::{ module_graph::{ModuleGraph, export_usage::compute_export_usage_info},
ModuleGraph, chunk_group_info::ChunkGroupEntry, export_usage::compute_export_usage_info,
},
reference_type::{InnerAssets, ReferenceType}, reference_type::{InnerAssets, ReferenceType},
resolve::{ resolve::{
ExternalTraced, ExternalType, ExternalTraced, ExternalType,
...@@ -49,7 +47,10 @@ use turbopack_core::{ ...@@ -49,7 +47,10 @@ use turbopack_core::{
}, },
}; };
use turbopack_ecmascript_runtime::RuntimeType; use turbopack_ecmascript_runtime::RuntimeType;
use turbopack_node::{debug::should_debug, evaluate::evaluate}; use turbopack_node::{
debug::should_debug,
evaluate::{evaluate, get_evaluate_entries},
};
use turbopack_nodejs::NodeJsChunkingContext; use turbopack_nodejs::NodeJsChunkingContext;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext; use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use turbopack_test_utils::{jest::JestRunResult, snapshot::UPDATE}; use turbopack_test_utils::{jest::JestRunResult, snapshot::UPDATE};
...@@ -462,13 +463,9 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V ...@@ -462,13 +463,9 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V
) )
.module(); .module();
// Keep this in sync with what `evaluate` does internally let entries = get_evaluate_entries(jest_entry_asset, asset_context, None);
let module_graph = ModuleGraph::from_modules(
Vc::cell(vec![ChunkGroupEntry::Entry(vec![ let module_graph = ModuleGraph::from_modules(entries.graph_entries(), false);
jest_entry_asset.to_resolved().await?,
])]),
false,
);
let chunking_context = NodeJsChunkingContext::builder( let chunking_context = NodeJsChunkingContext::builder(
project_root.clone(), project_root.clone(),
...@@ -514,13 +511,12 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V ...@@ -514,13 +511,12 @@ async fn run_test_operation(prepared_test: ResolvedVc<PreparedTest>) -> Result<V
.build(); .build();
let res = evaluate( let res = evaluate(
jest_entry_asset, entries,
path.clone(), path.clone(),
Vc::upcast(CommandLineProcessEnv::new()), Vc::upcast(CommandLineProcessEnv::new()),
Vc::upcast(test_source), Vc::upcast(test_source),
asset_context,
Vc::upcast(chunking_context), Vc::upcast(chunking_context),
None, module_graph,
vec![], vec![],
Completion::immutable(), Completion::immutable(),
should_debug("execution_test"), should_debug("execution_test"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment