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
608eec05
Unverified
Commit
608eec05
authored
Jan 12, 2026
by
Andrew Imm
Committed by
GitHub
Jan 12, 2026
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[Turbopack] Move DirList to its own module" (#88441)
Reverts vercel/next.js#88256
parent
e04dad29
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
115 additions
and
316 deletions
+115
-316
Cargo.lock
Cargo.lock
+0
-1
Cargo.toml
turbopack/crates/turbopack-ecmascript/Cargo.toml
+0
-1
dir_list.rs
...ck/crates/turbopack-ecmascript/src/references/dir_list.rs
+0
-309
mod.rs
turbopack/crates/turbopack-ecmascript/src/references/mod.rs
+0
-1
require_context.rs
...es/turbopack-ecmascript/src/references/require_context.rs
+115
-4
No files found.
Cargo.lock
View file @
608eec05
...
@@ -9867,7 +9867,6 @@ dependencies = [
...
@@ -9867,7 +9867,6 @@ dependencies = [
"strsim 0.11.1",
"strsim 0.11.1",
"swc_core",
"swc_core",
"swc_sourcemap",
"swc_sourcemap",
"tempfile",
"tokio",
"tokio",
"tracing",
"tracing",
"turbo-bincode",
"turbo-bincode",
...
...
turbopack/crates/turbopack-ecmascript/Cargo.toml
View file @
608eec05
...
@@ -88,7 +88,6 @@ swc_core = { workspace = true, features = [
...
@@ -88,7 +88,6 @@ swc_core = { workspace = true, features = [
[dev-dependencies]
[dev-dependencies]
criterion
=
{
workspace
=
true
,
features
=
["async_tokio"]
}
criterion
=
{
workspace
=
true
,
features
=
["async_tokio"]
}
tempfile
=
{
workspace
=
true
}
turbo-tasks-backend
=
{
workspace
=
true
}
turbo-tasks-backend
=
{
workspace
=
true
}
turbo-tasks-malloc
=
{
workspace
=
true
}
turbo-tasks-malloc
=
{
workspace
=
true
}
turbo-tasks-testing
=
{
workspace
=
true
}
turbo-tasks-testing
=
{
workspace
=
true
}
...
...
turbopack/crates/turbopack-ecmascript/src/references/dir_list.rs
deleted
100644 → 0
View file @
e04dad29
This diff is collapsed.
Click to expand it.
turbopack/crates/turbopack-ecmascript/src/references/mod.rs
View file @
608eec05
...
@@ -3,7 +3,6 @@ pub mod async_module;
...
@@ -3,7 +3,6 @@ pub mod async_module;
pub
mod
cjs
;
pub
mod
cjs
;
pub
mod
constant_condition
;
pub
mod
constant_condition
;
pub
mod
constant_value
;
pub
mod
constant_value
;
pub
mod
dir_list
;
pub
mod
dynamic_expression
;
pub
mod
dynamic_expression
;
pub
mod
esm
;
pub
mod
esm
;
pub
mod
exports_info
;
pub
mod
exports_info
;
...
...
turbopack/crates/turbopack-ecmascript/src/references/require_context.rs
View file @
608eec05
use
std
::{
borrow
::
Cow
,
sync
::
Arc
};
use
std
::{
borrow
::
Cow
,
collections
::
VecDeque
,
sync
::
Arc
};
use
anyhow
::{
Result
,
bail
};
use
anyhow
::{
Result
,
bail
};
use
bincode
::{
Decode
,
Encode
};
use
bincode
::{
Decode
,
Encode
};
...
@@ -19,7 +19,7 @@ use turbo_tasks::{
...
@@ -19,7 +19,7 @@ use turbo_tasks::{
FxIndexMap
,
NonLocalValue
,
ResolvedVc
,
ValueToString
,
Vc
,
debug
::
ValueDebugFormat
,
FxIndexMap
,
NonLocalValue
,
ResolvedVc
,
ValueToString
,
Vc
,
debug
::
ValueDebugFormat
,
trace
::
TraceRawVcs
,
trace
::
TraceRawVcs
,
};
};
use
turbo_tasks_fs
::
FileSystemPath
;
use
turbo_tasks_fs
::
{
DirectoryContent
,
DirectoryEntry
,
FileSystemPath
}
;
use
turbopack_core
::{
use
turbopack_core
::{
asset
::{
Asset
,
AssetContent
},
asset
::{
Asset
,
AssetContent
},
chunk
::{
chunk
::{
...
@@ -47,13 +47,124 @@ use crate::{
...
@@ -47,13 +47,124 @@ use crate::{
create_visitor
,
create_visitor
,
references
::{
references
::{
AstPath
,
AstPath
,
dir_list
::{
DirListFilter
,
FlatDirList
},
pattern_mapping
::{
PatternMapping
,
ResolveType
},
pattern_mapping
::{
PatternMapping
,
ResolveType
},
},
},
runtime_functions
::{
TURBOPACK_EXPORT_VALUE
,
TURBOPACK_MODULE_CONTEXT
,
TURBOPACK_REQUIRE
},
runtime_functions
::{
TURBOPACK_EXPORT_VALUE
,
TURBOPACK_MODULE_CONTEXT
,
TURBOPACK_REQUIRE
},
utils
::
module_id_to_lit
,
utils
::
module_id_to_lit
,
};
};
#[turbo_tasks
::
value]
#[derive(Debug)]
pub
(
crate
)
enum
DirListEntry
{
File
(
FileSystemPath
),
Dir
(
ResolvedVc
<
DirList
>
),
}
#[turbo_tasks
::
value(transparent)]
pub
(
crate
)
struct
DirList
(
#[bincode(with
=
"turbo_bincode::indexmap"
)]
FxIndexMap
<
RcStr
,
DirListEntry
>
,
);
#[turbo_tasks
::
value_impl]
impl
DirList
{
#[turbo_tasks
::
function]
pub
(
crate
)
fn
read
(
dir
:
FileSystemPath
,
recursive
:
bool
,
filter
:
Vc
<
EsRegex
>
)
->
Vc
<
Self
>
{
Self
::
read_internal
(
dir
.clone
(),
dir
,
recursive
,
filter
)
}
#[turbo_tasks
::
function]
pub
(
crate
)
async
fn
read_internal
(
root
:
FileSystemPath
,
dir
:
FileSystemPath
,
recursive
:
bool
,
filter
:
Vc
<
EsRegex
>
,
)
->
Result
<
Vc
<
Self
>>
{
let
root_val
=
root
.clone
();
let
dir_val
=
dir
.clone
();
let
regex
=
&
filter
.await
?
;
let
mut
list
=
FxIndexMap
::
default
();
let
dir_content
=
dir
.read_dir
()
.await
?
;
let
entries
=
match
&*
dir_content
{
DirectoryContent
::
Entries
(
entries
)
=>
Some
(
entries
),
DirectoryContent
::
NotFound
=>
None
,
};
for
(
_
,
entry
)
in
entries
.iter
()
.flat_map
(|
m
|
m
.iter
())
{
match
entry
{
DirectoryEntry
::
File
(
path
)
=>
{
if
let
Some
(
relative_path
)
=
root_val
.get_relative_path_to
(
path
)
&&
regex
.is_match
(
&
relative_path
)
{
list
.insert
(
relative_path
,
DirListEntry
::
File
(
path
.clone
()));
}
}
DirectoryEntry
::
Directory
(
path
)
if
recursive
=>
{
if
let
Some
(
relative_path
)
=
dir_val
.get_relative_path_to
(
path
)
{
list
.insert
(
relative_path
,
DirListEntry
::
Dir
(
DirList
::
read_internal
(
root
.clone
(),
path
.clone
(),
recursive
,
filter
,
)
.to_resolved
()
.await
?
,
),
);
}
}
// ignore everything else
_
=>
{}
}
}
list
.sort_keys
();
Ok
(
Vc
::
cell
(
list
))
}
#[turbo_tasks
::
function]
async
fn
flatten
(
self
:
Vc
<
Self
>
)
->
Result
<
Vc
<
FlatDirList
>>
{
let
this
=
self
.await
?
;
let
mut
queue
=
VecDeque
::
from
([
this
]);
let
mut
list
=
FxIndexMap
::
default
();
while
let
Some
(
dir
)
=
queue
.pop_front
()
{
for
(
k
,
entry
)
in
&*
dir
{
match
entry
{
DirListEntry
::
File
(
path
)
=>
{
list
.insert
(
k
.clone
(),
path
.clone
());
}
DirListEntry
::
Dir
(
d
)
=>
{
queue
.push_back
(
d
.await
?
);
}
}
}
}
Ok
(
Vc
::
cell
(
list
))
}
}
#[turbo_tasks
::
value(transparent)]
pub
(
crate
)
struct
FlatDirList
(
#[bincode(with
=
"turbo_bincode::indexmap"
)]
FxIndexMap
<
RcStr
,
FileSystemPath
>
,
);
#[turbo_tasks
::
value_impl]
impl
FlatDirList
{
#[turbo_tasks
::
function]
pub
(
crate
)
fn
read
(
dir
:
FileSystemPath
,
recursive
:
bool
,
filter
:
Vc
<
EsRegex
>
)
->
Vc
<
Self
>
{
DirList
::
read
(
dir
,
recursive
,
filter
)
.flatten
()
}
}
#[turbo_tasks
::
value]
#[turbo_tasks
::
value]
#[derive(Debug)]
#[derive(Debug)]
pub
struct
RequireContextMapEntry
{
pub
struct
RequireContextMapEntry
{
...
@@ -81,7 +192,7 @@ impl RequireContextMap {
...
@@ -81,7 +192,7 @@ impl RequireContextMap {
)
->
Result
<
Vc
<
Self
>>
{
)
->
Result
<
Vc
<
Self
>>
{
let
origin_path
=
origin
.origin_path
()
.await
?
.parent
();
let
origin_path
=
origin
.origin_path
()
.await
?
.parent
();
let
list
=
&*
FlatDirList
::
read
(
dir
,
recursive
,
DirListFilter
::
Regex
(
filter
)
)
.await
?
;
let
list
=
&*
FlatDirList
::
read
(
dir
,
recursive
,
filter
)
.await
?
;
let
mut
map
=
FxIndexMap
::
default
();
let
mut
map
=
FxIndexMap
::
default
();
...
...
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