Skip to content

Commit 40bb997

Browse files
mischnicmischnic
committed
Revert "fix(turbopack): Pass correct browserslist to styled-jsx (#83334)"
This reverts commit a9d62b0.
1 parent a43935f commit 40bb997

File tree

18 files changed

+127
-221
lines changed

18 files changed

+127
-221
lines changed

‎crates/next-api/src/project.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,6 @@ impl Project {
984984
format!("/ROOT/{}", self.project_path().await?.path).into(),
985985
this.define_env.nodejs(),
986986
self.current_node_js_version(),
987-
this.browserslist_query.clone(),
988987
))
989988
}
990989

@@ -995,7 +994,6 @@ impl Project {
995994
self.project_path().owned().await?,
996995
this.define_env.edge(),
997996
self.current_node_js_version(),
998-
this.browserslist_query.clone(),
999997
))
1000998
}
1001999

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,18 @@ pub async fn get_client_compile_time_info(
9898
browserslist_query: RcStr,
9999
define_env: Vc<OptionEnvMap>,
100100
) -> Result<Vc<CompileTimeInfo>> {
101-
let environment = BrowserEnvironment {
102-
dom: true,
103-
web_worker: false,
104-
service_worker: false,
105-
browserslist_query: browserslist_query.to_owned(),
106-
}
107-
.resolved_cell();
108-
109101
CompileTimeInfo::builder(
110-
Environment::new(ExecutionEnvironment::Browser(environment), *environment)
111-
.to_resolved()
112-
.await?,
102+
Environment::new(ExecutionEnvironment::Browser(
103+
BrowserEnvironment {
104+
dom: true,
105+
web_worker: false,
106+
service_worker: false,
107+
browserslist_query: browserslist_query.to_owned(),
108+
}
109+
.resolved_cell(),
110+
))
111+
.to_resolved()
112+
.await?,
113113
)
114114
.defines(next_client_defines(define_env).to_resolved().await?)
115115
.free_var_references(next_client_free_vars(define_env).to_resolved().await?)
@@ -271,7 +271,7 @@ pub async fn get_client_module_options_context(
271271
let tree_shaking_mode_for_foreign_code = *next_config
272272
.tree_shaking_mode_for_foreign_code(next_mode.is_development())
273273
.await?;
274-
let css_target_browsers = env.css_runtime_versions();
274+
let target_browsers = env.runtime_versions();
275275

276276
let mut next_client_rules =
277277
get_next_client_transforms_rules(next_config, ty.clone(), mode, false, encryption_key)
@@ -284,7 +284,7 @@ pub async fn get_client_module_options_context(
284284
get_relay_transform_rule(next_config, project_path.clone()).await?,
285285
get_emotion_transform_rule(next_config).await?,
286286
get_styled_components_transform_rule(next_config).await?,
287-
get_styled_jsx_transform_rule(next_config, css_target_browsers).await?,
287+
get_styled_jsx_transform_rule(next_config, target_browsers).await?,
288288
get_react_remove_properties_transform_rule(next_config).await?,
289289
get_remove_console_transform_rule(next_config).await?,
290290
]

‎crates/next-core/src/next_edge/context.rs

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ use turbopack_core::{
1111
module_id_strategies::ModuleIdStrategy,
1212
},
1313
compile_time_info::{CompileTimeDefines, CompileTimeInfo, FreeVarReference, FreeVarReferences},
14-
environment::{
15-
BrowserEnvironment, EdgeWorkerEnvironment, Environment, ExecutionEnvironment, NodeJsVersion,
16-
},
14+
environment::{EdgeWorkerEnvironment, Environment, ExecutionEnvironment, NodeJsVersion},
1715
free_var_references,
1816
module_graph::export_usage::OptionExportUsageInfo,
1917
};
@@ -62,23 +60,11 @@ pub async fn get_edge_compile_time_info(
6260
project_path: FileSystemPath,
6361
define_env: Vc<OptionEnvMap>,
6462
node_version: ResolvedVc<NodeJsVersion>,
65-
css_browserslist_query: RcStr,
6663
) -> Result<Vc<CompileTimeInfo>> {
67-
let css_environment = BrowserEnvironment {
68-
dom: false,
69-
web_worker: false,
70-
service_worker: false,
71-
browserslist_query: css_browserslist_query,
72-
}
73-
.resolved_cell();
74-
7564
CompileTimeInfo::builder(
76-
Environment::new(
77-
ExecutionEnvironment::EdgeWorker(
78-
EdgeWorkerEnvironment { node_version }.resolved_cell(),
79-
),
80-
*css_environment,
81-
)
65+
Environment::new(ExecutionEnvironment::EdgeWorker(
66+
EdgeWorkerEnvironment { node_version }.resolved_cell(),
67+
))
8268
.to_resolved()
8369
.await?,
8470
)

‎crates/next-core/src/next_server/context.rs

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use turbopack_core::{
2222
compile_time_defines,
2323
compile_time_info::{CompileTimeDefines, CompileTimeInfo, FreeVarReferences},
2424
environment::{
25-
BrowserEnvironment, Environment, ExecutionEnvironment, NodeJsEnvironment, NodeJsVersion,
25+
Environment, ExecutionEnvironment, NodeJsEnvironment, NodeJsVersion, RuntimeVersions,
2626
},
2727
free_var_references,
2828
module_graph::export_usage::OptionExportUsageInfo,
@@ -366,28 +366,16 @@ pub async fn get_server_compile_time_info(
366366
cwd: RcStr,
367367
define_env: Vc<OptionEnvMap>,
368368
node_version: ResolvedVc<NodeJsVersion>,
369-
css_browserslist_query: RcStr,
370369
) -> Result<Vc<CompileTimeInfo>> {
371-
let css_environment = BrowserEnvironment {
372-
dom: false,
373-
web_worker: false,
374-
service_worker: false,
375-
browserslist_query: css_browserslist_query,
376-
}
377-
.resolved_cell();
378-
379370
CompileTimeInfo::builder(
380-
Environment::new(
381-
ExecutionEnvironment::NodeJsLambda(
382-
NodeJsEnvironment {
383-
compile_target: CompileTarget::current().to_resolved().await?,
384-
node_version,
385-
cwd: ResolvedVc::cell(Some(cwd)),
386-
}
387-
.resolved_cell(),
388-
),
389-
*css_environment,
390-
)
371+
Environment::new(ExecutionEnvironment::NodeJsLambda(
372+
NodeJsEnvironment {
373+
compile_target: CompileTarget::current().to_resolved().await?,
374+
node_version,
375+
cwd: ResolvedVc::cell(Some(cwd)),
376+
}
377+
.resolved_cell(),
378+
))
391379
.to_resolved()
392380
.await?,
393381
)
@@ -400,10 +388,9 @@ pub async fn get_server_compile_time_info(
400388
#[turbo_tasks::function]
401389
pub async fn get_tracing_compile_time_info() -> Result<Vc<CompileTimeInfo>> {
402390
CompileTimeInfo::builder(
403-
Environment::new(
404-
ExecutionEnvironment::NodeJsLambda(NodeJsEnvironment::default().resolved_cell()),
405-
BrowserEnvironment::default().cell(),
406-
)
391+
Environment::new(ExecutionEnvironment::NodeJsLambda(
392+
NodeJsEnvironment::default().resolved_cell(),
393+
))
407394
.to_resolved()
408395
.await?,
409396
)
@@ -520,7 +507,7 @@ pub async fn get_server_module_options_context(
520507
let tree_shaking_mode_for_foreign_code = *next_config
521508
.tree_shaking_mode_for_foreign_code(next_mode.is_development())
522509
.await?;
523-
let css_versions = environment.css_runtime_versions();
510+
let versions = RuntimeVersions(Default::default()).cell();
524511

525512
let tsconfig_path = next_config
526513
.typescript_tsconfig_path()
@@ -581,8 +568,7 @@ pub async fn get_server_module_options_context(
581568
// context type.
582569
let styled_components_transform_rule =
583570
get_styled_components_transform_rule(next_config).await?;
584-
let styled_jsx_transform_rule =
585-
get_styled_jsx_transform_rule(next_config, css_versions).await?;
571+
let styled_jsx_transform_rule = get_styled_jsx_transform_rule(next_config, versions).await?;
586572

587573
let source_maps = if *next_config.server_source_maps().await? {
588574
SourceMapsType::Full

‎turbopack/crates/turbopack-cli/src/build/mod.rs

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,9 @@ async fn build_internal(
237237
build_output_root.clone(),
238238
build_output_root.clone(),
239239
build_output_root.clone(),
240-
Environment::new(
241-
ExecutionEnvironment::NodeJsLambda(
242-
NodeJsEnvironment::default().resolved_cell(),
243-
),
244-
compile_time_info.css_environment(),
245-
)
240+
Environment::new(ExecutionEnvironment::NodeJsLambda(
241+
NodeJsEnvironment::default().resolved_cell(),
242+
))
246243
.to_resolved()
247244
.await?,
248245
runtime_type,
@@ -324,25 +321,22 @@ async fn build_internal(
324321

325322
let chunking_context: Vc<Box<dyn ChunkingContext>> = match target {
326323
Target::Browser => {
327-
let browser_environment = BrowserEnvironment {
328-
dom: true,
329-
web_worker: false,
330-
service_worker: false,
331-
browserslist_query: browserslist_query.clone(),
332-
}
333-
.resolved_cell();
334-
335324
let mut builder = BrowserChunkingContext::builder(
336325
project_path,
337326
build_output_root.clone(),
338327
build_output_root_to_root_path,
339328
build_output_root.clone(),
340329
build_output_root.clone(),
341330
build_output_root.clone(),
342-
Environment::new(
343-
ExecutionEnvironment::Browser(browser_environment),
344-
*browser_environment,
345-
)
331+
Environment::new(ExecutionEnvironment::Browser(
332+
BrowserEnvironment {
333+
dom: true,
334+
web_worker: false,
335+
service_worker: false,
336+
browserslist_query: browserslist_query.clone(),
337+
}
338+
.resolved_cell(),
339+
))
346340
.to_resolved()
347341
.await?,
348342
runtime_type,
@@ -388,12 +382,9 @@ async fn build_internal(
388382
build_output_root.clone(),
389383
build_output_root.clone(),
390384
build_output_root.clone(),
391-
Environment::new(
392-
ExecutionEnvironment::NodeJsLambda(
393-
NodeJsEnvironment::default().resolved_cell(),
394-
),
395-
BrowserEnvironment::default().cell(),
396-
)
385+
Environment::new(ExecutionEnvironment::NodeJsLambda(
386+
NodeJsEnvironment::default().resolved_cell(),
387+
))
397388
.to_resolved()
398389
.await?,
399390
runtime_type,

‎turbopack/crates/turbopack-cli/src/contexts.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -199,19 +199,18 @@ pub async fn get_client_compile_time_info(
199199
node_env: Vc<NodeEnv>,
200200
) -> Result<Vc<CompileTimeInfo>> {
201201
let node_env = node_env.await?;
202-
203-
let environment = BrowserEnvironment {
204-
dom: true,
205-
web_worker: false,
206-
service_worker: false,
207-
browserslist_query,
208-
}
209-
.resolved_cell();
210-
211202
CompileTimeInfo::builder(
212-
Environment::new(ExecutionEnvironment::Browser(environment), *environment)
213-
.to_resolved()
214-
.await?,
203+
Environment::new(ExecutionEnvironment::Browser(
204+
BrowserEnvironment {
205+
dom: true,
206+
web_worker: false,
207+
service_worker: false,
208+
browserslist_query,
209+
}
210+
.resolved_cell(),
211+
))
212+
.to_resolved()
213+
.await?,
215214
)
216215
.defines(client_defines(&node_env).resolved_cell())
217216
.free_var_references(

‎turbopack/crates/turbopack-core/src/compile_time_info.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use turbo_rcstr::RcStr;
44
use turbo_tasks::{FxIndexMap, NonLocalValue, ResolvedVc, Vc, trace::TraceRawVcs};
55
use turbo_tasks_fs::FileSystemPath;
66

7-
use crate::environment::{BrowserEnvironment, Environment};
7+
use crate::environment::Environment;
88

99
#[macro_export]
1010
macro_rules! definable_name_map_pattern_internal {
@@ -349,11 +349,6 @@ impl CompileTimeInfo {
349349
pub fn environment(&self) -> Vc<Environment> {
350350
*self.environment
351351
}
352-
353-
#[turbo_tasks::function]
354-
pub async fn css_environment(&self) -> Result<Vc<BrowserEnvironment>> {
355-
Ok(self.environment.css_environment())
356-
}
357352
}
358353

359354
pub struct CompileTimeInfoBuilder {

‎turbopack/crates/turbopack-core/src/environment.rs

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,13 @@ pub enum ChunkLoading {
4242
pub struct Environment {
4343
// members must be private to avoid leaking non-custom types
4444
execution: ExecutionEnvironment,
45-
css_environment: ResolvedVc<BrowserEnvironment>,
4645
}
4746

4847
#[turbo_tasks::value_impl]
4948
impl Environment {
5049
#[turbo_tasks::function]
51-
pub async fn new(
52-
execution: ExecutionEnvironment,
53-
css_environment: ResolvedVc<BrowserEnvironment>,
54-
) -> Vc<Self> {
55-
Self::cell(Environment {
56-
execution,
57-
css_environment,
58-
})
50+
pub fn new(execution: ExecutionEnvironment) -> Vc<Self> {
51+
Self::cell(Environment { execution })
5952
}
6053
}
6154

@@ -107,17 +100,6 @@ impl Environment {
107100
})
108101
}
109102

110-
#[turbo_tasks::function]
111-
pub fn css_environment(&self) -> Vc<BrowserEnvironment> {
112-
*self.css_environment
113-
}
114-
115-
#[turbo_tasks::function]
116-
pub async fn css_runtime_versions(&self) -> Result<Vc<RuntimeVersions>> {
117-
let distribs = resolve_browserslist(self.css_environment).await?;
118-
Ok(Vc::cell(Versions::parse_versions(distribs)?))
119-
}
120-
121103
#[turbo_tasks::function]
122104
pub async fn browserslist_query(&self) -> Result<Vc<RcStr>> {
123105
Ok(match self.execution {
@@ -335,7 +317,6 @@ impl Default for NodeJsVersion {
335317
}
336318

337319
#[turbo_tasks::value(shared)]
338-
#[derive(Default)]
339320
pub struct BrowserEnvironment {
340321
pub dom: bool,
341322
pub web_worker: bool,

‎turbopack/crates/turbopack-ecmascript/benches/analyzer.rs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ use turbo_tasks::ResolvedVc;
1414
use turbo_tasks_testing::VcStorage;
1515
use turbopack_core::{
1616
compile_time_info::CompileTimeInfo,
17-
environment::{
18-
BrowserEnvironment, Environment, ExecutionEnvironment, NodeJsEnvironment, NodeJsVersion,
19-
},
17+
environment::{Environment, ExecutionEnvironment, NodeJsEnvironment, NodeJsVersion},
2018
target::CompileTarget,
2119
};
2220
use turbopack_ecmascript::analyzer::{
@@ -102,20 +100,15 @@ fn bench_link(b: &mut Bencher, input: &BenchInput) {
102100
let var_cache = Default::default();
103101
for val in input.var_graph.values.values() {
104102
VcStorage::with(async {
105-
let css_environment = BrowserEnvironment::default().cell();
106-
107103
let compile_time_info = CompileTimeInfo::builder(
108-
Environment::new(
109-
ExecutionEnvironment::NodeJsLambda(
110-
NodeJsEnvironment {
111-
compile_target: CompileTarget::unknown().to_resolved().await?,
112-
node_version: NodeJsVersion::default().resolved_cell(),
113-
cwd: ResolvedVc::cell(None),
114-
}
115-
.resolved_cell(),
116-
),
117-
css_environment,
118-
)
104+
Environment::new(ExecutionEnvironment::NodeJsLambda(
105+
NodeJsEnvironment {
106+
compile_target: CompileTarget::unknown().to_resolved().await?,
107+
node_version: NodeJsVersion::default().resolved_cell(),
108+
cwd: ResolvedVc::cell(None),
109+
}
110+
.resolved_cell(),
111+
))
119112
.to_resolved()
120113
.await?,
121114
)

0 commit comments

Comments
 (0)