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

refactor(turbopack/next-core): Use ResolvedVc in PackagesGlobs (#74712)

parent 521cdaef
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, Value, Vc}; use turbo_tasks::{trace::TraceRawVcs, NonLocalValue, 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},
...@@ -428,14 +428,13 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin { ...@@ -428,14 +428,13 @@ impl AfterResolvePlugin for ExternalCjsModulesResolvePlugin {
} }
} }
#[derive(Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, Debug)] #[derive(Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, Debug, NonLocalValue)]
pub struct PackagesGlobs { pub struct PackagesGlobs {
path_glob: Vc<Glob>, path_glob: ResolvedVc<Glob>,
request_glob: Vc<Glob>, request_glob: ResolvedVc<Glob>,
} }
// TODO move that to turbo #[turbo_tasks::value(transparent)]
#[turbo_tasks::value(transparent, local)]
pub struct OptionPackagesGlobs(Option<PackagesGlobs>); pub struct OptionPackagesGlobs(Option<PackagesGlobs>);
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -448,8 +447,8 @@ async fn packages_glob(packages: Vc<Vec<RcStr>>) -> Result<Vc<OptionPackagesGlob ...@@ -448,8 +447,8 @@ async fn packages_glob(packages: Vc<Vec<RcStr>>) -> Result<Vc<OptionPackagesGlob
let request_glob = let request_glob =
Glob::new(format!("{{{},{}/**}}", packages.join(","), packages.join("/**,")).into()); Glob::new(format!("{{{},{}/**}}", packages.join(","), packages.join("/**,")).into());
Ok(Vc::cell(Some(PackagesGlobs { Ok(Vc::cell(Some(PackagesGlobs {
path_glob: path_glob.resolve().await?, path_glob: path_glob.to_resolved().await?,
request_glob: request_glob.resolve().await?, request_glob: request_glob.to_resolved().await?,
}))) })))
} }
......
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