Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Turbopack + Relay: correctly implement artifact_directory to fix multi-project test #67403

Merged
merged 6 commits into from
Jul 4, 2024
Merged
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
74 changes: 37 additions & 37 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ swc_core = { version = "0.95.4", features = [
testing = { version = "0.36.0" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240703.1" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240704.3" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240703.1" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240704.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240703.1" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240704.3" }

# General Deps

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ pub async fn get_client_module_options_context(
get_next_client_transforms_rules(next_config, ty.into_value(), mode, true).await?;
let additional_rules: Vec<ModuleRule> = vec![
get_swc_ecma_transform_plugin_rule(next_config, project_path).await?,
get_relay_transform_rule(next_config).await?,
get_relay_transform_rule(next_config, project_path).await?,
get_emotion_transform_rule(next_config).await?,
get_styled_components_transform_rule(next_config).await?,
get_styled_jsx_transform_rule(next_config, target_browsers).await?,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ pub async fn get_server_module_options_context(
// A set of custom ecma transform rules being applied to server context.
let source_transform_rules: Vec<ModuleRule> = vec![
get_swc_ecma_transform_plugin_rule(next_config, project_path).await?,
get_relay_transform_rule(next_config).await?,
get_relay_transform_rule(next_config, project_path).await?,
get_emotion_transform_rule(next_config).await?,
]
.into_iter()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use anyhow::Result;
use turbo_tasks::Vc;
use turbo_tasks_fs::FileSystemPath;
use turbopack_binding::turbopack::{
ecmascript_plugin::transform::relay::RelayTransformer, turbopack::module_options::ModuleRule,
};
Expand All @@ -8,11 +9,19 @@ use super::get_ecma_transform_rule;
use crate::next_config::NextConfig;

/// Returns a transform rule for the relay graphql transform.
pub async fn get_relay_transform_rule(next_config: Vc<NextConfig>) -> Result<Option<ModuleRule>> {
pub async fn get_relay_transform_rule(
next_config: Vc<NextConfig>,
project_path: Vc<FileSystemPath>,
) -> Result<Option<ModuleRule>> {
let enable_mdx_rs = next_config.mdx_rs().await?.is_some();
let project_path = &*project_path.await?;
let module_rule = next_config.await?.compiler.as_ref().and_then(|value| {
value.relay.as_ref().map(|config| {
get_ecma_transform_rule(Box::new(RelayTransformer::new(config)), enable_mdx_rs, true)
get_ecma_transform_rule(
Box::new(RelayTransformer::new(config, project_path)),
enable_mdx_rs,
true,
)
})
});

Expand Down
Loading
Loading