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
2f24574a
Commit
2f24574a
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
9f6780b3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
485 additions
and
188 deletions
+485
-188
lib.rs
turbopack/crates/turbopack-ecmascript/src/lib.rs
+1
-0
chunk_item.rs
...pack/crates/turbopack-ecmascript/src/rename/chunk_item.rs
+79
-0
mod.rs
turbopack/crates/turbopack-ecmascript/src/rename/mod.rs
+2
-0
module.rs
turbopack/crates/turbopack-ecmascript/src/rename/module.rs
+312
-0
module.rs
...-ecmascript/src/side_effect_optimization/facade/module.rs
+71
-170
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 @
2f24574a
...
@@ -22,6 +22,7 @@ pub mod minify;
...
@@ -22,6 +22,7 @@ pub mod minify;
pub
mod
parse
;
pub
mod
parse
;
mod
path_visitor
;
mod
path_visitor
;
pub
mod
references
;
pub
mod
references
;
pub
mod
rename
;
pub
mod
runtime_functions
;
pub
mod
runtime_functions
;
pub
mod
side_effect_optimization
;
pub
mod
side_effect_optimization
;
pub
mod
source_map
;
pub
mod
source_map
;
...
...
turbopack/crates/turbopack-ecmascript/src/rename/chunk_item.rs
0 → 100644
View file @
2f24574a
use
anyhow
::
Result
;
use
turbo_tasks
::{
ResolvedVc
,
Vc
};
use
turbopack_core
::{
chunk
::{
AsyncModuleInfo
,
ChunkItem
,
ChunkType
,
ChunkingContext
},
ident
::
AssetIdent
,
module
::
Module
,
};
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
>>
,
}
#[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
>>
,
)
->
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 @
2f24574a
pub
mod
chunk_item
;
pub
mod
module
;
turbopack/crates/turbopack-ecmascript/src/rename/module.rs
0 → 100644
View file @
2f24574a
This diff is collapsed.
Click to expand it.
turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/module.rs
View file @
2f24574a
This diff is collapsed.
Click to expand it.
turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/reference.rs
View file @
2f24574a
...
@@ -25,6 +25,7 @@ use crate::{
...
@@ -25,6 +25,7 @@ use crate::{
chunk
::
EcmascriptChunkPlaceable
,
chunk
::
EcmascriptChunkPlaceable
,
code_gen
::{
CodeGeneration
,
CodeGenerationHoistedStmt
},
code_gen
::{
CodeGeneration
,
CodeGenerationHoistedStmt
},
references
::
esm
::
base
::{
ReferencedAsset
,
ReferencedAssetIdent
},
references
::
esm
::
base
::{
ReferencedAsset
,
ReferencedAssetIdent
},
rename
::
module
::
EcmascriptModuleRenameModule
,
runtime_functions
::
TURBOPACK_IMPORT
,
runtime_functions
::
TURBOPACK_IMPORT
,
utils
::
module_id_to_lit
,
utils
::
module_id_to_lit
,
};
};
...
@@ -111,11 +112,15 @@ impl ModuleReference for EcmascriptModulePartReference {
...
@@ -111,11 +112,15 @@ impl ModuleReference for EcmascriptModulePartReference {
};
};
Vc
::
upcast
::
<
Box
<
dyn
Module
>>
(
EcmascriptModuleLocalsModule
::
new
(
*
module
))
Vc
::
upcast
::
<
Box
<
dyn
Module
>>
(
EcmascriptModuleLocalsModule
::
new
(
*
module
))
}
}
ModulePart
::
Facade
ModulePart
::
Facade
=>
{
|
ModulePart
::
RenamedExport
{
..
}
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
*
self
.module
))
|
ModulePart
::
RenamedNamespace
{
..
}
=>
Vc
::
upcast
(
}
EcmascriptModuleFacadeModule
::
new
(
*
self
.module
,
self
.part
.clone
()),
ModulePart
::
RenamedExport
{
..
}
|
ModulePart
::
RenamedNamespace
{
..
}
=>
{
),
Vc
::
upcast
(
EcmascriptModuleRenameModule
::
new
(
*
self
.module
,
self
.part
.clone
(),
))
}
_
=>
{
_
=>
{
bail!
(
bail!
(
"Unexpected ModulePart
\
"
{}
\
" for EcmascriptModulePartReference"
,
"Unexpected ModulePart
\
"
{}
\
" for EcmascriptModulePartReference"
,
...
...
turbopack/crates/turbopack-ecmascript/src/tree_shake/part/module.rs
View file @
2f24574a
...
@@ -20,7 +20,7 @@ use crate::{
...
@@ -20,7 +20,7 @@ use crate::{
references
::{
references
::{
FollowExportsResult
,
analyse_ecmascript_module
,
esm
::
FoundExportType
,
follow_reexports
,
FollowExportsResult
,
analyse_ecmascript_module
,
esm
::
FoundExportType
,
follow_reexports
,
},
},
side_effect_optimization
::
facade
::
module
::
EcmascriptModuleFacad
eModule
,
rename
::
module
::
EcmascriptModuleRenam
eModule
,
tree_shake
::{
tree_shake
::{
Key
,
SplitResult
,
get_part_id
,
part
::
chunk_item
::
EcmascriptModulePartChunkItem
,
Key
,
SplitResult
,
get_part_id
,
part
::
chunk_item
::
EcmascriptModulePartChunkItem
,
part_of_module
,
side_effects
::
module
::
SideEffectsModule
,
split_module
,
part_of_module
,
side_effects
::
module
::
SideEffectsModule
,
split_module
,
...
@@ -188,7 +188,7 @@ impl EcmascriptModulePartAsset {
...
@@ -188,7 +188,7 @@ impl EcmascriptModulePartAsset {
*
final_module
*
final_module
}
else
{
}
else
{
ResolvedVc
::
upcast
(
ResolvedVc
::
upcast
(
EcmascriptModule
Facad
eModule
::
new
(
EcmascriptModule
Renam
eModule
::
new
(
**
final_module
,
**
final_module
,
ModulePart
::
renamed_export
(
new_export
.clone
(),
export
.clone
()),
ModulePart
::
renamed_export
(
new_export
.clone
(),
export
.clone
()),
)
)
...
@@ -198,7 +198,7 @@ impl EcmascriptModulePartAsset {
...
@@ -198,7 +198,7 @@ impl EcmascriptModulePartAsset {
}
}
}
else
{
}
else
{
ResolvedVc
::
upcast
(
ResolvedVc
::
upcast
(
EcmascriptModule
Facad
eModule
::
new
(
EcmascriptModule
Renam
eModule
::
new
(
**
final_module
,
**
final_module
,
ModulePart
::
renamed_namespace
(
export
.clone
()),
ModulePart
::
renamed_namespace
(
export
.clone
()),
)
)
...
...
turbopack/crates/turbopack/src/lib.rs
View file @
2f24574a
...
@@ -58,6 +58,7 @@ use turbopack_ecmascript::{
...
@@ -58,6 +58,7 @@ use turbopack_ecmascript::{
references
::
external_module
::{
references
::
external_module
::{
CachedExternalModule
,
CachedExternalTracingMode
,
CachedExternalType
,
CachedExternalModule
,
CachedExternalTracingMode
,
CachedExternalType
,
},
},
rename
::
module
::
EcmascriptModuleRenameModule
,
side_effect_optimization
::
locals
::
module
::
EcmascriptModuleLocalsModule
,
side_effect_optimization
::
locals
::
module
::
EcmascriptModuleLocalsModule
,
tree_shake
::
part
::
module
::
EcmascriptModulePartAsset
,
tree_shake
::
part
::
module
::
EcmascriptModulePartAsset
,
};
};
...
@@ -177,10 +178,9 @@ async fn apply_module_type(
...
@@ -177,10 +178,9 @@ async fn apply_module_type(
ModulePart
::
Export
(
_
)
=>
{
ModulePart
::
Export
(
_
)
=>
{
apply_reexport_tree_shaking
(
apply_reexport_tree_shaking
(
Vc
::
upcast
(
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
EcmascriptModuleFacadeModule
::
new
(
Vc
::
upcast
(
Vc
::
upcast
(
*
module
),
*
module
,
ModulePart
::
facade
(),
))
)
.resolve
()
.resolve
()
.await
?
,
.await
?
,
),
),
...
@@ -195,10 +195,7 @@ async fn apply_module_type(
...
@@ -195,10 +195,7 @@ async fn apply_module_type(
),
),
}
}
}
else
{
}
else
{
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
Vc
::
upcast
(
EcmascriptModuleFacadeModule
::
new
(
Vc
::
upcast
(
*
module
)))
Vc
::
upcast
(
*
module
),
ModulePart
::
facade
(),
))
}
}
}
else
{
}
else
{
Vc
::
upcast
(
*
module
)
Vc
::
upcast
(
*
module
)
...
@@ -273,13 +270,13 @@ async fn apply_reexport_tree_shaking(
...
@@ -273,13 +270,13 @@ async fn apply_reexport_tree_shaking(
if
*
new_export
==
*
export
{
if
*
new_export
==
*
export
{
Vc
::
upcast
(
**
final_module
)
Vc
::
upcast
(
**
final_module
)
}
else
{
}
else
{
Vc
::
upcast
(
EcmascriptModule
Facad
eModule
::
new
(
Vc
::
upcast
(
EcmascriptModule
Renam
eModule
::
new
(
**
final_module
,
**
final_module
,
ModulePart
::
renamed_export
(
new_export
.clone
(),
export
.clone
()),
ModulePart
::
renamed_export
(
new_export
.clone
(),
export
.clone
()),
))
))
}
}
}
else
{
}
else
{
Vc
::
upcast
(
EcmascriptModule
Facad
eModule
::
new
(
Vc
::
upcast
(
EcmascriptModule
Renam
eModule
::
new
(
**
final_module
,
**
final_module
,
ModulePart
::
renamed_namespace
(
export
.clone
()),
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