archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Issue Reporters (vercel/turbo#3707)" (vercel/turbo#3796)

Browse source 
This reverts commit a8612abf5edbde3013d6fcf8845976f422cb2ffc.

This commit makes the `turbotrace` hanging, x-ref:
https://vercel.slack.com/archives/C02UJN0A1UL/p1676369060652879
This commit is contained in:
LongYinan 2023-02-14 20:53:56 +08:00 committed by GitHub
parent 4460521e70
commit c881b16e49
1 changed files with 24 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
packages/next-swc/crates/next-dev/src/lib.rs
View file

@ -27,15 +27,14 @@ use owo_colors::OwoColorize;
use turbo_malloc::TurboMalloc;
use turbo_tasks::{
util::{FormatBytes, FormatDuration},
CollectiblesSource, RawVc, StatsType, TransientInstance, TransientValue, TurboTasks,
TurboTasksBackendApi, Value,
RawVc, StatsType, TransientInstance, TransientValue, TurboTasks, TurboTasksBackendApi, Value,
};
use turbo_tasks_fs::{DiskFileSystemVc, FileSystem, FileSystemVc};
use turbo_tasks_memory::MemoryBackend;
use turbopack_cli_utils::issue::{ConsoleUiVc, LogOptions};
use turbopack_cli_utils::issue::{ConsoleUi, ConsoleUiVc, LogOptions};
use turbopack_core::{
environment::ServerAddr,
issue::{IssueReporter, IssueReporterVc, IssueSeverity, IssueVc},
issue::IssueSeverity,
resolve::{parse::RequestVc, pattern::QueryMapVc},
server_fs::ServerFileSystemVc,
};
@ -63,7 +62,6 @@ pub struct NextDevServerBuilder {
entry_requests: Vec<EntryRequest>,
eager_compile: bool,
hostname: Option<IpAddr>,
issue_reporter: Option<Box<dyn IssueReporterProvider>>,
port: Option<u16>,
browserslist_query: String,
log_level: IssueSeverity,
@ -85,7 +83,6 @@ impl NextDevServerBuilder {
entry_requests: vec![],
eager_compile: false,
hostname: None,
issue_reporter: None,
port: None,
browserslist_query: "last 1 Chrome versions, last 1 Firefox versions, last 1 Safari \
versions, last 1 Edge versions"
@ -142,14 +139,6 @@ impl NextDevServerBuilder {
self
}
pub fn issue_reporter(
mut self,
issue_reporter: Box<dyn IssueReporterProvider>,
) -> NextDevServerBuilder {
self.issue_reporter = Some(issue_reporter);
self
}
/// Attempts to find an open port to bind.
fn find_port(&self, host: IpAddr, port: u16, max_attempts: u16) -> Result<DevServerBuilder> {
// max_attempts of 1 means we loop 0 times.
@ -203,22 +192,17 @@ impl NextDevServerBuilder {
let show_all = self.show_all;
let log_detail = self.log_detail;
let browserslist_query = self.browserslist_query;
let log_options = Arc::new(LogOptions {
let log_options = LogOptions {
current_dir: current_dir().unwrap(),
show_all,
log_detail,
log_level: self.log_level,
});
};
let entry_requests = Arc::new(self.entry_requests);
let console_ui = Arc::new(ConsoleUi::new(log_options));
let console_ui_to_dev_server = console_ui.clone();
let server_addr = Arc::new(server.addr);
let tasks = turbo_tasks.clone();
let issue_provider = self.issue_reporter.unwrap_or_else(|| {
// Initialize a ConsoleUi reporter if no custom reporter was provided
Box::new(move || ConsoleUiVc::new(log_options.clone().into()).into())
});
let issue_reporter_arc = Arc::new(move || issue_provider.get_issue_reporter());
let get_issue_reporter = issue_reporter_arc.clone();
let source = move || {
source(
root_dir.clone(),
@ -226,31 +210,22 @@ impl NextDevServerBuilder {
entry_requests.clone().into(),
eager_compile,
turbo_tasks.clone().into(),
get_issue_reporter(),
console_ui.clone().into(),
browserslist_query.clone(),
server_addr.clone().into(),
)
};
Ok(server.serve(tasks, source, issue_reporter_arc.clone()))
Ok(server.serve(tasks, source, console_ui_to_dev_server))
}
}
async fn handle_issues<T: Into<RawVc> + CollectiblesSource + Copy>(
source: T,
issue_reporter: IssueReporterVc,
) -> Result<()> {
let issues = IssueVc::peek_issues_with_path(source)
.await?
.strongly_consistent()
async fn handle_issues<T: Into<RawVc>>(source: T, console_ui: ConsoleUiVc) -> Result<()> {
let state = console_ui
.group_and_display_issues(TransientValue::new(source.into()))
.await?;
issue_reporter.report_issues(
TransientInstance::new(issues.clone()),
TransientValue::new(source.into()),
);
if issues.has_fatal().await? {
if state.has_fatal {
Err(anyhow!("Fatal issue(s) occurred"))
} else {
Ok(())
@ -258,17 +233,17 @@ async fn handle_issues<T: Into<RawVc> + CollectiblesSource + Copy>(
}
#[turbo_tasks::function]
async fn project_fs(project_dir: &str, issue_reporter: IssueReporterVc) -> Result<FileSystemVc> {
async fn project_fs(project_dir: &str, console_ui: ConsoleUiVc) -> Result<FileSystemVc> {
let disk_fs = DiskFileSystemVc::new("project".to_string(), project_dir.to_string());
handle_issues(disk_fs, issue_reporter).await?;
handle_issues(disk_fs, console_ui).await?;
disk_fs.await?.start_watching()?;
Ok(disk_fs.into())
}
#[turbo_tasks::function]
async fn output_fs(project_dir: &str, issue_reporter: IssueReporterVc) -> Result<FileSystemVc> {
async fn output_fs(project_dir: &str, console_ui: ConsoleUiVc) -> Result<FileSystemVc> {
let disk_fs = DiskFileSystemVc::new("output".to_string(), project_dir.to_string());
handle_issues(disk_fs, issue_reporter).await?;
handle_issues(disk_fs, console_ui).await?;
disk_fs.await?.start_watching()?;
Ok(disk_fs.into())
}
@ -281,12 +256,13 @@ async fn source(
entry_requests: TransientInstance<Vec<EntryRequest>>,
eager_compile: bool,
turbo_tasks: TransientInstance<TurboTasks<MemoryBackend>>,
issue_reporter: IssueReporterVc,
console_ui: TransientInstance<ConsoleUi>,
browserslist_query: String,
server_addr: TransientInstance<SocketAddr>,
) -> Result<ContentSourceVc> {
let output_fs = output_fs(&project_dir, issue_reporter);
let fs = project_fs(&root_dir, issue_reporter);
let console_ui = (*console_ui).clone().cell();
let output_fs = output_fs(&project_dir, console_ui);
let fs = project_fs(&root_dir, console_ui);
let project_relative = project_dir.strip_prefix(&root_dir).unwrap();
let project_relative = project_relative
.strip_prefix(MAIN_SEPARATOR)
@ -396,9 +372,9 @@ async fn source(
.cell()
.into();
handle_issues(dev_server_fs, issue_reporter).await?;
handle_issues(web_source, issue_reporter).await?;
handle_issues(page_source, issue_reporter).await?;
handle_issues(dev_server_fs, console_ui).await?;
handle_issues(web_source, console_ui).await?;
handle_issues(page_source, console_ui).await?;
Ok(source)
}
@ -575,16 +551,3 @@ fn profile_timeout<T>(
) -> impl Future<Output = T> {
future
}
pub trait IssueReporterProvider: Send + Sync + 'static {
fn get_issue_reporter(&self) -> IssueReporterVc;
}
impl<T> IssueReporterProvider for T
where
T: Fn() -> IssueReporterVc + Send + Sync + Clone + 'static,
{
fn get_issue_reporter(&self) -> IssueReporterVc {
self()
}
}