Unverified Commit 138a7952 authored by Leah's avatar Leah Committed by GitHub

`turbo-binding` -> `turbopack-binding` (#49816)

parent 6fd866bf
...@@ -42,7 +42,7 @@ swc_core = { version = "0.75.41" } ...@@ -42,7 +42,7 @@ swc_core = { version = "0.75.41" }
testing = { version = "0.33.4" } testing = { version = "0.33.4" }
# Turbo crates # Turbo crates
turbo-binding = { package = "turbopack-binding", git = "https://github.com/vercel/turbo.git", tag = "turbopack-230511.3" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230511.3" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [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-230511.3" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230511.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
......
...@@ -5,7 +5,7 @@ version = "0.0.0" ...@@ -5,7 +5,7 @@ version = "0.0.0"
publish = false publish = false
[features] [features]
plugin = ["turbo-binding/__swc_core_binding_napi_plugin"] plugin = ["turbopack-binding/__swc_core_binding_napi_plugin"]
[dependencies] [dependencies]
chrono = "0.4" chrono = "0.4"
...@@ -22,7 +22,7 @@ serde_json = "1" ...@@ -22,7 +22,7 @@ serde_json = "1"
sha1 = "0.10.1" sha1 = "0.10.1"
tracing = { version = "0.1.37" } tracing = { version = "0.1.37" }
turbo-binding = { workspace = true, features = [ turbopack-binding = { workspace = true, features = [
"__swc_core", "__swc_core",
"__swc_core_next_core", "__swc_core_next_core",
"__swc_transform_styled_jsx", "__swc_transform_styled_jsx",
...@@ -33,7 +33,7 @@ turbo-binding = { workspace = true, features = [ ...@@ -33,7 +33,7 @@ turbo-binding = { workspace = true, features = [
] } ] }
[dev-dependencies] [dev-dependencies]
turbo-binding = { workspace = true, features = [ turbopack-binding = { workspace = true, features = [
"__swc_core_testing_transform", "__swc_core_testing_transform",
"__swc_testing", "__swc_testing",
] } ] }
......
use turbo_binding::swc::core::ecma::{ use turbopack_binding::swc::core::ecma::{
ast::{Ident, JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXElementName, JSXOpeningElement}, ast::{Ident, JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXElementName, JSXOpeningElement},
atoms::JsWord, atoms::JsWord,
visit::Fold, visit::Fold,
......
use turbo_binding::swc::core::ecma::{ use turbopack_binding::swc::core::ecma::{
ast::*, ast::*,
visit::{Visit, VisitWith}, visit::{Visit, VisitWith},
}; };
......
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::errors::HANDLER, common::errors::HANDLER,
ecma::{ ecma::{
ast::ExportAll, ast::ExportAll,
......
...@@ -37,7 +37,7 @@ use either::Either; ...@@ -37,7 +37,7 @@ use either::Either;
use fxhash::FxHashSet; use fxhash::FxHashSet;
use next_transform_font::next_font_loaders; use next_transform_font::next_font_loaders;
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::{chain, comments::Comments, pass::Optional, FileName, SourceFile, SourceMap}, common::{chain, comments::Comments, pass::Optional, FileName, SourceFile, SourceMap},
ecma::{ ecma::{
ast::EsVersion, parser::parse_file_as_module, transforms::base::pass::noop, visit::Fold, ast::EsVersion, parser::parse_file_as_module, transforms::base::pass::noop, visit::Fold,
...@@ -61,7 +61,7 @@ mod top_level_binding_collector; ...@@ -61,7 +61,7 @@ mod top_level_binding_collector;
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct TransformOptions { pub struct TransformOptions {
#[serde(flatten)] #[serde(flatten)]
pub swc: turbo_binding::swc::core::base::config::Options, pub swc: turbopack_binding::swc::core::base::config::Options,
#[serde(default)] #[serde(default)]
pub disable_next_ssg: bool, pub disable_next_ssg: bool,
...@@ -91,7 +91,8 @@ pub struct TransformOptions { ...@@ -91,7 +91,8 @@ pub struct TransformOptions {
pub styled_jsx: bool, pub styled_jsx: bool,
#[serde(default)] #[serde(default)]
pub styled_components: Option<turbo_binding::swc::custom_transform::styled_components::Config>, pub styled_components:
Option<turbopack_binding::swc::custom_transform::styled_components::Config>,
#[serde(default)] #[serde(default)]
pub remove_console: Option<remove_console::Config>, pub remove_console: Option<remove_console::Config>,
...@@ -101,7 +102,7 @@ pub struct TransformOptions { ...@@ -101,7 +102,7 @@ pub struct TransformOptions {
#[serde(default)] #[serde(default)]
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
pub relay: Option<turbo_binding::swc::custom_transform::relay::Config>, pub relay: Option<turbopack_binding::swc::custom_transform::relay::Config>,
#[allow(unused)] #[allow(unused)]
#[serde(default)] #[serde(default)]
...@@ -113,11 +114,11 @@ pub struct TransformOptions { ...@@ -113,11 +114,11 @@ pub struct TransformOptions {
pub shake_exports: Option<shake_exports::Config>, pub shake_exports: Option<shake_exports::Config>,
#[serde(default)] #[serde(default)]
pub emotion: Option<turbo_binding::swc::custom_transform::emotion::EmotionOptions>, pub emotion: Option<turbopack_binding::swc::custom_transform::emotion::EmotionOptions>,
#[serde(default)] #[serde(default)]
pub modularize_imports: pub modularize_imports:
Option<turbo_binding::swc::custom_transform::modularize_imports::Config>, Option<turbopack_binding::swc::custom_transform::modularize_imports::Config>,
#[serde(default)] #[serde(default)]
pub font_loaders: Option<next_transform_font::Config>, pub font_loaders: Option<next_transform_font::Config>,
...@@ -142,7 +143,7 @@ where ...@@ -142,7 +143,7 @@ where
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
let relay_plugin = { let relay_plugin = {
if let Some(config) = &opts.relay { if let Some(config) = &opts.relay {
Either::Left(turbo_binding::swc::custom_transform::relay::relay( Either::Left(turbopack_binding::swc::custom_transform::relay::relay(
config, config,
file.name.clone(), file.name.clone(),
current_dir().unwrap(), current_dir().unwrap(),
...@@ -156,13 +157,13 @@ where ...@@ -156,13 +157,13 @@ where
let mut modularize_imports_config = match &opts.modularize_imports { let mut modularize_imports_config = match &opts.modularize_imports {
Some(config) => config.clone(), Some(config) => config.clone(),
None => turbo_binding::swc::custom_transform::modularize_imports::Config { None => turbopack_binding::swc::custom_transform::modularize_imports::Config {
packages: std::collections::HashMap::new(), packages: std::collections::HashMap::new(),
}, },
}; };
modularize_imports_config.packages.insert( modularize_imports_config.packages.insert(
"next/server".to_string(), "next/server".to_string(),
turbo_binding::swc::custom_transform::modularize_imports::PackageConfig { turbopack_binding::swc::custom_transform::modularize_imports::PackageConfig {
transform: "next/dist/server/web/exports/{{ kebabCase member }}".to_string(), transform: "next/dist/server/web/exports/{{ kebabCase member }}".to_string(),
prevent_full_import: false, prevent_full_import: false,
skip_default_conversion: false, skip_default_conversion: false,
...@@ -183,7 +184,7 @@ where ...@@ -183,7 +184,7 @@ where
}, },
if opts.styled_jsx { if opts.styled_jsx {
Either::Left( Either::Left(
turbo_binding::swc::custom_transform::styled_jsx::visitor::styled_jsx( turbopack_binding::swc::custom_transform::styled_jsx::visitor::styled_jsx(
cm.clone(), cm.clone(),
file.name.clone(), file.name.clone(),
), ),
...@@ -193,7 +194,7 @@ where ...@@ -193,7 +194,7 @@ where
}, },
match &opts.styled_components { match &opts.styled_components {
Some(config) => Either::Left( Some(config) => Either::Left(
turbo_binding::swc::custom_transform::styled_components::styled_components( turbopack_binding::swc::custom_transform::styled_components::styled_components(
file.name.clone(), file.name.clone(),
file.src_hash, file.src_hash,
config.clone(), config.clone(),
...@@ -247,7 +248,7 @@ where ...@@ -247,7 +248,7 @@ where
if let FileName::Real(path) = &file.name { if let FileName::Real(path) = &file.name {
path.to_str().map(|_| { path.to_str().map(|_| {
Either::Left( Either::Left(
turbo_binding::swc::custom_transform::emotion::EmotionTransformer::new( turbopack_binding::swc::custom_transform::emotion::EmotionTransformer::new(
config.clone(), config.clone(),
path, path,
file.src_hash as u32, file.src_hash as u32,
...@@ -261,7 +262,7 @@ where ...@@ -261,7 +262,7 @@ where
} }
}) })
.unwrap_or_else(|| Either::Right(noop())), .unwrap_or_else(|| Either::Right(noop())),
turbo_binding::swc::custom_transform::modularize_imports::modularize_imports( turbopack_binding::swc::custom_transform::modularize_imports::modularize_imports(
modularize_imports_config modularize_imports_config
), ),
match &opts.font_loaders { match &opts.font_loaders {
......
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use pathdiff::diff_paths; use pathdiff::diff_paths;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::{errors::HANDLER, FileName, DUMMY_SP}, common::{errors::HANDLER, FileName, DUMMY_SP},
ecma::{ ecma::{
ast::{ ast::{
......
...@@ -2,7 +2,7 @@ use std::{cell::RefCell, mem::take, rc::Rc}; ...@@ -2,7 +2,7 @@ use std::{cell::RefCell, mem::take, rc::Rc};
use easy_error::{bail, Error}; use easy_error::{bail, Error};
use fxhash::FxHashSet; use fxhash::FxHashSet;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::{ common::{
errors::HANDLER, errors::HANDLER,
pass::{Repeat, Repeated}, pass::{Repeat, Repeated},
......
use chrono::Utc; use chrono::Utc;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::{errors::HANDLER, Span, DUMMY_SP}, common::{errors::HANDLER, Span, DUMMY_SP},
ecma::{ ecma::{
ast::*, ast::*,
......
use regex::Regex; use regex::Regex;
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::ecma::{ use turbopack_binding::swc::core::ecma::{
ast::*, ast::*,
visit::{noop_fold_type, Fold, FoldWith}, visit::{noop_fold_type, Fold, FoldWith},
}; };
......
...@@ -2,7 +2,7 @@ use std::{collections::HashMap, path::PathBuf}; ...@@ -2,7 +2,7 @@ use std::{collections::HashMap, path::PathBuf};
use regex::Regex; use regex::Regex;
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::{ common::{
comments::{Comment, CommentKind, Comments}, comments::{Comment, CommentKind, Comments},
errors::HANDLER, errors::HANDLER,
......
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::{collections::AHashSet, DUMMY_SP}, common::{collections::AHashSet, DUMMY_SP},
ecma::{ ecma::{
ast::*, ast::*,
......
...@@ -3,7 +3,7 @@ use std::convert::{TryFrom, TryInto}; ...@@ -3,7 +3,7 @@ use std::convert::{TryFrom, TryInto};
use hex::encode as hex_encode; use hex::encode as hex_encode;
use serde::Deserialize; use serde::Deserialize;
use sha1::{Digest, Sha1}; use sha1::{Digest, Sha1};
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::{ common::{
comments::{Comment, CommentKind, Comments}, comments::{Comment, CommentKind, Comments},
errors::HANDLER, errors::HANDLER,
......
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::Mark, common::Mark,
ecma::{ ecma::{
ast::*, ast::*,
......
use std::hash::Hash; use std::hash::Hash;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
common::{collections::AHashSet, SyntaxContext}, common::{collections::AHashSet, SyntaxContext},
ecma::{ ecma::{
ast::{ ast::{
......
...@@ -8,7 +8,7 @@ use next_swc::{ ...@@ -8,7 +8,7 @@ use next_swc::{
server_actions::{self, server_actions}, server_actions::{self, server_actions},
}; };
use next_transform_font::{next_font_loaders, Config as FontLoaderConfig}; use next_transform_font::{next_font_loaders, Config as FontLoaderConfig};
use turbo_binding::swc::{ use turbopack_binding::swc::{
core::{ core::{
common::{chain, FileName, Mark}, common::{chain, FileName, Mark},
ecma::{ ecma::{
......
...@@ -12,7 +12,7 @@ use next_swc::{ ...@@ -12,7 +12,7 @@ use next_swc::{
shake_exports::{shake_exports, Config as ShakeExportsConfig}, shake_exports::{shake_exports, Config as ShakeExportsConfig},
}; };
use next_transform_font::{next_font_loaders, Config as FontLoaderConfig}; use next_transform_font::{next_font_loaders, Config as FontLoaderConfig};
use turbo_binding::swc::{ use turbopack_binding::swc::{
core::{ core::{
common::{chain, comments::SingleThreadedComments, FileName, Mark}, common::{chain, comments::SingleThreadedComments, FileName, Mark},
ecma::{ ecma::{
...@@ -110,7 +110,7 @@ fn next_ssg_fixture(input: PathBuf) { ...@@ -110,7 +110,7 @@ fn next_ssg_fixture(input: PathBuf) {
let jsx = jsx::<SingleThreadedComments>( let jsx = jsx::<SingleThreadedComments>(
tr.cm.clone(), tr.cm.clone(),
None, None,
turbo_binding::swc::core::ecma::transforms::react::Options { turbopack_binding::swc::core::ecma::transforms::react::Options {
next: false.into(), next: false.into(),
runtime: None, runtime: None,
import_source: Some("".into()), import_source: Some("".into()),
...@@ -151,7 +151,7 @@ fn page_config_fixture(input: PathBuf) { ...@@ -151,7 +151,7 @@ fn page_config_fixture(input: PathBuf) {
#[fixture("tests/fixture/relay/**/input.ts*")] #[fixture("tests/fixture/relay/**/input.ts*")]
fn relay_no_artifact_dir_fixture(input: PathBuf) { fn relay_no_artifact_dir_fixture(input: PathBuf) {
let output = input.parent().unwrap().join("output.js"); let output = input.parent().unwrap().join("output.js");
let config = turbo_binding::swc::custom_transform::relay::Config { let config = turbopack_binding::swc::custom_transform::relay::Config {
language: RelayLanguageConfig::TypeScript, language: RelayLanguageConfig::TypeScript,
artifact_directory: Some(PathBuf::from("__generated__")), artifact_directory: Some(PathBuf::from("__generated__")),
..Default::default() ..Default::default()
......
...@@ -2,7 +2,7 @@ use std::path::{Path, PathBuf}; ...@@ -2,7 +2,7 @@ use std::path::{Path, PathBuf};
use next_swc::{custom_before_pass, TransformOptions}; use next_swc::{custom_before_pass, TransformOptions};
use serde::de::DeserializeOwned; use serde::de::DeserializeOwned;
use turbo_binding::swc::{ use turbopack_binding::swc::{
core::{ core::{
base::Compiler, base::Compiler,
common::comments::SingleThreadedComments, common::comments::SingleThreadedComments,
...@@ -14,12 +14,12 @@ use turbo_binding::swc::{ ...@@ -14,12 +14,12 @@ use turbo_binding::swc::{
testing::{NormalizedOutput, Tester}, testing::{NormalizedOutput, Tester},
}; };
#[turbo_binding::swc::testing::fixture("tests/full/**/input.js")] #[turbopack_binding::swc::testing::fixture("tests/full/**/input.js")]
fn full(input: PathBuf) { fn full(input: PathBuf) {
test(&input, true); test(&input, true);
} }
#[turbo_binding::swc::testing::fixture("tests/loader/**/input.js")] #[turbopack_binding::swc::testing::fixture("tests/loader/**/input.js")]
fn loader(input: PathBuf) { fn loader(input: PathBuf) {
test(&input, false); test(&input, false);
} }
...@@ -34,16 +34,16 @@ fn test(input: &Path, minify: bool) { ...@@ -34,16 +34,16 @@ fn test(input: &Path, minify: bool) {
let fm = cm.load_file(input).expect("failed to load file"); let fm = cm.load_file(input).expect("failed to load file");
let options = TransformOptions { let options = TransformOptions {
swc: turbo_binding::swc::core::base::config::Options { swc: turbopack_binding::swc::core::base::config::Options {
swcrc: true, swcrc: true,
output_path: Some(output.clone()), output_path: Some(output.clone()),
config: turbo_binding::swc::core::base::config::Config { config: turbopack_binding::swc::core::base::config::Config {
is_module: Some(turbo_binding::swc::core::base::config::IsModule::Bool( is_module: Some(
true, turbopack_binding::swc::core::base::config::IsModule::Bool(true),
)), ),
jsc: turbo_binding::swc::core::base::config::JscConfig { jsc: turbopack_binding::swc::core::base::config::JscConfig {
minify: if minify { minify: if minify {
Some(assert_json("{ \"compress\": true, \"mangle\": true }")) Some(assert_json("{ \"compress\": true, \"mangle\": true }"))
} else { } else {
......
...@@ -3,7 +3,7 @@ use std::{cell::RefCell, rc::Rc, sync::Arc}; ...@@ -3,7 +3,7 @@ use std::{cell::RefCell, rc::Rc, sync::Arc};
use fxhash::FxHashSet; use fxhash::FxHashSet;
use next_swc::next_ssg::next_ssg; use next_swc::next_ssg::next_ssg;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
base::{try_with_handler, Compiler}, base::{try_with_handler, Compiler},
common::{comments::SingleThreadedComments, FileName, FilePathMapping, SourceMap, GLOBALS}, common::{comments::SingleThreadedComments, FileName, FilePathMapping, SourceMap, GLOBALS},
ecma::transforms::base::pass::noop, ecma::transforms::base::pass::noop,
......
...@@ -13,7 +13,7 @@ default = ["rustls-tls"] ...@@ -13,7 +13,7 @@ default = ["rustls-tls"]
# when build (i.e napi --build --features plugin), same for the wasm as well. # when build (i.e napi --build --features plugin), same for the wasm as well.
# this is due to some of transitive dependencies have features cannot be enabled at the same time # this is due to some of transitive dependencies have features cannot be enabled at the same time
# (i.e wasmer/default vs wasmer/js-default) while cargo merges all the features at once. # (i.e wasmer/default vs wasmer/js-default) while cargo merges all the features at once.
plugin = ["turbo-binding/__swc_core_binding_napi_plugin", "next-swc/plugin"] plugin = ["turbopack-binding/__swc_core_binding_napi_plugin", "next-swc/plugin"]
sentry_native_tls = ["sentry", "sentry/native-tls", "native-tls"] sentry_native_tls = ["sentry", "sentry/native-tls", "native-tls"]
sentry_rustls = ["sentry", "sentry/rustls", "rustls-tls"] sentry_rustls = ["sentry", "sentry/rustls", "rustls-tls"]
...@@ -58,7 +58,7 @@ tracing = { version = "0.1.37" } ...@@ -58,7 +58,7 @@ tracing = { version = "0.1.37" }
tracing-futures = "0.2.5" tracing-futures = "0.2.5"
tracing-subscriber = "0.3.9" tracing-subscriber = "0.3.9"
tracing-chrome = "0.5.0" tracing-chrome = "0.5.0"
turbo-binding = { workspace = true, features = [ turbopack-binding = { workspace = true, features = [
"__swc_core_binding_napi", "__swc_core_binding_napi",
"__feature_node_file_trace", "__feature_node_file_trace",
"__feature_mdx_rs", "__feature_mdx_rs",
...@@ -69,7 +69,7 @@ turbo-binding = { workspace = true, features = [ ...@@ -69,7 +69,7 @@ turbo-binding = { workspace = true, features = [
] } ] }
[target.'cfg(not(all(target_os = "linux", target_env = "musl", target_arch = "aarch64")))'.dependencies] [target.'cfg(not(all(target_os = "linux", target_env = "musl", target_arch = "aarch64")))'.dependencies]
turbo-binding = { workspace = true, features = [ turbopack-binding = { workspace = true, features = [
"__turbo_tasks_malloc" "__turbo_tasks_malloc"
] } ] }
...@@ -88,6 +88,6 @@ sentry = { version = "0.27.0", default-features = false, features = [ ...@@ -88,6 +88,6 @@ sentry = { version = "0.27.0", default-features = false, features = [
napi-build = "2" napi-build = "2"
serde = "1" serde = "1"
serde_json = "1" serde_json = "1"
turbo-binding = { workspace = true, features = [ turbopack-binding = { workspace = true, features = [
"__turbo_tasks_build" "__turbo_tasks_build"
]} ]}
...@@ -5,7 +5,7 @@ use std::{ ...@@ -5,7 +5,7 @@ use std::{
path::Path, path::Path,
}; };
use turbo_binding::turbo::tasks_build::generate_register; use turbopack_binding::turbo::tasks_build::generate_register;
extern crate napi_build; extern crate napi_build;
......
...@@ -11,7 +11,7 @@ use next_core::app_structure::{ ...@@ -11,7 +11,7 @@ use next_core::app_structure::{
EntrypointsVc, LoaderTree, LoaderTreeVc, MetadataWithAltItem, EntrypointsVc, LoaderTree, LoaderTreeVc, MetadataWithAltItem,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::{ use turbopack_binding::{
turbo::{ turbo::{
tasks, tasks,
tasks::{ tasks::{
......
...@@ -41,7 +41,7 @@ use std::{ ...@@ -41,7 +41,7 @@ use std::{
use backtrace::Backtrace; use backtrace::Backtrace;
use fxhash::FxHashSet; use fxhash::FxHashSet;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
base::{Compiler, TransformOutput}, base::{Compiler, TransformOutput},
common::{sync::Lazy, FilePathMapping, SourceMap}, common::{sync::Lazy, FilePathMapping, SourceMap},
}; };
...@@ -63,7 +63,8 @@ pub mod util; ...@@ -63,7 +63,8 @@ pub mod util;
feature = "__internal_dhat-ad-hoc" feature = "__internal_dhat-ad-hoc"
)))] )))]
#[global_allocator] #[global_allocator]
static ALLOC: turbo_binding::turbo::malloc::TurboMalloc = turbo_binding::turbo::malloc::TurboMalloc; static ALLOC: turbopack_binding::turbo::malloc::TurboMalloc =
turbopack_binding::turbo::malloc::TurboMalloc;
#[cfg(feature = "__internal_dhat-heap")] #[cfg(feature = "__internal_dhat-heap")]
#[global_allocator] #[global_allocator]
......
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use turbo_binding::features::mdxjs::{compile, Options}; use turbopack_binding::features::mdxjs::{compile, Options};
pub struct MdxCompileTask { pub struct MdxCompileTask {
pub input: String, pub input: String,
......
...@@ -30,7 +30,7 @@ use std::sync::Arc; ...@@ -30,7 +30,7 @@ use std::sync::Arc;
use fxhash::FxHashMap; use fxhash::FxHashMap;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
base::{try_with_handler, TransformOutput}, base::{try_with_handler, TransformOutput},
common::{errors::ColorConfig, sync::Lrc, FileName, SourceFile, SourceMap, GLOBALS}, common::{errors::ColorConfig, sync::Lrc, FileName, SourceFile, SourceMap, GLOBALS},
}; };
...@@ -38,9 +38,9 @@ use turbo_binding::swc::core::{ ...@@ -38,9 +38,9 @@ use turbo_binding::swc::core::{
use crate::{get_compiler, util::MapErr}; use crate::{get_compiler, util::MapErr};
pub struct MinifyTask { pub struct MinifyTask {
c: Arc<turbo_binding::swc::core::base::Compiler>, c: Arc<turbopack_binding::swc::core::base::Compiler>,
code: MinifyTarget, code: MinifyTarget,
opts: turbo_binding::swc::core::base::config::JsMinifyOptions, opts: turbopack_binding::swc::core::base::config::JsMinifyOptions,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
...@@ -80,7 +80,7 @@ impl Task for MinifyTask { ...@@ -80,7 +80,7 @@ impl Task for MinifyTask {
fn compute(&mut self) -> napi::Result<Self::Output> { fn compute(&mut self) -> napi::Result<Self::Output> {
try_with_handler( try_with_handler(
self.c.cm.clone(), self.c.cm.clone(),
turbo_binding::swc::core::base::HandlerOpts { turbopack_binding::swc::core::base::HandlerOpts {
color: ColorConfig::Never, color: ColorConfig::Never,
skip_filename: true, skip_filename: true,
}, },
...@@ -127,7 +127,7 @@ pub fn minify_sync(input: Buffer, opts: Buffer) -> napi::Result<TransformOutput> ...@@ -127,7 +127,7 @@ pub fn minify_sync(input: Buffer, opts: Buffer) -> napi::Result<TransformOutput>
try_with_handler( try_with_handler(
c.cm.clone(), c.cm.clone(),
turbo_binding::swc::core::base::HandlerOpts { turbopack_binding::swc::core::base::HandlerOpts {
color: ColorConfig::Never, color: ColorConfig::Never,
skip_filename: true, skip_filename: true,
}, },
......
...@@ -2,7 +2,7 @@ use std::sync::Arc; ...@@ -2,7 +2,7 @@ use std::sync::Arc;
use anyhow::Context as _; use anyhow::Context as _;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
base::{config::ParseOptions, try_with_handler}, base::{config::ParseOptions, try_with_handler},
common::{ common::{
comments::Comments, errors::ColorConfig, FileName, FilePathMapping, SourceMap, GLOBALS, comments::Comments, errors::ColorConfig, FileName, FilePathMapping, SourceMap, GLOBALS,
...@@ -24,7 +24,7 @@ impl Task for ParseTask { ...@@ -24,7 +24,7 @@ impl Task for ParseTask {
fn compute(&mut self) -> napi::Result<Self::Output> { fn compute(&mut self) -> napi::Result<Self::Output> {
GLOBALS.set(&Default::default(), || { GLOBALS.set(&Default::default(), || {
let c = turbo_binding::swc::core::base::Compiler::new(Arc::new(SourceMap::new( let c = turbopack_binding::swc::core::base::Compiler::new(Arc::new(SourceMap::new(
FilePathMapping::empty(), FilePathMapping::empty(),
))); )));
...@@ -39,7 +39,7 @@ impl Task for ParseTask { ...@@ -39,7 +39,7 @@ impl Task for ParseTask {
c.cm.new_source_file(self.filename.clone(), self.src.clone()); c.cm.new_source_file(self.filename.clone(), self.src.clone());
let program = try_with_handler( let program = try_with_handler(
c.cm.clone(), c.cm.clone(),
turbo_binding::swc::core::base::HandlerOpts { turbopack_binding::swc::core::base::HandlerOpts {
color: ColorConfig::Never, color: ColorConfig::Never,
skip_filename: false, skip_filename: false,
}, },
......
...@@ -38,7 +38,7 @@ use anyhow::{anyhow, bail, Context as _}; ...@@ -38,7 +38,7 @@ use anyhow::{anyhow, bail, Context as _};
use fxhash::FxHashSet; use fxhash::FxHashSet;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use next_swc::{custom_before_pass, TransformOptions}; use next_swc::{custom_before_pass, TransformOptions};
use turbo_binding::swc::core::{ use turbopack_binding::swc::core::{
base::{try_with_handler, Compiler, TransformOutput}, base::{try_with_handler, Compiler, TransformOutput},
common::{comments::SingleThreadedComments, errors::ColorConfig, FileName, GLOBALS}, common::{comments::SingleThreadedComments, errors::ColorConfig, FileName, GLOBALS},
ecma::transforms::base::pass::noop, ecma::transforms::base::pass::noop,
...@@ -76,7 +76,7 @@ impl Task for TransformTask { ...@@ -76,7 +76,7 @@ impl Task for TransformTask {
let res = catch_unwind(AssertUnwindSafe(|| { let res = catch_unwind(AssertUnwindSafe(|| {
try_with_handler( try_with_handler(
self.c.cm.clone(), self.c.cm.clone(),
turbo_binding::swc::core::base::HandlerOpts { turbopack_binding::swc::core::base::HandlerOpts {
color: ColorConfig::Always, color: ColorConfig::Always,
skip_filename: skip_filename(), skip_filename: skip_filename(),
}, },
......
use std::sync::Arc; use std::sync::Arc;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use turbo_binding::{ use turbopack_binding::{
features::node_file_trace::{start, Args}, features::node_file_trace::{start, Args},
turbo::{tasks::TurboTasks, tasks_memory::MemoryBackend}, turbo::{tasks::TurboTasks, tasks_memory::MemoryBackend},
turbopack::turbopack::{ turbopack::turbopack::{
......
...@@ -9,16 +9,16 @@ autobenches = false ...@@ -9,16 +9,16 @@ autobenches = false
[features] [features]
native-tls = ["next-core/native-tls"] native-tls = ["next-core/native-tls"]
rustls-tls = ["next-core/rustls-tls"] rustls-tls = ["next-core/rustls-tls"]
custom_allocator = ["turbo-binding/__turbo_tasks_malloc", "turbo-binding/__turbo_tasks_malloc_custom_allocator"] custom_allocator = ["turbopack-binding/__turbo_tasks_malloc", "turbopack-binding/__turbo_tasks_malloc_custom_allocator"]
[dependencies] [dependencies]
anyhow = "1.0.47" anyhow = "1.0.47"
next-core = { workspace = true } next-core = { workspace = true }
turbo-binding = { workspace = true, features = ["__turbo_tasks", "__turbo_tasks_memory"] } turbopack-binding = { workspace = true, features = ["__turbo_tasks", "__turbo_tasks_memory"] }
[build-dependencies] [build-dependencies]
turbo-binding = { workspace = true, features = ["__turbo_tasks_build"] } turbopack-binding = { workspace = true, features = ["__turbo_tasks_build"] }
vergen = { version = "7.3.2", default-features = false, features = [ vergen = { version = "7.3.2", default-features = false, features = [
"cargo", "cargo",
"build", "build",
......
use turbo_binding::turbo::tasks_build::generate_register; use turbopack_binding::turbo::tasks_build::generate_register;
use vergen::{vergen, Config}; use vergen::{vergen, Config};
fn main() { fn main() {
......
use turbo_binding::turbo::{ use turbopack_binding::turbo::{
tasks::{NothingVc, StatsType, TurboTasks, TurboTasksBackendApi}, tasks::{NothingVc, StatsType, TurboTasks, TurboTasksBackendApi},
tasks_memory::MemoryBackend, tasks_memory::MemoryBackend,
}; };
pub fn register() { pub fn register() {
turbo_binding::turbo::tasks::register(); turbopack_binding::turbo::tasks::register();
include!(concat!(env!("OUT_DIR"), "/register.rs")); include!(concat!(env!("OUT_DIR"), "/register.rs"));
} }
......
...@@ -23,7 +23,7 @@ indoc = { workspace = true } ...@@ -23,7 +23,7 @@ indoc = { workspace = true }
allsorts = { workspace = true } allsorts = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
lazy_static = { workspace = true } lazy_static = { workspace = true }
turbo-binding = { workspace = true, features = [ turbopack-binding = { workspace = true, features = [
"__swc_transform_modularize_imports", "__swc_transform_modularize_imports",
"__swc_transform_relay", "__swc_transform_relay",
"__feature_auto_hash_map", "__feature_auto_hash_map",
...@@ -57,16 +57,16 @@ swc_core = { workspace = true, features = [ ...@@ -57,16 +57,16 @@ swc_core = { workspace = true, features = [
] } ] }
[build-dependencies] [build-dependencies]
turbo-binding = { workspace = true, features = ["__turbo_tasks_build"] } turbopack-binding = { workspace = true, features = ["__turbo_tasks_build"] }
[features] [features]
next-font-local = [] next-font-local = []
native-tls = ["turbo-binding/__turbo_tasks_fetch_native-tls"] native-tls = ["turbopack-binding/__turbo_tasks_fetch_native-tls"]
rustls-tls = ["turbo-binding/__turbo_tasks_fetch_rustls-tls"] rustls-tls = ["turbopack-binding/__turbo_tasks_fetch_rustls-tls"]
# Internal only. Enabled when building for the Next.js integration test suite. # Internal only. Enabled when building for the Next.js integration test suite.
__internal_nextjs_integration_test = [] __internal_nextjs_integration_test = []
# enable "HMR" for embedded assets # enable "HMR" for embedded assets
dynamic_embed_contents = [ dynamic_embed_contents = [
"turbo-binding/__turbo_tasks_fs_dynamic_embed_contents", "turbopack-binding/__turbo_tasks_fs_dynamic_embed_contents",
"turbo-binding/__turbopack_dev_dynamic_embed_contents", "turbopack-binding/__turbopack_dev_dynamic_embed_contents",
] ]
use turbo_binding::turbo::tasks_build::generate_register; use turbopack_binding::turbo::tasks_build::generate_register;
fn main() { fn main() {
generate_register(); generate_register();
......
use std::collections::HashMap; use std::collections::HashMap;
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbopack_binding::turbo::tasks_fs::FileSystemPathVc;
pub mod next_layout_entry_transition; pub mod next_layout_entry_transition;
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::{ use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
core::{asset::AssetVc, compile_time_info::CompileTimeInfoVc}, core::{asset::AssetVc, compile_time_info::CompileTimeInfoVc},
......
...@@ -7,7 +7,9 @@ use swc_core::{ ...@@ -7,7 +7,9 @@ use swc_core::{
common::{source_map::Pos, Span, Spanned}, common::{source_map::Pos, Span, Spanned},
ecma::ast::{Expr, Ident, Program}, ecma::ast::{Expr, Ident, Program},
}; };
use turbo_binding::turbopack::{ use turbo_tasks::{primitives::StringVc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPathVc;
use turbopack_binding::turbopack::{
core::{ core::{
asset::{Asset, AssetVc}, asset::{Asset, AssetVc},
ident::AssetIdentVc, ident::AssetIdentVc,
...@@ -21,8 +23,6 @@ use turbo_binding::turbopack::{ ...@@ -21,8 +23,6 @@ use turbo_binding::turbopack::{
EcmascriptModuleAssetVc, EcmascriptModuleAssetVc,
}, },
}; };
use turbo_tasks::{primitives::StringVc, trace::TraceRawVcs};
use turbo_tasks_fs::FileSystemPathVc;
use crate::util::NextRuntime; use crate::util::NextRuntime;
......
...@@ -3,7 +3,8 @@ use std::{collections::HashMap, io::Write, iter::once}; ...@@ -3,7 +3,8 @@ use std::{collections::HashMap, io::Write, iter::once};
use anyhow::Result; use anyhow::Result;
use async_recursion::async_recursion; use async_recursion::async_recursion;
use indexmap::{indexmap, IndexMap}; use indexmap::{indexmap, IndexMap};
use turbo_binding::{ use turbo_tasks::{primitives::JsonValueVc, TryJoinIterExt, ValueToString};
use turbopack_binding::{
turbo::{ turbo::{
tasks::{ tasks::{
primitives::{OptionStringVc, StringVc}, primitives::{OptionStringVc, StringVc},
...@@ -60,7 +61,6 @@ use turbo_binding::{ ...@@ -60,7 +61,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::{primitives::JsonValueVc, TryJoinIterExt, ValueToString};
use crate::{ use crate::{
app_render::next_layout_entry_transition::NextServerComponentTransition, app_render::next_layout_entry_transition::NextServerComponentTransition,
......
...@@ -8,16 +8,16 @@ use indexmap::{indexmap, map::Entry, IndexMap}; ...@@ -8,16 +8,16 @@ use indexmap::{indexmap, map::Entry, IndexMap};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::{
turbo::tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPathVc},
turbopack::core::issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc},
};
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, debug::ValueDebugFormat,
primitives::{StringVc, StringsVc}, primitives::{StringVc, StringsVc},
trace::TraceRawVcs, trace::TraceRawVcs,
CompletionVc, CompletionsVc, CompletionVc, CompletionsVc,
}; };
use turbopack_binding::{
turbo::tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPathVc},
turbopack::core::issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc},
};
use crate::next_config::NextConfigVc; use crate::next_config::NextConfigVc;
......
use turbo_binding::turbopack::{ use turbo_tasks::Value;
use turbopack_binding::turbopack::{
core::{ core::{
asset::AssetVc, asset::AssetVc,
context::{AssetContext, AssetContextVc}, context::{AssetContext, AssetContextVc},
...@@ -8,7 +9,6 @@ use turbo_binding::turbopack::{ ...@@ -8,7 +9,6 @@ use turbo_binding::turbopack::{
EcmascriptModuleAssetVc, EcmascriptModuleAssetVc,
}, },
}; };
use turbo_tasks::Value;
pub(crate) fn as_es_module_asset( pub(crate) fn as_es_module_asset(
asset: AssetVc, asset: AssetVc,
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::{ use turbo_tasks::{
primitives::{BoolVc, StringVc},
Value,
};
use turbopack_binding::{
turbo::tasks_fs::{FileSystemEntryType, FileSystemPathVc}, turbo::tasks_fs::{FileSystemEntryType, FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
...@@ -13,10 +17,6 @@ use turbo_binding::{ ...@@ -13,10 +17,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::{
primitives::{BoolVc, StringVc},
Value,
};
const BABEL_CONFIG_FILES: &[&str] = &[ const BABEL_CONFIG_FILES: &[&str] = &[
".babelrc", ".babelrc",
......
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use indexmap::{indexmap, IndexMap}; use indexmap::{indexmap, IndexMap};
use turbo_binding::turbopack::{ use turbo_tasks::Value;
use turbo_tasks_fs::{File, FileSystemPathVc};
use turbopack_binding::turbopack::{
core::{ core::{
asset::{Asset, AssetVc}, asset::{Asset, AssetVc},
context::{AssetContext, AssetContextVc}, context::{AssetContext, AssetContextVc},
...@@ -15,8 +17,6 @@ use turbo_binding::turbopack::{ ...@@ -15,8 +17,6 @@ use turbo_binding::turbopack::{
InnerAssetsVc, InnerAssetsVc,
}, },
}; };
use turbo_tasks::Value;
use turbo_tasks_fs::{File, FileSystemPathVc};
use crate::asset_helpers::as_es_module_asset; use crate::asset_helpers::as_es_module_asset;
......
use turbo_binding::{ use turbopack_binding::{
turbo::tasks_fs::{FileContentVc, FileSystem, FileSystemPathVc, FileSystemVc}, turbo::tasks_fs::{FileContentVc, FileSystem, FileSystemPathVc, FileSystemVc},
turbopack::core::{asset::AssetVc, source_asset::SourceAssetVc}, turbopack::core::{asset::AssetVc, source_asset::SourceAssetVc},
}; };
...@@ -7,7 +7,7 @@ pub const VIRTUAL_PACKAGE_NAME: &str = "@vercel/turbopack-next"; ...@@ -7,7 +7,7 @@ pub const VIRTUAL_PACKAGE_NAME: &str = "@vercel/turbopack-next";
#[turbo_tasks::function] #[turbo_tasks::function]
pub(crate) fn next_js_fs() -> FileSystemVc { pub(crate) fn next_js_fs() -> FileSystemVc {
// [TODO]: macro need to be refactored to be used via turbo-binding // [TODO]: macro need to be refactored to be used via turbopack-binding
turbo_tasks_fs::embed_directory!("next", "$CARGO_MANIFEST_DIR/js/src") turbo_tasks_fs::embed_directory!("next", "$CARGO_MANIFEST_DIR/js/src")
} }
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::{ use turbopack_binding::{
turbo::tasks_env::{ turbo::tasks_env::{
CustomProcessEnvVc, EnvMapVc, FilterProcessEnvVc, ProcessEnv, ProcessEnvVc, CustomProcessEnvVc, EnvMapVc, FilterProcessEnvVc, ProcessEnv, ProcessEnvVc,
}, },
......
use std::collections::HashMap; use std::collections::HashMap;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::{ use turbo_tasks::Value;
use turbopack_binding::{
turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc}, turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
...@@ -17,7 +18,6 @@ use turbo_binding::{ ...@@ -17,7 +18,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::Value;
use crate::{ use crate::{
next_client::context::{ next_client::context::{
......
...@@ -37,7 +37,7 @@ mod web_entry_source; ...@@ -37,7 +37,7 @@ mod web_entry_source;
pub use app_source::create_app_source; pub use app_source::create_app_source;
pub use page_source::create_page_source; pub use page_source::create_page_source;
pub use turbo_binding::{turbopack::node::source_map, *}; pub use turbopack_binding::{turbopack::node::source_map, *};
pub use web_entry_source::create_web_entry_source; pub use web_entry_source::create_web_entry_source;
pub fn register() { pub fn register() {
......
...@@ -2,7 +2,11 @@ use anyhow::{Context, Result}; ...@@ -2,7 +2,11 @@ use anyhow::{Context, Result};
use indexmap::IndexMap; use indexmap::IndexMap;
use mime::{APPLICATION_JAVASCRIPT_UTF_8, APPLICATION_JSON}; use mime::{APPLICATION_JAVASCRIPT_UTF_8, APPLICATION_JSON};
use serde::Serialize; use serde::Serialize;
use turbo_binding::{ use turbo_tasks::{
graph::{GraphTraversal, NonDeterministic},
primitives::{StringReadRef, StringVc, StringsVc},
};
use turbopack_binding::{
turbo::{tasks::TryJoinIterExt, tasks_fs::File}, turbo::{tasks::TryJoinIterExt, tasks_fs::File},
turbopack::{ turbopack::{
core::{ core::{
...@@ -18,10 +22,6 @@ use turbo_binding::{ ...@@ -18,10 +22,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::{
graph::{GraphTraversal, NonDeterministic},
primitives::{StringReadRef, StringVc, StringsVc},
};
use crate::{ use crate::{
embed_js::next_js_file, embed_js::next_js_file,
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::{ use turbo_tasks::primitives::StringVc;
use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::core::resolve::options::{ImportMapping, ImportMappingVc}, turbopack::core::resolve::options::{ImportMapping, ImportMappingVc},
}; };
use turbo_tasks::primitives::StringVc;
use crate::next_import_map::get_next_package; use crate::next_import_map::get_next_package;
......
...@@ -2,7 +2,9 @@ use core::{default::Default, result::Result::Ok}; ...@@ -2,7 +2,9 @@ use core::{default::Default, result::Result::Ok};
use std::collections::HashMap; use std::collections::HashMap;
use anyhow::Result; use anyhow::Result;
use turbo_binding::{ use turbo_tasks::{primitives::StringVc, Value};
use turbo_tasks_fs::FileSystem;
use turbopack_binding::{
turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc}, turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
...@@ -37,8 +39,6 @@ use turbo_binding::{ ...@@ -37,8 +39,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::{primitives::StringVc, Value};
use turbo_tasks_fs::FileSystem;
use super::transforms::get_next_client_transforms_rules; use super::transforms::get_next_client_transforms_rules;
use crate::{ use crate::{
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::{ use turbopack_binding::{
turbo::{tasks::ValueToString, tasks_fs::FileSystemPathVc}, turbo::{tasks::ValueToString, tasks_fs::FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
......
use anyhow::Result; use anyhow::Result;
use next_transform_strip_page_exports::ExportFilter; use next_transform_strip_page_exports::ExportFilter;
use turbo_binding::turbopack::turbopack::module_options::ModuleRule; use turbopack_binding::turbopack::turbopack::module_options::ModuleRule;
use crate::{ use crate::{
next_client::context::ClientContextType, next_client::context::ClientContextType,
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbopack::{ use turbo_tasks::{primitives::OptionStringVc, Value};
use turbopack_binding::turbopack::{
core::{ core::{
asset::AssetVc, asset::AssetVc,
chunk::{ChunkingContext, ChunkingContextVc}, chunk::{ChunkingContext, ChunkingContextVc},
...@@ -19,7 +20,6 @@ use turbo_binding::turbopack::{ ...@@ -19,7 +20,6 @@ use turbo_binding::turbopack::{
ModuleAssetContextVc, ModuleAssetContextVc,
}, },
}; };
use turbo_tasks::{primitives::OptionStringVc, Value};
use super::runtime_entry::RuntimeEntriesVc; use super::runtime_entry::RuntimeEntriesVc;
use crate::embed_js::next_asset; use crate::embed_js::next_asset;
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::{ use turbo_tasks::Value;
use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
core::{asset::AssetVc, chunk::ChunkingContextVc, compile_time_info::CompileTimeInfoVc}, core::{asset::AssetVc, chunk::ChunkingContextVc, compile_time_info::CompileTimeInfoVc},
...@@ -13,7 +14,6 @@ use turbo_binding::{ ...@@ -13,7 +14,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::Value;
use super::with_chunks::WithChunksAsset; use super::with_chunks::WithChunksAsset;
use crate::{ use crate::{
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::turbopack::{ use turbo_tasks::{primitives::StringVc, Value};
use turbopack_binding::turbopack::{
core::{ core::{
asset::{Asset, AssetContentVc, AssetVc}, asset::{Asset, AssetContentVc, AssetVc},
chunk::{ chunk::{
...@@ -15,7 +16,6 @@ use turbo_binding::turbopack::{ ...@@ -15,7 +16,6 @@ use turbo_binding::turbopack::{
EcmascriptChunkVc, EcmascriptExportsVc, EcmascriptChunkVc, EcmascriptExportsVc,
}, },
}; };
use turbo_tasks::{primitives::StringVc, Value};
#[turbo_tasks::function] #[turbo_tasks::function]
fn modifier() -> StringVc { fn modifier() -> StringVc {
......
...@@ -2,7 +2,7 @@ use std::io::Write; ...@@ -2,7 +2,7 @@ use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indoc::writedoc; use indoc::writedoc;
use turbo_binding::{ use turbopack_binding::{
turbo::{ turbo::{
tasks::{primitives::StringVc, TryJoinIterExt, Value}, tasks::{primitives::StringVc, TryJoinIterExt, Value},
tasks_fs::rope::RopeBuilder, tasks_fs::rope::RopeBuilder,
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbopack::{ use turbo_tasks::{primitives::OptionStringVc, Value};
use turbopack_binding::turbopack::{
core::{ core::{
asset::AssetVc, asset::AssetVc,
context::AssetContext, context::AssetContext,
...@@ -15,7 +16,6 @@ use turbo_binding::turbopack::{ ...@@ -15,7 +16,6 @@ use turbo_binding::turbopack::{
ModuleAssetContextVc, ModuleAssetContextVc,
}, },
}; };
use turbo_tasks::{primitives::OptionStringVc, Value};
use crate::embed_js::next_asset; use crate::embed_js::next_asset;
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{asset::AssetVc, compile_time_info::CompileTimeInfoVc}, core::{asset::AssetVc, compile_time_info::CompileTimeInfoVc},
turbopack::{ turbopack::{
ecmascript::chunk::EcmascriptChunkPlaceableVc, ecmascript::chunk::EcmascriptChunkPlaceableVc,
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use turbo_binding::turbopack::{ use turbo_tasks::{primitives::StringVc, Value};
use turbopack_binding::turbopack::{
core::{ core::{
asset::{Asset, AssetContentVc, AssetVc}, asset::{Asset, AssetContentVc, AssetVc},
chunk::{ chunk::{
...@@ -15,7 +16,6 @@ use turbo_binding::turbopack::{ ...@@ -15,7 +16,6 @@ use turbo_binding::turbopack::{
EcmascriptChunkVc, EcmascriptExportsVc, EcmascriptChunkVc, EcmascriptExportsVc,
}, },
}; };
use turbo_tasks::{primitives::StringVc, Value};
#[turbo_tasks::function] #[turbo_tasks::function]
fn modifier() -> StringVc { fn modifier() -> StringVc {
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_binding::{ use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value, ValueToString, ValueToStringVc};
use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
core::{ core::{
...@@ -30,7 +31,6 @@ use turbo_binding::{ ...@@ -30,7 +31,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value, ValueToString, ValueToStringVc};
#[turbo_tasks::function] #[turbo_tasks::function]
fn modifier() -> StringVc { fn modifier() -> StringVc {
......
...@@ -2,7 +2,13 @@ use anyhow::{Context, Result}; ...@@ -2,7 +2,13 @@ use anyhow::{Context, Result};
use indexmap::IndexMap; use indexmap::IndexMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use turbo_binding::{ use turbo_tasks::{
primitives::{BoolVc, StringsVc},
trace::TraceRawVcs,
CompletionVc, Value,
};
use turbo_tasks_fs::json::parse_json_with_source_context;
use turbopack_binding::{
turbo::{tasks_env::EnvMapVc, tasks_fs::FileSystemPathVc}, turbo::{tasks_env::EnvMapVc, tasks_fs::FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
...@@ -35,12 +41,6 @@ use turbo_binding::{ ...@@ -35,12 +41,6 @@ use turbo_binding::{
turbopack::evaluate_context::node_evaluate_asset_context, turbopack::evaluate_context::node_evaluate_asset_context,
}, },
}; };
use turbo_tasks::{
primitives::{BoolVc, StringsVc},
trace::TraceRawVcs,
CompletionVc, Value,
};
use turbo_tasks_fs::json::parse_json_with_source_context;
use crate::{embed_js::next_asset, next_shared::transforms::ModularizeImportPackageConfig}; use crate::{embed_js::next_asset, next_shared::transforms::ModularizeImportPackageConfig};
...@@ -646,7 +646,7 @@ pub async fn load_next_config_internal( ...@@ -646,7 +646,7 @@ pub async fn load_next_config_internal(
) )
.await?; .await?;
let turbo_binding::turbo::tasks_bytes::stream::SingleValue::Single(val) = config_value.try_into_single().await.context("Evaluation of Next.js config failed")? else { let turbopack_binding::turbo::tasks_bytes::stream::SingleValue::Single(val) = config_value.try_into_single().await.context("Evaluation of Next.js config failed")? else {
return Ok(NextConfig::default().cell()); return Ok(NextConfig::default().cell());
}; };
let next_config: NextConfig = parse_json_with_source_context(val.to_str()?)?; let next_config: NextConfig = parse_json_with_source_context(val.to_str()?)?;
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::{ use turbo_tasks::Value;
use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
core::{ core::{
...@@ -18,7 +19,6 @@ use turbo_binding::{ ...@@ -18,7 +19,6 @@ use turbo_binding::{
turbopack::resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc}, turbopack::resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
}, },
}; };
use turbo_tasks::Value;
use crate::{ use crate::{
next_config::NextConfigVc, next_import_map::get_next_edge_import_map, next_config::NextConfigVc, next_import_map::get_next_edge_import_map,
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::{ use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
core::{asset::AssetVc, chunk::ChunkingContextVc, compile_time_info::CompileTimeInfoVc}, core::{asset::AssetVc, chunk::ChunkingContextVc, compile_time_info::CompileTimeInfoVc},
......
use anyhow::Result; use anyhow::Result;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::turbo::tasks::{ use turbopack_binding::turbo::tasks::{
primitives::{StringVc, StringsVc}, primitives::{StringVc, StringsVc},
trace::TraceRawVcs, trace::TraceRawVcs,
}; };
......
...@@ -4,11 +4,11 @@ use anyhow::{Context, Result}; ...@@ -4,11 +4,11 @@ use anyhow::{Context, Result};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::{turbo::tasks_fs::FileSystemPathVc, turbopack::core::issue::IssueSeverity};
use turbo_tasks::{ use turbo_tasks::{
primitives::{StringVc, StringsVc, U32Vc}, primitives::{StringVc, StringsVc, U32Vc},
trace::TraceRawVcs, trace::TraceRawVcs,
}; };
use turbopack_binding::{turbo::tasks_fs::FileSystemPathVc, turbopack::core::issue::IssueSeverity};
use super::options::NextFontGoogleOptionsVc; use super::options::NextFontGoogleOptionsVc;
use crate::{ use crate::{
...@@ -180,7 +180,7 @@ fn lookup_fallback( ...@@ -180,7 +180,7 @@ fn lookup_fallback(
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_fs::json::parse_json_with_source_context; use turbopack_binding::turbo::tasks_fs::json::parse_json_with_source_context;
use super::{FontAdjustment, FontMetricsMap}; use super::{FontAdjustment, FontMetricsMap};
use crate::next_font::google::font_fallback::{lookup_fallback, Fallback}; use crate::next_font::google::font_fallback::{lookup_fallback, Fallback};
......
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use indexmap::IndexMap; use indexmap::IndexMap;
use indoc::formatdoc; use indoc::formatdoc;
use turbo_binding::{ use turbopack_binding::{
turbo::{ turbo::{
tasks::{ tasks::{
primitives::{OptionStringVc, StringVc, U32Vc}, primitives::{OptionStringVc, StringVc, U32Vc},
...@@ -209,7 +209,9 @@ impl ImportMappingReplacement for NextFontGoogleCssModuleReplacer { ...@@ -209,7 +209,9 @@ impl ImportMappingReplacement for NextFontGoogleCssModuleReplacer {
#[cfg(not(feature = "__internal_nextjs_integration_test"))] #[cfg(not(feature = "__internal_nextjs_integration_test"))]
let stylesheet_str = { let stylesheet_str = {
use turbo_binding::{turbo::tasks_fetch::fetch, turbopack::core::issue::IssueSeverity}; use turbopack_binding::{
turbo::tasks_fetch::fetch, turbopack::core::issue::IssueSeverity,
};
let stylesheet_res = fetch( let stylesheet_res = fetch(
stylesheet_url, stylesheet_url,
...@@ -304,7 +306,7 @@ async fn get_stylesheet_url_from_options( ...@@ -304,7 +306,7 @@ async fn get_stylesheet_url_from_options(
let mut css_url: Option<String> = None; let mut css_url: Option<String> = None;
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
{ {
use turbo_binding::turbo::tasks_env::{CommandLineProcessEnvVc, ProcessEnv}; use turbopack_binding::turbo::tasks_env::{CommandLineProcessEnvVc, ProcessEnv};
let env = CommandLineProcessEnvVc::new(); let env = CommandLineProcessEnvVc::new();
if let Some(url) = &*env.read("TURBOPACK_TEST_ONLY_MOCK_SERVER").await? { if let Some(url) = &*env.read("TURBOPACK_TEST_ONLY_MOCK_SERVER").await? {
...@@ -396,7 +398,7 @@ async fn get_mock_stylesheet( ...@@ -396,7 +398,7 @@ async fn get_mock_stylesheet(
) -> Result<Option<String>> { ) -> Result<Option<String>> {
use std::{collections::HashMap, path::Path}; use std::{collections::HashMap, path::Path};
use turbo_binding::{ use turbopack_binding::{
turbo::{ turbo::{
tasks::CompletionVc, tasks::CompletionVc,
tasks_bytes::stream::SingleValue, tasks_bytes::stream::SingleValue,
......
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use indexmap::{indexset, IndexMap, IndexSet}; use indexmap::{indexset, IndexMap, IndexSet};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::turbo::tasks::{primitives::StringVc, trace::TraceRawVcs, Value}; use turbopack_binding::turbo::tasks::{primitives::StringVc, trace::TraceRawVcs, Value};
use super::request::{NextFontRequest, OneOrManyStrings}; use super::request::{NextFontRequest, OneOrManyStrings};
...@@ -198,7 +198,7 @@ pub(super) fn options_from_request( ...@@ -198,7 +198,7 @@ pub(super) fn options_from_request(
mod tests { mod tests {
use anyhow::Result; use anyhow::Result;
use indexmap::IndexMap; use indexmap::IndexMap;
use turbo_binding::turbo::tasks_fs::json::parse_json_with_source_context; use turbopack_binding::turbo::tasks_fs::json::parse_json_with_source_context;
use super::{options_from_request, FontDataEntry, NextFontGoogleOptions}; use super::{options_from_request, FontDataEntry, NextFontGoogleOptions};
use crate::next_font::google::{options::FontWeights, request::NextFontRequest}; use crate::next_font::google::{options::FontWeights, request::NextFontRequest};
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks::primitives::{OptionStringVc, StringVc}; use turbopack_binding::turbo::tasks::primitives::{OptionStringVc, StringVc};
use super::FontCssPropertiesVc; use super::FontCssPropertiesVc;
use crate::next_font::{ use crate::next_font::{
......
...@@ -231,7 +231,7 @@ pub(super) fn get_stylesheet_url( ...@@ -231,7 +231,7 @@ pub(super) fn get_stylesheet_url(
mod tests { mod tests {
use anyhow::Result; use anyhow::Result;
use indexmap::indexset; use indexmap::indexset;
use turbo_binding::turbo::tasks_fs::json::parse_json_with_source_context; use turbopack_binding::turbo::tasks_fs::json::parse_json_with_source_context;
use super::get_font_axes; use super::get_font_axes;
use crate::next_font::google::{ use crate::next_font::google::{
......
use turbo_binding::{ use turbo_tasks::primitives::StringVc;
use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::core::issue::{Issue, IssueSeverityVc, IssueVc}, turbopack::core::issue::{Issue, IssueSeverityVc, IssueVc},
}; };
use turbo_tasks::primitives::StringVc;
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
pub(crate) struct NextFontIssue { pub(crate) struct NextFontIssue {
......
...@@ -3,7 +3,7 @@ use allsorts::{ ...@@ -3,7 +3,7 @@ use allsorts::{
Font, Font,
}; };
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use turbo_binding::turbo::{ use turbopack_binding::turbo::{
tasks::primitives::{StringVc, StringsVc, U32Vc}, tasks::primitives::{StringVc, StringsVc, U32Vc},
tasks_fs::{FileContent, FileSystemPathVc}, tasks_fs::{FileContent, FileSystemPathVc},
}; };
......
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_binding::{ use turbopack_binding::{
turbo::{ turbo::{
tasks::{ tasks::{
primitives::{OptionStringVc, U32Vc}, primitives::{OptionStringVc, U32Vc},
......
...@@ -2,7 +2,7 @@ use std::{fmt::Display, str::FromStr}; ...@@ -2,7 +2,7 @@ use std::{fmt::Display, str::FromStr};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::turbo::tasks::{primitives::StringVc, trace::TraceRawVcs, Value}; use turbopack_binding::turbo::tasks::{primitives::StringVc, trace::TraceRawVcs, Value};
use super::request::{ use super::request::{
AdjustFontFallback, NextFontLocalRequest, NextFontLocalRequestArguments, SrcDescriptor, AdjustFontFallback, NextFontLocalRequest, NextFontLocalRequestArguments, SrcDescriptor,
...@@ -173,7 +173,7 @@ pub(super) fn options_from_request(request: &NextFontLocalRequest) -> Result<Nex ...@@ -173,7 +173,7 @@ pub(super) fn options_from_request(request: &NextFontLocalRequest) -> Result<Nex
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_fs::json::parse_json_with_source_context; use turbopack_binding::turbo::tasks_fs::json::parse_json_with_source_context;
use super::{options_from_request, NextFontLocalOptions}; use super::{options_from_request, NextFontLocalOptions};
use crate::next_font::local::{ use crate::next_font::local::{
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::turbo::tasks::trace::TraceRawVcs; use turbopack_binding::turbo::tasks::trace::TraceRawVcs;
/// The top-most structure encoded into the query param in requests to /// The top-most structure encoded into the query param in requests to
/// `next/font/local` generated by the next/font swc transform. e.g. /// `next/font/local` generated by the next/font swc transform. e.g.
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_binding::turbo::tasks::primitives::{StringVc, U32Vc}; use turbopack_binding::turbo::tasks::primitives::{StringVc, U32Vc};
use super::options::{FontDescriptors, NextFontLocalOptionsVc}; use super::options::{FontDescriptors, NextFontLocalOptionsVc};
use crate::next_font::{ use crate::next_font::{
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks::primitives::{StringVc, U32Vc}; use turbopack_binding::turbo::tasks::primitives::{StringVc, U32Vc};
use super::options::NextFontLocalOptionsVc; use super::options::NextFontLocalOptionsVc;
use crate::next_font::{ use crate::next_font::{
......
use anyhow::Result; use anyhow::Result;
use indoc::formatdoc; use indoc::formatdoc;
use turbo_binding::turbo::tasks::primitives::StringVc; use turbopack_binding::turbo::tasks::primitives::StringVc;
use super::{ use super::{
font_fallback::{FontFallback, FontFallbacksVc}, font_fallback::{FontFallback, FontFallbacksVc},
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use turbo_binding::{ use turbo_tasks::primitives::{OptionStringVc, StringVc, U32Vc};
use turbopack_binding::{
turbo::tasks_hash::hash_xxh3_hash64, turbopack::core::resolve::pattern::QueryMapVc, turbo::tasks_hash::hash_xxh3_hash64, turbopack::core::resolve::pattern::QueryMapVc,
}; };
use turbo_tasks::primitives::{OptionStringVc, StringVc, U32Vc};
/// CSS properties and values for a given font variation. These are rendered as /// CSS properties and values for a given font variation. These are rendered as
/// values in both the returned JavaScript object and in the referenced css /// values in both the returned JavaScript object and in the referenced css
......
use std::collections::BTreeSet; use std::collections::BTreeSet;
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbopack::{ use turbo_tasks::{primitives::StringVc, Value};
use turbo_tasks_fs::FileSystem;
use turbopack_binding::turbopack::{
core::{ core::{
asset::AssetContent, asset::AssetContent,
ident::AssetIdentVc, ident::AssetIdentVc,
...@@ -21,8 +23,6 @@ use turbo_binding::turbopack::{ ...@@ -21,8 +23,6 @@ use turbo_binding::turbopack::{
}, },
image::process::optimize, image::process::optimize,
}; };
use turbo_tasks::{primitives::StringVc, Value};
use turbo_tasks_fs::FileSystem;
/// Serves, resizes, optimizes, and re-encodes images to be used with /// Serves, resizes, optimizes, and re-encodes images to be used with
/// next/image. /// next/image.
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::{ use turbopack_binding::{
turbo::tasks::Value, turbo::tasks::Value,
turbopack::{ turbopack::{
core::{ core::{
......
use std::io::Write; use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::{ use turbopack_binding::{
turbo::{ turbo::{
tasks::primitives::StringVc, tasks::primitives::StringVc,
tasks_fs::{rope::RopeBuilder, FileContent}, tasks_fs::{rope::RopeBuilder, FileContent},
......
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use turbo_binding::{ use turbo_tasks::Value;
use turbopack_binding::{
turbo::tasks_fs::{glob::GlobVc, FileSystem, FileSystemPathVc}, turbo::tasks_fs::{glob::GlobVc, FileSystem, FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
...@@ -20,7 +21,6 @@ use turbo_binding::{ ...@@ -20,7 +21,6 @@ use turbo_binding::{
turbopack::{resolve_options, resolve_options_context::ResolveOptionsContext}, turbopack::{resolve_options, resolve_options_context::ResolveOptionsContext},
}, },
}; };
use turbo_tasks::Value;
use crate::{ use crate::{
embed_js::{next_js_fs, VIRTUAL_PACKAGE_NAME}, embed_js::{next_js_fs, VIRTUAL_PACKAGE_NAME},
...@@ -465,7 +465,7 @@ pub async fn insert_next_shared_aliases( ...@@ -465,7 +465,7 @@ pub async fn insert_next_shared_aliases(
insert_package_alias( insert_package_alias(
import_map, import_map,
"@vercel/turbopack-node/", "@vercel/turbopack-node/",
turbo_binding::turbopack::node::embed_js::embed_fs().root(), turbopack_binding::turbopack::node::embed_js::embed_fs().root(),
); );
Ok(()) Ok(())
...@@ -569,7 +569,7 @@ fn insert_turbopack_dev_alias(import_map: &mut ImportMap) { ...@@ -569,7 +569,7 @@ fn insert_turbopack_dev_alias(import_map: &mut ImportMap) {
insert_package_alias( insert_package_alias(
import_map, import_map,
"@vercel/turbopack-dev/", "@vercel/turbopack-dev/",
turbo_binding::turbopack::dev::embed_js::embed_fs().root(), turbopack_binding::turbopack::dev::embed_js::embed_fs().root(),
); );
} }
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::{ use turbopack_binding::{
turbo::tasks::primitives::BoolVc, turbo::tasks::primitives::BoolVc,
turbopack::node::route_matcher::{ParamsVc, RouteMatcher}, turbopack::node::route_matcher::{ParamsVc, RouteMatcher},
}; };
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::{ use turbopack_binding::{
turbo::tasks::primitives::{BoolVc, StringVc}, turbo::tasks::primitives::{BoolVc, StringVc},
turbopack::node::route_matcher::{ParamsVc, RouteMatcher, RouteMatcherVc}, turbopack::node::route_matcher::{ParamsVc, RouteMatcher, RouteMatcherVc},
}; };
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::{ use turbopack_binding::{
turbo::tasks::primitives::{BoolVc, Regex}, turbo::tasks::primitives::{BoolVc, Regex},
turbopack::node::route_matcher::{Param, ParamsVc, RouteMatcher}, turbopack::node::route_matcher::{Param, ParamsVc, RouteMatcher},
}; };
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::{ use turbopack_binding::{
turbo::tasks::primitives::BoolVc, turbo::tasks::primitives::BoolVc,
turbopack::node::route_matcher::{ParamsVc, RouteMatcher}, turbopack::node::route_matcher::{ParamsVc, RouteMatcher},
}; };
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::{ use turbo_tasks::{primitives::StringVc, Value};
use turbo_tasks_fs::FileSystem;
use turbopack_binding::{
turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc}, turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
...@@ -30,8 +32,6 @@ use turbo_binding::{ ...@@ -30,8 +32,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::{primitives::StringVc, Value};
use turbo_tasks_fs::FileSystem;
use super::{ use super::{
resolve::ExternalCjsModulesResolvePluginVc, transforms::get_next_server_transforms_rules, resolve::ExternalCjsModulesResolvePluginVc, transforms::get_next_server_transforms_rules,
......
use anyhow::Result; use anyhow::Result;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use turbo_binding::{ use turbo_tasks::primitives::{BoolVc, StringsVc};
use turbopack_binding::{
turbo::tasks_fs::{glob::GlobVc, FileJsonContent, FileSystemPathVc}, turbo::tasks_fs::{glob::GlobVc, FileJsonContent, FileSystemPathVc},
turbopack::core::{ turbopack::core::{
asset::Asset, asset::Asset,
...@@ -16,7 +17,6 @@ use turbo_binding::{ ...@@ -16,7 +17,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::primitives::{BoolVc, StringsVc};
/// The predicated based on which the [ExternalCjsModulesResolvePlugin] decides /// The predicated based on which the [ExternalCjsModulesResolvePlugin] decides
/// whether to mark a module as external. /// whether to mark a module as external.
......
use anyhow::Result; use anyhow::Result;
use next_transform_strip_page_exports::ExportFilter; use next_transform_strip_page_exports::ExportFilter;
use turbo_binding::turbopack::turbopack::module_options::ModuleRule; use turbopack_binding::turbopack::turbopack::module_options::ModuleRule;
use crate::{ use crate::{
next_config::NextConfigVc, next_config::NextConfigVc,
......
...@@ -2,7 +2,8 @@ use std::collections::HashSet; ...@@ -2,7 +2,8 @@ use std::collections::HashSet;
use anyhow::Result; use anyhow::Result;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use turbo_binding::{ use turbo_tasks_fs::glob::GlobVc;
use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::core::{ turbopack::core::{
issue::unsupported_module::UnsupportedModuleIssue, issue::unsupported_module::UnsupportedModuleIssue,
...@@ -14,7 +15,6 @@ use turbo_binding::{ ...@@ -14,7 +15,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks_fs::glob::GlobVc;
lazy_static! { lazy_static! {
static ref UNSUPPORTED_PACKAGES: HashSet<&'static str> = ["@vercel/og"].into(); static ref UNSUPPORTED_PACKAGES: HashSet<&'static str> = ["@vercel/og"].into();
......
...@@ -9,11 +9,11 @@ pub use next_dynamic::get_next_dynamic_transform_rule; ...@@ -9,11 +9,11 @@ pub use next_dynamic::get_next_dynamic_transform_rule;
pub use next_font::get_next_font_transform_rule; pub use next_font::get_next_font_transform_rule;
pub use next_strip_page_exports::get_next_pages_transforms_rule; pub use next_strip_page_exports::get_next_pages_transforms_rule;
pub use relay::get_relay_transform_plugin; pub use relay::get_relay_transform_plugin;
use turbo_binding::turbopack::{ use turbo_tasks::Value;
use turbopack_binding::turbopack::{
core::reference_type::{ReferenceType, UrlReferenceSubType}, core::reference_type::{ReferenceType, UrlReferenceSubType},
turbopack::module_options::{ModuleRule, ModuleRuleCondition, ModuleRuleEffect, ModuleType}, turbopack::module_options::{ModuleRule, ModuleRuleCondition, ModuleRuleEffect, ModuleType},
}; };
use turbo_tasks::Value;
use crate::next_image::{module::BlurPlaceholderMode, StructuredImageModuleTypeVc}; use crate::next_image::{module::BlurPlaceholderMode, StructuredImageModuleTypeVc};
......
...@@ -11,7 +11,8 @@ use swc_core::{ ...@@ -11,7 +11,8 @@ use swc_core::{
visit::FoldWith, visit::FoldWith,
}, },
}; };
use turbo_binding::{ use turbo_tasks::trace::TraceRawVcs;
use turbopack_binding::{
swc::custom_transform::modularize_imports::{modularize_imports, PackageConfig}, swc::custom_transform::modularize_imports::{modularize_imports, PackageConfig},
turbopack::{ turbopack::{
ecmascript::{ ecmascript::{
...@@ -21,7 +22,6 @@ use turbo_binding::{ ...@@ -21,7 +22,6 @@ use turbo_binding::{
turbopack::module_options::{ModuleRule, ModuleRuleEffect}, turbopack::module_options::{ModuleRule, ModuleRuleEffect},
}, },
}; };
use turbo_tasks::trace::TraceRawVcs;
use super::module_rule_match_js_no_url; use super::module_rule_match_js_no_url;
...@@ -80,7 +80,7 @@ impl CustomTransformer for ModularizeImportsTransformer { ...@@ -80,7 +80,7 @@ impl CustomTransformer for ModularizeImportsTransformer {
async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> { async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy())); let p = std::mem::replace(program, Program::Module(Module::dummy()));
*program = p.fold_with(&mut modularize_imports( *program = p.fold_with(&mut modularize_imports(
turbo_binding::swc::custom_transform::modularize_imports::Config { turbopack_binding::swc::custom_transform::modularize_imports::Config {
packages: self.packages.clone(), packages: self.packages.clone(),
}, },
)); ));
......
...@@ -10,7 +10,7 @@ use swc_core::{ ...@@ -10,7 +10,7 @@ use swc_core::{
visit::FoldWith, visit::FoldWith,
}, },
}; };
use turbo_binding::{ use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
ecmascript::{ ecmascript::{
......
use anyhow::Result; use anyhow::Result;
use async_trait::async_trait; use async_trait::async_trait;
use swc_core::ecma::{ast::Program, atoms::JsWord, visit::VisitMutWith}; use swc_core::ecma::{ast::Program, atoms::JsWord, visit::VisitMutWith};
use turbo_binding::turbopack::{ use turbopack_binding::turbopack::{
ecmascript::{ ecmascript::{
CustomTransformer, EcmascriptInputTransform, EcmascriptInputTransformsVc, TransformContext, CustomTransformer, EcmascriptInputTransform, EcmascriptInputTransformsVc, TransformContext,
TransformPluginVc, TransformPluginVc,
......
...@@ -8,7 +8,7 @@ use swc_core::{ ...@@ -8,7 +8,7 @@ use swc_core::{
visit::FoldWith, visit::FoldWith,
}, },
}; };
use turbo_binding::{ use turbopack_binding::{
turbo::tasks_fs::FileSystemPathVc, turbo::tasks_fs::FileSystemPathVc,
turbopack::{ turbopack::{
ecmascript::{ ecmascript::{
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbopack::{ use turbopack_binding::turbopack::{
ecmascript::{OptionTransformPluginVc, TransformPluginVc}, ecmascript::{OptionTransformPluginVc, TransformPluginVc},
ecmascript_plugin::transform::relay::RelayTransformer, ecmascript_plugin::transform::relay::RelayTransformer,
}; };
......
...@@ -2,7 +2,8 @@ use std::io::Write; ...@@ -2,7 +2,8 @@ use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::{ use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value};
use turbopack_binding::{
turbo::tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc}, turbo::tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc},
turbopack::{ turbopack::{
core::{ core::{
...@@ -22,7 +23,6 @@ use turbo_binding::{ ...@@ -22,7 +23,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value};
use crate::{embed_js::next_js_file_path, util::get_asset_path_from_pathname}; use crate::{embed_js::next_js_file_path, util::get_asset_path_from_pathname};
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::{ use turbo_tasks::{
primitives::{JsonValueVc, OptionStringVc, StringVc, StringsVc},
trace::TraceRawVcs,
Value,
};
use turbopack_binding::{
turbo::{ turbo::{
tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc}, tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc},
tasks_fs::{FileContent, FileSystemPathVc}, tasks_fs::{FileContent, FileSystemPathVc},
...@@ -42,11 +47,6 @@ use turbo_binding::{ ...@@ -42,11 +47,6 @@ use turbo_binding::{
turbopack::{transition::TransitionsByNameVc, ModuleAssetContextVc}, turbopack::{transition::TransitionsByNameVc, ModuleAssetContextVc},
}, },
}; };
use turbo_tasks::{
primitives::{JsonValueVc, OptionStringVc, StringVc, StringsVc},
trace::TraceRawVcs,
Value,
};
use crate::{ use crate::{
embed_js::next_asset, embed_js::next_asset,
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::{
turbo::tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPathVc},
turbopack::dev_server::source::specificity::SpecificityVc,
};
use turbo_tasks::{ use turbo_tasks::{
primitives::{BoolVc, StringsVc}, primitives::{BoolVc, StringsVc},
CompletionVc, CompletionVc,
}; };
use turbopack_binding::{
turbo::tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPathVc},
turbopack::dev_server::source::specificity::SpecificityVc,
};
use crate::next_config::NextConfigVc; use crate::next_config::NextConfigVc;
......
...@@ -3,7 +3,13 @@ use futures::StreamExt; ...@@ -3,7 +3,13 @@ use futures::StreamExt;
use indexmap::indexmap; use indexmap::indexmap;
use serde::Deserialize; use serde::Deserialize;
use serde_json::json; use serde_json::json;
use turbo_binding::{ use turbo_tasks::{
primitives::{JsonValueVc, StringsVc},
util::SharedError,
CompletionVc, CompletionsVc, Value,
};
use turbo_tasks_fs::json::parse_json_with_source_context;
use turbopack_binding::{
turbo::{ turbo::{
tasks_bytes::{Bytes, Stream}, tasks_bytes::{Bytes, Stream},
tasks_fs::{to_sys_path, File, FileSystemPathVc}, tasks_fs::{to_sys_path, File, FileSystemPathVc},
...@@ -37,12 +43,6 @@ use turbo_binding::{ ...@@ -37,12 +43,6 @@ use turbo_binding::{
}, },
}, },
}; };
use turbo_tasks::{
primitives::{JsonValueVc, StringsVc},
util::SharedError,
CompletionVc, CompletionsVc, Value,
};
use turbo_tasks_fs::json::parse_json_with_source_context;
use crate::{ use crate::{
asset_helpers::as_es_module_asset, asset_helpers::as_es_module_asset,
......
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use futures::{Stream, TryStreamExt}; use futures::{Stream, TryStreamExt};
use indexmap::IndexSet; use indexmap::IndexSet;
use turbo_binding::turbopack::{ use turbo_tasks::{primitives::StringVc, CompletionVc, CompletionsVc, Value};
use turbopack_binding::turbopack::{
core::{ core::{
environment::ServerAddrVc, environment::ServerAddrVc,
introspect::{Introspectable, IntrospectableChildrenVc, IntrospectableVc}, introspect::{Introspectable, IntrospectableChildrenVc, IntrospectableVc},
...@@ -13,7 +14,6 @@ use turbo_binding::turbopack::{ ...@@ -13,7 +14,6 @@ use turbo_binding::turbopack::{
}, },
node::execution_context::ExecutionContextVc, node::execution_context::ExecutionContextVc,
}; };
use turbo_tasks::{primitives::StringVc, CompletionVc, CompletionsVc, Value};
use crate::{ use crate::{
app_structure::OptionAppDirVc, app_structure::OptionAppDirVc,
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::turbopack::{ use turbopack_binding::turbopack::{
core::{ core::{
issue::{IssueSeverity, OptionIssueSourceVc}, issue::{IssueSeverity, OptionIssueSourceVc},
resolve::{origin::ResolveOriginVc, parse::RequestVc}, resolve::{origin::ResolveOriginVc, parse::RequestVc},
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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