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
c1f13e48
Unverified
Commit
c1f13e48
authored
Mar 13, 2026
by
Niklas Mischkulnig
Committed by
GitHub
Mar 13, 2026
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turbopack: rename CSS module structs for clarity (#91304)
parent
25447831
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
57 additions
and
57 deletions
+57
-57
module_graph.rs
crates/next-api/src/module_graph.rs
+4
-5
transforms.rs
crates/next-core/src/next_server/transforms.rs
+1
-1
reference_type.rs
turbopack/crates/turbopack-core/src/reference_type.rs
+4
-4
asset.rs
turbopack/crates/turbopack-css/src/asset.rs
+18
-17
lib.rs
turbopack/crates/turbopack-css/src/lib.rs
+2
-2
module_asset.rs
turbopack/crates/turbopack-css/src/module_asset.rs
+10
-10
process.rs
turbopack/crates/turbopack-css/src/process.rs
+5
-5
lib.rs
turbopack/crates/turbopack/src/lib.rs
+3
-3
mod.rs
turbopack/crates/turbopack/src/module_options/mod.rs
+7
-7
module_rule.rs
turbopack/crates/turbopack/src/module_options/module_rule.rs
+3
-3
No files found.
crates/next-api/src/module_graph.rs
View file @
c1f13e48
...
@@ -25,7 +25,7 @@ use turbopack_core::{
...
@@ -25,7 +25,7 @@ use turbopack_core::{
module
::
Module
,
module
::
Module
,
module_graph
::{
GraphTraversalAction
,
ModuleGraph
,
ModuleGraphLayer
},
module_graph
::{
GraphTraversalAction
,
ModuleGraph
,
ModuleGraphLayer
},
};
};
use
turbopack_css
::{
CssModule
Asset
,
ModuleCssAsset
};
use
turbopack_css
::{
CssModule
,
EcmascriptCssModule
};
use
crate
::{
use
crate
::{
client_references
::{
ClientManifestEntryType
,
ClientReferenceData
,
map_client_references
},
client_references
::{
ClientManifestEntryType
,
ClientReferenceData
,
map_client_references
},
...
@@ -809,16 +809,15 @@ async fn validate_pages_css_imports_individual(
...
@@ -809,16 +809,15 @@ async fn validate_pages_css_imports_individual(
// If the module being imported isn't a global css module, there is nothing to
// If the module being imported isn't a global css module, there is nothing to
// validate.
// validate.
let
module_is_global_css
=
let
module_is_global_css
=
ResolvedVc
::
try_downcast_type
::
<
CssModule
>
(
module
)
.is_some
();
ResolvedVc
::
try_downcast_type
::
<
CssModuleAsset
>
(
module
)
.is_some
();
if
!
module_is_global_css
{
if
!
module_is_global_css
{
return
Ok
(
GraphTraversalAction
::
Continue
);
return
Ok
(
GraphTraversalAction
::
Continue
);
}
}
let
parent_is_css_module
=
let
parent_is_css_module
=
ResolvedVc
::
try_downcast_type
::
<
ModuleCssAsset
>
(
parent_module
)
.is_some
()
ResolvedVc
::
try_downcast_type
::
<
EcmascriptCssModule
>
(
parent_module
)
.is_some
()
||
ResolvedVc
::
try_downcast_type
::
<
CssModule
Asset
>
(
parent_module
)
.is_some
();
||
ResolvedVc
::
try_downcast_type
::
<
CssModule
>
(
parent_module
)
.is_some
();
// We also always allow .module css/scss/sass files to import global css files as
// We also always allow .module css/scss/sass files to import global css files as
// well.
// well.
...
...
crates/next-core/src/next_server/transforms.rs
View file @
c1f13e48
...
@@ -60,7 +60,7 @@ pub async fn get_next_server_transforms_rules(
...
@@ -60,7 +60,7 @@ pub async fn get_next_server_transforms_rules(
if
!
matches!
(
context_ty
,
ServerContextType
::
AppRSC
{
..
})
{
if
!
matches!
(
context_ty
,
ServerContextType
::
AppRSC
{
..
})
{
rules
.extend
([
rules
.extend
([
// Ignore the inner
ModuleCssAsset -> CssModuleAsset
references
// Ignore the inner
EcmascriptCssModule -> CssModule
references
// The CSS Module module itself (and the Analyze reference) is still needed to generate
// The CSS Module module itself (and the Analyze reference) is still needed to generate
// the class names object.
// the class names object.
ModuleRule
::
new
(
ModuleRule
::
new
(
...
...
turbopack/crates/turbopack-core/src/reference_type.rs
View file @
c1f13e48
...
@@ -218,12 +218,12 @@ impl ImportContext {
...
@@ -218,12 +218,12 @@ impl ImportContext {
)]
)]
pub
enum
CssReferenceSubType
{
pub
enum
CssReferenceSubType
{
AtImport
(
Option
<
ResolvedVc
<
ImportContext
>>
),
AtImport
(
Option
<
ResolvedVc
<
ImportContext
>>
),
/// Reference from
ModuleCssAsset to an imported ModuleCssAsset for retrieving the composed
/// Reference from
EcmascriptCssModule to an imported EcmascriptCssModule for retrieving the
/// class name
/// c
omposed c
lass name
Compose
,
Compose
,
/// Reference from
ModuleCssAsset to the CssModuleAsset
/// Reference from
EcmascriptCssModule to the CssModule
Inner
,
Inner
,
/// Used for generating the list of classes in a
ModuleCssAsset
/// Used for generating the list of classes in a
EcmascriptCssModule
Analyze
,
Analyze
,
Custom
(
u8
),
Custom
(
u8
),
#[default]
#[default]
...
...
turbopack/crates/turbopack-css/src/asset.rs
View file @
c1f13e48
...
@@ -18,7 +18,7 @@ use turbopack_core::{
...
@@ -18,7 +18,7 @@ use turbopack_core::{
};
};
use
crate
::{
use
crate
::{
CssModule
Asset
Type
,
LightningCssFeatureFlags
,
CssModuleType
,
LightningCssFeatureFlags
,
chunk
::{
CssChunkItem
,
CssChunkItemContent
,
CssChunkPlaceable
,
CssChunkType
,
CssImport
},
chunk
::{
CssChunkItem
,
CssChunkItemContent
,
CssChunkPlaceable
,
CssChunkType
,
CssImport
},
code_gen
::
CodeGenerateable
,
code_gen
::
CodeGenerateable
,
process
::{
process
::{
...
@@ -32,29 +32,30 @@ use crate::{
...
@@ -32,29 +32,30 @@ use crate::{
#[turbo_tasks
::
value]
#[turbo_tasks
::
value]
#[derive(Clone)]
#[derive(Clone)]
/// A global CSS asset. Notably not a `.module.css` module, which is [`ModuleCssAsset`] instead.
/// A global CSS asset. Notably not a `.module.css` module, which is [`EcmascriptCssModule`]
pub
struct
CssModuleAsset
{
/// instead.
pub
struct
CssModule
{
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
asset_context
:
ResolvedVc
<
Box
<
dyn
AssetContext
>>
,
asset_context
:
ResolvedVc
<
Box
<
dyn
AssetContext
>>
,
import_context
:
Option
<
ResolvedVc
<
ImportContext
>>
,
import_context
:
Option
<
ResolvedVc
<
ImportContext
>>
,
ty
:
CssModule
Asset
Type
,
ty
:
CssModuleType
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
lightningcss_features
:
LightningCssFeatureFlags
,
lightningcss_features
:
LightningCssFeatureFlags
,
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
CssModule
Asset
{
impl
CssModule
{
/// Creates a new CSS asset.
/// Creates a new CSS asset.
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
pub
fn
new
(
pub
fn
new
(
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
asset_context
:
ResolvedVc
<
Box
<
dyn
AssetContext
>>
,
asset_context
:
ResolvedVc
<
Box
<
dyn
AssetContext
>>
,
ty
:
CssModule
Asset
Type
,
ty
:
CssModuleType
,
import_context
:
Option
<
ResolvedVc
<
ImportContext
>>
,
import_context
:
Option
<
ResolvedVc
<
ImportContext
>>
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
lightningcss_features
:
LightningCssFeatureFlags
,
lightningcss_features
:
LightningCssFeatureFlags
,
)
->
Vc
<
Self
>
{
)
->
Vc
<
Self
>
{
Self
::
cell
(
CssModule
Asset
{
Self
::
cell
(
CssModule
{
source
,
source
,
asset_context
,
asset_context
,
import_context
,
import_context
,
...
@@ -72,7 +73,7 @@ impl CssModuleAsset {
...
@@ -72,7 +73,7 @@ impl CssModuleAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
ParseCss
for
CssModule
Asset
{
impl
ParseCss
for
CssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
parse_css
(
self
:
Vc
<
Self
>
)
->
Result
<
Vc
<
ParseCssResult
>>
{
async
fn
parse_css
(
self
:
Vc
<
Self
>
)
->
Result
<
Vc
<
ParseCssResult
>>
{
let
this
=
self
.await
?
;
let
this
=
self
.await
?
;
...
@@ -89,7 +90,7 @@ impl ParseCss for CssModuleAsset {
...
@@ -89,7 +90,7 @@ impl ParseCss for CssModuleAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
ProcessCss
for
CssModule
Asset
{
impl
ProcessCss
for
CssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
get_css_with_placeholder
(
self
:
Vc
<
Self
>
)
->
Result
<
Vc
<
CssWithPlaceholderResult
>>
{
async
fn
get_css_with_placeholder
(
self
:
Vc
<
Self
>
)
->
Result
<
Vc
<
CssWithPlaceholderResult
>>
{
let
this
=
self
.await
?
;
let
this
=
self
.await
?
;
...
@@ -128,7 +129,7 @@ impl ProcessCss for CssModuleAsset {
...
@@ -128,7 +129,7 @@ impl ProcessCss for CssModuleAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
Module
for
CssModule
Asset
{
impl
Module
for
CssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
ident
(
&
self
)
->
Result
<
Vc
<
AssetIdent
>>
{
async
fn
ident
(
&
self
)
->
Result
<
Vc
<
AssetIdent
>>
{
let
mut
ident
=
self
let
mut
ident
=
self
...
@@ -166,18 +167,18 @@ impl Module for CssModuleAsset {
...
@@ -166,18 +167,18 @@ impl Module for CssModuleAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
StyleModule
for
CssModule
Asset
{
impl
StyleModule
for
CssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
style_type
(
&
self
)
->
Vc
<
StyleType
>
{
fn
style_type
(
&
self
)
->
Vc
<
StyleType
>
{
match
self
.ty
{
match
self
.ty
{
CssModule
Asset
Type
::
Default
=>
StyleType
::
GlobalStyle
.cell
(),
CssModuleType
::
Default
=>
StyleType
::
GlobalStyle
.cell
(),
CssModule
Asset
Type
::
Module
=>
StyleType
::
IsolatedStyle
.cell
(),
CssModuleType
::
Module
=>
StyleType
::
IsolatedStyle
.cell
(),
}
}
}
}
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
ChunkableModule
for
CssModule
Asset
{
impl
ChunkableModule
for
CssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
as_chunk_item
(
fn
as_chunk_item
(
self
:
ResolvedVc
<
Self
>
,
self
:
ResolvedVc
<
Self
>
,
...
@@ -193,10 +194,10 @@ impl ChunkableModule for CssModuleAsset {
...
@@ -193,10 +194,10 @@ impl ChunkableModule for CssModuleAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
CssChunkPlaceable
for
CssModule
Asset
{}
impl
CssChunkPlaceable
for
CssModule
{}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
ResolveOrigin
for
CssModule
Asset
{
impl
ResolveOrigin
for
CssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
origin_path
(
&
self
)
->
Vc
<
FileSystemPath
>
{
fn
origin_path
(
&
self
)
->
Vc
<
FileSystemPath
>
{
self
.source
.ident
()
.path
()
self
.source
.ident
()
.path
()
...
@@ -210,7 +211,7 @@ impl ResolveOrigin for CssModuleAsset {
...
@@ -210,7 +211,7 @@ impl ResolveOrigin for CssModuleAsset {
#[turbo_tasks
::
value]
#[turbo_tasks
::
value]
struct
CssModuleChunkItem
{
struct
CssModuleChunkItem
{
module
:
ResolvedVc
<
CssModule
Asset
>
,
module
:
ResolvedVc
<
CssModule
>
,
module_graph
:
ResolvedVc
<
ModuleGraph
>
,
module_graph
:
ResolvedVc
<
ModuleGraph
>
,
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
chunking_context
:
ResolvedVc
<
Box
<
dyn
ChunkingContext
>>
,
}
}
...
...
turbopack/crates/turbopack-css/src/lib.rs
View file @
c1f13e48
...
@@ -18,7 +18,7 @@ use bincode::{Decode, Encode};
...
@@ -18,7 +18,7 @@ use bincode::{Decode, Encode};
use
turbo_tasks
::{
NonLocalValue
,
TaskInput
,
trace
::
TraceRawVcs
};
use
turbo_tasks
::{
NonLocalValue
,
TaskInput
,
trace
::
TraceRawVcs
};
use
crate
::
references
::
import
::
ImportAssetReference
;
use
crate
::
references
::
import
::
ImportAssetReference
;
pub
use
crate
::{
asset
::
CssModule
Asset
,
module_asset
::
ModuleCssAsset
,
process
::
*
};
pub
use
crate
::{
asset
::
CssModule
,
module_asset
::
EcmascriptCssModule
,
process
::
*
};
#[derive(
#[derive(
PartialOrd,
PartialOrd,
...
@@ -36,7 +36,7 @@ pub use crate::{asset::CssModuleAsset, module_asset::ModuleCssAsset, process::*}
...
@@ -36,7 +36,7 @@ pub use crate::{asset::CssModuleAsset, module_asset::ModuleCssAsset, process::*}
Encode,
Encode,
Decode,
Decode,
)]
)]
pub
enum
CssModule
Asset
Type
{
pub
enum
CssModuleType
{
/// Default parsing mode.
/// Default parsing mode.
#[default]
#[default]
Default
,
Default
,
...
...
turbopack/crates/turbopack-css/src/module_asset.rs
View file @
c1f13e48
...
@@ -38,20 +38,20 @@ use crate::{
...
@@ -38,20 +38,20 @@ use crate::{
#[turbo_tasks
::
value]
#[turbo_tasks
::
value]
#[derive(Clone)]
#[derive(Clone)]
/// A CSS Module asset, as in `.module.css`. For a global CSS module, see [`CssModule
Asset
`].
/// A CSS Module asset, as in `.module.css`. For a global CSS module, see [`CssModule`].
pub
struct
ModuleCssAsset
{
pub
struct
EcmascriptCssModule
{
pub
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
pub
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
pub
asset_context
:
ResolvedVc
<
Box
<
dyn
AssetContext
>>
,
pub
asset_context
:
ResolvedVc
<
Box
<
dyn
AssetContext
>>
,
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
ModuleCssAsset
{
impl
EcmascriptCssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
pub
fn
new
(
pub
fn
new
(
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
asset_context
:
ResolvedVc
<
Box
<
dyn
AssetContext
>>
,
asset_context
:
ResolvedVc
<
Box
<
dyn
AssetContext
>>
,
)
->
Vc
<
Self
>
{
)
->
Vc
<
Self
>
{
Self
::
cell
(
ModuleCssAsset
{
Self
::
cell
(
EcmascriptCssModule
{
source
,
source
,
asset_context
,
asset_context
,
})
})
...
@@ -59,7 +59,7 @@ impl ModuleCssAsset {
...
@@ -59,7 +59,7 @@ impl ModuleCssAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
Module
for
ModuleCssAsset
{
impl
Module
for
EcmascriptCssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
async
fn
ident
(
&
self
)
->
Result
<
Vc
<
AssetIdent
>>
{
async
fn
ident
(
&
self
)
->
Result
<
Vc
<
AssetIdent
>>
{
Ok
(
self
Ok
(
self
...
@@ -164,7 +164,7 @@ struct ModuleCssClasses(
...
@@ -164,7 +164,7 @@ struct ModuleCssClasses(
);
);
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
ModuleCssAsset
{
impl
EcmascriptCssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
pub
fn
inner
(
&
self
,
ty
:
ReferenceType
)
->
Vc
<
ProcessResult
>
{
pub
fn
inner
(
&
self
,
ty
:
ReferenceType
)
->
Vc
<
ProcessResult
>
{
self
.asset_context
.process
(
*
self
.source
,
ty
)
self
.asset_context
.process
(
*
self
.source
,
ty
)
...
@@ -244,7 +244,7 @@ impl ModuleCssAsset {
...
@@ -244,7 +244,7 @@ impl ModuleCssAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
ChunkableModule
for
ModuleCssAsset
{
impl
ChunkableModule
for
EcmascriptCssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
as_chunk_item
(
fn
as_chunk_item
(
self
:
ResolvedVc
<
Self
>
,
self
:
ResolvedVc
<
Self
>
,
...
@@ -256,7 +256,7 @@ impl ChunkableModule for ModuleCssAsset {
...
@@ -256,7 +256,7 @@ impl ChunkableModule for ModuleCssAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
EcmascriptChunkPlaceable
for
ModuleCssAsset
{
impl
EcmascriptChunkPlaceable
for
EcmascriptCssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
get_exports
(
&
self
)
->
Vc
<
EcmascriptExports
>
{
fn
get_exports
(
&
self
)
->
Vc
<
EcmascriptExports
>
{
EcmascriptExports
::
Value
.cell
()
EcmascriptExports
::
Value
.cell
()
...
@@ -303,7 +303,7 @@ impl EcmascriptChunkPlaceable for ModuleCssAsset {
...
@@ -303,7 +303,7 @@ impl EcmascriptChunkPlaceable for ModuleCssAsset {
};
};
let
Some
(
css_module
)
=
let
Some
(
css_module
)
=
ResolvedVc
::
try_downcast_type
::
<
ModuleCssAsset
>
(
*
resolved_module
)
ResolvedVc
::
try_downcast_type
::
<
EcmascriptCssModule
>
(
*
resolved_module
)
else
{
else
{
CssModuleComposesIssue
{
CssModuleComposesIssue
{
severity
:
IssueSeverity
::
Error
,
severity
:
IssueSeverity
::
Error
,
...
@@ -371,7 +371,7 @@ impl EcmascriptChunkPlaceable for ModuleCssAsset {
...
@@ -371,7 +371,7 @@ impl EcmascriptChunkPlaceable for ModuleCssAsset {
}
}
#[turbo_tasks
::
value_impl]
#[turbo_tasks
::
value_impl]
impl
ResolveOrigin
for
ModuleCssAsset
{
impl
ResolveOrigin
for
EcmascriptCssModule
{
#[turbo_tasks
::
function]
#[turbo_tasks
::
function]
fn
origin_path
(
&
self
)
->
Vc
<
FileSystemPath
>
{
fn
origin_path
(
&
self
)
->
Vc
<
FileSystemPath
>
{
self
.source
.ident
()
.path
()
self
.source
.ident
()
.path
()
...
...
turbopack/crates/turbopack-css/src/process.rs
View file @
c1f13e48
...
@@ -35,7 +35,7 @@ use turbopack_core::{
...
@@ -35,7 +35,7 @@ use turbopack_core::{
};
};
use
crate
::{
use
crate
::{
CssModule
Asset
Type
,
LightningCssFeatureFlags
,
CssModuleType
,
LightningCssFeatureFlags
,
lifetime_util
::
stylesheet_into_static
,
lifetime_util
::
stylesheet_into_static
,
references
::{
references
::{
analyze_references
,
analyze_references
,
...
@@ -363,7 +363,7 @@ pub async fn parse_css(
...
@@ -363,7 +363,7 @@ pub async fn parse_css(
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
origin
:
ResolvedVc
<
Box
<
dyn
ResolveOrigin
>>
,
origin
:
ResolvedVc
<
Box
<
dyn
ResolveOrigin
>>
,
import_context
:
Option
<
ResolvedVc
<
ImportContext
>>
,
import_context
:
Option
<
ResolvedVc
<
ImportContext
>>
,
ty
:
CssModule
Asset
Type
,
ty
:
CssModuleType
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
feature_flags
:
LightningCssFeatureFlags
,
feature_flags
:
LightningCssFeatureFlags
,
)
->
Result
<
Vc
<
ParseCssResult
>>
{
)
->
Result
<
Vc
<
ParseCssResult
>>
{
...
@@ -409,7 +409,7 @@ async fn process_content(
...
@@ -409,7 +409,7 @@ async fn process_content(
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
source
:
ResolvedVc
<
Box
<
dyn
Source
>>
,
origin
:
ResolvedVc
<
Box
<
dyn
ResolveOrigin
>>
,
origin
:
ResolvedVc
<
Box
<
dyn
ResolveOrigin
>>
,
import_context
:
Option
<
ResolvedVc
<
ImportContext
>>
,
import_context
:
Option
<
ResolvedVc
<
ImportContext
>>
,
ty
:
CssModule
Asset
Type
,
ty
:
CssModuleType
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
feature_flags
:
LightningCssFeatureFlags
,
feature_flags
:
LightningCssFeatureFlags
,
)
->
Result
<
Vc
<
ParseCssResult
>>
{
)
->
Result
<
Vc
<
ParseCssResult
>>
{
...
@@ -427,7 +427,7 @@ async fn process_content(
...
@@ -427,7 +427,7 @@ async fn process_content(
let
config
=
ParserOptions
{
let
config
=
ParserOptions
{
css_modules
:
match
ty
{
css_modules
:
match
ty
{
CssModule
Asset
Type
::
Module
=>
Some
(
lightningcss
::
css_modules
::
Config
{
CssModuleType
::
Module
=>
Some
(
lightningcss
::
css_modules
::
Config
{
pattern
:
Pattern
{
pattern
:
Pattern
{
segments
:
smallvec!
[
segments
:
smallvec!
[
Segment
::
Name
,
Segment
::
Name
,
...
@@ -461,7 +461,7 @@ async fn process_content(
...
@@ -461,7 +461,7 @@ async fn process_content(
},
},
)
{
)
{
Ok
(
mut
ss
)
=>
{
Ok
(
mut
ss
)
=>
{
if
matches!
(
ty
,
CssModule
Asset
Type
::
Module
)
{
if
matches!
(
ty
,
CssModuleType
::
Module
)
{
let
mut
validator
=
CssValidator
{
errors
:
Vec
::
new
()
};
let
mut
validator
=
CssValidator
{
errors
:
Vec
::
new
()
};
ss
.visit
(
&
mut
validator
)
.unwrap
();
ss
.visit
(
&
mut
validator
)
.unwrap
();
...
...
turbopack/crates/turbopack/src/lib.rs
View file @
c1f13e48
...
@@ -43,7 +43,7 @@ use turbopack_core::{
...
@@ -43,7 +43,7 @@ use turbopack_core::{
source
::
Source
,
source
::
Source
,
source_transform
::
SourceTransforms
,
source_transform
::
SourceTransforms
,
};
};
use
turbopack_css
::{
CssModule
Asset
,
ModuleCssAsset
};
use
turbopack_css
::{
CssModule
,
EcmascriptCssModule
};
use
turbopack_ecmascript
::{
use
turbopack_ecmascript
::{
AnalyzeMode
,
EcmascriptInputTransforms
,
EcmascriptModuleAsset
,
EcmascriptModuleAssetType
,
AnalyzeMode
,
EcmascriptInputTransforms
,
EcmascriptModuleAsset
,
EcmascriptModuleAssetType
,
EcmascriptOptions
,
TreeShakingMode
,
EcmascriptOptions
,
TreeShakingMode
,
...
@@ -249,7 +249,7 @@ async fn apply_module_type(
...
@@ -249,7 +249,7 @@ async fn apply_module_type(
ResolvedVc
::
upcast
(
NodeAddonModule
::
new
(
*
source
)
.to_resolved
()
.await
?
)
ResolvedVc
::
upcast
(
NodeAddonModule
::
new
(
*
source
)
.to_resolved
()
.await
?
)
}
}
ModuleType
::
CssModule
=>
ResolvedVc
::
upcast
(
ModuleType
::
CssModule
=>
ResolvedVc
::
upcast
(
ModuleCssAsset
::
new
(
*
source
,
Vc
::
upcast
(
module_asset_context
))
EcmascriptCssModule
::
new
(
*
source
,
Vc
::
upcast
(
module_asset_context
))
.to_resolved
()
.to_resolved
()
.await
?
,
.await
?
,
),
),
...
@@ -259,7 +259,7 @@ async fn apply_module_type(
...
@@ -259,7 +259,7 @@ async fn apply_module_type(
environment
,
environment
,
lightningcss_features
,
lightningcss_features
,
}
=>
ResolvedVc
::
upcast
(
}
=>
ResolvedVc
::
upcast
(
CssModule
Asset
::
new
(
CssModule
::
new
(
*
source
,
*
source
,
Vc
::
upcast
(
module_asset_context
),
Vc
::
upcast
(
module_asset_context
),
*
ty
,
*
ty
,
...
...
turbopack/crates/turbopack/src/module_options/mod.rs
View file @
c1f13e48
...
@@ -25,7 +25,7 @@ use turbopack_core::{
...
@@ -25,7 +25,7 @@ use turbopack_core::{
},
},
resolve
::
options
::{
ImportMap
,
ImportMapping
},
resolve
::
options
::{
ImportMap
,
ImportMapping
},
};
};
use
turbopack_css
::
CssModule
Asset
Type
;
use
turbopack_css
::
CssModuleType
;
use
turbopack_ecmascript
::{
use
turbopack_ecmascript
::{
AnalyzeMode
,
EcmascriptInputTransform
,
EcmascriptInputTransforms
,
EcmascriptOptions
,
AnalyzeMode
,
EcmascriptInputTransform
,
EcmascriptInputTransforms
,
EcmascriptOptions
,
SpecifiedModuleType
,
bytes_source_transform
::
BytesSourceTransform
,
SpecifiedModuleType
,
bytes_source_transform
::
BytesSourceTransform
,
...
@@ -819,7 +819,7 @@ impl ModuleOptions {
...
@@ -819,7 +819,7 @@ impl ModuleOptions {
ModuleRule
::
new
(
ModuleRule
::
new
(
module_css_condition
.clone
(),
module_css_condition
.clone
(),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModule
Asset
Type
::
Module
,
ty
:
CssModuleType
::
Module
,
environment
,
environment
,
lightningcss_features
,
lightningcss_features
,
})],
})],
...
@@ -830,7 +830,7 @@ impl ModuleOptions {
...
@@ -830,7 +830,7 @@ impl ModuleOptions {
RuleCondition
::
ContentTypeStartsWith
(
"text/css"
.to_string
()),
RuleCondition
::
ContentTypeStartsWith
(
"text/css"
.to_string
()),
]),
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModule
Asset
Type
::
Default
,
ty
:
CssModuleType
::
Default
,
environment
,
environment
,
lightningcss_features
,
lightningcss_features
,
})],
})],
...
@@ -894,7 +894,7 @@ impl ModuleOptions {
...
@@ -894,7 +894,7 @@ impl ModuleOptions {
))),
))),
]),
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModule
Asset
Type
::
Module
,
ty
:
CssModuleType
::
Module
,
environment
,
environment
,
lightningcss_features
,
lightningcss_features
,
})],
})],
...
@@ -908,7 +908,7 @@ impl ModuleOptions {
...
@@ -908,7 +908,7 @@ impl ModuleOptions {
))),
))),
]),
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModule
Asset
Type
::
Module
,
ty
:
CssModuleType
::
Module
,
environment
,
environment
,
lightningcss_features
,
lightningcss_features
,
})],
})],
...
@@ -922,7 +922,7 @@ impl ModuleOptions {
...
@@ -922,7 +922,7 @@ impl ModuleOptions {
))),
))),
]),
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModule
Asset
Type
::
Module
,
ty
:
CssModuleType
::
Module
,
environment
,
environment
,
lightningcss_features
,
lightningcss_features
,
})],
})],
...
@@ -937,7 +937,7 @@ impl ModuleOptions {
...
@@ -937,7 +937,7 @@ impl ModuleOptions {
RuleCondition
::
ContentTypeStartsWith
(
"text/css"
.to_string
()),
RuleCondition
::
ContentTypeStartsWith
(
"text/css"
.to_string
()),
]),
]),
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
vec!
[
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModule
Asset
Type
::
Default
,
ty
:
CssModuleType
::
Default
,
environment
,
environment
,
lightningcss_features
,
lightningcss_features
,
})],
})],
...
...
turbopack/crates/turbopack/src/module_options/module_rule.rs
View file @
c1f13e48
...
@@ -9,7 +9,7 @@ use turbopack_core::{
...
@@ -9,7 +9,7 @@ use turbopack_core::{
environment
::
Environment
,
reference_type
::
ReferenceType
,
source
::
Source
,
environment
::
Environment
,
reference_type
::
ReferenceType
,
source
::
Source
,
source_transform
::
SourceTransforms
,
source_transform
::
SourceTransforms
,
};
};
use
turbopack_css
::
CssModule
Asset
Type
;
use
turbopack_css
::
CssModuleType
;
use
turbopack_ecmascript
::{
use
turbopack_ecmascript
::{
EcmascriptInputTransforms
,
EcmascriptOptions
,
bytes_source_transform
::
BytesSourceTransform
,
EcmascriptInputTransforms
,
EcmascriptOptions
,
bytes_source_transform
::
BytesSourceTransform
,
json_source_transform
::
JsonSourceTransform
,
json_source_transform
::
JsonSourceTransform
,
...
@@ -140,7 +140,7 @@ pub enum ModuleType {
...
@@ -140,7 +140,7 @@ pub enum ModuleType {
NodeAddon
,
NodeAddon
,
CssModule
,
CssModule
,
Css
{
Css
{
ty
:
CssModule
Asset
Type
,
ty
:
CssModuleType
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
environment
:
Option
<
ResolvedVc
<
Environment
>>
,
lightningcss_features
:
turbopack_css
::
LightningCssFeatureFlags
,
lightningcss_features
:
turbopack_css
::
LightningCssFeatureFlags
,
},
},
...
@@ -264,7 +264,7 @@ impl ConfiguredModuleType {
...
@@ -264,7 +264,7 @@ impl ConfiguredModuleType {
})
})
}
}
ConfiguredModuleType
::
Css
=>
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ConfiguredModuleType
::
Css
=>
ModuleRuleEffect
::
ModuleType
(
ModuleType
::
Css
{
ty
:
CssModule
Asset
Type
::
Default
,
ty
:
CssModuleType
::
Default
,
environment
,
environment
,
lightningcss_features
,
lightningcss_features
,
}),
}),
...
...
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