Unverified Commit 0cff3757 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

[Turbopack] correctly apply defines (#75643)

### What?

Defines like `process.env.NODE_ENV` were not correctly applied to turbopack-cli. This fixes it.
parent c84be735
...@@ -20,6 +20,7 @@ use turbopack_core::{ ...@@ -20,6 +20,7 @@ use turbopack_core::{
condition::ContextCondition, condition::ContextCondition,
context::AssetContext, context::AssetContext,
environment::{BrowserEnvironment, Environment, ExecutionEnvironment}, environment::{BrowserEnvironment, Environment, ExecutionEnvironment},
free_var_references,
resolve::options::{ImportMap, ImportMapping}, resolve::options::{ImportMap, ImportMapping},
}; };
use turbopack_node::{ use turbopack_node::{
...@@ -195,13 +196,12 @@ pub fn get_client_asset_context( ...@@ -195,13 +196,12 @@ pub fn get_client_asset_context(
asset_context asset_context
} }
fn client_defines(node_env: &NodeEnv) -> Vc<CompileTimeDefines> { fn client_defines(node_env: &NodeEnv) -> CompileTimeDefines {
compile_time_defines!( compile_time_defines!(
process.turbopack = true, process.turbopack = true,
process.env.TURBOPACK = true, process.env.TURBOPACK = true,
process.env.NODE_ENV = node_env.to_string() process.env.NODE_ENV = node_env.to_string()
) )
.cell()
} }
#[turbo_tasks::function] #[turbo_tasks::function]
...@@ -209,6 +209,7 @@ pub async fn get_client_compile_time_info( ...@@ -209,6 +209,7 @@ pub async fn get_client_compile_time_info(
browserslist_query: RcStr, browserslist_query: RcStr,
node_env: Vc<NodeEnv>, node_env: Vc<NodeEnv>,
) -> Result<Vc<CompileTimeInfo>> { ) -> Result<Vc<CompileTimeInfo>> {
let node_env = node_env.await?;
CompileTimeInfo::builder( CompileTimeInfo::builder(
Environment::new(Value::new(ExecutionEnvironment::Browser( Environment::new(Value::new(ExecutionEnvironment::Browser(
BrowserEnvironment { BrowserEnvironment {
...@@ -222,7 +223,10 @@ pub async fn get_client_compile_time_info( ...@@ -222,7 +223,10 @@ pub async fn get_client_compile_time_info(
.to_resolved() .to_resolved()
.await?, .await?,
) )
.defines(client_defines(&*node_env.await?).to_resolved().await?) .defines(client_defines(&node_env).resolved_cell())
.free_var_references(
free_var_references!(..client_defines(&node_env).into_iter()).resolved_cell(),
)
.cell() .cell()
.await .await
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment