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 10 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 Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion crates/node-file-trace/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,11 @@ async fn run<B: Backend + 'static, F: Future<Output = ()>>(
let console_ui = ConsoleUiVc::new(log_options);
console_ui
.as_issue_reporter()
.report_issues(TransientInstance::new(issues), source)
.report_issues(
TransientInstance::new(issues),
source,
IssueSeverity::Error.cell(),
)
.await?;

if has_return_value {
Expand Down
1 change: 1 addition & 0 deletions crates/turbo-tasks-macros/src/value_macro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ pub fn value(args: TokenStream, input: TokenStream) -> TokenStream {
Ok(Self { node: self.node.resolve_strongly_consistent().await? })
}

/// Downcasts the passed Trait Vc into this concrete Vc.
pub async fn resolve_from(super_trait_vc: impl std::convert::Into<turbo_tasks::RawVc>) -> Result<Option<Self>, turbo_tasks::ResolveTypeError> {
let raw_vc: turbo_tasks::RawVc = super_trait_vc.into();
let raw_vc = raw_vc.resolve_value(*#value_type_id_ident).await?;
Expand Down
5 changes: 3 additions & 2 deletions crates/turbopack-cli-utils/src/issue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use turbo_tasks::{
};
use turbo_tasks_fs::{source_context::get_source_context, FileLinesContent};
use turbopack_core::issue::{
CapturedIssues, IssueReporter, IssueReporterVc, IssueSeverity, PlainIssue,
CapturedIssues, IssueReporter, IssueReporterVc, IssueSeverity, IssueSeverityVc, PlainIssue,
PlainIssueProcessingPathItem, PlainIssueProcessingPathItemReadRef, PlainIssueSource,
};

Expand Down Expand Up @@ -353,6 +353,7 @@ impl IssueReporter for ConsoleUi {
&self,
issues: TransientInstance<ReadRef<CapturedIssues>>,
source: TransientValue<RawVc>,
min_fatal_severity: IssueSeverityVc,
) -> Result<BoolVc> {
let issues = &*issues;
let LogOptions {
Expand Down Expand Up @@ -389,7 +390,7 @@ impl IssueReporter for ConsoleUi {
}

let severity = plain_issue.severity;
if severity == IssueSeverity::Fatal {
if severity <= *min_fatal_severity.await? {
has_fatal = true;
}

Expand Down
1 change: 1 addition & 0 deletions crates/turbopack-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ turbo-tasks-fs = { workspace = true }
turbo-tasks-malloc = { workspace = true, default-features = false }
turbo-tasks-memory = { workspace = true }
turbopack = { workspace = true }
turbopack-build = { workspace = true }
turbopack-cli-utils = { workspace = true }
turbopack-core = { workspace = true }
turbopack-dev = { workspace = true }
Expand Down
18 changes: 16 additions & 2 deletions crates/turbopack-cli/src/arguments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,30 @@ 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(),
}
}
}

#[derive(Debug, Args)]
#[derive(Debug, Args, Clone)]
pub struct CommonArguments {
/// The entrypoints of the project. Resolved relative to the project's
/// directory (`--dir`).
#[clap(value_parser)]
pub entries: Option<Vec<String>>,

/// The directory of the application.
/// If no directory is provided, the current directory will be used.
#[clap(value_parser)]
#[clap(short, long, value_parser)]
pub dir: Option<PathBuf>,

/// The root directory of the project. Nothing outside of this directory can
Expand Down Expand Up @@ -90,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,
}
Loading
Loading