Unverified Commit a388c0a0 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: clean up some old TODOs (#82364)

I looked through all TODOs if there are any remaining "todo fix this for prod builds"-style comments, but there weren't any. But some of them are outdated now
parent 5c38caab
...@@ -66,7 +66,7 @@ use turbopack_core::{ ...@@ -66,7 +66,7 @@ use turbopack_core::{
}, },
output::{OutputAsset, OutputAssets}, output::{OutputAsset, OutputAssets},
raw_output::RawOutput, raw_output::RawOutput,
reference_type::{CssReferenceSubType, ReferenceType}, reference_type::{CommonJsReferenceSubType, CssReferenceSubType, ReferenceType},
resolve::{origin::PlainResolveOrigin, parse::Request, pattern::Pattern}, resolve::{origin::PlainResolveOrigin, parse::Request, pattern::Pattern},
source::Source, source::Source,
virtual_output::VirtualOutputAsset, virtual_output::VirtualOutputAsset,
...@@ -852,6 +852,7 @@ impl AppProject { ...@@ -852,6 +852,7 @@ impl AppProject {
Request::parse(Pattern::Constant(rcstr!( Request::parse(Pattern::Constant(rcstr!(
"next/dist/client/app-next-turbopack.js" "next/dist/client/app-next-turbopack.js"
))), ))),
CommonJsReferenceSubType::Undefined,
None, None,
false, false,
) )
......
...@@ -5,6 +5,7 @@ use turbopack_core::{ ...@@ -5,6 +5,7 @@ use turbopack_core::{
chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets}, chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
context::AssetContext, context::AssetContext,
module::Module, module::Module,
reference_type::CommonJsReferenceSubType,
resolve::{origin::PlainResolveOrigin, parse::Request}, resolve::{origin::PlainResolveOrigin, parse::Request},
source::Source, source::Source,
}; };
...@@ -35,6 +36,7 @@ impl RuntimeEntry { ...@@ -35,6 +36,7 @@ impl RuntimeEntry {
let modules = cjs_resolve( let modules = cjs_resolve(
Vc::upcast(PlainResolveOrigin::new(asset_context, path.clone())), Vc::upcast(PlainResolveOrigin::new(asset_context, path.clone())),
*request, *request,
CommonJsReferenceSubType::Undefined,
None, None,
false, false,
) )
......
...@@ -5,6 +5,7 @@ use turbopack_core::{ ...@@ -5,6 +5,7 @@ use turbopack_core::{
chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets}, chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
context::AssetContext, context::AssetContext,
module::Module, module::Module,
reference_type::CommonJsReferenceSubType,
resolve::{origin::PlainResolveOrigin, parse::Request}, resolve::{origin::PlainResolveOrigin, parse::Request},
source::Source, source::Source,
}; };
...@@ -35,6 +36,7 @@ impl RuntimeEntry { ...@@ -35,6 +36,7 @@ impl RuntimeEntry {
let modules = cjs_resolve( let modules = cjs_resolve(
Vc::upcast(PlainResolveOrigin::new(asset_context, path.clone())), Vc::upcast(PlainResolveOrigin::new(asset_context, path.clone())),
**request, **request,
CommonJsReferenceSubType::Undefined,
None, None,
false, false,
) )
......
...@@ -2074,7 +2074,7 @@ pub mod tests { ...@@ -2074,7 +2074,7 @@ pub mod tests {
impl Asset for MockModule { impl Asset for MockModule {
#[turbo_tasks::function] #[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> { fn content(&self) -> Vc<AssetContent> {
todo!() panic!("MockModule::content shouldn't be called")
} }
} }
......
...@@ -59,6 +59,3 @@ impl OutputAssets { ...@@ -59,6 +59,3 @@ impl OutputAssets {
/// A set of [OutputAsset]s /// A set of [OutputAsset]s
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct OutputAssetsSet(FxIndexSet<ResolvedVc<Box<dyn OutputAsset>>>); pub struct OutputAssetsSet(FxIndexSet<ResolvedVc<Box<dyn OutputAsset>>>);
// TODO All Vc::try_resolve_downcast::<Box<dyn OutputAsset>> calls should be
// removed
...@@ -17,5 +17,3 @@ pub struct OptionSource(Option<ResolvedVc<Box<dyn Source>>>); ...@@ -17,5 +17,3 @@ pub struct OptionSource(Option<ResolvedVc<Box<dyn Source>>>);
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct Sources(Vec<ResolvedVc<Box<dyn Source>>>); pub struct Sources(Vec<ResolvedVc<Box<dyn Source>>>);
// TODO All Vc::try_resolve_downcast::<Box<dyn Source>> calls should be removed
...@@ -38,9 +38,7 @@ impl ModuleReference for CssModuleComposeReference { ...@@ -38,9 +38,7 @@ impl ModuleReference for CssModuleComposeReference {
*self.origin, *self.origin,
*self.request, *self.request,
CssReferenceSubType::Compose, CssReferenceSubType::Compose,
// TODO: add real issue source, currently impossible because `CssClassName` doesn't // TODO: add real issue source, currently impossible
// contain the source span
// https://docs.rs/swc_css_modules/0.21.16/swc_css_modules/enum.CssClassName.html
None, None,
) )
} }
......
...@@ -102,15 +102,12 @@ impl EmotionTransformer { ...@@ -102,15 +102,12 @@ impl EmotionTransformer {
enabled: Some(true), enabled: Some(true),
sourcemap: config.sourcemap, sourcemap: config.sourcemap,
label_format: config.label_format.as_deref().map(From::from), label_format: config.label_format.as_deref().map(From::from),
auto_label: if let Some(auto_label) = config.auto_label.as_ref() { auto_label: match config.auto_label.as_ref() {
match auto_label { Some(EmotionLabelKind::Always) => Some(true),
EmotionLabelKind::Always => Some(true), Some(EmotionLabelKind::Never) => Some(false),
EmotionLabelKind::Never => Some(false), // [TODO]: this is not correct (doesn't take current mode into account)
// [TODO]: this is not correct coerece, need to be fixed Some(EmotionLabelKind::DevOnly) => None,
EmotionLabelKind::DevOnly => None, None => None,
}
} else {
None
}, },
import_map: config.import_map.as_ref().map(|map| { import_map: config.import_map.as_ref().map(|map| {
map.iter() map.iter()
......
...@@ -22,7 +22,8 @@ pub async fn get_runtime_asset_context( ...@@ -22,7 +22,8 @@ pub async fn get_runtime_asset_context(
), ),
..Default::default() ..Default::default()
}, },
// TODO: Somehow this fails to compile when enabled. // TODO: This fails when enabled, we cannot insert helpers for the runtime code as this
// happens after bundling.
// environment: Some(environment), // environment: Some(environment),
environment: None, environment: None,
tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly), tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly),
......
...@@ -73,7 +73,6 @@ pub async fn get_browser_runtime_code( ...@@ -73,7 +73,6 @@ pub async fn get_browser_runtime_code(
runtime_backend_code.push("browser/runtime/dom/dev-backend-dom.ts"); runtime_backend_code.push("browser/runtime/dom/dev-backend-dom.ts");
} }
(ChunkLoading::Dom, RuntimeType::Production) => { (ChunkLoading::Dom, RuntimeType::Production) => {
// TODO
runtime_backend_code.push("browser/runtime/dom/runtime-backend-dom.ts"); runtime_backend_code.push("browser/runtime/dom/runtime-backend-dom.ts");
} }
......
...@@ -622,7 +622,6 @@ impl EvalContext { ...@@ -622,7 +622,6 @@ impl EvalContext {
if let Expr::Member(MemberExpr { obj, prop, .. }) = unparen(callee) { if let Expr::Member(MemberExpr { obj, prop, .. }) = unparen(callee) {
let obj = Box::new(self.eval(obj)); let obj = Box::new(self.eval(obj));
let prop = Box::new(match prop { let prop = Box::new(match prop {
// TODO avoid clone
MemberProp::Ident(i) => i.sym.clone().into(), MemberProp::Ident(i) => i.sym.clone().into(),
MemberProp::PrivateName(_) => { MemberProp::PrivateName(_) => {
return JsValue::unknown_empty( return JsValue::unknown_empty(
......
...@@ -19,6 +19,7 @@ use turbopack_core::{ ...@@ -19,6 +19,7 @@ use turbopack_core::{
chunk::{ChunkableModuleReference, ChunkingContext}, chunk::{ChunkableModuleReference, ChunkingContext},
issue::IssueSource, issue::IssueSource,
reference::ModuleReference, reference::ModuleReference,
reference_type::CommonJsReferenceSubType,
resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request}, resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request},
}; };
use turbopack_resolve::ecmascript::cjs_resolve; use turbopack_resolve::ecmascript::cjs_resolve;
...@@ -67,6 +68,7 @@ impl ModuleReference for AmdDefineAssetReference { ...@@ -67,6 +68,7 @@ impl ModuleReference for AmdDefineAssetReference {
cjs_resolve( cjs_resolve(
*self.origin, *self.origin,
*self.request, *self.request,
CommonJsReferenceSubType::Undefined,
Some(self.issue_source), Some(self.issue_source),
self.in_try, self.in_try,
) )
...@@ -176,6 +178,7 @@ impl AmdDefineWithDependenciesCodeGen { ...@@ -176,6 +178,7 @@ impl AmdDefineWithDependenciesCodeGen {
cjs_resolve( cjs_resolve(
*self.origin, *self.origin,
**request, **request,
CommonJsReferenceSubType::Undefined,
Some(self.issue_source), Some(self.issue_source),
self.in_try, self.in_try,
), ),
......
...@@ -13,6 +13,7 @@ use turbopack_core::{ ...@@ -13,6 +13,7 @@ use turbopack_core::{
chunk::{ChunkableModuleReference, ChunkingContext}, chunk::{ChunkableModuleReference, ChunkingContext},
issue::IssueSource, issue::IssueSource,
reference::ModuleReference, reference::ModuleReference,
reference_type::CommonJsReferenceSubType,
resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request}, resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request},
}; };
use turbopack_resolve::ecmascript::cjs_resolve; use turbopack_resolve::ecmascript::cjs_resolve;
...@@ -61,6 +62,7 @@ impl ModuleReference for CjsAssetReference { ...@@ -61,6 +62,7 @@ impl ModuleReference for CjsAssetReference {
cjs_resolve( cjs_resolve(
*self.origin, *self.origin,
*self.request, *self.request,
CommonJsReferenceSubType::Undefined,
Some(self.issue_source), Some(self.issue_source),
self.in_try, self.in_try,
) )
...@@ -112,6 +114,7 @@ impl ModuleReference for CjsRequireAssetReference { ...@@ -112,6 +114,7 @@ impl ModuleReference for CjsRequireAssetReference {
cjs_resolve( cjs_resolve(
*self.origin, *self.origin,
*self.request, *self.request,
CommonJsReferenceSubType::Undefined,
Some(self.issue_source), Some(self.issue_source),
self.in_try, self.in_try,
) )
...@@ -236,6 +239,7 @@ impl ModuleReference for CjsRequireResolveAssetReference { ...@@ -236,6 +239,7 @@ impl ModuleReference for CjsRequireResolveAssetReference {
cjs_resolve( cjs_resolve(
*self.origin, *self.origin,
*self.request, *self.request,
CommonJsReferenceSubType::Undefined,
Some(self.issue_source), Some(self.issue_source),
self.in_try, self.in_try,
) )
......
...@@ -92,7 +92,6 @@ impl EsmBinding { ...@@ -92,7 +92,6 @@ impl EsmBinding {
visit_mut_prop, visit_mut_prop,
|prop: &mut Prop| { |prop: &mut Prop| {
if let Prop::Shorthand(ident) = prop { if let Prop::Shorthand(ident) = prop {
// TODO: Merge with the above condition when https://rust-lang.github.io/rfcs/2497-if-let-chains.html lands.
match &imported_ident { match &imported_ident {
ImportedIdent::Module(imported_ident) => { ImportedIdent::Module(imported_ident) => {
*prop = Prop::KeyValue(KeyValueProp { *prop = Prop::KeyValue(KeyValueProp {
......
...@@ -3039,9 +3039,15 @@ async fn require_resolve_visitor( ...@@ -3039,9 +3039,15 @@ async fn require_resolve_visitor(
Ok(if args.len() == 1 { Ok(if args.len() == 1 {
let pat = js_value_to_pattern(&args[0]); let pat = js_value_to_pattern(&args[0]);
let request = Request::parse(pat.clone()); let request = Request::parse(pat.clone());
let resolved = cjs_resolve_source(origin, request, None, true) let resolved = cjs_resolve_source(
.resolve() origin,
.await?; request,
CommonJsReferenceSubType::Undefined,
None,
true,
)
.resolve()
.await?;
let mut values = resolved let mut values = resolved
.primary_sources() .primary_sources()
.await? .await?
......
...@@ -31,6 +31,7 @@ use turbopack_core::{ ...@@ -31,6 +31,7 @@ use turbopack_core::{
module::Module, module::Module,
module_graph::ModuleGraph, module_graph::ModuleGraph,
reference::{ModuleReference, ModuleReferences}, reference::{ModuleReference, ModuleReferences},
reference_type::CommonJsReferenceSubType,
resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request}, resolve::{ModuleResolveResult, origin::ResolveOrigin, parse::Request},
source::Source, source::Source,
}; };
...@@ -196,9 +197,15 @@ impl RequireContextMap { ...@@ -196,9 +197,15 @@ impl RequireContextMap {
let request = Request::parse(origin_relative.clone().into()) let request = Request::parse(origin_relative.clone().into())
.to_resolved() .to_resolved()
.await?; .await?;
let result = cjs_resolve(origin, *request, issue_source, is_optional) let result = cjs_resolve(
.to_resolved() origin,
.await?; *request,
CommonJsReferenceSubType::Undefined,
issue_source,
is_optional,
)
.to_resolved()
.await?;
map.insert( map.insert(
context_relative.clone(), context_relative.clone(),
......
...@@ -205,7 +205,13 @@ impl CompilerReference { ...@@ -205,7 +205,13 @@ impl CompilerReference {
impl ModuleReference for CompilerReference { impl ModuleReference for CompilerReference {
#[turbo_tasks::function] #[turbo_tasks::function]
fn resolve_reference(&self) -> Vc<ModuleResolveResult> { fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
cjs_resolve(*self.origin, *self.request, None, false) cjs_resolve(
*self.origin,
*self.request,
CommonJsReferenceSubType::Undefined,
None,
false,
)
} }
} }
...@@ -281,7 +287,13 @@ impl TsNodeRequireReference { ...@@ -281,7 +287,13 @@ impl TsNodeRequireReference {
impl ModuleReference for TsNodeRequireReference { impl ModuleReference for TsNodeRequireReference {
#[turbo_tasks::function] #[turbo_tasks::function]
fn resolve_reference(&self) -> Vc<ModuleResolveResult> { fn resolve_reference(&self) -> Vc<ModuleResolveResult> {
cjs_resolve(*self.origin, *self.request, None, false) cjs_resolve(
*self.origin,
*self.request,
CommonJsReferenceSubType::Undefined,
None,
false,
)
} }
} }
......
...@@ -484,9 +484,7 @@ impl ChunkingContext for NodeJsChunkingContext { ...@@ -484,9 +484,7 @@ impl ChunkingContext for NodeJsChunkingContext {
_module_graph: Vc<ModuleGraph>, _module_graph: Vc<ModuleGraph>,
_availability_info: AvailabilityInfo, _availability_info: AvailabilityInfo,
) -> Result<Vc<ChunkGroupResult>> { ) -> Result<Vc<ChunkGroupResult>> {
// TODO(alexkirsz) This method should be part of a separate trait that is bail!("the Node.js chunking context does not support evaluated chunk groups")
// only implemented for client/edge runtimes.
bail!("the build chunking context does not support evaluated chunk groups")
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -104,11 +104,11 @@ pub async fn esm_resolve( ...@@ -104,11 +104,11 @@ pub async fn esm_resolve(
pub async fn cjs_resolve( pub async fn cjs_resolve(
origin: Vc<Box<dyn ResolveOrigin>>, origin: Vc<Box<dyn ResolveOrigin>>,
request: Vc<Request>, request: Vc<Request>,
ty: CommonJsReferenceSubType,
issue_source: Option<IssueSource>, issue_source: Option<IssueSource>,
is_optional: bool, is_optional: bool,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
// TODO pass CommonJsReferenceSubType let ty = ReferenceType::CommonJs(ty);
let ty = ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined);
let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()).await?) let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()).await?)
.resolve() .resolve()
.await?; .await?;
...@@ -119,11 +119,11 @@ pub async fn cjs_resolve( ...@@ -119,11 +119,11 @@ pub async fn cjs_resolve(
pub async fn cjs_resolve_source( pub async fn cjs_resolve_source(
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: ResolvedVc<Request>, request: ResolvedVc<Request>,
ty: CommonJsReferenceSubType,
issue_source: Option<IssueSource>, issue_source: Option<IssueSource>,
is_optional: bool, is_optional: bool,
) -> Result<Vc<ResolveResult>> { ) -> Result<Vc<ResolveResult>> {
// TODO pass CommonJsReferenceSubType let ty = ReferenceType::CommonJs(ty);
let ty = ReferenceType::CommonJs(CommonJsReferenceSubType::Undefined);
let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()).await?) let options = apply_cjs_specific_options(origin.resolve_options(ty.clone()).await?)
.resolve() .resolve()
.await?; .await?;
......
...@@ -560,14 +560,7 @@ async fn walk_asset( ...@@ -560,14 +560,7 @@ async fn walk_asset(
diff(path.clone(), asset.content()).await?; diff(path.clone(), asset.content()).await?;
} }
queue.extend( queue.extend(asset.references().await?.iter().copied());
asset
.references()
.await?
.iter()
.copied()
.flat_map(ResolvedVc::try_downcast::<Box<dyn OutputAsset>>),
);
Ok(()) Ok(())
} }
......
...@@ -12,7 +12,6 @@ pub mod global_module_ids; ...@@ -12,7 +12,6 @@ pub mod global_module_ids;
mod graph; mod graph;
pub mod module_options; pub mod module_options;
pub mod transition; pub mod transition;
pub(crate) mod unsupported_sass;
use anyhow::{Result, bail}; use anyhow::{Result, bail};
use css::{CssModuleAsset, ModuleCssAsset}; use css::{CssModuleAsset, ModuleCssAsset};
......
//! TODO(WEB-741) Remove this file once Sass is supported.
use anyhow::Result;
use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{FileSystemPath, glob::Glob};
use turbopack_core::{
issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString},
reference_type::ReferenceType,
resolve::{
ResolveResultOption,
parse::Request,
plugin::{AfterResolvePlugin, AfterResolvePluginCondition},
},
};
/// Resolve plugins that warns when importing a sass file.
#[turbo_tasks::value]
pub(crate) struct UnsupportedSassResolvePlugin {
root: FileSystemPath,
}
#[turbo_tasks::value_impl]
impl UnsupportedSassResolvePlugin {
#[turbo_tasks::function]
pub fn new(root: FileSystemPath) -> Vc<Self> {
UnsupportedSassResolvePlugin { root }.cell()
}
}
#[turbo_tasks::value_impl]
impl AfterResolvePlugin for UnsupportedSassResolvePlugin {
#[turbo_tasks::function]
async fn after_resolve_condition(&self) -> Result<Vc<AfterResolvePluginCondition>> {
Ok(AfterResolvePluginCondition::new(
self.root.root().owned().await?,
Glob::new(rcstr!("**/*.{sass,scss}")),
))
}
#[turbo_tasks::function]
async fn after_resolve(
&self,
fs_path: FileSystemPath,
lookup_path: FileSystemPath,
_reference_type: ReferenceType,
request: ResolvedVc<Request>,
) -> Result<Vc<ResolveResultOption>> {
let extension = fs_path.extension();
if ["sass", "scss"].contains(&extension) {
UnsupportedSassModuleIssue {
file_path: lookup_path,
request,
}
.resolved_cell()
.emit();
}
Ok(ResolveResultOption::none())
}
}
#[turbo_tasks::value(shared)]
struct UnsupportedSassModuleIssue {
// TODO(PACK-4879): The `file_path` is incorrect for this issue and we should supply
// detailed source information.
file_path: FileSystemPath,
request: ResolvedVc<Request>,
}
#[turbo_tasks::value_impl]
impl Issue for UnsupportedSassModuleIssue {
fn severity(&self) -> IssueSeverity {
IssueSeverity::Warning
}
#[turbo_tasks::function]
async fn title(&self) -> Result<Vc<StyledString>> {
Ok(StyledString::Text(
format!(
"Unsupported Sass request: {}",
self.request.await?.request().unwrap_or(rcstr!("N/A"))
)
.into(),
)
.cell())
}
#[turbo_tasks::function]
fn file_path(&self) -> Vc<FileSystemPath> {
self.file_path.clone().cell()
}
#[turbo_tasks::function]
fn description(&self) -> Vc<OptionStyledString> {
Vc::cell(Some(
StyledString::Text(rcstr!(
"Turbopack does not yet support importing Sass modules."
))
.resolved_cell(),
))
}
#[turbo_tasks::function]
fn stage(&self) -> Vc<IssueStage> {
IssueStage::Unsupported.cell()
}
}
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