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
ce36aec7
Unverified
Commit
ce36aec7
authored
Jan 28, 2026
by
Niklas Mischkulnig
Committed by
GitHub
Jan 28, 2026
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[backport] Turbopack: validate CSS without computing all paths (#83810) (#88125)
parent
aff987d5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
54 additions
and
70 deletions
+54
-70
module_graph.rs
crates/next-api/src/module_graph.rs
+54
-70
No files found.
crates/next-api/src/module_graph.rs
View file @
ce36aec7
...
@@ -16,8 +16,7 @@ use rustc_hash::FxHashMap;
...
@@ -16,8 +16,7 @@ use rustc_hash::FxHashMap;
use
tracing
::
Instrument
;
use
tracing
::
Instrument
;
use
turbo_rcstr
::{
RcStr
,
rcstr
};
use
turbo_rcstr
::{
RcStr
,
rcstr
};
use
turbo_tasks
::{
use
turbo_tasks
::{
CollectiblesSource
,
FxIndexMap
,
FxIndexSet
,
ResolvedVc
,
TryFlatJoinIterExt
,
TryJoinIterExt
,
CollectiblesSource
,
FxIndexMap
,
FxIndexSet
,
ResolvedVc
,
TryFlatJoinIterExt
,
TryJoinIterExt
,
Vc
,
ValueToString
,
Vc
,
};
};
use
turbo_tasks_fs
::
FileSystemPath
;
use
turbo_tasks_fs
::
FileSystemPath
;
use
turbopack
::
css
::{
CssModuleAsset
,
ModuleCssAsset
};
use
turbopack
::
css
::{
CssModuleAsset
,
ModuleCssAsset
};
...
@@ -429,8 +428,8 @@ impl ClientReferencesGraph {
...
@@ -429,8 +428,8 @@ impl ClientReferencesGraph {
#[turbo_tasks
::
value(shared)]
#[turbo_tasks
::
value(shared)]
struct
CssGlobalImportIssue
{
struct
CssGlobalImportIssue
{
parent_module
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
p
ub
p
arent_module
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
module
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
pub
module
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
}
}
impl
CssGlobalImportIssue
{
impl
CssGlobalImportIssue
{
...
@@ -512,17 +511,16 @@ type FxModuleNameMap = FxIndexMap<ResolvedVc<Box<dyn Module>>, RcStr>;
...
@@ -512,17 +511,16 @@ type FxModuleNameMap = FxIndexMap<ResolvedVc<Box<dyn Module>>, RcStr>;
#[turbo_tasks
::
value(transparent)]
#[turbo_tasks
::
value(transparent)]
struct
ModuleNameMap
(
pub
FxModuleNameMap
);
struct
ModuleNameMap
(
pub
FxModuleNameMap
);
#[tracing
::
instrument(level
=
tracing
::
Level
::
INFO,
name
=
"validate pages css imports"
,
skip_all)]
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
validate_pages_css_imports
(
async
fn
validate_pages_css_imports
(
graph
:
Vc
<
SingleModuleGraph
>
,
graph
:
Vc
<
SingleModuleGraph
>
,
is_single_page
:
bool
,
is_single_page
:
bool
,
entry
:
Vc
<
Box
<
dyn
Module
>>
,
entry
:
Vc
<
Box
<
dyn
Module
>>
,
app_module
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
app_module
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
module_name_map
:
ResolvedVc
<
ModuleNameMap
>
,
)
->
Result
<
()
>
{
)
->
Result
<
()
>
{
let
graph
=
&*
graph
.await
?
;
let
graph
=
&*
graph
.await
?
;
let
entry
=
entry
.to_resolved
()
.await
?
;
let
entry
=
entry
.to_resolved
()
.await
?
;
let
module_name_map
=
module_name_map
.await
?
;
let
entries
=
if
!
is_single_page
{
let
entries
=
if
!
is_single_page
{
if
!
graph
.has_entry_module
(
entry
)
{
if
!
graph
.has_entry_module
(
entry
)
{
...
@@ -534,33 +532,31 @@ async fn validate_pages_css_imports(
...
@@ -534,33 +532,31 @@ async fn validate_pages_css_imports(
Either
::
Right
(
graph
.entry_modules
())
Either
::
Right
(
graph
.entry_modules
())
};
};
let
mut
candidates
=
vec!
[];
graph
.traverse_edges_from_entries
(
entries
,
|
parent_info
,
node
|
{
graph
.traverse_edges_from_entries
(
entries
,
|
parent_info
,
node
|
{
let
module
=
node
.module
;
let
module
=
node
.module
;
// If the module being imported isn't a global css module, there is nothing to validate.
// If we're at a root node, there is nothing importing this module and we can skip
let
module_is_global_css
=
// any further validations.
ResolvedVc
::
try_downcast_type
::
<
CssModuleAsset
>
(
module
)
.is_some
();
let
Some
((
parent_node
,
_
))
=
parent_info
else
{
return
GraphTraversalAction
::
Continue
;
};
let
parent_module
=
parent_node
.module
;
if
!
module_is_global_css
{
// Importing CSS from _app.js is always allowed.
if
parent_module
==
app_module
{
return
GraphTraversalAction
::
Continue
;
return
GraphTraversalAction
::
Continue
;
}
}
// We allow imports of global CSS files which are inside of `node_modules`.
// If the module being imported isn't a global css module, there is nothing to validate.
let
module_name_contains_node_modules
=
module_name_map
let
module_is_global_css
=
.get
(
&
module
)
ResolvedVc
::
try_downcast_type
::
<
CssModuleAsset
>
(
module
)
.is_some
();
.is_some_and
(|
s
|
s
.contains
(
"node_modules"
));
if
module_name_contains_node_module
s
{
if
!
module_is_global_cs
s
{
return
GraphTraversalAction
::
Continue
;
return
GraphTraversalAction
::
Continue
;
}
}
// If we're at a root node, there is nothing importing this module and we can skip
// any further validations.
let
Some
((
parent_node
,
_
))
=
parent_info
else
{
return
GraphTraversalAction
::
Continue
;
};
let
parent_module
=
parent_node
.module
;
let
parent_is_css_module
=
ResolvedVc
::
try_downcast_type
::
<
ModuleCssAsset
>
(
parent_module
)
let
parent_is_css_module
=
ResolvedVc
::
try_downcast_type
::
<
ModuleCssAsset
>
(
parent_module
)
.is_some
()
.is_some
()
||
ResolvedVc
::
try_downcast_type
::
<
CssModuleAsset
>
(
parent_module
)
.is_some
();
||
ResolvedVc
::
try_downcast_type
::
<
CssModuleAsset
>
(
parent_module
)
.is_some
();
...
@@ -574,14 +570,38 @@ async fn validate_pages_css_imports(
...
@@ -574,14 +570,38 @@ async fn validate_pages_css_imports(
// the same as the app module. If it isn't we know it isn't a valid place to import global
// the same as the app module. If it isn't we know it isn't a valid place to import global
// css.
// css.
if
parent_module
!=
app_module
{
if
parent_module
!=
app_module
{
CssGlobalImportIssue
::
new
(
parent_module
,
module
)
candidates
.push
(
CssGlobalImportIssue
::
new
(
parent_module
,
module
))
.resolved_cell
()
.emit
();
}
}
GraphTraversalAction
::
Continue
GraphTraversalAction
::
Continue
})
?
;
})
?
;
candidates
.into_iter
()
.map
(
async
|
issue
|
{
// We allow imports of global CSS files which are inside of `node_modules`.
Ok
(
if
!
issue
.module
.ident
()
.path
()
.await
?
.path
.contains
(
"/node_modules/"
)
{
Some
(
issue
)
}
else
{
None
},
)
})
.try_flat_join
()
.await
?
.into_iter
()
.for_each
(|
issue
|
{
issue
.resolved_cell
()
.emit
();
});
Ok
(())
Ok
(())
}
}
...
@@ -785,45 +805,12 @@ impl GlobalBuildInformation {
...
@@ -785,45 +805,12 @@ impl GlobalBuildInformation {
entry
:
Vc
<
Box
<
dyn
Module
>>
,
entry
:
Vc
<
Box
<
dyn
Module
>>
,
app_module
:
Vc
<
Box
<
dyn
Module
>>
,
app_module
:
Vc
<
Box
<
dyn
Module
>>
,
)
->
Result
<
()
>
{
)
->
Result
<
()
>
{
let
span
=
tracing
::
info_span!
(
"validate pages css imports"
);
async
move
{
let
graphs
=
&
self
.bare_graphs.await
?
.graphs
;
let
graphs
=
&
self
.bare_graphs.await
?
.graphs
;
// We need to collect the module names here to pass into the
// `validate_pages_css_imports` function. This is because the function is
// called for each graph, and we need to know the module names of the parent
// modules to determine if the import is valid. We can't do this in the
// called function because it's within a closure that can't resolve turbo tasks.
let
graph_to_module_ident_tuples
=
async
|
graph
:
&
ResolvedVc
<
SingleModuleGraph
>
|
{
graph
.await
?
.graph
.node_weights
()
.map
(
async
|
n
|
Ok
((
n
.module
(),
n
.module
()
.ident
()
.to_string
()
.owned
()
.await
?
)))
.try_join
()
.await
};
let
identifier_map
=
graphs
.iter
()
.map
(
graph_to_module_ident_tuples
)
.try_join
()
.await
?
.into_iter
()
.flatten
()
.collect
::
<
FxIndexMap
<
_
,
_
>>
();
let
identifier_map
=
ModuleNameMap
(
identifier_map
)
.cell
();
graphs
graphs
.iter
()
.iter
()
.map
(|
graph
|
{
.map
(|
graph
|
{
validate_pages_css_imports
(
validate_pages_css_imports
(
**
graph
,
self
.is_single_page
,
entry
,
app_module
)
**
graph
,
self
.is_single_page
,
entry
,
app_module
,
identifier_map
,
)
.as_side_effect
()
.as_side_effect
()
})
})
.try_join
()
.try_join
()
...
@@ -831,9 +818,6 @@ impl GlobalBuildInformation {
...
@@ -831,9 +818,6 @@ impl GlobalBuildInformation {
Ok
(())
Ok
(())
}
}
.instrument
(
span
)
.await
}
}
}
#[turbo_tasks
::
function(operation)]
#[turbo_tasks
::
function(operation)]
...
...
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