Unverified Commit a05f664b authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

Turbopack: chore: Remove re-exports from turbopack crate (#85791)

I don't think these specific re-exports are too problematic, but we've moved away from the pattern of a few top-level crates re-exporting all of the rest of turbopack because in some cases it can make compilation performance much worse in the way that it structures the crate dependency graph.

Re-exports of "internal" crates can be useful in controlling what parts of the API is and isn't "public", but these re-exports aren't really doing that.
parent 1cedd668
...@@ -4282,9 +4282,11 @@ dependencies = [ ...@@ -4282,9 +4282,11 @@ dependencies = [
"turbopack-analyze", "turbopack-analyze",
"turbopack-browser", "turbopack-browser",
"turbopack-core", "turbopack-core",
"turbopack-css",
"turbopack-ecmascript", "turbopack-ecmascript",
"turbopack-node", "turbopack-node",
"turbopack-nodejs", "turbopack-nodejs",
"turbopack-resolve",
"turbopack-wasm", "turbopack-wasm",
"urlencoding", "urlencoding",
"vergen", "vergen",
...@@ -4365,12 +4367,14 @@ dependencies = [ ...@@ -4365,12 +4367,14 @@ dependencies = [
"turbopack", "turbopack",
"turbopack-browser", "turbopack-browser",
"turbopack-core", "turbopack-core",
"turbopack-css",
"turbopack-ecmascript", "turbopack-ecmascript",
"turbopack-ecmascript-plugins", "turbopack-ecmascript-plugins",
"turbopack-ecmascript-runtime", "turbopack-ecmascript-runtime",
"turbopack-image", "turbopack-image",
"turbopack-node", "turbopack-node",
"turbopack-nodejs", "turbopack-nodejs",
"turbopack-resolve",
"turbopack-static", "turbopack-static",
"turbopack-trace-utils", "turbopack-trace-utils",
] ]
...@@ -9544,7 +9548,9 @@ dependencies = [ ...@@ -9544,7 +9548,9 @@ dependencies = [
"turbopack-browser", "turbopack-browser",
"turbopack-cli-utils", "turbopack-cli-utils",
"turbopack-core", "turbopack-core",
"turbopack-css",
"turbopack-dev-server", "turbopack-dev-server",
"turbopack-ecmascript",
"turbopack-ecmascript-plugins", "turbopack-ecmascript-plugins",
"turbopack-ecmascript-runtime", "turbopack-ecmascript-runtime",
"turbopack-env", "turbopack-env",
...@@ -9863,6 +9869,7 @@ dependencies = [ ...@@ -9863,6 +9869,7 @@ dependencies = [
"turbopack", "turbopack",
"turbopack-cli-utils", "turbopack-cli-utils",
"turbopack-core", "turbopack-core",
"turbopack-ecmascript",
"turbopack-resolve", "turbopack-resolve",
"turbopack-trace-utils", "turbopack-trace-utils",
] ]
...@@ -10001,6 +10008,8 @@ dependencies = [ ...@@ -10001,6 +10008,8 @@ dependencies = [
"turbopack", "turbopack",
"turbopack-browser", "turbopack-browser",
"turbopack-core", "turbopack-core",
"turbopack-css",
"turbopack-ecmascript",
"turbopack-ecmascript-plugins", "turbopack-ecmascript-plugins",
"turbopack-ecmascript-runtime", "turbopack-ecmascript-runtime",
"turbopack-env", "turbopack-env",
...@@ -10071,6 +10080,7 @@ dependencies = [ ...@@ -10071,6 +10080,7 @@ dependencies = [
"turbo-tasks-malloc", "turbo-tasks-malloc",
"turbopack", "turbopack",
"turbopack-core", "turbopack-core",
"turbopack-ecmascript",
"turbopack-resolve", "turbopack-resolve",
] ]
......
...@@ -36,9 +36,11 @@ turbopack = { workspace = true } ...@@ -36,9 +36,11 @@ turbopack = { workspace = true }
turbopack-analyze = { workspace = true } turbopack-analyze = { workspace = true }
turbopack-browser = { workspace = true } turbopack-browser = { workspace = true }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
turbopack-css = { workspace = true }
turbopack-ecmascript = { workspace = true } turbopack-ecmascript = { workspace = true }
turbopack-node = { workspace = true } turbopack-node = { workspace = true }
turbopack-nodejs = { workspace = true } turbopack-nodejs = { workspace = true }
turbopack-resolve = { workspace = true }
turbopack-wasm = { workspace = true } turbopack-wasm = { workspace = true }
urlencoding = { workspace = true } urlencoding = { workspace = true }
......
...@@ -45,7 +45,6 @@ use turbo_tasks_fs::{File, FileContent, FileSystemPath}; ...@@ -45,7 +45,6 @@ use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack::{ use turbopack::{
ModuleAssetContext, ModuleAssetContext,
module_options::{ModuleOptionsContext, RuleCondition, transition_rule::TransitionRule}, module_options::{ModuleOptionsContext, RuleCondition, transition_rule::TransitionRule},
resolve_options_context::ResolveOptionsContext,
transition::{FullContextTransition, Transition, TransitionOptions}, transition::{FullContextTransition, Transition, TransitionOptions},
}; };
use turbopack_core::{ use turbopack_core::{
...@@ -73,6 +72,7 @@ use turbopack_core::{ ...@@ -73,6 +72,7 @@ use turbopack_core::{
use turbopack_ecmascript::{ use turbopack_ecmascript::{
resolve::cjs_resolve, single_file_ecmascript_output::SingleFileEcmascriptOutput, resolve::cjs_resolve, single_file_ecmascript_output::SingleFileEcmascriptOutput,
}; };
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use crate::{ use crate::{
dynamic_imports::{NextDynamicChunkAvailability, collect_next_dynamic_chunks}, dynamic_imports::{NextDynamicChunkAvailability, collect_next_dynamic_chunks},
......
...@@ -8,8 +8,8 @@ use serde::{Deserialize, Serialize}; ...@@ -8,8 +8,8 @@ use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, ResolvedVc, TryFlatJoinIterExt, Vc, debug::ValueDebugFormat, trace::TraceRawVcs, NonLocalValue, ResolvedVc, TryFlatJoinIterExt, Vc, debug::ValueDebugFormat, trace::TraceRawVcs,
}; };
use turbopack::css::chunk::CssChunkPlaceable;
use turbopack_core::{module::Module, module_graph::SingleModuleGraph}; use turbopack_core::{module::Module, module_graph::SingleModuleGraph};
use turbopack_css::chunk::CssChunkPlaceable;
#[derive( #[derive(
Copy, Clone, Serialize, Deserialize, Eq, PartialEq, TraceRawVcs, ValueDebugFormat, NonLocalValue, Copy, Clone, Serialize, Deserialize, Eq, PartialEq, TraceRawVcs, ValueDebugFormat, NonLocalValue,
......
...@@ -19,13 +19,13 @@ use turbo_tasks::{ ...@@ -19,13 +19,13 @@ use turbo_tasks::{
CollectiblesSource, FxIndexMap, FxIndexSet, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Vc, CollectiblesSource, FxIndexMap, FxIndexSet, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Vc,
}; };
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::css::{CssModuleAsset, ModuleCssAsset};
use turbopack_core::{ use turbopack_core::{
context::AssetContext, context::AssetContext,
issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString}, issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString},
module::Module, module::Module,
module_graph::{GraphTraversalAction, ModuleGraph, SingleModuleGraphWithBindingUsage}, module_graph::{GraphTraversalAction, ModuleGraph, SingleModuleGraphWithBindingUsage},
}; };
use turbopack_css::{CssModuleAsset, ModuleCssAsset};
use crate::{ use crate::{
client_references::{ClientManifestEntryType, ClientReferenceData, map_client_references}, client_references::{ClientManifestEntryType, ClientReferenceData, map_client_references},
......
...@@ -39,7 +39,6 @@ use turbo_tasks_fs::{ ...@@ -39,7 +39,6 @@ use turbo_tasks_fs::{
use turbopack::{ use turbopack::{
ModuleAssetContext, ModuleAssetContext,
module_options::ModuleOptionsContext, module_options::ModuleOptionsContext,
resolve_options_context::ResolveOptionsContext,
transition::{FullContextTransition, Transition, TransitionOptions}, transition::{FullContextTransition, Transition, TransitionOptions},
}; };
use turbopack_core::{ use turbopack_core::{
...@@ -66,6 +65,7 @@ use turbopack_core::{ ...@@ -66,6 +65,7 @@ use turbopack_core::{
}; };
use turbopack_ecmascript::resolve::esm_resolve; use turbopack_ecmascript::resolve::esm_resolve;
use turbopack_nodejs::NodeJsChunkingContext; use turbopack_nodejs::NodeJsChunkingContext;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use crate::{ use crate::{
dynamic_imports::{ dynamic_imports::{
......
...@@ -70,6 +70,7 @@ turbo-tasks-hash = { workspace = true } ...@@ -70,6 +70,7 @@ turbo-tasks-hash = { workspace = true }
turbopack = { workspace = true } turbopack = { workspace = true }
turbopack-browser = { workspace = true } turbopack-browser = { workspace = true }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
turbopack-css = { workspace = true }
turbopack-ecmascript = { workspace = true } turbopack-ecmascript = { workspace = true }
turbopack-ecmascript-plugins = { workspace = true, features = [ turbopack-ecmascript-plugins = { workspace = true, features = [
"transform_emotion", "transform_emotion",
...@@ -78,6 +79,7 @@ turbopack-ecmascript-runtime = { workspace = true } ...@@ -78,6 +79,7 @@ turbopack-ecmascript-runtime = { workspace = true }
turbopack-image = { workspace = true } turbopack-image = { workspace = true }
turbopack-node = { workspace = true } turbopack-node = { workspace = true }
turbopack-nodejs = { workspace = true } turbopack-nodejs = { workspace = true }
turbopack-resolve = { workspace = true }
turbopack-static = { workspace = true } turbopack-static = { workspace = true }
turbopack-trace-utils = { workspace = true } turbopack-trace-utils = { workspace = true }
......
...@@ -5,13 +5,9 @@ use serde::{Deserialize, Serialize}; ...@@ -5,13 +5,9 @@ use serde::{Deserialize, Serialize};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::{ use turbopack::module_options::{
css::chunk::CssChunkType,
module_options::{
CssOptionsContext, EcmascriptOptionsContext, JsxTransformOptions, ModuleRule, CssOptionsContext, EcmascriptOptionsContext, JsxTransformOptions, ModuleRule,
TypescriptTransformOptions, module_options_context::ModuleOptionsContext, TypescriptTransformOptions, module_options_context::ModuleOptionsContext,
},
resolve_options_context::ResolveOptionsContext,
}; };
use turbopack_browser::{ use turbopack_browser::{
BrowserChunkingContext, ChunkSuffix, ContentHashing, CurrentChunkMethod, BrowserChunkingContext, ChunkSuffix, ContentHashing, CurrentChunkMethod,
...@@ -28,11 +24,13 @@ use turbopack_core::{ ...@@ -28,11 +24,13 @@ use turbopack_core::{
module_graph::binding_usage_info::OptionBindingUsageInfo, module_graph::binding_usage_info::OptionBindingUsageInfo,
resolve::{parse::Request, pattern::Pattern}, resolve::{parse::Request, pattern::Pattern},
}; };
use turbopack_css::chunk::CssChunkType;
use turbopack_ecmascript::{AnalyzeMode, TypeofWindow, chunk::EcmascriptChunkType}; use turbopack_ecmascript::{AnalyzeMode, TypeofWindow, chunk::EcmascriptChunkType};
use turbopack_node::{ use turbopack_node::{
execution_context::ExecutionContext, execution_context::ExecutionContext,
transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions}, transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions},
}; };
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use super::transforms::get_next_client_transforms_rules; use super::transforms::get_next_client_transforms_rules;
use crate::{ use crate::{
......
...@@ -2,7 +2,6 @@ use anyhow::Result; ...@@ -2,7 +2,6 @@ use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueToString, Vc}; use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::FileContent; use turbo_tasks_fs::FileContent;
use turbopack::css::chunk::CssChunkPlaceable;
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{ChunkGroupType, ChunkableModuleReference, ChunkingType, ChunkingTypeOption}, chunk::{ChunkGroupType, ChunkableModuleReference, ChunkingType, ChunkingTypeOption},
...@@ -12,6 +11,7 @@ use turbopack_core::{ ...@@ -12,6 +11,7 @@ use turbopack_core::{
resolve::ModuleResolveResult, resolve::ModuleResolveResult,
source::OptionSource, source::OptionSource,
}; };
use turbopack_css::chunk::CssChunkPlaceable;
/// A [`CssClientReferenceModule`] is a marker module used to indicate which /// A [`CssClientReferenceModule`] is a marker module used to indicate which
/// client reference should appear in the client reference manifest. /// client reference should appear in the client reference manifest.
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use turbo_tasks::{ResolvedVc, Vc}; use turbo_tasks::{ResolvedVc, Vc};
use turbopack::{ModuleAssetContext, css::chunk::CssChunkPlaceable, transition::Transition}; use turbopack::{ModuleAssetContext, transition::Transition};
use turbopack_core::{context::ProcessResult, reference_type::ReferenceType, source::Source}; use turbopack_core::{context::ProcessResult, reference_type::ReferenceType, source::Source};
use turbopack_css::chunk::CssChunkPlaceable;
use crate::next_client_reference::css_client_reference::css_client_reference_module::CssClientReferenceModule; use crate::next_client_reference::css_client_reference::css_client_reference_module::CssClientReferenceModule;
......
...@@ -10,10 +10,10 @@ use turbo_tasks::{ ...@@ -10,10 +10,10 @@ use turbo_tasks::{
graph::{AdjacencyMap, GraphTraversal, Visit, VisitControlFlow}, graph::{AdjacencyMap, GraphTraversal, Visit, VisitControlFlow},
trace::TraceRawVcs, trace::TraceRawVcs,
}; };
use turbopack::css::chunk::CssChunkPlaceable;
use turbopack_core::{ use turbopack_core::{
chunk::ChunkingType, module::Module, reference::primary_chunkable_referenced_modules, chunk::ChunkingType, module::Module, reference::primary_chunkable_referenced_modules,
}; };
use turbopack_css::chunk::CssChunkPlaceable;
use crate::{ use crate::{
next_client_reference::{ next_client_reference::{
......
...@@ -3,7 +3,6 @@ use serde::{Deserialize, Serialize}; ...@@ -3,7 +3,6 @@ use serde::{Deserialize, Serialize};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::{css::chunk::CssChunkType, resolve_options_context::ResolveOptionsContext};
use turbopack_browser::BrowserChunkingContext; use turbopack_browser::BrowserChunkingContext;
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
...@@ -15,8 +14,10 @@ use turbopack_core::{ ...@@ -15,8 +14,10 @@ use turbopack_core::{
free_var_references, free_var_references,
module_graph::binding_usage_info::OptionBindingUsageInfo, module_graph::binding_usage_info::OptionBindingUsageInfo,
}; };
use turbopack_css::chunk::CssChunkType;
use turbopack_ecmascript::chunk::EcmascriptChunkType; use turbopack_ecmascript::chunk::EcmascriptChunkType;
use turbopack_node::execution_context::ExecutionContext; use turbopack_node::execution_context::ExecutionContext;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use crate::{ use crate::{
app_structure::CollectedRootParams, app_structure::CollectedRootParams,
......
...@@ -6,12 +6,10 @@ use turbo_rcstr::{RcStr, rcstr}; ...@@ -6,12 +6,10 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs}; use turbo_tasks::{ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::{ use turbopack::{
css::chunk::CssChunkType,
module_options::{ module_options::{
CssOptionsContext, EcmascriptOptionsContext, ExternalsTracingOptions, JsxTransformOptions, CssOptionsContext, EcmascriptOptionsContext, ExternalsTracingOptions, JsxTransformOptions,
ModuleOptionsContext, ModuleRule, TypescriptTransformOptions, ModuleOptionsContext, ModuleRule, TypescriptTransformOptions,
}, },
resolve_options_context::ResolveOptionsContext,
transition::Transition, transition::Transition,
}; };
use turbopack_core::{ use turbopack_core::{
...@@ -26,6 +24,7 @@ use turbopack_core::{ ...@@ -26,6 +24,7 @@ use turbopack_core::{
module_graph::binding_usage_info::OptionBindingUsageInfo, module_graph::binding_usage_info::OptionBindingUsageInfo,
target::CompileTarget, target::CompileTarget,
}; };
use turbopack_css::chunk::CssChunkType;
use turbopack_ecmascript::{ use turbopack_ecmascript::{
AnalyzeMode, TypeofWindow, chunk::EcmascriptChunkType, references::esm::UrlRewriteBehavior, AnalyzeMode, TypeofWindow, chunk::EcmascriptChunkType, references::esm::UrlRewriteBehavior,
}; };
...@@ -37,6 +36,7 @@ use turbopack_node::{ ...@@ -37,6 +36,7 @@ use turbopack_node::{
transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions}, transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions},
}; };
use turbopack_nodejs::NodeJsChunkingContext; use turbopack_nodejs::NodeJsChunkingContext;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use super::{ use super::{
resolve::ExternalCjsModulesResolvePlugin, resolve::ExternalCjsModulesResolvePlugin,
......
...@@ -70,7 +70,6 @@ pub async fn get_swc_ecma_transform_rule_impl( ...@@ -70,7 +70,6 @@ pub async fn get_swc_ecma_transform_rule_impl(
use anyhow::bail; use anyhow::bail;
use turbo_tasks::TryFlatJoinIterExt; use turbo_tasks::TryFlatJoinIterExt;
use turbo_tasks_fs::FileContent; use turbo_tasks_fs::FileContent;
use turbopack::{resolve_options, resolve_options_context::ResolveOptionsContext};
use turbopack_core::{ use turbopack_core::{
asset::Asset, asset::Asset,
reference_type::{CommonJsReferenceSubType, ReferenceType}, reference_type::{CommonJsReferenceSubType, ReferenceType},
...@@ -79,6 +78,9 @@ pub async fn get_swc_ecma_transform_rule_impl( ...@@ -79,6 +78,9 @@ pub async fn get_swc_ecma_transform_rule_impl(
use turbopack_ecmascript_plugins::transform::swc_ecma_transform_plugins::{ use turbopack_ecmascript_plugins::transform::swc_ecma_transform_plugins::{
SwcEcmaTransformPluginsTransformer, SwcPluginModule, SwcEcmaTransformPluginsTransformer, SwcPluginModule,
}; };
use turbopack_resolve::{
resolve::resolve_options, resolve_options_context::ResolveOptionsContext,
};
use crate::next_shared::transforms::{EcmascriptTransformStage, get_ecma_transform_rule}; use crate::next_shared::transforms::{EcmascriptTransformStage, get_ecma_transform_rule};
......
...@@ -2,11 +2,8 @@ use anyhow::Result; ...@@ -2,11 +2,8 @@ use anyhow::Result;
use turbo_rcstr::rcstr; use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, Vc}; use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{self, FileJsonContent, FileSystemPath}; use turbo_tasks_fs::{self, FileJsonContent, FileSystemPath};
use turbopack::{ use turbopack::module_options::{
module_options::{
DecoratorsKind, DecoratorsOptions, JsxTransformOptions, TypescriptTransformOptions, DecoratorsKind, DecoratorsOptions, JsxTransformOptions, TypescriptTransformOptions,
},
resolve_options_context::ResolveOptionsContext,
}; };
use turbopack_browser::react_refresh::assert_can_resolve_react_refresh; use turbopack_browser::react_refresh::assert_can_resolve_react_refresh;
use turbopack_core::{ use turbopack_core::{
...@@ -15,6 +12,7 @@ use turbopack_core::{ ...@@ -15,6 +12,7 @@ use turbopack_core::{
source::Source, source::Source,
}; };
use turbopack_ecmascript::typescript::resolve::{read_from_tsconfigs, read_tsconfigs, tsconfig}; use turbopack_ecmascript::typescript::resolve::{read_from_tsconfigs, read_tsconfigs, tsconfig};
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use crate::{mode::NextMode, next_config::NextConfig}; use crate::{mode::NextMode, next_config::NextConfig};
......
...@@ -60,7 +60,9 @@ turbopack = { workspace = true } ...@@ -60,7 +60,9 @@ turbopack = { workspace = true }
turbopack-browser = { workspace = true } turbopack-browser = { workspace = true }
turbopack-cli-utils = { workspace = true } turbopack-cli-utils = { workspace = true }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
turbopack-css = { workspace = true }
turbopack-dev-server = { workspace = true } turbopack-dev-server = { workspace = true }
turbopack-ecmascript = { workspace = true }
turbopack-ecmascript-plugins = { workspace = true, features = [ turbopack-ecmascript-plugins = { workspace = true, features = [
"transform_emotion", "transform_emotion",
] } ] }
......
...@@ -15,10 +15,7 @@ use turbo_tasks_backend::{ ...@@ -15,10 +15,7 @@ use turbo_tasks_backend::{
}; };
use turbo_tasks_fs::FileSystem; use turbo_tasks_fs::FileSystem;
use turbo_unix_path::join_path; use turbo_unix_path::join_path;
use turbopack::{ use turbopack::global_module_ids::get_global_module_id_strategy;
css::chunk::CssChunkType, ecmascript::chunk::EcmascriptChunkType,
global_module_ids::get_global_module_id_strategy,
};
use turbopack_browser::{BrowserChunkingContext, ContentHashing, CurrentChunkMethod}; use turbopack_browser::{BrowserChunkingContext, ContentHashing, CurrentChunkMethod};
use turbopack_cli_utils::issue::{ConsoleUi, LogOptions}; use turbopack_cli_utils::issue::{ConsoleUi, LogOptions};
use turbopack_core::{ use turbopack_core::{
...@@ -43,6 +40,8 @@ use turbopack_core::{ ...@@ -43,6 +40,8 @@ use turbopack_core::{
parse::Request, parse::Request,
}, },
}; };
use turbopack_css::chunk::CssChunkType;
use turbopack_ecmascript::chunk::EcmascriptChunkType;
use turbopack_ecmascript_runtime::RuntimeType; use turbopack_ecmascript_runtime::RuntimeType;
use turbopack_env::dotenv::load_env; use turbopack_env::dotenv::load_env;
use turbopack_node::execution_context::ExecutionContext; use turbopack_node::execution_context::ExecutionContext;
......
...@@ -6,7 +6,6 @@ use turbo_tasks::{ResolvedVc, Vc}; ...@@ -6,7 +6,6 @@ use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack::{ use turbopack::{
ModuleAssetContext, ModuleAssetContext,
ecmascript::TreeShakingMode,
module_options::{ module_options::{
EcmascriptOptionsContext, JsxTransformOptions, ModuleOptionsContext, EcmascriptOptionsContext, JsxTransformOptions, ModuleOptionsContext,
TypescriptTransformOptions, TypescriptTransformOptions,
...@@ -24,6 +23,7 @@ use turbopack_core::{ ...@@ -24,6 +23,7 @@ use turbopack_core::{
ident::Layer, ident::Layer,
resolve::options::{ImportMap, ImportMapping}, resolve::options::{ImportMap, ImportMapping},
}; };
use turbopack_ecmascript::TreeShakingMode;
use turbopack_node::{ use turbopack_node::{
execution_context::ExecutionContext, transforms::postcss::PostCssTransformOptions, execution_context::ExecutionContext, transforms::postcss::PostCssTransformOptions,
}; };
......
...@@ -36,6 +36,7 @@ turbo-tasks-malloc = { workspace = true, default-features = false, features = [ ...@@ -36,6 +36,7 @@ turbo-tasks-malloc = { workspace = true, default-features = false, features = [
"custom_allocator" "custom_allocator"
] } ] }
turbopack = { workspace = true } turbopack = { workspace = true }
turbopack-ecmascript = { workspace = true }
turbopack-cli-utils = { workspace = true } turbopack-cli-utils = { workspace = true }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
turbopack-resolve = { workspace = true } turbopack-resolve = { workspace = true }
......
...@@ -6,7 +6,6 @@ use turbo_tasks::{ResolvedVc, TransientInstance, TryJoinIterExt, ValueToString, ...@@ -6,7 +6,6 @@ use turbo_tasks::{ResolvedVc, TransientInstance, TryJoinIterExt, ValueToString,
use turbo_tasks_fs::{DiskFileSystem, FileSystem}; use turbo_tasks_fs::{DiskFileSystem, FileSystem};
use turbopack::{ use turbopack::{
ModuleAssetContext, ModuleAssetContext,
ecmascript::AnalyzeMode,
module_options::{ module_options::{
CssOptionsContext, EcmascriptOptionsContext, ModuleOptionsContext, CssOptionsContext, EcmascriptOptionsContext, ModuleOptionsContext,
TypescriptTransformOptions, TypescriptTransformOptions,
...@@ -25,6 +24,7 @@ use turbopack_core::{ ...@@ -25,6 +24,7 @@ use turbopack_core::{
reference_type::ReferenceType, reference_type::ReferenceType,
traced_asset::TracedAsset, traced_asset::TracedAsset,
}; };
use turbopack_ecmascript::AnalyzeMode;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext; use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
pub async fn node_file_trace( pub async fn node_file_trace(
......
...@@ -34,6 +34,8 @@ turbo-tasks-backend = { workspace = true } ...@@ -34,6 +34,8 @@ turbo-tasks-backend = { workspace = true }
turbo-unix-path = { workspace = true } turbo-unix-path = { workspace = true }
turbopack-browser = { workspace = true, features = ["test"] } turbopack-browser = { workspace = true, features = ["test"] }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
turbopack-css = { workspace = true }
turbopack-ecmascript = { workspace = true }
turbopack-ecmascript-plugins = { workspace = true, features = [ turbopack-ecmascript-plugins = { workspace = true, features = [
"transform_emotion", "transform_emotion",
] } ] }
......
...@@ -25,8 +25,6 @@ use turbo_tasks_fs::{ ...@@ -25,8 +25,6 @@ use turbo_tasks_fs::{
use turbo_unix_path::sys_to_unix; use turbo_unix_path::sys_to_unix;
use turbopack::{ use turbopack::{
ModuleAssetContext, ModuleAssetContext,
css::chunk::CssChunkType,
ecmascript::{TreeShakingMode, chunk::EcmascriptChunkType},
module_options::{EcmascriptOptionsContext, ModuleOptionsContext, TypescriptTransformOptions}, module_options::{EcmascriptOptionsContext, ModuleOptionsContext, TypescriptTransformOptions},
}; };
use turbopack_core::{ use turbopack_core::{
...@@ -46,6 +44,8 @@ use turbopack_core::{ ...@@ -46,6 +44,8 @@ use turbopack_core::{
options::{ImportMap, ImportMapping}, options::{ImportMap, ImportMapping},
}, },
}; };
use turbopack_css::chunk::CssChunkType;
use turbopack_ecmascript::{TreeShakingMode, chunk::EcmascriptChunkType};
use turbopack_ecmascript_runtime::RuntimeType; use turbopack_ecmascript_runtime::RuntimeType;
use turbopack_node::{ use turbopack_node::{
debug::should_debug, debug::should_debug,
......
...@@ -20,9 +20,6 @@ use turbo_tasks_fs::{ ...@@ -20,9 +20,6 @@ use turbo_tasks_fs::{
use turbo_unix_path::sys_to_unix; use turbo_unix_path::sys_to_unix;
use turbopack::{ use turbopack::{
ModuleAssetContext, ModuleAssetContext,
ecmascript::{
AnalyzeMode, EcmascriptInputTransform, TreeShakingMode, chunk::EcmascriptChunkType,
},
module_options::{ module_options::{
EcmascriptOptionsContext, JsxTransformOptions, ModuleOptionsContext, ModuleRule, EcmascriptOptionsContext, JsxTransformOptions, ModuleOptionsContext, ModuleRule,
ModuleRuleEffect, RuleCondition, TypescriptTransformOptions, ModuleRuleEffect, RuleCondition, TypescriptTransformOptions,
...@@ -54,6 +51,9 @@ use turbopack_core::{ ...@@ -54,6 +51,9 @@ use turbopack_core::{
reference_type::{EntryReferenceSubType, ReferenceType}, reference_type::{EntryReferenceSubType, ReferenceType},
source::Source, source::Source,
}; };
use turbopack_ecmascript::{
AnalyzeMode, EcmascriptInputTransform, TreeShakingMode, chunk::EcmascriptChunkType,
};
use turbopack_ecmascript_plugins::transform::{ use turbopack_ecmascript_plugins::transform::{
emotion::{EmotionTransformConfig, EmotionTransformer}, emotion::{EmotionTransformConfig, EmotionTransformer},
styled_components::{StyledComponentsTransformConfig, StyledComponentsTransformer}, styled_components::{StyledComponentsTransformConfig, StyledComponentsTransformer},
......
...@@ -32,6 +32,7 @@ turbo-tasks-malloc = { workspace = true, default-features = false } ...@@ -32,6 +32,7 @@ turbo-tasks-malloc = { workspace = true, default-features = false }
turbo-tasks-backend = { workspace = true } turbo-tasks-backend = { workspace = true }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
turbopack-resolve = { workspace = true } turbopack-resolve = { workspace = true }
turbopack-ecmascript = { workspace = true }
criterion = { workspace = true, features = ["async_tokio"] } criterion = { workspace = true, features = ["async_tokio"] }
difference = "2.0" difference = "2.0"
......
...@@ -33,9 +33,7 @@ use turbo_tasks::{ ...@@ -33,9 +33,7 @@ use turbo_tasks::{
use turbo_tasks_backend::TurboTasksBackend; use turbo_tasks_backend::TurboTasksBackend;
use turbo_tasks_fs::{DiskFileSystem, FileSystem}; use turbo_tasks_fs::{DiskFileSystem, FileSystem};
use turbopack::{ use turbopack::{
ModuleAssetContext, ModuleAssetContext, emit_assets_into_dir_operation,
ecmascript::AnalyzeMode,
emit_assets_into_dir_operation,
module_options::{ module_options::{
CssOptionsContext, EcmascriptOptionsContext, ModuleOptionsContext, CssOptionsContext, EcmascriptOptionsContext, ModuleOptionsContext,
TypescriptTransformOptions, TypescriptTransformOptions,
...@@ -52,6 +50,7 @@ use turbopack_core::{ ...@@ -52,6 +50,7 @@ use turbopack_core::{
reference::all_assets_from_entry, reference::all_assets_from_entry,
reference_type::ReferenceType, reference_type::ReferenceType,
}; };
use turbopack_ecmascript::AnalyzeMode;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext; use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
#[global_allocator] #[global_allocator]
......
...@@ -15,7 +15,6 @@ use turbo_tasks_backend::TurboTasksBackend; ...@@ -15,7 +15,6 @@ use turbo_tasks_backend::TurboTasksBackend;
use turbo_tasks_fs::{DiskFileSystem, FileSystem}; use turbo_tasks_fs::{DiskFileSystem, FileSystem};
use turbopack::{ use turbopack::{
ModuleAssetContext, ModuleAssetContext,
ecmascript::AnalyzeMode,
module_options::{ module_options::{
CssOptionsContext, EcmascriptOptionsContext, ModuleOptionsContext, CssOptionsContext, EcmascriptOptionsContext, ModuleOptionsContext,
TypescriptTransformOptions, TypescriptTransformOptions,
...@@ -33,6 +32,7 @@ use turbopack_core::{ ...@@ -33,6 +32,7 @@ use turbopack_core::{
reference_type::ReferenceType, reference_type::ReferenceType,
traced_asset::TracedAsset, traced_asset::TracedAsset,
}; };
use turbopack_ecmascript::AnalyzeMode;
use turbopack_resolve::resolve_options_context::ResolveOptionsContext; use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use crate::helpers::print_changeset; use crate::helpers::print_changeset;
......
...@@ -13,13 +13,6 @@ pub mod module_options; ...@@ -13,13 +13,6 @@ pub mod module_options;
pub mod transition; pub mod transition;
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use css::{CssModuleAsset, ModuleCssAsset};
use ecmascript::{
EcmascriptModuleAsset, EcmascriptModuleAssetType, TreeShakingMode,
chunk::EcmascriptChunkPlaceable,
references::{FollowExportsResult, follow_reexports},
side_effect_optimization::facade::module::EcmascriptModuleFacadeModule,
};
use module_options::{ModuleOptions, ModuleOptionsContext, ModuleRuleEffect, ModuleType}; use module_options::{ModuleOptions, ModuleOptionsContext, ModuleRuleEffect, ModuleType};
use tracing::{Instrument, field::Empty}; use tracing::{Instrument, field::Empty};
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
...@@ -28,7 +21,6 @@ use turbo_tasks_fs::{ ...@@ -28,7 +21,6 @@ use turbo_tasks_fs::{
FileSystemPath, FileSystemPath,
glob::{Glob, GlobOptions}, glob::{Glob, GlobOptions},
}; };
pub use turbopack_core::condition;
use turbopack_core::{ use turbopack_core::{
asset::Asset, asset::Asset,
chunk::SourceMapsType, chunk::SourceMapsType,
...@@ -51,26 +43,34 @@ use turbopack_core::{ ...@@ -51,26 +43,34 @@ use turbopack_core::{
}, },
source::Source, source::Source,
}; };
pub use turbopack_css as css; use turbopack_css::{CssModuleAsset, ModuleCssAsset};
pub use turbopack_ecmascript as ecmascript;
use turbopack_ecmascript::{ use turbopack_ecmascript::{
AnalyzeMode, AnalyzeMode, EcmascriptModuleAsset, EcmascriptModuleAssetType, TreeShakingMode,
chunk::EcmascriptChunkPlaceable,
inlined_bytes_module::InlinedBytesJsModule, inlined_bytes_module::InlinedBytesJsModule,
references::external_module::{ references::{
CachedExternalModule, CachedExternalTracingMode, CachedExternalType, FollowExportsResult,
external_module::{CachedExternalModule, CachedExternalTracingMode, CachedExternalType},
follow_reexports,
},
side_effect_optimization::{
facade::module::EcmascriptModuleFacadeModule, locals::module::EcmascriptModuleLocalsModule,
}, },
side_effect_optimization::locals::module::EcmascriptModuleLocalsModule,
tree_shake::asset::EcmascriptModulePartAsset, tree_shake::asset::EcmascriptModulePartAsset,
}; };
use turbopack_json::JsonModuleAsset; use turbopack_json::JsonModuleAsset;
pub use turbopack_resolve::{resolve::resolve_options, resolve_options_context}; use turbopack_resolve::{
use turbopack_resolve::{resolve_options_context::ResolveOptionsContext, typescript::type_resolve}; resolve::resolve_options, resolve_options_context::ResolveOptionsContext,
typescript::type_resolve,
};
use turbopack_static::{css::StaticUrlCssModule, ecma::StaticUrlJsModule}; use turbopack_static::{css::StaticUrlCssModule, ecma::StaticUrlJsModule};
use turbopack_wasm::{module_asset::WebAssemblyModuleAsset, source::WebAssemblySource}; use turbopack_wasm::{module_asset::WebAssemblyModuleAsset, source::WebAssemblySource};
use self::transition::{Transition, TransitionOptions}; use crate::{
use crate::module_options::{ module_options::{
CssOptionsContext, CustomModuleType, EcmascriptOptionsContext, TypescriptTransformOptions, CssOptionsContext, CustomModuleType, EcmascriptOptionsContext, TypescriptTransformOptions,
},
transition::{Transition, TransitionOptions},
}; };
async fn apply_module_type( async fn apply_module_type(
......
...@@ -31,12 +31,10 @@ use turbopack_node::{ ...@@ -31,12 +31,10 @@ use turbopack_node::{
execution_context::ExecutionContext, execution_context::ExecutionContext,
transforms::{postcss::PostCssTransform, webpack::WebpackLoaders}, transforms::{postcss::PostCssTransform, webpack::WebpackLoaders},
}; };
use turbopack_resolve::resolve_options_context::ResolveOptionsContext;
use turbopack_wasm::source::WebAssemblySourceType; use turbopack_wasm::source::WebAssemblySourceType;
use crate::{ use crate::evaluate_context::{config_tracing_module_context, node_evaluate_asset_context};
evaluate_context::{config_tracing_module_context, node_evaluate_asset_context},
resolve_options_context::ResolveOptionsContext,
};
#[turbo_tasks::function] #[turbo_tasks::function]
fn package_import_map_from_import_mapping( fn package_import_map_from_import_mapping(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment