Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a GlobalInformation struct #8912

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions crates/turbopack-browser/src/chunking_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use turbopack_core::{
chunk::{
availability_info::AvailabilityInfo,
chunk_group::{make_chunk_group, MakeChunkGroupResult},
global_information::OptionGlobalInformation,
Chunk, ChunkGroupResult, ChunkItem, ChunkableModule, ChunkingContext,
EntryChunkGroupResult, EvaluatableAssets, MinifyType, ModuleId,
},
Expand Down Expand Up @@ -122,6 +123,8 @@ pub struct BrowserChunkingContext {
minify_type: MinifyType,
/// Whether to use manifest chunks for lazy compilation
manifest_chunks: bool,
/// Global information
global_information: Vc<OptionGlobalInformation>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Option<Vc<GlobalInformation>>

}

impl BrowserChunkingContext {
Expand All @@ -133,6 +136,7 @@ impl BrowserChunkingContext {
asset_root_path: Vc<FileSystemPath>,
environment: Vc<Environment>,
runtime_type: RuntimeType,
global_information: Vc<OptionGlobalInformation>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That shouldn't be passed here (we don't want to force to always pass that).

Instead add a global_information() method to pass that, similar to the other optional fields

) -> BrowserChunkingContextBuilder {
BrowserChunkingContextBuilder {
chunking_context: BrowserChunkingContext {
Expand All @@ -151,6 +155,7 @@ impl BrowserChunkingContext {
runtime_type,
minify_type: MinifyType::NoMinify,
manifest_chunks: false,
global_information,
},
}
}
Expand Down
1 change: 1 addition & 0 deletions crates/turbopack-cli/src/build/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ async fn build_internal(
NodeEnv::Development => RuntimeType::Development,
NodeEnv::Production => RuntimeType::Production,
},
Vc::cell(None),
)
.minify_type(minify_type)
.build(),
Expand Down
1 change: 1 addition & 0 deletions crates/turbopack-cli/src/dev/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ async fn source(
build_output_root.join("assets".into()),
node_build_environment(),
RuntimeType::Development,
Vc::cell(None),
)
.build();

Expand Down
1 change: 1 addition & 0 deletions crates/turbopack-cli/src/dev/web_entry_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ pub fn get_client_chunking_context(
server_root.join("/_assets".into()),
environment,
RuntimeType::Development,
Vc::cell(None),
)
.hot_module_replacement()
.build(),
Expand Down
6 changes: 6 additions & 0 deletions crates/turbopack-core/src/chunk/global_information.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#[turbo_tasks::value]
#[derive(Clone, Debug)]
pub struct GlobalInformation {}

#[turbo_tasks::value(transparent)]
pub struct OptionGlobalInformation(Option<GlobalInformation>);
1 change: 1 addition & 0 deletions crates/turbopack-core/src/chunk/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub(crate) mod chunking_context;
pub(crate) mod containment_tree;
pub(crate) mod data;
pub(crate) mod evaluate;
pub mod global_information;
pub mod optimize;

use std::{
Expand Down
13 changes: 13 additions & 0 deletions crates/turbopack-nodejs/src/chunking_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use turbopack_core::{
chunk::{
availability_info::AvailabilityInfo,
chunk_group::{make_chunk_group, MakeChunkGroupResult},
global_information::OptionGlobalInformation,
Chunk, ChunkGroupResult, ChunkItem, ChunkableModule, ChunkingContext,
EntryChunkGroupResult, EvaluatableAssets, MinifyType, ModuleId,
},
Expand Down Expand Up @@ -84,6 +85,8 @@ pub struct NodeJsChunkingContext {
minify_type: MinifyType,
/// Whether to use manifest chunks for lazy compilation
manifest_chunks: bool,
/// Global information
global_information: Vc<OptionGlobalInformation>,
}

impl NodeJsChunkingContext {
Expand All @@ -96,6 +99,7 @@ impl NodeJsChunkingContext {
asset_root_path: Vc<FileSystemPath>,
environment: Vc<Environment>,
runtime_type: RuntimeType,
global_information: Vc<OptionGlobalInformation>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

) -> NodeJsChunkingContextBuilder {
NodeJsChunkingContextBuilder {
chunking_context: NodeJsChunkingContext {
Expand All @@ -109,6 +113,7 @@ impl NodeJsChunkingContext {
runtime_type,
minify_type: MinifyType::NoMinify,
manifest_chunks: false,
global_information,
},
}
}
Expand All @@ -131,6 +136,14 @@ impl NodeJsChunkingContext {

#[turbo_tasks::value_impl]
impl NodeJsChunkingContext {
#[turbo_tasks::function]
async fn chunk_item_id_from_ident(
self: Vc<Self>,
ident: Vc<AssetIdent>,
) -> Result<Vc<ModuleId>> {
Ok(ModuleId::String(ident.to_string().await?.clone_value()).cell())
}

#[turbo_tasks::function]
fn new(this: Value<NodeJsChunkingContext>) -> Vc<Self> {
this.into_value().cell()
Expand Down
1 change: 1 addition & 0 deletions crates/turbopack-tests/tests/execution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ async fn run_test(prepared_test: Vc<PreparedTest>) -> Result<Vc<RunTestResult>>
static_root_path,
env,
RuntimeType::Development,
Vc::cell(None),
)
.build();

Expand Down
2 changes: 2 additions & 0 deletions crates/turbopack-tests/tests/snapshot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ async fn run_test(resource: RcStr) -> Result<Vc<FileSystemPath>> {
static_root_path,
env,
options.runtime_type,
Vc::cell(None),
)
.build(),
),
Expand All @@ -331,6 +332,7 @@ async fn run_test(resource: RcStr) -> Result<Vc<FileSystemPath>> {
static_root_path,
env,
options.runtime_type,
Vc::cell(None),
)
.minify_type(options.minify_type)
.build(),
Expand Down