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
73efa184
Unverified
Commit
73efa184
authored
Jan 22, 2025
by
Niklas Mischkulnig
Committed by
GitHub
Jan 22, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turbopack: don't generate CSS for Node.js (#75117)
parent
ab874537
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
456 additions
and
187 deletions
+456
-187
app.rs
crates/next-api/src/app.rs
+185
-101
client_references.rs
crates/next-api/src/client_references.rs
+11
-8
project.rs
crates/next-api/src/project.rs
+3
-3
app_client_references_chunks.rs
...es/next-core/src/next_app/app_client_references_chunks.rs
+10
-9
css_client_reference_module.rs
...rence/css_client_reference/css_client_reference_module.rs
+107
-0
css_client_reference_transition.rs
...e/css_client_reference/css_client_reference_transition.rs
+49
-0
mod.rs
...ore/src/next_client_reference/css_client_reference/mod.rs
+2
-0
ecmascript_client_reference_transition.rs
...lient_reference/ecmascript_client_reference_transition.rs
+3
-6
mod.rs
crates/next-core/src/next_client_reference/mod.rs
+5
-0
visit_client_reference.rs
...-core/src/next_client_reference/visit_client_reference.rs
+10
-7
transforms.rs
crates/next-core/src/next_server/transforms.rs
+22
-1
reference_type.rs
turbopack/crates/turbopack-core/src/reference_type.rs
+5
-5
module_asset.rs
turbopack/crates/turbopack-css/src/module_asset.rs
+23
-15
lib.rs
turbopack/crates/turbopack/src/lib.rs
+4
-6
mod.rs
turbopack/crates/turbopack/src/module_options/mod.rs
+16
-25
module_rule.rs
turbopack/crates/turbopack/src/module_options/module_rule.rs
+1
-1
No files found.
crates/next-api/src/app.rs
View file @
73efa184
This diff is collapsed.
Click to expand it.
crates/next-api/src/client_references.rs
View file @
73efa184
...
...
@@ -2,14 +2,15 @@ use std::collections::HashMap;
use
anyhow
::
Result
;
use
next_core
::{
self
,
next_client_reference
::
EcmascriptClientReferenceModule
,
self
,
next_client_reference
::{
CssClientReferenceModule
,
EcmascriptClientReferenceModule
},
next_server_component
::
server_component_module
::
NextServerComponentModule
,
};
use
serde
::{
Deserialize
,
Serialize
};
use
turbo_tasks
::{
debug
::
ValueDebugFormat
,
trace
::
TraceRawVcs
,
NonLocalValue
,
ResolvedVc
,
TryFlatJoinIterExt
,
Vc
,
};
use
turbopack
::
css
::
CssModuleAsset
;
use
turbopack
::
css
::
chunk
::
CssChunkPlaceable
;
use
turbopack_core
::{
module
::
Module
,
module_graph
::
SingleModuleGraph
};
#[derive(
...
...
@@ -20,7 +21,7 @@ pub enum ClientReferenceMapType {
module
:
ResolvedVc
<
EcmascriptClientReferenceModule
>
,
ssr_module
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
},
CssClientReference
(
ResolvedVc
<
CssModuleAsset
>
),
CssClientReference
(
ResolvedVc
<
Box
<
dyn
CssChunkPlaceable
>
>
),
ServerComponent
(
ResolvedVc
<
NextServerComponentModule
>
),
}
...
...
@@ -38,7 +39,7 @@ pub async fn map_client_references(
let
module
=
node
.module
;
if
let
Some
(
client_reference_module
)
=
ResolvedVc
::
try_downcast_type
::
<
EcmascriptClientReferenceModule
>
(
module
)
.await
?
ResolvedVc
::
try_downcast_type
_sync
::
<
EcmascriptClientReferenceModule
>
(
module
)
{
Ok
(
Some
((
module
,
...
...
@@ -47,15 +48,17 @@ pub async fn map_client_references(
ssr_module
:
ResolvedVc
::
upcast
(
client_reference_module
.await
?
.ssr_module
),
},
)))
}
else
if
let
Some
(
c
ss_client_reference_asset
)
=
ResolvedVc
::
try_downcast_type
::
<
CssModuleAsset
>
(
module
)
.await
?
}
else
if
let
Some
(
c
lient_reference_module
)
=
ResolvedVc
::
try_downcast_type
_sync
::
<
CssClientReferenceModule
>
(
module
)
{
Ok
(
Some
((
module
,
ClientReferenceMapType
::
CssClientReference
(
css_client_reference_asset
),
ClientReferenceMapType
::
CssClientReference
(
ResolvedVc
::
upcast
(
client_reference_module
.await
?
.client_module
,
)),
)))
}
else
if
let
Some
(
server_component
)
=
ResolvedVc
::
try_downcast_type
::
<
NextServerComponentModule
>
(
module
)
.await
?
ResolvedVc
::
try_downcast_type
_sync
::
<
NextServerComponentModule
>
(
module
)
{
Ok
(
Some
((
module
,
...
...
crates/next-api/src/project.rs
View file @
73efa184
...
...
@@ -1211,7 +1211,7 @@ impl Project {
transitions
.push
((
ECMASCRIPT_CLIENT_TRANSITION_NAME
.into
(),
app_project
.edge_client_reference_transition
()
.edge_
ecmascript_
client_reference_transition
()
.to_resolved
()
.await
?
,
));
...
...
@@ -1297,7 +1297,7 @@ impl Project {
transitions
.push
((
ECMASCRIPT_CLIENT_TRANSITION_NAME
.into
(),
app_project
.client_reference_transition
()
.
ecmascript_
client_reference_transition
()
.to_resolved
()
.await
?
,
));
...
...
@@ -1352,7 +1352,7 @@ impl Project {
transitions
.push
((
ECMASCRIPT_CLIENT_TRANSITION_NAME
.into
(),
app_project
.edge_client_reference_transition
()
.edge_
ecmascript_
client_reference_transition
()
.to_resolved
()
.await
?
,
));
...
...
crates/next-core/src/next_app/app_client_references_chunks.rs
View file @
73efa184
...
...
@@ -104,9 +104,12 @@ pub async fn get_app_client_references_chunks(
},
)
}
ClientReferenceType
::
CssClientReference
(
css_
modul
e
)
=>
{
ClientReferenceType
::
CssClientReference
(
css_
client_referenc
e
)
=>
{
let
client_chunk_group
=
client_chunking_context
.root_chunk_group
(
*
ResolvedVc
::
upcast
(
css_module
),
module_graph
)
.root_chunk_group
(
*
ResolvedVc
::
upcast
(
css_client_reference
),
module_graph
,
)
.await
?
;
(
...
...
@@ -226,13 +229,11 @@ pub async fn get_app_client_references_chunks(
Ok
(
match
client_reference_ty
{
ClientReferenceType
::
EcmascriptClientReference
(
ecmascript_client_reference
,
)
=>
{
let
ecmascript_client_reference_ref
=
ecmascript_client_reference
.await
?
;
*
ResolvedVc
::
upcast
(
ecmascript_client_reference_ref
.client_module
)
}
ClientReferenceType
::
CssClientReference
(
css_module
)
=>
{
*
ResolvedVc
::
upcast
(
*
css_module
)
)
=>
*
ResolvedVc
::
upcast
(
ecmascript_client_reference
.await
?
.client_module
,
),
ClientReferenceType
::
CssClientReference
(
css_client_reference
)
=>
{
*
ResolvedVc
::
upcast
(
*
css_client_reference
)
}
})
})
...
...
crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs
0 → 100644
View file @
73efa184
use
anyhow
::{
bail
,
Result
};
use
turbo_rcstr
::
RcStr
;
use
turbo_tasks
::{
ResolvedVc
,
ValueToString
,
Vc
};
use
turbopack
::
css
::
chunk
::
CssChunkPlaceable
;
use
turbopack_core
::{
asset
::{
Asset
,
AssetContent
},
chunk
::{
ChunkGroupType
,
ChunkableModuleReference
,
ChunkingType
,
ChunkingTypeOption
},
ident
::
AssetIdent
,
module
::
Module
,
reference
::{
ModuleReference
,
ModuleReferences
},
resolve
::
ModuleResolveResult
,
};
/// A [`CssClientReferenceModule`] is a marker module used to indicate which
/// client reference should appear in the client reference manifest.
#[turbo_tasks
::
value]
pub
struct
CssClientReferenceModule
{
/// The CSS module (in the client context)
pub
client_module
:
ResolvedVc
<
Box
<
dyn
CssChunkPlaceable
>>
,
}
#[turbo_tasks
::
value_impl]
impl
CssClientReferenceModule
{
/// Create a new [`CssClientReferenceModule`] from the given source CSS
/// module.
#[turbo_tasks
::
function]
pub
fn
new
(
client_module
:
ResolvedVc
<
Box
<
dyn
CssChunkPlaceable
>>
,
)
->
Vc
<
CssClientReferenceModule
>
{
CssClientReferenceModule
{
client_module
}
.cell
()
}
}
#[turbo_tasks
::
function]
fn
css_client_reference_modifier
()
->
Vc
<
RcStr
>
{
Vc
::
cell
(
"css client reference"
.into
())
}
#[turbo_tasks
::
value_impl]
impl
Module
for
CssClientReferenceModule
{
#[turbo_tasks
::
function]
fn
ident
(
&
self
)
->
Vc
<
AssetIdent
>
{
self
.client_module
.ident
()
.with_modifier
(
css_client_reference_modifier
())
}
#[turbo_tasks
::
function]
async
fn
references
(
self
:
Vc
<
Self
>
)
->
Result
<
Vc
<
ModuleReferences
>>
{
let
CssClientReferenceModule
{
client_module
,
..
}
=
&*
self
.await
?
;
Ok
(
Vc
::
cell
(
vec!
[
ResolvedVc
::
upcast
(
CssClientReference
::
new
(
*
ResolvedVc
::
upcast
(
*
client_module
))
.to_resolved
()
.await
?
,
)]))
}
}
#[turbo_tasks
::
value_impl]
impl
Asset
for
CssClientReferenceModule
{
#[turbo_tasks
::
function]
fn
content
(
&
self
)
->
Result
<
Vc
<
AssetContent
>>
{
// The client reference asset only serves as a marker asset.
bail!
(
"CssClientReferenceModule has no content"
)
}
}
#[turbo_tasks
::
value]
pub
(
crate
)
struct
CssClientReference
{
module
:
ResolvedVc
<
Box
<
dyn
Module
>>
,
}
#[turbo_tasks
::
value_impl]
impl
CssClientReference
{
#[turbo_tasks
::
function]
pub
fn
new
(
module
:
ResolvedVc
<
Box
<
dyn
Module
>>
)
->
Vc
<
Self
>
{
Self
::
cell
(
CssClientReference
{
module
})
}
}
#[turbo_tasks
::
value_impl]
impl
ChunkableModuleReference
for
CssClientReference
{
#[turbo_tasks
::
function]
fn
chunking_type
(
&
self
)
->
Vc
<
ChunkingTypeOption
>
{
Vc
::
cell
(
Some
(
ChunkingType
::
Isolated
{
_ty
:
ChunkGroupType
::
Evaluated
,
merge_tag
:
Some
(
"client"
.into
()),
}))
}
}
#[turbo_tasks
::
value_impl]
impl
ModuleReference
for
CssClientReference
{
#[turbo_tasks
::
function]
fn
resolve_reference
(
&
self
)
->
Vc
<
ModuleResolveResult
>
{
ModuleResolveResult
::
module
(
self
.module
)
.cell
()
}
}
#[turbo_tasks
::
value_impl]
impl
ValueToString
for
CssClientReference
{
#[turbo_tasks
::
function]
fn
to_string
(
&
self
)
->
Vc
<
RcStr
>
{
Vc
::
cell
(
"css client reference to client"
.into
())
}
}
crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_transition.rs
0 → 100644
View file @
73efa184
use
anyhow
::{
Context
,
Result
};
use
turbo_tasks
::{
ResolvedVc
,
Value
,
Vc
};
use
turbopack
::{
css
::
chunk
::
CssChunkPlaceable
,
transition
::
Transition
,
ModuleAssetContext
};
use
turbopack_core
::{
context
::
ProcessResult
,
reference_type
::
ReferenceType
,
source
::
Source
};
use
crate
::
next_client_reference
::
css_client_reference
::
css_client_reference_module
::
CssClientReferenceModule
;
#[turbo_tasks
::
value(shared)]
pub
struct
NextCssClientReferenceTransition
{
client_transition
:
ResolvedVc
<
Box
<
dyn
Transition
>>
,
}
#[turbo_tasks
::
value_impl]
impl
NextCssClientReferenceTransition
{
#[turbo_tasks
::
function]
pub
fn
new
(
client_transition
:
ResolvedVc
<
Box
<
dyn
Transition
>>
)
->
Vc
<
Self
>
{
NextCssClientReferenceTransition
{
client_transition
}
.cell
()
}
}
#[turbo_tasks
::
value_impl]
impl
Transition
for
NextCssClientReferenceTransition
{
#[turbo_tasks
::
function]
async
fn
process
(
self
:
Vc
<
Self
>
,
source
:
Vc
<
Box
<
dyn
Source
>>
,
rsc_module_asset_context
:
Vc
<
ModuleAssetContext
>
,
reference_type
:
Value
<
ReferenceType
>
,
)
->
Result
<
Vc
<
ProcessResult
>>
{
let
module
=
self
.await
?
.client_transition
.process
(
source
,
rsc_module_asset_context
,
reference_type
);
let
ProcessResult
::
Module
(
module
)
=
*
module
.await
?
else
{
return
Ok
(
ProcessResult
::
Ignore
.cell
());
};
let
client_module
=
ResolvedVc
::
try_sidecast_sync
::
<
Box
<
dyn
CssChunkPlaceable
>>
(
module
)
.context
(
"css client asset is not css chunk placeable"
)
?
;
Ok
(
ProcessResult
::
Module
(
ResolvedVc
::
upcast
(
CssClientReferenceModule
::
new
(
*
client_module
)
.to_resolved
()
.await
?
,
))
.cell
())
}
}
crates/next-core/src/next_client_reference/css_client_reference/mod.rs
0 → 100644
View file @
73efa184
pub
(
crate
)
mod
css_client_reference_module
;
pub
(
crate
)
mod
css_client_reference_transition
;
crates/next-core/src/next_client_reference/ecmascript_client_reference/ecmascript_client_reference_transition.rs
View file @
73efa184
use
anyhow
::{
bail
,
Result
};
use
turbo_rcstr
::
RcStr
;
use
turbo_tasks
::{
ResolvedVc
,
Value
,
Vc
};
use
turbopack
::{
transition
::{
ContextTransition
,
Transition
},
ModuleAssetContext
,
};
use
turbopack
::{
transition
::
Transition
,
ModuleAssetContext
};
use
turbopack_core
::{
context
::
ProcessResult
,
file_source
::
FileSource
,
...
...
@@ -18,7 +15,7 @@ use crate::next_client_reference::ecmascript_client_reference::ecmascript_client
#[turbo_tasks
::
value(shared)]
pub
struct
NextEcmascriptClientReferenceTransition
{
client_transition
:
ResolvedVc
<
Box
<
dyn
Transition
>>
,
ssr_transition
:
ResolvedVc
<
ContextTransition
>
,
ssr_transition
:
ResolvedVc
<
Box
<
dyn
Transition
>
>
,
}
#[turbo_tasks
::
value_impl]
...
...
@@ -26,7 +23,7 @@ impl NextEcmascriptClientReferenceTransition {
#[turbo_tasks
::
function]
pub
fn
new
(
client_transition
:
ResolvedVc
<
Box
<
dyn
Transition
>>
,
ssr_transition
:
ResolvedVc
<
ContextTransition
>
,
ssr_transition
:
ResolvedVc
<
Box
<
dyn
Transition
>
>
,
)
->
Vc
<
Self
>
{
NextEcmascriptClientReferenceTransition
{
client_transition
,
...
...
crates/next-core/src/next_client_reference/mod.rs
View file @
73efa184
pub
(
crate
)
mod
css_client_reference
;
pub
(
crate
)
mod
ecmascript_client_reference
;
pub
(
crate
)
mod
visit_client_reference
;
pub
use
css_client_reference
::{
css_client_reference_module
::
CssClientReferenceModule
,
css_client_reference_transition
::
NextCssClientReferenceTransition
,
};
pub
use
ecmascript_client_reference
::{
ecmascript_client_reference_module
::
EcmascriptClientReferenceModule
,
ecmascript_client_reference_transition
::
NextEcmascriptClientReferenceTransition
,
...
...
crates/next-core/src/next_client_reference/visit_client_reference.rs
View file @
73efa184
...
...
@@ -11,11 +11,14 @@ use turbo_tasks::{
FxIndexMap
,
FxIndexSet
,
NonLocalValue
,
ReadRef
,
ResolvedVc
,
TryJoinIterExt
,
ValueToString
,
Vc
,
};
use
turbo_tasks_fs
::
FileSystemPath
;
use
turbopack
::
css
::
CssModuleAsset
;
use
turbopack
::
css
::
chunk
::
CssChunkPlaceable
;
use
turbopack_core
::{
module
::
Module
,
reference
::
primary_referenced_modules
};
use
crate
::{
next_client_reference
::
ecmascript_client_reference
::
ecmascript_client_reference_module
::
EcmascriptClientReferenceModule
,
next_client_reference
::{
ecmascript_client_reference
::
ecmascript_client_reference_module
::
EcmascriptClientReferenceModule
,
CssClientReferenceModule
,
},
next_server_component
::
server_component_module
::
NextServerComponentModule
,
next_server_utility
::
server_utility_module
::
NextServerUtilityModule
,
};
...
...
@@ -63,7 +66,7 @@ impl ClientReference {
)]
pub
enum
ClientReferenceType
{
EcmascriptClientReference
(
ResolvedVc
<
EcmascriptClientReferenceModule
>
),
CssClientReference
(
ResolvedVc
<
CssModuleAsset
>
),
CssClientReference
(
ResolvedVc
<
Box
<
dyn
CssChunkPlaceable
>
>
),
}
#[turbo_tasks
::
value(shared)]
...
...
@@ -420,8 +423,8 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
});
}
if
let
Some
(
c
ss_client_reference_asset
)
=
ResolvedVc
::
try_downcast_type
::
<
Css
ModuleAsset
>
(
*
module
)
.await
?
if
let
Some
(
c
lient_reference_module
)
=
ResolvedVc
::
try_downcast_type
::
<
Css
ClientReferenceModule
>
(
*
module
)
.await
?
{
return
Ok
(
VisitClientReferenceNode
{
state
:
node
.state
,
...
...
@@ -429,10 +432,10 @@ impl Visit<VisitClientReferenceNode> for VisitClientReference {
ClientReference
{
server_component
:
node
.state
.server_component
(),
ty
:
ClientReferenceType
::
CssClientReference
(
c
ss_client_reference_asset
,
c
lient_reference_module
.await
?
.client_module
,
),
},
c
ss_client_reference_asset
.ident
()
.to_string
()
.await
?
,
c
lient_reference_module
.ident
()
.to_string
()
.await
?
,
),
});
}
...
...
crates/next-core/src/next_server/transforms.rs
View file @
73efa184
...
...
@@ -2,7 +2,7 @@ use anyhow::Result;
use
next_custom_transforms
::
transforms
::
strip_page_exports
::
ExportFilter
;
use
turbo_rcstr
::
RcStr
;
use
turbo_tasks
::{
ResolvedVc
,
Vc
};
use
turbopack
::
module_options
::
ModuleRule
;
use
turbopack
::
module_options
::
{
ModuleRule
,
ModuleRuleEffect
,
RuleCondition
}
;
use
crate
::{
mode
::
NextMode
,
...
...
@@ -48,6 +48,27 @@ pub async fn get_next_server_transforms_rules(
}
rules
.push
(
get_next_font_transform_rule
(
mdx_rs
));
if
!
matches!
(
context_ty
,
ServerContextType
::
AppRSC
{
..
})
{
rules
.extend
([
// Ignore the internal ModuleCssAsset -> CssModuleAsset references
// The CSS Module module itself is still needed for class names
ModuleRule
::
new_internal
(
RuleCondition
::
ResourcePathEndsWith
(
".module.css"
.into
()),
vec!
[
ModuleRuleEffect
::
Ignore
],
),
]);
rules
.extend
([
// Ignore all non-module CSS references
ModuleRule
::
new
(
RuleCondition
::
all
(
vec!
[
RuleCondition
::
ResourcePathEndsWith
(
".css"
.into
()),
RuleCondition
::
not
(
RuleCondition
::
ResourcePathEndsWith
(
".module.css"
.into
())),
]),
vec!
[
ModuleRuleEffect
::
Ignore
],
),
]);
}
if
!
foreign_code
{
rules
.push
(
get_next_page_static_info_assert_rule
(
mdx_rs
,
...
...
turbopack/crates/turbopack-core/src/reference_type.rs
View file @
73efa184
...
...
@@ -167,13 +167,13 @@ impl ImportContext {
#[derive(Debug,
Clone,
Hash)]
pub
enum
CssReferenceSubType
{
AtImport
(
Option
<
ResolvedVc
<
ImportContext
>>
),
/// Reference from ModuleCssAsset to an imported ModuleCssAsset for retrieving the composed
/// class name
Compose
,
/// Reference from any asset to a CSS-parseable asset.
///
/// This marks the boundary between non-CSS and CSS assets. The Next.js App
/// Router implementation uses this to inject client references in-between
/// Global/Module CSS assets and the underlying CSS assets.
/// Reference from ModuleCssAsset to the CssModuleAsset
Internal
,
/// Used for generating the list of classes in a ModuleCssAsset
Analyze
,
Custom
(
u8
),
Undefined
,
}
...
...
turbopack/crates/turbopack-css/src/module_asset.rs
View file @
73efa184
...
...
@@ -86,15 +86,23 @@ impl Module for ModuleCssAsset {
.await
?
.iter
()
.copied
()
.chain
(
match
*
self
.inner
()
.try_into_module
()
.await
?
{
Some
(
inner
)
=>
Some
(
InternalCssAssetReference
::
new
(
*
inner
)
.to_resolved
()
.await
.map
(
ResolvedVc
::
upcast
)
?
,
),
None
=>
None
,
})
.chain
(
match
*
self
.inner
(
Value
::
new
(
ReferenceType
::
Css
(
CssReferenceSubType
::
Internal
,
)))
.try_into_module
()
.await
?
{
Some
(
inner
)
=>
Some
(
InternalCssAssetReference
::
new
(
*
inner
)
.to_resolved
()
.await
.map
(
ResolvedVc
::
upcast
)
?
,
),
None
=>
None
,
},
)
.collect
();
Ok
(
Vc
::
cell
(
references
))
...
...
@@ -156,16 +164,16 @@ struct ModuleCssClasses(FxIndexMap<String, Vec<ModuleCssClass>>);
#[turbo_tasks
::
value_impl]
impl
ModuleCssAsset
{
#[turbo_tasks
::
function]
fn
inner
(
&
self
)
->
Vc
<
ProcessResult
>
{
self
.asset_context
.process
(
*
self
.source
,
Value
::
new
(
ReferenceType
::
Css
(
CssReferenceSubType
::
Internal
)),
)
pub
fn
inner
(
&
self
,
ty
:
Value
<
ReferenceType
>
)
->
Vc
<
ProcessResult
>
{
self
.asset_context
.process
(
*
self
.source
,
Value
::
new
(
ty
.into_value
()))
}
#[turbo_tasks
::
function]
async
fn
classes
(
self
:
Vc
<
Self
>
)
->
Result
<
Vc
<
ModuleCssClasses
>>
{
let
inner
=
self
.inner
()
.module
();
let
inner
=
self
.inner
(
Value
::
new
(
ReferenceType
::
Css
(
CssReferenceSubType
::
Analyze
)))
.module
();
let
inner
=
Vc
::
try_resolve_sidecast
::
<
Box
<
dyn
ProcessCss
>>
(
inner
)
.await
?
...
...
turbopack/crates/turbopack/src/lib.rs
View file @
73efa184
...
...
@@ -231,17 +231,12 @@ async fn apply_module_type(
}
ModuleType
::
Json
=>
ResolvedVc
::
upcast
(
JsonModuleAsset
::
new
(
*
source
)
.to_resolved
()
.await
?
),
ModuleType
::
Raw
=>
ResolvedVc
::
upcast
(
RawModule
::
new
(
*
source
)
.to_resolved
()
.await
?
),
ModuleType
::
CssGlobal
=>
{
return
Ok
(
module_asset_context
.process
(
*
source
,
Value
::
new
(
ReferenceType
::
Css
(
CssReferenceSubType
::
Internal
)),
))
}
ModuleType
::
CssModule
=>
ResolvedVc
::
upcast
(
ModuleCssAsset
::
new
(
*
source
,
Vc
::
upcast
(
module_asset_context
))
.to_resolved
()
.await
?
,
),
ModuleType
::
Css
{
ty
}
=>
ResolvedVc
::
upcast
(
CssModuleAsset
::
new
(
*
source
,
...
...
@@ -541,6 +536,9 @@ async fn process_default_internal(
if
rule
.matches
(
source
,
&
path_ref
,
&
reference_type
)
.await
?
{
for
effect
in
rule
.effects
()
{
match
effect
{
ModuleRuleEffect
::
Ignore
=>
{
return
Ok
(
ProcessResult
::
Ignore
.cell
());
}
ModuleRuleEffect
::
SourceTransforms
(
transforms
)
=>
{
current_source
=
transforms
.transform
(
*
current_source
)
.to_resolved
()
.await
?
;
...
...
turbopack/crates/turbopack/src/module_options/mod.rs
View file @
73efa184
...
...
@@ -441,15 +441,11 @@ impl ModuleOptions {
}
rules
.extend
([
ModuleRule
::
new
(
RuleCondition
::
all
(
vec!
[
RuleCondition
::
ResourcePathEndsWith
(
".css"
.to_string
()),
// Only create a global CSS asset if not `@import`ed from CSS already.
RuleCondition
::
not
(
RuleCondition
::
ReferenceType
(
ReferenceType
::
Css
(
CssReferenceSubType
::
AtImport
(
None
),
))),
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
CssGlobal
)],
ModuleRule
::
new_all
(
RuleCondition
::
ResourcePathEndsWith
(
".css"
.to_string
()),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModuleAssetType
::
Default
,
})],
),
ModuleRule
::
new
(
RuleCondition
::
all
(
vec!
[
...
...
@@ -463,18 +459,6 @@ impl ModuleOptions {
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
CssModule
)],
),
ModuleRule
::
new
(
RuleCondition
::
all
(
vec!
[
RuleCondition
::
ResourcePathEndsWith
(
".css"
.to_string
()),
// Create a normal CSS asset if `@import`ed from CSS already.
RuleCondition
::
ReferenceType
(
ReferenceType
::
Css
(
CssReferenceSubType
::
AtImport
(
None
),
)),
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModuleAssetType
::
Default
,
})],
),
ModuleRule
::
new
(
RuleCondition
::
all
(
vec!
[
RuleCondition
::
ResourcePathEndsWith
(
".module.css"
.to_string
()),
...
...
@@ -487,14 +471,21 @@ impl ModuleOptions {
ty
:
CssModuleAssetType
::
Module
,
})],
),
// Ecmascript CSS Modules referencing the actual CSS module to include it
ModuleRule
::
new_internal
(
RuleCondition
::
ResourcePathEndsWith
(
".css"
.to_string
()),
RuleCondition
::
ResourcePathEndsWith
(
".
module.
css"
.to_string
()),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModuleAssetType
::
Default
,
ty
:
CssModuleAssetType
::
Module
,
})],
),
ModuleRule
::
new_internal
(
RuleCondition
::
ResourcePathEndsWith
(
".module.css"
.to_string
()),
// Ecmascript CSS Modules referencing the actual CSS module to list the classes
ModuleRule
::
new
(
RuleCondition
::
all
(
vec!
[
RuleCondition
::
ReferenceType
(
ReferenceType
::
Css
(
CssReferenceSubType
::
Analyze
,
)),
RuleCondition
::
ResourcePathEndsWith
(
".module.css"
.to_string
()),
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModuleAssetType
::
Module
,
})],
...
...
turbopack/crates/turbopack/src/module_options/module_rule.rs
View file @
73efa184
...
...
@@ -73,6 +73,7 @@ pub enum ModuleRuleEffect {
append
:
ResolvedVc
<
EcmascriptInputTransforms
>
,
},
SourceTransforms
(
ResolvedVc
<
SourceTransforms
>
),
Ignore
,
}
#[turbo_tasks
::
value(serialization
=
"auto_for_input"
,
shared)]
...
...
@@ -99,7 +100,6 @@ pub enum ModuleType {
},
Json
,
Raw
,
CssGlobal
,
CssModule
,
Css
{
ty
:
CssModuleAssetType
,
...
...
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