diff --git a/crates/next-core/src/next_server/resolve.rs b/crates/next-core/src/next_server/resolve.rs index 014606c9075ff0..c493ef2f631db4 100644 --- a/crates/next-core/src/next_server/resolve.rs +++ b/crates/next-core/src/next_server/resolve.rs @@ -1,7 +1,7 @@ use anyhow::Result; use serde::{Deserialize, Serialize}; 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 turbopack_core::{ issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString}, @@ -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 { - path_glob: Vc, - request_glob: Vc, + path_glob: ResolvedVc, + request_glob: ResolvedVc, } -// TODO move that to turbo -#[turbo_tasks::value(transparent, local)] +#[turbo_tasks::value(transparent)] pub struct OptionPackagesGlobs(Option); #[turbo_tasks::function] @@ -448,8 +447,8 @@ async fn packages_glob(packages: Vc>) -> Result