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

Turbopack: cleanup ModuleHotReferenceAssetReference (#94206)

No need for a separate `pub async fn resolve()`, just call
`ModuleReference.resolve_reference` directly
parent 24e8c18a
...@@ -10,7 +10,6 @@ use swc_core::{ ...@@ -10,7 +10,6 @@ use swc_core::{
}, },
quote, quote,
}; };
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
NonLocalValue, ReadRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc, debug::ValueDebugFormat, NonLocalValue, ReadRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc, debug::ValueDebugFormat,
trace::TraceRawVcs, trace::TraceRawVcs,
...@@ -41,7 +40,8 @@ use crate::{ ...@@ -41,7 +40,8 @@ use crate::{
/// `import.meta.hot.accept(dep, callback)`. Ensures the accepted dependency is included /// `import.meta.hot.accept(dep, callback)`. Ensures the accepted dependency is included
/// in the chunk graph so it can be hot-replaced at runtime. /// in the chunk graph so it can be hot-replaced at runtime.
#[turbo_tasks::value] #[turbo_tasks::value]
#[derive(Hash, Debug)] #[derive(Hash, Debug, ValueToString)]
#[value_to_string("module.hot.accept/decline {request}")]
pub struct ModuleHotReferenceAssetReference { pub struct ModuleHotReferenceAssetReference {
origin: ResolvedVc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
pub request: ResolvedVc<Request>, pub request: ResolvedVc<Request>,
...@@ -70,9 +70,10 @@ impl ModuleHotReferenceAssetReference { ...@@ -70,9 +70,10 @@ impl ModuleHotReferenceAssetReference {
} }
} }
impl ModuleHotReferenceAssetReference { #[turbo_tasks::value_impl]
/// Shared resolve logic used by both `resolve_reference` and code generation. impl ModuleReference for ModuleHotReferenceAssetReference {
pub async fn resolve(&self) -> Result<Vc<ModuleResolveResult>> { #[turbo_tasks::function]
async fn resolve_reference(&self) -> Result<Vc<ModuleResolveResult>> {
if self.is_esm { if self.is_esm {
esm_resolve( esm_resolve(
*self.origin, *self.origin,
...@@ -92,25 +93,6 @@ impl ModuleHotReferenceAssetReference { ...@@ -92,25 +93,6 @@ impl ModuleHotReferenceAssetReference {
)) ))
} }
} }
}
#[turbo_tasks::value_impl]
impl ValueToString for ModuleHotReferenceAssetReference {
#[turbo_tasks::function]
async fn to_string(&self) -> Result<Vc<RcStr>> {
let request_str = self.request.to_string().await?;
Ok(Vc::cell(
format!("module.hot.accept/decline {}", request_str).into(),
))
}
}
#[turbo_tasks::value_impl]
impl ModuleReference for ModuleHotReferenceAssetReference {
#[turbo_tasks::function]
async fn resolve_reference(&self) -> Result<Vc<ModuleResolveResult>> {
self.resolve().await
}
fn chunking_type(&self) -> Option<ChunkingType> { fn chunking_type(&self) -> Option<ChunkingType> {
Some(ChunkingType::Parallel { Some(ChunkingType::Parallel {
...@@ -155,7 +137,7 @@ impl ModuleHotReferenceCodeGen { ...@@ -155,7 +137,7 @@ impl ModuleHotReferenceCodeGen {
.iter() .iter()
.map(|reference| async move { .map(|reference| async move {
let r = reference.await?; let r = reference.await?;
let resolve_result = r.resolve().await?; let resolve_result = reference.resolve_reference();
PatternMapping::resolve_request( PatternMapping::resolve_request(
*r.request, *r.request,
*r.origin, *r.origin,
......
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