Unverified Commit 2da62593 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

[Turbopack] use new backend in next-build-test (#75724)

### What?

* use new backend in next-build-test
* apply effects in next-build-test
* fix Dockerfile
parent f37a4545
...@@ -28,5 +28,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ ...@@ -28,5 +28,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# RUN su node -c "npm install -g <your-package-list-here>" # RUN su node -c "npm install -g <your-package-list-here>"
# Enable pnpm # Enable pnpm
RUN npm i -g corepack@latest
RUN corepack enable pnpm RUN corepack enable pnpm
\ No newline at end of file
...@@ -4451,11 +4451,11 @@ dependencies = [ ...@@ -4451,11 +4451,11 @@ 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-fs", "turbo-tasks-fs",
"turbo-tasks-malloc", "turbo-tasks-malloc",
"turbo-tasks-memory",
"turbopack", "turbopack",
"turbopack-browser", "turbopack-browser",
"turbopack-cli-utils", "turbopack-cli-utils",
......
...@@ -23,10 +23,10 @@ tracing = "0.1" ...@@ -23,10 +23,10 @@ tracing = "0.1"
tracing-subscriber = "0.3" tracing-subscriber = "0.3"
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-fs = { workspace = true } turbo-tasks-fs = { workspace = true }
turbo-tasks-malloc = { workspace = true } turbo-tasks-malloc = { workspace = true }
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 }
......
...@@ -9,15 +9,15 @@ use anyhow::{Context, Result}; ...@@ -9,15 +9,15 @@ use anyhow::{Context, Result};
use futures_util::{StreamExt, TryStreamExt}; use futures_util::{StreamExt, TryStreamExt};
use next_api::{ use next_api::{
project::{ProjectContainer, ProjectOptions}, project::{ProjectContainer, ProjectOptions},
route::{endpoint_write_to_disk, Route}, route::{endpoint_write_to_disk, Endpoint, EndpointOutputPaths, Route},
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ReadConsistency, TransientInstance, TurboTasks, Vc}; use turbo_tasks::{get_effects, ReadConsistency, ResolvedVc, TransientInstance, TurboTasks, Vc};
use turbo_tasks_backend::{NoopBackingStorage, TurboTasksBackend};
use turbo_tasks_malloc::TurboMalloc; use turbo_tasks_malloc::TurboMalloc;
use turbo_tasks_memory::MemoryBackend;
pub async fn main_inner( pub async fn main_inner(
tt: &TurboTasks<MemoryBackend>, tt: &TurboTasks<TurboTasksBackend<NoopBackingStorage>>,
strat: Strategy, strat: Strategy,
factor: usize, factor: usize,
limit: usize, limit: usize,
...@@ -158,7 +158,7 @@ pub fn shuffle<'a, T: 'a>(items: impl Iterator<Item = T>) -> impl Iterator<Item ...@@ -158,7 +158,7 @@ pub fn shuffle<'a, T: 'a>(items: impl Iterator<Item = T>) -> impl Iterator<Item
} }
pub async fn render_routes( pub async fn render_routes(
tt: &TurboTasks<MemoryBackend>, tt: &TurboTasks<TurboTasksBackend<NoopBackingStorage>>,
routes: impl Iterator<Item = (RcStr, Route)>, routes: impl Iterator<Item = (RcStr, Route)>,
strategy: Strategy, strategy: Strategy,
factor: usize, factor: usize,
...@@ -185,21 +185,21 @@ pub async fn render_routes( ...@@ -185,21 +185,21 @@ pub async fn render_routes(
html_endpoint, html_endpoint,
data_endpoint: _, data_endpoint: _,
} => { } => {
endpoint_write_to_disk(*html_endpoint).await?; endpoint_write_to_disk_with_effects(*html_endpoint).await?;
} }
Route::PageApi { endpoint } => { Route::PageApi { endpoint } => {
endpoint_write_to_disk(*endpoint).await?; endpoint_write_to_disk_with_effects(*endpoint).await?;
} }
Route::AppPage(routes) => { Route::AppPage(routes) => {
for route in routes { for route in routes {
endpoint_write_to_disk(*route.html_endpoint).await?; endpoint_write_to_disk_with_effects(*route.html_endpoint).await?;
} }
} }
Route::AppRoute { Route::AppRoute {
original_name: _, original_name: _,
endpoint, endpoint,
} => { } => {
endpoint_write_to_disk(*endpoint).await?; endpoint_write_to_disk_with_effects(*endpoint).await?;
} }
Route::Conflict => { Route::Conflict => {
tracing::info!("WARN: conflict {}", name); tracing::info!("WARN: conflict {}", name);
...@@ -242,7 +242,27 @@ pub async fn render_routes( ...@@ -242,7 +242,27 @@ pub async fn render_routes(
Ok(stream.len()) Ok(stream.len())
} }
async fn hmr(tt: &TurboTasks<MemoryBackend>, project: Vc<ProjectContainer>) -> Result<()> { #[turbo_tasks::function]
async fn endpoint_write_to_disk_with_effects(
endpoint: ResolvedVc<Box<dyn Endpoint>>,
) -> Result<Vc<EndpointOutputPaths>> {
let op = endpoint_write_to_disk_operation(endpoint);
let result = op.resolve_strongly_consistent().await?;
get_effects(op).await?.apply().await?;
Ok(*result)
}
#[turbo_tasks::function(operation)]
pub fn endpoint_write_to_disk_operation(
endpoint: ResolvedVc<Box<dyn Endpoint>>,
) -> Vc<EndpointOutputPaths> {
endpoint_write_to_disk(*endpoint)
}
async fn hmr(
tt: &TurboTasks<TurboTasksBackend<NoopBackingStorage>>,
project: Vc<ProjectContainer>,
) -> Result<()> {
tracing::info!("HMR..."); tracing::info!("HMR...");
let session = TransientInstance::new(()); let session = TransientInstance::new(());
let idents = tt let idents = tt
......
...@@ -8,8 +8,8 @@ use next_core::tracing_presets::{ ...@@ -8,8 +8,8 @@ use next_core::tracing_presets::{
}; };
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, Registry}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, Registry};
use turbo_tasks::TurboTasks; use turbo_tasks::TurboTasks;
use turbo_tasks_backend::{noop_backing_storage, BackendOptions, TurboTasksBackend};
use turbo_tasks_malloc::TurboMalloc; use turbo_tasks_malloc::TurboMalloc;
use turbo_tasks_memory::MemoryBackend;
use turbopack_trace_utils::{ use turbopack_trace_utils::{
exit::ExitGuard, filter_layer::FilterLayer, raw_trace::RawTraceLayer, trace_writer::TraceWriter, exit::ExitGuard, filter_layer::FilterLayer, raw_trace::RawTraceLayer, trace_writer::TraceWriter,
}; };
...@@ -118,7 +118,14 @@ fn main() { ...@@ -118,7 +118,14 @@ fn main() {
None None
}; };
let tt = TurboTasks::new(MemoryBackend::new(usize::MAX)); let tt = TurboTasks::new(TurboTasksBackend::new(
BackendOptions {
dependency_tracking: false,
storage_mode: None,
..Default::default()
},
noop_backing_storage(),
));
let result = main_inner(&tt, strat, factor, limit, files).await; let result = main_inner(&tt, strat, factor, limit, files).await;
let memory = TurboMalloc::memory_usage(); let memory = TurboMalloc::memory_usage();
tracing::info!("memory usage: {} MiB", memory / 1024 / 1024); tracing::info!("memory usage: {} MiB", memory / 1024 / 1024);
......
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