Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
3f01d2fc
Unverified
Commit
3f01d2fc
authored
Oct 08, 2024
by
Tobias Koppers
Committed by
GitHub
Oct 08, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Turbopack] add persistentCaching config option (#70904)
### What? add experimental option to enable persistent caching
parent
556d34ef
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
209 additions
and
77 deletions
+209
-77
Cargo.toml
crates/napi/Cargo.toml
+1
-3
project.rs
crates/napi/src/next_api/project.rs
+19
-20
utils.rs
crates/napi/src/next_api/utils.rs
+119
-20
turbotrace.rs
crates/napi/src/turbotrace.rs
+27
-21
collect-build-traces.ts
packages/next/src/build/collect-build-traces.ts
+3
-2
index.ts
packages/next/src/build/index.ts
+1
-0
generated-native.d.ts
packages/next/src/build/swc/generated-native.d.ts
+6
-2
index.ts
packages/next/src/build/swc/index.ts
+11
-5
types.ts
packages/next/src/build/swc/types.ts
+13
-3
config-schema.ts
packages/next/src/server/config-schema.ts
+1
-0
config-shared.ts
packages/next/src/server/config-shared.ts
+5
-0
hot-reloader-turbopack.ts
packages/next/src/server/dev/hot-reloader-turbopack.ts
+1
-0
mod.rs
turbopack/crates/turbo-tasks-backend/src/backend/mod.rs
+2
-1
No files found.
crates/napi/Cargo.toml
View file @
3f01d2fc
...
@@ -37,8 +37,6 @@ __internal_dhat-heap = ["dhat"]
...
@@ -37,8 +37,6 @@ __internal_dhat-heap = ["dhat"]
# effectively does nothing.
# effectively does nothing.
__internal_dhat-ad-hoc
=
["dhat"]
__internal_dhat-ad-hoc
=
["dhat"]
new-backend
=
["dep:turbo-tasks-backend"]
# Enable specific tls features per-target.
# Enable specific tls features per-target.
[target.'cfg(all(target_os
=
"windows"
,
target_arch
=
"aarch64"
))'.dependencies]
[target.'cfg(all(target_os
=
"windows"
,
target_arch
=
"aarch64"
))'.dependencies]
next-core
=
{
workspace
=
true
,
features
=
["native-tls"]
}
next-core
=
{
workspace
=
true
,
features
=
["native-tls"]
}
...
@@ -107,7 +105,7 @@ lightningcss-napi = { workspace = true }
...
@@ -107,7 +105,7 @@ lightningcss-napi = { workspace = true }
tokio
=
{
workspace
=
true
,
features
=
["full"]
}
tokio
=
{
workspace
=
true
,
features
=
["full"]
}
turbo-tasks
=
{
workspace
=
true
}
turbo-tasks
=
{
workspace
=
true
}
turbo-tasks-memory
=
{
workspace
=
true
}
turbo-tasks-memory
=
{
workspace
=
true
}
turbo-tasks-backend
=
{
workspace
=
true
,
optional
=
true
}
turbo-tasks-backend
=
{
workspace
=
true
}
turbo-tasks-fs
=
{
workspace
=
true
}
turbo-tasks-fs
=
{
workspace
=
true
}
next-api
=
{
workspace
=
true
}
next-api
=
{
workspace
=
true
}
next-build
=
{
workspace
=
true
}
next-build
=
{
workspace
=
true
}
...
...
crates/napi/src/next_api/project.rs
View file @
3f01d2fc
...
@@ -22,7 +22,7 @@ use rand::Rng;
...
@@ -22,7 +22,7 @@ use rand::Rng;
use
tokio
::{
io
::
AsyncWriteExt
,
time
::
Instant
};
use
tokio
::{
io
::
AsyncWriteExt
,
time
::
Instant
};
use
tracing
::
Instrument
;
use
tracing
::
Instrument
;
use
tracing_subscriber
::{
layer
::
SubscriberExt
,
util
::
SubscriberInitExt
,
EnvFilter
,
Registry
};
use
tracing_subscriber
::{
layer
::
SubscriberExt
,
util
::
SubscriberInitExt
,
EnvFilter
,
Registry
};
use
turbo_tasks
::{
Completion
,
RcStr
,
ReadRef
,
TransientInstance
,
TurboTasks
,
UpdateInfo
,
Vc
};
use
turbo_tasks
::{
Completion
,
RcStr
,
ReadRef
,
TransientInstance
,
UpdateInfo
,
Vc
};
use
turbo_tasks_fs
::{
DiskFileSystem
,
FileContent
,
FileSystem
,
FileSystemPath
};
use
turbo_tasks_fs
::{
DiskFileSystem
,
FileContent
,
FileSystem
,
FileSystemPath
};
use
turbopack_core
::{
use
turbopack_core
::{
diagnostics
::
PlainDiagnostic
,
diagnostics
::
PlainDiagnostic
,
...
@@ -44,7 +44,7 @@ use super::{
...
@@ -44,7 +44,7 @@ use super::{
endpoint
::
ExternalEndpoint
,
endpoint
::
ExternalEndpoint
,
utils
::{
utils
::{
create_turbo_tasks
,
get_diagnostics
,
get_issues
,
subscribe
,
NapiDiagnostic
,
NapiIssue
,
create_turbo_tasks
,
get_diagnostics
,
get_issues
,
subscribe
,
NapiDiagnostic
,
NapiIssue
,
Next
Backend
,
RootTask
,
TurbopackResult
,
VcArc
,
Next
TurboTasks
,
RootTask
,
TurbopackResult
,
VcArc
,
},
},
};
};
use
crate
::
register
;
use
crate
::
register
;
...
@@ -188,6 +188,8 @@ pub struct NapiDefineEnv {
...
@@ -188,6 +188,8 @@ pub struct NapiDefineEnv {
#[napi(object)]
#[napi(object)]
pub
struct
NapiTurboEngineOptions
{
pub
struct
NapiTurboEngineOptions
{
/// Use the new backend with persistent caching enabled.
pub
persistent_caching
:
Option
<
bool
>
,
/// An upper bound of memory that turbopack will attempt to stay under.
/// An upper bound of memory that turbopack will attempt to stay under.
pub
memory_limit
:
Option
<
f64
>
,
pub
memory_limit
:
Option
<
f64
>
,
}
}
...
@@ -272,7 +274,7 @@ impl From<NapiDefineEnv> for DefineEnv {
...
@@ -272,7 +274,7 @@ impl From<NapiDefineEnv> for DefineEnv {
}
}
pub
struct
ProjectInstance
{
pub
struct
ProjectInstance
{
turbo_tasks
:
Arc
<
TurboTasks
<
NextBackend
>>
,
turbo_tasks
:
NextTurboTasks
,
container
:
Vc
<
ProjectContainer
>
,
container
:
Vc
<
ProjectContainer
>
,
exit_receiver
:
tokio
::
sync
::
Mutex
<
Option
<
ExitReceiver
>>
,
exit_receiver
:
tokio
::
sync
::
Mutex
<
Option
<
ExitReceiver
>>
,
}
}
...
@@ -338,13 +340,20 @@ pub async fn project_new(
...
@@ -338,13 +340,20 @@ pub async fn project_new(
.memory_limit
.memory_limit
.map
(|
m
|
m
as
usize
)
.map
(|
m
|
m
as
usize
)
.unwrap_or
(
usize
::
MAX
);
.unwrap_or
(
usize
::
MAX
);
let
turbo_tasks
=
create_turbo_tasks
(
PathBuf
::
from
(
&
options
.dist_dir
),
memory_limit
)
?
;
let
persistent_caching
=
turbo_engine_options
.persistent_caching
.unwrap_or_default
();
#[cfg(not(feature
=
"new-backend"
))]
let
turbo_tasks
=
create_turbo_tasks
(
{
PathBuf
::
from
(
&
options
.dist_dir
),
persistent_caching
,
memory_limit
,
)
?
;
if
!
persistent_caching
{
use
std
::
io
::
Write
;
use
std
::
io
::
Write
;
let
stats_path
=
std
::
env
::
var_os
(
"NEXT_TURBOPACK_TASK_STATISTICS"
);
let
stats_path
=
std
::
env
::
var_os
(
"NEXT_TURBOPACK_TASK_STATISTICS"
);
if
let
Some
(
stats_path
)
=
stats_path
{
if
let
Some
(
stats_path
)
=
stats_path
{
let
task_stats
=
turbo_tasks
.backend
()
.task_statistics
()
.enable
()
.clone
();
let
Some
(
backend
)
=
turbo_tasks
.memory_backend
()
else
{
return
Err
(
anyhow!
(
"task statistics require a memory backend"
)
.into
());
};
let
task_stats
=
backend
.task_statistics
()
.enable
()
.clone
();
exit
.on_exit
(
async
move
{
exit
.on_exit
(
async
move
{
tokio
::
task
::
spawn_blocking
(
move
||
{
tokio
::
task
::
spawn_blocking
(
move
||
{
let
mut
file
=
std
::
fs
::
File
::
create
(
&
stats_path
)
let
mut
file
=
std
::
fs
::
File
::
create
(
&
stats_path
)
...
@@ -498,11 +507,7 @@ struct NapiRoute {
...
@@ -498,11 +507,7 @@ struct NapiRoute {
}
}
impl
NapiRoute
{
impl
NapiRoute
{
fn
from_route
(
fn
from_route
(
pathname
:
String
,
value
:
Route
,
turbo_tasks
:
&
NextTurboTasks
)
->
Self
{
pathname
:
String
,
value
:
Route
,
turbo_tasks
:
&
Arc
<
TurboTasks
<
NextBackend
>>
,
)
->
Self
{
let
convert_endpoint
=
|
endpoint
:
Vc
<
Box
<
dyn
Endpoint
>>
|
{
let
convert_endpoint
=
|
endpoint
:
Vc
<
Box
<
dyn
Endpoint
>>
|
{
Some
(
External
::
new
(
ExternalEndpoint
(
VcArc
::
new
(
Some
(
External
::
new
(
ExternalEndpoint
(
VcArc
::
new
(
turbo_tasks
.clone
(),
turbo_tasks
.clone
(),
...
@@ -566,10 +571,7 @@ struct NapiMiddleware {
...
@@ -566,10 +571,7 @@ struct NapiMiddleware {
}
}
impl
NapiMiddleware
{
impl
NapiMiddleware
{
fn
from_middleware
(
fn
from_middleware
(
value
:
&
Middleware
,
turbo_tasks
:
&
NextTurboTasks
)
->
Result
<
Self
>
{
value
:
&
Middleware
,
turbo_tasks
:
&
Arc
<
TurboTasks
<
NextBackend
>>
,
)
->
Result
<
Self
>
{
Ok
(
NapiMiddleware
{
Ok
(
NapiMiddleware
{
endpoint
:
External
::
new
(
ExternalEndpoint
(
VcArc
::
new
(
endpoint
:
External
::
new
(
ExternalEndpoint
(
VcArc
::
new
(
turbo_tasks
.clone
(),
turbo_tasks
.clone
(),
...
@@ -586,10 +588,7 @@ struct NapiInstrumentation {
...
@@ -586,10 +588,7 @@ struct NapiInstrumentation {
}
}
impl
NapiInstrumentation
{
impl
NapiInstrumentation
{
fn
from_instrumentation
(
fn
from_instrumentation
(
value
:
&
Instrumentation
,
turbo_tasks
:
&
NextTurboTasks
)
->
Result
<
Self
>
{
value
:
&
Instrumentation
,
turbo_tasks
:
&
Arc
<
TurboTasks
<
NextBackend
>>
,
)
->
Result
<
Self
>
{
Ok
(
NapiInstrumentation
{
Ok
(
NapiInstrumentation
{
node_js
:
External
::
new
(
ExternalEndpoint
(
VcArc
::
new
(
node_js
:
External
::
new
(
ExternalEndpoint
(
VcArc
::
new
(
turbo_tasks
.clone
(),
turbo_tasks
.clone
(),
...
...
crates/napi/src/next_api/utils.rs
View file @
3f01d2fc
use
std
::{
collections
::
HashMap
,
future
::
Future
,
ops
::
Deref
,
path
::
PathBuf
,
sync
::
Arc
};
use
std
::{
collections
::
HashMap
,
future
::
Future
,
ops
::
Deref
,
path
::
PathBuf
,
sync
::
Arc
,
time
::
Duration
,
};
use
anyhow
::{
anyhow
,
Context
,
Result
};
use
anyhow
::{
anyhow
,
Context
,
Result
};
use
napi
::{
use
napi
::{
...
@@ -7,7 +9,9 @@ use napi::{
...
@@ -7,7 +9,9 @@ use napi::{
JsFunction
,
JsObject
,
JsUnknown
,
NapiRaw
,
NapiValue
,
Status
,
JsFunction
,
JsObject
,
JsUnknown
,
NapiRaw
,
NapiValue
,
Status
,
};
};
use
serde
::
Serialize
;
use
serde
::
Serialize
;
use
turbo_tasks
::{
ReadRef
,
TaskId
,
TryJoinIterExt
,
TurboTasks
,
Vc
};
use
turbo_tasks
::{
trace
::
TraceRawVcs
,
ReadRef
,
TaskId
,
TryJoinIterExt
,
TurboTasks
,
UpdateInfo
,
Vc
,
};
use
turbo_tasks_fs
::
FileContent
;
use
turbo_tasks_fs
::
FileContent
;
use
turbopack_core
::{
use
turbopack_core
::{
diagnostics
::{
Diagnostic
,
DiagnosticContextExt
,
PlainDiagnostic
},
diagnostics
::{
Diagnostic
,
DiagnosticContextExt
,
PlainDiagnostic
},
...
@@ -18,41 +22,136 @@ use turbopack_core::{
...
@@ -18,41 +22,136 @@ use turbopack_core::{
use
crate
::
util
::
log_internal_error_and_inform
;
use
crate
::
util
::
log_internal_error_and_inform
;
#[cfg(not(feature
=
"new-backend"
))]
#[derive(Clone)]
pub
type
NextBackend
=
turbo_tasks_memory
::
MemoryBackend
;
pub
enum
NextTurboTasks
{
#[cfg(feature
=
"new-backend"
)]
Memory
(
Arc
<
TurboTasks
<
turbo_tasks_memory
::
MemoryBackend
>>
),
pub
type
NextBackend
=
turbo_tasks_backend
::
TurboTasksBackend
;
PersistentCaching
(
Arc
<
TurboTasks
<
turbo_tasks_backend
::
TurboTasksBackend
>>
),
}
impl
NextTurboTasks
{
pub
fn
dispose_root_task
(
&
self
,
task
:
TaskId
)
{
match
self
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
turbo_tasks
.dispose_root_task
(
task
),
NextTurboTasks
::
PersistentCaching
(
turbo_tasks
)
=>
turbo_tasks
.dispose_root_task
(
task
),
}
}
pub
fn
spawn_root_task
<
T
,
F
,
Fut
>
(
&
self
,
functor
:
F
)
->
TaskId
where
T
:
Send
,
F
:
Fn
()
->
Fut
+
Send
+
Sync
+
Clone
+
'static
,
Fut
:
Future
<
Output
=
Result
<
Vc
<
T
>>>
+
Send
,
{
match
self
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
turbo_tasks
.spawn_root_task
(
functor
),
NextTurboTasks
::
PersistentCaching
(
turbo_tasks
)
=>
turbo_tasks
.spawn_root_task
(
functor
),
}
}
pub
async
fn
run_once
<
T
:
TraceRawVcs
+
Send
+
'static
>
(
&
self
,
future
:
impl
Future
<
Output
=
Result
<
T
>>
+
Send
+
'static
,
)
->
Result
<
T
>
{
match
self
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
turbo_tasks
.run_once
(
future
)
.await
,
NextTurboTasks
::
PersistentCaching
(
turbo_tasks
)
=>
turbo_tasks
.run_once
(
future
)
.await
,
}
}
pub
fn
spawn_once_task
<
T
,
Fut
>
(
&
self
,
future
:
Fut
)
->
TaskId
where
T
:
Send
,
Fut
:
Future
<
Output
=
Result
<
Vc
<
T
>>>
+
Send
+
'static
,
{
match
self
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
turbo_tasks
.spawn_once_task
(
future
),
NextTurboTasks
::
PersistentCaching
(
turbo_tasks
)
=>
turbo_tasks
.spawn_once_task
(
future
),
}
}
pub
async
fn
aggregated_update_info
(
&
self
,
aggregation
:
Duration
,
timeout
:
Duration
,
)
->
Option
<
UpdateInfo
>
{
match
self
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
{
turbo_tasks
.aggregated_update_info
(
aggregation
,
timeout
)
.await
}
NextTurboTasks
::
PersistentCaching
(
turbo_tasks
)
=>
{
turbo_tasks
.aggregated_update_info
(
aggregation
,
timeout
)
.await
}
}
}
pub
async
fn
get_or_wait_aggregated_update_info
(
&
self
,
aggregation
:
Duration
)
->
UpdateInfo
{
match
self
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
{
turbo_tasks
.get_or_wait_aggregated_update_info
(
aggregation
)
.await
}
NextTurboTasks
::
PersistentCaching
(
turbo_tasks
)
=>
{
turbo_tasks
.get_or_wait_aggregated_update_info
(
aggregation
)
.await
}
}
}
pub
fn
memory_backend
(
&
self
)
->
Option
<&
turbo_tasks_memory
::
MemoryBackend
>
{
match
self
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
Some
(
turbo_tasks
.backend
()),
NextTurboTasks
::
PersistentCaching
(
_
)
=>
None
,
}
}
pub
async
fn
stop_and_wait
(
&
self
)
{
match
self
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
turbo_tasks
.stop_and_wait
()
.await
,
NextTurboTasks
::
PersistentCaching
(
turbo_tasks
)
=>
turbo_tasks
.stop_and_wait
()
.await
,
}
}
}
#[allow(unused_variables,
reason
=
"feature-gated"
)]
pub
fn
create_turbo_tasks
(
pub
fn
create_turbo_tasks
(
output_path
:
PathBuf
,
output_path
:
PathBuf
,
persistent_caching
:
bool
,
memory_limit
:
usize
,
memory_limit
:
usize
,
)
->
Result
<
Arc
<
TurboTasks
<
NextBackend
>>>
{
)
->
Result
<
NextTurboTasks
>
{
#[cfg(not(feature
=
"new-backend"
))]
Ok
(
if
persistent_caching
{
let
backend
=
TurboTasks
::
new
(
turbo_tasks_memory
::
MemoryBackend
::
new
(
memory_limit
));
NextTurboTasks
::
PersistentCaching
(
TurboTasks
::
new
(
#[cfg(feature
=
"new-backend"
)]
turbo_tasks_backend
::
TurboTasksBackend
::
new
(
Arc
::
new
(
let
backend
=
TurboTasks
::
new
(
turbo_tasks_backend
::
TurboTasksBackend
::
new
(
Arc
::
new
(
turbo_tasks_backend
::
LmdbBackingStorage
::
new
(
&
output_path
.join
(
"cache/turbopack"
))
?
,
turbo_tasks_backend
::
LmdbBackingStorage
::
new
(
&
output_path
.join
(
"cache/turbopack"
))
?
,
)),
)));
))
Ok
(
backend
)
}
else
{
NextTurboTasks
::
Memory
(
TurboTasks
::
new
(
turbo_tasks_memory
::
MemoryBackend
::
new
(
memory_limit
,
)))
})
}
}
/// A helper type to hold both a Vc operation and the TurboTasks root process.
/// A helper type to hold both a Vc operation and the TurboTasks root process.
/// Without this, we'd need to pass both individually all over the place
/// Without this, we'd need to pass both individually all over the place
#[derive(Clone)]
#[derive(Clone)]
pub
struct
VcArc
<
T
>
{
pub
struct
VcArc
<
T
>
{
turbo_tasks
:
Arc
<
TurboTasks
<
NextBackend
>>
,
turbo_tasks
:
NextTurboTasks
,
/// The Vc. Must be resolved, otherwise you are referencing an inactive
/// The Vc. Must be resolved, otherwise you are referencing an inactive
/// operation.
/// operation.
vc
:
T
,
vc
:
T
,
}
}
impl
<
T
>
VcArc
<
T
>
{
impl
<
T
>
VcArc
<
T
>
{
pub
fn
new
(
turbo_tasks
:
Arc
<
TurboTasks
<
NextBackend
>>
,
vc
:
T
)
->
Self
{
pub
fn
new
(
turbo_tasks
:
NextTurboTasks
,
vc
:
T
)
->
Self
{
Self
{
turbo_tasks
,
vc
}
Self
{
turbo_tasks
,
vc
}
}
}
pub
fn
turbo_tasks
(
&
self
)
->
&
Arc
<
TurboTasks
<
NextBackend
>>
{
pub
fn
turbo_tasks
(
&
self
)
->
&
NextTurboTasks
{
&
self
.turbo_tasks
&
self
.turbo_tasks
}
}
}
}
...
@@ -75,7 +174,7 @@ pub fn serde_enum_to_string<T: Serialize>(value: &T) -> Result<String> {
...
@@ -75,7 +174,7 @@ pub fn serde_enum_to_string<T: Serialize>(value: &T) -> Result<String> {
/// The root of our turbopack computation.
/// The root of our turbopack computation.
pub
struct
RootTask
{
pub
struct
RootTask
{
#[allow(dead_code)]
#[allow(dead_code)]
turbo_tasks
:
Arc
<
TurboTasks
<
NextBackend
>>
,
turbo_tasks
:
NextTurboTasks
,
#[allow(dead_code)]
#[allow(dead_code)]
task_id
:
Option
<
TaskId
>
,
task_id
:
Option
<
TaskId
>
,
}
}
...
@@ -319,7 +418,7 @@ impl<T: ToNapiValue> ToNapiValue for TurbopackResult<T> {
...
@@ -319,7 +418,7 @@ impl<T: ToNapiValue> ToNapiValue for TurbopackResult<T> {
}
}
pub
fn
subscribe
<
T
:
'static
+
Send
+
Sync
,
F
:
Future
<
Output
=
Result
<
T
>>
+
Send
,
V
:
ToNapiValue
>
(
pub
fn
subscribe
<
T
:
'static
+
Send
+
Sync
,
F
:
Future
<
Output
=
Result
<
T
>>
+
Send
,
V
:
ToNapiValue
>
(
turbo_tasks
:
Arc
<
TurboTasks
<
NextBackend
>>
,
turbo_tasks
:
NextTurboTasks
,
func
:
JsFunction
,
func
:
JsFunction
,
handler
:
impl
'static
+
Sync
+
Send
+
Clone
+
Fn
()
->
F
,
handler
:
impl
'static
+
Sync
+
Send
+
Clone
+
Fn
()
->
F
,
mapper
:
impl
'static
+
Sync
+
Send
+
FnMut
(
ThreadSafeCallContext
<
T
>
)
->
napi
::
Result
<
Vec
<
V
>>
,
mapper
:
impl
'static
+
Sync
+
Send
+
FnMut
(
ThreadSafeCallContext
<
T
>
)
->
napi
::
Result
<
Vec
<
V
>>
,
...
...
crates/napi/src/turbotrace.rs
View file @
3f01d2fc
...
@@ -2,46 +2,52 @@ use std::{path::PathBuf, sync::Arc};
...
@@ -2,46 +2,52 @@ use std::{path::PathBuf, sync::Arc};
use
napi
::
bindgen_prelude
::
*
;
use
napi
::
bindgen_prelude
::
*
;
use
node_file_trace
::{
start
,
Args
};
use
node_file_trace
::{
start
,
Args
};
use
turbo_tasks
::
TurboTasks
;
use
turbopack
::{
use
turbopack
::{
module_options
::{
EcmascriptOptionsContext
,
ModuleOptionsContext
},
module_options
::{
EcmascriptOptionsContext
,
ModuleOptionsContext
},
resolve_options_context
::
ResolveOptionsContext
,
resolve_options_context
::
ResolveOptionsContext
,
};
};
use
crate
::
next_api
::
utils
::{
self
,
Next
Backend
};
use
crate
::
next_api
::
utils
::{
self
,
Next
TurboTasks
};
#[napi]
#[napi]
pub
fn
create_turbo_tasks
(
pub
fn
create_turbo_tasks
(
output_path
:
String
,
output_path
:
String
,
persistent_caching
:
bool
,
memory_limit
:
Option
<
i64
>
,
memory_limit
:
Option
<
i64
>
,
)
->
External
<
Arc
<
TurboTasks
<
NextBackend
>>
>
{
)
->
External
<
NextTurboTasks
>
{
let
limit
=
memory_limit
.map
(|
u
|
u
as
usize
)
.unwrap_or
(
usize
::
MAX
);
let
limit
=
memory_limit
.map
(|
u
|
u
as
usize
)
.unwrap_or
(
usize
::
MAX
);
let
turbo_tasks
=
utils
::
create_turbo_tasks
(
PathBuf
::
from
(
&
output_path
),
limit
)
let
turbo_tasks
=
.expect
(
"Failed to create TurboTasks"
);
utils
::
create_turbo_tasks
(
PathBuf
::
from
(
&
output_path
),
persistent_caching
,
limit
)
.expect
(
"Failed to create TurboTasks"
);
External
::
new_with_size_hint
(
turbo_tasks
,
limit
)
External
::
new_with_size_hint
(
turbo_tasks
,
limit
)
}
}
#[napi]
#[napi]
pub
async
fn
run_turbo_tracing
(
pub
async
fn
run_turbo_tracing
(
options
:
Buffer
,
options
:
Buffer
,
turbo_tasks
:
External
<
Arc
<
TurboTasks
<
NextBackend
>>
>
,
turbo_tasks
:
External
<
NextTurboTasks
>
,
)
->
napi
::
Result
<
Vec
<
String
>>
{
)
->
napi
::
Result
<
Vec
<
String
>>
{
let
args
:
Args
=
serde_json
::
from_slice
(
options
.as_ref
())
?
;
let
args
:
Args
=
serde_json
::
from_slice
(
options
.as_ref
())
?
;
let
files
=
start
(
let
args
=
Arc
::
new
(
args
);
Arc
::
new
(
args
),
let
module_options
=
Some
(
ModuleOptionsContext
{
turbo_tasks
.clone
(),
ecmascript
:
EcmascriptOptionsContext
{
Some
(
ModuleOptionsContext
{
enable_types
:
true
,
ecmascript
:
EcmascriptOptionsContext
{
enable_types
:
true
,
..
Default
::
default
()
},
enable_mdx
:
true
,
..
Default
::
default
()
..
Default
::
default
()
}),
},
Some
(
ResolveOptionsContext
{
enable_mdx
:
true
,
..
Default
::
default
()
..
Default
::
default
()
}),
});
)
let
resolve_options
=
Some
(
ResolveOptionsContext
{
.await
?
;
..
Default
::
default
()
});
let
files
=
match
&*
turbo_tasks
{
NextTurboTasks
::
Memory
(
turbo_tasks
)
=>
{
start
(
args
,
turbo_tasks
.clone
(),
module_options
,
resolve_options
)
.await
?
}
NextTurboTasks
::
PersistentCaching
(
turbo_tasks
)
=>
{
start
(
args
,
turbo_tasks
.clone
(),
module_options
,
resolve_options
)
.await
?
}
};
Ok
(
files
.into_iter
()
.map
(|
f
|
f
.to_string
())
.collect
())
Ok
(
files
.into_iter
()
.map
(|
f
|
f
.to_string
())
.collect
())
}
}
packages/next/src/build/collect-build-traces.ts
View file @
3f01d2fc
...
@@ -27,7 +27,7 @@ import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
...
@@ -27,7 +27,7 @@ import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
import
isError
from
'../lib/is-error'
import
isError
from
'../lib/is-error'
import
type
{
NodeFileTraceReasons
}
from
'@vercel/nft'
import
type
{
NodeFileTraceReasons
}
from
'@vercel/nft'
import
type
{
RoutesUsingEdgeRuntime
}
from
'./utils'
import
type
{
RoutesUsingEdgeRuntime
}
from
'./utils'
import
type
{
ExternalObject
,
TurboTasks
}
from
'./swc/generated-native'
import
type
{
ExternalObject
,
Next
TurboTasks
}
from
'./swc/generated-native'
const
debug
=
debugOriginal
(
'next:build:build-traces'
)
const
debug
=
debugOriginal
(
'next:build:build-traces'
)
...
@@ -108,7 +108,7 @@ export async function collectBuildTraces({
...
@@ -108,7 +108,7 @@ export async function collectBuildTraces({
})
{
})
{
const
startTime
=
Date
.
now
()
const
startTime
=
Date
.
now
()
debug
(
'starting build traces'
)
debug
(
'starting build traces'
)
let
turboTasksForTrace
:
ExternalObject
<
TurboTasks
>
let
turboTasksForTrace
:
ExternalObject
<
Next
TurboTasks
>
let
bindings
=
await
loadBindings
()
let
bindings
=
await
loadBindings
()
const
runTurbotrace
=
async
function
()
{
const
runTurbotrace
=
async
function
()
{
...
@@ -120,6 +120,7 @@ export async function collectBuildTraces({
...
@@ -120,6 +120,7 @@ export async function collectBuildTraces({
let
turbotraceFiles
:
string
[]
|
undefined
let
turbotraceFiles
:
string
[]
|
undefined
turboTasksForTrace
=
bindings
.
turbo
.
createTurboTasks
(
turboTasksForTrace
=
bindings
.
turbo
.
createTurboTasks
(
distDir
,
distDir
,
false
,
(
config
.
experimental
.
turbotrace
?.
memoryLimit
??
(
config
.
experimental
.
turbotrace
?.
memoryLimit
??
TURBO_TRACE_DEFAULT_MEMORY_LIMIT
)
*
TURBO_TRACE_DEFAULT_MEMORY_LIMIT
)
*
1024
*
1024
*
...
...
packages/next/src/build/index.ts
View file @
3f01d2fc
...
@@ -1409,6 +1409,7 @@ export default async function build(
...
@@ -1409,6 +1409,7 @@ export default async function build(
browserslistQuery
:
supportedBrowsers
.
join
(
', '
),
browserslistQuery
:
supportedBrowsers
.
join
(
', '
),
},
},
{
{
persistentCaching
:
config
.
experimental
.
turbo
?.
persistentCaching
,
memoryLimit
:
config
.
experimental
.
turbo
?.
memoryLimit
,
memoryLimit
:
config
.
experimental
.
turbo
?.
memoryLimit
,
}
}
)
)
...
...
packages/next/src/build/swc/generated-native.d.ts
View file @
3f01d2fc
...
@@ -4,6 +4,7 @@ import type { TurbopackResult } from './types'
...
@@ -4,6 +4,7 @@ import type { TurbopackResult } from './types'
export
type
TurboTasks
=
{
readonly
__tag
:
unique
symbol
}
export
type
TurboTasks
=
{
readonly
__tag
:
unique
symbol
}
export
type
ExternalEndpoint
=
{
readonly
__tag
:
unique
symbol
}
export
type
ExternalEndpoint
=
{
readonly
__tag
:
unique
symbol
}
export
type
NextTurboTasks
=
{
readonly
__tag
:
unique
symbol
}
export
type
RefCell
=
{
readonly
__tag
:
unique
symbol
}
export
type
RefCell
=
{
readonly
__tag
:
unique
symbol
}
export
type
NapiRouteHas
=
{
export
type
NapiRouteHas
=
{
type
:
string
type
:
string
...
@@ -172,6 +173,8 @@ export interface NapiDefineEnv {
...
@@ -172,6 +173,8 @@ export interface NapiDefineEnv {
nodejs
:
Array
<
NapiEnvVar
>
nodejs
:
Array
<
NapiEnvVar
>
}
}
export
interface
NapiTurboEngineOptions
{
export
interface
NapiTurboEngineOptions
{
/** Use the new backend with persistent caching enabled. */
persistentCaching
?:
boolean
/** An upper bound of memory that turbopack will attempt to stay under. */
/** An upper bound of memory that turbopack will attempt to stay under. */
memoryLimit
?:
number
memoryLimit
?:
number
}
}
...
@@ -364,11 +367,12 @@ export interface NapiRewrite {
...
@@ -364,11 +367,12 @@ export interface NapiRewrite {
}
}
export
function
createTurboTasks
(
export
function
createTurboTasks
(
outputPath
:
string
,
outputPath
:
string
,
persistentCaching
:
boolean
,
memoryLimit
?:
number
|
undefined
|
null
memoryLimit
?:
number
|
undefined
|
null
):
ExternalObject
<
TurboTasks
>
):
ExternalObject
<
Next
TurboTasks
>
export
function
runTurboTracing
(
export
function
runTurboTracing
(
options
:
Buffer
,
options
:
Buffer
,
turboTasks
:
ExternalObject
<
TurboTasks
>
turboTasks
:
ExternalObject
<
Next
TurboTasks
>
):
Promise
<
Array
<
string
>>
):
Promise
<
Array
<
string
>>
export
function
getTargetTriple
():
string
export
function
getTargetTriple
():
string
export
function
initHeapProfiler
():
ExternalObject
<
RefCell
>
export
function
initHeapProfiler
():
ExternalObject
<
RefCell
>
...
...
packages/next/src/build/swc/index.ts
View file @
3f01d2fc
...
@@ -26,7 +26,7 @@ import type {
...
@@ -26,7 +26,7 @@ import type {
ExternalObject
,
ExternalObject
,
NapiPartialProjectOptions
,
NapiPartialProjectOptions
,
NapiProjectOptions
,
NapiProjectOptions
,
TurboTasks
,
Next
TurboTasks
,
}
from
'./generated-native'
}
from
'./generated-native'
import
type
{
import
type
{
Binding
,
Binding
,
...
@@ -1055,8 +1055,9 @@ async function loadWasm(importPath = '') {
...
@@ -1055,8 +1055,9 @@ async function loadWasm(importPath = '') {
},
},
createTurboTasks
:
function
(
createTurboTasks
:
function
(
_outputPath
:
string
,
_outputPath
:
string
,
_persistentCaching
:
boolean
,
_memoryLimit
?:
number
|
undefined
_memoryLimit
?:
number
|
undefined
):
ExternalObject
<
TurboTasks
>
{
):
ExternalObject
<
Next
TurboTasks
>
{
throw
new
Error
(
throw
new
Error
(
'`turbo.createTurboTasks` is not supported by the wasm bindings.'
'`turbo.createTurboTasks` is not supported by the wasm bindings.'
)
)
...
@@ -1228,7 +1229,7 @@ function loadNative(importPath?: string) {
...
@@ -1228,7 +1229,7 @@ function loadNative(importPath?: string) {
initHeapProfiler: bindings.initHeapProfiler,
initHeapProfiler: bindings.initHeapProfiler,
teardownHeapProfiler: bindings.teardownHeapProfiler,
teardownHeapProfiler: bindings.teardownHeapProfiler,
turbo: {
turbo: {
startTrace(options = {}, turboTasks: ExternalObject<TurboTasks>) {
startTrace(options = {}, turboTasks: ExternalObject<
Next
TurboTasks>) {
initHeapProfiler()
initHeapProfiler()
return (customBindings ?? bindings).runTurboTracing(
return (customBindings ?? bindings).runTurboTracing(
toBuffer({ exact: true, ...options }),
toBuffer({ exact: true, ...options }),
...
@@ -1237,9 +1238,14 @@ function loadNative(importPath?: string) {
...
@@ -1237,9 +1238,14 @@ function loadNative(importPath?: string) {
},
},
createTurboTasks(
createTurboTasks(
outputPath: string,
outputPath: string,
persistentCaching: boolean,
memoryLimit?: number
memoryLimit?: number
): ExternalObject<TurboTasks> {
): ExternalObject<NextTurboTasks> {
return bindings.createTurboTasks(outputPath, memoryLimit)
return bindings.createTurboTasks(
outputPath,
persistentCaching,
memoryLimit
)
},
},
createProject: bindingToApi(customBindings ?? bindings, false),
createProject: bindingToApi(customBindings ?? bindings, false),
startTurbopackTraceServer(traceFilePath) {
startTurbopackTraceServer(traceFilePath) {
...
...
packages/next/src/build/swc/types.ts
View file @
3f01d2fc
import
type
{
NextConfigComplete
}
from
'../../server/config-shared'
import
type
{
NextConfigComplete
}
from
'../../server/config-shared'
import
type
{
__ApiPreviewProps
}
from
'../../server/api-utils'
import
type
{
__ApiPreviewProps
}
from
'../../server/api-utils'
import
type
{
ExternalObject
,
RefCell
,
TurboTasks
}
from
'./generated-native'
import
type
{
ExternalObject
,
NextTurboTasks
,
RefCell
,
}
from
'./generated-native'
export
interface
Binding
{
export
interface
Binding
{
isWasm
:
boolean
isWasm
:
boolean
turbo
:
{
turbo
:
{
startTrace
(
options
:
any
,
turboTasks
:
ExternalObject
<
TurboTasks
>
):
any
startTrace
(
options
:
any
,
turboTasks
:
ExternalObject
<
Next
TurboTasks
>
):
any
createTurboTasks
(
createTurboTasks
(
outputPath
:
string
,
outputPath
:
string
,
persistentCaching
:
boolean
,
memoryLimit
?:
number
memoryLimit
?:
number
):
ExternalObject
<
TurboTasks
>
):
ExternalObject
<
Next
TurboTasks
>
createProject
(
createProject
(
options
:
ProjectOptions
,
options
:
ProjectOptions
,
turboEngineOptions
?:
TurboEngineOptions
turboEngineOptions
?:
TurboEngineOptions
...
@@ -107,6 +112,11 @@ export type TurbopackResult<T = {}> = T & {
...
@@ -107,6 +112,11 @@ export type TurbopackResult<T = {}> = T & {
}
}
export
interface
TurboEngineOptions
{
export
interface
TurboEngineOptions
{
/**
* Use the new backend with persistent caching enabled.
*/
persistentCaching
?:
boolean
/**
/**
* An upper bound of memory that turbopack will attempt to stay under.
* An upper bound of memory that turbopack will attempt to stay under.
*/
*/
...
...
packages/next/src/server/config-schema.ts
View file @
3f01d2fc
...
@@ -391,6 +391,7 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
...
@@ -391,6 +391,7 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
resolveExtensions
:
z
.
array
(
z
.
string
()).
optional
(),
resolveExtensions
:
z
.
array
(
z
.
string
()).
optional
(),
useSwcCss
:
z
.
boolean
().
optional
(),
useSwcCss
:
z
.
boolean
().
optional
(),
treeShaking
:
z
.
boolean
().
optional
(),
treeShaking
:
z
.
boolean
().
optional
(),
persistentCaching
:
z
.
boolean
().
optional
(),
memoryLimit
:
z
.
number
().
optional
(),
memoryLimit
:
z
.
number
().
optional
(),
moduleIdStrategy
:
z
.
enum
([
'named'
,
'deterministic'
]).
optional
(),
moduleIdStrategy
:
z
.
enum
([
'named'
,
'deterministic'
]).
optional
(),
})
})
...
...
packages/next/src/server/config-shared.ts
View file @
3f01d2fc
...
@@ -154,6 +154,11 @@ export interface ExperimentalTurboOptions {
...
@@ -154,6 +154,11 @@ export interface ExperimentalTurboOptions {
*/
*/
memoryLimit
?:
number
memoryLimit
?:
number
/**
* Enable persistent caching for the turbopack dev server and build.
*/
persistentCaching
?:
boolean
/**
/**
* Enable tree shaking for the turbopack dev server and build.
* Enable tree shaking for the turbopack dev server and build.
*/
*/
...
...
packages/next/src/server/dev/hot-reloader-turbopack.ts
View file @
3f01d2fc
...
@@ -176,6 +176,7 @@ export async function createHotReloaderTurbopack(
...
@@ -176,6 +176,7 @@ export async function createHotReloaderTurbopack(
browserslistQuery
:
supportedBrowsers
.
join
(
', '
),
browserslistQuery
:
supportedBrowsers
.
join
(
', '
),
},
},
{
{
persistentCaching
:
opts
.
nextConfig
.
experimental
.
turbo
?.
persistentCaching
,
memoryLimit
:
opts
.
nextConfig
.
experimental
.
turbo
?.
memoryLimit
,
memoryLimit
:
opts
.
nextConfig
.
experimental
.
turbo
?.
memoryLimit
,
}
}
)
)
...
...
turbopack/crates/turbo-tasks-backend/src/backend/mod.rs
View file @
3f01d2fc
...
@@ -1529,8 +1529,9 @@ impl Backend for TurboTasksBackend {
...
@@ -1529,8 +1529,9 @@ impl Backend for TurboTasksBackend {
)
->
TaskId
{
)
->
TaskId
{
self
.
0
.create_transient_task
(
task_type
)
self
.
0
.create_transient_task
(
task_type
)
}
}
fn
dispose_root_task
(
&
self
,
_
:
TaskId
,
_
:
&
dyn
TurboTasksBackendApi
<
Self
>
)
{
fn
dispose_root_task
(
&
self
,
_
:
TaskId
,
_
:
&
dyn
TurboTasksBackendApi
<
Self
>
)
{
todo!
()
// TODO implement
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment