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
817ec9bd
Commit
817ec9bd
authored
Aug 19, 2025
by
Tobias Koppers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turbopack: organize tree shaking code
parent
b1cc500f
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
100 additions
and
85 deletions
+100
-85
server_actions.rs
crates/next-api/src/server_actions.rs
+1
-1
base.rs
...ck/crates/turbopack-ecmascript/src/references/esm/base.rs
+1
-1
export.rs
.../crates/turbopack-ecmascript/src/references/esm/export.rs
+1
-1
mod.rs
turbopack/crates/turbopack-ecmascript/src/tree_shake/mod.rs
+2
-3
chunk_item.rs
...es/turbopack-ecmascript/src/tree_shake/part/chunk_item.rs
+81
-0
mod.rs
...ck/crates/turbopack-ecmascript/src/tree_shake/part/mod.rs
+2
-0
module.rs
...crates/turbopack-ecmascript/src/tree_shake/part/module.rs
+5
-5
chunk_item.rs
...pack-ecmascript/src/tree_shake/side_effects/chunk_item.rs
+2
-71
mod.rs
...s/turbopack-ecmascript/src/tree_shake/side_effects/mod.rs
+2
-0
module.rs
...urbopack-ecmascript/src/tree_shake/side_effects/module.rs
+2
-2
lib.rs
turbopack/crates/turbopack/src/lib.rs
+1
-1
No files found.
crates/next-api/src/server_actions.rs
View file @
817ec9bd
...
...
@@ -42,7 +42,7 @@ use turbopack_core::{
};
use
turbopack_ecmascript
::{
EcmascriptParsable
,
chunk
::
EcmascriptChunkPlaceable
,
parse
::
ParseResult
,
tree_shake
::
asset
::
EcmascriptModulePartAsset
,
tree_shake
::
part
::
module
::
EcmascriptModulePartAsset
,
};
/// Metadata for a server action: (layer, exported_name, filename)
...
...
turbopack/crates/turbopack-ecmascript/src/references/esm/base.rs
View file @
817ec9bd
...
...
@@ -46,7 +46,7 @@ use crate::{
util
::
throw_module_not_found_expr
,
},
runtime_functions
::{
TURBOPACK_EXTERNAL_IMPORT
,
TURBOPACK_EXTERNAL_REQUIRE
,
TURBOPACK_IMPORT
},
tree_shake
::{
TURBOPACK_PART_IMPORT_SOURCE
,
asset
::
EcmascriptModulePartAsset
},
tree_shake
::{
TURBOPACK_PART_IMPORT_SOURCE
,
part
::
module
::
EcmascriptModulePartAsset
},
utils
::
module_id_to_lit
,
};
...
...
turbopack/crates/turbopack-ecmascript/src/references/esm/export.rs
View file @
817ec9bd
...
...
@@ -34,7 +34,7 @@ use crate::{
magic_identifier
,
references
::
esm
::
base
::
ReferencedAsset
,
runtime_functions
::{
TURBOPACK_DYNAMIC
,
TURBOPACK_ESM
},
tree_shake
::
asset
::
EcmascriptModulePartAsset
,
tree_shake
::
part
::
module
::
EcmascriptModulePartAsset
,
utils
::
module_id_to_lit
,
};
...
...
turbopack/crates/turbopack-ecmascript/src/tree_shake/mod.rs
View file @
817ec9bd
...
...
@@ -24,12 +24,11 @@ use crate::{
EcmascriptModuleAsset
,
EcmascriptParsable
,
analyzer
::
graph
::
EvalContext
,
parse
::
ParseResult
,
};
pub
mod
asset
;
pub
mod
chunk_item
;
mod
graph
;
pub
mod
merge
;
mod
optimizations
;
pub
mod
side_effect_module
;
pub
mod
part
;
pub
mod
side_effects
;
#[cfg(test)]
mod
tests
;
mod
util
;
...
...
turbopack/crates/turbopack-ecmascript/src/tree_shake/part/chunk_item.rs
0 → 100644
View file @
817ec9bd
use
anyhow
::
Result
;
use
turbo_tasks
::{
ResolvedVc
,
Vc
};
use
turbopack_core
::{
chunk
::{
AsyncModuleInfo
,
ChunkItem
,
ChunkType
,
ChunkingContext
},
ident
::
AssetIdent
,
module
::
Module
,
output
::
OutputAssetsReference
,
};
use
crate
::{
EcmascriptAnalyzableExt
,
chunk
::{
EcmascriptChunkItem
,
EcmascriptChunkItemContent
,
EcmascriptChunkType
},
tree_shake
::
part
::
module
::
EcmascriptModulePartAsset
,
};
/// This is an implementation of [ChunkItem] for
/// [Vc<EcmascriptModulePartAsset>].
///
/// This is a pointer to a part of an ES module.
#[turbo_tasks
::
value(shared)]
pub
struct
EcmascriptModulePartChunkItem
{
pub
(
super
)
module
:
ResolvedVc
<
EcmascriptModulePartAsset
>
,
pub
(
super
)
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
}
#[turbo_tasks
::
value_impl]
impl
EcmascriptChunkItem
for
EcmascriptModulePartChunkItem
{
#[turbo_tasks
::
function]
fn
content
(
self
:
Vc
<
Self
>
)
->
Vc
<
EcmascriptChunkItemContent
>
{
panic!
(
"content() should never be called"
);
}
#[turbo_tasks
::
function]
async
fn
content_with_async_module_info
(
&
self
,
async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
_estimated
:
bool
,
)
->
Result
<
Vc
<
EcmascriptChunkItemContent
>>
{
let
analyze
=
self
.module
.analyze
();
let
analyze_ref
=
analyze
.await
?
;
let
async_module_options
=
analyze_ref
.async_module
.module_options
(
async_module_info
);
let
content
=
self
.module
.module_content
(
*
self
.chunking_context
,
async_module_info
);
Ok
(
EcmascriptChunkItemContent
::
new
(
content
,
*
self
.chunking_context
,
async_module_options
,
))
}
}
#[turbo_tasks
::
value_impl]
impl
OutputAssetsReference
for
EcmascriptModulePartChunkItem
{}
#[turbo_tasks
::
value_impl]
impl
ChunkItem
for
EcmascriptModulePartChunkItem
{
#[turbo_tasks
::
function]
fn
asset_ident
(
&
self
)
->
Vc
<
AssetIdent
>
{
self
.module
.ident
()
}
#[turbo_tasks
::
function]
fn
chunking_context
(
&
self
)
->
Vc
<
Box
<
dyn
ChunkingContext
>>
{
*
self
.chunking_context
}
#[turbo_tasks
::
function]
async
fn
ty
(
&
self
)
->
Result
<
Vc
<
Box
<
dyn
ChunkType
>>>
{
Ok
(
Vc
::
upcast
(
Vc
::
<
EcmascriptChunkType
>
::
default
()
.resolve
()
.await
?
,
))
}
#[turbo_tasks
::
function]
fn
module
(
&
self
)
->
Vc
<
Box
<
dyn
Module
>>
{
*
ResolvedVc
::
upcast
(
self
.module
)
}
}
turbopack/crates/turbopack-ecmascript/src/tree_shake/part/mod.rs
0 → 100644
View file @
817ec9bd
pub
mod
chunk_item
;
pub
mod
module
;
turbopack/crates/turbopack-ecmascript/src/tree_shake/
asset
.rs
→
turbopack/crates/turbopack-ecmascript/src/tree_shake/
part/module
.rs
View file @
817ec9bd
...
...
@@ -10,10 +10,6 @@ use turbopack_core::{
resolve
::{
ExportUsage
,
ModulePart
},
};
use
super
::{
SplitResult
,
chunk_item
::
EcmascriptModulePartChunkItem
,
get_part_id
,
part_of_module
,
split_module
,
};
use
crate
::{
AnalyzeEcmascriptModuleResult
,
EcmascriptAnalyzable
,
EcmascriptModuleAsset
,
EcmascriptModuleAssetType
,
EcmascriptModuleContent
,
EcmascriptModuleContentOptions
,
...
...
@@ -24,7 +20,10 @@ use crate::{
FollowExportsResult
,
analyze_ecmascript_module
,
esm
::
FoundExportType
,
follow_reexports
,
},
side_effect_optimization
::
facade
::
module
::
EcmascriptModuleFacadeModule
,
tree_shake
::{
Key
,
side_effect_module
::
SideEffectsModule
},
tree_shake
::{
Key
,
SplitResult
,
get_part_id
,
part
::
chunk_item
::
EcmascriptModulePartChunkItem
,
part_of_module
,
side_effects
::
module
::
SideEffectsModule
,
split_module
,
},
};
/// A reference to part of an ES module.
...
...
@@ -41,6 +40,7 @@ impl EcmascriptParsable for EcmascriptModulePartAsset {
#[turbo_tasks
::
function]
fn
failsafe_parse
(
&
self
)
->
Result
<
Vc
<
ParseResult
>>
{
let
split_data
=
split_module
(
*
self
.full_module
);
assert_ne!
(
self
.part
,
ModulePart
::
Facade
);
Ok
(
part_of_module
(
split_data
,
self
.part
.clone
()))
}
#[turbo_tasks
::
function]
...
...
turbopack/crates/turbopack-ecmascript/src/tree_shake/chunk_item.rs
→
turbopack/crates/turbopack-ecmascript/src/tree_shake/
side_effects/
chunk_item.rs
View file @
817ec9bd
...
...
@@ -2,93 +2,24 @@ use anyhow::Result;
use
turbo_tasks
::{
ResolvedVc
,
ValueDefault
,
Vc
};
use
turbo_tasks_fs
::
rope
::
RopeBuilder
;
use
turbopack_core
::{
chunk
::{
AsyncModuleInfo
,
ChunkItem
,
ChunkType
,
ChunkingContext
,
ModuleChunkItemIdExt
},
chunk
::{
ChunkItem
,
ChunkType
,
ChunkingContext
,
ModuleChunkItemIdExt
},
ident
::
AssetIdent
,
module
::
Module
,
module_graph
::
ModuleGraph
,
output
::
OutputAssetsReference
,
};
use
super
::
asset
::
EcmascriptModulePartAsset
;
use
crate
::{
EcmascriptAnalyzableExt
,
chunk
::{
EcmascriptChunkItem
,
EcmascriptChunkItemContent
,
EcmascriptChunkItemOptions
,
EcmascriptChunkPlaceable
,
EcmascriptChunkType
,
item
::
RewriteSourcePath
,
},
references
::
async_module
::
AsyncModuleOptions
,
runtime_functions
::{
TURBOPACK_EXPORT_NAMESPACE
,
TURBOPACK_IMPORT
},
tree_shake
::
side_effect
_
module
::
SideEffectsModule
,
tree_shake
::
side_effect
s
::
module
::
SideEffectsModule
,
utils
::
StringifyModuleId
,
};
/// This is an implementation of [ChunkItem] for
/// [Vc<EcmascriptModulePartAsset>].
///
/// This is a pointer to a part of an ES module.
#[turbo_tasks
::
value(shared)]
pub
struct
EcmascriptModulePartChunkItem
{
pub
(
super
)
module
:
ResolvedVc
<
EcmascriptModulePartAsset
>
,
pub
(
super
)
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
}
#[turbo_tasks
::
value_impl]
impl
EcmascriptChunkItem
for
EcmascriptModulePartChunkItem
{
#[turbo_tasks
::
function]
fn
content
(
self
:
Vc
<
Self
>
)
->
Vc
<
EcmascriptChunkItemContent
>
{
panic!
(
"content() should never be called"
);
}
#[turbo_tasks
::
function]
async
fn
content_with_async_module_info
(
&
self
,
async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
_estimated
:
bool
,
)
->
Result
<
Vc
<
EcmascriptChunkItemContent
>>
{
let
analyze
=
self
.module
.analyze
();
let
analyze_ref
=
analyze
.await
?
;
let
async_module_options
=
analyze_ref
.async_module
.module_options
(
async_module_info
);
let
content
=
self
.module
.module_content
(
*
self
.chunking_context
,
async_module_info
);
Ok
(
EcmascriptChunkItemContent
::
new
(
content
,
*
self
.chunking_context
,
async_module_options
,
))
}
}
#[turbo_tasks
::
value_impl]
impl
OutputAssetsReference
for
EcmascriptModulePartChunkItem
{}
#[turbo_tasks
::
value_impl]
impl
ChunkItem
for
EcmascriptModulePartChunkItem
{
#[turbo_tasks
::
function]
fn
asset_ident
(
&
self
)
->
Vc
<
AssetIdent
>
{
self
.module
.ident
()
}
#[turbo_tasks
::
function]
fn
chunking_context
(
&
self
)
->
Vc
<
Box
<
dyn
ChunkingContext
>>
{
*
self
.chunking_context
}
#[turbo_tasks
::
function]
async
fn
ty
(
&
self
)
->
Result
<
Vc
<
Box
<
dyn
ChunkType
>>>
{
Ok
(
Vc
::
upcast
(
Vc
::
<
EcmascriptChunkType
>
::
default
()
.resolve
()
.await
?
,
))
}
#[turbo_tasks
::
function]
fn
module
(
&
self
)
->
Vc
<
Box
<
dyn
Module
>>
{
*
ResolvedVc
::
upcast
(
self
.module
)
}
}
#[turbo_tasks
::
value(shared)]
pub
(
super
)
struct
SideEffectsModuleChunkItem
{
pub
module
:
ResolvedVc
<
SideEffectsModule
>
,
...
...
turbopack/crates/turbopack-ecmascript/src/tree_shake/side_effects/mod.rs
0 → 100644
View file @
817ec9bd
pub
mod
chunk_item
;
pub
mod
module
;
turbopack/crates/turbopack-ecmascript/src/tree_shake/side_effect
_
module.rs
→
turbopack/crates/turbopack-ecmascript/src/tree_shake/side_effect
s/
module.rs
View file @
817ec9bd
...
...
@@ -13,11 +13,11 @@ use turbopack_core::{
use
crate
::{
EcmascriptModuleAsset
,
chunk
::{
EcmascriptChunkPlaceable
,
EcmascriptExports
},
tree_shake
::
chunk_item
::
SideEffectsModuleChunkItem
,
tree_shake
::
side_effects
::
chunk_item
::
SideEffectsModuleChunkItem
,
};
#[turbo_tasks
::
value]
pub
(
super
)
struct
SideEffectsModule
{
pub
struct
SideEffectsModule
{
/// Original module
pub
module
:
ResolvedVc
<
EcmascriptModuleAsset
>
,
/// The part of the original module that is the binding
...
...
turbopack/crates/turbopack/src/lib.rs
View file @
817ec9bd
...
...
@@ -54,7 +54,7 @@ use turbopack_ecmascript::{
side_effect_optimization
::{
facade
::
module
::
EcmascriptModuleFacadeModule
,
locals
::
module
::
EcmascriptModuleLocalsModule
,
},
tree_shake
::
asset
::
EcmascriptModulePartAsset
,
tree_shake
::
part
::
module
::
EcmascriptModulePartAsset
,
};
use
turbopack_json
::
JsonModuleAsset
;
use
turbopack_resolve
::{
...
...
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