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

feat(turbopack): Sort issues #62566

Merged
merged 15 commits into from
Feb 27, 2024
68 changes: 34 additions & 34 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ swc_core = { version = "0.90.10", features = [
testing = { version = "0.35.18" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240226.1" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240227.2" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240226.1" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240227.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240226.1" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240227.2" }

# General Deps

Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/napi/src/next_api/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pub async fn get_diagnostics<T: Send>(source: Vc<T>) -> Result<Arc<Vec<ReadRef<P
#[napi(object)]
pub struct NapiIssue {
pub severity: String,
pub category: String,
pub stage: String,
pub file_path: String,
pub title: serde_json::Value,
pub description: Option<serde_json::Value>,
Expand All @@ -119,7 +119,7 @@ impl From<&PlainIssue> for NapiIssue {
.description
.as_ref()
.map(|styled| serde_json::to_value(StyledStringSerialize::from(styled)).unwrap()),
category: issue.category.clone(),
stage: issue.stage.to_string(),
file_path: issue.file_path.clone(),
detail: issue
.detail
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ use turbopack_binding::{
file_source::FileSource,
ident::AssetIdent,
issue::{
Issue, IssueExt, IssueSeverity, IssueSource, OptionIssueSource, OptionStyledString,
StyledString,
Issue, IssueExt, IssueSeverity, IssueSource, IssueStage, OptionIssueSource,
OptionStyledString, StyledString,
},
source::Source,
},
Expand Down Expand Up @@ -173,8 +173,8 @@ impl Issue for NextSegmentConfigParsingIssue {
}

#[turbo_tasks::function]
fn category(&self) -> Vc<String> {
Vc::cell("parsing".to_string())
fn stage(&self) -> Vc<IssueStage> {
IssueStage::Parse.into()
}

#[turbo_tasks::function]
Expand Down
8 changes: 5 additions & 3 deletions packages/next-swc/crates/next-core/src/app_structure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ use turbo_tasks::{
};
use turbopack_binding::{
turbo::tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPath},
turbopack::core::issue::{Issue, IssueExt, IssueSeverity, OptionStyledString, StyledString},
turbopack::core::issue::{
Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString,
},
};

use crate::{
Expand Down Expand Up @@ -1217,8 +1219,8 @@ impl Issue for DirectoryTreeIssue {
}

#[turbo_tasks::function]
fn category(&self) -> Vc<String> {
Vc::cell("next app".to_string())
fn stage(&self) -> Vc<IssueStage> {
IssueStage::AppStructure.cell()
}

#[turbo_tasks::function]
Expand Down