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
2ce415f4
Commit
2ce415f4
authored
Aug 19, 2025
by
Tobias Koppers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turbopack: Extract rename module and share between side effects optimization and tree shaking
parent
93a8d8f2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
485 additions
and
184 deletions
+485
-184
lib.rs
turbopack/crates/turbopack-ecmascript/src/lib.rs
+1
-0
chunk_item.rs
...pack/crates/turbopack-ecmascript/src/rename/chunk_item.rs
+83
-0
mod.rs
turbopack/crates/turbopack-ecmascript/src/rename/mod.rs
+2
-0
module.rs
turbopack/crates/turbopack-ecmascript/src/rename/module.rs
+316
-0
module.rs
...-ecmascript/src/side_effect_optimization/facade/module.rs
+63
-166
reference.rs
...pack-ecmascript/src/side_effect_optimization/reference.rs
+10
-5
module.rs
...crates/turbopack-ecmascript/src/tree_shake/part/module.rs
+3
-3
lib.rs
turbopack/crates/turbopack/src/lib.rs
+7
-10
No files found.
turbopack/crates/turbopack-ecmascript/src/lib.rs
View file @
2ce415f4
...
...
@@ -22,6 +22,7 @@ pub mod minify;
pub
mod
parse
;
mod
path_visitor
;
pub
mod
references
;
pub
mod
rename
;
pub
mod
runtime_functions
;
pub
mod
side_effect_optimization
;
pub
mod
single_file_ecmascript_output
;
...
...
turbopack/crates/turbopack-ecmascript/src/rename/chunk_item.rs
0 → 100644
View file @
2ce415f4
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
,
EcmascriptChunkPlaceable
,
EcmascriptChunkType
,
},
rename
::
module
::
EcmascriptModuleRenameModule
,
};
/// The chunk item for [EcmascriptModuleRenameModule].
#[turbo_tasks
::
value(shared)]
pub
struct
EcmascriptModuleRenameChunkItem
{
pub
(
crate
)
module
:
ResolvedVc
<
EcmascriptModuleRenameModule
>
,
pub
(
crate
)
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
}
impl
OutputAssetsReference
for
EcmascriptModuleRenameChunkItem
{}
#[turbo_tasks
::
value_impl]
impl
EcmascriptChunkItem
for
EcmascriptModuleRenameChunkItem
{
#[turbo_tasks
::
function]
fn
content
(
self
:
Vc
<
Self
>
)
->
Vc
<
EcmascriptChunkItemContent
>
{
panic!
(
"content() should never be called"
);
}
#[turbo_tasks
::
function]
fn
content_with_async_module_info
(
&
self
,
async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
_estimated
:
bool
,
)
->
Result
<
Vc
<
EcmascriptChunkItemContent
>>
{
let
chunking_context
=
self
.chunking_context
;
let
content
=
self
.module
.module_content
(
*
chunking_context
,
async_module_info
);
let
async_module_options
=
self
.module
.get_async_module
()
.module_options
(
async_module_info
);
Ok
(
EcmascriptChunkItemContent
::
new
(
content
,
*
chunking_context
,
async_module_options
,
))
}
}
#[turbo_tasks
::
value_impl]
impl
ChunkItem
for
EcmascriptModuleRenameChunkItem
{
#[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/rename/mod.rs
0 → 100644
View file @
2ce415f4
pub
mod
chunk_item
;
pub
mod
module
;
turbopack/crates/turbopack-ecmascript/src/rename/module.rs
0 → 100644
View file @
2ce415f4
This diff is collapsed.
Click to expand it.
turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/module.rs
View file @
2ce415f4
This diff is collapsed.
Click to expand it.
turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/reference.rs
View file @
2ce415f4
...
...
@@ -19,6 +19,7 @@ use crate::{
chunk
::
EcmascriptChunkPlaceable
,
code_gen
::{
CodeGeneration
,
CodeGenerationHoistedStmt
},
references
::
esm
::
base
::{
ReferencedAsset
,
ReferencedAssetIdent
},
rename
::
module
::
EcmascriptModuleRenameModule
,
runtime_functions
::
TURBOPACK_IMPORT
,
side_effect_optimization
::{
facade
::
module
::
EcmascriptModuleFacadeModule
,
locals
::
module
::
EcmascriptModuleLocalsModule
,
...
...
@@ -108,11 +109,15 @@ impl ModuleReference for EcmascriptModulePartReference {
};
Vc
::
upcast
::
<
Box
<
dyn
Module
>>
(
EcmascriptModuleLocalsModule
::
new
(
*
module
))
}
ModulePart
::
Facade
|
ModulePart
::
RenamedExport
{
..
}
|
ModulePart
::
RenamedNamespace
{
..
}
=>
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
*
self
.module
,
self
.part
.clone
()),
),
ModulePart
::
Facade
=>
{
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
*
self
.module
))
}
ModulePart
::
RenamedExport
{
..
}
|
ModulePart
::
RenamedNamespace
{
..
}
=>
{
Vc
::
upcast
(
EcmascriptModuleRenameModule
::
new
(
*
self
.module
,
self
.part
.clone
(),
))
}
_
=>
{
bail!
(
"Unexpected ModulePart
\
"
{}
\
" for EcmascriptModulePartReference"
,
...
...
turbopack/crates/turbopack-ecmascript/src/tree_shake/part/module.rs
View file @
2ce415f4
...
...
@@ -19,7 +19,7 @@ use crate::{
references
::{
FollowExportsResult
,
analyze_ecmascript_module
,
esm
::
FoundExportType
,
follow_reexports
,
},
side_effect_optimization
::
facade
::
module
::
EcmascriptModuleFacad
eModule
,
rename
::
module
::
EcmascriptModuleRenam
eModule
,
tree_shake
::{
Key
,
SplitResult
,
get_part_id
,
part
::
chunk_item
::
EcmascriptModulePartChunkItem
,
part_of_module
,
side_effects
::
module
::
SideEffectsModule
,
split_module
,
...
...
@@ -187,7 +187,7 @@ impl EcmascriptModulePartAsset {
*
final_module
}
else
{
ResolvedVc
::
upcast
(
EcmascriptModule
Facad
eModule
::
new
(
EcmascriptModule
Renam
eModule
::
new
(
**
final_module
,
ModulePart
::
renamed_export
(
new_export
.clone
(),
export
.clone
()),
)
...
...
@@ -197,7 +197,7 @@ impl EcmascriptModulePartAsset {
}
}
else
{
ResolvedVc
::
upcast
(
EcmascriptModule
Facad
eModule
::
new
(
EcmascriptModule
Renam
eModule
::
new
(
**
final_module
,
ModulePart
::
renamed_namespace
(
export
.clone
()),
)
...
...
turbopack/crates/turbopack/src/lib.rs
View file @
2ce415f4
...
...
@@ -51,6 +51,7 @@ use turbopack_ecmascript::{
external_module
::{
CachedExternalModule
,
CachedExternalTracingMode
,
CachedExternalType
},
follow_reexports
,
},
rename
::
module
::
EcmascriptModuleRenameModule
,
side_effect_optimization
::{
facade
::
module
::
EcmascriptModuleFacadeModule
,
locals
::
module
::
EcmascriptModuleLocalsModule
,
},
...
...
@@ -202,10 +203,9 @@ async fn apply_module_type(
ModulePart
::
Export
(
_
)
=>
{
apply_reexport_tree_shaking
(
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
Vc
::
upcast
(
*
module
),
ModulePart
::
facade
(),
)
EcmascriptModuleFacadeModule
::
new
(
Vc
::
upcast
(
*
module
,
))
.resolve
()
.await
?
,
),
...
...
@@ -220,10 +220,7 @@ async fn apply_module_type(
),
}
}
else
{
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
Vc
::
upcast
(
*
module
),
ModulePart
::
facade
(),
))
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
Vc
::
upcast
(
*
module
)))
}
}
else
{
Vc
::
upcast
(
*
module
)
...
...
@@ -308,13 +305,13 @@ async fn apply_reexport_tree_shaking(
if
*
new_export
==
*
export
{
Vc
::
upcast
(
**
final_module
)
}
else
{
Vc
::
upcast
(
EcmascriptModule
Facad
eModule
::
new
(
Vc
::
upcast
(
EcmascriptModule
Renam
eModule
::
new
(
**
final_module
,
ModulePart
::
renamed_export
(
new_export
.clone
(),
export
.clone
()),
))
}
}
else
{
Vc
::
upcast
(
EcmascriptModule
Facad
eModule
::
new
(
Vc
::
upcast
(
EcmascriptModule
Renam
eModule
::
new
(
**
final_module
,
ModulePart
::
renamed_namespace
(
export
.clone
()),
))
...
...
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