Unverified Commit 9bd38dd1 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

codemod(turbopack): Rewrite more Vc fields in structs as ResolvedVc (#71172)

**This is a** *(mostly)* **machine-generated PR.**

This uses a much updated version of the ast-grep based codemod script from #70927, which can now match a bunch more patterns.

Codemod scripts: https://github.com/vercel/turbopack-resolved-vc-codemod/tree/90518e64cfaf9328546ff4688692f16f54d4fc3e

I did a small bit of cleanup after running the script with:

```bash
sg -U --pattern '$OBJ.resolve().await?.to_resolved().await?' -r '$OBJ.to_resolved().await?'
```

Notable additions since last time are:
- Runs the compiler/fixer in a loop a few times, as fixing an issue often allows compilation to get further, creating new errors.
- Can apply compiler-suggested edits (usually these are manual derefs needed with `*`)
- Knows how to rewrite `$OBJ.cell()` to `$OBJ.resolved_cell()`
- Knows how to rewrite `Vc::cell($ARG)` to `ResolvedVc::cell($ARG)`
- Knows how to rewrite `$TYPE::cell($ARG)` to `$TYPE::resolved_cell($ARG)`.
- Knows how to add `.to_resolved().await?` to expressions.
parent cfd816dd
...@@ -11,7 +11,7 @@ use tracing::{Instrument, Level}; ...@@ -11,7 +11,7 @@ use tracing::{Instrument, Level};
use turbo_tasks::{ use turbo_tasks::{
graph::{GraphTraversal, NonDeterministic, VisitControlFlow, VisitedNodes}, graph::{GraphTraversal, NonDeterministic, VisitControlFlow, VisitedNodes},
trace::TraceRawVcs, trace::TraceRawVcs,
FxIndexMap, RcStr, ReadRef, TryJoinIterExt, Value, ValueToString, Vc, FxIndexMap, RcStr, ReadRef, ResolvedVc, TryJoinIterExt, Value, ValueToString, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
...@@ -162,7 +162,7 @@ pub(crate) async fn collect_next_dynamic_imports( ...@@ -162,7 +162,7 @@ pub(crate) async fn collect_next_dynamic_imports(
.iter() .iter()
.map(|module| async move { .map(|module| async move {
Ok(NextDynamicVisitEntry::Module( Ok(NextDynamicVisitEntry::Module(
module.resolve().await?, module.to_resolved().await?,
module.ident().to_string().await?, module.ident().to_string().await?,
)) ))
}) })
...@@ -209,8 +209,8 @@ pub(crate) async fn collect_next_dynamic_imports( ...@@ -209,8 +209,8 @@ pub(crate) async fn collect_next_dynamic_imports(
#[derive(Debug, PartialEq, Eq, Hash, Clone, TraceRawVcs, Serialize, Deserialize)] #[derive(Debug, PartialEq, Eq, Hash, Clone, TraceRawVcs, Serialize, Deserialize)]
enum NextDynamicVisitEntry { enum NextDynamicVisitEntry {
Module(Vc<Box<dyn Module>>, ReadRef<RcStr>), Module(ResolvedVc<Box<dyn Module>>, ReadRef<RcStr>),
DynamicImportsMap(Vc<DynamicImportsMap>), DynamicImportsMap(ResolvedVc<DynamicImportsMap>),
} }
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
...@@ -227,7 +227,7 @@ async fn get_next_dynamic_edges( ...@@ -227,7 +227,7 @@ async fn get_next_dynamic_edges(
.iter() .iter()
.map(|&referenced_module| async move { .map(|&referenced_module| async move {
Ok(NextDynamicVisitEntry::Module( Ok(NextDynamicVisitEntry::Module(
referenced_module, referenced_module.to_resolved().await?,
referenced_module.ident().to_string().await?, referenced_module.ident().to_string().await?,
)) ))
}) })
...@@ -236,7 +236,7 @@ async fn get_next_dynamic_edges( ...@@ -236,7 +236,7 @@ async fn get_next_dynamic_edges(
if let Some(dynamic_imports_map) = *dynamic_imports_map.await? { if let Some(dynamic_imports_map) = *dynamic_imports_map.await? {
edges.reserve_exact(1); edges.reserve_exact(1);
edges.push(NextDynamicVisitEntry::DynamicImportsMap( edges.push(NextDynamicVisitEntry::DynamicImportsMap(
dynamic_imports_map, dynamic_imports_map.to_resolved().await?,
)); ));
} }
Ok(Vc::cell(edges)) Ok(Vc::cell(edges))
...@@ -264,7 +264,7 @@ impl turbo_tasks::graph::Visit<NextDynamicVisitEntry> for NextDynamicVisit { ...@@ -264,7 +264,7 @@ impl turbo_tasks::graph::Visit<NextDynamicVisitEntry> for NextDynamicVisit {
}; };
let client_asset_context = self.client_asset_context; let client_asset_context = self.client_asset_context;
async move { async move {
Ok(get_next_dynamic_edges(client_asset_context, module) Ok(get_next_dynamic_edges(client_asset_context, *module)
.await? .await?
.into_iter() .into_iter()
.cloned()) .cloned())
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, TryJoinIterExt, ValueToString, Vc}; use turbo_tasks::{RcStr, ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::glob::Glob; use turbo_tasks_fs::glob::Glob;
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
...@@ -19,13 +19,13 @@ use turbopack_ecmascript::chunk::{ ...@@ -19,13 +19,13 @@ use turbopack_ecmascript::chunk::{
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct IncludeModulesModule { pub struct IncludeModulesModule {
ident: Vc<AssetIdent>, ident: Vc<AssetIdent>,
modules: Vec<Vc<Box<dyn Module>>>, modules: Vec<ResolvedVc<Box<dyn Module>>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl IncludeModulesModule { impl IncludeModulesModule {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new(ident: Vc<AssetIdent>, modules: Vec<Vc<Box<dyn Module>>>) -> Vc<Self> { pub fn new(ident: Vc<AssetIdent>, modules: Vec<ResolvedVc<Box<dyn Module>>>) -> Vc<Self> {
Self { ident, modules }.cell() Self { ident, modules }.cell()
} }
} }
...@@ -50,7 +50,7 @@ impl Module for IncludeModulesModule { ...@@ -50,7 +50,7 @@ impl Module for IncludeModulesModule {
.iter() .iter()
.map(|&module| async move { .map(|&module| async move {
Ok(Vc::upcast( Ok(Vc::upcast(
IncludedModuleReference::new(module).resolve().await?, IncludedModuleReference::new(*module).resolve().await?,
)) ))
}) })
.try_join() .try_join()
......
use std::iter::once; use std::iter::once;
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, RcStr, Value, Vc}; use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Value, Vc};
use turbo_tasks_env::EnvMap; use turbo_tasks_env::EnvMap;
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack::{ use turbopack::{
...@@ -193,8 +193,8 @@ fn internal_assets_conditions() -> ContextCondition { ...@@ -193,8 +193,8 @@ fn internal_assets_conditions() -> ContextCondition {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn get_client_module_options_context( pub async fn get_client_module_options_context(
project_path: Vc<FileSystemPath>, project_path: Vc<FileSystemPath>,
execution_context: Vc<ExecutionContext>, execution_context: ResolvedVc<ExecutionContext>,
env: Vc<Environment>, env: ResolvedVc<Environment>,
ty: Value<ClientContextType>, ty: Value<ClientContextType>,
mode: Vc<NextMode>, mode: Vc<NextMode>,
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
...@@ -202,7 +202,7 @@ pub async fn get_client_module_options_context( ...@@ -202,7 +202,7 @@ pub async fn get_client_module_options_context(
let next_mode = mode.await?; let next_mode = mode.await?;
let resolve_options_context = let resolve_options_context =
get_client_resolve_options_context(project_path, ty, mode, next_config, execution_context); get_client_resolve_options_context(project_path, ty, mode, next_config, *execution_context);
let tsconfig = get_typescript_transform_options(project_path); let tsconfig = get_typescript_transform_options(project_path);
let decorators_options = get_decorators_transform_options(project_path); let decorators_options = get_decorators_transform_options(project_path);
...@@ -312,7 +312,7 @@ pub async fn get_client_module_options_context( ...@@ -312,7 +312,7 @@ pub async fn get_client_module_options_context(
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
enable_jsx: Some(jsx_runtime_options), enable_jsx: Some(jsx_runtime_options),
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options), enable_decorators: Some(decorators_options.to_resolved().await?),
..module_options_context.ecmascript.clone() ..module_options_context.ecmascript.clone()
}, },
enable_webpack_loaders, enable_webpack_loaders,
...@@ -408,8 +408,10 @@ pub async fn get_client_runtime_entries( ...@@ -408,8 +408,10 @@ pub async fn get_client_runtime_entries(
// because the bootstrap contains JSX which requires Refresh's global // because the bootstrap contains JSX which requires Refresh's global
// functions to be available. // functions to be available.
if let Some(request) = enable_react_refresh { if let Some(request) = enable_react_refresh {
runtime_entries runtime_entries.push(
.push(RuntimeEntry::Request(request, project_root.join("_".into())).cell()) RuntimeEntry::Request(request.to_resolved().await?, project_root.join("_".into()))
.cell(),
)
}; };
} }
...@@ -418,7 +420,9 @@ pub async fn get_client_runtime_entries( ...@@ -418,7 +420,9 @@ pub async fn get_client_runtime_entries(
RuntimeEntry::Request( RuntimeEntry::Request(
Request::parse(Value::new(Pattern::Constant( Request::parse(Value::new(Pattern::Constant(
"next/dist/client/app-next-turbopack.js".into(), "next/dist/client/app-next-turbopack.js".into(),
))), )))
.to_resolved()
.await?,
project_root.join("_".into()), project_root.join("_".into()),
) )
.cell(), .cell(),
......
...@@ -12,8 +12,8 @@ use turbopack_ecmascript::resolve::cjs_resolve; ...@@ -12,8 +12,8 @@ use turbopack_ecmascript::resolve::cjs_resolve;
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub enum RuntimeEntry { pub enum RuntimeEntry {
Request(Vc<Request>, Vc<FileSystemPath>), Request(ResolvedVc<Request>, Vc<FileSystemPath>),
Evaluatable(Vc<Box<dyn EvaluatableAsset>>), Evaluatable(ResolvedVc<Box<dyn EvaluatableAsset>>),
Source(ResolvedVc<Box<dyn Source>>), Source(ResolvedVc<Box<dyn Source>>),
} }
...@@ -25,7 +25,7 @@ impl RuntimeEntry { ...@@ -25,7 +25,7 @@ impl RuntimeEntry {
asset_context: Vc<Box<dyn AssetContext>>, asset_context: Vc<Box<dyn AssetContext>>,
) -> Result<Vc<EvaluatableAssets>> { ) -> Result<Vc<EvaluatableAssets>> {
let (request, path) = match *self.await? { let (request, path) = match *self.await? {
RuntimeEntry::Evaluatable(e) => return Ok(EvaluatableAssets::one(e)), RuntimeEntry::Evaluatable(e) => return Ok(EvaluatableAssets::one(*e)),
RuntimeEntry::Source(source) => { RuntimeEntry::Source(source) => {
return Ok(EvaluatableAssets::one(source.to_evaluatable(asset_context))); return Ok(EvaluatableAssets::one(source.to_evaluatable(asset_context)));
} }
...@@ -34,7 +34,7 @@ impl RuntimeEntry { ...@@ -34,7 +34,7 @@ impl RuntimeEntry {
let modules = cjs_resolve( let modules = cjs_resolve(
Vc::upcast(PlainResolveOrigin::new(asset_context, path)), Vc::upcast(PlainResolveOrigin::new(asset_context, path)),
request, *request,
None, None,
false, false,
) )
......
...@@ -3,7 +3,7 @@ use std::collections::HashSet; ...@@ -3,7 +3,7 @@ use std::collections::HashSet;
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use serde::{Deserialize, Deserializer, Serialize}; use serde::{Deserialize, Deserializer, Serialize};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, RcStr, TaskInput, Vc}; use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, RcStr, ResolvedVc, TaskInput, Vc};
use turbo_tasks_env::EnvMap; use turbo_tasks_env::EnvMap;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::{ use turbopack::module_options::{
...@@ -481,7 +481,7 @@ pub enum ReactCompilerOptionsOrBoolean { ...@@ -481,7 +481,7 @@ pub enum ReactCompilerOptionsOrBoolean {
} }
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct OptionalReactCompilerOptions(Option<Vc<ReactCompilerOptions>>); pub struct OptionalReactCompilerOptions(Option<ResolvedVc<ReactCompilerOptions>>);
#[turbo_tasks::value(eq = "manual")] #[turbo_tasks::value(eq = "manual")]
#[derive(Clone, Debug, Default, PartialEq)] #[derive(Clone, Debug, Default, PartialEq)]
...@@ -1080,11 +1080,11 @@ impl NextConfig { ...@@ -1080,11 +1080,11 @@ impl NextConfig {
compilation_mode: None, compilation_mode: None,
panic_threshold: None, panic_threshold: None,
} }
.cell(), .resolved_cell(),
)) ))
} }
Some(ReactCompilerOptionsOrBoolean::Option(options)) => OptionalReactCompilerOptions( Some(ReactCompilerOptionsOrBoolean::Option(options)) => OptionalReactCompilerOptions(
Some(ReactCompilerOptions { ..options.clone() }.cell()), Some(ReactCompilerOptions { ..options.clone() }.resolved_cell()),
), ),
_ => OptionalReactCompilerOptions(None), _ => OptionalReactCompilerOptions(None),
}; };
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, RcStr, Value, Vc}; use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Value, Vc};
use turbo_tasks_env::EnvMap; use turbo_tasks_env::EnvMap;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::resolve_options_context::ResolveOptionsContext; use turbopack::resolve_options_context::ResolveOptionsContext;
...@@ -60,7 +60,7 @@ async fn next_edge_defines(define_env: Vc<EnvMap>) -> Result<Vc<CompileTimeDefin ...@@ -60,7 +60,7 @@ async fn next_edge_defines(define_env: Vc<EnvMap>) -> Result<Vc<CompileTimeDefin
/// See [here](https://github.com/vercel/next.js/blob/160bb99b06e9c049f88e25806fd995f07f4cc7e1/packages/next/src/build/webpack-config.ts#L1715-L1718) how webpack configures it. /// See [here](https://github.com/vercel/next.js/blob/160bb99b06e9c049f88e25806fd995f07f4cc7e1/packages/next/src/build/webpack-config.ts#L1715-L1718) how webpack configures it.
#[turbo_tasks::function] #[turbo_tasks::function]
async fn next_edge_free_vars( async fn next_edge_free_vars(
project_path: Vc<FileSystemPath>, project_path: ResolvedVc<FileSystemPath>,
define_env: Vc<EnvMap>, define_env: Vc<EnvMap>,
) -> Result<Vc<FreeVarReferences>> { ) -> Result<Vc<FreeVarReferences>> {
Ok(free_var_references!( Ok(free_var_references!(
......
use std::iter::once; use std::iter::once;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{FxIndexMap, RcStr, Value, Vc}; use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Value, Vc};
use turbo_tasks_env::{EnvMap, ProcessEnv}; use turbo_tasks_env::{EnvMap, ProcessEnv};
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack::{ use turbopack::{
...@@ -179,7 +179,7 @@ pub async fn get_server_resolve_options_context( ...@@ -179,7 +179,7 @@ pub async fn get_server_resolve_options_context(
let server_external_packages_plugin = ExternalCjsModulesResolvePlugin::new( let server_external_packages_plugin = ExternalCjsModulesResolvePlugin::new(
project_path, project_path,
project_path.root(), project_path.root(),
ExternalPredicate::Only(Vc::cell(external_packages)).cell(), ExternalPredicate::Only(ResolvedVc::cell(external_packages)).cell(),
*next_config.import_externals().await?, *next_config.import_externals().await?,
); );
...@@ -202,7 +202,7 @@ pub async fn get_server_resolve_options_context( ...@@ -202,7 +202,7 @@ pub async fn get_server_resolve_options_context(
ExternalCjsModulesResolvePlugin::new( ExternalCjsModulesResolvePlugin::new(
project_path, project_path,
project_path.root(), project_path.root(),
ExternalPredicate::AllExcept(Vc::cell(transpiled_packages)).cell(), ExternalPredicate::AllExcept(ResolvedVc::cell(transpiled_packages)).cell(),
*next_config.import_externals().await?, *next_config.import_externals().await?,
) )
}; };
...@@ -375,7 +375,7 @@ fn internal_assets_conditions() -> ContextCondition { ...@@ -375,7 +375,7 @@ fn internal_assets_conditions() -> ContextCondition {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn get_server_module_options_context( pub async fn get_server_module_options_context(
project_path: Vc<FileSystemPath>, project_path: Vc<FileSystemPath>,
execution_context: Vc<ExecutionContext>, execution_context: ResolvedVc<ExecutionContext>,
ty: Value<ServerContextType>, ty: Value<ServerContextType>,
mode: Vc<NextMode>, mode: Vc<NextMode>,
next_config: Vc<NextConfig>, next_config: Vc<NextConfig>,
...@@ -569,7 +569,7 @@ pub async fn get_server_module_options_context( ...@@ -569,7 +569,7 @@ pub async fn get_server_module_options_context(
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
enable_jsx: Some(jsx_runtime_options), enable_jsx: Some(jsx_runtime_options),
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options), enable_decorators: Some(decorators_options.to_resolved().await?),
..module_options_context.ecmascript ..module_options_context.ecmascript
}, },
enable_webpack_loaders, enable_webpack_loaders,
...@@ -632,7 +632,7 @@ pub async fn get_server_module_options_context( ...@@ -632,7 +632,7 @@ pub async fn get_server_module_options_context(
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
enable_jsx: Some(jsx_runtime_options), enable_jsx: Some(jsx_runtime_options),
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options), enable_decorators: Some(decorators_options.to_resolved().await?),
..module_options_context.ecmascript ..module_options_context.ecmascript
}, },
enable_webpack_loaders, enable_webpack_loaders,
...@@ -706,7 +706,7 @@ pub async fn get_server_module_options_context( ...@@ -706,7 +706,7 @@ pub async fn get_server_module_options_context(
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
enable_jsx: Some(rsc_jsx_runtime_options), enable_jsx: Some(rsc_jsx_runtime_options),
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options), enable_decorators: Some(decorators_options.to_resolved().await?),
..module_options_context.ecmascript ..module_options_context.ecmascript
}, },
enable_webpack_loaders, enable_webpack_loaders,
...@@ -779,7 +779,7 @@ pub async fn get_server_module_options_context( ...@@ -779,7 +779,7 @@ pub async fn get_server_module_options_context(
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
enable_jsx: Some(rsc_jsx_runtime_options), enable_jsx: Some(rsc_jsx_runtime_options),
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options), enable_decorators: Some(decorators_options.to_resolved().await?),
..module_options_context.ecmascript ..module_options_context.ecmascript
}, },
enable_webpack_loaders, enable_webpack_loaders,
...@@ -869,7 +869,7 @@ pub async fn get_server_module_options_context( ...@@ -869,7 +869,7 @@ pub async fn get_server_module_options_context(
ecmascript: EcmascriptOptionsContext { ecmascript: EcmascriptOptionsContext {
enable_jsx: Some(jsx_runtime_options), enable_jsx: Some(jsx_runtime_options),
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options), enable_decorators: Some(decorators_options.to_resolved().await?),
..module_options_context.ecmascript ..module_options_context.ecmascript
}, },
enable_webpack_loaders, enable_webpack_loaders,
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, RcStr, Value, Vc}; use turbo_tasks::{trace::TraceRawVcs, RcStr, ResolvedVc, Value, Vc};
use turbo_tasks_fs::{self, glob::Glob, FileJsonContent, FileSystemPath}; use turbo_tasks_fs::{self, glob::Glob, FileJsonContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString}, issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString},
...@@ -24,10 +24,10 @@ use turbopack_core::{ ...@@ -24,10 +24,10 @@ use turbopack_core::{
pub enum ExternalPredicate { pub enum ExternalPredicate {
/// Mark all modules as external if they're not listed in the list. /// Mark all modules as external if they're not listed in the list.
/// Applies only to imports outside of node_modules. /// Applies only to imports outside of node_modules.
AllExcept(Vc<Vec<RcStr>>), AllExcept(ResolvedVc<Vec<RcStr>>),
/// Only mark modules listed as external, whether inside node_modules or /// Only mark modules listed as external, whether inside node_modules or
/// not. /// not.
Only(Vc<Vec<RcStr>>), Only(ResolvedVc<Vec<RcStr>>),
} }
/// Mark modules as external, so they're resolved at runtime instead of bundled. /// Mark modules as external, so they're resolved at runtime instead of bundled.
...@@ -111,7 +111,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -111,7 +111,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
return Ok(ResolveResultOption::none()); return Ok(ResolveResultOption::none());
} }
let exception_glob = packages_glob(*exceptions).await?; let exception_glob = packages_glob(**exceptions).await?;
if let Some(PackagesGlobs { if let Some(PackagesGlobs {
path_glob, path_glob,
...@@ -127,7 +127,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -127,7 +127,7 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
false false
} }
ExternalPredicate::Only(externals) => { ExternalPredicate::Only(externals) => {
let external_glob = packages_glob(*externals).await?; let external_glob = packages_glob(**externals).await?;
if let Some(PackagesGlobs { if let Some(PackagesGlobs {
path_glob, path_glob,
......
...@@ -122,7 +122,7 @@ impl EcmascriptChunkPlaceable for NextServerComponentModule { ...@@ -122,7 +122,7 @@ impl EcmascriptChunkPlaceable for NextServerComponentModule {
exports, exports,
star_exports: vec![module_reference], star_exports: vec![module_reference],
} }
.cell(), .resolved_cell(),
) )
.cell() .cell()
} }
......
use anyhow::Result; use anyhow::Result;
use tracing::Instrument; use tracing::Instrument;
use turbo_tasks::{RcStr, ValueToString, Vc}; use turbo_tasks::{RcStr, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPath, FileSystemPathOption, DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPath, FileSystemPathOption,
}; };
...@@ -12,7 +12,7 @@ use crate::next_import_map::get_next_package; ...@@ -12,7 +12,7 @@ use crate::next_import_map::get_next_package;
pub struct PagesStructureItem { pub struct PagesStructureItem {
pub base_path: Vc<FileSystemPath>, pub base_path: Vc<FileSystemPath>,
pub extensions: Vc<Vec<RcStr>>, pub extensions: Vc<Vec<RcStr>>,
pub fallback_path: Option<Vc<FileSystemPath>>, pub fallback_path: Option<ResolvedVc<FileSystemPath>>,
/// Pathname of this item in the Next.js router. /// Pathname of this item in the Next.js router.
pub next_router_path: Vc<FileSystemPath>, pub next_router_path: Vc<FileSystemPath>,
...@@ -29,7 +29,7 @@ impl PagesStructureItem { ...@@ -29,7 +29,7 @@ impl PagesStructureItem {
fn new( fn new(
base_path: Vc<FileSystemPath>, base_path: Vc<FileSystemPath>,
extensions: Vc<Vec<RcStr>>, extensions: Vc<Vec<RcStr>>,
fallback_path: Option<Vc<FileSystemPath>>, fallback_path: Option<ResolvedVc<FileSystemPath>>,
next_router_path: Vc<FileSystemPath>, next_router_path: Vc<FileSystemPath>,
original_path: Vc<FileSystemPath>, original_path: Vc<FileSystemPath>,
) -> Vc<Self> { ) -> Vc<Self> {
...@@ -53,7 +53,7 @@ impl PagesStructureItem { ...@@ -53,7 +53,7 @@ impl PagesStructureItem {
} }
} }
if let Some(fallback_path) = self.fallback_path { if let Some(fallback_path) = self.fallback_path {
Ok(fallback_path) Ok(*fallback_path)
} else { } else {
Ok(self.base_path) Ok(self.base_path)
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#![feature(arbitrary_self_types_pointers)] #![feature(arbitrary_self_types_pointers)]
use anyhow::{anyhow, bail, Result}; use anyhow::{anyhow, bail, Result};
use turbo_tasks::{RcStr, Value, ValueToString, Vc}; use turbo_tasks::{RcStr, ResolvedVc, Value, ValueToString, Vc};
use turbo_tasks_testing::{register, run, Registration}; use turbo_tasks_testing::{register, run, Registration};
static REGISTRATION: Registration = register!(); static REGISTRATION: Registration = register!();
...@@ -22,7 +22,7 @@ async fn all_in_one() { ...@@ -22,7 +22,7 @@ async fn all_in_one() {
let c = MyStructValue { let c = MyStructValue {
value: 42, value: 42,
next: Some(MyStructValue::new(a)), next: Some(MyStructValue::new(a).to_resolved().await?),
} }
.into(); .into();
...@@ -101,7 +101,7 @@ impl ValueToString for MyEnumValue { ...@@ -101,7 +101,7 @@ impl ValueToString for MyEnumValue {
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
struct MyStructValue { struct MyStructValue {
value: u32, value: u32,
next: Option<Vc<MyStructValue>>, next: Option<ResolvedVc<MyStructValue>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
......
...@@ -47,7 +47,7 @@ async fn enum_none_debug() { ...@@ -47,7 +47,7 @@ async fn enum_none_debug() {
#[tokio::test] #[tokio::test]
async fn enum_transparent_debug() { async fn enum_transparent_debug() {
run(&REGISTRATION, || async { run(&REGISTRATION, || async {
let a: Vc<Enum> = Enum::Transparent(Transparent(42).resolved_cell()).cell(); let a: Vc<Enum> = Enum::Transparent(Transparent(42).cell()).cell();
assert_eq!( assert_eq!(
format!("{:?}", a.dbg().await?), format!("{:?}", a.dbg().await?),
r#"Enum :: Transparent( r#"Enum :: Transparent(
...@@ -63,7 +63,7 @@ async fn enum_transparent_debug() { ...@@ -63,7 +63,7 @@ async fn enum_transparent_debug() {
#[tokio::test] #[tokio::test]
async fn enum_inner_vc_debug() { async fn enum_inner_vc_debug() {
run(&REGISTRATION, || async { run(&REGISTRATION, || async {
let a: Vc<Enum> = Enum::Enum(Enum::None.resolved_cell()).cell(); let a: Vc<Enum> = Enum::Enum(Enum::None.cell()).cell();
assert_eq!( assert_eq!(
format!("{:?}", a.dbg().await?), format!("{:?}", a.dbg().await?),
r#"Enum :: Enum( r#"Enum :: Enum(
...@@ -163,8 +163,8 @@ struct Transparent(u32); ...@@ -163,8 +163,8 @@ struct Transparent(u32);
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
enum Enum { enum Enum {
None, None,
Transparent(ResolvedVc<Transparent>), Transparent(Vc<Transparent>),
Enum(ResolvedVc<Enum>), Enum(Vc<Enum>),
} }
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{Value, Vc}; use turbo_tasks::{ResolvedVc, Value, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString}, issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString},
...@@ -23,14 +23,14 @@ fn react_refresh_request_in_next() -> Vc<Request> { ...@@ -23,14 +23,14 @@ fn react_refresh_request_in_next() -> Vc<Request> {
#[turbo_tasks::value] #[turbo_tasks::value]
pub enum ResolveReactRefreshResult { pub enum ResolveReactRefreshResult {
NotFound, NotFound,
Found(Vc<Request>), Found(ResolvedVc<Request>),
} }
impl ResolveReactRefreshResult { impl ResolveReactRefreshResult {
pub fn as_request(&self) -> Option<Vc<Request>> { pub fn as_request(&self) -> Option<Vc<Request>> {
match self { match self {
ResolveReactRefreshResult::NotFound => None, ResolveReactRefreshResult::NotFound => None,
ResolveReactRefreshResult::Found(r) => Some(*r), ResolveReactRefreshResult::Found(r) => Some(**r),
} }
} }
pub fn is_found(&self) -> bool { pub fn is_found(&self) -> bool {
...@@ -62,7 +62,7 @@ pub async fn assert_can_resolve_react_refresh( ...@@ -62,7 +62,7 @@ pub async fn assert_can_resolve_react_refresh(
.first_source(); .first_source();
if result.await?.is_some() { if result.await?.is_some() {
return Ok(ResolveReactRefreshResult::Found(request).cell()); return Ok(ResolveReactRefreshResult::Found(request.to_resolved().await?).cell());
} }
} }
ReactRefreshResolvingIssue { path }.cell().emit(); ReactRefreshResolvingIssue { path }.cell().emit();
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{ValueToString, Vc}; use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets}, chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
...@@ -12,8 +12,8 @@ use turbopack_resolve::ecmascript::cjs_resolve; ...@@ -12,8 +12,8 @@ use turbopack_resolve::ecmascript::cjs_resolve;
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub enum RuntimeEntry { pub enum RuntimeEntry {
Request(Vc<Request>, Vc<FileSystemPath>), Request(ResolvedVc<Request>, ResolvedVc<FileSystemPath>),
Evaluatable(Vc<Box<dyn EvaluatableAsset>>), Evaluatable(ResolvedVc<Box<dyn EvaluatableAsset>>),
Source(Vc<Box<dyn Source>>), Source(Vc<Box<dyn Source>>),
} }
...@@ -25,7 +25,7 @@ impl RuntimeEntry { ...@@ -25,7 +25,7 @@ impl RuntimeEntry {
asset_context: Vc<Box<dyn AssetContext>>, asset_context: Vc<Box<dyn AssetContext>>,
) -> Result<Vc<EvaluatableAssets>> { ) -> Result<Vc<EvaluatableAssets>> {
let (request, path) = match *self.await? { let (request, path) = match *self.await? {
RuntimeEntry::Evaluatable(e) => return Ok(EvaluatableAssets::one(e)), RuntimeEntry::Evaluatable(e) => return Ok(EvaluatableAssets::one(*e)),
RuntimeEntry::Source(source) => { RuntimeEntry::Source(source) => {
return Ok(EvaluatableAssets::one(source.to_evaluatable(asset_context))); return Ok(EvaluatableAssets::one(source.to_evaluatable(asset_context)));
} }
...@@ -33,8 +33,8 @@ impl RuntimeEntry { ...@@ -33,8 +33,8 @@ impl RuntimeEntry {
}; };
let modules = cjs_resolve( let modules = cjs_resolve(
Vc::upcast(PlainResolveOrigin::new(asset_context, path)), Vc::upcast(PlainResolveOrigin::new(asset_context, *path)),
request, *request,
None, None,
false, false,
) )
......
use std::fmt; use std::fmt;
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, Value, Vc}; use turbo_tasks::{RcStr, ResolvedVc, Value, Vc};
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack::{ use turbopack::{
ecmascript::{EcmascriptInputTransform, TreeShakingMode}, ecmascript::{EcmascriptInputTransform, TreeShakingMode},
...@@ -98,8 +98,8 @@ pub async fn get_client_resolve_options_context( ...@@ -98,8 +98,8 @@ pub async fn get_client_resolve_options_context(
#[turbo_tasks::function] #[turbo_tasks::function]
async fn get_client_module_options_context( async fn get_client_module_options_context(
project_path: Vc<FileSystemPath>, project_path: Vc<FileSystemPath>,
execution_context: Vc<ExecutionContext>, execution_context: ResolvedVc<ExecutionContext>,
env: Vc<Environment>, env: ResolvedVc<Environment>,
node_env: Vc<NodeEnv>, node_env: Vc<NodeEnv>,
) -> Result<Vc<ModuleOptionsContext>> { ) -> Result<Vc<ModuleOptionsContext>> {
let module_options_context = ModuleOptionsContext { let module_options_context = ModuleOptionsContext {
......
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use turbo_tasks::{RcStr, TryJoinIterExt, Value, Vc}; use turbo_tasks::{RcStr, ResolvedVc, TryJoinIterExt, Value, Vc};
use turbo_tasks_env::ProcessEnv; use turbo_tasks_env::ProcessEnv;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_browser::{react_refresh::assert_can_resolve_react_refresh, BrowserChunkingContext}; use turbopack_browser::{react_refresh::assert_can_resolve_react_refresh, BrowserChunkingContext};
...@@ -52,21 +52,27 @@ pub fn get_client_chunking_context( ...@@ -52,21 +52,27 @@ pub fn get_client_chunking_context(
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn get_client_runtime_entries( pub async fn get_client_runtime_entries(
project_path: Vc<FileSystemPath>, project_path: ResolvedVc<FileSystemPath>,
) -> Result<Vc<RuntimeEntries>> { ) -> Result<Vc<RuntimeEntries>> {
let resolve_options_context = get_client_resolve_options_context(project_path); let resolve_options_context = get_client_resolve_options_context(*project_path);
let mut runtime_entries = Vec::new(); let mut runtime_entries = Vec::new();
let enable_react_refresh = let enable_react_refresh =
assert_can_resolve_react_refresh(project_path, resolve_options_context) assert_can_resolve_react_refresh(*project_path, resolve_options_context)
.await? .await?
.as_request(); .as_request();
// It's important that React Refresh come before the regular bootstrap file, // It's important that React Refresh come before the regular bootstrap file,
// because the bootstrap contains JSX which requires Refresh's global // because the bootstrap contains JSX which requires Refresh's global
// functions to be available. // functions to be available.
if let Some(request) = enable_react_refresh { if let Some(request) = enable_react_refresh {
runtime_entries.push(RuntimeEntry::Request(request, project_path.join("_".into())).cell()) runtime_entries.push(
RuntimeEntry::Request(
request.to_resolved().await?,
project_path.join("_".into()).to_resolved().await?,
)
.cell(),
)
}; };
runtime_entries.push( runtime_entries.push(
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexMap, TryFlatJoinIterExt, TryJoinIterExt, debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexMap, ResolvedVc, TryFlatJoinIterExt,
ValueToString, Vc, TryJoinIterExt, ValueToString, Vc,
}; };
use turbo_tasks_hash::Xxh3Hash64Hasher; use turbo_tasks_hash::Xxh3Hash64Hasher;
...@@ -24,7 +24,7 @@ pub struct AvailableChunkItemInfoMap(FxIndexMap<Vc<Box<dyn ChunkItem>>, Availabl ...@@ -24,7 +24,7 @@ pub struct AvailableChunkItemInfoMap(FxIndexMap<Vc<Box<dyn ChunkItem>>, Availabl
/// `include` queries. /// `include` queries.
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct AvailableChunkItems { pub struct AvailableChunkItems {
parent: Option<Vc<AvailableChunkItems>>, parent: Option<ResolvedVc<AvailableChunkItems>>,
chunk_items: Vc<AvailableChunkItemInfoMap>, chunk_items: Vc<AvailableChunkItemInfoMap>,
} }
...@@ -57,7 +57,7 @@ impl AvailableChunkItems { ...@@ -57,7 +57,7 @@ impl AvailableChunkItems {
.try_flat_join() .try_flat_join()
.await?; .await?;
Ok(AvailableChunkItems { Ok(AvailableChunkItems {
parent: Some(self), parent: Some(self.to_resolved().await?),
chunk_items: Vc::cell(chunk_items.into_iter().collect()), chunk_items: Vc::cell(chunk_items.into_iter().collect()),
} }
.cell()) .cell())
......
...@@ -240,7 +240,7 @@ enum ChunkContentGraphNode { ...@@ -240,7 +240,7 @@ enum ChunkContentGraphNode {
module: Vc<Box<dyn ChunkableModule>>, module: Vc<Box<dyn ChunkableModule>>,
}, },
// ModuleReferences that are not placed in the current chunk group // ModuleReferences that are not placed in the current chunk group
ExternalModuleReference(Vc<Box<dyn ModuleReference>>), ExternalModuleReference(ResolvedVc<Box<dyn ModuleReference>>),
/// A list of directly referenced chunk items from which `is_async_module` /// A list of directly referenced chunk items from which `is_async_module`
/// will be inherited. /// will be inherited.
InheritAsyncInfo { InheritAsyncInfo {
...@@ -257,7 +257,7 @@ enum ChunkGraphNodeToReferences { ...@@ -257,7 +257,7 @@ enum ChunkGraphNodeToReferences {
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TraceRawVcs)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, TraceRawVcs)]
struct ChunkGraphEdge { struct ChunkGraphEdge {
key: Option<Vc<Box<dyn Module>>>, key: Option<ResolvedVc<Box<dyn Module>>>,
node: ChunkContentGraphNode, node: ChunkContentGraphNode,
} }
...@@ -346,14 +346,18 @@ async fn graph_node_to_referenced_nodes( ...@@ -346,14 +346,18 @@ async fn graph_node_to_referenced_nodes(
else { else {
return Ok(vec![ChunkGraphEdge { return Ok(vec![ChunkGraphEdge {
key: None, key: None,
node: ChunkContentGraphNode::ExternalModuleReference(reference), node: ChunkContentGraphNode::ExternalModuleReference(
reference.to_resolved().await?,
),
}]); }]);
}; };
let Some(chunking_type) = *chunkable_module_reference.chunking_type().await? else { let Some(chunking_type) = *chunkable_module_reference.chunking_type().await? else {
return Ok(vec![ChunkGraphEdge { return Ok(vec![ChunkGraphEdge {
key: None, key: None,
node: ChunkContentGraphNode::ExternalModuleReference(reference), node: ChunkContentGraphNode::ExternalModuleReference(
reference.to_resolved().await?,
),
}]); }]);
}; };
...@@ -371,7 +375,9 @@ async fn graph_node_to_referenced_nodes( ...@@ -371,7 +375,9 @@ async fn graph_node_to_referenced_nodes(
return Ok(( return Ok((
Some(ChunkGraphEdge { Some(ChunkGraphEdge {
key: None, key: None,
node: ChunkContentGraphNode::ExternalModuleReference(reference), node: ChunkContentGraphNode::ExternalModuleReference(
reference.to_resolved().await?,
),
}), }),
None, None,
)); ));
...@@ -385,7 +391,7 @@ async fn graph_node_to_referenced_nodes( ...@@ -385,7 +391,7 @@ async fn graph_node_to_referenced_nodes(
.await?; .await?;
Ok(( Ok((
Some(ChunkGraphEdge { Some(ChunkGraphEdge {
key: Some(module), key: Some(module.to_resolved().await?),
node: ChunkContentGraphNode::ChunkItem { node: ChunkContentGraphNode::ChunkItem {
item: chunk_item, item: chunk_item,
ident: module.ident().to_string().await?, ident: module.ident().to_string().await?,
...@@ -401,7 +407,7 @@ async fn graph_node_to_referenced_nodes( ...@@ -401,7 +407,7 @@ async fn graph_node_to_referenced_nodes(
.await?; .await?;
Ok(( Ok((
Some(ChunkGraphEdge { Some(ChunkGraphEdge {
key: Some(module), key: Some(module.to_resolved().await?),
node: ChunkContentGraphNode::ChunkItem { node: ChunkContentGraphNode::ChunkItem {
item: chunk_item, item: chunk_item,
ident: module.ident().to_string().await?, ident: module.ident().to_string().await?,
...@@ -436,7 +442,7 @@ async fn graph_node_to_referenced_nodes( ...@@ -436,7 +442,7 @@ async fn graph_node_to_referenced_nodes(
.await?; .await?;
Ok(( Ok((
Some(ChunkGraphEdge { Some(ChunkGraphEdge {
key: Some(module), key: Some(module.to_resolved().await?),
node: ChunkContentGraphNode::ChunkItem { node: ChunkContentGraphNode::ChunkItem {
item: chunk_item, item: chunk_item,
ident: module.ident().to_string().await?, ident: module.ident().to_string().await?,
...@@ -518,7 +524,7 @@ impl Visit<ChunkContentGraphNode, ()> for ChunkContentVisit { ...@@ -518,7 +524,7 @@ impl Visit<ChunkContentGraphNode, ()> for ChunkContentVisit {
} }
}; };
if !self.processed_modules.insert(module) { if !self.processed_modules.insert(*module) {
return VisitControlFlow::Skip(node); return VisitControlFlow::Skip(node);
} }
...@@ -582,7 +588,7 @@ async fn chunk_content_internal_parallel( ...@@ -582,7 +588,7 @@ async fn chunk_content_internal_parallel(
return Ok(None); return Ok(None);
}; };
Ok(Some(ChunkGraphEdge { Ok(Some(ChunkGraphEdge {
key: Some(entry), key: Some(entry.to_resolved().await?),
node: ChunkContentGraphNode::ChunkItem { node: ChunkContentGraphNode::ChunkItem {
item: chunkable_module item: chunkable_module
.as_chunk_item(chunking_context) .as_chunk_item(chunking_context)
...@@ -628,7 +634,7 @@ async fn chunk_content_internal_parallel( ...@@ -628,7 +634,7 @@ async fn chunk_content_internal_parallel(
} }
ChunkContentGraphNode::ExternalModuleReference(reference) => { ChunkContentGraphNode::ExternalModuleReference(reference) => {
let reference = reference.resolve().await?; let reference = reference.resolve().await?;
external_module_references.insert(reference); external_module_references.insert(*reference);
} }
ChunkContentGraphNode::InheritAsyncInfo { item, references } => { ChunkContentGraphNode::InheritAsyncInfo { item, references } => {
for &(reference, ty) in &references { for &(reference, ty) in &references {
......
use turbo_tasks::{FxIndexMap, RcStr, Vc}; use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use crate::environment::Environment; use crate::environment::Environment;
...@@ -203,7 +203,7 @@ impl CompileTimeDefines { ...@@ -203,7 +203,7 @@ impl CompileTimeDefines {
pub enum FreeVarReference { pub enum FreeVarReference {
EcmaScriptModule { EcmaScriptModule {
request: RcStr, request: RcStr,
lookup_path: Option<Vc<FileSystemPath>>, lookup_path: Option<ResolvedVc<FileSystemPath>>,
export: Option<RcStr>, export: Option<RcStr>,
}, },
Value(CompileTimeDefineValue), Value(CompileTimeDefineValue),
......
...@@ -5,7 +5,7 @@ use std::{ ...@@ -5,7 +5,7 @@ use std::{
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use swc_core::ecma::preset_env::{Version, Versions}; use swc_core::ecma::preset_env::{Version, Versions};
use turbo_tasks::{RcStr, Value, Vc}; use turbo_tasks::{RcStr, ResolvedVc, Value, Vc};
use turbo_tasks_env::ProcessEnv; use turbo_tasks_env::ProcessEnv;
use crate::target::CompileTarget; use crate::target::CompileTarget;
...@@ -247,8 +247,8 @@ impl NodeJsEnvironment { ...@@ -247,8 +247,8 @@ impl NodeJsEnvironment {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn runtime_versions(&self) -> Result<Vc<RuntimeVersions>> { pub async fn runtime_versions(&self) -> Result<Vc<RuntimeVersions>> {
let str = match *self.node_version.await? { let str = match *self.node_version.await? {
NodeJsVersion::Current(process_env) => get_current_nodejs_version(process_env), NodeJsVersion::Current(process_env) => get_current_nodejs_version(*process_env),
NodeJsVersion::Static(version) => version, NodeJsVersion::Static(version) => *version,
} }
.await?; .await?;
...@@ -261,7 +261,7 @@ impl NodeJsEnvironment { ...@@ -261,7 +261,7 @@ impl NodeJsEnvironment {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn current(process_env: Vc<Box<dyn ProcessEnv>>) -> Vc<Self> { pub fn current(process_env: ResolvedVc<Box<dyn ProcessEnv>>) -> Vc<Self> {
Self::cell(NodeJsEnvironment { Self::cell(NodeJsEnvironment {
compile_target: CompileTarget::current(), compile_target: CompileTarget::current(),
node_version: NodeJsVersion::cell(NodeJsVersion::Current(process_env)), node_version: NodeJsVersion::cell(NodeJsVersion::Current(process_env)),
...@@ -272,13 +272,13 @@ impl NodeJsEnvironment { ...@@ -272,13 +272,13 @@ impl NodeJsEnvironment {
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub enum NodeJsVersion { pub enum NodeJsVersion {
Current(Vc<Box<dyn ProcessEnv>>), Current(ResolvedVc<Box<dyn ProcessEnv>>),
Static(Vc<RcStr>), Static(ResolvedVc<RcStr>),
} }
impl Default for NodeJsVersion { impl Default for NodeJsVersion {
fn default() -> Self { fn default() -> Self {
NodeJsVersion::Static(Vc::cell(DEFAULT_NODEJS_VERSION.into())) NodeJsVersion::Static(ResolvedVc::cell(DEFAULT_NODEJS_VERSION.into()))
} }
} }
......
...@@ -23,7 +23,7 @@ pub struct AssetIdent { ...@@ -23,7 +23,7 @@ pub struct AssetIdent {
/// The part of the asset that is a (ECMAScript) module /// The part of the asset that is a (ECMAScript) module
pub part: Option<ResolvedVc<ModulePart>>, pub part: Option<ResolvedVc<ModulePart>>,
/// The asset layer the asset was created from. /// The asset layer the asset was created from.
pub layer: Option<Vc<RcStr>>, pub layer: Option<ResolvedVc<RcStr>>,
} }
impl AssetIdent { impl AssetIdent {
...@@ -158,7 +158,7 @@ impl AssetIdent { ...@@ -158,7 +158,7 @@ impl AssetIdent {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn with_layer(&self, layer: Vc<RcStr>) -> Vc<Self> { pub fn with_layer(&self, layer: ResolvedVc<RcStr>) -> Vc<Self> {
let mut this = self.clone(); let mut this = self.clone();
this.layer = Some(layer); this.layer = Some(layer);
Self::new(Value::new(this)) Self::new(Value::new(this))
......
...@@ -429,7 +429,7 @@ impl CapturedIssues { ...@@ -429,7 +429,7 @@ impl CapturedIssues {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct IssueSource { pub struct IssueSource {
source: Vc<Box<dyn Source>>, source: Vc<Box<dyn Source>>,
range: Option<Vc<SourceRange>>, range: Option<ResolvedVc<SourceRange>>,
} }
/// The end position is the first character after the range /// The end position is the first character after the range
...@@ -460,7 +460,7 @@ impl IssueSource { ...@@ -460,7 +460,7 @@ impl IssueSource {
) -> Vc<Self> { ) -> Vc<Self> {
Self::cell(IssueSource { Self::cell(IssueSource {
source, source,
range: Some(SourceRange::LineColumn(start, end).cell()), range: Some(SourceRange::LineColumn(start, end).resolved_cell()),
}) })
} }
...@@ -492,7 +492,7 @@ impl IssueSource { ...@@ -492,7 +492,7 @@ impl IssueSource {
if let Some((source, start, end)) = mapped { if let Some((source, start, end)) = mapped {
return Ok(Self::cell(IssueSource { return Ok(Self::cell(IssueSource {
source, source,
range: Some(SourceRange::LineColumn(start, end).cell()), range: Some(SourceRange::LineColumn(start, end).resolved_cell()),
})); }));
} }
} }
...@@ -514,9 +514,11 @@ impl IssueSource { ...@@ -514,9 +514,11 @@ impl IssueSource {
source, source,
range: match (start == 0, end == 0) { range: match (start == 0, end == 0) {
(true, true) => None, (true, true) => None,
(false, false) => Some(SourceRange::ByteOffset(start - 1, end - 1).cell()), (false, false) => Some(SourceRange::ByteOffset(start - 1, end - 1).resolved_cell()),
(false, true) => Some(SourceRange::ByteOffset(start - 1, start - 1).cell()), (false, true) => {
(true, false) => Some(SourceRange::ByteOffset(end - 1, end - 1).cell()), Some(SourceRange::ByteOffset(start - 1, start - 1).resolved_cell())
}
(true, false) => Some(SourceRange::ByteOffset(end - 1, end - 1).resolved_cell()),
}, },
}) })
} }
...@@ -541,7 +543,7 @@ impl IssueSource { ...@@ -541,7 +543,7 @@ impl IssueSource {
range: if let FileLinesContent::Lines(lines) = &*source.content().lines().await? { range: if let FileLinesContent::Lines(lines) = &*source.content().lines().await? {
let start = find_line_and_column(lines.as_ref(), start); let start = find_line_and_column(lines.as_ref(), start);
let end = find_line_and_column(lines.as_ref(), end); let end = find_line_and_column(lines.as_ref(), end);
Some(SourceRange::LineColumn(start, end).cell()) Some(SourceRange::LineColumn(start, end).resolved_cell())
} else { } else {
None None
}, },
......
use std::fmt::Write; use std::fmt::Write;
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, ReadRef, ValueToString, Vc}; use turbo_tasks::{RcStr, ReadRef, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use super::{Issue, IssueSource, IssueStage, OptionIssueSource, OptionStyledString, StyledString}; use super::{Issue, IssueSource, IssueStage, OptionIssueSource, OptionStyledString, StyledString};
...@@ -22,7 +22,7 @@ pub struct ResolvingIssue { ...@@ -22,7 +22,7 @@ pub struct ResolvingIssue {
pub file_path: Vc<FileSystemPath>, pub file_path: Vc<FileSystemPath>,
pub resolve_options: Vc<ResolveOptions>, pub resolve_options: Vc<ResolveOptions>,
pub error_message: Option<String>, pub error_message: Option<String>,
pub source: Option<Vc<IssueSource>>, pub source: Option<ResolvedVc<IssueSource>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
......
...@@ -10,8 +10,8 @@ use anyhow::{bail, Result}; ...@@ -10,8 +10,8 @@ use anyhow::{bail, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::{Instrument, Level}; use tracing::{Instrument, Level};
use turbo_tasks::{ use turbo_tasks::{
fxindexmap, fxindexset, trace::TraceRawVcs, FxIndexMap, RcStr, TaskInput, TryJoinIterExt, fxindexmap, fxindexset, trace::TraceRawVcs, FxIndexMap, RcStr, ResolvedVc, TaskInput,
Value, ValueToString, Vc, TryJoinIterExt, Value, ValueToString, Vc,
}; };
use turbo_tasks_fs::{ use turbo_tasks_fs::{
util::normalize_request, FileSystemEntryType, FileSystemPath, RealPathResult, util::normalize_request, FileSystemEntryType, FileSystemPath, RealPathResult,
...@@ -67,7 +67,7 @@ pub enum ModuleResolveResultItem { ...@@ -67,7 +67,7 @@ pub enum ModuleResolveResultItem {
OutputAsset(Vc<Box<dyn OutputAsset>>), OutputAsset(Vc<Box<dyn OutputAsset>>),
External(RcStr, ExternalType), External(RcStr, ExternalType),
Ignore, Ignore,
Error(Vc<RcStr>), Error(ResolvedVc<RcStr>),
Empty, Empty,
Custom(u8), Custom(u8),
} }
...@@ -675,7 +675,9 @@ impl ResolveResult { ...@@ -675,7 +675,9 @@ impl ResolveResult {
} }
ResolveResultItem::Ignore => ModuleResolveResultItem::Ignore, ResolveResultItem::Ignore => ModuleResolveResultItem::Ignore,
ResolveResultItem::Empty => ModuleResolveResultItem::Empty, ResolveResultItem::Empty => ModuleResolveResultItem::Empty,
ResolveResultItem::Error(e) => ModuleResolveResultItem::Error(e), ResolveResultItem::Error(e) => {
ModuleResolveResultItem::Error(e.to_resolved().await?)
}
ResolveResultItem::Custom(u8) => { ResolveResultItem::Custom(u8) => {
ModuleResolveResultItem::Custom(u8) ModuleResolveResultItem::Custom(u8)
} }
...@@ -1202,8 +1204,8 @@ pub async fn find_context_file_or_package_key( ...@@ -1202,8 +1204,8 @@ pub async fn find_context_file_or_package_key(
#[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, Debug)] #[derive(Clone, Copy, PartialEq, Eq, Serialize, Deserialize, TraceRawVcs, Debug)]
enum FindPackageItem { enum FindPackageItem {
PackageDirectory(Vc<FileSystemPath>), PackageDirectory(ResolvedVc<FileSystemPath>),
PackageFile(Vc<FileSystemPath>), PackageFile(ResolvedVc<FileSystemPath>),
} }
#[turbo_tasks::value] #[turbo_tasks::value]
...@@ -1236,7 +1238,9 @@ async fn find_package( ...@@ -1236,7 +1238,9 @@ async fn find_package(
if let Some(fs_path) = if let Some(fs_path) =
dir_exists(fs_path, &mut affecting_sources).await? dir_exists(fs_path, &mut affecting_sources).await?
{ {
packages.push(FindPackageItem::PackageDirectory(fs_path)); packages.push(FindPackageItem::PackageDirectory(
fs_path.to_resolved().await?,
));
} }
} }
} }
...@@ -1259,10 +1263,14 @@ async fn find_package( ...@@ -1259,10 +1263,14 @@ async fn find_package(
{ {
match ty { match ty {
FileSystemEntryType::Directory => { FileSystemEntryType::Directory => {
packages.push(FindPackageItem::PackageDirectory(package_dir)); packages.push(FindPackageItem::PackageDirectory(
package_dir.to_resolved().await?,
));
} }
FileSystemEntryType::File => { FileSystemEntryType::File => {
packages.push(FindPackageItem::PackageFile(package_dir)); packages.push(FindPackageItem::PackageFile(
package_dir.to_resolved().await?,
));
} }
_ => {} _ => {}
} }
...@@ -1274,7 +1282,9 @@ async fn find_package( ...@@ -1274,7 +1282,9 @@ async fn find_package(
let package_file = package_dir.append(extension.clone()); let package_file = package_dir.append(extension.clone());
if let Some(package_file) = exists(package_file, &mut affecting_sources).await? if let Some(package_file) = exists(package_file, &mut affecting_sources).await?
{ {
packages.push(FindPackageItem::PackageFile(package_file)); packages.push(FindPackageItem::PackageFile(
package_file.to_resolved().await?,
));
} }
} }
} }
...@@ -1435,7 +1445,7 @@ pub async fn url_resolve( ...@@ -1435,7 +1445,7 @@ pub async fn url_resolve(
origin: Vc<Box<dyn ResolveOrigin>>, origin: Vc<Box<dyn ResolveOrigin>>,
request: Vc<Request>, request: Vc<Request>,
reference_type: Value<ReferenceType>, reference_type: Value<ReferenceType>,
issue_source: Option<Vc<IssueSource>>, issue_source: Option<ResolvedVc<IssueSource>>,
is_optional: bool, is_optional: bool,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
let resolve_options = origin.resolve_options(reference_type.clone()); let resolve_options = origin.resolve_options(reference_type.clone());
...@@ -2362,7 +2372,7 @@ async fn resolve_module_request( ...@@ -2362,7 +2372,7 @@ async fn resolve_module_request(
FindPackageItem::PackageDirectory(package_path) => { FindPackageItem::PackageDirectory(package_path) => {
results.push(resolve_into_package( results.push(resolve_into_package(
Value::new(path.clone()), Value::new(path.clone()),
package_path, *package_path,
query, query,
fragment, fragment,
options, options,
...@@ -2372,7 +2382,7 @@ async fn resolve_module_request( ...@@ -2372,7 +2382,7 @@ async fn resolve_module_request(
if path.is_match("") { if path.is_match("") {
let resolved = resolved( let resolved = resolved(
RequestKey::new(".".into()), RequestKey::new(".".into()),
package_path, *package_path,
lookup_path, lookup_path,
request, request,
options_value, options_value,
...@@ -2721,7 +2731,7 @@ pub async fn handle_resolve_error( ...@@ -2721,7 +2731,7 @@ pub async fn handle_resolve_error(
request: Vc<Request>, request: Vc<Request>,
resolve_options: Vc<ResolveOptions>, resolve_options: Vc<ResolveOptions>,
is_optional: bool, is_optional: bool,
source: Option<Vc<IssueSource>>, source: Option<ResolvedVc<IssueSource>>,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
async fn is_unresolvable(result: Vc<ModuleResolveResult>) -> Result<bool> { async fn is_unresolvable(result: Vc<ModuleResolveResult>) -> Result<bool> {
Ok(*result.resolve().await?.is_unresolvable().await?) Ok(*result.resolve().await?.is_unresolvable().await?)
...@@ -2765,7 +2775,7 @@ pub async fn handle_resolve_source_error( ...@@ -2765,7 +2775,7 @@ pub async fn handle_resolve_source_error(
request: Vc<Request>, request: Vc<Request>,
resolve_options: Vc<ResolveOptions>, resolve_options: Vc<ResolveOptions>,
is_optional: bool, is_optional: bool,
source: Option<Vc<IssueSource>>, source: Option<ResolvedVc<IssueSource>>,
) -> Result<Vc<ResolveResult>> { ) -> Result<Vc<ResolveResult>> {
async fn is_unresolvable(result: Vc<ResolveResult>) -> Result<bool> { async fn is_unresolvable(result: Vc<ResolveResult>) -> Result<bool> {
Ok(*result.resolve().await?.is_unresolvable().await?) Ok(*result.resolve().await?.is_unresolvable().await?)
...@@ -2809,7 +2819,7 @@ async fn emit_resolve_error_issue( ...@@ -2809,7 +2819,7 @@ async fn emit_resolve_error_issue(
request: Vc<Request>, request: Vc<Request>,
resolve_options: Vc<ResolveOptions>, resolve_options: Vc<ResolveOptions>,
err: anyhow::Error, err: anyhow::Error,
source: Option<Vc<IssueSource>>, source: Option<ResolvedVc<IssueSource>>,
) -> Result<()> { ) -> Result<()> {
let severity = if is_optional || resolve_options.await?.loose_errors { let severity = if is_optional || resolve_options.await?.loose_errors {
IssueSeverity::Warning.cell() IssueSeverity::Warning.cell()
...@@ -2836,7 +2846,7 @@ async fn emit_unresolvable_issue( ...@@ -2836,7 +2846,7 @@ async fn emit_unresolvable_issue(
reference_type: Value<ReferenceType>, reference_type: Value<ReferenceType>,
request: Vc<Request>, request: Vc<Request>,
resolve_options: Vc<ResolveOptions>, resolve_options: Vc<ResolveOptions>,
source: Option<Vc<IssueSource>>, source: Option<ResolvedVc<IssueSource>>,
) -> Result<()> { ) -> Result<()> {
let severity = if is_optional || resolve_options.await?.loose_errors { let severity = if is_optional || resolve_options.await?.loose_errors {
IssueSeverity::Warning.cell() IssueSeverity::Warning.cell()
...@@ -2875,7 +2885,7 @@ pub enum ModulePart { ...@@ -2875,7 +2885,7 @@ pub enum ModulePart {
/// all exports are unused. /// all exports are unused.
Evaluation, Evaluation,
/// Represents an export of a module. /// Represents an export of a module.
Export(Vc<RcStr>), Export(ResolvedVc<RcStr>),
/// Represents a renamed export of a module. /// Represents a renamed export of a module.
RenamedExport { RenamedExport {
original_export: Vc<RcStr>, original_export: Vc<RcStr>,
...@@ -2902,7 +2912,7 @@ impl ModulePart { ...@@ -2902,7 +2912,7 @@ impl ModulePart {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn export(export: RcStr) -> Vc<Self> { pub fn export(export: RcStr) -> Vc<Self> {
ModulePart::Export(Vc::cell(export)).cell() ModulePart::Export(ResolvedVc::cell(export)).cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn renamed_export(original_export: RcStr, export: RcStr) -> Vc<Self> { pub fn renamed_export(original_export: RcStr, export: RcStr) -> Vc<Self> {
......
use turbo_tasks::Vc; use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use super::options::{ use super::options::{
...@@ -7,7 +7,7 @@ use super::options::{ ...@@ -7,7 +7,7 @@ use super::options::{
}; };
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn node_cjs_resolve_options(root: Vc<FileSystemPath>) -> Vc<ResolveOptions> { pub fn node_cjs_resolve_options(root: ResolvedVc<FileSystemPath>) -> Vc<ResolveOptions> {
let conditions: ResolutionConditions = [ let conditions: ResolutionConditions = [
("node".into(), ConditionValue::Set), ("node".into(), ConditionValue::Set),
("require".into(), ConditionValue::Set), ("require".into(), ConditionValue::Set),
...@@ -37,7 +37,7 @@ pub fn node_cjs_resolve_options(root: Vc<FileSystemPath>) -> Vc<ResolveOptions> ...@@ -37,7 +37,7 @@ pub fn node_cjs_resolve_options(root: Vc<FileSystemPath>) -> Vc<ResolveOptions>
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn node_esm_resolve_options(root: Vc<FileSystemPath>) -> Vc<ResolveOptions> { pub fn node_esm_resolve_options(root: ResolvedVc<FileSystemPath>) -> Vc<ResolveOptions> {
let conditions: ResolutionConditions = [ let conditions: ResolutionConditions = [
("node".into(), ConditionValue::Set), ("node".into(), ConditionValue::Set),
("import".into(), ConditionValue::Set), ("import".into(), ConditionValue::Set),
......
...@@ -3,8 +3,8 @@ use std::{collections::BTreeMap, future::Future, pin::Pin}; ...@@ -3,8 +3,8 @@ use std::{collections::BTreeMap, future::Future, pin::Pin};
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexSet, RcStr, TryJoinIterExt, Value, debug::ValueDebugFormat, trace::TraceRawVcs, FxIndexSet, RcStr, ResolvedVc, TryJoinIterExt,
ValueToString, Vc, Value, ValueToString, Vc,
}; };
use turbo_tasks_fs::{glob::Glob, FileSystemPath}; use turbo_tasks_fs::{glob::Glob, FileSystemPath};
...@@ -31,7 +31,7 @@ pub struct ExcludedExtensions(pub FxIndexSet<RcStr>); ...@@ -31,7 +31,7 @@ pub struct ExcludedExtensions(pub FxIndexSet<RcStr>);
pub enum ResolveModules { pub enum ResolveModules {
/// when inside of path, use the list of directories to /// when inside of path, use the list of directories to
/// resolve inside these /// resolve inside these
Nested(Vc<FileSystemPath>, Vec<RcStr>), Nested(ResolvedVc<FileSystemPath>, Vec<RcStr>),
/// look into that directory, unless the request has an excluded extension /// look into that directory, unless the request has an excluded extension
Path { Path {
dir: Vc<FileSystemPath>, dir: Vc<FileSystemPath>,
...@@ -95,7 +95,7 @@ pub enum ResolveInPackage { ...@@ -95,7 +95,7 @@ pub enum ResolveInPackage {
pub enum ImportMapping { pub enum ImportMapping {
External(Option<RcStr>, ExternalType), External(Option<RcStr>, ExternalType),
/// An already resolved result that will be returned directly. /// An already resolved result that will be returned directly.
Direct(Vc<ResolveResult>), Direct(ResolvedVc<ResolveResult>),
/// A request alias that will be resolved first, and fall back to resolving /// A request alias that will be resolved first, and fall back to resolving
/// the original request if it fails. Useful for the tsconfig.json /// the original request if it fails. Useful for the tsconfig.json
/// `compilerOptions.paths` option and Next aliases. /// `compilerOptions.paths` option and Next aliases.
...@@ -152,7 +152,7 @@ impl AliasTemplate for Vc<ImportMapping> { ...@@ -152,7 +152,7 @@ impl AliasTemplate for Vc<ImportMapping> {
ImportMapping::PrimaryAlternative(name, context) => { ImportMapping::PrimaryAlternative(name, context) => {
ReplacedImportMapping::PrimaryAlternative((*name).clone().into(), *context) ReplacedImportMapping::PrimaryAlternative((*name).clone().into(), *context)
} }
ImportMapping::Direct(v) => ReplacedImportMapping::Direct(*v), ImportMapping::Direct(v) => ReplacedImportMapping::Direct(**v),
ImportMapping::Ignore => ReplacedImportMapping::Ignore, ImportMapping::Ignore => ReplacedImportMapping::Ignore,
ImportMapping::Empty => ReplacedImportMapping::Empty, ImportMapping::Empty => ReplacedImportMapping::Empty,
ImportMapping::Alternatives(alternatives) => ReplacedImportMapping::Alternatives( ImportMapping::Alternatives(alternatives) => ReplacedImportMapping::Alternatives(
...@@ -189,7 +189,7 @@ impl AliasTemplate for Vc<ImportMapping> { ...@@ -189,7 +189,7 @@ impl AliasTemplate for Vc<ImportMapping> {
*context, *context,
) )
} }
ImportMapping::Direct(v) => ReplacedImportMapping::Direct(*v), ImportMapping::Direct(v) => ReplacedImportMapping::Direct(**v),
ImportMapping::Ignore => ReplacedImportMapping::Ignore, ImportMapping::Ignore => ReplacedImportMapping::Ignore,
ImportMapping::Empty => ReplacedImportMapping::Empty, ImportMapping::Empty => ReplacedImportMapping::Empty,
ImportMapping::Alternatives(alternatives) => ReplacedImportMapping::Alternatives( ImportMapping::Alternatives(alternatives) => ReplacedImportMapping::Alternatives(
......
...@@ -238,7 +238,10 @@ impl CssChunkItem for CssModuleChunkItem { ...@@ -238,7 +238,10 @@ impl CssChunkItem for CssModuleChunkItem {
if let Some(css_item) = if let Some(css_item) =
Vc::try_resolve_downcast::<Box<dyn CssChunkItem>>(item).await? Vc::try_resolve_downcast::<Box<dyn CssChunkItem>>(item).await?
{ {
imports.push(CssImport::Internal(import_ref, css_item)); imports.push(CssImport::Internal(
import_ref.to_resolved().await?,
css_item,
));
} }
} }
} }
...@@ -260,7 +263,7 @@ impl CssChunkItem for CssModuleChunkItem { ...@@ -260,7 +263,7 @@ impl CssChunkItem for CssModuleChunkItem {
if let Some(css_item) = if let Some(css_item) =
Vc::try_resolve_downcast::<Box<dyn CssChunkItem>>(item).await? Vc::try_resolve_downcast::<Box<dyn CssChunkItem>>(item).await?
{ {
imports.push(CssImport::Composes(css_item)); imports.push(CssImport::Composes(css_item.to_resolved().await?));
} }
} }
} }
......
...@@ -4,7 +4,9 @@ pub mod source_map; ...@@ -4,7 +4,9 @@ pub mod source_map;
use std::fmt::Write; use std::fmt::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{FxIndexSet, RcStr, TryJoinIterExt, Value, ValueDefault, ValueToString, Vc}; use turbo_tasks::{
FxIndexSet, RcStr, ResolvedVc, TryJoinIterExt, Value, ValueDefault, ValueToString, Vc,
};
use turbo_tasks_fs::{rope::Rope, File, FileSystem}; use turbo_tasks_fs::{rope::Rope, File, FileSystem};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
...@@ -350,8 +352,8 @@ pub trait CssChunkPlaceable: ChunkableModule + Module + Asset {} ...@@ -350,8 +352,8 @@ pub trait CssChunkPlaceable: ChunkableModule + Module + Asset {}
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub enum CssImport { pub enum CssImport {
External(Vc<RcStr>), External(Vc<RcStr>),
Internal(Vc<ImportAssetReference>, Vc<Box<dyn CssChunkItem>>), Internal(ResolvedVc<ImportAssetReference>, Vc<Box<dyn CssChunkItem>>),
Composes(Vc<Box<dyn CssChunkItem>>), Composes(ResolvedVc<Box<dyn CssChunkItem>>),
} }
#[derive(Debug)] #[derive(Debug)]
......
...@@ -10,7 +10,7 @@ use swc_core::css::{ ...@@ -10,7 +10,7 @@ use swc_core::css::{
ast::UrlValue, ast::UrlValue,
visit::{VisitMut, VisitMutWith}, visit::{VisitMut, VisitMutWith},
}; };
use turbo_tasks::{debug::ValueDebug, RcStr, Value, ValueToString, Vc}; use turbo_tasks::{debug::ValueDebug, RcStr, ResolvedVc, Value, ValueToString, Vc};
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType,
...@@ -28,7 +28,7 @@ use crate::{embed::CssEmbed, StyleSheetLike}; ...@@ -28,7 +28,7 @@ use crate::{embed::CssEmbed, StyleSheetLike};
#[turbo_tasks::value(into = "new")] #[turbo_tasks::value(into = "new")]
pub enum ReferencedAsset { pub enum ReferencedAsset {
Some(Vc<Box<dyn OutputAsset>>), Some(ResolvedVc<Box<dyn OutputAsset>>),
None, None,
} }
...@@ -68,7 +68,10 @@ impl UrlAssetReference { ...@@ -68,7 +68,10 @@ impl UrlAssetReference {
if let Some(embeddable) = if let Some(embeddable) =
Vc::try_resolve_downcast::<Box<dyn CssEmbed>>(chunk_item).await? Vc::try_resolve_downcast::<Box<dyn CssEmbed>>(chunk_item).await?
{ {
return Ok(ReferencedAsset::Some(embeddable.embedded_asset()).into()); return Ok(ReferencedAsset::Some(
embeddable.embedded_asset().to_resolved().await?,
)
.into());
} }
} }
bail!( bail!(
......
...@@ -5,8 +5,8 @@ use std::{ ...@@ -5,8 +5,8 @@ use std::{
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{ use turbo_tasks::{
fxindexset, Completion, FxIndexMap, FxIndexSet, RcStr, State, TryJoinIterExt, Value, fxindexset, Completion, FxIndexMap, FxIndexSet, RcStr, ResolvedVc, State, TryJoinIterExt,
ValueToString, Vc, Value, ValueToString, Vc,
}; };
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
...@@ -338,7 +338,10 @@ impl Introspectable for AssetGraphContentSource { ...@@ -338,7 +338,10 @@ impl Introspectable for AssetGraphContentSource {
Ok(Vc::cell( Ok(Vc::cell(
root_asset_children root_asset_children
.chain(expanded_asset_children) .chain(expanded_asset_children)
.chain(once((expanded_key, Vc::upcast(FullyExpaned(self).cell())))) .chain(once((
expanded_key,
Vc::upcast(FullyExpaned(self.to_resolved().await?).cell()),
)))
.collect(), .collect(),
)) ))
} }
...@@ -350,7 +353,7 @@ fn fully_expaned_introspectable_type() -> Vc<RcStr> { ...@@ -350,7 +353,7 @@ fn fully_expaned_introspectable_type() -> Vc<RcStr> {
} }
#[turbo_tasks::value] #[turbo_tasks::value]
struct FullyExpaned(Vc<AssetGraphContentSource>); struct FullyExpaned(ResolvedVc<AssetGraphContentSource>);
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Introspectable for FullyExpaned { impl Introspectable for FullyExpaned {
......
...@@ -89,9 +89,9 @@ pub struct StaticContent { ...@@ -89,9 +89,9 @@ pub struct StaticContent {
/// The content of a result that is returned by a content source. /// The content of a result that is returned by a content source.
pub enum ContentSourceContent { pub enum ContentSourceContent {
NotFound, NotFound,
Static(Vc<StaticContent>), Static(ResolvedVc<StaticContent>),
HttpProxy(Vc<ProxyResult>), HttpProxy(ResolvedVc<ProxyResult>),
Rewrite(Vc<Rewrite>), Rewrite(ResolvedVc<Rewrite>),
/// Continue with the next route /// Continue with the next route
Next, Next,
} }
...@@ -119,31 +119,33 @@ impl GetContentSourceContent for ContentSourceContent { ...@@ -119,31 +119,33 @@ impl GetContentSourceContent for ContentSourceContent {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl ContentSourceContent { impl ContentSourceContent {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn static_content(content: Vc<Box<dyn VersionedContent>>) -> Vc<ContentSourceContent> { pub fn static_content(
content: ResolvedVc<Box<dyn VersionedContent>>,
) -> Vc<ContentSourceContent> {
ContentSourceContent::Static( ContentSourceContent::Static(
StaticContent { StaticContent {
content, content: *content,
status_code: 200, status_code: 200,
headers: HeaderList::empty(), headers: HeaderList::empty(),
} }
.cell(), .resolved_cell(),
) )
.cell() .cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn static_with_headers( pub fn static_with_headers(
content: Vc<Box<dyn VersionedContent>>, content: ResolvedVc<Box<dyn VersionedContent>>,
status_code: u16, status_code: u16,
headers: Vc<HeaderList>, headers: ResolvedVc<HeaderList>,
) -> Vc<ContentSourceContent> { ) -> Vc<ContentSourceContent> {
ContentSourceContent::Static( ContentSourceContent::Static(
StaticContent { StaticContent {
content, content: *content,
status_code, status_code,
headers, headers: *headers,
} }
.cell(), .resolved_cell(),
) )
.cell() .cell()
} }
......
...@@ -8,7 +8,7 @@ use hyper::{ ...@@ -8,7 +8,7 @@ use hyper::{
header::{HeaderName as HyperHeaderName, HeaderValue as HyperHeaderValue}, header::{HeaderName as HyperHeaderName, HeaderValue as HyperHeaderValue},
Uri, Uri,
}; };
use turbo_tasks::{RcStr, TransientInstance, Value, Vc}; use turbo_tasks::{RcStr, ResolvedVc, TransientInstance, Value, Vc};
use super::{ use super::{
headers::{HeaderValue, Headers}, headers::{HeaderValue, Headers},
...@@ -24,7 +24,7 @@ use super::{ ...@@ -24,7 +24,7 @@ use super::{
#[turbo_tasks::value(serialization = "none")] #[turbo_tasks::value(serialization = "none")]
pub enum ResolveSourceRequestResult { pub enum ResolveSourceRequestResult {
NotFound, NotFound,
Static(Vc<StaticContent>, Vc<HeaderList>), Static(Vc<StaticContent>, ResolvedVc<HeaderList>),
HttpProxy(Vc<ProxyResult>), HttpProxy(Vc<ProxyResult>),
} }
...@@ -107,13 +107,15 @@ pub async fn resolve_source_request( ...@@ -107,13 +107,15 @@ pub async fn resolve_source_request(
} }
ContentSourceContent::Static(static_content) => { ContentSourceContent::Static(static_content) => {
return Ok(ResolveSourceRequestResult::Static( return Ok(ResolveSourceRequestResult::Static(
*static_content, **static_content,
HeaderList::new(response_header_overwrites), HeaderList::new(response_header_overwrites)
.to_resolved()
.await?,
) )
.cell()); .cell());
} }
ContentSourceContent::HttpProxy(proxy_result) => { ContentSourceContent::HttpProxy(proxy_result) => {
return Ok(ResolveSourceRequestResult::HttpProxy(*proxy_result).cell()); return Ok(ResolveSourceRequestResult::HttpProxy(**proxy_result).cell());
} }
ContentSourceContent::Next => continue, ContentSourceContent::Next => continue,
} }
......
...@@ -79,7 +79,7 @@ impl GetContentSourceContent for WrappedGetContentSourceContent { ...@@ -79,7 +79,7 @@ impl GetContentSourceContent for WrappedGetContentSourceContent {
response_headers: rewrite.response_headers, response_headers: rewrite.response_headers,
request_headers: rewrite.request_headers, request_headers: rewrite.request_headers,
} }
.cell(), .resolved_cell(),
) )
.cell()); .cell());
} }
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{TryFlatJoinIterExt, Vc}; use turbo_tasks::{ResolvedVc, TryFlatJoinIterExt, Vc};
use turbo_tasks_fs::{glob::Glob, FileJsonContent, FileSystemPath}; use turbo_tasks_fs::{glob::Glob, FileJsonContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::Asset, asset::Asset,
...@@ -33,7 +33,7 @@ pub trait EcmascriptChunkPlaceable: ChunkableModule + Module + Asset { ...@@ -33,7 +33,7 @@ pub trait EcmascriptChunkPlaceable: ChunkableModule + Module + Asset {
enum SideEffectsValue { enum SideEffectsValue {
None, None,
Constant(bool), Constant(bool),
Glob(Vc<Glob>), Glob(ResolvedVc<Glob>),
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -100,7 +100,7 @@ async fn side_effects_from_package_json( ...@@ -100,7 +100,7 @@ async fn side_effects_from_package_json(
.try_flat_join() .try_flat_join()
.await?; .await?;
return Ok( return Ok(
SideEffectsValue::Glob(Glob::alternatives(globs).resolve().await?).cell(), SideEffectsValue::Glob(Glob::alternatives(globs).to_resolved().await?).cell(),
); );
} else { } else {
SideEffectsInPackageJsonIssue { SideEffectsInPackageJsonIssue {
...@@ -190,7 +190,7 @@ pub async fn is_marked_as_side_effect_free( ...@@ -190,7 +190,7 @@ pub async fn is_marked_as_side_effect_free(
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub enum EcmascriptExports { pub enum EcmascriptExports {
EsmExports(Vc<EsmExports>), EsmExports(ResolvedVc<EsmExports>),
DynamicNamespace, DynamicNamespace,
CommonJs, CommonJs,
EmptyCommonJs, EmptyCommonJs,
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{ use turbo_tasks::{
graph::{AdjacencyMap, GraphTraversal}, graph::{AdjacencyMap, GraphTraversal},
FxIndexMap, FxIndexSet, RcStr, TryJoinIterExt, ValueToString, Vc, FxIndexMap, FxIndexSet, RcStr, ResolvedVc, TryJoinIterExt, ValueToString, Vc,
}; };
use turbo_tasks_hash::hash_xxh3_hash64; use turbo_tasks_hash::hash_xxh3_hash64;
use turbopack_core::{ use turbopack_core::{
...@@ -24,14 +24,14 @@ pub struct PreprocessedChildrenIdents { ...@@ -24,14 +24,14 @@ pub struct PreprocessedChildrenIdents {
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub enum ReferencedModule { pub enum ReferencedModule {
Module(Vc<Box<dyn Module>>), Module(Vc<Box<dyn Module>>),
AsyncLoaderModule(Vc<Box<dyn Module>>), AsyncLoaderModule(ResolvedVc<Box<dyn Module>>),
} }
impl ReferencedModule { impl ReferencedModule {
fn module(&self) -> Vc<Box<dyn Module>> { fn module(&self) -> Vc<Box<dyn Module>> {
match *self { match *self {
ReferencedModule::Module(module) => module, ReferencedModule::Module(module) => module,
ReferencedModule::AsyncLoaderModule(module) => module, ReferencedModule::AsyncLoaderModule(module) => *module,
} }
} }
} }
...@@ -89,7 +89,10 @@ async fn referenced_modules(module: Vc<Box<dyn Module>>) -> Result<Vc<Referenced ...@@ -89,7 +89,10 @@ async fn referenced_modules(module: Vc<Box<dyn Module>>) -> Result<Vc<Referenced
} }
if let Some(async_loader_module) = async_loader { if let Some(async_loader_module) = async_loader {
if set.insert(async_loader_module) { if set.insert(async_loader_module) {
modules.push(ReferencedModule::AsyncLoaderModule(async_loader_module).cell()); modules.push(
ReferencedModule::AsyncLoaderModule(async_loader_module.to_resolved().await?)
.cell(),
);
} }
} }
} }
......
...@@ -196,11 +196,11 @@ pub struct EcmascriptModuleAssetBuilder { ...@@ -196,11 +196,11 @@ pub struct EcmascriptModuleAssetBuilder {
transforms: Vc<EcmascriptInputTransforms>, transforms: Vc<EcmascriptInputTransforms>,
options: Vc<EcmascriptOptions>, options: Vc<EcmascriptOptions>,
compile_time_info: Vc<CompileTimeInfo>, compile_time_info: Vc<CompileTimeInfo>,
inner_assets: Option<Vc<InnerAssets>>, inner_assets: Option<ResolvedVc<InnerAssets>>,
} }
impl EcmascriptModuleAssetBuilder { impl EcmascriptModuleAssetBuilder {
pub fn with_inner_assets(mut self, inner_assets: Vc<InnerAssets>) -> Self { pub fn with_inner_assets(mut self, inner_assets: ResolvedVc<InnerAssets>) -> Self {
self.inner_assets = Some(inner_assets); self.inner_assets = Some(inner_assets);
self self
} }
...@@ -219,7 +219,7 @@ impl EcmascriptModuleAssetBuilder { ...@@ -219,7 +219,7 @@ impl EcmascriptModuleAssetBuilder {
self.transforms, self.transforms,
self.options, self.options,
self.compile_time_info, self.compile_time_info,
inner_assets, *inner_assets,
) )
} else { } else {
EcmascriptModuleAsset::new( EcmascriptModuleAsset::new(
...@@ -296,7 +296,7 @@ impl EcmascriptModuleAsset { ...@@ -296,7 +296,7 @@ impl EcmascriptModuleAsset {
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub(crate) struct ModuleTypeResult { pub(crate) struct ModuleTypeResult {
pub module_type: SpecifiedModuleType, pub module_type: SpecifiedModuleType,
pub referenced_package_json: Option<Vc<FileSystemPath>>, pub referenced_package_json: Option<ResolvedVc<FileSystemPath>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -312,7 +312,7 @@ impl ModuleTypeResult { ...@@ -312,7 +312,7 @@ impl ModuleTypeResult {
#[turbo_tasks::function] #[turbo_tasks::function]
fn new_with_package_json( fn new_with_package_json(
module_type: SpecifiedModuleType, module_type: SpecifiedModuleType,
package_json: Vc<FileSystemPath>, package_json: ResolvedVc<FileSystemPath>,
) -> Vc<Self> { ) -> Vc<Self> {
Self::cell(ModuleTypeResult { Self::cell(ModuleTypeResult {
module_type, module_type,
...@@ -526,7 +526,7 @@ impl Module for EcmascriptModuleAsset { ...@@ -526,7 +526,7 @@ impl Module for EcmascriptModuleAsset {
ident.add_asset(Vc::cell(name.to_string().into()), asset.ident()); ident.add_asset(Vc::cell(name.to_string().into()), asset.ident());
} }
ident.add_modifier(modifier()); ident.add_modifier(modifier());
ident.layer = Some(self.asset_context.layer()); ident.layer = Some(self.asset_context.layer().to_resolved().await?);
Ok(AssetIdent::new(Value::new(ident))) Ok(AssetIdent::new(Value::new(ident)))
} else { } else {
Ok(self Ok(self
......
...@@ -5,7 +5,7 @@ use swc_core::{ ...@@ -5,7 +5,7 @@ use swc_core::{
ecma::ast::{Decl, Expr, ExprStmt, Ident, Stmt}, ecma::ast::{Decl, Expr, ExprStmt, Ident, Stmt},
quote, quote,
}; };
use turbo_tasks::{RcStr, Value, ValueToString, Vc}; use turbo_tasks::{RcStr, ResolvedVc, Value, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
...@@ -40,7 +40,7 @@ use crate::{ ...@@ -40,7 +40,7 @@ use crate::{
#[turbo_tasks::value] #[turbo_tasks::value]
pub enum ReferencedAsset { pub enum ReferencedAsset {
Some(Vc<Box<dyn EcmascriptChunkPlaceable>>), Some(ResolvedVc<Box<dyn EcmascriptChunkPlaceable>>),
External(RcStr, ExternalType), External(RcStr, ExternalType),
None, None,
Unresolvable, Unresolvable,
...@@ -87,7 +87,7 @@ impl ReferencedAsset { ...@@ -87,7 +87,7 @@ impl ReferencedAsset {
Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkPlaceable>>(module) Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkPlaceable>>(module)
.await? .await?
{ {
return Ok(ReferencedAsset::Some(placeable).cell()); return Ok(ReferencedAsset::Some(placeable.to_resolved().await?).cell());
} }
} }
// TODO ignore should probably be handled differently // TODO ignore should probably be handled differently
...@@ -105,7 +105,7 @@ pub struct EsmAssetReference { ...@@ -105,7 +105,7 @@ pub struct EsmAssetReference {
pub request: Vc<Request>, pub request: Vc<Request>,
pub annotations: ImportAnnotations, pub annotations: ImportAnnotations,
pub issue_source: Vc<IssueSource>, pub issue_source: Vc<IssueSource>,
pub export_name: Option<Vc<ModulePart>>, pub export_name: Option<ResolvedVc<ModulePart>>,
pub import_externals: bool, pub import_externals: bool,
} }
...@@ -127,7 +127,7 @@ impl EsmAssetReference { ...@@ -127,7 +127,7 @@ impl EsmAssetReference {
request: Vc<Request>, request: Vc<Request>,
issue_source: Vc<IssueSource>, issue_source: Vc<IssueSource>,
annotations: Value<ImportAnnotations>, annotations: Value<ImportAnnotations>,
export_name: Option<Vc<ModulePart>>, export_name: Option<ResolvedVc<ModulePart>>,
import_externals: bool, import_externals: bool,
) -> Vc<Self> { ) -> Vc<Self> {
Self::cell(EsmAssetReference { Self::cell(EsmAssetReference {
...@@ -153,7 +153,7 @@ impl ModuleReference for EsmAssetReference { ...@@ -153,7 +153,7 @@ impl ModuleReference for EsmAssetReference {
let ty = if matches!(self.annotations.module_type(), Some("json")) { let ty = if matches!(self.annotations.module_type(), Some("json")) {
EcmaScriptModulesReferenceSubType::ImportWithType(ImportWithType::Json) EcmaScriptModulesReferenceSubType::ImportWithType(ImportWithType::Json)
} else if let Some(part) = &self.export_name { } else if let Some(part) = &self.export_name {
EcmaScriptModulesReferenceSubType::ImportPart(*part) EcmaScriptModulesReferenceSubType::ImportPart(**part)
} else { } else {
EcmaScriptModulesReferenceSubType::Import EcmaScriptModulesReferenceSubType::Import
}; };
...@@ -167,7 +167,7 @@ impl ModuleReference for EsmAssetReference { ...@@ -167,7 +167,7 @@ impl ModuleReference for EsmAssetReference {
.expect("EsmAssetReference origin should be a EcmascriptModuleAsset"); .expect("EsmAssetReference origin should be a EcmascriptModuleAsset");
return Ok(ModuleResolveResult::module( return Ok(ModuleResolveResult::module(
EcmascriptModulePartAsset::select_part(module, part), EcmascriptModulePartAsset::select_part(module, *part),
) )
.cell()); .cell());
} }
...@@ -192,7 +192,7 @@ impl ModuleReference for EsmAssetReference { ...@@ -192,7 +192,7 @@ impl ModuleReference for EsmAssetReference {
let export = export_name.await?; let export = export_name.await?;
if *is_export_missing(module, export.clone_value()).await? { if *is_export_missing(module, export.clone_value()).await? {
InvalidExport { InvalidExport {
export: export_name, export: *export_name,
module, module,
source: self.issue_source, source: self.issue_source,
} }
......
...@@ -218,12 +218,12 @@ async fn handle_declared_export( ...@@ -218,12 +218,12 @@ async fn handle_declared_export(
.await? .await?
{ {
return Ok(ControlFlow::Break(FollowExportsResult { return Ok(ControlFlow::Break(FollowExportsResult {
module, module: *module,
export_name: Some(name.clone()), export_name: Some(name.clone()),
ty: FoundExportType::SideEffects, ty: FoundExportType::SideEffects,
})); }));
} }
return Ok(ControlFlow::Continue((module, name.clone()))); return Ok(ControlFlow::Continue((*module, name.clone())));
} }
} }
EsmExport::ImportedNamespace(reference) => { EsmExport::ImportedNamespace(reference) => {
...@@ -231,7 +231,7 @@ async fn handle_declared_export( ...@@ -231,7 +231,7 @@ async fn handle_declared_export(
*ReferencedAsset::from_resolve_result(reference.resolve_reference()).await? *ReferencedAsset::from_resolve_result(reference.resolve_reference()).await?
{ {
return Ok(ControlFlow::Break(FollowExportsResult { return Ok(ControlFlow::Break(FollowExportsResult {
module: m, module: *m,
export_name: None, export_name: None,
ty: FoundExportType::Found, ty: FoundExportType::Found,
})); }));
...@@ -290,7 +290,7 @@ async fn get_all_export_names( ...@@ -290,7 +290,7 @@ async fn get_all_export_names(
if let ReferencedAsset::Some(m) = if let ReferencedAsset::Some(m) =
*ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await? *ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await?
{ {
Some(get_all_export_names(m)) Some(get_all_export_names(*m))
} else { } else {
None None
}, },
...@@ -341,8 +341,8 @@ pub async fn expand_star_exports( ...@@ -341,8 +341,8 @@ pub async fn expand_star_exports(
if let ReferencedAsset::Some(asset) = if let ReferencedAsset::Some(asset) =
&*ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await? &*ReferencedAsset::from_resolve_result(esm_ref.resolve_reference()).await?
{ {
if checked_modules.insert(*asset) { if checked_modules.insert(**asset) {
queue.push((*asset, asset.get_exports())); queue.push((**asset, asset.get_exports()));
} }
} }
} }
...@@ -444,7 +444,7 @@ impl EsmExports { ...@@ -444,7 +444,7 @@ impl EsmExports {
continue; continue;
}; };
let export_info = expand_star_exports(*asset).await?; let export_info = expand_star_exports(**asset).await?;
for export in &export_info.star_exports { for export in &export_info.star_exports {
if !exports.contains_key(export) { if !exports.contains_key(export) {
...@@ -456,7 +456,7 @@ impl EsmExports { ...@@ -456,7 +456,7 @@ impl EsmExports {
} }
if export_info.has_dynamic_exports { if export_info.has_dynamic_exports {
dynamic_exports.push(*asset); dynamic_exports.push(**asset);
} }
} }
......
...@@ -50,7 +50,9 @@ use swc_core::{ ...@@ -50,7 +50,9 @@ use swc_core::{
}, },
}; };
use tracing::Instrument; use tracing::Instrument;
use turbo_tasks::{FxIndexSet, RcStr, TryJoinIterExt, Upcast, Value, ValueToString, Vc}; use turbo_tasks::{
FxIndexSet, RcStr, ResolvedVc, TryJoinIterExt, Upcast, Value, ValueToString, Vc,
};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
compile_time_info::{ compile_time_info::{
...@@ -168,7 +170,7 @@ pub struct AnalyzeEcmascriptModuleResultBuilder { ...@@ -168,7 +170,7 @@ pub struct AnalyzeEcmascriptModuleResultBuilder {
exports: EcmascriptExports, exports: EcmascriptExports,
async_module: Vc<OptionAsyncModule>, async_module: Vc<OptionAsyncModule>,
successful: bool, successful: bool,
source_map: Option<Vc<OptionSourceMap>>, source_map: Option<ResolvedVc<OptionSourceMap>>,
bindings: Vec<EsmBinding>, bindings: Vec<EsmBinding>,
} }
...@@ -253,7 +255,7 @@ impl AnalyzeEcmascriptModuleResultBuilder { ...@@ -253,7 +255,7 @@ impl AnalyzeEcmascriptModuleResultBuilder {
} }
/// Sets the analysis result ES export. /// Sets the analysis result ES export.
pub fn set_source_map(&mut self, source_map: Vc<OptionSourceMap>) { pub fn set_source_map(&mut self, source_map: ResolvedVc<OptionSourceMap>) {
self.source_map = Some(source_map); self.source_map = Some(source_map);
} }
...@@ -324,7 +326,7 @@ impl AnalyzeEcmascriptModuleResultBuilder { ...@@ -324,7 +326,7 @@ impl AnalyzeEcmascriptModuleResultBuilder {
let source_map = if let Some(source_map) = self.source_map { let source_map = if let Some(source_map) = self.source_map {
source_map source_map
} else { } else {
OptionSourceMap::none() OptionSourceMap::none().to_resolved().await?
}; };
Ok(AnalyzeEcmascriptModuleResult::cell( Ok(AnalyzeEcmascriptModuleResult::cell(
AnalyzeEcmascriptModuleResult { AnalyzeEcmascriptModuleResult {
...@@ -336,7 +338,7 @@ impl AnalyzeEcmascriptModuleResultBuilder { ...@@ -336,7 +338,7 @@ impl AnalyzeEcmascriptModuleResultBuilder {
exports: self.exports.into(), exports: self.exports.into(),
async_module: self.async_module, async_module: self.async_module,
successful: self.successful, successful: self.successful,
source_map, source_map: *source_map,
}, },
)) ))
} }
...@@ -458,7 +460,7 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -458,7 +460,7 @@ pub(crate) async fn analyse_ecmascript_module_internal(
} = *module.determine_module_type().await?; } = *module.determine_module_type().await?;
if let Some(package_json) = referenced_package_json { if let Some(package_json) = referenced_package_json {
analysis.add_reference(PackageJsonReference::new(package_json)); analysis.add_reference(PackageJsonReference::new(*package_json));
} }
if analyze_types { if analyze_types {
...@@ -546,18 +548,20 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -546,18 +548,20 @@ pub(crate) async fn analyse_ecmascript_module_internal(
let reference = SourceMapReference::new(origin_path, source_map_origin); let reference = SourceMapReference::new(origin_path, source_map_origin);
analysis.add_reference(reference); analysis.add_reference(reference);
let source_map = reference.generate_source_map(); let source_map = reference.generate_source_map();
analysis.set_source_map(convert_to_turbopack_source_map( analysis.set_source_map(
source_map, convert_to_turbopack_source_map(source_map, source_map_origin)
source_map_origin, .to_resolved()
)); .await?,
);
source_map_from_comment = true; source_map_from_comment = true;
} else if path.starts_with("data:application/json;base64,") { } else if path.starts_with("data:application/json;base64,") {
let source_map_origin = origin_path; let source_map_origin = origin_path;
let source_map = maybe_decode_data_url(path.into()); let source_map = maybe_decode_data_url(path.into());
analysis.set_source_map(convert_to_turbopack_source_map( analysis.set_source_map(
source_map, convert_to_turbopack_source_map(source_map, source_map_origin)
source_map_origin, .to_resolved()
)); .await?,
);
source_map_from_comment = true; source_map_from_comment = true;
} }
} }
...@@ -566,10 +570,14 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -566,10 +570,14 @@ pub(crate) async fn analyse_ecmascript_module_internal(
Vc::try_resolve_sidecast::<Box<dyn GenerateSourceMap>>(source).await? Vc::try_resolve_sidecast::<Box<dyn GenerateSourceMap>>(source).await?
{ {
let source_map_origin = source.ident().path(); let source_map_origin = source.ident().path();
analysis.set_source_map(convert_to_turbopack_source_map( analysis.set_source_map(
convert_to_turbopack_source_map(
generate_source_map.generate_source_map(), generate_source_map.generate_source_map(),
source_map_origin, source_map_origin,
)); )
.to_resolved()
.await?,
);
} }
} }
...@@ -761,7 +769,7 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -761,7 +769,7 @@ pub(crate) async fn analyse_ecmascript_module_internal(
} }
.cell(); .cell();
EcmascriptExports::EsmExports(esm_exports) EcmascriptExports::EsmExports(esm_exports.to_resolved().await?)
} else if specified_type == SpecifiedModuleType::EcmaScript { } else if specified_type == SpecifiedModuleType::EcmaScript {
match detect_dynamic_export(program) { match detect_dynamic_export(program) {
DetectedDynamicExportType::CommonJs => { DetectedDynamicExportType::CommonJs => {
...@@ -777,7 +785,7 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -777,7 +785,7 @@ pub(crate) async fn analyse_ecmascript_module_internal(
exports: Default::default(), exports: Default::default(),
star_exports: Default::default(), star_exports: Default::default(),
} }
.cell(), .resolved_cell(),
) )
} }
DetectedDynamicExportType::Namespace => EcmascriptExports::DynamicNamespace, DetectedDynamicExportType::Namespace => EcmascriptExports::DynamicNamespace,
...@@ -788,7 +796,7 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -788,7 +796,7 @@ pub(crate) async fn analyse_ecmascript_module_internal(
exports: Default::default(), exports: Default::default(),
star_exports: Default::default(), star_exports: Default::default(),
} }
.cell(), .resolved_cell(),
), ),
} }
} else { } else {
...@@ -801,7 +809,7 @@ pub(crate) async fn analyse_ecmascript_module_internal( ...@@ -801,7 +809,7 @@ pub(crate) async fn analyse_ecmascript_module_internal(
exports: Default::default(), exports: Default::default(),
star_exports: Default::default(), star_exports: Default::default(),
} }
.cell(), .resolved_cell(),
), ),
DetectedDynamicExportType::None => EcmascriptExports::EmptyCommonJs, DetectedDynamicExportType::None => EcmascriptExports::EmptyCommonJs,
} }
...@@ -2191,7 +2199,7 @@ async fn handle_free_var_reference( ...@@ -2191,7 +2199,7 @@ async fn handle_free_var_reference(
lookup_path.map_or(state.origin, |lookup_path| { lookup_path.map_or(state.origin, |lookup_path| {
Vc::upcast(PlainResolveOrigin::new( Vc::upcast(PlainResolveOrigin::new(
state.origin.asset_context(), state.origin.asset_context(),
lookup_path, *lookup_path,
)) ))
}), }),
Request::parse(Value::new(request.clone().into())), Request::parse(Value::new(request.clone().into())),
......
...@@ -255,7 +255,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule { ...@@ -255,7 +255,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleFacadeModule {
star_exports, star_exports,
} }
.cell(); .cell();
Ok(EcmascriptExports::EsmExports(exports).cell()) Ok(EcmascriptExports::EsmExports(exports.to_resolved().await?).cell())
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -94,7 +94,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleLocalsModule { ...@@ -94,7 +94,7 @@ impl EcmascriptChunkPlaceable for EcmascriptModuleLocalsModule {
star_exports: vec![], star_exports: vec![],
} }
.cell(); .cell();
Ok(EcmascriptExports::EsmExports(exports).cell()) Ok(EcmascriptExports::EsmExports(exports.to_resolved().await?).cell())
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use swc_core::{common::DUMMY_SP, ecma::ast::Ident, quote}; use swc_core::{common::DUMMY_SP, ecma::ast::Ident, quote};
use turbo_tasks::{RcStr, ValueToString, Vc}; use turbo_tasks::{RcStr, ResolvedVc, ValueToString, Vc};
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType, ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType,
...@@ -25,7 +25,7 @@ use crate::{ ...@@ -25,7 +25,7 @@ use crate::{
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct EcmascriptModulePartReference { pub struct EcmascriptModulePartReference {
pub module: Vc<Box<dyn EcmascriptChunkPlaceable>>, pub module: Vc<Box<dyn EcmascriptChunkPlaceable>>,
pub part: Option<Vc<ModulePart>>, pub part: Option<ResolvedVc<ModulePart>>,
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -33,7 +33,7 @@ impl EcmascriptModulePartReference { ...@@ -33,7 +33,7 @@ impl EcmascriptModulePartReference {
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn new_part( pub fn new_part(
module: Vc<Box<dyn EcmascriptChunkPlaceable>>, module: Vc<Box<dyn EcmascriptChunkPlaceable>>,
part: Vc<ModulePart>, part: ResolvedVc<ModulePart>,
) -> Vc<Self> { ) -> Vc<Self> {
EcmascriptModulePartReference { EcmascriptModulePartReference {
module, module,
...@@ -77,7 +77,7 @@ impl ModuleReference for EcmascriptModulePartReference { ...@@ -77,7 +77,7 @@ impl ModuleReference for EcmascriptModulePartReference {
| ModulePart::Facade | ModulePart::Facade
| ModulePart::RenamedExport { .. } | ModulePart::RenamedExport { .. }
| ModulePart::RenamedNamespace { .. } => { | ModulePart::RenamedNamespace { .. } => {
Vc::upcast(EcmascriptModuleFacadeModule::new(self.module, part)) Vc::upcast(EcmascriptModuleFacadeModule::new(self.module, *part))
} }
ModulePart::Export(..) | ModulePart::Internal(..) => { ModulePart::Export(..) | ModulePart::Internal(..) => {
bail!( bail!(
......
...@@ -18,7 +18,7 @@ use swc_core::{ ...@@ -18,7 +18,7 @@ use swc_core::{
}, },
quote, quote,
}; };
use turbo_tasks::{RcStr, Vc}; use turbo_tasks::{RcStr, ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
environment::Environment, environment::Environment,
...@@ -30,7 +30,7 @@ use turbopack_core::{ ...@@ -30,7 +30,7 @@ use turbopack_core::{
pub enum EcmascriptInputTransform { pub enum EcmascriptInputTransform {
CommonJs, CommonJs,
Plugin(Vc<TransformPlugin>), Plugin(Vc<TransformPlugin>),
PresetEnv(Vc<Environment>), PresetEnv(ResolvedVc<Environment>),
React { React {
#[serde(default)] #[serde(default)]
development: bool, development: bool,
......
...@@ -17,7 +17,7 @@ use image::{ ...@@ -17,7 +17,7 @@ use image::{
use mime::Mime; use mime::Mime;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_with::{serde_as, DisplayFromStr}; use serde_with::{serde_as, DisplayFromStr};
use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, Vc}; use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, ResolvedVc, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
error::PrettyPrintError, error::PrettyPrintError,
...@@ -170,7 +170,7 @@ fn load_image_internal( ...@@ -170,7 +170,7 @@ fn load_image_internal(
.into(), .into(),
) )
.cell(), .cell(),
title: Some(StyledString::Text("AVIF image not supported".into()).cell()), title: Some(StyledString::Text("AVIF image not supported".into()).resolved_cell()),
issue_severity: Some(IssueSeverity::Warning.into()), issue_severity: Some(IssueSeverity::Warning.into()),
} }
.cell() .cell()
...@@ -188,7 +188,7 @@ fn load_image_internal( ...@@ -188,7 +188,7 @@ fn load_image_internal(
.into(), .into(),
) )
.cell(), .cell(),
title: Some(StyledString::Text("WEBP image not supported".into()).cell()), title: Some(StyledString::Text("WEBP image not supported".into()).resolved_cell()),
issue_severity: Some(IssueSeverity::Warning.into()), issue_severity: Some(IssueSeverity::Warning.into()),
} }
.cell() .cell()
...@@ -479,7 +479,7 @@ pub async fn optimize( ...@@ -479,7 +479,7 @@ pub async fn optimize(
struct ImageProcessingIssue { struct ImageProcessingIssue {
path: Vc<FileSystemPath>, path: Vc<FileSystemPath>,
message: Vc<StyledString>, message: Vc<StyledString>,
title: Option<Vc<StyledString>>, title: Option<ResolvedVc<StyledString>>,
issue_severity: Option<Vc<IssueSeverity>>, issue_severity: Option<Vc<IssueSeverity>>,
} }
...@@ -502,8 +502,9 @@ impl Issue for ImageProcessingIssue { ...@@ -502,8 +502,9 @@ impl Issue for ImageProcessingIssue {
#[turbo_tasks::function] #[turbo_tasks::function]
fn title(&self) -> Vc<StyledString> { fn title(&self) -> Vc<StyledString> {
self.title *self
.unwrap_or(StyledString::Text("Processing image failed".into()).cell()) .title
.unwrap_or(StyledString::Text("Processing image failed".into()).resolved_cell())
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -127,7 +127,8 @@ impl GetContentSourceContent for NodeApiContentSource { ...@@ -127,7 +127,8 @@ impl GetContentSourceContent for NodeApiContentSource {
return Err(anyhow!("Missing request data")); return Err(anyhow!("Missing request data"));
}; };
let entry = self.entry.entry(data.clone()).await?; let entry = self.entry.entry(data.clone()).await?;
Ok(ContentSourceContent::HttpProxy(render_proxy( Ok(ContentSourceContent::HttpProxy(
render_proxy(
self.cwd, self.cwd,
self.env, self.env,
self.server_root.join(path.clone()), self.server_root.join(path.clone()),
...@@ -150,7 +151,10 @@ impl GetContentSourceContent for NodeApiContentSource { ...@@ -150,7 +151,10 @@ impl GetContentSourceContent for NodeApiContentSource {
.cell(), .cell(),
*body, *body,
self.debug, self.debug,
)) )
.to_resolved()
.await?,
)
.cell()) .cell())
} }
} }
......
...@@ -7,8 +7,8 @@ use futures::{ ...@@ -7,8 +7,8 @@ use futures::{
use parking_lot::Mutex; use parking_lot::Mutex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
duration_span, mark_finished, prevent_gc, util::SharedError, RawVc, TaskInput, ValueToString, duration_span, mark_finished, prevent_gc, util::SharedError, RawVc, ResolvedVc, TaskInput,
Vc, ValueToString, Vc,
}; };
use turbo_tasks_bytes::{Bytes, Stream}; use turbo_tasks_bytes::{Bytes, Stream};
use turbo_tasks_env::ProcessEnv; use turbo_tasks_env::ProcessEnv;
...@@ -46,7 +46,7 @@ pub enum StaticResult { ...@@ -46,7 +46,7 @@ pub enum StaticResult {
headers: Vc<HeaderList>, headers: Vc<HeaderList>,
body: Body, body: Body,
}, },
Rewrite(Vc<Rewrite>), Rewrite(ResolvedVc<Rewrite>),
} }
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
...@@ -66,7 +66,7 @@ impl StaticResult { ...@@ -66,7 +66,7 @@ impl StaticResult {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn rewrite(rewrite: Vc<Rewrite>) -> Vc<Self> { pub fn rewrite(rewrite: ResolvedVc<Rewrite>) -> Vc<Self> {
StaticResult::Rewrite(rewrite).cell() StaticResult::Rewrite(rewrite).cell()
} }
} }
......
...@@ -236,10 +236,12 @@ impl GetContentSourceContent for NodeRenderContentSource { ...@@ -236,10 +236,12 @@ impl GetContentSourceContent for NodeRenderContentSource {
headers: headers.await?.clone_value(), headers: headers.await?.clone_value(),
body: body.clone(), body: body.clone(),
} }
.cell(), .resolved_cell(),
) )
.cell(), .cell(),
StaticResult::Rewrite(rewrite) => ContentSourceContent::Rewrite(rewrite).cell(), StaticResult::Rewrite(rewrite) => {
ContentSourceContent::Rewrite(rewrite.to_resolved().await?).cell()
}
}) })
} }
} }
......
...@@ -7,7 +7,8 @@ use serde::{Deserialize, Serialize}; ...@@ -7,7 +7,8 @@ use serde::{Deserialize, Serialize};
use serde_json::{json, Value as JsonValue}; use serde_json::{json, Value as JsonValue};
use serde_with::serde_as; use serde_with::serde_as;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, Completion, RcStr, TaskInput, TryJoinIterExt, Value, ValueToString, Vc, trace::TraceRawVcs, Completion, RcStr, ResolvedVc, TaskInput, TryJoinIterExt, Value,
ValueToString, Vc,
}; };
use turbo_tasks_bytes::stream::SingleValue; use turbo_tasks_bytes::stream::SingleValue;
use turbo_tasks_env::ProcessEnv; use turbo_tasks_env::ProcessEnv;
...@@ -229,7 +230,7 @@ impl WebpackLoadersProcessedAsset { ...@@ -229,7 +230,7 @@ impl WebpackLoadersProcessedAsset {
context_ident_for_issue: this.source.ident(), context_ident_for_issue: this.source.ident(),
asset_context: evaluate_context, asset_context: evaluate_context,
chunking_context, chunking_context,
resolve_options_context: Some(transform.resolve_options_context), resolve_options_context: Some(transform.resolve_options_context.to_resolved().await?),
args: vec![ args: vec![
Vc::cell(content.into()), Vc::cell(content.into()),
// We need to pass the query string to the loader // We need to pass the query string to the loader
...@@ -380,7 +381,7 @@ pub struct WebpackLoaderContext { ...@@ -380,7 +381,7 @@ pub struct WebpackLoaderContext {
pub context_ident_for_issue: Vc<AssetIdent>, pub context_ident_for_issue: Vc<AssetIdent>,
pub asset_context: Vc<Box<dyn AssetContext>>, pub asset_context: Vc<Box<dyn AssetContext>>,
pub chunking_context: Vc<Box<dyn ChunkingContext>>, pub chunking_context: Vc<Box<dyn ChunkingContext>>,
pub resolve_options_context: Option<Vc<ResolveOptionsContext>>, pub resolve_options_context: Option<ResolvedVc<ResolveOptionsContext>>,
pub args: Vec<Vc<JsonValue>>, pub args: Vec<Vc<JsonValue>>,
pub additional_invalidation: Vc<Completion>, pub additional_invalidation: Vc<Completion>,
} }
...@@ -498,7 +499,7 @@ impl EvaluateContext for WebpackLoaderContext { ...@@ -498,7 +499,7 @@ impl EvaluateContext for WebpackLoaderContext {
}; };
let lookup_path = self.cwd.join(lookup_path); let lookup_path = self.cwd.join(lookup_path);
let request = Request::parse(Value::new(Pattern::Constant(request))); let request = Request::parse(Value::new(Pattern::Constant(request)));
let options = resolve_options(lookup_path, resolve_options_context); let options = resolve_options(lookup_path, *resolve_options_context);
let options = apply_webpack_resolve_options(options, webpack_options); let options = apply_webpack_resolve_options(options, webpack_options);
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{Value, Vc}; use turbo_tasks::{ResolvedVc, Value, Vc};
use turbopack_core::{ use turbopack_core::{
issue::IssueSource, issue::IssueSource,
reference_type::{CommonJsReferenceSubType, EcmaScriptModulesReferenceSubType, ReferenceType}, reference_type::{CommonJsReferenceSubType, EcmaScriptModulesReferenceSubType, ReferenceType},
...@@ -80,7 +80,7 @@ pub async fn esm_resolve( ...@@ -80,7 +80,7 @@ pub async fn esm_resolve(
request: Vc<Request>, request: Vc<Request>,
ty: Value<EcmaScriptModulesReferenceSubType>, ty: Value<EcmaScriptModulesReferenceSubType>,
is_optional: bool, is_optional: bool,
issue_source: Option<Vc<IssueSource>>, issue_source: Option<ResolvedVc<IssueSource>>,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
let ty = Value::new(ReferenceType::EcmaScriptModules(ty.into_value())); let ty = Value::new(ReferenceType::EcmaScriptModules(ty.into_value()));
let options = apply_esm_specific_options(origin.resolve_options(ty.clone()), ty.clone()) let options = apply_esm_specific_options(origin.resolve_options(ty.clone()), ty.clone())
...@@ -93,7 +93,7 @@ pub async fn esm_resolve( ...@@ -93,7 +93,7 @@ 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>,
issue_source: Option<Vc<IssueSource>>, issue_source: Option<ResolvedVc<IssueSource>>,
is_optional: bool, is_optional: bool,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
// TODO pass CommonJsReferenceSubType // TODO pass CommonJsReferenceSubType
...@@ -106,9 +106,9 @@ pub async fn cjs_resolve( ...@@ -106,9 +106,9 @@ pub async fn cjs_resolve(
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn cjs_resolve_source( pub async fn cjs_resolve_source(
origin: Vc<Box<dyn ResolveOrigin>>, origin: ResolvedVc<Box<dyn ResolveOrigin>>,
request: Vc<Request>, request: ResolvedVc<Request>,
issue_source: Option<Vc<IssueSource>>, issue_source: Option<ResolvedVc<IssueSource>>,
is_optional: bool, is_optional: bool,
) -> Result<Vc<ResolveResult>> { ) -> Result<Vc<ResolveResult>> {
// TODO pass CommonJsReferenceSubType // TODO pass CommonJsReferenceSubType
...@@ -119,7 +119,7 @@ pub async fn cjs_resolve_source( ...@@ -119,7 +119,7 @@ pub async fn cjs_resolve_source(
let result = resolve( let result = resolve(
origin.origin_path().parent().resolve().await?, origin.origin_path().parent().resolve().await?,
ty.clone(), ty.clone(),
request, *request,
options, options,
); );
...@@ -127,7 +127,7 @@ pub async fn cjs_resolve_source( ...@@ -127,7 +127,7 @@ pub async fn cjs_resolve_source(
result, result,
ty, ty,
origin.origin_path(), origin.origin_path(),
request, *request,
options, options,
is_optional, is_optional,
issue_source, issue_source,
...@@ -141,7 +141,7 @@ async fn specific_resolve( ...@@ -141,7 +141,7 @@ async fn specific_resolve(
options: Vc<ResolveOptions>, options: Vc<ResolveOptions>,
reference_type: Value<ReferenceType>, reference_type: Value<ReferenceType>,
is_optional: bool, is_optional: bool,
issue_source: Option<Vc<IssueSource>>, issue_source: Option<ResolvedVc<IssueSource>>,
) -> Result<Vc<ModuleResolveResult>> { ) -> Result<Vc<ModuleResolveResult>> {
let result = origin.resolve_asset(request, options, reference_type.clone()); let result = origin.resolve_asset(request, options, reference_type.clone());
......
...@@ -213,14 +213,20 @@ async fn base_resolve_options( ...@@ -213,14 +213,20 @@ async fn base_resolve_options(
extensions, extensions,
modules: if let Some(environment) = emulating { modules: if let Some(environment) = emulating {
if *environment.resolve_node_modules().await? { if *environment.resolve_node_modules().await? {
vec![ResolveModules::Nested(root, vec!["node_modules".into()])] vec![ResolveModules::Nested(
root.to_resolved().await?,
vec!["node_modules".into()],
)]
} else { } else {
Vec::new() Vec::new()
} }
} else { } else {
let mut mods = Vec::new(); let mut mods = Vec::new();
if let Some(dir) = opt.enable_node_modules { if let Some(dir) = opt.enable_node_modules {
mods.push(ResolveModules::Nested(dir, vec!["node_modules".into()])); mods.push(ResolveModules::Nested(
dir.to_resolved().await?,
vec!["node_modules".into()],
));
} }
mods mods
}, },
......
...@@ -286,7 +286,7 @@ async fn run_test(prepared_test: Vc<PreparedTest>) -> Result<Vc<RunTestResult>> ...@@ -286,7 +286,7 @@ async fn run_test(prepared_test: Vc<PreparedTest>) -> Result<Vc<RunTestResult>>
import_externals: true, import_externals: true,
..Default::default() ..Default::default()
}, },
preset_env_versions: Some(env), preset_env_versions: Some(env.to_resolved().await?),
tree_shaking_mode: options.tree_shaking_mode, tree_shaking_mode: options.tree_shaking_mode,
rules: vec![( rules: vec![(
ContextCondition::InDirectory("node_modules".into()), ContextCondition::InDirectory("node_modules".into()),
......
...@@ -278,7 +278,7 @@ async fn run_test(resource: RcStr) -> Result<Vc<FileSystemPath>> { ...@@ -278,7 +278,7 @@ async fn run_test(resource: RcStr) -> Result<Vc<FileSystemPath>> {
use_swc_css: options.use_swc_css, use_swc_css: options.use_swc_css,
..Default::default() ..Default::default()
}, },
preset_env_versions: Some(env), preset_env_versions: Some(env.to_resolved().await?),
rules: vec![( rules: vec![(
ContextCondition::InDirectory("node_modules".into()), ContextCondition::InDirectory("node_modules".into()),
ModuleOptionsContext { ModuleOptionsContext {
......
use std::collections::HashSet; use std::collections::HashSet;
use anyhow::Result; use anyhow::Result;
use turbo_tasks::Vc; use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::output::OutputAsset; use turbopack_core::output::OutputAsset;
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub enum AggregatedGraph { pub enum AggregatedGraph {
Leaf(Vc<Box<dyn OutputAsset>>), Leaf(ResolvedVc<Box<dyn OutputAsset>>),
Node { Node {
depth: usize, depth: usize,
content: HashSet<Vc<AggregatedGraph>>, content: HashSet<Vc<AggregatedGraph>>,
...@@ -17,7 +17,7 @@ pub enum AggregatedGraph { ...@@ -17,7 +17,7 @@ pub enum AggregatedGraph {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl AggregatedGraph { impl AggregatedGraph {
#[turbo_tasks::function] #[turbo_tasks::function]
fn leaf(asset: Vc<Box<dyn OutputAsset>>) -> Vc<Self> { fn leaf(asset: ResolvedVc<Box<dyn OutputAsset>>) -> Vc<Self> {
Self::cell(AggregatedGraph::Leaf(asset)) Self::cell(AggregatedGraph::Leaf(asset))
} }
} }
...@@ -36,7 +36,7 @@ impl AggregatedGraph { ...@@ -36,7 +36,7 @@ impl AggregatedGraph {
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn content(self: Vc<Self>) -> Result<Vc<AggregatedGraphNodeContent>> { pub async fn content(self: Vc<Self>) -> Result<Vc<AggregatedGraphNodeContent>> {
Ok(match *self.await? { Ok(match *self.await? {
AggregatedGraph::Leaf(asset) => AggregatedGraphNodeContent::Asset(asset).into(), AggregatedGraph::Leaf(asset) => AggregatedGraphNodeContent::Asset(*asset).into(),
AggregatedGraph::Node { ref content, .. } => { AggregatedGraph::Node { ref content, .. } => {
AggregatedGraphNodeContent::Children(content.clone()).into() AggregatedGraphNodeContent::Children(content.clone()).into()
} }
...@@ -50,7 +50,7 @@ impl AggregatedGraph { ...@@ -50,7 +50,7 @@ impl AggregatedGraph {
let mut refs = HashSet::new(); let mut refs = HashSet::new();
for reference in asset.references().await?.iter() { for reference in asset.references().await?.iter() {
let reference = reference.resolve().await?; let reference = reference.resolve().await?;
if asset != reference { if asset != reference.to_resolved().await? {
refs.insert(AggregatedGraph::leaf(reference)); refs.insert(AggregatedGraph::leaf(reference));
} }
} }
......
...@@ -106,7 +106,7 @@ async fn apply_module_type( ...@@ -106,7 +106,7 @@ async fn apply_module_type(
module_type: Vc<ModuleType>, module_type: Vc<ModuleType>,
reference_type: Value<ReferenceType>, reference_type: Value<ReferenceType>,
part: Option<Vc<ModulePart>>, part: Option<Vc<ModulePart>>,
inner_assets: Option<Vc<InnerAssets>>, inner_assets: Option<ResolvedVc<InnerAssets>>,
runtime_code: bool, runtime_code: bool,
) -> Result<Vc<ProcessResult>> { ) -> Result<Vc<ProcessResult>> {
let module_type = &*module_type.await?; let module_type = &*module_type.await?;
......
...@@ -140,7 +140,9 @@ impl ModuleOptions { ...@@ -140,7 +140,9 @@ impl ModuleOptions {
let ecmascript_options_vc = ecmascript_options.cell(); let ecmascript_options_vc = ecmascript_options.cell();
if let Some(env) = preset_env_versions { if let Some(env) = preset_env_versions {
transforms.push(EcmascriptInputTransform::PresetEnv(env)); transforms.push(EcmascriptInputTransform::PresetEnv(
env.to_resolved().await?,
));
} }
if let Some(enable_typeof_window_inlining) = enable_typeof_window_inlining { if let Some(enable_typeof_window_inlining) = enable_typeof_window_inlining {
...@@ -418,13 +420,13 @@ impl ModuleOptions { ...@@ -418,13 +420,13 @@ impl ModuleOptions {
vec![ModuleRuleEffect::SourceTransforms(Vc::cell(vec![ vec![ModuleRuleEffect::SourceTransforms(Vc::cell(vec![
Vc::upcast(PostCssTransform::new( Vc::upcast(PostCssTransform::new(
node_evaluate_asset_context( node_evaluate_asset_context(
execution_context, *execution_context,
Some(import_map), Some(import_map),
None, None,
"postcss".into(), "postcss".into(),
true, true,
), ),
execution_context, *execution_context,
options.config_location, options.config_location,
)), )),
]))], ]))],
...@@ -562,13 +564,13 @@ impl ModuleOptions { ...@@ -562,13 +564,13 @@ impl ModuleOptions {
vec![ModuleRuleEffect::SourceTransforms(Vc::cell(vec![ vec![ModuleRuleEffect::SourceTransforms(Vc::cell(vec![
Vc::upcast(WebpackLoaders::new( Vc::upcast(WebpackLoaders::new(
node_evaluate_asset_context( node_evaluate_asset_context(
execution_context, *execution_context,
Some(import_map), Some(import_map),
None, None,
"webpack_loaders".into(), "webpack_loaders".into(),
false, false,
), ),
execution_context, *execution_context,
rule.loaders, rule.loaders,
rule.rename_as.clone(), rule.rename_as.clone(),
resolve_options_context, resolve_options_context,
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, RcStr, ValueDefault, Vc}; use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, RcStr, ResolvedVc, ValueDefault, Vc};
use turbopack_core::{ use turbopack_core::{
chunk::MinifyType, condition::ContextCondition, environment::Environment, chunk::MinifyType, condition::ContextCondition, environment::Environment,
resolve::options::ImportMapping, resolve::options::ImportMapping,
...@@ -119,8 +119,8 @@ pub struct ModuleOptionsContext { ...@@ -119,8 +119,8 @@ pub struct ModuleOptionsContext {
pub enable_mdx: bool, pub enable_mdx: bool,
pub enable_mdx_rs: Option<Vc<MdxTransformOptions>>, pub enable_mdx_rs: Option<Vc<MdxTransformOptions>>,
pub preset_env_versions: Option<Vc<Environment>>, pub preset_env_versions: Option<ResolvedVc<Environment>>,
pub execution_context: Option<Vc<ExecutionContext>>, pub execution_context: Option<ResolvedVc<ExecutionContext>>,
pub side_effect_free_packages: Vec<RcStr>, pub side_effect_free_packages: Vec<RcStr>,
pub tree_shaking_mode: Option<TreeShakingMode>, pub tree_shaking_mode: Option<TreeShakingMode>,
...@@ -142,7 +142,7 @@ pub struct EcmascriptOptionsContext { ...@@ -142,7 +142,7 @@ pub struct EcmascriptOptionsContext {
/// normal resolution. /// normal resolution.
pub enable_types: bool, pub enable_types: bool,
pub enable_typescript_transform: Option<Vc<TypescriptTransformOptions>>, pub enable_typescript_transform: Option<Vc<TypescriptTransformOptions>>,
pub enable_decorators: Option<Vc<DecoratorsOptions>>, pub enable_decorators: Option<ResolvedVc<DecoratorsOptions>>,
pub esm_url_rewrite_behavior: Option<UrlRewriteBehavior>, pub esm_url_rewrite_behavior: Option<UrlRewriteBehavior>,
/// References to externals from ESM imports should use `import()` and make /// References to externals from ESM imports should use `import()` and make
/// async modules. /// async modules.
......
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