Skip to content

Commit a9496fa

Browse files
authored
chore: update next.js (#2216)
* chore: update next.js * chore: update next.js * fix: fmt * fix: fmt * chore: fix wasm build
1 parent 82fb80c commit a9496fa

File tree

11 files changed

+29
-16
lines changed

11 files changed

+29
-16
lines changed

Cargo.lock

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/pack-api/src/operation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use turbo_tasks::{
44
CollectiblesSource, NonLocalValue, OperationVc, ResolvedVc, Vc, debug::ValueDebugFormat,
55
get_effects, trace::TraceRawVcs,
66
};
7-
use turbopack_core::{diagnostics::Diagnostic, issue::IssueDescriptionExt};
7+
use turbopack_core::{diagnostics::Diagnostic, issue::CollectibleIssuesExt};
88

99
use crate::{endpoint::Endpoint, entrypoint::Entrypoints};
1010

@@ -36,7 +36,7 @@ async fn entrypoints_without_collectibles_operation(
3636
) -> Result<Vc<Entrypoints>> {
3737
let _ = entrypoints.resolve_strongly_consistent().await?;
3838
let _ = entrypoints.take_collectibles::<Box<dyn Diagnostic>>();
39-
let _ = entrypoints.take_issues_with_path().await?;
39+
let _ = entrypoints.take_issues().await?;
4040
let _ = get_effects(entrypoints).await?;
4141
Ok(entrypoints.connect())
4242
}

crates/pack-api/src/project.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use turbopack_core::{
4141
},
4242
compile_time_info::CompileTimeInfo,
4343
issue::{
44-
Issue, IssueDescriptionExt, IssueSeverity, IssueStage, OptionStyledString, StyledString,
44+
CollectibleIssuesExt, Issue, IssueSeverity, IssueStage, OptionStyledString, StyledString,
4545
},
4646
module_graph::{
4747
GraphEntries, ModuleGraph, SingleModuleGraph, VisitedModules,
@@ -829,7 +829,7 @@ impl Project {
829829
async move {
830830
let module_graphs_op = whole_app_module_graph_operation(self);
831831
let module_graphs_vc = module_graphs_op.connect().resolve().await?;
832-
let _ = module_graphs_op.take_issues_with_path().await?;
832+
let _ = module_graphs_op.take_issues().await?;
833833

834834
// At this point all modules have been computed and we can get rid of the node.js
835835
// process pools

crates/pack-api/src/utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use turbo_tasks::{
77
};
88
use turbopack_core::{
99
diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic},
10-
issue::{IssueDescriptionExt, IssueSeverity, PlainIssue, StyledString},
10+
issue::{CollectibleIssuesExt, IssueSeverity, PlainIssue, StyledString},
1111
};
1212

1313
use crate::endpoint::{Endpoint, EndpointIssuesAndDiags, endpoint_server_changed_operation};
@@ -73,7 +73,7 @@ pub async fn strongly_consistent_catch_collectables<R: VcValueType + Send>(
7373
}
7474

7575
pub async fn get_issues<T: Send>(source: OperationVc<T>) -> Result<Arc<Vec<ReadRef<PlainIssue>>>> {
76-
let issues = source.peek_issues_with_path().await?;
76+
let issues = source.peek_issues().await?;
7777
Ok(Arc::new(issues.get_plain_issues().await?))
7878
}
7979

crates/pack-cli/src/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub async fn run(options: ProjectOptions) -> Result<()> {
2222
let (turbo_tasks, project_container) = initialize_project_container(options, dev).await?;
2323

2424
let (entrypoints, _issues, _diagnostics) = turbo_tasks
25-
.run_once(async move {
25+
.run(async move {
2626
let entrypoints_with_issues_op =
2727
get_all_written_entrypoints_with_issues_operation(project_container);
2828

crates/pack-cli/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ pub async fn initialize_project_container(
8787
noop_backing_storage(),
8888
));
8989
let project_container = turbo_tasks
90-
.run_once(async move {
90+
.run(async move {
9191
let project_container = ProjectContainer::new("utoo-pack-cli".into(), dev);
9292
let project_container = project_container.to_resolved().await?;
9393
project_container.initialize(options).await?;

crates/pack-napi/src/pack_api/project.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ pub async fn project_new(
311311
let trace_server = std::env::var("TURBOPACK_TRACE_SERVER").ok();
312312
if trace_server.is_some() {
313313
tracing_server_handle = Some(thread::spawn(move || {
314-
turbopack_trace_server::start_turbopack_trace_server(trace_file);
314+
turbopack_trace_server::start_turbopack_trace_server(trace_file, None);
315315
}));
316316
println!(
317317
"Turbopack trace server started. View trace at https://turbo-trace-viewer.vercel.app/"

crates/pack-tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ turbo-tasks-fs = { workspace = true }
3333
turbo-unix-path = { workspace = true }
3434
turbopack = { workspace = true }
3535
turbopack-browser = { workspace = true, features = ["test"] }
36-
turbopack-core = { workspace = true, features = ["issue_path"] }
36+
turbopack-core = { workspace = true }
3737
turbopack-ecmascript-plugins = { workspace = true, features = ["transform_emotion"] }
3838
turbopack-node = { workspace = true }
3939
turbopack-nodejs = { workspace = true, features = ["test"] }

crates/pack-tests/tests/snapshot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use turbo_tasks::{ResolvedVc, TurboTasks, ValueToString, Vc, apply_effects};
2020
use turbo_tasks_backend::{BackendOptions, TurboTasksBackend, noop_backing_storage};
2121
use turbo_tasks_fs::FileSystemPath;
2222
use turbo_unix_path::sys_to_unix;
23-
use turbopack_core::{asset::Asset, issue::IssueDescriptionExt, output::OutputAsset};
23+
use turbopack_core::{asset::Asset, issue::CollectibleIssuesExt, output::OutputAsset};
2424
use turbopack_test_utils::snapshot::{UPDATE, diff, expected, matches_expected, snapshot_issues};
2525

2626
use crate::util::REPO_ROOT;
@@ -126,7 +126,7 @@ async fn run_inner_options(resource: RcStr) -> Result<()> {
126126
.await?
127127
.owned()
128128
.await?;
129-
let captured_issues = output_op.peek_issues_with_path().await?;
129+
let captured_issues = output_op.peek_issues().await?;
130130

131131
let plain_issues = captured_issues.get_plain_issues().await?;
132132

next.js

Submodule next.js updated 622 files

0 commit comments

Comments
 (0)