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
f64cd092
Commit
f64cd092
authored
Jan 29, 2026
by
Tobias Koppers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reduce code duplication
parent
cc81b3e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
42 deletions
+43
-42
dynamic_module.rs
crates/next-core/src/next_dynamic/dynamic_module.rs
+17
-19
server_component_module.rs
...core/src/next_server_component/server_component_module.rs
+13
-12
server_utility_module.rs
...ext-core/src/next_server_utility/server_utility_module.rs
+13
-11
No files found.
crates/next-core/src/next_dynamic/dynamic_module.rs
View file @
f64cd092
...
@@ -10,7 +10,7 @@ use turbopack_core::{
...
@@ -10,7 +10,7 @@ use turbopack_core::{
module
::{
Module
,
ModuleSideEffects
},
module
::{
Module
,
ModuleSideEffects
},
module_graph
::
ModuleGraph
,
module_graph
::
ModuleGraph
,
output
::
OutputAssetsReference
,
output
::
OutputAssetsReference
,
reference
::{
ModuleReferences
,
SingleChunkableModuleReference
},
reference
::{
ModuleReference
,
ModuleReference
s
,
SingleChunkableModuleReference
},
resolve
::
ExportUsage
,
resolve
::
ExportUsage
,
source
::
OptionSource
,
source
::
OptionSource
,
};
};
...
@@ -43,6 +43,20 @@ fn dynamic_ref_description() -> RcStr {
...
@@ -43,6 +43,20 @@ fn dynamic_ref_description() -> RcStr {
rcstr!
(
"next/dynamic reference"
)
rcstr!
(
"next/dynamic reference"
)
}
}
impl
NextDynamicEntryModule
{
async
fn
module_reference
(
&
self
)
->
Result
<
ResolvedVc
<
Box
<
dyn
ModuleReference
>>>
{
Ok
(
ResolvedVc
::
upcast
(
SingleChunkableModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
),
dynamic_ref_description
(),
ExportUsage
::
all
(),
)
.to_resolved
()
.await
?
,
))
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
Module
for
NextDynamicEntryModule
{
impl
Module
for
NextDynamicEntryModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
...
@@ -59,15 +73,7 @@ impl Module for NextDynamicEntryModule {
...
@@ -59,15 +73,7 @@ impl Module for NextDynamicEntryModule {
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
references
(
&
self
)
->
Result
<
Vc
<
ModuleReferences
>>
{
async
fn
references
(
&
self
)
->
Result
<
Vc
<
ModuleReferences
>>
{
Ok
(
Vc
::
cell
(
vec!
[
ResolvedVc
::
upcast
(
Ok
(
Vc
::
cell
(
vec!
[
self
.module_reference
()
.await
?
]))
SingleChunkableModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
),
dynamic_ref_description
(),
ExportUsage
::
all
(),
)
.to_resolved
()
.await
?
,
)]))
}
}
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
side_effects
(
self
:
Vc
<
Self
>
)
->
Vc
<
ModuleSideEffects
>
{
fn
side_effects
(
self
:
Vc
<
Self
>
)
->
Vc
<
ModuleSideEffects
>
{
...
@@ -99,15 +105,7 @@ impl ChunkableModule for NextDynamicEntryModule {
...
@@ -99,15 +105,7 @@ impl ChunkableModule for NextDynamicEntryModule {
impl
EcmascriptChunkPlaceable
for
NextDynamicEntryModule
{
impl
EcmascriptChunkPlaceable
for
NextDynamicEntryModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
get_exports
(
&
self
)
->
Result
<
Vc
<
EcmascriptExports
>>
{
async
fn
get_exports
(
&
self
)
->
Result
<
Vc
<
EcmascriptExports
>>
{
let
module_reference
=
ResolvedVc
::
upcast
(
let
module_reference
=
self
.module_reference
()
.await
?
;
SingleChunkableModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
),
dynamic_ref_description
(),
ExportUsage
::
all
(),
)
.to_resolved
()
.await
?
,
);
let
mut
exports
=
BTreeMap
::
new
();
let
mut
exports
=
BTreeMap
::
new
();
let
default
=
rcstr!
(
"default"
);
let
default
=
rcstr!
(
"default"
);
...
...
crates/next-core/src/next_server_component/server_component_module.rs
View file @
f64cd092
...
@@ -11,7 +11,7 @@ use turbopack_core::{
...
@@ -11,7 +11,7 @@ use turbopack_core::{
module
::{
Module
,
ModuleSideEffects
},
module
::{
Module
,
ModuleSideEffects
},
module_graph
::
ModuleGraph
,
module_graph
::
ModuleGraph
,
output
::
OutputAssetsReference
,
output
::
OutputAssetsReference
,
reference
::
ModuleReferences
,
reference
::
{
ModuleReference
,
ModuleReferences
}
,
source
::
OptionSource
,
source
::
OptionSource
,
};
};
use
turbopack_ecmascript
::{
use
turbopack_ecmascript
::{
...
@@ -64,6 +64,16 @@ impl NextServerComponentModule {
...
@@ -64,6 +64,16 @@ impl NextServerComponentModule {
}
}
}
}
impl
NextServerComponentModule
{
async
fn
module_reference
(
&
self
)
->
Result
<
ResolvedVc
<
Box
<
dyn
ModuleReference
>>>
{
Ok
(
ResolvedVc
::
upcast
(
NextServerComponentModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
))
.to_resolved
()
.await
?
,
))
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
Module
for
NextServerComponentModule
{
impl
Module
for
NextServerComponentModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
...
@@ -80,11 +90,7 @@ impl Module for NextServerComponentModule {
...
@@ -80,11 +90,7 @@ impl Module for NextServerComponentModule {
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
references
(
&
self
)
->
Result
<
Vc
<
ModuleReferences
>>
{
async
fn
references
(
&
self
)
->
Result
<
Vc
<
ModuleReferences
>>
{
Ok
(
Vc
::
cell
(
vec!
[
ResolvedVc
::
upcast
(
Ok
(
Vc
::
cell
(
vec!
[
self
.module_reference
()
.await
?
]))
NextServerComponentModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
))
.to_resolved
()
.await
?
,
)]))
}
}
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
side_effects
(
self
:
Vc
<
Self
>
)
->
Vc
<
ModuleSideEffects
>
{
fn
side_effects
(
self
:
Vc
<
Self
>
)
->
Vc
<
ModuleSideEffects
>
{
...
@@ -116,12 +122,7 @@ impl ChunkableModule for NextServerComponentModule {
...
@@ -116,12 +122,7 @@ impl ChunkableModule for NextServerComponentModule {
impl
EcmascriptChunkPlaceable
for
NextServerComponentModule
{
impl
EcmascriptChunkPlaceable
for
NextServerComponentModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
get_exports
(
&
self
)
->
Result
<
Vc
<
EcmascriptExports
>>
{
async
fn
get_exports
(
&
self
)
->
Result
<
Vc
<
EcmascriptExports
>>
{
let
module_reference
=
ResolvedVc
::
upcast
(
let
module_reference
=
self
.module_reference
()
.await
?
;
NextServerComponentModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
))
.to_resolved
()
.await
?
,
);
let
mut
exports
=
BTreeMap
::
new
();
let
mut
exports
=
BTreeMap
::
new
();
let
default
=
rcstr!
(
"default"
);
let
default
=
rcstr!
(
"default"
);
exports
.insert
(
exports
.insert
(
...
...
crates/next-core/src/next_server_utility/server_utility_module.rs
View file @
f64cd092
...
@@ -11,7 +11,7 @@ use turbopack_core::{
...
@@ -11,7 +11,7 @@ use turbopack_core::{
module
::{
Module
,
ModuleSideEffects
},
module
::{
Module
,
ModuleSideEffects
},
module_graph
::
ModuleGraph
,
module_graph
::
ModuleGraph
,
output
::
OutputAssetsReference
,
output
::
OutputAssetsReference
,
reference
::
ModuleReferences
,
reference
::
{
ModuleReference
,
ModuleReferences
}
,
source
::
OptionSource
,
source
::
OptionSource
,
};
};
use
turbopack_ecmascript
::{
use
turbopack_ecmascript
::{
...
@@ -44,6 +44,16 @@ impl NextServerUtilityModule {
...
@@ -44,6 +44,16 @@ impl NextServerUtilityModule {
}
}
}
}
impl
NextServerUtilityModule
{
async
fn
module_reference
(
&
self
)
->
Result
<
ResolvedVc
<
Box
<
dyn
ModuleReference
>>>
{
Ok
(
ResolvedVc
::
upcast
(
NextServerUtilityModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
))
.to_resolved
()
.await
?
,
))
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
Module
for
NextServerUtilityModule
{
impl
Module
for
NextServerUtilityModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
...
@@ -60,11 +70,7 @@ impl Module for NextServerUtilityModule {
...
@@ -60,11 +70,7 @@ impl Module for NextServerUtilityModule {
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
references
(
&
self
)
->
Result
<
Vc
<
ModuleReferences
>>
{
async
fn
references
(
&
self
)
->
Result
<
Vc
<
ModuleReferences
>>
{
Ok
(
Vc
::
cell
(
vec!
[
ResolvedVc
::
upcast
(
Ok
(
Vc
::
cell
(
vec!
[
self
.module_reference
()
.await
?
]))
NextServerUtilityModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
))
.to_resolved
()
.await
?
,
)]))
}
}
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
...
@@ -97,11 +103,7 @@ impl ChunkableModule for NextServerUtilityModule {
...
@@ -97,11 +103,7 @@ impl ChunkableModule for NextServerUtilityModule {
impl
EcmascriptChunkPlaceable
for
NextServerUtilityModule
{
impl
EcmascriptChunkPlaceable
for
NextServerUtilityModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
get_exports
(
&
self
)
->
Result
<
Vc
<
EcmascriptExports
>>
{
async
fn
get_exports
(
&
self
)
->
Result
<
Vc
<
EcmascriptExports
>>
{
let
module_reference
=
ResolvedVc
::
upcast
(
let
module_reference
=
self
.module_reference
()
.await
?
;
NextServerUtilityModuleReference
::
new
(
Vc
::
upcast
(
*
self
.module
))
.to_resolved
()
.await
?
,
);
let
mut
exports
=
BTreeMap
::
new
();
let
mut
exports
=
BTreeMap
::
new
();
let
default
=
rcstr!
(
"default"
);
let
default
=
rcstr!
(
"default"
);
...
...
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