Pass environment

Author: timneutkens

crates/next-core/src/next_client/context.rs

@@ -289,7 +289,6 @@ pub async fn get_client_module_options_context(
         .tree_shaking_mode_for_foreign_code(next_mode.is_development())
         .await?;
     let target_browsers = env.runtime_versions();
-    let browserslist_query = env.browserslist_query().owned().await?;
 
     let mut next_client_rules =
         get_next_client_transforms_rules(next_config, ty, mode, false, encryption_key).await?;
@@ -340,7 +339,6 @@ pub async fn get_client_module_options_context(
             ..Default::default()
         },
         css: CssOptionsContext {
-            browserslist_query,
             source_maps,
             ..Default::default()
         },

turbopack/crates/turbopack-css/src/asset.rs

@@ -82,7 +82,7 @@ impl ParseCss for CssModuleAsset {
             Vc::upcast(self),
             this.import_context.map(|v| *v),
             this.ty,
-            this.environment,
+            *this.environment,
         ))
     }
 }
@@ -94,7 +94,10 @@ impl ProcessCss for CssModuleAsset {
         let this = self.await?;
         let parse_result = self.parse_css();
 
-        Ok(process_css_with_placeholder(parse_result, this.environment))
+        Ok(process_css_with_placeholder(
+            parse_result,
+            *this.environment,
+        ))
     }
 
     #[turbo_tasks::function]
@@ -116,7 +119,7 @@ impl ProcessCss for CssModuleAsset {
             chunking_context,
             minify_type,
             origin_source_map,
-            this.environment,
+            *this.environment,
         ))
     }
 }

turbopack/crates/turbopack-css/src/process.rs

@@ -309,7 +309,7 @@ pub async fn finalize_css(
                     true,
                     true,
                     origin_source_map,
-                    environment,
+                    environment.to_resolved().await?,
                 )
                 .await?;
 

turbopack/crates/turbopack/src/lib.rs

@@ -247,7 +247,7 @@ async fn apply_module_type(
                     .css
                     .minify_type,
                 css_import_context,
-                environment,
+                **environment,
             )
             .to_resolved()
             .await?,

turbopack/crates/turbopack/src/module_options/mod.rs

@@ -133,7 +133,6 @@ impl ModuleOptions {
             enable_mdx_rs,
             css:
                 CssOptionsContext {
-                    ref browserslist_query,
                     enable_raw_css,
                     source_maps: css_source_maps,
                     ..
@@ -438,6 +437,12 @@ impl ModuleOptions {
             ),
         ];
 
+        let environment = if let Some(env) = preset_env_versions {
+            env
+        } else {
+            todo!()
+        };
+
         if enable_raw_css {
             rules.extend([
                 ModuleRule::new(
@@ -447,7 +452,7 @@ impl ModuleOptions {
                     ]),
                     vec![ModuleRuleEffect::ModuleType(ModuleType::Css {
                         ty: CssModuleAssetType::Default,
-                        browserslist_query: browserslist_query.clone(),
+                        environment,
                     })],
                 ),
                 ModuleRule::new(
@@ -457,7 +462,7 @@ impl ModuleOptions {
                     ]),
                     vec![ModuleRuleEffect::ModuleType(ModuleType::Css {
                         ty: CssModuleAssetType::Module,
-                        browserslist_query: browserslist_query.clone(),
+                        environment,
                     })],
                 ),
             ]);
@@ -510,7 +515,7 @@ impl ModuleOptions {
                     ]),
                     vec![ModuleRuleEffect::ModuleType(ModuleType::Css {
                         ty: CssModuleAssetType::Default,
-                        browserslist_query: browserslist_query.clone(),
+                        environment,
                     })],
                 ),
                 ModuleRule::new(
@@ -541,7 +546,7 @@ impl ModuleOptions {
                     ]),
                     vec![ModuleRuleEffect::ModuleType(ModuleType::Css {
                         ty: CssModuleAssetType::Module,
-                        browserslist_query: browserslist_query.clone(),
+                        environment,
                     })],
                 ),
                 // Ecmascript CSS Modules referencing the actual CSS module to include it
@@ -552,7 +557,7 @@ impl ModuleOptions {
                     ]),
                     vec![ModuleRuleEffect::ModuleType(ModuleType::Css {
                         ty: CssModuleAssetType::Module,
-                        browserslist_query: browserslist_query.clone(),
+                        environment,
                     })],
                 ),
                 // Ecmascript CSS Modules referencing the actual CSS module to list the classes
@@ -568,7 +573,7 @@ impl ModuleOptions {
                     ]),
                     vec![ModuleRuleEffect::ModuleType(ModuleType::Css {
                         ty: CssModuleAssetType::Module,
-                        browserslist_query: browserslist_query.clone(),
+                        environment,
                     })],
                 ),
             ]);

turbopack/crates/turbopack/src/module_options/module_options_context.rs

@@ -206,7 +206,6 @@ pub struct EcmascriptOptionsContext {
 #[derive(Clone, Default)]
 #[serde(default)]
 pub struct CssOptionsContext {
-    pub browserslist_query: RcStr,
     /// This skips `GlobalCss` and `ModuleCss` module assets from being
     /// generated in the module graph, generating only `Css` module assets.
     ///

turbopack/crates/turbopack/src/module_options/module_rule.rs

@@ -1,10 +1,10 @@
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
-use turbo_rcstr::RcStr;
 use turbo_tasks::{NonLocalValue, ResolvedVc, trace::TraceRawVcs};
 use turbo_tasks_fs::FileSystemPath;
 use turbopack_core::{
-    reference_type::ReferenceType, source::Source, source_transform::SourceTransforms,
+    environment::Environment, reference_type::ReferenceType, source::Source,
+    source_transform::SourceTransforms,
 };
 use turbopack_css::CssModuleAssetType;
 use turbopack_ecmascript::{EcmascriptInputTransforms, EcmascriptOptions};