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
9eca3e33
Commit
9eca3e33
authored
Feb 24, 2026
by
Matt Mastracci
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Box<dyn ChunkedItem> -> ChunkItem
parent
3e95502a
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
155 additions
and
95 deletions
+155
-95
server_actions.rs
crates/next-api/src/server_actions.rs
+3
-2
webpack_stats.rs
crates/next-api/src/webpack_stats.rs
+2
-3
ecmascript_client_reference_module.rs
...pt_client_reference/ecmascript_client_reference_module.rs
+10
-12
chunking_context.rs
turbopack/crates/turbopack-browser/src/chunking_context.rs
+2
-3
chunk_id_strategy.rs
...pack/crates/turbopack-core/src/chunk/chunk_id_strategy.rs
+6
-2
chunk_item_batch.rs
...opack/crates/turbopack-core/src/chunk/chunk_item_batch.rs
+1
-1
dev.rs
turbopack/crates/turbopack-core/src/chunk/chunking/dev.rs
+1
-1
mod.rs
turbopack/crates/turbopack-core/src/chunk/chunking/mod.rs
+1
-1
chunking_context.rs
...opack/crates/turbopack-core/src/chunk/chunking_context.rs
+5
-5
mod.rs
turbopack/crates/turbopack-core/src/chunk/mod.rs
+66
-18
style_groups.rs
...ck/crates/turbopack-core/src/module_graph/style_groups.rs
+3
-2
asset.rs
turbopack/crates/turbopack-css/src/asset.rs
+24
-15
mod.rs
turbopack/crates/turbopack-css/src/chunk/mod.rs
+7
-6
batch.rs
turbopack/crates/turbopack-ecmascript/src/chunk/batch.rs
+3
-2
chunk_type.rs
...opack/crates/turbopack-ecmascript/src/chunk/chunk_type.rs
+5
-4
content.rs
turbopack/crates/turbopack-ecmascript/src/chunk/content.rs
+2
-1
item.rs
turbopack/crates/turbopack-ecmascript/src/chunk/item.rs
+11
-13
mod.rs
turbopack/crates/turbopack-ecmascript/src/chunk/mod.rs
+1
-1
chunking_context.rs
turbopack/crates/turbopack-nodejs/src/chunking_context.rs
+2
-3
No files found.
crates/next-api/src/server_actions.rs
View file @
9eca3e33
...
@@ -27,7 +27,8 @@ use turbo_tasks_fs::{self, File, FileContent, FileSystemPath, rope::RopeBuilder}
...
@@ -27,7 +27,8 @@ use turbo_tasks_fs::{self, File, FileContent, FileSystemPath, rope::RopeBuilder}
use
turbopack_core
::{
use
turbopack_core
::{
asset
::
AssetContent
,
asset
::
AssetContent
,
chunk
::{
chunk
::{
ChunkedItem
,
ChunkItemExt
,
ChunkingContext
,
ChunkingContextExt
,
EvaluatableAsset
,
ModuleId
,
ChunkItem
,
ChunkingContext
,
ChunkingContextExt
,
EvaluatableAsset
,
ModuleId
,
},
},
context
::
AssetContext
,
context
::
AssetContext
,
file_source
::
FileSource
,
file_source
::
FileSource
,
...
@@ -158,7 +159,7 @@ async fn build_manifest(
...
@@ -158,7 +159,7 @@ async fn build_manifest(
page_name
:
RcStr
,
page_name
:
RcStr
,
runtime
:
NextRuntime
,
runtime
:
NextRuntime
,
actions
:
Vc
<
AllActions
>
,
actions
:
Vc
<
AllActions
>
,
chunk_item
:
Vc
<
Box
<
dyn
ChunkedItem
>
>
,
chunk_item
:
Vc
<
ChunkItem
>
,
async_module_info
:
Vc
<
AsyncModulesInfo
>
,
async_module_info
:
Vc
<
AsyncModulesInfo
>
,
)
->
Result
<
ResolvedVc
<
Box
<
dyn
OutputAsset
>>>
{
)
->
Result
<
ResolvedVc
<
Box
<
dyn
OutputAsset
>>>
{
let
manifest_path_prefix
=
&
page_name
;
let
manifest_path_prefix
=
&
page_name
;
...
...
crates/next-api/src/webpack_stats.rs
View file @
9eca3e33
...
@@ -8,7 +8,7 @@ use turbo_tasks::{
...
@@ -8,7 +8,7 @@ use turbo_tasks::{
};
};
use
turbopack_browser
::
ecmascript
::
EcmascriptBrowserChunk
;
use
turbopack_browser
::
ecmascript
::
EcmascriptBrowserChunk
;
use
turbopack_core
::{
use
turbopack_core
::{
chunk
::{
Chunk
,
Chunk
edItem
,
ChunkItemExt
,
ModuleId
},
chunk
::{
Chunk
,
Chunk
Item
,
ModuleId
},
module
::
Module
,
module
::
Module
,
module_graph
::
ModuleGraph
,
module_graph
::
ModuleGraph
,
output
::{
OutputAsset
,
OutputAssetsReference
},
output
::{
OutputAsset
,
OutputAssetsReference
},
...
@@ -25,8 +25,7 @@ where
...
@@ -25,8 +25,7 @@ where
{
{
let
mut
assets
=
vec!
[];
let
mut
assets
=
vec!
[];
let
mut
chunks
=
vec!
[];
let
mut
chunks
=
vec!
[];
let
mut
chunk_items
:
FxIndexMap
<
Vc
<
Box
<
dyn
ChunkedItem
>>
,
FxIndexSet
<
RcStr
>>
=
let
mut
chunk_items
:
FxIndexMap
<
Vc
<
ChunkItem
>
,
FxIndexSet
<
RcStr
>>
=
FxIndexMap
::
default
();
FxIndexMap
::
default
();
let
entry_assets
=
entry_assets
.into_iter
()
.collect
::
<
Vec
<
_
>>
();
let
entry_assets
=
entry_assets
.into_iter
()
.collect
::
<
Vec
<
_
>>
();
...
...
crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_module.rs
View file @
9eca3e33
...
@@ -8,8 +8,8 @@ use turbo_tasks_fs::{File, FileContent};
...
@@ -8,8 +8,8 @@ use turbo_tasks_fs::{File, FileContent};
use
turbopack_core
::{
use
turbopack_core
::{
asset
::
AssetContent
,
asset
::
AssetContent
,
chunk
::{
chunk
::{
AsyncModuleInfo
,
ChunkGroupType
,
Chunk
edItem
,
ChunkType
,
ChunkableModule
,
ChunkingContext
,
AsyncModuleInfo
,
ChunkGroupType
,
Chunk
Item
,
ChunkType
,
ChunkableModule
,
ChunkedItem
,
ChunkingContextExt
,
ChunkingType
,
ChunkingTypeOption
,
ChunkingContext
,
ChunkingContext
Ext
,
ChunkingType
,
ChunkingTypeOption
,
},
},
code_builder
::
CodeBuilder
,
code_builder
::
CodeBuilder
,
context
::
AssetContext
,
context
::
AssetContext
,
...
@@ -256,23 +256,21 @@ impl ChunkableModule for EcmascriptClientReferenceModule {
...
@@ -256,23 +256,21 @@ impl ChunkableModule for EcmascriptClientReferenceModule {
self
:
ResolvedVc
<
Self
>
,
self
:
ResolvedVc
<
Self
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
)
->
Result
<
Vc
<
Box
<
dyn
ChunkedItem
>>>
{
)
->
Result
<
Vc
<
ChunkItem
>>
{
let
item
=
chunking_context
.chunk_item
(
let
item
=
chunking_context
.chunk_item
(
Vc
::
upcast
(
self
.proxy_module
()),
module_graph
);
Vc
::
upcast
(
self
.proxy_module
()),
let
inner
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
=
*
item
.await
?
;
module_graph
,
let
ecmascript_item
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
EcmascriptChunkItem
>>
(
inner
)
);
let
ecmascript_item
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
EcmascriptChunkItem
>>
(
item
.to_resolved
()
.await
?
)
.context
(
"EcmascriptModuleAsset must implement EcmascriptChunkItem"
)
?
;
.context
(
"EcmascriptModuleAsset must implement EcmascriptChunkItem"
)
?
;
Ok
(
Vc
::
upcast
(
let
chunked
:
Vc
<
Box
<
dyn
ChunkedItem
>>
=
Vc
::
upcast
(
EcmascriptClientReferenceProxyChunkItem
{
EcmascriptClientReferenceProxyChunkItem
{
inner_module
:
self
,
inner_module
:
self
,
inner_chunk_item
:
ecmascript_item
,
inner_chunk_item
:
ecmascript_item
,
chunking_context
,
chunking_context
,
}
}
.cell
(),
.cell
(),
))
);
Ok
(
ChunkItem
::
from_trait
(
chunked
))
}
}
}
}
...
...
turbopack/crates/turbopack-browser/src/chunking_context.rs
View file @
9eca3e33
...
@@ -11,8 +11,7 @@ use turbo_tasks_hash::{DeterministicHash, HashAlgorithm};
...
@@ -11,8 +11,7 @@ use turbo_tasks_hash::{DeterministicHash, HashAlgorithm};
use
turbopack_core
::{
use
turbopack_core
::{
asset
::
Asset
,
asset
::
Asset
,
chunk
::{
chunk
::{
AssetSuffix
,
Chunk
,
ChunkGroupResult
,
ChunkedItem
,
ChunkType
,
ChunkableModule
,
AssetSuffix
,
Chunk
,
ChunkGroupResult
,
ChunkItem
,
ChunkType
,
ChunkableModule
,
ChunkingConfig
,
ChunkingConfigs
,
ChunkingContext
,
ChunkingContextExt
,
ChunkingConfig
,
ChunkingConfigs
,
ChunkingContext
,
ChunkingContextExt
,
EntryChunkGroupResult
,
EvaluatableAsset
,
EvaluatableAssets
,
MinifyType
,
EntryChunkGroupResult
,
EvaluatableAsset
,
EvaluatableAssets
,
MinifyType
,
SourceMapSourceType
,
SourceMapsType
,
UnusedReferences
,
UrlBehavior
,
SourceMapSourceType
,
SourceMapsType
,
UnusedReferences
,
UrlBehavior
,
availability_info
::
AvailabilityInfo
,
availability_info
::
AvailabilityInfo
,
...
@@ -907,7 +906,7 @@ impl ChunkingContext for BrowserChunkingContext {
...
@@ -907,7 +906,7 @@ impl ChunkingContext for BrowserChunkingContext {
module
:
Vc
<
Box
<
dyn
ChunkableModule
>>
,
module
:
Vc
<
Box
<
dyn
ChunkableModule
>>
,
module_graph
:
Vc
<
ModuleGraph
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
availability_info
:
AvailabilityInfo
,
availability_info
:
AvailabilityInfo
,
)
->
Result
<
Vc
<
Box
<
dyn
ChunkedItem
>
>>
{
)
->
Result
<
Vc
<
ChunkItem
>>
{
let
chunking_context
=
ResolvedVc
::
upcast
::
<
Box
<
dyn
ChunkingContext
>>
(
self
);
let
chunking_context
=
ResolvedVc
::
upcast
::
<
Box
<
dyn
ChunkingContext
>>
(
self
);
Ok
(
if
self
.await
?
.manifest_chunks
{
Ok
(
if
self
.await
?
.manifest_chunks
{
let
manifest_asset
=
ManifestAsyncModule
::
new
(
let
manifest_asset
=
ManifestAsyncModule
::
new
(
...
...
turbopack/crates/turbopack-core/src/chunk/chunk_id_strategy.rs
View file @
9eca3e33
...
@@ -7,7 +7,11 @@ use turbo_tasks::{
...
@@ -7,7 +7,11 @@ use turbo_tasks::{
use
turbo_tasks_hash
::
hash_xxh3_hash64
;
use
turbo_tasks_hash
::
hash_xxh3_hash64
;
use
super
::
ModuleId
;
use
super
::
ModuleId
;
use
crate
::{
chunk
::
ChunkedItem
,
ident
::
AssetIdent
,
module
::
Module
};
use
crate
::{
chunk
::
ChunkItem
,
ident
::
AssetIdent
,
module
::
Module
,
};
#[turbo_tasks
::
value(transparent,
cell
=
"keyed"
)]
#[turbo_tasks
::
value(transparent,
cell
=
"keyed"
)]
pub
struct
ModuleIds
(
FxHashMap
<
ResolvedVc
<
AssetIdent
>
,
ModuleId
>
);
pub
struct
ModuleIds
(
FxHashMap
<
ResolvedVc
<
AssetIdent
>
,
ModuleId
>
);
...
@@ -29,7 +33,7 @@ pub struct ModuleIdStrategy {
...
@@ -29,7 +33,7 @@ pub struct ModuleIdStrategy {
}
}
impl
ModuleIdStrategy
{
impl
ModuleIdStrategy
{
pub
async
fn
get_id
(
&
self
,
chunk_item
:
Vc
<
Box
<
dyn
ChunkedItem
>
>
)
->
Result
<
ModuleId
>
{
pub
async
fn
get_id
(
&
self
,
chunk_item
:
Vc
<
ChunkItem
>
)
->
Result
<
ModuleId
>
{
let
ident
=
chunk_item
.asset_ident
();
let
ident
=
chunk_item
.asset_ident
();
self
.get_id_from_ident
(
ident
)
.await
self
.get_id_from_ident
(
ident
)
.await
}
}
...
...
turbopack/crates/turbopack-core/src/chunk/chunk_item_batch.rs
View file @
9eca3e33
...
@@ -12,7 +12,7 @@ use turbo_tasks::{
...
@@ -12,7 +12,7 @@ use turbo_tasks::{
use
crate
::{
use
crate
::{
chunk
::{
chunk
::{
Chunk
edItem
,
Chunk
ItemWithAsyncModuleInfo
,
ChunkType
,
ChunkableModule
,
ChunkingContext
,
ChunkItemWithAsyncModuleInfo
,
ChunkType
,
ChunkableModule
,
ChunkingContext
,
chunking_context
::
ChunkingContextExt
,
chunking_context
::
ChunkingContextExt
,
},
},
module_graph
::{
module_graph
::{
...
...
turbopack/crates/turbopack-core/src/chunk/chunking/dev.rs
View file @
9eca3e33
...
@@ -8,7 +8,7 @@ use tracing::Level;
...
@@ -8,7 +8,7 @@ use tracing::Level;
use
turbo_tasks
::{
FxIndexMap
,
ResolvedVc
,
TryJoinIterExt
,
ValueToString
};
use
turbo_tasks
::{
FxIndexMap
,
ResolvedVc
,
TryJoinIterExt
,
ValueToString
};
use
crate
::
chunk
::{
use
crate
::
chunk
::{
Chunk
edItem
,
Chunk
ItemWithAsyncModuleInfo
,
ChunkType
,
ChunkingContext
,
ChunkItemWithAsyncModuleInfo
,
ChunkType
,
ChunkingContext
,
chunking
::{
ChunkItemOrBatchWithInfo
,
SplitContext
,
make_chunk
},
chunking
::{
ChunkItemOrBatchWithInfo
,
SplitContext
,
make_chunk
},
};
};
...
...
turbopack/crates/turbopack-core/src/chunk/chunking/mod.rs
View file @
9eca3e33
...
@@ -13,7 +13,7 @@ use turbo_tasks::{
...
@@ -13,7 +13,7 @@ use turbo_tasks::{
use
crate
::{
use
crate
::{
chunk
::{
chunk
::{
Chunk
,
Chunk
edItem
,
Chunk
ItemWithAsyncModuleInfo
,
ChunkType
,
ChunkingContext
,
Chunks
,
Chunk
,
ChunkItemWithAsyncModuleInfo
,
ChunkType
,
ChunkingContext
,
Chunks
,
batch_info
,
batch_info
,
chunk_item_batch
::{
chunk_item_batch
::{
ChunkItemBatchGroup
,
ChunkItemBatchGroups
,
ChunkItemBatchWithAsyncModuleInfo
,
ChunkItemBatchGroup
,
ChunkItemBatchGroups
,
ChunkItemBatchWithAsyncModuleInfo
,
...
...
turbopack/crates/turbopack-core/src/chunk/chunking_context.rs
View file @
9eca3e33
...
@@ -12,7 +12,7 @@ use turbo_tasks_hash::DeterministicHash;
...
@@ -12,7 +12,7 @@ use turbo_tasks_hash::DeterministicHash;
use
crate
::{
use
crate
::{
asset
::
Asset
,
asset
::
Asset
,
chunk
::{
chunk
::{
Chunk
ed
Item
,
ChunkType
,
ChunkableModule
,
EvaluatableAssets
,
ChunkItem
,
ChunkType
,
ChunkableModule
,
EvaluatableAssets
,
availability_info
::
AvailabilityInfo
,
chunk_id_strategy
::
ModuleIdStrategy
,
availability_info
::
AvailabilityInfo
,
chunk_id_strategy
::
ModuleIdStrategy
,
},
},
environment
::
Environment
,
environment
::
Environment
,
...
@@ -430,7 +430,7 @@ pub trait ChunkingContext {
...
@@ -430,7 +430,7 @@ pub trait ChunkingContext {
module
:
Vc
<
Box
<
dyn
ChunkableModule
>>
,
module
:
Vc
<
Box
<
dyn
ChunkableModule
>>
,
module_graph
:
Vc
<
ModuleGraph
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
availability_info
:
AvailabilityInfo
,
availability_info
:
AvailabilityInfo
,
)
->
Vc
<
Box
<
dyn
ChunkedItem
>
>
;
)
->
Vc
<
ChunkItem
>
;
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
async_loader_chunk_item_ident
(
&
self
,
module
:
Vc
<
Box
<
dyn
ChunkableModule
>>
)
fn
async_loader_chunk_item_ident
(
&
self
,
module
:
Vc
<
Box
<
dyn
ChunkableModule
>>
)
->
Vc
<
AssetIdent
>
;
->
Vc
<
AssetIdent
>
;
...
@@ -586,7 +586,7 @@ pub trait ChunkingContextExt {
...
@@ -586,7 +586,7 @@ pub trait ChunkingContextExt {
self
:
Vc
<
Self
>
,
self
:
Vc
<
Self
>
,
module
:
Vc
<
Box
<
dyn
Module
>>
,
module
:
Vc
<
Box
<
dyn
Module
>>
,
module_graph
:
Vc
<
ModuleGraph
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
)
->
Vc
<
Box
<
dyn
ChunkedItem
>
>
)
->
Vc
<
ChunkItem
>
where
where
Self
:
Send
;
Self
:
Send
;
}
}
...
@@ -712,7 +712,7 @@ impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingConte
...
@@ -712,7 +712,7 @@ impl<T: ChunkingContext + Send + Upcast<Box<dyn ChunkingContext>>> ChunkingConte
self
:
Vc
<
Self
>
,
self
:
Vc
<
Self
>
,
module
:
Vc
<
Box
<
dyn
Module
>>
,
module
:
Vc
<
Box
<
dyn
Module
>>
,
module_graph
:
Vc
<
ModuleGraph
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
)
->
Vc
<
Box
<
dyn
ChunkedItem
>
>
{
)
->
Vc
<
ChunkItem
>
{
chunk_item
(
Vc
::
upcast_non_strict
(
self
),
module
,
module_graph
)
chunk_item
(
Vc
::
upcast_non_strict
(
self
),
module
,
module_graph
)
}
}
}
}
...
@@ -722,7 +722,7 @@ async fn chunk_item(
...
@@ -722,7 +722,7 @@ async fn chunk_item(
chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
module
:
Vc
<
Box
<
dyn
Module
>>
,
module
:
Vc
<
Box
<
dyn
Module
>>
,
module_graph
:
Vc
<
ModuleGraph
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
)
->
Result
<
Vc
<
Box
<
dyn
ChunkedItem
>
>>
{
)
->
Result
<
Vc
<
ChunkItem
>>
{
let
module
=
module
.to_resolved
()
.await
?
;
let
module
=
module
.to_resolved
()
.await
?
;
let
Some
(
chunkable
)
=
ResolvedVc
::
try_sidecast
::
<
Box
<
dyn
ChunkableModule
>>
(
module
)
else
{
let
Some
(
chunkable
)
=
ResolvedVc
::
try_sidecast
::
<
Box
<
dyn
ChunkableModule
>>
(
module
)
else
{
bail!
(
bail!
(
...
...
turbopack/crates/turbopack-core/src/chunk/mod.rs
View file @
9eca3e33
...
@@ -43,7 +43,7 @@ use crate::{
...
@@ -43,7 +43,7 @@ use crate::{
ModuleGraph
,
ModuleGraph
,
module_batch
::{
ChunkableModuleOrBatch
,
ModuleBatchGroup
},
module_batch
::{
ChunkableModuleOrBatch
,
ModuleBatchGroup
},
},
},
output
::{
OutputAssets
,
OutputAssetsReference
},
output
::{
OutputAssets
,
OutputAssetsReference
,
OutputAssetsWithReferenced
},
};
};
/// A module id, which can be a number or string
/// A module id, which can be a number or string
...
@@ -85,7 +85,7 @@ pub trait ChunkableModule: Module {
...
@@ -85,7 +85,7 @@ pub trait ChunkableModule: Module {
self
:
Vc
<
Self
>
,
self
:
Vc
<
Self
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
)
->
Vc
<
Box
<
dyn
ChunkedItem
>
>
;
)
->
Vc
<
ChunkItem
>
;
}
}
/// Implements `ChunkableModule` for a type that implements `EcmascriptChunkPlaceable`.
/// Implements `ChunkableModule` for a type that implements `EcmascriptChunkPlaceable`.
...
@@ -113,12 +113,14 @@ macro_rules! chunk_item {
...
@@ -113,12 +113,14 @@ macro_rules! chunk_item {
chunking_context
:
turbo_tasks
::
ResolvedVc
<
chunking_context
:
turbo_tasks
::
ResolvedVc
<
Box
<
dyn
turbopack_core
::
chunk
::
ChunkingContext
>
,
Box
<
dyn
turbopack_core
::
chunk
::
ChunkingContext
>
,
>
,
>
,
)
->
turbo_tasks
::
Vc
<
Box
<
dyn
ChunkedItem
>>
{
)
->
turbo_tasks
::
Vc
<
turbopack_core
::
chunk
::
ChunkItem
>
{
turbopack_core
::
chunk
::
ChunkItem
::
from_trait
(
turbo_tasks
::
Vc
::
upcast
(
$chunk_item_fn
(
$chunk_item_fn
(
turbo_tasks
::
ResolvedVc
::
upcast
(
self
),
turbo_tasks
::
ResolvedVc
::
upcast
(
self
),
module_graph
,
module_graph
,
chunking_context
,
chunking_context
,
)
),
))
}
}
}
}
};
};
...
@@ -473,7 +475,7 @@ pub trait ChunkType: ValueToString {
...
@@ -473,7 +475,7 @@ pub trait ChunkType: ValueToString {
fn
chunk_item_size
(
fn
chunk_item_size
(
&
self
,
&
self
,
chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
chunk_item
:
Vc
<
Box
<
dyn
ChunkedItem
>
>
,
chunk_item
:
Vc
<
ChunkItem
>
,
async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
)
->
Vc
<
usize
>
;
)
->
Vc
<
usize
>
;
}
}
...
@@ -484,16 +486,61 @@ pub fn round_chunk_item_size(size: usize) -> usize {
...
@@ -484,16 +486,61 @@ pub fn round_chunk_item_size(size: usize) -> usize {
}
}
#[turbo_tasks
::
value(transparent)]
#[turbo_tasks
::
value(transparent)]
pub
struct
ChunkItems
(
pub
Vec
<
ResolvedVc
<
Box
<
dyn
ChunkedItem
>
>>
);
pub
struct
ChunkItems
(
pub
Vec
<
ResolvedVc
<
ChunkItem
>>
);
/// A wrapper around a `ResolvedVc<
Box<dyn ChunkedItem>
>` that provides direct method access
/// A wrapper around a `ResolvedVc<
ChunkItem
>` that provides direct method access
/// without needing the `ChunkedItem` trait in scope.
/// without needing the `ChunkedItem` trait in scope.
#[derive(
#[turbo_tasks
::
value(transparent)]
Debug,
Clone,
PartialEq,
Eq,
Hash,
TraceRawVcs,
NonLocalValue,
TaskInput,
Encode,
Decode,
)]
#[repr(transparent)]
pub
struct
ChunkItem
(
pub
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
);
pub
struct
ChunkItem
(
pub
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
);
#[turbo_tasks
::
value_impl]
impl
ChunkItem
{
#[turbo_tasks
::
function]
pub
async
fn
from_trait
(
chunked_item
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
)
->
Vc
<
ChunkItem
>
{
ChunkItem
(
chunked_item
)
.cell
()
}
#[turbo_tasks
::
function]
pub
fn
ty
(
&
self
)
->
Vc
<
Box
<
dyn
ChunkType
>>
{
self
.
0
.ty
()
}
#[turbo_tasks
::
function]
pub
fn
asset_ident
(
&
self
)
->
Vc
<
AssetIdent
>
{
self
.
0
.asset_ident
()
}
#[turbo_tasks
::
function]
pub
fn
content_ident
(
&
self
)
->
Vc
<
AssetIdent
>
{
self
.
0
.content_ident
()
}
#[turbo_tasks
::
function]
pub
fn
module
(
&
self
)
->
Vc
<
Box
<
dyn
Module
>>
{
self
.
0
.module
()
}
#[turbo_tasks
::
function]
pub
fn
chunking_context
(
&
self
)
->
Vc
<
Box
<
dyn
ChunkingContext
>>
{
self
.
0
.chunking_context
()
}
}
impl
ChunkItem
{
pub
async
fn
id
(
self
:
Vc
<
Self
>
)
->
Result
<
ModuleId
>
{
let
this
=
self
.await
?
;
this
.id
()
.await
}
}
#[turbo_tasks
::
value_impl]
impl
OutputAssetsReference
for
ChunkItem
{
#[turbo_tasks
::
function]
fn
references
(
&
self
)
->
Vc
<
OutputAssetsWithReferenced
>
{
self
.
0
.references
()
}
}
#[turbo_tasks
::
value]
#[turbo_tasks
::
value]
pub
struct
AsyncModuleInfo
{
pub
struct
AsyncModuleInfo
{
pub
referenced_async_modules
:
AutoSet
<
ResolvedVc
<
Box
<
dyn
Module
>>>
,
pub
referenced_async_modules
:
AutoSet
<
ResolvedVc
<
Box
<
dyn
Module
>>>
,
...
@@ -514,7 +561,7 @@ impl AsyncModuleInfo {
...
@@ -514,7 +561,7 @@ impl AsyncModuleInfo {
Debug,
Clone,
PartialEq,
Eq,
Hash,
TraceRawVcs,
TaskInput,
NonLocalValue,
Encode,
Decode,
Debug,
Clone,
PartialEq,
Eq,
Hash,
TraceRawVcs,
TaskInput,
NonLocalValue,
Encode,
Decode,
)]
)]
pub
struct
ChunkItemWithAsyncModuleInfo
{
pub
struct
ChunkItemWithAsyncModuleInfo
{
pub
chunk_item
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>
>
,
pub
chunk_item
:
ResolvedVc
<
ChunkItem
>
,
pub
module
:
Option
<
ResolvedVc
<
Box
<
dyn
ChunkableModule
>>>
,
pub
module
:
Option
<
ResolvedVc
<
Box
<
dyn
ChunkableModule
>>>
,
pub
async_info
:
Option
<
ResolvedVc
<
AsyncModuleInfo
>>
,
pub
async_info
:
Option
<
ResolvedVc
<
AsyncModuleInfo
>>
,
}
}
...
@@ -533,8 +580,9 @@ where
...
@@ -533,8 +580,9 @@ where
{
{
/// Returns the module id of this chunk item.
/// Returns the module id of this chunk item.
async
fn
id
(
self
:
Vc
<
Self
>
)
->
Result
<
ModuleId
>
{
async
fn
id
(
self
:
Vc
<
Self
>
)
->
Result
<
ModuleId
>
{
let
chunk_item
=
Vc
::
upcast_non_strict
(
self
);
let
chunked_item
:
Vc
<
Box
<
dyn
ChunkedItem
>>
=
Vc
::
upcast_non_strict
(
self
);
chunk_item
let
chunk_item
=
ChunkItem
(
chunked_item
.to_resolved
()
.await
?
)
.cell
();
chunked_item
.chunking_context
()
.chunking_context
()
.chunk_item_id_strategy
()
.chunk_item_id_strategy
()
.await
?
.await
?
...
...
turbopack/crates/turbopack-core/src/module_graph/style_groups.rs
View file @
9eca3e33
...
@@ -12,8 +12,9 @@ use turbo_tasks::{
...
@@ -12,8 +12,9 @@ use turbo_tasks::{
use
crate
::{
use
crate
::{
chunk
::{
chunk
::{
ChunkedItem
,
ChunkItemBatchWithAsyncModuleInfo
,
ChunkItemWithAsyncModuleInfo
,
ChunkType
,
ChunkItemBatchWithAsyncModuleInfo
,
ChunkItemWithAsyncModuleInfo
,
ChunkType
,
ChunkableModule
,
ChunkingContext
,
chunk_item_batch
::
attach_async_info_to_chunkable_module
,
ChunkableModule
,
ChunkingContext
,
chunk_item_batch
::
attach_async_info_to_chunkable_module
,
},
},
module
::{
Module
,
StyleModule
,
StyleType
},
module
::{
Module
,
StyleModule
,
StyleType
},
module_graph
::{
module_graph
::{
...
...
turbopack/crates/turbopack-css/src/asset.rs
View file @
9eca3e33
...
@@ -3,7 +3,10 @@ use turbo_rcstr::rcstr;
...
@@ -3,7 +3,10 @@ use turbo_rcstr::rcstr;
use
turbo_tasks
::{
IntoTraitRef
,
ResolvedVc
,
TryJoinIterExt
,
ValueToString
,
Vc
};
use
turbo_tasks
::{
IntoTraitRef
,
ResolvedVc
,
TryJoinIterExt
,
ValueToString
,
Vc
};
use
turbo_tasks_fs
::{
FileContent
,
FileSystemPath
};
use
turbo_tasks_fs
::{
FileContent
,
FileSystemPath
};
use
turbopack_core
::{
use
turbopack_core
::{
chunk
::{
ChunkedItem
,
ChunkType
,
ChunkableModule
,
ChunkingContext
,
ChunkingContextExt
,
MinifyType
},
chunk
::{
ChunkItem
,
ChunkType
,
ChunkableModule
,
ChunkedItem
,
ChunkingContext
,
ChunkingContextExt
,
MinifyType
,
},
context
::
AssetContext
,
context
::
AssetContext
,
environment
::
Environment
,
environment
::
Environment
,
ident
::
AssetIdent
,
ident
::
AssetIdent
,
...
@@ -177,12 +180,14 @@ impl ChunkableModule for CssModuleAsset {
...
@@ -177,12 +180,14 @@ impl ChunkableModule for CssModuleAsset {
self
:
ResolvedVc
<
Self
>
,
self
:
ResolvedVc
<
Self
>
,
module_graph
:
ResolvedVc
<
ModuleGraph
>
,
module_graph
:
ResolvedVc
<
ModuleGraph
>
,
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
)
->
Vc
<
Box
<
dyn
ChunkedItem
>>
{
)
->
Vc
<
ChunkItem
>
{
let
item
:
Vc
<
Box
<
dyn
ChunkedItem
>>
=
Vc
::
upcast
(
CssModuleChunkItem
::
cell
(
CssModuleChunkItem
{
Vc
::
upcast
(
CssModuleChunkItem
::
cell
(
CssModuleChunkItem
{
module
:
self
,
module
:
self
,
module_graph
,
module_graph
,
chunking_context
,
chunking_context
,
}))
}));
ChunkItem
::
from_trait
(
item
)
}
}
}
}
...
@@ -276,10 +281,12 @@ impl CssChunkItem for CssModuleChunkItem {
...
@@ -276,10 +281,12 @@ impl CssChunkItem for CssModuleChunkItem {
if
let
Some
(
placeable
)
=
if
let
Some
(
placeable
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkPlaceable
>>
(
module
)
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkPlaceable
>>
(
module
)
{
{
let
item
=
chunking_context
.chunk_item
(
Vc
::
upcast
(
*
placeable
),
*
self
.module_graph
);
let
item
=
if
let
Some
(
css_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkItem
>>
(
chunking_context
.chunk_item
(
Vc
::
upcast
(
*
placeable
),
*
self
.module_graph
);
item
.to_resolved
()
.await
?
,
let
inner
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
=
*
item
.await
?
;
)
{
if
let
Some
(
css_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkItem
>>
(
inner
)
{
imports
.push
(
CssImport
::
Internal
(
import_ref
,
css_item
));
imports
.push
(
CssImport
::
Internal
(
import_ref
,
css_item
));
}
}
}
}
...
@@ -298,10 +305,12 @@ impl CssChunkItem for CssModuleChunkItem {
...
@@ -298,10 +305,12 @@ impl CssChunkItem for CssModuleChunkItem {
if
let
Some
(
placeable
)
=
if
let
Some
(
placeable
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkPlaceable
>>
(
module
)
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkPlaceable
>>
(
module
)
{
{
let
item
=
chunking_context
.chunk_item
(
Vc
::
upcast
(
*
placeable
),
*
self
.module_graph
);
let
item
=
if
let
Some
(
css_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkItem
>>
(
chunking_context
.chunk_item
(
Vc
::
upcast
(
*
placeable
),
*
self
.module_graph
);
item
.to_resolved
()
.await
?
,
let
inner
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
=
*
item
.await
?
;
)
{
if
let
Some
(
css_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkItem
>>
(
inner
)
{
imports
.push
(
CssImport
::
Composes
(
css_item
));
imports
.push
(
CssImport
::
Composes
(
css_item
));
}
}
}
}
...
...
turbopack/crates/turbopack-css/src/chunk/mod.rs
View file @
9eca3e33
...
@@ -13,9 +13,9 @@ use turbo_tasks_fs::{
...
@@ -13,9 +13,9 @@ use turbo_tasks_fs::{
use
turbopack_core
::{
use
turbopack_core
::{
asset
::{
Asset
,
AssetContent
},
asset
::{
Asset
,
AssetContent
},
chunk
::{
chunk
::{
AsyncModuleInfo
,
Chunk
,
Chunk
ed
Item
,
ChunkItemBatchGroup
,
ChunkItemExt
,
AsyncModuleInfo
,
Chunk
,
ChunkItem
,
ChunkItemBatchGroup
,
ChunkItemExt
,
ChunkItemOrBatchWithAsyncModuleInfo
,
ChunkItemWithAsyncModuleInfo
,
ChunkType
,
ChunkItemOrBatchWithAsyncModuleInfo
,
ChunkItemWithAsyncModuleInfo
,
ChunkType
,
ChunkableModule
,
ChunkingContext
,
ChunkingContextExt
,
MinifyType
,
OutputChunk
,
ChunkableModule
,
Chunk
edItem
,
Chunk
ingContext
,
ChunkingContextExt
,
MinifyType
,
OutputChunk
,
OutputChunkRuntimeInfo
,
SourceMapSourceType
,
round_chunk_item_size
,
OutputChunkRuntimeInfo
,
SourceMapSourceType
,
round_chunk_item_size
,
},
},
code_builder
::{
Code
,
CodeBuilder
},
code_builder
::{
Code
,
CodeBuilder
},
...
@@ -558,8 +558,8 @@ impl ChunkType for CssChunkType {
...
@@ -558,8 +558,8 @@ impl ChunkType for CssChunkType {
chunk_items
:
chunk_items
chunk_items
:
chunk_items
.iter
()
.iter
()
.map
(
async
|
ChunkItemWithAsyncModuleInfo
{
chunk_item
,
..
}|
{
.map
(
async
|
ChunkItemWithAsyncModuleInfo
{
chunk_item
,
..
}|
{
let
Some
(
chunk_item
)
=
let
inner
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
=
*
chunk_item
.await
?
;
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkItem
>>
(
*
chunk_item
)
let
Some
(
chunk_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkItem
>>
(
inner
)
else
{
else
{
bail!
(
"Chunk item is not an css chunk item but reporting chunk type css"
);
bail!
(
"Chunk item is not an css chunk item but reporting chunk type css"
);
};
};
...
@@ -577,10 +577,11 @@ impl ChunkType for CssChunkType {
...
@@ -577,10 +577,11 @@ impl ChunkType for CssChunkType {
async
fn
chunk_item_size
(
async
fn
chunk_item_size
(
&
self
,
&
self
,
_chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
_chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
chunk_item
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>
>
,
chunk_item
:
Vc
<
ChunkItem
>
,
_async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
_async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
)
->
Result
<
Vc
<
usize
>>
{
)
->
Result
<
Vc
<
usize
>>
{
let
Some
(
chunk_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkItem
>>
(
chunk_item
)
else
{
let
inner
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
=
*
chunk_item
.await
?
;
let
Some
(
chunk_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
CssChunkItem
>>
(
inner
)
else
{
bail!
(
"Chunk item is not an css chunk item but reporting chunk type css"
);
bail!
(
"Chunk item is not an css chunk item but reporting chunk type css"
);
};
};
Ok
(
Vc
::
cell
(
chunk_item
.content
()
.await
.map_or
(
0
,
|
content
|
{
Ok
(
Vc
::
cell
(
chunk_item
.content
()
.await
.map_or
(
0
,
|
content
|
{
...
...
turbopack/crates/turbopack-ecmascript/src/chunk/batch.rs
View file @
9eca3e33
...
@@ -25,7 +25,7 @@ impl EcmascriptChunkItemOrBatchWithAsyncInfo {
...
@@ -25,7 +25,7 @@ impl EcmascriptChunkItemOrBatchWithAsyncInfo {
Ok
(
match
item
{
Ok
(
match
item
{
ChunkItemOrBatchWithAsyncModuleInfo
::
ChunkItem
(
chunk_item
)
=>
{
ChunkItemOrBatchWithAsyncModuleInfo
::
ChunkItem
(
chunk_item
)
=>
{
EcmascriptChunkItemOrBatchWithAsyncInfo
::
ChunkItem
(
EcmascriptChunkItemOrBatchWithAsyncInfo
::
ChunkItem
(
EcmascriptChunkItemWithAsyncInfo
::
from_chunk_item
(
chunk_item
)
?
,
EcmascriptChunkItemWithAsyncInfo
::
from_chunk_item
(
chunk_item
)
.await
?
,
)
)
}
}
&
ChunkItemOrBatchWithAsyncModuleInfo
::
Batch
(
batch
)
=>
{
&
ChunkItemOrBatchWithAsyncModuleInfo
::
Batch
(
batch
)
=>
{
...
@@ -63,7 +63,8 @@ impl EcmascriptChunkBatchWithAsyncInfo {
...
@@ -63,7 +63,8 @@ impl EcmascriptChunkBatchWithAsyncInfo {
.chunk_items
.chunk_items
.iter
()
.iter
()
.map
(
EcmascriptChunkItemWithAsyncInfo
::
from_chunk_item
)
.map
(
EcmascriptChunkItemWithAsyncInfo
::
from_chunk_item
)
.collect
::
<
Result
<
Vec
<
_
>>>
()
?
,
.try_join
()
.await
?
,
}
}
.cell
())
.cell
())
}
}
...
...
turbopack/crates/turbopack-ecmascript/src/chunk/chunk_type.rs
View file @
9eca3e33
use
anyhow
::{
Result
,
bail
};
use
anyhow
::{
Result
,
bail
};
use
turbo_tasks
::{
ResolvedVc
,
TryJoinIterExt
,
ValueDefault
,
ValueToString
,
Vc
};
use
turbo_tasks
::{
ResolvedVc
,
TryJoinIterExt
,
ValueDefault
,
ValueToString
,
Vc
};
use
turbopack_core
::
chunk
::{
use
turbopack_core
::
chunk
::{
AsyncModuleInfo
,
Chunk
,
Chunk
ed
Item
,
ChunkItemBatchGroup
,
ChunkItemOrBatchWithAsyncModuleInfo
,
AsyncModuleInfo
,
Chunk
,
ChunkItem
,
ChunkItemBatchGroup
,
ChunkItemOrBatchWithAsyncModuleInfo
,
ChunkType
,
ChunkingContext
,
round_chunk_item_size
,
ChunkType
,
Chunk
edItem
,
Chunk
ingContext
,
round_chunk_item_size
,
};
};
use
super
::{
EcmascriptChunk
,
EcmascriptChunkContent
,
EcmascriptChunkItem
};
use
super
::{
EcmascriptChunk
,
EcmascriptChunkContent
,
EcmascriptChunkItem
};
...
@@ -50,10 +50,11 @@ impl ChunkType for EcmascriptChunkType {
...
@@ -50,10 +50,11 @@ impl ChunkType for EcmascriptChunkType {
async
fn
chunk_item_size
(
async
fn
chunk_item_size
(
&
self
,
&
self
,
_chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
_chunking_context
:
Vc
<
Box
<
dyn
ChunkingContext
>>
,
chunk_item
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>
>
,
chunk_item
:
Vc
<
ChunkItem
>
,
async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
async_module_info
:
Option
<
Vc
<
AsyncModuleInfo
>>
,
)
->
Result
<
Vc
<
usize
>>
{
)
->
Result
<
Vc
<
usize
>>
{
let
Some
(
chunk_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
EcmascriptChunkItem
>>
(
chunk_item
)
let
inner
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
=
*
chunk_item
.await
?
;
let
Some
(
chunk_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
EcmascriptChunkItem
>>
(
inner
)
else
{
else
{
bail!
(
"Chunk item is not an ecmascript chunk item but reporting chunk type ecmascript"
);
bail!
(
"Chunk item is not an ecmascript chunk item but reporting chunk type ecmascript"
);
};
};
...
...
turbopack/crates/turbopack-ecmascript/src/chunk/content.rs
View file @
9eca3e33
...
@@ -3,7 +3,7 @@ use std::future::IntoFuture;
...
@@ -3,7 +3,7 @@ use std::future::IntoFuture;
use
anyhow
::
Result
;
use
anyhow
::
Result
;
use
either
::
Either
;
use
either
::
Either
;
use
turbo_tasks
::{
ReadRef
,
ResolvedVc
,
TryJoinIterExt
,
Vc
};
use
turbo_tasks
::{
ReadRef
,
ResolvedVc
,
TryJoinIterExt
,
Vc
};
use
turbopack_core
::
chunk
::{
Chunk
edItem
,
ChunkItems
,
batch_info
};
use
turbopack_core
::
chunk
::{
Chunk
Item
,
ChunkItems
,
ChunkedItem
,
batch_info
};
use
crate
::
chunk
::{
use
crate
::
chunk
::{
CodeAndIds
,
CodeAndIds
,
...
@@ -42,6 +42,7 @@ impl EcmascriptChunkContent {
...
@@ -42,6 +42,7 @@ impl EcmascriptChunkContent {
}
}
})
})
.map
(
ResolvedVc
::
upcast
::
<
Box
<
dyn
ChunkedItem
>>
)
.map
(
ResolvedVc
::
upcast
::
<
Box
<
dyn
ChunkedItem
>>
)
.map
(|
item
|
ChunkItem
(
item
)
.resolved_cell
())
.collect
(),
.collect
(),
)
)
.cell
())
.cell
())
...
...
turbopack/crates/turbopack-ecmascript/src/chunk/item.rs
View file @
9eca3e33
...
@@ -11,7 +11,7 @@ use turbo_tasks::{
...
@@ -11,7 +11,7 @@ use turbo_tasks::{
use
turbo_tasks_fs
::{
FileSystemPath
,
rope
::
Rope
};
use
turbo_tasks_fs
::{
FileSystemPath
,
rope
::
Rope
};
use
turbopack_core
::{
use
turbopack_core
::{
chunk
::{
chunk
::{
AsyncModuleInfo
,
Chunk
edItem
,
ChunkItemWithAsyncModuleInfo
,
ChunkType
,
ChunkingContext
,
AsyncModuleInfo
,
Chunk
ItemWithAsyncModuleInfo
,
ChunkType
,
ChunkedItem
,
ChunkingContext
,
ChunkingContextExt
,
ModuleId
,
SourceMapSourceType
,
ChunkingContextExt
,
ModuleId
,
SourceMapSourceType
,
},
},
code_builder
::{
Code
,
CodeBuilder
},
code_builder
::{
Code
,
CodeBuilder
},
...
@@ -206,7 +206,7 @@ pub struct EcmascriptChunkItemWithAsyncInfo {
...
@@ -206,7 +206,7 @@ pub struct EcmascriptChunkItemWithAsyncInfo {
}
}
impl
EcmascriptChunkItemWithAsyncInfo
{
impl
EcmascriptChunkItemWithAsyncInfo
{
pub
fn
from_chunk_item
(
pub
async
fn
from_chunk_item
(
chunk_item
:
&
ChunkItemWithAsyncModuleInfo
,
chunk_item
:
&
ChunkItemWithAsyncModuleInfo
,
)
->
Result
<
EcmascriptChunkItemWithAsyncInfo
>
{
)
->
Result
<
EcmascriptChunkItemWithAsyncInfo
>
{
let
ChunkItemWithAsyncModuleInfo
{
let
ChunkItemWithAsyncModuleInfo
{
...
@@ -214,8 +214,8 @@ impl EcmascriptChunkItemWithAsyncInfo {
...
@@ -214,8 +214,8 @@ impl EcmascriptChunkItemWithAsyncInfo {
module
:
_
,
module
:
_
,
async_info
,
async_info
,
}
=
chunk_item
;
}
=
chunk_item
;
let
Some
(
chunk_item
)
=
let
inner
:
ResolvedVc
<
Box
<
dyn
ChunkedItem
>>
=
*
chunk_item
.await
?
;
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
EcmascriptChunkItem
>>
(
*
chunk_item
)
let
Some
(
chunk_item
)
=
ResolvedVc
::
try_downcast
::
<
Box
<
dyn
EcmascriptChunkItem
>>
(
inner
)
else
{
else
{
bail!
(
"Chunk item is not an ecmascript chunk item but reporting chunk type ecmascript"
);
bail!
(
"Chunk item is not an ecmascript chunk item but reporting chunk type ecmascript"
);
};
};
...
@@ -316,15 +316,13 @@ pub fn ecmascript_chunk_item(
...
@@ -316,15 +316,13 @@ pub fn ecmascript_chunk_item(
module
:
ResolvedVc
<
Box
<
dyn
EcmascriptChunkPlaceable
>>
,
module
:
ResolvedVc
<
Box
<
dyn
EcmascriptChunkPlaceable
>>
,
module_graph
:
ResolvedVc
<
ModuleGraph
>
,
module_graph
:
ResolvedVc
<
ModuleGraph
>
,
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
)
->
Vc
<
Box
<
dyn
ChunkedItem
>>
{
)
->
Vc
<
EcmascriptModuleChunkItem
>
{
Vc
::
upcast
(
EcmascriptModuleChunkItem
{
EcmascriptModuleChunkItem
{
module
,
module
,
chunking_context
,
chunking_context
,
module_graph
,
module_graph
,
}
}
.cell
(),
.cell
()
)
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
...
...
turbopack/crates/turbopack-ecmascript/src/chunk/mod.rs
View file @
9eca3e33
...
@@ -13,7 +13,7 @@ use turbo_rcstr::{RcStr, rcstr};
...
@@ -13,7 +13,7 @@ use turbo_rcstr::{RcStr, rcstr};
use
turbo_tasks
::{
ResolvedVc
,
TryJoinIterExt
,
ValueToString
,
Vc
};
use
turbo_tasks
::{
ResolvedVc
,
TryJoinIterExt
,
ValueToString
,
Vc
};
use
turbo_tasks_fs
::
FileSystem
;
use
turbo_tasks_fs
::
FileSystem
;
use
turbopack_core
::{
use
turbopack_core
::{
chunk
::{
Chunk
,
Chunk
edItem
,
Chunk
Items
,
ChunkingContext
,
ModuleIds
},
chunk
::{
Chunk
,
ChunkItems
,
ChunkingContext
,
ModuleIds
},
ident
::
AssetIdent
,
ident
::
AssetIdent
,
introspect
::{
introspect
::{
Introspectable
,
IntrospectableChildren
,
module
::
IntrospectableModule
,
Introspectable
,
IntrospectableChildren
,
module
::
IntrospectableModule
,
...
...
turbopack/crates/turbopack-nodejs/src/chunking_context.rs
View file @
9eca3e33
...
@@ -6,8 +6,7 @@ use turbo_tasks_fs::FileSystemPath;
...
@@ -6,8 +6,7 @@ use turbo_tasks_fs::FileSystemPath;
use
turbopack_core
::{
use
turbopack_core
::{
asset
::
Asset
,
asset
::
Asset
,
chunk
::{
chunk
::{
AssetSuffix
,
Chunk
,
ChunkGroupResult
,
ChunkedItem
,
ChunkType
,
ChunkableModule
,
AssetSuffix
,
Chunk
,
ChunkGroupResult
,
ChunkItem
,
ChunkType
,
ChunkableModule
,
ChunkingConfig
,
ChunkingConfigs
,
ChunkingContext
,
ChunkingContextExt
,
ChunkingConfig
,
ChunkingConfigs
,
ChunkingContext
,
ChunkingContextExt
,
EntryChunkGroupResult
,
EvaluatableAssets
,
MinifyType
,
SourceMapSourceType
,
SourceMapsType
,
EntryChunkGroupResult
,
EvaluatableAssets
,
MinifyType
,
SourceMapSourceType
,
SourceMapsType
,
UnusedReferences
,
UrlBehavior
,
UnusedReferences
,
UrlBehavior
,
availability_info
::
AvailabilityInfo
,
availability_info
::
AvailabilityInfo
,
...
@@ -639,7 +638,7 @@ impl ChunkingContext for NodeJsChunkingContext {
...
@@ -639,7 +638,7 @@ impl ChunkingContext for NodeJsChunkingContext {
module
:
Vc
<
Box
<
dyn
ChunkableModule
>>
,
module
:
Vc
<
Box
<
dyn
ChunkableModule
>>
,
module_graph
:
Vc
<
ModuleGraph
>
,
module_graph
:
Vc
<
ModuleGraph
>
,
availability_info
:
AvailabilityInfo
,
availability_info
:
AvailabilityInfo
,
)
->
Result
<
Vc
<
Box
<
dyn
ChunkedItem
>
>>
{
)
->
Result
<
Vc
<
ChunkItem
>>
{
let
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
=
let
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
=
Vc
::
upcast
::
<
Box
<
dyn
ChunkingContext
>>
(
self
)
Vc
::
upcast
::
<
Box
<
dyn
ChunkingContext
>>
(
self
)
.to_resolved
()
.to_resolved
()
...
...
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