Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

feat(next-core): relay transform plugin #48899

Merged
merged 11 commits into from
May 9, 2023
Merged

feat(next-core): relay transform plugin #48899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dcce55d
refactor(next-core): extract custom transforms
kwonoj Apr 26, 2023
f6118df
feat(next-core): relay transform plugin
kwonoj Apr 26, 2023
612a2cd
feat(turbopack): initial relay compiler config support
kwonoj Apr 26, 2023
1f88615
fix(relay): resolve injected module resolution
kwonoj Apr 27, 2023
9556fe7
refactor(next-core): consolidate swc_relay
kwonoj Apr 28, 2023
6e56869
build(cargo): update deps
kwonoj Apr 28, 2023
333f0ce
build(cargo): update lockfile
kwonoj May 1, 2023
726d2b6
build(cargo): update turbopack
kwonoj May 9, 2023
d43266b
refactor(next_shared): update references
kwonoj May 9, 2023
27f6f93
Merge branch 'canary' into feat-turbopack-relay
sokra May 9, 2023
8607f82
Merge branch 'canary' into feat-turbopack-relay
ijjk May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
71 changes: 37 additions & 34 deletions Cargo.lock
View file
Open in desktop

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

9 changes: 4 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,14 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
# SWC crates
# Keep consistent with preset_env_base through swc_core
swc_core = { version = "0.75.41" }
swc_relay = { version = "0.2.7" }
testing = { version = "0.33.6" }
testing = { version = "0.33.4" }

# Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.3" }
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230508.2" }
# [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-230504.3" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230508.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230504.3" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230508.2" }

# General Deps

Expand Down
1 change: 0 additions & 1 deletion packages/next-swc/crates/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ turbo-binding = { workspace = true, features = [
"__swc_transform_modularize_imports",
"__swc_transform_relay",
] }
swc_relay = { workspace = true }

[dev-dependencies]
turbo-binding = { workspace = true, features = [
Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pub struct TransformOptions {

#[serde(default)]
#[cfg(not(target_arch = "wasm32"))]
pub relay: Option<swc_relay::Config>,
pub relay: Option<turbo_binding::swc::custom_transform::relay::Config>,

#[allow(unused)]
#[serde(default)]
Expand Down Expand Up @@ -142,7 +142,7 @@ where
#[cfg(not(target_arch = "wasm32"))]
let relay_plugin = {
if let Some(config) = &opts.relay {
Either::Left(swc_relay::relay(
Either::Left(turbo_binding::swc::custom_transform::relay::relay(
config,
file.name.clone(),
current_dir().unwrap(),
Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/tests/fixture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use next_swc::{
shake_exports::{shake_exports, Config as ShakeExportsConfig},
};
use next_transform_font::{next_font_loaders, Config as FontLoaderConfig};
use swc_relay::{relay, RelayLanguageConfig};
use turbo_binding::swc::{
core::{
common::{chain, comments::SingleThreadedComments, FileName, Mark},
Expand All @@ -25,6 +24,7 @@ use turbo_binding::swc::{
},
},
},
custom_transform::relay::{relay, RelayLanguageConfig},
testing::fixture,
};

Expand Down Expand Up @@ -151,7 +151,7 @@ fn page_config_fixture(input: PathBuf) {
#[fixture("tests/fixture/relay/**/input.ts*")]
fn relay_no_artifact_dir_fixture(input: PathBuf) {
let output = input.parent().unwrap().join("output.js");
let config = swc_relay::Config {
let config = turbo_binding::swc::custom_transform::relay::Config {
language: RelayLanguageConfig::TypeScript,
artifact_directory: Some(PathBuf::from("__generated__")),
..Default::default()
Expand Down