From feb0a47c5f616a030c67950876ef203185f64f33 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 13 Mar 2024 07:00:00 +0000 Subject: [PATCH 1/2] accept css files outside of the project as virtual assets --- crates/turbopack-node/src/transforms/postcss.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/crates/turbopack-node/src/transforms/postcss.rs b/crates/turbopack-node/src/transforms/postcss.rs index 9f55b1b933c94..676a6b4d269fc 100644 --- a/crates/turbopack-node/src/transforms/postcss.rs +++ b/crates/turbopack-node/src/transforms/postcss.rs @@ -375,15 +375,14 @@ impl PostCssTransformedAsset { // We need to get a path relative to the project because the postcss loader // runs with the project as the current working directory. - let Some(css_path) = project_path + let css_path = if let Some(css_path) = project_path .await? .get_relative_path_to(&*css_fs_path.await?) - else { - bail!( - "CSS path {} is outside of the project {}", - css_fs_path.to_string().await?, - project_path.to_string().await? - ); + { + css_path + } else { + // This shouldn't be an error since it can happen on virtual assets + "".to_string() }; let config_value = evaluate_webpack_loader(WebpackLoaderContext { From 9cff48aba138450d091aea3fe3e5dad4023e91c6 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 13 Mar 2024 07:26:46 +0000 Subject: [PATCH 2/2] lint --- crates/turbopack-node/src/transforms/postcss.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/turbopack-node/src/transforms/postcss.rs b/crates/turbopack-node/src/transforms/postcss.rs index 676a6b4d269fc..844eabc4ef845 100644 --- a/crates/turbopack-node/src/transforms/postcss.rs +++ b/crates/turbopack-node/src/transforms/postcss.rs @@ -3,8 +3,7 @@ use indexmap::indexmap; use indoc::formatdoc; use serde::{Deserialize, Serialize}; use turbo_tasks::{ - trace::TraceRawVcs, Completion, Completions, TaskInput, TryFlatJoinIterExt, Value, - ValueToString, Vc, + trace::TraceRawVcs, Completion, Completions, TaskInput, TryFlatJoinIterExt, Value, Vc, }; use turbo_tasks_bytes::stream::SingleValue; use turbo_tasks_fs::{