Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WEB-1253: turbopack-cli: implement turbopack build #5488

Merged
merged 25 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
790a69b
turbopack-cli: modularize code to support turbopack build
wbinnssmith Jul 10, 2023
2916a58
fixup! turbopack-cli: modularize code to support turbopack build
wbinnssmith Jul 10, 2023
1487140
fixup! fixup! turbopack-cli: modularize code to support turbopack build
wbinnssmith Jul 10, 2023
c50c3c8
turbopack-cli: implement `turbopack build`
wbinnssmith Jul 10, 2023
c49d929
Merge remote-tracking branch 'origin/main' into wbinnssmith/modulariz…
wbinnssmith Jul 10, 2023
9f1b0f0
fixup! turbopack-cli: modularize code to support turbopack build
wbinnssmith Jul 10, 2023
d3200f0
Merge remote-tracking branch 'origin/wbinnssmith/modularize-cli' into…
wbinnssmith Jul 10, 2023
7cb359b
fixup! Merge remote-tracking branch 'origin/wbinnssmith/modularize-cl…
wbinnssmith Jul 10, 2023
5b5a34f
fixup! fixup! Merge remote-tracking branch 'origin/wbinnssmith/modula…
wbinnssmith Jul 10, 2023
6eadb0c
fixup! turbopack-cli: implement `turbopack build`
wbinnssmith Jul 10, 2023
690744c
fixup! turbopack-cli: implement `turbopack build`
wbinnssmith Jul 12, 2023
6c9079d
Merge remote-tracking branch 'origin/main' into wbinnssmith/modulariz…
wbinnssmith Jul 12, 2023
896be23
Merge remote-tracking branch 'origin/wbinnssmith/modularize-cli' into…
wbinnssmith Jul 12, 2023
accee1a
fixup! Merge remote-tracking branch 'origin/main' into wbinnssmith/mo…
wbinnssmith Jul 12, 2023
c05dfba
fixup! fixup! Merge remote-tracking branch 'origin/main' into wbinnss…
wbinnssmith Jul 13, 2023
dc55f46
Merge remote-tracking branch 'origin/main' into wbinnssmith/modulariz…
wbinnssmith Jul 18, 2023
de9b98d
fixup! Merge remote-tracking branch 'origin/main' into wbinnssmith/mo…
wbinnssmith Jul 18, 2023
82a2ca3
Merge remote-tracking branch 'origin/wbinnssmith/modularize-cli' into…
wbinnssmith Jul 18, 2023
792ed43
fixup! Merge remote-tracking branch 'origin/wbinnssmith/modularize-cl…
wbinnssmith Jul 18, 2023
cb3b1a4
fixup! fixup! Merge remote-tracking branch 'origin/main' into wbinnss…
wbinnssmith Jul 18, 2023
282fead
Merge remote-tracking branch 'origin/main' into wbinnssmith/modulariz…
wbinnssmith Jul 19, 2023
d41b4e0
fixup! Merge remote-tracking branch 'origin/main' into wbinnssmith/mo…
wbinnssmith Jul 19, 2023
11ec9d5
Merge remote-tracking branch 'origin/wbinnssmith/modularize-cli' into…
wbinnssmith Jul 19, 2023
6da9aef
Merge remote-tracking branch 'origin/main' into wbinnssmith/turbopack…
wbinnssmith Jul 20, 2023
b7b6f90
fixup! Merge remote-tracking branch 'origin/main' into wbinnssmith/tu…
wbinnssmith Jul 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/turbo-tasks/src/join_iter_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ where

pin_project! {
/// Future for the [TryJoinIterExt::try_join] method.
#[must_use]
pub struct TryJoin<F>
where
F: Future,
Expand Down
9 changes: 9 additions & 0 deletions crates/turbopack-cli/src/arguments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ use turbopack_cli_utils::issue::IssueSeverityCliOption;
#[derive(Debug, Parser)]
#[clap(author, version, about, long_about = None)]
pub enum Arguments {
Build(BuildArguments),
Dev(DevArguments),
}

impl Arguments {
/// The directory of the application. see [CommonArguments]::dir
pub fn dir(&self) -> Option<&Path> {
match self {
Arguments::Build(args) => args.common.dir.as_deref(),
Arguments::Dev(args) => args.common.dir.as_deref(),
}
}
Expand Down Expand Up @@ -95,3 +97,10 @@ pub struct DevArguments {
#[clap(long)]
pub allow_retry: bool,
}

#[derive(Debug, Args)]
#[clap(author, version, about, long_about = None)]
pub struct BuildArguments {
#[clap(flatten)]
pub common: CommonArguments,
}
316 changes: 316 additions & 0 deletions crates/turbopack-cli/src/build/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,316 @@
use std::{
collections::HashSet,
env::current_dir,
path::{PathBuf, MAIN_SEPARATOR},
sync::Arc,
};

use anyhow::{bail, Context, Result};
use turbo_tasks::{unit, TransientInstance, TryJoinIterExt, TurboTasks, Value, Vc};
use turbo_tasks_fs::FileSystem;
use turbo_tasks_memory::MemoryBackend;
use turbopack::ecmascript::EcmascriptModuleAsset;
use turbopack_build::BuildChunkingContext;
use turbopack_cli_utils::issue::{ConsoleUi, LogOptions};
use turbopack_core::{
asset::Asset,
chunk::{ChunkableModule, ChunkingContext, EvaluatableAssets},
environment::{BrowserEnvironment, Environment, ExecutionEnvironment},
issue::{handle_issues, IssueReporter, IssueSeverity},
module::Module,
output::OutputAsset,
reference::all_assets_from_entries,
reference_type::{EntryReferenceSubType, ReferenceType},
resolve::{
origin::{PlainResolveOrigin, ResolveOriginExt},
parse::Request,
pattern::QueryMap,
},
};
use turbopack_env::dotenv::load_env;
use turbopack_node::execution_context::ExecutionContext;

use crate::{
arguments::BuildArguments,
contexts::{get_client_asset_context, get_client_compile_time_info, NodeEnv},
util::{
normalize_dirs, normalize_entries, output_fs, project_fs, EntryRequest, EntryRequests,
NormalizedDirs,
},
};

pub fn register() {
turbopack::register();
include!(concat!(env!("OUT_DIR"), "/register.rs"));
}

pub struct TurbopackBuildBuilder {
turbo_tasks: Arc<TurboTasks<MemoryBackend>>,
project_dir: String,
root_dir: String,
entry_requests: Vec<EntryRequest>,
browserslist_query: String,
log_level: IssueSeverity,
show_all: bool,
log_detail: bool,
}

impl TurbopackBuildBuilder {
pub fn new(
turbo_tasks: Arc<TurboTasks<MemoryBackend>>,
project_dir: String,
root_dir: String,
) -> Self {
TurbopackBuildBuilder {
turbo_tasks,
project_dir,
root_dir,
entry_requests: vec![],
browserslist_query: "chrome 64, edge 79, firefox 67, opera 51, safari 12".to_owned(),
log_level: IssueSeverity::Warning,
show_all: false,
log_detail: false,
}
}

pub fn entry_request(mut self, entry_asset_path: EntryRequest) -> Self {
self.entry_requests.push(entry_asset_path);
self
}

pub fn browserslist_query(mut self, browserslist_query: String) -> Self {
self.browserslist_query = browserslist_query;
self
}

pub fn log_level(mut self, log_level: IssueSeverity) -> Self {
self.log_level = log_level;
self
}

pub fn show_all(mut self, show_all: bool) -> Self {
self.show_all = show_all;
self
}

pub fn log_detail(mut self, log_detail: bool) -> Self {
self.log_detail = log_detail;
self
}

pub async fn build(self) -> Result<()> {
let task = self.turbo_tasks.spawn_once_task(async move {
let build_result = build_internal(
self.project_dir.clone(),
self.root_dir,
EntryRequests(
self.entry_requests
.iter()
.cloned()
.map(EntryRequest::cell)
.collect(),
)
.cell(),
self.browserslist_query,
);

// Await the result to propagate any errors.
build_result.await?;

let issue_reporter: Vc<Box<dyn IssueReporter>> =
Vc::upcast(ConsoleUi::new(TransientInstance::new(LogOptions {
project_dir: PathBuf::from(self.project_dir),
current_dir: current_dir().unwrap(),
show_all: self.show_all,
log_detail: self.log_detail,
log_level: self.log_level,
})));

handle_issues(
build_result,
issue_reporter,
IssueSeverity::Error.into(),
None,
None,
)
.await?;

Ok(unit().node)
});

self.turbo_tasks.wait_task_completion(task, true).await?;

Ok(())
}
}

#[turbo_tasks::function]
async fn build_internal(
project_dir: String,
root_dir: String,
entry_requests: Vc<EntryRequests>,
browserslist_query: String,
) -> Result<Vc<()>> {
let env = Environment::new(Value::new(ExecutionEnvironment::Browser(
BrowserEnvironment {
dom: true,
web_worker: false,
service_worker: false,
browserslist_query: browserslist_query.clone(),
}
.into(),
)));
let output_fs = output_fs(project_dir.clone());
let project_fs = project_fs(root_dir.clone());
let project_relative = project_dir.strip_prefix(&root_dir).unwrap();
let project_relative = project_relative
.strip_prefix(MAIN_SEPARATOR)
.unwrap_or(project_relative)
.replace(MAIN_SEPARATOR, "/");
let project_path = project_fs.root().join(project_relative);
let build_output_root = output_fs.root().join("dist".to_string());

let chunking_context = Vc::upcast(
BuildChunkingContext::builder(
project_path,
build_output_root,
build_output_root,
build_output_root,
env,
)
.build(),
);

let node_env = NodeEnv::Production.cell();
let compile_time_info = get_client_compile_time_info(browserslist_query, node_env);
let execution_context =
ExecutionContext::new(project_path, chunking_context, load_env(project_path));
let context =
get_client_asset_context(project_path, execution_context, compile_time_info, node_env);

let entry_requests = (*entry_requests
.await?
.iter()
.cloned()
.map(|r| async move {
Ok(match &*r.await? {
EntryRequest::Relative(p) => Request::relative(Value::new(p.clone().into()), false),
EntryRequest::Module(m, p) => {
Request::module(m.clone(), Value::new(p.clone().into()), QueryMap::none())
}
})
})
.try_join()
.await?)
.to_vec();

let origin = PlainResolveOrigin::new(context, output_fs.root().join("_".to_string()));
let project_dir = &project_dir;
let entries = entry_requests
.into_iter()
.map(|request_vc| async move {
let ty = Value::new(ReferenceType::Entry(EntryReferenceSubType::Undefined));
let request = request_vc.await?;
Ok(*origin
.resolve_asset(request_vc, origin.resolve_options(ty.clone()), ty)
.primary_assets()
.await?
.first()
.with_context(|| {
format!(
"Unable to resolve entry {} from directory {}.",
request.request().unwrap(),
project_dir
)
})?)
})
.try_join()
.await?;

let entry_chunk_groups = entries
.into_iter()
.map(|entry_module| async move {
Ok(
if let Some(ecmascript) =
Vc::try_resolve_downcast_type::<EcmascriptModuleAsset>(entry_module).await?
{
Vc::cell(vec![Vc::try_resolve_downcast_type::<BuildChunkingContext>(
chunking_context,
)
.await?
.unwrap()
.entry_chunk(
build_output_root
.join(
ecmascript
.ident()
.path()
.file_stem()
.await?
.as_deref()
.unwrap()
.to_string(),
)
.with_extension("entry.js".to_string()),
Vc::upcast(ecmascript),
EvaluatableAssets::one(Vc::upcast(ecmascript)),
)])
} else if let Some(chunkable) =
Vc::try_resolve_sidecast::<Box<dyn ChunkableModule>>(entry_module).await?
{
chunking_context.chunk_group(chunkable.as_root_chunk(chunking_context))
} else {
// TODO convert into a serve-able asset
bail!(
"Entry module is not chunkable, so it can't be used to bootstrap the \
application"
)
},
)
})
.try_join()
.await?;

let mut chunks: HashSet<Vc<Box<dyn OutputAsset>>> = HashSet::new();
for chunk_group in entry_chunk_groups {
chunks.extend(&*all_assets_from_entries(chunk_group).await?);
}

chunks
.iter()
.map(|c| c.content().write(c.ident().path()))
.try_join()
.await?;

Ok(unit())
}

pub async fn build(args: &BuildArguments) -> Result<()> {
let NormalizedDirs {
project_dir,
root_dir,
} = normalize_dirs(&args.common.dir, &args.common.root)?;

let tt = TurboTasks::new(MemoryBackend::new(
args.common
.memory_limit
.map_or(usize::MAX, |l| l * 1024 * 1024),
));

let mut builder = TurbopackBuildBuilder::new(tt, project_dir, root_dir)
.log_detail(args.common.log_detail)
.show_all(args.common.show_all)
.log_level(
args.common
.log_level
.map_or_else(|| IssueSeverity::Warning, |l| l.0),
);

for entry in normalize_entries(&args.common.entries) {
builder = builder.entry_request(EntryRequest::Relative(entry));
}

builder.build().await?;

Ok(())
}
7 changes: 5 additions & 2 deletions crates/turbopack-cli/src/contexts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ async fn get_client_module_options_context(
project_path: Vc<FileSystemPath>,
execution_context: Vc<ExecutionContext>,
env: Vc<Environment>,
node_env: Vc<NodeEnv>,
) -> Result<Vc<ModuleOptionsContext>> {
let module_options_context = ModuleOptionsContext {
preset_env_versions: Some(env),
Expand All @@ -103,8 +104,8 @@ async fn get_client_module_options_context(

let resolve_options_context = get_client_resolve_options_context(project_path);

let enable_react_refresh =
assert_can_resolve_react_refresh(project_path, resolve_options_context)
let enable_react_refresh = matches!(*node_env.await?, NodeEnv::Development)
&& assert_can_resolve_react_refresh(project_path, resolve_options_context)
.await?
.is_found();

Expand Down Expand Up @@ -153,12 +154,14 @@ pub fn get_client_asset_context(
project_path: Vc<FileSystemPath>,
execution_context: Vc<ExecutionContext>,
compile_time_info: Vc<CompileTimeInfo>,
node_env: Vc<NodeEnv>,
) -> Vc<Box<dyn AssetContext>> {
let resolve_options_context = get_client_resolve_options_context(project_path);
let module_options_context = get_client_module_options_context(
project_path,
execution_context,
compile_time_info.environment(),
node_env,
);

let context: Vc<Box<dyn AssetContext>> = Vc::upcast(ModuleAssetContext::new(
Expand Down
3 changes: 2 additions & 1 deletion crates/turbopack-cli/src/dev/web_entry_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ pub async fn create_web_entry_source(
browserslist_query: String,
) -> Result<Vc<Box<dyn ContentSource>>> {
let compile_time_info = get_client_compile_time_info(browserslist_query, node_env);
let context = get_client_asset_context(project_path, execution_context, compile_time_info);
let context =
get_client_asset_context(project_path, execution_context, compile_time_info, node_env);
let chunking_context =
get_client_chunking_context(project_path, server_root, compile_time_info.environment());
let entries = get_client_runtime_entries(project_path);
Expand Down
Loading
Loading