Skip to content

Commit f7cf3e8

Browse files
committed
renaming
1 parent a6df26b commit f7cf3e8

File tree

11 files changed

+16
-16
lines changed

11 files changed

+16
-16
lines changed

crates/next-api/src/app.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ impl AppEndpoint {
12391239
*client_chunking_context,
12401240
);
12411241

1242-
client_assets.extend(client_shared_chunk_group.direct_assets().await?);
1242+
client_assets.extend(client_shared_chunk_group.all_assets().await?);
12431243

12441244
let client_shared_chunk_group = client_shared_chunk_group.await?;
12451245
(
@@ -1282,20 +1282,20 @@ impl AppEndpoint {
12821282
.layout_segment_client_chunks
12831283
.values()
12841284
{
1285-
client_assets.extend(assets.direct_assets().await?.iter().copied());
1285+
client_assets.extend(assets.all_assets().await?.iter().copied());
12861286
}
12871287
for &assets in client_references_chunks_ref
12881288
.client_component_client_chunks
12891289
.values()
12901290
{
1291-
client_assets.extend(assets.direct_assets().await?.iter().copied());
1291+
client_assets.extend(assets.all_assets().await?.iter().copied());
12921292
}
12931293
for &assets in client_references_chunks_ref
12941294
.client_component_ssr_chunks
12951295
.values()
12961296
{
12971297
// TODO(alexkirsz) In which manifest does this go?
1298-
server_assets.extend(assets.direct_assets().await?.iter().copied());
1298+
server_assets.extend(assets.all_assets().await?.iter().copied());
12991299
}
13001300

13011301
let manifest_path_prefix = &app_entry.original_name;
@@ -1372,7 +1372,7 @@ impl AppEndpoint {
13721372
.client_component_ssr_chunks
13731373
.values()
13741374
{
1375-
middleware_assets.extend(assets.direct_assets().await?);
1375+
middleware_assets.extend(assets.all_assets().await?);
13761376
}
13771377
}
13781378

@@ -1416,7 +1416,7 @@ impl AppEndpoint {
14161416
)
14171417
.to_resolved()
14181418
.await?;
1419-
server_assets.extend(app_entry_chunks.direct_assets().await?.into_iter().copied());
1419+
server_assets.extend(app_entry_chunks.all_assets().await?.into_iter().copied());
14201420
let app_entry_chunk_group_ref = app_entry_chunks.await?;
14211421
let app_entry_chunks = app_entry_chunk_group_ref.assets;
14221422
let app_entry_chunks_ref = app_entry_chunks.await?;

crates/next-api/src/instrumentation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ impl InstrumentationEndpoint {
155155
get_js_paths_from_root(&node_root_value, &edge_chunk_group.await?.assets.await?)
156156
.await?;
157157

158-
let mut output_assets = edge_chunk_group.direct_assets().owned().await?;
158+
let mut output_assets = edge_chunk_group.all_assets().owned().await?;
159159

160160
let wasm_paths_from_root =
161161
get_wasm_paths_from_root(&node_root_value, edge_all_assets.await?).await?;

crates/next-api/src/middleware.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl MiddlewareEndpoint {
266266
get_js_paths_from_root(&node_root_value, &edge_chunk_group.await?.assets.await?)
267267
.await?;
268268

269-
let mut output_assets = edge_chunk_group.direct_assets().owned().await?;
269+
let mut output_assets = edge_chunk_group.all_assets().owned().await?;
270270

271271
let wasm_paths_from_root =
272272
get_wasm_paths_from_root(&node_root_value, edge_all_assets.await?).await?;

crates/next-api/src/nft_json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ async fn get_referenced_server_assets(
481481
client_root: Option<FileSystemPath>,
482482
exclude_glob: Option<ReadRef<Glob>>,
483483
) -> Result<Vec<(ResolvedVc<Box<dyn OutputAsset>>, Option<ReadRef<RcStr>>)>> {
484-
let refs = asset.references().direct_assets().await?;
484+
let refs = asset.references().all_assets().await?;
485485

486486
refs.iter()
487487
.map(async |asset| {

crates/next-api/src/pages.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ impl PageEndpoint {
13071307
let ssr_chunk = match this.ty {
13081308
PageEndpointType::Html => {
13091309
let client_chunk_group = self.client_chunk_group();
1310-
client_assets.extend(client_chunk_group.direct_assets().await?.iter().copied());
1310+
client_assets.extend(client_chunk_group.all_assets().await?.iter().copied());
13111311
let client_chunks = *client_chunk_group.await?.assets;
13121312

13131313
let build_manifest = self.build_manifest(client_chunks).to_resolved().await?;

crates/next-api/src/webpack_stats.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ where
3838
let mut queue = entry_assets.clone();
3939
while let Some(asset) = queue.pop() {
4040
if visited.insert(asset) {
41-
let references = asset.references().direct_assets().await?;
41+
let references = asset.references().all_assets().await?;
4242
asset_children.insert(asset, references.clone());
4343
queue.extend(references);
4444
}

turbopack/crates/turbopack-core/src/chunk/chunking_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ impl ChunkGroupResult {
153153
}
154154

155155
#[turbo_tasks::function]
156-
pub async fn direct_assets(&self) -> Result<Vc<OutputAssets>> {
156+
pub async fn all_assets(&self) -> Result<Vc<OutputAssets>> {
157157
Ok(Vc::cell(
158158
expand_output_assets(
159159
self.assets

turbopack/crates/turbopack-core/src/output.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ impl OutputAssetsWithReferenced {
188188
/// Returns only direct referenced assets and does not include assets referenced indirectly by
189189
/// them.
190190
#[turbo_tasks::function]
191-
pub async fn direct_assets(&self) -> Result<Vc<OutputAssets>> {
191+
pub async fn all_assets(&self) -> Result<Vc<OutputAssets>> {
192192
Ok(Vc::cell(self.expand_assets(false).await?))
193193
}
194194

turbopack/crates/turbopack-nft/src/nft.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ async fn to_graph(asset: ResolvedVc<Box<dyn OutputAsset>>, max_depth: usize) ->
150150

151151
let mut result = vec![];
152152
while let Some((depth, asset)) = queue.pop() {
153-
let references = asset.references().direct_assets().await?;
153+
let references = asset.references().all_assets().await?;
154154
let mut indent = String::new();
155155
for _ in 0..depth {
156156
indent.push_str(" ");

turbopack/crates/turbopack-tests/tests/snapshot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ async fn walk_asset(
583583
diff(path.clone(), asset.content()).await?;
584584
}
585585

586-
queue.extend(asset.references().direct_assets().await?.iter().copied());
586+
queue.extend(asset.references().all_assets().await?.iter().copied());
587587

588588
Ok(())
589589
}

0 commit comments

Comments
 (0)