Unverified Commit a57e4e80 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: remove Asset supertrait from Module trait. Modules don't have content (#86416)

Reverts vercel/next.js#86415
parent c26b4a68
......@@ -6,7 +6,7 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{IntoTraitRef, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{File, FileContent};
use turbopack_core::{
asset::{Asset, AssetContent},
asset::AssetContent,
chunk::{
AsyncModuleInfo, ChunkGroupType, ChunkItem, ChunkType, ChunkableModule,
ChunkableModuleReference, ChunkingContext, ChunkingType, ChunkingTypeOption,
......@@ -249,18 +249,6 @@ impl Module for EcmascriptClientReferenceModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for EcmascriptClientReferenceModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
AssetContent::File(
FileContent::Content("// This is a proxy module for Next.js client references.".into())
.resolved_cell(),
)
.cell()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for EcmascriptClientReferenceModule {
#[turbo_tasks::function]
......
......@@ -4,9 +4,7 @@ use anyhow::Result;
use indoc::formatdoc;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileContent;
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -78,18 +76,6 @@ impl Module for NextDynamicEntryModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for NextDynamicEntryModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
AssetContent::File(
FileContent::Content("// This is a marker module for Next.js dynamic.".into())
.resolved_cell(),
)
.cell()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for NextDynamicEntryModule {
#[turbo_tasks::function]
......
......@@ -4,9 +4,8 @@ use anyhow::Result;
use indoc::formatdoc;
use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -94,20 +93,6 @@ impl Module for NextServerComponentModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for NextServerComponentModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
AssetContent::File(
FileContent::Content(
"// This is a marker module for Next.js server components.".into(),
)
.resolved_cell(),
)
.cell()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for NextServerComponentModule {
#[turbo_tasks::function]
......
......@@ -4,9 +4,8 @@ use anyhow::Result;
use indoc::formatdoc;
use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -75,18 +74,6 @@ impl Module for NextServerUtilityModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for NextServerUtilityModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
AssetContent::File(
FileContent::Content("// This is a marker module for Next.js server utilities.".into())
.resolved_cell(),
)
.cell()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for NextServerUtilityModule {
#[turbo_tasks::function]
......
......@@ -68,10 +68,11 @@ pub async fn get_swc_ecma_transform_rule_impl(
enable_mdx_rs: bool,
) -> Result<Option<ModuleRule>> {
use anyhow::bail;
use turbo_tasks::TryFlatJoinIterExt;
use turbo_tasks::{TryFlatJoinIterExt, ValueToString};
use turbo_tasks_fs::FileContent;
use turbopack_core::{
asset::Asset,
module::Module,
reference_type::{CommonJsReferenceSubType, ReferenceType},
resolve::{handle_resolve_error, parse::Request, resolve},
};
......@@ -133,7 +134,16 @@ pub async fn get_swc_ecma_transform_rule_impl(
return Ok(None);
};
let content = &*plugin_module.content().file_content().await?;
let Some(plugin_source) = &*plugin_module.source().await? else {
use anyhow::bail;
bail!(
"Expected source for plugin module: {}",
plugin_module.ident().to_string().await?
);
};
let content = &*plugin_source.content().file_content().await?;
let FileContent::Content(file) = content else {
bail!("Expected file content for plugin module");
};
......
......@@ -9,7 +9,7 @@ use turbo_tasks::{FxIndexMap, FxIndexSet, ResolvedVc, TryJoinIterExt, ValueToStr
use turbo_tasks_fs::{FileContent, rope::Rope};
use turbopack::{ModuleAssetContext, module_options::CustomModuleType};
use turbopack_core::{
asset::{Asset, AssetContent},
asset::Asset,
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext},
code_builder::CodeBuilder,
compile_time_info::{
......@@ -103,14 +103,6 @@ impl Module for RawEcmascriptModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for RawEcmascriptModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for RawEcmascriptModule {
#[turbo_tasks::function]
......
module.exports = {
// importing externals should work fine
import 'fs'
import 'path'
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
......
// importing externals should work fine
require('fs')
require('path')
// If you want to use other PostCSS plugins, see the following:
// https://tailwindcss.com/docs/using-with-preprocessors
module.exports = {
......
......@@ -23,7 +23,7 @@ pub async fn get_referenced_modules(
/// Returns a completion that changes when any content of any asset in the whole
/// asset graph changes.
#[turbo_tasks::function]
pub async fn any_content_changed_of_module(
pub async fn any_source_content_changed_of_module(
root: ResolvedVc<Box<dyn Module>>,
) -> Result<Vc<Completion>> {
let completions = AdjacencyMap::new()
......@@ -31,7 +31,7 @@ pub async fn any_content_changed_of_module(
.await
.completed()?
.into_postorder_topological()
.map(|m| content_changed(*ResolvedVc::upcast(m)))
.map(|m| source_changed(*m))
.map(|v| v.to_resolved())
.try_join()
.await?;
......@@ -65,3 +65,14 @@ pub async fn content_changed(asset: Vc<Box<dyn Asset>>) -> Result<Vc<Completion>
asset.content().file_content().await?;
Ok(Completion::new())
}
/// Returns a completion that changes when the content of the given asset
/// changes.
#[turbo_tasks::function]
pub async fn source_changed(asset: Vc<Box<dyn Module>>) -> Result<Vc<Completion>> {
if let Some(source) = *asset.source().await? {
// Reading the file content is enough to add as dependency
source.content().file_content().await?;
}
Ok(Completion::new())
}
......@@ -3,7 +3,6 @@ use turbo_tasks::{ResolvedVc, Upcast, ValueToString, Vc};
use super::ChunkableModule;
use crate::{
asset::Asset,
context::AssetContext,
module::Module,
reference_type::{EntryReferenceSubType, ReferenceType},
......@@ -15,7 +14,7 @@ use crate::{
/// The chunking context implementation will resolve the dynamic entry to a
/// well-known value or trait object.
#[turbo_tasks::value_trait]
pub trait EvaluatableAsset: Asset + Module + ChunkableModule {}
pub trait EvaluatableAsset: Module + ChunkableModule {}
pub trait EvaluatableAssetExt {
fn to_evaluatable(
......
......@@ -89,7 +89,7 @@ pub struct ModuleIds(Vec<ModuleId>);
/// A [Module] that can be converted into a [Chunk].
#[turbo_tasks::value_trait]
pub trait ChunkableModule: Module + Asset {
pub trait ChunkableModule: Module {
#[turbo_tasks::function]
fn as_chunk_item(
self: Vc<Self>,
......@@ -114,7 +114,7 @@ impl ChunkableModules {
// with other module types (as a MergeableModule cannot prevent itself from being merged with other
// module types)
#[turbo_tasks::value_trait]
pub trait MergeableModule: Module + Asset {
pub trait MergeableModule: Module {
/// Even though MergeableModule is implemented, this allows a dynamic condition to determine
/// mergeability
#[turbo_tasks::function]
......
......@@ -33,8 +33,12 @@ impl Introspectable for IntrospectableModule {
}
#[turbo_tasks::function]
fn details(&self) -> Vc<RcStr> {
content_to_details(self.0.content())
async fn details(&self) -> Result<Vc<RcStr>> {
if let Some(source) = *self.0.source().await? {
Ok(content_to_details(source.content()))
} else {
Ok(Vc::cell("No source".into()))
}
}
#[turbo_tasks::function]
......
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, TaskInput, ValueToString, Vc};
use crate::{asset::Asset, ident::AssetIdent, reference::ModuleReferences, source::OptionSource};
use crate::{ident::AssetIdent, reference::ModuleReferences, source::OptionSource};
#[derive(Clone, Copy, Debug, TaskInput, Hash)]
#[turbo_tasks::value(shared)]
......@@ -28,7 +28,7 @@ pub enum ModuleSideEffects {
/// A module. This usually represents parsed source code, which has references
/// to other modules.
#[turbo_tasks::value_trait]
pub trait Module: Asset {
pub trait Module {
/// The identifier of the [Module]. It's expected to be unique and capture
/// all properties of the [Module].
#[turbo_tasks::function]
......@@ -64,7 +64,7 @@ pub trait Module: Asset {
}
#[turbo_tasks::value_trait]
pub trait StyleModule: Module + Asset {
pub trait StyleModule: Module {
/// The style type of the module.
#[turbo_tasks::function]
fn style_type(&self) -> Vc<StyleType>;
......
......@@ -7,7 +7,6 @@ use turbo_tasks::{FxIndexSet, ResolvedVc, TryJoinIterExt, Vc};
use turbo_tasks_fs::{FileSystemEntryType, FileSystemPath};
use crate::{
asset::{Asset, AssetContent},
file_source::FileSource,
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -108,14 +107,6 @@ impl Module for NodeAddonModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for NodeAddonModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::function]
async fn dir_references(package_dir: FileSystemPath) -> Result<Vc<ModuleReferences>> {
let matches = read_matches(
......
use turbo_tasks::{ResolvedVc, Vc};
use crate::{
asset::{Asset, AssetContent},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
source::{OptionSource, Source},
......@@ -31,14 +30,6 @@ impl Module for RawModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for RawModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl RawModule {
#[turbo_tasks::function]
......
use std::hash::Hash;
use anyhow::Result;
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use anyhow::{Result, bail};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath;
use crate::{
......@@ -74,7 +74,14 @@ impl OutputAsset for RebasedAsset {
#[turbo_tasks::value_impl]
impl Asset for RebasedAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.module.content()
async fn content(&self) -> Result<Vc<AssetContent>> {
if let Some(source) = *self.module.source().await? {
Ok(source.content())
} else {
bail!(
"Module {} has no source",
self.module.ident().to_string().await?
)
}
}
}
use anyhow::Result;
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use anyhow::{Result, bail};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath;
use crate::{
......@@ -54,7 +54,14 @@ impl OutputAsset for TracedAsset {
#[turbo_tasks::value_impl]
impl Asset for TracedAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.module.content()
async fn content(&self) -> Result<Vc<AssetContent>> {
if let Some(source) = *self.module.source().await? {
Ok(source.content())
} else {
bail!(
"Module {} has no source",
self.module.ident().to_string().await?,
)
}
}
}
......@@ -3,7 +3,6 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::{FileContent, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, MinifyType},
context::AssetContext,
environment::Environment,
......@@ -171,14 +170,6 @@ impl StyleModule for CssModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for CssModuleAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for CssModuleAsset {
#[turbo_tasks::function]
......
......@@ -441,7 +441,7 @@ impl GenerateSourceMap for CssChunk {
// TODO: remove
#[turbo_tasks::value_trait]
pub trait CssChunkPlaceable: ChunkableModule + Module + Asset {}
pub trait CssChunkPlaceable: ChunkableModule + Module {}
#[derive(Clone, Debug)]
#[turbo_tasks::value(shared)]
......
use turbo_tasks::Vc;
use turbopack_core::{asset::Asset, chunk::ChunkingContext, module::Module, output::OutputAsset};
use turbopack_core::{chunk::ChunkingContext, module::Module, output::OutputAsset};
#[turbo_tasks::value_trait]
pub trait CssEmbed: Module + Asset {
pub trait CssEmbed: Module {
#[turbo_tasks::function]
fn embedded_asset(
self: Vc<Self>,
......
......@@ -8,7 +8,6 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{FxIndexMap, IntoTraitRef, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{FileSystemPath, rope::Rope};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext, ModuleChunkItemIdExt},
context::{AssetContext, ProcessResult},
ident::AssetIdent,
......@@ -120,14 +119,6 @@ impl Module for ModuleCssAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for ModuleCssAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
/// A CSS class that is exported from a CSS module.
///
/// See [`ModuleCssClasses`] for more information.
......
......@@ -2,7 +2,6 @@ use anyhow::Result;
use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkableModule, ChunkingContext, availability_info::AvailabilityInfo},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -72,14 +71,6 @@ impl Module for AsyncLoaderModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for AsyncLoaderModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
panic!("content() should not be called");
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for AsyncLoaderModule {
#[turbo_tasks::function]
......
......@@ -26,7 +26,7 @@ use crate::references::{
};
#[turbo_tasks::value_trait]
pub trait EcmascriptChunkPlaceable: ChunkableModule + Module + Asset {
pub trait EcmascriptChunkPlaceable: ChunkableModule + Module {
#[turbo_tasks::function]
fn get_exports(self: Vc<Self>) -> Vc<EcmascriptExports>;
#[turbo_tasks::function]
......
......@@ -5,7 +5,7 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{FileContent, rope::RopeBuilder};
use turbopack_core::{
asset::{Asset, AssetContent},
asset::Asset,
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -56,14 +56,6 @@ impl Module for InlinedBytesJsModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for InlinedBytesJsModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for InlinedBytesJsModule {
#[turbo_tasks::function]
......@@ -125,7 +117,7 @@ impl ChunkItem for InlinedBytesJsChunkItem {
impl EcmascriptChunkItem for InlinedBytesJsChunkItem {
#[turbo_tasks::function]
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
let content = self.module.content().file_content().await?;
let content = self.module.await?.source.content().file_content().await?;
match &*content {
FileContent::Content(data) => {
let mut inner_code = RopeBuilder::default();
......
......@@ -80,7 +80,6 @@ use turbo_tasks::{
};
use turbo_tasks_fs::{FileJsonContent, FileSystemPath, glob::Glob, rope::Rope};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
AsyncModuleInfo, ChunkItem, ChunkType, ChunkableModule, ChunkingContext, EvaluatableAsset,
MergeableModule, MergeableModuleExposure, MergeableModules, MergeableModulesExposed,
......@@ -403,7 +402,7 @@ pub trait EcmascriptParsable {
}
#[turbo_tasks::value_trait]
pub trait EcmascriptAnalyzable: Module + Asset {
pub trait EcmascriptAnalyzable: Module {
#[turbo_tasks::function]
fn analyze(self: Vc<Self>) -> Vc<AnalyzeEcmascriptModuleResult>;
......@@ -780,14 +779,6 @@ impl Module for EcmascriptModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for EcmascriptModuleAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for EcmascriptModuleAsset {
#[turbo_tasks::function]
......
......@@ -2,7 +2,6 @@ use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
ChunkableModule, ChunkingContext, ChunkingContextExt, availability_info::AvailabilityInfo,
},
......@@ -158,14 +157,6 @@ impl Module for ManifestAsyncModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for ManifestAsyncModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
panic!("content() should not be called");
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for ManifestAsyncModule {
#[turbo_tasks::function]
......
use anyhow::{Context, Result};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
AsyncModuleInfo, ChunkItem, ChunkType, ChunkableModule, ChunkingContext,
MergeableModuleExposure, MergeableModules, MergeableModulesExposed,
......@@ -60,14 +59,6 @@ impl MergedEcmascriptModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for MergedEcmascriptModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
panic!("content() should not be called");
}
}
#[turbo_tasks::value_impl]
impl Module for MergedEcmascriptModule {
#[turbo_tasks::function]
......
......@@ -4,9 +4,7 @@ use anyhow::{Context, Result};
use bincode::{Decode, Encode};
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, TryJoinIterExt, Vc, trace::TraceRawVcs};
use turbo_tasks_fs::{
FileContent, FileSystem, FileSystemPath, LinkType, VirtualFileSystem, rope::RopeBuilder,
};
use turbo_tasks_fs::{FileSystem, FileSystemPath, LinkType, VirtualFileSystem, rope::RopeBuilder};
use turbo_tasks_hash::{encode_hex, hash_xxh3_hash64};
use turbopack_core::{
asset::{Asset, AssetContent},
......@@ -332,7 +330,8 @@ impl Module for CachedExternalModule {
// graph for chunking. `compute_async_module_info` computes
// `is_self_async` for every module, but at least for traced modules,
// that value is never used as `ChunkingType::Traced.is_inherit_async()
// == false`. Optimize this case by using `ModuleWithoutSelfAsync` to
// == false`. Optimize this case by using
// `SideEffectfulModuleWithoutSelfAsync` to
// short circuit that computation and thus defer parsing traced modules
// to emitting to not block all of chunking on this.
.map(|m| Vc::upcast(SideEffectfulModuleWithoutSelfAsync::new(*m))),
......@@ -362,15 +361,6 @@ impl Module for CachedExternalModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for CachedExternalModule {
#[turbo_tasks::function]
fn content(self: Vc<Self>) -> Vc<AssetContent> {
// should be `NotFound` as this function gets called to detect source changes
AssetContent::file(FileContent::NotFound.cell())
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for CachedExternalModule {
#[turbo_tasks::function]
......@@ -518,14 +508,6 @@ impl SideEffectfulModuleWithoutSelfAsync {
}
}
#[turbo_tasks::value_impl]
impl Asset for SideEffectfulModuleWithoutSelfAsync {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.module.content()
}
}
#[turbo_tasks::value_impl]
impl Module for SideEffectfulModuleWithoutSelfAsync {
#[turbo_tasks::function]
......@@ -535,7 +517,7 @@ impl Module for SideEffectfulModuleWithoutSelfAsync {
#[turbo_tasks::function]
fn source(&self) -> Vc<turbopack_core::source::OptionSource> {
Vc::cell(None)
self.module.source()
}
#[turbo_tasks::function]
......
......@@ -21,7 +21,6 @@ use turbo_tasks::{
};
use turbo_tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemPath};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
ChunkItem, ChunkType, ChunkableModule, ChunkableModuleReference, ChunkingContext,
MinifyType, ModuleChunkItemIdExt,
......@@ -439,14 +438,6 @@ impl Module for RequireContextAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for RequireContextAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
unimplemented!()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for RequireContextAsset {
#[turbo_tasks::function]
......
......@@ -2,9 +2,7 @@ use std::collections::BTreeMap;
use anyhow::{Result, bail};
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::{File, FileContent};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
AsyncModuleInfo, ChunkableModule, ChunkingContext, EvaluatableAsset, MergeableModule,
MergeableModules, MergeableModulesExposed,
......@@ -193,16 +191,6 @@ impl Module for EcmascriptModuleFacadeModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for EcmascriptModuleFacadeModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
let f = File::from("");
AssetContent::file(FileContent::Content(f).cell())
}
}
#[turbo_tasks::value_impl]
impl EcmascriptAnalyzable for EcmascriptModuleFacadeModule {
#[turbo_tasks::function]
......
......@@ -3,7 +3,6 @@ use std::collections::BTreeMap;
use anyhow::{Result, bail};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
AsyncModuleInfo, ChunkableModule, ChunkingContext, MergeableModule, MergeableModules,
MergeableModulesExposed,
......@@ -77,14 +76,6 @@ impl Module for EcmascriptModuleLocalsModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for EcmascriptModuleLocalsModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.module.content()
}
}
#[turbo_tasks::value_impl]
impl EcmascriptAnalyzable for EcmascriptModuleLocalsModule {
#[turbo_tasks::function]
......
......@@ -2,7 +2,6 @@ use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, EvaluatableAsset},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -345,14 +344,6 @@ impl Module for EcmascriptModulePartAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for EcmascriptModulePartAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.full_module.content()
}
}
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for EcmascriptModulePartAsset {
#[turbo_tasks::function]
......
use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, Vc};
use turbo_tasks_fs::FileContent;
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkableModule, ChunkingContext, EvaluatableAsset},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -122,21 +120,6 @@ impl Module for SideEffectsModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for SideEffectsModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
AssetContent::File(
FileContent::Content(
"// This is a proxy module for reexportings a module with additional side effects."
.into(),
)
.resolved_cell(),
)
.cell()
}
}
#[turbo_tasks::value_impl]
impl EcmascriptChunkPlaceable for SideEffectsModule {
#[turbo_tasks::function]
......
......@@ -4,7 +4,7 @@ use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::DirectoryContent;
use turbopack_core::{
asset::{Asset, AssetContent},
asset::Asset,
ident::AssetIdent,
module::{Module, ModuleSideEffects},
raw_module::RawModule,
......@@ -180,14 +180,6 @@ impl Module for TsConfigModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for TsConfigModuleAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value]
#[derive(Hash, Debug)]
pub struct CompilerReference {
......
......@@ -3,7 +3,6 @@ use swc_core::ecma::ast::Lit;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
file_source::FileSource,
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -69,14 +68,6 @@ impl Module for WebpackModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for WebpackModuleAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value(shared)]
pub struct WebpackChunkAssetReference {
#[turbo_tasks(trace_ignore)]
......
......@@ -2,7 +2,6 @@ use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
ChunkGroupType, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType,
ChunkingTypeOption,
......@@ -75,14 +74,6 @@ impl Module for WorkerLoaderModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for WorkerLoaderModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
panic!("content() should not be called");
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for WorkerLoaderModule {
#[turbo_tasks::function]
......
......@@ -16,7 +16,7 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{FileContent, FileJsonContent};
use turbopack_core::{
asset::{Asset, AssetContent},
asset::Asset,
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext},
code_builder::CodeBuilder,
ident::AssetIdent,
......@@ -64,14 +64,6 @@ impl Module for JsonModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for JsonModuleAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for JsonModuleAsset {
#[turbo_tasks::function]
......@@ -135,7 +127,7 @@ impl EcmascriptChunkItem for JsonChunkItem {
async fn content(&self) -> Result<Vc<EcmascriptChunkItemContent>> {
// We parse to JSON and then stringify again to ensure that the
// JSON is valid.
let content = self.module.content().file_content();
let content = self.module.await?.source.content().file_content();
let data = content.parse_json().await?;
match &*data {
FileJsonContent::Content(data) => {
......
......@@ -12,7 +12,7 @@ use turbo_tasks_fs::{
};
use turbopack_core::{
asset::{Asset, AssetContent},
changed::any_content_changed_of_module,
changed::any_source_content_changed_of_module,
context::{AssetContext, ProcessResult},
file_source::FileSource,
ident::AssetIdent,
......@@ -195,7 +195,7 @@ async fn config_changed(
.module();
Ok(Vc::<Completions>::cell(vec![
any_content_changed_of_module(config_asset)
any_source_content_changed_of_module(config_asset)
.to_resolved()
.await?,
extra_configs_changed(asset_context, postcss_config_path)
......@@ -231,9 +231,11 @@ async fn extra_configs_changed(
.try_into_module()
.await?
{
Some(module) => {
Some(any_content_changed_of_module(*module).to_resolved().await?)
}
Some(module) => Some(
any_source_content_changed_of_module(*module)
.to_resolved()
.await?,
),
None => None,
}
} else {
......
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::ChunkingContext,
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -57,14 +56,6 @@ impl Module for StaticUrlCssModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for StaticUrlCssModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl CssEmbed for StaticUrlCssModule {
#[turbo_tasks::function]
......
......@@ -2,7 +2,6 @@ use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{AssetSuffix, ChunkItem, ChunkType, ChunkableModule, ChunkingContext},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
......@@ -69,14 +68,6 @@ impl Module for StaticUrlJsModule {
}
}
#[turbo_tasks::value_impl]
impl Asset for StaticUrlJsModule {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for StaticUrlJsModule {
#[turbo_tasks::function]
......
......@@ -3,7 +3,6 @@ use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, Vc, fxindexmap};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{
AsyncModuleInfo, ChunkItem, ChunkType, ChunkableModule, ChunkingContext,
chunk_group::references_to_output_assets,
......@@ -153,14 +152,6 @@ impl Module for WebAssemblyModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for WebAssemblyModuleAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for WebAssemblyModuleAsset {
#[turbo_tasks::function]
......
......@@ -2,7 +2,6 @@ use anyhow::{Result, bail};
use turbo_rcstr::rcstr;
use turbo_tasks::{IntoTraitRef, ResolvedVc, Vc};
use turbopack_core::{
asset::{Asset, AssetContent},
chunk::{ChunkItem, ChunkType, ChunkableModule, ChunkingContext},
context::AssetContext,
ident::AssetIdent,
......@@ -72,14 +71,6 @@ impl Module for RawWebAssemblyModuleAsset {
}
}
#[turbo_tasks::value_impl]
impl Asset for RawWebAssemblyModuleAsset {
#[turbo_tasks::function]
fn content(&self) -> Vc<AssetContent> {
self.source.content()
}
}
#[turbo_tasks::value_impl]
impl ChunkableModule for RawWebAssemblyModuleAsset {
#[turbo_tasks::function]
......
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