Unverified Commit 8ee79b82 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

change turbopack-cli to new backend (#75242)

### What?

* change turbopack-cli to new backend
* avoid transient tasks in turbopack-cli
parent 7aa61377
...@@ -9471,12 +9471,12 @@ dependencies = [ ...@@ -9471,12 +9471,12 @@ dependencies = [
"tracing-subscriber", "tracing-subscriber",
"turbo-rcstr", "turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-backend",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-env", "turbo-tasks-env",
"turbo-tasks-fetch", "turbo-tasks-fetch",
"turbo-tasks-fs", "turbo-tasks-fs",
"turbo-tasks-malloc", "turbo-tasks-malloc",
"turbo-tasks-memory",
"turbopack", "turbopack",
"turbopack-bench", "turbopack-bench",
"turbopack-browser", "turbopack-browser",
......
...@@ -45,11 +45,11 @@ tokio = { workspace = true, features = ["full"] } ...@@ -45,11 +45,11 @@ tokio = { workspace = true, features = ["full"] }
tracing-subscriber = { workspace = true, features = ["env-filter", "json"] } tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }
turbo-rcstr = { workspace = true } turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-backend = { workspace = true }
turbo-tasks-env = { workspace = true } turbo-tasks-env = { workspace = true }
turbo-tasks-fetch = { workspace = true } turbo-tasks-fetch = { workspace = true }
turbo-tasks-fs = { workspace = true } turbo-tasks-fs = { workspace = true }
turbo-tasks-malloc = { workspace = true, default-features = false } turbo-tasks-malloc = { workspace = true, default-features = false }
turbo-tasks-memory = { workspace = true }
turbopack = { workspace = true } turbopack = { workspace = true }
turbopack-browser = { workspace = true } turbopack-browser = { workspace = true }
turbopack-cli-utils = { workspace = true } turbopack-cli-utils = { workspace = true }
......
...@@ -77,12 +77,11 @@ pub struct CommonArguments { ...@@ -77,12 +77,11 @@ pub struct CommonArguments {
#[clap(long)] #[clap(long)]
pub full_stats: bool, pub full_stats: bool,
/// Enable experimental garbage collection with the provided memory limit in // Enable experimental garbage collection with the provided memory limit in
/// MB. // MB.
#[clap(long)] // #[clap(long)]
pub memory_limit: Option<usize>, // pub memory_limit: Option<usize>,
/// Whether to build for the `browser` or `node``
/// Target
#[clap(long)] #[clap(long)]
pub target: Option<Target>, pub target: Option<Target>,
} }
......
...@@ -11,8 +11,10 @@ use turbo_tasks::{ ...@@ -11,8 +11,10 @@ use turbo_tasks::{
apply_effects, ReadConsistency, ResolvedVc, TransientInstance, TryJoinIterExt, TurboTasks, apply_effects, ReadConsistency, ResolvedVc, TransientInstance, TryJoinIterExt, TurboTasks,
Value, Vc, Value, Vc,
}; };
use turbo_tasks_backend::{
noop_backing_storage, BackendOptions, NoopBackingStorage, TurboTasksBackend,
};
use turbo_tasks_fs::FileSystem; use turbo_tasks_fs::FileSystem;
use turbo_tasks_memory::MemoryBackend;
use turbopack_browser::BrowserChunkingContext; use turbopack_browser::BrowserChunkingContext;
use turbopack_cli_utils::issue::{ConsoleUi, LogOptions}; use turbopack_cli_utils::issue::{ConsoleUi, LogOptions};
use turbopack_core::{ use turbopack_core::{
...@@ -43,8 +45,7 @@ use crate::{ ...@@ -43,8 +45,7 @@ use crate::{
arguments::{BuildArguments, Target}, arguments::{BuildArguments, Target},
contexts::{get_client_asset_context, get_client_compile_time_info, NodeEnv}, contexts::{get_client_asset_context, get_client_compile_time_info, NodeEnv},
util::{ util::{
normalize_dirs, normalize_entries, output_fs, project_fs, EntryRequest, EntryRequests, normalize_dirs, normalize_entries, output_fs, project_fs, EntryRequest, NormalizedDirs,
NormalizedDirs,
}, },
}; };
...@@ -53,8 +54,10 @@ pub fn register() { ...@@ -53,8 +54,10 @@ pub fn register() {
include!(concat!(env!("OUT_DIR"), "/register.rs")); include!(concat!(env!("OUT_DIR"), "/register.rs"));
} }
type Backend = TurboTasksBackend<NoopBackingStorage>;
pub struct TurbopackBuildBuilder { pub struct TurbopackBuildBuilder {
turbo_tasks: Arc<TurboTasks<MemoryBackend>>, turbo_tasks: Arc<TurboTasks<Backend>>,
project_dir: RcStr, project_dir: RcStr,
root_dir: RcStr, root_dir: RcStr,
entry_requests: Vec<EntryRequest>, entry_requests: Vec<EntryRequest>,
...@@ -67,11 +70,7 @@ pub struct TurbopackBuildBuilder { ...@@ -67,11 +70,7 @@ pub struct TurbopackBuildBuilder {
} }
impl TurbopackBuildBuilder { impl TurbopackBuildBuilder {
pub fn new( pub fn new(turbo_tasks: Arc<TurboTasks<Backend>>, project_dir: RcStr, root_dir: RcStr) -> Self {
turbo_tasks: Arc<TurboTasks<MemoryBackend>>,
project_dir: RcStr,
root_dir: RcStr,
) -> Self {
TurbopackBuildBuilder { TurbopackBuildBuilder {
turbo_tasks, turbo_tasks,
project_dir, project_dir,
...@@ -126,14 +125,7 @@ impl TurbopackBuildBuilder { ...@@ -126,14 +125,7 @@ impl TurbopackBuildBuilder {
let build_result_op = build_internal( let build_result_op = build_internal(
self.project_dir.clone(), self.project_dir.clone(),
self.root_dir, self.root_dir,
EntryRequests( self.entry_requests.clone(),
self.entry_requests
.iter()
.cloned()
.map(EntryRequest::resolved_cell)
.collect(),
)
.resolved_cell(),
self.browserslist_query, self.browserslist_query,
self.minify_type, self.minify_type,
self.target, self.target,
...@@ -177,7 +169,7 @@ impl TurbopackBuildBuilder { ...@@ -177,7 +169,7 @@ impl TurbopackBuildBuilder {
async fn build_internal( async fn build_internal(
project_dir: RcStr, project_dir: RcStr,
root_dir: RcStr, root_dir: RcStr,
entry_requests: ResolvedVc<EntryRequests>, entry_requests: Vec<EntryRequest>,
browserslist_query: RcStr, browserslist_query: RcStr,
minify_type: MinifyType, minify_type: MinifyType,
target: Target, target: Target,
...@@ -285,11 +277,9 @@ async fn build_internal( ...@@ -285,11 +277,9 @@ async fn build_internal(
); );
let entry_requests = (*entry_requests let entry_requests = (*entry_requests
.await? .into_iter()
.iter()
.cloned()
.map(|r| async move { .map(|r| async move {
Ok(match &*r.await? { Ok(match r {
EntryRequest::Relative(p) => Request::relative( EntryRequest::Relative(p) => Request::relative(
Value::new(p.clone().into()), Value::new(p.clone().into()),
Default::default(), Default::default(),
...@@ -421,10 +411,12 @@ pub async fn build(args: &BuildArguments) -> Result<()> { ...@@ -421,10 +411,12 @@ pub async fn build(args: &BuildArguments) -> Result<()> {
root_dir, root_dir,
} = normalize_dirs(&args.common.dir, &args.common.root)?; } = normalize_dirs(&args.common.dir, &args.common.root)?;
let tt = TurboTasks::new(MemoryBackend::new( let tt = TurboTasks::new(TurboTasksBackend::new(
args.common BackendOptions {
.memory_limit storage_mode: None,
.map_or(usize::MAX, |l| l * 1024 * 1024), ..Default::default()
},
noop_backing_storage(),
)); ));
let mut builder = TurbopackBuildBuilder::new(tt, project_dir, root_dir) let mut builder = TurbopackBuildBuilder::new(tt, project_dir, root_dir)
......
...@@ -16,9 +16,11 @@ use turbo_tasks::{ ...@@ -16,9 +16,11 @@ use turbo_tasks::{
util::{FormatBytes, FormatDuration}, util::{FormatBytes, FormatDuration},
ResolvedVc, TransientInstance, TurboTasks, UpdateInfo, Value, Vc, ResolvedVc, TransientInstance, TurboTasks, UpdateInfo, Value, Vc,
}; };
use turbo_tasks_backend::{
noop_backing_storage, BackendOptions, NoopBackingStorage, TurboTasksBackend,
};
use turbo_tasks_fs::FileSystem; use turbo_tasks_fs::FileSystem;
use turbo_tasks_malloc::TurboMalloc; use turbo_tasks_malloc::TurboMalloc;
use turbo_tasks_memory::MemoryBackend;
use turbopack::evaluate_context::node_build_environment; use turbopack::evaluate_context::node_build_environment;
use turbopack_cli_utils::issue::{ConsoleUi, LogOptions}; use turbopack_cli_utils::issue::{ConsoleUi, LogOptions};
use turbopack_core::{ use turbopack_core::{
...@@ -50,8 +52,10 @@ use crate::{ ...@@ -50,8 +52,10 @@ use crate::{
pub(crate) mod web_entry_source; pub(crate) mod web_entry_source;
type Backend = TurboTasksBackend<NoopBackingStorage>;
pub struct TurbopackDevServerBuilder { pub struct TurbopackDevServerBuilder {
turbo_tasks: Arc<TurboTasks<MemoryBackend>>, turbo_tasks: Arc<TurboTasks<Backend>>,
project_dir: RcStr, project_dir: RcStr,
root_dir: RcStr, root_dir: RcStr,
entry_requests: Vec<EntryRequest>, entry_requests: Vec<EntryRequest>,
...@@ -68,7 +72,7 @@ pub struct TurbopackDevServerBuilder { ...@@ -68,7 +72,7 @@ pub struct TurbopackDevServerBuilder {
impl TurbopackDevServerBuilder { impl TurbopackDevServerBuilder {
pub fn new( pub fn new(
turbo_tasks: Arc<TurboTasks<MemoryBackend>>, turbo_tasks: Arc<TurboTasks<Backend>>,
project_dir: RcStr, project_dir: RcStr,
root_dir: RcStr, root_dir: RcStr,
) -> TurbopackDevServerBuilder { ) -> TurbopackDevServerBuilder {
...@@ -356,10 +360,12 @@ pub async fn start_server(args: &DevArguments) -> Result<()> { ...@@ -356,10 +360,12 @@ pub async fn start_server(args: &DevArguments) -> Result<()> {
root_dir, root_dir,
} = normalize_dirs(&args.common.dir, &args.common.root)?; } = normalize_dirs(&args.common.dir, &args.common.root)?;
let tt = TurboTasks::new(MemoryBackend::new( let tt = TurboTasks::new(TurboTasksBackend::new(
args.common BackendOptions {
.memory_limit storage_mode: None,
.map_or(usize::MAX, |l| l * 1024 * 1024), ..Default::default()
},
noop_backing_storage(),
)); ));
let tt_clone = tt.clone(); let tt_clone = tt.clone();
...@@ -503,7 +509,7 @@ pub async fn start_server(args: &DevArguments) -> Result<()> { ...@@ -503,7 +509,7 @@ pub async fn start_server(args: &DevArguments) -> Result<()> {
#[cfg(feature = "profile")] #[cfg(feature = "profile")]
// When profiling, exits the process when no new updates have been received for // When profiling, exits the process when no new updates have been received for
// a given timeout and there are no more tasks in progress. // a given timeout and there are no more tasks in progress.
async fn profile_timeout<T>(tt: &TurboTasks<MemoryBackend>, future: impl Future<Output = T>) -> T { async fn profile_timeout<T>(tt: &TurboTasks<Backend>, future: impl Future<Output = T>) -> T {
/// How long to wait in between updates before force-exiting the process /// How long to wait in between updates before force-exiting the process
/// during profiling. /// during profiling.
const PROFILE_EXIT_TIMEOUT: Duration = Duration::from_secs(5); const PROFILE_EXIT_TIMEOUT: Duration = Duration::from_secs(5);
...@@ -523,7 +529,7 @@ async fn profile_timeout<T>(tt: &TurboTasks<MemoryBackend>, future: impl Future< ...@@ -523,7 +529,7 @@ async fn profile_timeout<T>(tt: &TurboTasks<MemoryBackend>, future: impl Future<
#[cfg(not(feature = "profile"))] #[cfg(not(feature = "profile"))]
fn profile_timeout<T>( fn profile_timeout<T>(
_tt: &TurboTasks<MemoryBackend>, _tt: &TurboTasks<Backend>,
future: impl Future<Output = T>, future: impl Future<Output = T>,
) -> impl Future<Output = T> { ) -> impl Future<Output = T> {
future future
......
...@@ -2,15 +2,12 @@ use std::{env::current_dir, path::PathBuf}; ...@@ -2,15 +2,12 @@ use std::{env::current_dir, path::PathBuf};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use dunce::canonicalize; use dunce::canonicalize;
use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc}; use turbo_tasks::{NonLocalValue, TaskInput, Vc};
use turbo_tasks_fs::{DiskFileSystem, FileSystem}; use turbo_tasks_fs::{DiskFileSystem, FileSystem};
#[turbo_tasks::value(transparent)] #[derive(Clone, Debug, TaskInput, Hash, PartialEq, Eq, NonLocalValue, Serialize, Deserialize)]
pub struct EntryRequests(pub Vec<ResolvedVc<EntryRequest>>);
#[turbo_tasks::value(shared)]
#[derive(Clone)]
pub enum EntryRequest { pub enum EntryRequest {
Relative(RcStr), Relative(RcStr),
Module(RcStr, RcStr), Module(RcStr, RcStr),
......
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