Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
d710482c
Unverified
Commit
d710482c
authored
Jan 13, 2025
by
Benjamin Woodruff
Committed by
GitHub
Jan 13, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(turbopack/next-core): Use ResolvedVc in PackagesGlobs (#74712)
parent
521cdaef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
resolve.rs
crates/next-core/src/next_server/resolve.rs
+7
-8
No files found.
crates/next-core/src/next_server/resolve.rs
View file @
d710482c
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
<
Glob
>
,
request_glob
:
Vc
<
Glob
>
,
path_glob
:
Resolved
Vc
<
Glob
>
,
request_glob
:
Resolved
Vc
<
Glob
>
,
}
// TODO move that to turbo
#[turbo_tasks
::
value(transparent,
local)]
#[turbo_tasks
::
value(transparent)]
pub
struct
OptionPackagesGlobs
(
Option
<
PackagesGlobs
>
);
#[turbo_tasks
::
function]
...
...
@@ -448,8 +447,8 @@ async fn packages_glob(packages: Vc<Vec<RcStr>>) -> Result<Vc<OptionPackagesGlob
let
request_glob
=
Glob
::
new
(
format!
(
"{{{},{}/**}}"
,
packages
.join
(
","
),
packages
.join
(
"/**,"
))
.into
());
Ok
(
Vc
::
cell
(
Some
(
PackagesGlobs
{
path_glob
:
path_glob
.
resolve
()
.await
?
,
request_glob
:
request_glob
.
resolve
()
.await
?
,
path_glob
:
path_glob
.
to_resolved
()
.await
?
,
request_glob
:
request_glob
.
to_resolved
()
.await
?
,
})))
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment