Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions crates/next-core/src/next_client/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,18 @@
..postcss_transform_options.clone()
};
let enable_postcss_transform = Some(postcss_transform_options.resolved_cell());

// Postcss for browser environment
let browser_postcss_transform_options = PostCssTransformOptions {
postcss_package: Some(
get_postcss_package_mapping(project_path.clone())
.to_resolved()
.await?,
),
config_location: PostCssConfigLocation::ProjectPathOrLocalPath,
..Default::default()
};
let enable_browser_postcss_transform = Some(browser_postcss_transform_options.resolved_cell());
let enable_foreign_postcss_transform = Some(postcss_foreign_transform_options.resolved_cell());

let source_maps = if *next_config.client_source_maps(mode).await? {
Expand All @@ -322,6 +334,7 @@
execution_context: Some(execution_context),
tree_shaking_mode: tree_shaking_mode_for_user_code,
enable_postcss_transform,
enable_browser_postcss_transform,

Check failure on line 337 in crates/next-core/src/next_client/context.rs

View workflow job for this annotation

GitHub Actions / Benchmark Rust Crates (tiny)

mismatched types
side_effect_free_packages: next_config.optimize_package_imports().owned().await?,
keep_last_successful_parse: next_mode.is_development(),
..Default::default()
Expand Down
11 changes: 4 additions & 7 deletions crates/next-core/src/util.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::future::Future;
use std::{future::Future, str::FromStr};

use anyhow::{Context, Result, bail};
use serde::{Deserialize, Serialize, de::DeserializeOwned};
Expand Down Expand Up @@ -60,13 +60,10 @@ pub fn defines(define_env: &FxIndexMap<RcStr, Option<RcStr>>) -> CompileTimeDefi
)
.or_insert_with(|| {
if let Some(v) = v {
let val = serde_json::from_str(v);
let val = serde_json::Value::from_str(v);
match val {
Ok(serde_json::Value::Bool(v)) => CompileTimeDefineValue::Bool(v),
Ok(serde_json::Value::String(v)) => {
CompileTimeDefineValue::String(v.into())
}
_ => CompileTimeDefineValue::JSON(v.clone()),
Ok(v) => v.into(),
_ => CompileTimeDefineValue::Evaluate(v.clone()),
}
} else {
CompileTimeDefineValue::Undefined
Expand Down
Loading
Loading