Unverified Commit 2820f078 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

add consistent import sorting/grouping to rustfmt (#47745)

### What?

Better auto format

### Why?

imports are inconsistently grouped and ordered

### How?

configure cargo fmt
parent f798c95f
max_width = 100
tab_spaces = 4
hard_tabs = false
format_strings = true format_strings = true
use_field_init_shorthand = true use_field_init_shorthand = true
wrap_comments = true wrap_comments = true
imports_granularity = "Crate"
group_imports = "StdExternalCrate"
use turbo_binding::swc::core::{ use turbo_binding::swc::core::ecma::{
ecma::ast::{Ident, JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXElementName, JSXOpeningElement}, ast::{Ident, JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXElementName, JSXOpeningElement},
ecma::atoms::JsWord, atoms::JsWord,
ecma::visit::Fold, visit::Fold,
}; };
pub fn amp_attributes() -> impl Fold { pub fn amp_attributes() -> impl Fold {
......
use turbo_binding::swc::core::{ use turbo_binding::swc::core::ecma::{
ecma::ast::*, ast::*,
ecma::visit::{Visit, VisitWith}, visit::{Visit, VisitWith},
}; };
pub(crate) fn contains_cjs(m: &Module) -> bool { pub(crate) fn contains_cjs(m: &Module) -> bool {
......
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::errors::HANDLER, common::errors::HANDLER,
ecma::ast::ExportAll, ecma::{
ecma::transforms::base::pass::Optional, ast::ExportAll,
ecma::visit::{noop_fold_type, Fold}, transforms::base::pass::Optional,
visit::{noop_fold_type, Fold},
},
}; };
pub fn disallow_re_export_all_in_page(is_page_file: bool) -> impl Fold { pub fn disallow_re_export_all_in_page(is_page_file: bool) -> impl Fold {
......
...@@ -30,23 +30,18 @@ DEALINGS IN THE SOFTWARE. ...@@ -30,23 +30,18 @@ DEALINGS IN THE SOFTWARE.
#![deny(clippy::all)] #![deny(clippy::all)]
#![feature(box_patterns)] #![feature(box_patterns)]
use std::{cell::RefCell, env::current_dir, path::PathBuf, rc::Rc, sync::Arc};
use auto_cjs::contains_cjs; use auto_cjs::contains_cjs;
use either::Either; 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 std::cell::RefCell;
use std::env::current_dir;
use std::rc::Rc;
use std::{path::PathBuf, sync::Arc};
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::{chain, comments::Comments, pass::Optional, FileName, SourceFile, SourceMap}, common::{chain, comments::Comments, pass::Optional, FileName, SourceFile, SourceMap},
ecma::ast::EsVersion, ecma::{
ecma::parser::parse_file_as_module, ast::EsVersion, parser::parse_file_as_module, transforms::base::pass::noop, visit::Fold,
ecma::transforms::base::pass::noop, },
ecma::visit::Fold,
}; };
pub mod amp_attributes; pub mod amp_attributes;
......
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use pathdiff::diff_paths; use pathdiff::diff_paths;
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::{errors::HANDLER, FileName, DUMMY_SP}, common::{errors::HANDLER, FileName, DUMMY_SP},
ecma::ast::{ ecma::{
ArrayLit, ArrowExpr, BinExpr, BinaryOp, BlockStmtOrExpr, Bool, CallExpr, Callee, Expr, ast::{
ExprOrSpread, Id, Ident, ImportDecl, ImportSpecifier, KeyValueProp, Lit, MemberExpr, ArrayLit, ArrowExpr, BinExpr, BinaryOp, BlockStmtOrExpr, Bool, CallExpr, Callee, Expr,
MemberProp, Null, ObjectLit, Prop, PropName, PropOrSpread, Str, Tpl, ExprOrSpread, Id, Ident, ImportDecl, ImportSpecifier, KeyValueProp, Lit, MemberExpr,
MemberProp, Null, ObjectLit, Prop, PropName, PropOrSpread, Str, Tpl,
},
atoms::js_word,
utils::ExprFactory,
visit::{Fold, FoldWith},
}, },
ecma::atoms::js_word,
ecma::utils::ExprFactory,
ecma::visit::{Fold, FoldWith},
}; };
pub fn next_dynamic( pub fn next_dynamic(
......
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 std::cell::RefCell;
use std::mem::take;
use std::rc::Rc;
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::{ common::{
errors::HANDLER, errors::HANDLER,
pass::{Repeat, Repeated}, pass::{Repeat, Repeated},
DUMMY_SP, DUMMY_SP,
}, },
ecma::ast::*, ecma::{
ecma::visit::{noop_fold_type, Fold, FoldWith}, ast::*,
visit::{noop_fold_type, Fold, FoldWith},
},
}; };
static SSG_EXPORTS: &[&str; 3] = &["getStaticProps", "getStaticPaths", "getServerSideProps"]; static SSG_EXPORTS: &[&str; 3] = &["getStaticProps", "getStaticPaths", "getServerSideProps"];
......
use chrono::Utc; use chrono::Utc;
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::{errors::HANDLER, Span, DUMMY_SP}, common::{errors::HANDLER, Span, DUMMY_SP},
ecma::ast::*, ecma::{
ecma::visit::{Fold, FoldWith}, ast::*,
visit::{Fold, FoldWith},
},
}; };
pub fn page_config(is_development: bool, is_page_file: bool) -> impl Fold { pub fn page_config(is_development: bool, is_page_file: bool) -> impl Fold {
......
use regex::Regex; use regex::Regex;
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::ecma::{
use turbo_binding::swc::core::{ ast::*,
ecma::ast::*, visit::{noop_fold_type, Fold, FoldWith},
ecma::visit::{noop_fold_type, Fold, FoldWith},
}; };
#[derive(Clone, Debug, Deserialize)] #[derive(Clone, Debug, Deserialize)]
......
use std::collections::HashMap; use std::{collections::HashMap, path::PathBuf};
use std::path::PathBuf;
use regex::Regex; use regex::Regex;
use serde::Deserialize; use serde::Deserialize;
use crate::auto_cjs::contains_cjs;
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::{ common::{
comments::{Comment, CommentKind, Comments}, comments::{Comment, CommentKind, Comments},
errors::HANDLER, errors::HANDLER,
FileName, Span, Spanned, DUMMY_SP, FileName, Span, Spanned, DUMMY_SP,
}, },
ecma::ast::*, ecma::{
ecma::atoms::{js_word, JsWord}, ast::*,
ecma::utils::{prepend_stmts, quote_ident, quote_str, ExprFactory}, atoms::{js_word, JsWord},
ecma::visit::{as_folder, noop_visit_mut_type, Fold, VisitMut, VisitMutWith}, utils::{prepend_stmts, quote_ident, quote_str, ExprFactory},
visit::{as_folder, noop_visit_mut_type, Fold, VisitMut, VisitMutWith},
},
}; };
use crate::auto_cjs::contains_cjs;
#[derive(Clone, Debug, Deserialize)] #[derive(Clone, Debug, Deserialize)]
#[serde(untagged)] #[serde(untagged)]
pub enum Config { pub enum Config {
......
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::{collections::AHashSet, DUMMY_SP}, common::{collections::AHashSet, DUMMY_SP},
ecma::ast::*, ecma::{
ecma::atoms::JsWord, ast::*,
ecma::visit::{noop_fold_type, Fold, FoldWith}, atoms::JsWord,
visit::{noop_fold_type, Fold, FoldWith},
},
}; };
use crate::top_level_binding_collector::collect_top_level_decls; use crate::top_level_binding_collector::collect_top_level_decls;
......
use serde::Deserialize; use serde::Deserialize;
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::Mark, common::Mark,
ecma::ast::*, ecma::{
ecma::atoms::{js_word, JsWord}, ast::*,
ecma::transforms::optimization::simplify::dce::{dce, Config as DCEConfig}, atoms::{js_word, JsWord},
ecma::visit::{Fold, FoldWith}, transforms::optimization::simplify::dce::{dce, Config as DCEConfig},
visit::{Fold, FoldWith},
},
}; };
#[derive(Clone, Debug, Deserialize)] #[derive(Clone, Debug, Deserialize)]
......
...@@ -2,12 +2,14 @@ use std::hash::Hash; ...@@ -2,12 +2,14 @@ use std::hash::Hash;
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
common::{collections::AHashSet, SyntaxContext}, common::{collections::AHashSet, SyntaxContext},
ecma::ast::{ ecma::{
ClassDecl, FnDecl, Ident, ImportDefaultSpecifier, ImportNamedSpecifier, ast::{
ImportStarAsSpecifier, ModuleItem, ObjectPatProp, Param, Pat, Stmt, VarDeclarator, ClassDecl, FnDecl, Ident, ImportDefaultSpecifier, ImportNamedSpecifier,
ImportStarAsSpecifier, ModuleItem, ObjectPatProp, Param, Pat, Stmt, VarDeclarator,
},
utils::ident::IdentLike,
visit::{noop_visit_type, Visit, VisitWith},
}, },
ecma::utils::ident::IdentLike,
ecma::visit::{noop_visit_type, Visit, VisitWith},
}; };
// Modified from swc_ecma_utils/src/lib.rs:BindingCollector. // Modified from swc_ecma_utils/src/lib.rs:BindingCollector.
......
use std::path::PathBuf;
use next_swc::{ use next_swc::{
disallow_re_export_all_in_page::disallow_re_export_all_in_page, disallow_re_export_all_in_page::disallow_re_export_all_in_page,
next_dynamic::next_dynamic, next_dynamic::next_dynamic,
...@@ -6,7 +8,6 @@ use next_swc::{ ...@@ -6,7 +8,6 @@ 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 std::path::PathBuf;
use turbo_binding::swc::{ use turbo_binding::swc::{
core::{ core::{
common::{chain, FileName, Mark}, common::{chain, FileName, Mark},
......
use std::{env::current_dir, path::PathBuf};
use next_swc::{ use next_swc::{
amp_attributes::amp_attributes, amp_attributes::amp_attributes,
next_dynamic::next_dynamic, next_dynamic::next_dynamic,
...@@ -10,16 +12,17 @@ use next_swc::{ ...@@ -10,16 +12,17 @@ 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 std::{env::current_dir, path::PathBuf};
use swc_relay::{relay, RelayLanguageConfig}; use swc_relay::{relay, RelayLanguageConfig};
use turbo_binding::swc::{ use turbo_binding::swc::{
core::{ core::{
common::{chain, comments::SingleThreadedComments, FileName, Mark}, common::{chain, comments::SingleThreadedComments, FileName, Mark},
ecma::transforms::base::resolver,
ecma::transforms::testing::{test, test_fixture},
ecma::{ ecma::{
parser::{EsConfig, Syntax}, parser::{EsConfig, Syntax},
transforms::react::jsx, transforms::{
base::resolver,
react::jsx,
testing::{test, test_fixture},
},
}, },
}, },
testing::fixture, testing::fixture,
......
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 std::path::{Path, PathBuf};
use turbo_binding::swc::{ use turbo_binding::swc::{
core::{ core::{
base::Compiler, base::Compiler,
common::comments::SingleThreadedComments, common::comments::SingleThreadedComments,
ecma::parser::{Syntax, TsConfig}, ecma::{
ecma::transforms::base::pass::noop, parser::{Syntax, TsConfig},
transforms::base::pass::noop,
},
}, },
testing::{NormalizedOutput, Tester}, testing::{NormalizedOutput, Tester},
}; };
......
use std::cell::RefCell; use std::{cell::RefCell, rc::Rc, sync::Arc};
use std::rc::Rc;
use std::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 turbo_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},
......
...@@ -26,9 +26,9 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ...@@ -26,9 +26,9 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
*/ */
use std::fs::read_to_string;
use std::{ use std::{
cell::RefCell, cell::RefCell,
fs::read_to_string,
panic::{catch_unwind, AssertUnwindSafe}, panic::{catch_unwind, AssertUnwindSafe},
rc::Rc, rc::Rc,
sync::Arc, sync::Arc,
......
use std::convert::TryFrom; use std::convert::TryFrom;
use crate::util::MapErr;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use next_build::{next_build as turbo_next_build, NextBuildOptions}; use next_build::{next_build as turbo_next_build, NextBuildOptions};
use next_dev::{devserver_options::DevServerOptions, start_server}; use next_dev::{devserver_options::DevServerOptions, start_server};
use crate::util::MapErr;
#[napi] #[napi]
pub async fn start_turbo_dev(options: Buffer) -> napi::Result<()> { pub async fn start_turbo_dev(options: Buffer) -> napi::Result<()> {
let options: DevServerOptions = serde_json::from_slice(&options)?; let options: DevServerOptions = serde_json::from_slice(&options)?;
......
use std::sync::Arc; use std::sync::Arc;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use turbo_binding::features::node_file_trace::{start, Args}; use turbo_binding::{
use turbo_binding::turbo::tasks::TurboTasks; features::node_file_trace::{start, Args},
use turbo_binding::turbo::tasks_memory::MemoryBackend; turbo::{tasks::TurboTasks, tasks_memory::MemoryBackend},
use turbo_binding::turbopack::turbopack::{ turbopack::turbopack::{
module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext, module_options::ModuleOptionsContext, resolve_options_context::ResolveOptionsContext,
},
}; };
#[napi] #[napi]
......
use turbo_binding::turbo::tasks_build::{generate_register, rerun_if_glob}; use turbo_binding::turbo::tasks_build::{generate_register, rerun_if_glob};
use vergen::{vergen, Config}; use vergen::{vergen, Config};
fn main() { fn main() {
......
use turbo_binding::turbo::tasks::{NothingVc, StatsType, TurboTasks, TurboTasksBackendApi}; use turbo_binding::turbo::{
use turbo_binding::turbo::tasks_memory::MemoryBackend; tasks::{NothingVc, StatsType, TurboTasks, TurboTasksBackendApi},
tasks_memory::MemoryBackend,
};
pub fn register() { pub fn register() {
turbo_binding::turbo::tasks::register(); turbo_binding::turbo::tasks::register();
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::FileSystemPathVc,
asset::AssetVc, compile_time_info::CompileTimeInfoVc, context::AssetContext, turbopack::{
}; core::{asset::AssetVc, compile_time_info::CompileTimeInfoVc, context::AssetContext},
use turbo_binding::turbopack::ecmascript::{ ecmascript::{
EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType,
EcmascriptModuleAssetVc, InnerAssetsVc, EcmascriptModuleAssetVc, InnerAssetsVc,
}; },
use turbo_binding::turbopack::turbopack::{ turbopack::{
module_options::ModuleOptionsContextVc, module_options::ModuleOptionsContextVc,
resolve_options_context::ResolveOptionsContextVc, resolve_options_context::ResolveOptionsContextVc,
transition::{Transition, TransitionVc}, transition::{Transition, TransitionVc},
ModuleAssetContextVc, ModuleAssetContextVc,
},
},
}; };
use turbo_tasks::{primitives::OptionStringVc, Value}; use turbo_tasks::{primitives::OptionStringVc, Value};
......
...@@ -6,42 +6,49 @@ use std::{ ...@@ -6,42 +6,49 @@ use std::{
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbo::tasks::{ use turbo_binding::{
primitives::OptionStringVc, TryJoinIterExt, Value, ValueToString, turbo::{
}; tasks::{primitives::OptionStringVc, TryJoinIterExt, Value, ValueToString},
use turbo_binding::turbo::tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc}; tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc},
use turbo_binding::turbo::tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc}; tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc},
use turbo_binding::turbopack::core::{
compile_time_info::CompileTimeInfoVc,
context::{AssetContext, AssetContextVc},
environment::{EnvironmentIntention, ServerAddrVc},
reference_type::{EntryReferenceSubType, ReferenceType},
source_asset::SourceAssetVc,
virtual_asset::VirtualAssetVc,
};
use turbo_binding::turbopack::dev::DevChunkingContextVc;
use turbo_binding::turbopack::dev_server::{
html::DevHtmlAssetVc,
source::{
combined::CombinedContentSource, ContentSourceData, ContentSourceVc, NoContentSourceVc,
}, },
}; turbopack::{
use turbo_binding::turbopack::ecmascript::{ core::{
chunk::EcmascriptChunkPlaceablesVc, magic_identifier, utils::StringifyJs, compile_time_info::CompileTimeInfoVc,
EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc, InnerAssetsVc, context::{AssetContext, AssetContextVc},
}; environment::{EnvironmentIntention, ServerAddrVc},
use turbo_binding::turbopack::env::ProcessEnvAssetVc; reference_type::{EntryReferenceSubType, ReferenceType},
use turbo_binding::turbopack::node::{ source_asset::SourceAssetVc,
execution_context::ExecutionContextVc, virtual_asset::VirtualAssetVc,
render::{ },
node_api_source::create_node_api_source, rendered_source::create_node_rendered_source, dev::DevChunkingContextVc,
dev_server::{
html::DevHtmlAssetVc,
source::{
combined::CombinedContentSource, ContentSourceData, ContentSourceVc,
NoContentSourceVc,
},
},
ecmascript::{
chunk::EcmascriptChunkPlaceablesVc, magic_identifier, utils::StringifyJs,
EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
InnerAssetsVc,
},
env::ProcessEnvAssetVc,
node::{
execution_context::ExecutionContextVc,
render::{
node_api_source::create_node_api_source,
rendered_source::create_node_rendered_source,
},
NodeEntry, NodeEntryVc, NodeRenderingEntry, NodeRenderingEntryVc,
},
turbopack::{
ecmascript::EcmascriptInputTransform,
transition::{TransitionVc, TransitionsByNameVc},
ModuleAssetContextVc,
},
}, },
NodeEntry, NodeEntryVc, NodeRenderingEntry, NodeRenderingEntryVc,
};
use turbo_binding::turbopack::turbopack::{
ecmascript::EcmascriptInputTransform,
transition::{TransitionVc, TransitionsByNameVc},
ModuleAssetContextVc,
}; };
use crate::{ use crate::{
......
use std::collections::HashMap; use std::collections::HashMap;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::turbo::tasks_fs::{ use turbo_binding::{
DirectoryContent, DirectoryEntry, File, FileContentVc, FileSystemEntryType, FileSystemPathVc, turbo::tasks_fs::{
DirectoryContent, DirectoryEntry, File, FileContentVc, FileSystemEntryType,
FileSystemPathVc,
},
turbopack::{
core::issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc},
dev_server::source::specificity::SpecificityVc,
},
}; };
use turbo_binding::turbopack::core::issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc};
use turbo_binding::turbopack::dev_server::source::specificity::SpecificityVc;
use turbo_tasks::{ use turbo_tasks::{
primitives::{StringVc, StringsVc}, primitives::{StringVc, StringsVc},
CompletionVc, ValueToString, CompletionVc, ValueToString,
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_fs::{FileSystemEntryType, FileSystemPathVc}; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::{FileSystemEntryType, FileSystemPathVc},
issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc}, turbopack::{
resolve::{parse::RequestVc, pattern::Pattern, resolve}, core::{
}; issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc},
use turbo_binding::turbopack::node::transforms::webpack::{ resolve::{parse::RequestVc, pattern::Pattern, resolve},
WebpackLoaderConfigItem, WebpackLoaderConfigItemsVc, },
}; node::transforms::webpack::{WebpackLoaderConfigItem, WebpackLoaderConfigItemsVc},
use turbo_binding::turbopack::turbopack::{ turbopack::{
module_options::WebpackLoadersOptionsVc, resolve_options, module_options::WebpackLoadersOptionsVc, resolve_options,
resolve_options_context::ResolveOptionsContext, resolve_options_context::ResolveOptionsContext,
},
},
}; };
use turbo_tasks::{ use turbo_tasks::{
primitives::{BoolVc, StringVc}, primitives::{BoolVc, StringVc},
......
use turbo_binding::turbo::tasks_fs::{FileContentVc, FileSystem, FileSystemPathVc, FileSystemVc}; use turbo_binding::{
use turbo_binding::turbopack::core::{asset::AssetVc, source_asset::SourceAssetVc}; turbo::tasks_fs::{FileContentVc, FileSystem, FileSystemPathVc, FileSystemVc},
turbopack::core::{asset::AssetVc, source_asset::SourceAssetVc},
};
pub const VIRTUAL_PACKAGE_NAME: &str = "@vercel/turbopack-next"; pub const VIRTUAL_PACKAGE_NAME: &str = "@vercel/turbopack-next";
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbo::tasks_env::{ use turbo_binding::{
CommandLineProcessEnvVc, CustomProcessEnvVc, EnvMapVc, FilterProcessEnvVc, ProcessEnv, turbo::{
ProcessEnvVc, tasks_env::{
CommandLineProcessEnvVc, CustomProcessEnvVc, EnvMapVc, FilterProcessEnvVc, ProcessEnv,
ProcessEnvVc,
},
tasks_fs::FileSystemPathVc,
},
turbopack::env::{EmbeddableProcessEnvVc, TryDotenvProcessEnvVc},
}; };
use turbo_binding::turbo::tasks_fs::FileSystemPathVc;
use turbo_binding::turbopack::env::{EmbeddableProcessEnvVc, TryDotenvProcessEnvVc};
use crate::next_config::NextConfigVc; use crate::next_config::NextConfigVc;
......
use std::collections::HashMap; use std::collections::HashMap;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::turbo::tasks_env::ProcessEnvVc; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc},
use turbo_binding::turbopack::core::{ turbopack::{
chunk::ChunkGroupVc, core::{
compile_time_info::CompileTimeInfoVc, chunk::ChunkGroupVc,
context::AssetContextVc, compile_time_info::CompileTimeInfoVc,
resolve::{options::ImportMap, origin::PlainResolveOriginVc}, context::AssetContextVc,
}; resolve::{options::ImportMap, origin::PlainResolveOriginVc},
use turbo_binding::turbopack::dev_server::html::DevHtmlAssetVc; },
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc; dev_server::html::DevHtmlAssetVc,
use turbo_binding::turbopack::turbopack::{ node::execution_context::ExecutionContextVc,
ecmascript::EcmascriptModuleAssetVc, transition::TransitionsByNameVc, ModuleAssetContextVc, turbopack::{
ecmascript::EcmascriptModuleAssetVc, transition::TransitionsByNameVc,
ModuleAssetContextVc,
},
},
}; };
use turbo_tasks::Value; use turbo_tasks::Value;
......
...@@ -35,8 +35,7 @@ mod web_entry_source; ...@@ -35,8 +35,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 turbo_binding::{turbopack::node::source_map, *};
pub use turbo_binding::*;
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,14 +2,18 @@ use anyhow::{Context, Result}; ...@@ -2,14 +2,18 @@ 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::turbo::tasks_fs::File; use turbo_binding::{
use turbo_binding::turbopack::core::asset::AssetContentVc; turbo::tasks_fs::File,
use turbo_binding::turbopack::dev_server::source::{ turbopack::{
ContentSource, ContentSourceContentVc, ContentSourceData, ContentSourceResultVc, core::asset::AssetContentVc,
ContentSourceVc, dev_server::source::{
}; ContentSource, ContentSourceContentVc, ContentSourceData, ContentSourceResultVc,
use turbo_binding::turbopack::node::render::{ ContentSourceVc,
node_api_source::NodeApiContentSourceVc, rendered_source::NodeRenderContentSourceVc, },
node::render::{
node_api_source::NodeApiContentSourceVc, rendered_source::NodeRenderContentSourceVc,
},
},
}; };
use turbo_tasks::{ use turbo_tasks::{
graph::{GraphTraversal, NonDeterministic}, graph::{GraphTraversal, NonDeterministic},
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::resolve::options::{ImportMapping, ImportMappingVc}; turbo::tasks_fs::FileSystemPathVc,
turbopack::core::resolve::options::{ImportMapping, ImportMappingVc},
};
use turbo_tasks::primitives::StringVc; use turbo_tasks::primitives::StringVc;
use crate::next_import_map::get_next_package; use crate::next_import_map::get_next_package;
......
...@@ -2,31 +2,39 @@ use core::{default::Default, result::Result::Ok}; ...@@ -2,31 +2,39 @@ use core::{default::Default, result::Result::Ok};
use std::collections::HashMap; use std::collections::HashMap;
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_env::ProcessEnvVc; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::{FileSystem, FileSystemPathVc}; turbo::{
use turbo_binding::turbopack::core::{ tasks_env::ProcessEnvVc,
chunk::ChunkingContextVc, tasks_fs::{FileSystem, FileSystemPathVc},
compile_time_defines,
compile_time_info::{
CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc, FreeVarReference,
FreeVarReferencesVc,
}, },
context::AssetContextVc, turbopack::{
environment::{BrowserEnvironment, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment}, core::{
free_var_references, chunk::ChunkingContextVc,
resolve::{parse::RequestVc, pattern::Pattern}, compile_time_defines,
}; compile_time_info::{
use turbo_binding::turbopack::dev::DevChunkingContextVc; CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc, FreeVarReference,
use turbo_binding::turbopack::env::ProcessEnvAssetVc; FreeVarReferencesVc,
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc; },
use turbo_binding::turbopack::turbopack::{ context::AssetContextVc,
module_options::{ environment::{
module_options_context::{ModuleOptionsContext, ModuleOptionsContextVc}, BrowserEnvironment, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment,
JsxTransformOptions, PostCssTransformOptions, WebpackLoadersOptions, },
free_var_references,
resolve::{parse::RequestVc, pattern::Pattern},
},
dev::DevChunkingContextVc,
env::ProcessEnvAssetVc,
node::execution_context::ExecutionContextVc,
turbopack::{
module_options::{
module_options_context::{ModuleOptionsContext, ModuleOptionsContextVc},
JsxTransformOptions, PostCssTransformOptions, WebpackLoadersOptions,
},
resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
transition::TransitionsByNameVc,
ModuleAssetContextVc,
},
}, },
resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
transition::TransitionsByNameVc,
ModuleAssetContextVc,
}; };
use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks::{primitives::StringVc, Value};
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::FileSystemPathVc,
asset::Asset, turbopack::{
context::AssetContextVc, core::{
resolve::{origin::PlainResolveOriginVc, parse::RequestVc}, asset::Asset,
}; context::AssetContextVc,
use turbo_binding::turbopack::ecmascript::{ resolve::{origin::PlainResolveOriginVc, parse::RequestVc},
chunk::{EcmascriptChunkPlaceableVc, EcmascriptChunkPlaceablesVc}, },
resolve::cjs_resolve, ecmascript::{
chunk::{EcmascriptChunkPlaceableVc, EcmascriptChunkPlaceablesVc},
resolve::cjs_resolve,
},
},
}; };
use turbo_tasks::ValueToString; use turbo_tasks::ValueToString;
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbopack::core::{ use turbo_binding::turbopack::{
asset::AssetVc, core::{
chunk::{ChunkingContext, ChunkingContextVc}, asset::AssetVc,
compile_time_info::CompileTimeInfoVc, chunk::{ChunkingContext, ChunkingContextVc},
context::AssetContext, compile_time_info::CompileTimeInfoVc,
}; context::AssetContext,
use turbo_binding::turbopack::ecmascript::{ },
EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType, ecmascript::{
EcmascriptModuleAssetVc, InnerAssetsVc, EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType,
}; EcmascriptModuleAssetVc, InnerAssetsVc,
use turbo_binding::turbopack::turbopack::{ },
ecmascript::chunk_group_files_asset::ChunkGroupFilesAsset, turbopack::{
module_options::ModuleOptionsContextVc, ecmascript::chunk_group_files_asset::ChunkGroupFilesAsset,
resolve_options_context::ResolveOptionsContextVc, module_options::ModuleOptionsContextVc,
transition::{Transition, TransitionVc}, resolve_options_context::ResolveOptionsContextVc,
ModuleAssetContextVc, transition::{Transition, TransitionVc},
ModuleAssetContextVc,
},
}; };
use turbo_tasks::{primitives::OptionStringVc, Value}; use turbo_tasks::{primitives::OptionStringVc, Value};
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::FileSystemPathVc,
asset::AssetVc, chunk::ChunkingContextVc, compile_time_info::CompileTimeInfoVc, turbopack::{
}; core::{asset::AssetVc, chunk::ChunkingContextVc, compile_time_info::CompileTimeInfoVc},
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc; node::execution_context::ExecutionContextVc,
use turbo_binding::turbopack::turbopack::{ turbopack::{
ecmascript::chunk::EcmascriptChunkPlaceableVc, ecmascript::chunk::EcmascriptChunkPlaceableVc,
module_options::ModuleOptionsContextVc, module_options::ModuleOptionsContextVc,
resolve_options_context::ResolveOptionsContextVc, resolve_options_context::ResolveOptionsContextVc,
transition::{Transition, TransitionVc}, transition::{Transition, TransitionVc},
ModuleAssetContextVc, ModuleAssetContextVc,
},
},
}; };
use turbo_tasks::Value; use turbo_tasks::Value;
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::turbopack::turbopack::ecmascript::chunk::{
EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc, EcmascriptChunkVc,
EcmascriptExportsVc,
};
use turbo_binding::turbopack::{ use turbo_binding::turbopack::{
core::{ core::{
asset::{Asset, AssetContentVc, AssetVc}, asset::{Asset, AssetContentVc, AssetVc},
...@@ -14,6 +10,10 @@ use turbo_binding::turbopack::{ ...@@ -14,6 +10,10 @@ use turbo_binding::turbopack::{
reference::AssetReferencesVc, reference::AssetReferencesVc,
}, },
ecmascript::chunk::EcmascriptChunkingContextVc, ecmascript::chunk::EcmascriptChunkingContextVc,
turbopack::ecmascript::chunk::{
EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc,
EcmascriptChunkVc, EcmascriptExportsVc,
},
}; };
use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks::{primitives::StringVc, Value};
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::FileSystemPathVc,
asset::{Asset, AssetContentVc, AssetVc}, turbopack::{
chunk::{ core::{
availability_info::AvailabilityInfo, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, asset::{Asset, AssetContentVc, AssetVc},
ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, chunk::{
ChunkingContextVc, availability_info::AvailabilityInfo, Chunk, ChunkGroupReferenceVc, ChunkGroupVc,
ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset,
ChunkableAssetVc, ChunkingContextVc,
},
ident::AssetIdentVc,
reference::AssetReferencesVc,
},
turbopack::ecmascript::{
chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItemContentVc,
EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc,
EcmascriptChunkVc, EcmascriptChunkingContextVc, EcmascriptExports,
EcmascriptExportsVc,
},
utils::StringifyJs,
},
}, },
ident::AssetIdentVc,
reference::AssetReferencesVc,
};
use turbo_binding::turbopack::turbopack::ecmascript::{
chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItemContentVc,
EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc,
EcmascriptChunkVc, EcmascriptChunkingContextVc, EcmascriptExports, EcmascriptExportsVc,
},
utils::StringifyJs,
}; };
use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value}; use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value};
#[turbo_tasks::function] #[turbo_tasks::function]
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbopack::core::{ use turbo_binding::turbopack::{
asset::AssetVc, core::{
context::AssetContext, asset::AssetVc,
reference_type::{EntryReferenceSubType, ReferenceType}, context::AssetContext,
}; reference_type::{EntryReferenceSubType, ReferenceType},
use turbo_binding::turbopack::ecmascript::{ },
EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType, ecmascript::{
EcmascriptModuleAssetVc, InnerAssetsVc, EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType,
}; EcmascriptModuleAssetVc, InnerAssetsVc,
use turbo_binding::turbopack::turbopack::{ },
transition::{Transition, TransitionVc}, turbopack::{
ModuleAssetContextVc, transition::{Transition, TransitionVc},
ModuleAssetContextVc,
},
}; };
use turbo_tasks::{primitives::OptionStringVc, Value}; use turbo_tasks::{primitives::OptionStringVc, Value};
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbopack::core::{asset::AssetVc, compile_time_info::CompileTimeInfoVc}; use turbo_binding::turbopack::{
use turbo_binding::turbopack::turbopack::{ core::{asset::AssetVc, compile_time_info::CompileTimeInfoVc},
ecmascript::chunk::EcmascriptChunkPlaceableVc, turbopack::{
module_options::ModuleOptionsContextVc, ecmascript::chunk::EcmascriptChunkPlaceableVc,
resolve_options_context::ResolveOptionsContextVc, module_options::ModuleOptionsContextVc,
transition::{Transition, TransitionVc}, resolve_options_context::ResolveOptionsContextVc,
ModuleAssetContextVc, transition::{Transition, TransitionVc},
ModuleAssetContextVc,
},
}; };
use super::with_chunking_context_scope_asset::WithChunkingContextScopeAsset; use super::with_chunking_context_scope_asset::WithChunkingContextScopeAsset;
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use turbo_binding::turbopack::core::{ use turbo_binding::turbopack::{
asset::{Asset, AssetContentVc, AssetVc}, core::{
chunk::{ asset::{Asset, AssetContentVc, AssetVc},
availability_info::AvailabilityInfo, ChunkVc, ChunkableAsset, ChunkableAssetVc, chunk::{
ChunkingContext, ChunkingContextVc, availability_info::AvailabilityInfo, ChunkVc, ChunkableAsset, ChunkableAssetVc,
ChunkingContext, ChunkingContextVc,
},
ident::AssetIdentVc,
reference::AssetReferencesVc,
},
ecmascript::chunk::EcmascriptChunkingContextVc,
turbopack::ecmascript::chunk::{
EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc,
EcmascriptChunkVc, EcmascriptExportsVc,
}, },
ident::AssetIdentVc,
reference::AssetReferencesVc,
};
use turbo_binding::turbopack::ecmascript::chunk::EcmascriptChunkingContextVc;
use turbo_binding::turbopack::turbopack::ecmascript::chunk::{
EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc, EcmascriptChunkVc,
EcmascriptExportsVc,
}; };
use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks::{primitives::StringVc, Value};
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::FileSystemPathVc,
asset::{Asset, AssetContentVc, AssetVc}, turbopack::{
chunk::{ core::{
availability_info::AvailabilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkVc, asset::{Asset, AssetContentVc, AssetVc},
ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, chunk::{
ChunkingContext, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, availability_info::AvailabilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc,
ChunkVc, ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc,
ChunkableAssetVc, ChunkingContext, ChunkingContextVc, ChunkingType,
ChunkingTypeOptionVc,
},
ident::AssetIdentVc,
reference::{AssetReference, AssetReferenceVc, AssetReferencesVc},
resolve::{ResolveResult, ResolveResultVc},
},
turbopack::ecmascript::{
chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItemContentVc,
EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc,
EcmascriptChunkVc, EcmascriptChunkingContextVc, EcmascriptExports,
EcmascriptExportsVc,
},
utils::StringifyJs,
},
}, },
ident::AssetIdentVc,
reference::{AssetReference, AssetReferenceVc, AssetReferencesVc},
resolve::{ResolveResult, ResolveResultVc},
};
use turbo_binding::turbopack::turbopack::ecmascript::{
chunk::{
EcmascriptChunkItem, EcmascriptChunkItemContent, EcmascriptChunkItemContentVc,
EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc,
EcmascriptChunkVc, EcmascriptChunkingContextVc, EcmascriptExports, EcmascriptExportsVc,
},
utils::StringifyJs,
}; };
use turbo_tasks::{primitives::StringVc, Value, ValueToString, ValueToStringVc}; use turbo_tasks::{primitives::StringVc, Value, ValueToString, ValueToStringVc};
......
...@@ -2,32 +2,35 @@ use anyhow::{Context, Result}; ...@@ -2,32 +2,35 @@ 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::turbo::tasks_env::EnvMapVc; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; turbo::{tasks_env::EnvMapVc, tasks_fs::FileSystemPathVc},
use turbo_binding::turbopack::core::{ turbopack::{
asset::Asset, core::{
changed::any_content_changed, asset::Asset,
chunk::ChunkingContext, changed::any_content_changed,
context::AssetContext, chunk::ChunkingContext,
ident::AssetIdentVc, context::AssetContext,
issue::IssueContextExt, ident::AssetIdentVc,
reference_type::{EntryReferenceSubType, ReferenceType}, issue::IssueContextExt,
resolve::{ reference_type::{EntryReferenceSubType, ReferenceType},
find_context_file, resolve::{
options::{ImportMap, ImportMapping}, find_context_file,
FindContextFileResult, ResolveAliasMap, ResolveAliasMapVc, options::{ImportMap, ImportMapping},
FindContextFileResult, ResolveAliasMap, ResolveAliasMapVc,
},
source_asset::SourceAssetVc,
},
ecmascript::{
EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
},
node::{
evaluate::evaluate,
execution_context::{ExecutionContext, ExecutionContextVc},
transforms::webpack::{WebpackLoaderConfigItems, WebpackLoaderConfigItemsVc},
},
turbopack::evaluate_context::node_evaluate_asset_context,
}, },
source_asset::SourceAssetVc,
}; };
use turbo_binding::turbopack::ecmascript::{
EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
};
use turbo_binding::turbopack::node::{
evaluate::evaluate,
execution_context::{ExecutionContext, ExecutionContextVc},
transforms::webpack::{WebpackLoaderConfigItems, WebpackLoaderConfigItemsVc},
};
use turbo_binding::turbopack::turbopack::evaluate_context::node_evaluate_asset_context;
use turbo_tasks::{ use turbo_tasks::{
primitives::{BoolVc, StringsVc}, primitives::{BoolVc, StringsVc},
trace::TraceRawVcs, trace::TraceRawVcs,
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::FileSystemPathVc,
compile_time_defines, turbopack::{
compile_time_info::{ core::{
CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc, FreeVarReference, compile_time_defines,
FreeVarReferencesVc, compile_time_info::{
}, CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc, FreeVarReference,
environment::{ FreeVarReferencesVc,
EdgeWorkerEnvironment, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment, },
ServerAddrVc, environment::{
EdgeWorkerEnvironment, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment,
ServerAddrVc,
},
free_var_references,
},
node::execution_context::ExecutionContextVc,
turbopack::resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
}, },
free_var_references,
};
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc;
use turbo_binding::turbopack::turbopack::resolve_options_context::{
ResolveOptionsContext, ResolveOptionsContextVc,
}; };
use turbo_tasks::Value; use turbo_tasks::Value;
......
use anyhow::{anyhow, bail, Result}; use anyhow::{anyhow, bail, Result};
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbo::tasks::Value; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::{ turbo::{
rope::RopeBuilder, File, FileContent, FileContentVc, FileSystemPathVc, tasks::Value,
}; tasks_fs::{rope::RopeBuilder, File, FileContent, FileContentVc, FileSystemPathVc},
use turbo_binding::turbopack::core::{ },
asset::{Asset, AssetVc}, turbopack::{
chunk::ChunkingContextVc, core::{
compile_time_info::CompileTimeInfoVc, asset::{Asset, AssetVc},
context::AssetContext, chunk::ChunkingContextVc,
reference_type::EcmaScriptModulesReferenceSubType, compile_time_info::CompileTimeInfoVc,
resolve::parse::RequestVc, context::AssetContext,
virtual_asset::VirtualAssetVc, reference_type::EcmaScriptModulesReferenceSubType,
}; resolve::parse::RequestVc,
use turbo_binding::turbopack::ecmascript::{ virtual_asset::VirtualAssetVc,
chunk_group_files_asset::ChunkGroupFilesAsset, resolve::esm_resolve, utils::StringifyJs, },
EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType, ecmascript::{
EcmascriptModuleAssetVc, InnerAssetsVc, chunk_group_files_asset::ChunkGroupFilesAsset, resolve::esm_resolve,
}; utils::StringifyJs, EcmascriptInputTransform, EcmascriptInputTransformsVc,
use turbo_binding::turbopack::turbopack::{ EcmascriptModuleAssetType, EcmascriptModuleAssetVc, InnerAssetsVc,
module_options::ModuleOptionsContextVc, },
resolve_options_context::ResolveOptionsContextVc, turbopack::{
transition::{Transition, TransitionVc}, module_options::ModuleOptionsContextVc,
ModuleAssetContextVc, resolve_options_context::ResolveOptionsContextVc,
transition::{Transition, TransitionVc},
ModuleAssetContextVc,
},
},
}; };
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
......
...@@ -2,8 +2,7 @@ use std::collections::HashMap; ...@@ -2,8 +2,7 @@ use std::collections::HashMap;
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{turbo::tasks_fs::FileSystemPathVc, turbopack::core::issue::IssueSeverity};
use turbo_binding::turbopack::core::issue::IssueSeverity;
use turbo_tasks::{ use turbo_tasks::{
primitives::{StringVc, StringsVc, U32Vc}, primitives::{StringVc, StringsVc, U32Vc},
trace::TraceRawVcs, trace::TraceRawVcs,
......
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::turbo::tasks::{ use turbo_binding::{
primitives::{OptionStringVc, StringVc, U32Vc}, turbo::{
Value, tasks::{
}; primitives::{OptionStringVc, StringVc, U32Vc},
use turbo_binding::turbo::tasks_fs::{ Value,
json::parse_json_with_source_context, FileContent, FileSystemPathVc, },
}; tasks_fs::{json::parse_json_with_source_context, FileContent, FileSystemPathVc},
use turbo_binding::turbopack::core::{ },
resolve::{ turbopack::{
options::{ core::{
ImportMapResult, ImportMapResultVc, ImportMapping, ImportMappingReplacement, resolve::{
ImportMappingReplacementVc, ImportMappingVc, options::{
ImportMapResult, ImportMapResultVc, ImportMapping, ImportMappingReplacement,
ImportMappingReplacementVc, ImportMappingVc,
},
parse::{Request, RequestVc},
pattern::QueryMapVc,
ResolveResult,
},
virtual_asset::VirtualAssetVc,
}, },
parse::{Request, RequestVc}, node::execution_context::ExecutionContextVc,
pattern::QueryMapVc,
ResolveResult,
}, },
virtual_asset::VirtualAssetVc,
}; };
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc;
use self::{ use self::{
font_fallback::get_font_fallback, font_fallback::get_font_fallback,
...@@ -205,8 +209,7 @@ impl ImportMappingReplacement for NextFontGoogleCssModuleReplacer { ...@@ -205,8 +209,7 @@ 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; use turbo_binding::{turbo::tasks_fetch::fetch, turbopack::core::issue::IssueSeverity};
use turbo_binding::turbopack::core::issue::IssueSeverity;
let stylesheet_res = fetch( let stylesheet_res = fetch(
stylesheet_url, stylesheet_url,
...@@ -393,16 +396,22 @@ async fn get_mock_stylesheet( ...@@ -393,16 +396,22 @@ 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::turbo::tasks::CompletionVc; use turbo_binding::{
use turbo_binding::turbo::tasks_bytes::stream::SingleValue; turbo::{
use turbo_binding::turbo::tasks_env::{CommandLineProcessEnvVc, ProcessEnv}; tasks::CompletionVc,
use turbo_binding::turbo::tasks_fs::{DiskFileSystemVc, File, FileSystem}; tasks_bytes::stream::SingleValue,
use turbo_binding::turbopack::core::{context::AssetContext, ident::AssetIdentVc}; tasks_env::{CommandLineProcessEnvVc, ProcessEnv},
use turbo_binding::turbopack::ecmascript::{ tasks_fs::{DiskFileSystemVc, File, FileSystem},
EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc, },
turbopack::{
core::{context::AssetContext, ident::AssetIdentVc},
ecmascript::{
EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
},
node::{evaluate::evaluate, execution_context::ExecutionContext},
turbopack::evaluate_context::node_evaluate_asset_context,
},
}; };
use turbo_binding::turbopack::node::{evaluate::evaluate, execution_context::ExecutionContext};
use turbo_binding::turbopack::turbopack::evaluate_context::node_evaluate_asset_context;
let env = CommandLineProcessEnvVc::new().as_process_env(); let env = CommandLineProcessEnvVc::new().as_process_env();
let mocked_response_js = &*env.read("NEXT_FONT_GOOGLE_MOCKED_RESPONSES").await?; let mocked_response_js = &*env.read("NEXT_FONT_GOOGLE_MOCKED_RESPONSES").await?;
......
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::issue::{Issue, IssueSeverityVc, IssueVc}; turbo::tasks_fs::FileSystemPathVc,
turbopack::core::issue::{Issue, IssueSeverityVc, IssueVc},
};
use turbo_tasks::primitives::StringVc; use turbo_tasks::primitives::StringVc;
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
......
...@@ -105,11 +105,12 @@ fn default_display() -> String { ...@@ -105,11 +105,12 @@ fn default_display() -> String {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::{default_adjust_font_fallback, deserialize_adjust_font_fallback};
use anyhow::Result; use anyhow::Result;
use serde::Deserialize; use serde::Deserialize;
use super::AdjustFontFallback; use super::{
default_adjust_font_fallback, deserialize_adjust_font_fallback, AdjustFontFallback,
};
#[derive(Debug, Deserialize, PartialEq)] #[derive(Debug, Deserialize, PartialEq)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use turbo_binding::turbo::tasks_hash::hash_xxh3_hash64; use turbo_binding::{
use turbo_binding::turbopack::core::resolve::pattern::QueryMapVc; turbo::tasks_hash::hash_xxh3_hash64, turbopack::core::resolve::pattern::QueryMapVc,
};
use turbo_tasks::primitives::{OptionStringVc, StringVc, U32Vc}; 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
......
use std::collections::BTreeSet; use std::collections::BTreeSet;
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbopack::core::introspect::{Introspectable, IntrospectableVc}; use turbo_binding::turbopack::{
use turbo_binding::turbopack::dev_server::source::{ core::introspect::{Introspectable, IntrospectableVc},
query::QueryValue, ContentSource, ContentSourceContent, ContentSourceData, dev_server::source::{
ContentSourceDataFilter, ContentSourceDataVary, ContentSourceResultVc, ContentSourceVc, query::QueryValue, ContentSource, ContentSourceContent, ContentSourceData,
NeededData, ProxyResult, ContentSourceDataFilter, ContentSourceDataVary, ContentSourceResultVc, ContentSourceVc,
NeededData, ProxyResult,
},
}; };
use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks::{primitives::StringVc, Value};
......
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use turbo_binding::turbo::tasks_fs::{glob::GlobVc, FileSystem, FileSystemPathVc}; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::{glob::GlobVc, FileSystem, FileSystemPathVc},
asset::Asset, turbopack::{
resolve::{ core::{
options::{ asset::Asset,
ConditionValue, ImportMap, ImportMapVc, ImportMapping, ImportMappingVc, resolve::{
ResolveOptionsVc, ResolvedMap, ResolvedMapVc, options::{
ConditionValue, ImportMap, ImportMapVc, ImportMapping, ImportMappingVc,
ResolveOptionsVc, ResolvedMap, ResolvedMapVc,
},
parse::RequestVc,
pattern::Pattern,
resolve, AliasPattern, ExportsValue, ResolveAliasMapVc,
},
}, },
parse::RequestVc, node::execution_context::ExecutionContextVc,
pattern::Pattern, turbopack::{resolve_options, resolve_options_context::ResolveOptionsContext},
resolve, AliasPattern, ExportsValue, ResolveAliasMapVc,
}, },
}; };
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc;
use turbo_binding::turbopack::turbopack::{
resolve_options, resolve_options_context::ResolveOptionsContext,
};
use turbo_tasks::Value; use turbo_tasks::Value;
use crate::{ use crate::{
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::turbo::tasks::primitives::BoolVc; use turbo_binding::{
use turbo_binding::turbopack::node::route_matcher::{ParamsVc, RouteMatcher}; turbo::tasks::primitives::BoolVc,
turbopack::node::route_matcher::{ParamsVc, RouteMatcher},
};
#[derive(Debug, Serialize, Deserialize, Eq, PartialEq)] #[derive(Debug, Serialize, Deserialize, Eq, PartialEq)]
pub struct AllMatch; pub struct AllMatch;
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_env::ProcessEnvVc; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc},
use turbo_binding::turbopack::core::{ turbopack::{
compile_time_defines, core::{
compile_time_info::{CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc}, compile_time_defines,
environment::{ compile_time_info::{CompileTimeDefinesVc, CompileTimeInfo, CompileTimeInfoVc},
EnvironmentIntention, EnvironmentVc, ExecutionEnvironment, NodeJsEnvironmentVc, environment::{
ServerAddrVc, EnvironmentIntention, EnvironmentVc, ExecutionEnvironment, NodeJsEnvironmentVc,
}, ServerAddrVc,
}; },
use turbo_binding::turbopack::ecmascript::EcmascriptInputTransform; },
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc; ecmascript::EcmascriptInputTransform,
use turbo_binding::turbopack::turbopack::{ node::execution_context::ExecutionContextVc,
module_options::{ turbopack::{
JsxTransformOptions, JsxTransformOptionsVc, ModuleOptionsContext, ModuleOptionsContextVc, module_options::{
PostCssTransformOptions, WebpackLoadersOptions, JsxTransformOptions, JsxTransformOptionsVc, ModuleOptionsContext,
ModuleOptionsContextVc, PostCssTransformOptions, WebpackLoadersOptions,
},
resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
},
}, },
resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
}; };
use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks::{primitives::StringVc, Value};
......
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::turbo::tasks_fs::{glob::GlobVc, FileJsonContent, FileSystemPathVc}; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::{glob::GlobVc, FileJsonContent, FileSystemPathVc},
asset::Asset, turbopack::core::{
resolve::{ asset::Asset,
find_context_file, resolve::{
node::node_cjs_resolve_options, find_context_file,
package_json, node::node_cjs_resolve_options,
parse::{Request, RequestVc}, package_json,
plugin::{ResolvePlugin, ResolvePluginConditionVc, ResolvePluginVc}, parse::{Request, RequestVc},
resolve, FindContextFileResult, PrimaryResolveResult, ResolveResult, ResolveResultOptionVc, plugin::{ResolvePlugin, ResolvePluginConditionVc, ResolvePluginVc},
resolve, FindContextFileResult, PrimaryResolveResult, ResolveResult,
ResolveResultOptionVc,
},
}, },
}; };
use turbo_tasks::primitives::{BoolVc, StringsVc}; use turbo_tasks::primitives::{BoolVc, StringsVc};
......
...@@ -11,14 +11,16 @@ use swc_core::{ ...@@ -11,14 +11,16 @@ use swc_core::{
visit::{FoldWith, VisitMutWith}, visit::{FoldWith, VisitMutWith},
}, },
}; };
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::reference_type::{ReferenceType, UrlReferenceSubType}; turbo::tasks_fs::FileSystemPathVc,
use turbo_binding::turbopack::ecmascript::{ turbopack::{
CustomTransformVc, CustomTransformer, EcmascriptInputTransform, EcmascriptInputTransformsVc, core::reference_type::{ReferenceType, UrlReferenceSubType},
TransformContext, ecmascript::{
}; CustomTransformVc, CustomTransformer, EcmascriptInputTransform,
use turbo_binding::turbopack::turbopack::module_options::{ EcmascriptInputTransformsVc, TransformContext,
ModuleRule, ModuleRuleCondition, ModuleRuleEffect, },
turbopack::module_options::{ModuleRule, ModuleRuleCondition, ModuleRuleEffect},
},
}; };
/// Returns a rule which applies the Next.js page export stripping transform. /// Returns a rule which applies the Next.js page export stripping transform.
......
...@@ -2,22 +2,24 @@ use std::io::Write; ...@@ -2,22 +2,24 @@ use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indexmap::indexmap; use indexmap::indexmap;
use turbo_binding::turbo::tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc}; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc},
asset::{Asset, AssetContentVc, AssetVc}, turbopack::{
chunk::{Chunk, ChunkGroupVc, ChunkReferenceVc, ChunkingContextVc, ChunksVc}, core::{
context::{AssetContext, AssetContextVc}, asset::{Asset, AssetContentVc, AssetVc},
ident::AssetIdentVc, chunk::{Chunk, ChunkGroupVc, ChunkReferenceVc, ChunkingContextVc, ChunksVc},
reference::AssetReferencesVc, context::{AssetContext, AssetContextVc},
reference_type::{EntryReferenceSubType, ReferenceType}, ident::AssetIdentVc,
virtual_asset::VirtualAssetVc, reference::AssetReferencesVc,
}; reference_type::{EntryReferenceSubType, ReferenceType},
use turbo_binding::turbopack::dev_server::source::{ virtual_asset::VirtualAssetVc,
asset_graph::AssetGraphContentSourceVc, ContentSourceVc, },
}; dev_server::source::{asset_graph::AssetGraphContentSourceVc, ContentSourceVc},
use turbo_binding::turbopack::ecmascript::{ ecmascript::{
utils::StringifyJs, EcmascriptInputTransform, EcmascriptInputTransformsVc, utils::StringifyJs, EcmascriptInputTransform, EcmascriptInputTransformsVc,
EcmascriptModuleAssetType, EcmascriptModuleAssetVc, InnerAssetsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc, InnerAssetsVc,
},
},
}; };
use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value}; use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value};
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_binding::turbo::tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc}; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::{FileContent, FileSystemPathVc}; turbo::{
use turbo_binding::turbopack::core::{ tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc},
asset::AssetVc, tasks_fs::{FileContent, FileSystemPathVc},
chunk::ChunkingContextVc,
context::{AssetContext, AssetContextVc},
environment::{EnvironmentIntention, ServerAddrVc},
reference_type::{EntryReferenceSubType, ReferenceType},
source_asset::SourceAssetVc,
};
use turbo_binding::turbopack::dev::DevChunkingContextVc;
use turbo_binding::turbopack::dev_server::{
html::DevHtmlAssetVc,
source::{
asset_graph::AssetGraphContentSourceVc,
combined::{CombinedContentSource, CombinedContentSourceVc},
specificity::SpecificityVc,
ContentSourceData, ContentSourceVc, NoContentSourceVc,
}, },
}; turbopack::{
use turbo_binding::turbopack::ecmascript::{ core::{
chunk::EcmascriptChunkPlaceablesVc, EcmascriptInputTransform, EcmascriptInputTransformsVc, asset::AssetVc,
EcmascriptModuleAssetType, EcmascriptModuleAssetVc, InnerAssetsVc, chunk::ChunkingContextVc,
}; context::{AssetContext, AssetContextVc},
use turbo_binding::turbopack::env::ProcessEnvAssetVc; environment::{EnvironmentIntention, ServerAddrVc},
use turbo_binding::turbopack::node::{ reference_type::{EntryReferenceSubType, ReferenceType},
execution_context::ExecutionContextVc, source_asset::SourceAssetVc,
render::{ },
node_api_source::create_node_api_source, rendered_source::create_node_rendered_source, dev::DevChunkingContextVc,
dev_server::{
html::DevHtmlAssetVc,
source::{
asset_graph::AssetGraphContentSourceVc,
combined::{CombinedContentSource, CombinedContentSourceVc},
specificity::SpecificityVc,
ContentSourceData, ContentSourceVc, NoContentSourceVc,
},
},
ecmascript::{
chunk::EcmascriptChunkPlaceablesVc, EcmascriptInputTransform,
EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
InnerAssetsVc,
},
env::ProcessEnvAssetVc,
node::{
execution_context::ExecutionContextVc,
render::{
node_api_source::create_node_api_source,
rendered_source::create_node_rendered_source,
},
route_matcher::RouteMatcherVc,
NodeEntry, NodeEntryVc, NodeRenderingEntry, NodeRenderingEntryVc,
},
turbopack::{transition::TransitionsByNameVc, ModuleAssetContextVc},
}, },
route_matcher::RouteMatcherVc,
NodeEntry, NodeEntryVc, NodeRenderingEntry, NodeRenderingEntryVc,
}; };
use turbo_binding::turbopack::turbopack::{transition::TransitionsByNameVc, ModuleAssetContextVc};
use turbo_tasks::{ use turbo_tasks::{
primitives::{OptionStringVc, StringVc, StringsVc}, primitives::{OptionStringVc, StringVc, StringsVc},
trace::TraceRawVcs, trace::TraceRawVcs,
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_fs::{ use turbo_binding::{
DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPathVc, turbo::tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPathVc},
turbopack::dev_server::source::specificity::SpecificityVc,
}; };
use turbo_binding::turbopack::dev_server::source::specificity::SpecificityVc;
use turbo_tasks::{ use turbo_tasks::{
primitives::{BoolVc, StringsVc}, primitives::{BoolVc, StringsVc},
CompletionVc, CompletionVc,
......
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::FileSystemPathVc,
issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc}, turbopack::{
resolve::{origin::ResolveOriginVc, parse::RequestVc}, core::{
}; issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc},
use turbo_binding::turbopack::turbopack::{ resolve::{origin::ResolveOriginVc, parse::RequestVc},
ecmascript::{ },
chunk::EcmascriptChunkPlaceableVc, turbopack::{
resolve::{apply_cjs_specific_options, cjs_resolve}, ecmascript::{
chunk::EcmascriptChunkPlaceableVc,
resolve::{apply_cjs_specific_options, cjs_resolve},
},
resolve_options_context::ResolveOptionsContextVc,
},
}, },
resolve_options_context::ResolveOptionsContextVc,
}; };
use turbo_tasks::{debug::ValueDebug, primitives::StringVc}; use turbo_tasks::{debug::ValueDebug, primitives::StringVc};
......
...@@ -3,33 +3,39 @@ use futures::StreamExt; ...@@ -3,33 +3,39 @@ 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::turbo::tasks_bytes::{Bytes, Stream}; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::{to_sys_path, File, FileSystemPathVc}; turbo::{
use turbo_binding::turbopack::core::{ tasks_bytes::{Bytes, Stream},
asset::AssetVc, tasks_fs::{to_sys_path, File, FileSystemPathVc},
changed::any_content_changed, },
chunk::ChunkingContext, turbopack::{
context::{AssetContext, AssetContextVc}, core::{
environment::{EnvironmentIntention::Middleware, ServerAddrVc}, asset::AssetVc,
ident::AssetIdentVc, changed::any_content_changed,
issue::IssueVc, chunk::ChunkingContext,
reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType}, context::{AssetContext, AssetContextVc},
resolve::{find_context_file, FindContextFileResult}, environment::{EnvironmentIntention::Middleware, ServerAddrVc},
source_asset::SourceAssetVc, ident::AssetIdentVc,
virtual_asset::VirtualAssetVc, issue::IssueVc,
}; reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType},
use turbo_binding::turbopack::dev::DevChunkingContextVc; resolve::{find_context_file, FindContextFileResult},
use turbo_binding::turbopack::ecmascript::{ source_asset::SourceAssetVc,
EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType, virtual_asset::VirtualAssetVc,
EcmascriptModuleAssetVc, InnerAssetsVc, OptionEcmascriptModuleAssetVc, },
}; dev::DevChunkingContextVc,
use turbo_binding::turbopack::node::{ ecmascript::{
evaluate::evaluate, EcmascriptInputTransform, EcmascriptInputTransformsVc, EcmascriptModuleAssetType,
execution_context::{ExecutionContext, ExecutionContextVc}, EcmascriptModuleAssetVc, InnerAssetsVc, OptionEcmascriptModuleAssetVc,
source_map::{trace_stack, StructuredError}, },
}; node::{
use turbo_binding::turbopack::turbopack::{ evaluate::evaluate,
evaluate_context::node_evaluate_asset_context, transition::TransitionsByNameVc, execution_context::{ExecutionContext, ExecutionContextVc},
source_map::{trace_stack, StructuredError},
},
turbopack::{
evaluate_context::node_evaluate_asset_context, transition::TransitionsByNameVc,
},
},
}; };
use turbo_tasks::{ use turbo_tasks::{
primitives::{JsonValueVc, StringsVc}, primitives::{JsonValueVc, StringsVc},
......
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use futures::stream::StreamExt; use futures::stream::StreamExt;
use indexmap::IndexSet; use indexmap::IndexSet;
use turbo_binding::turbopack::core::{ use turbo_binding::turbopack::{
environment::ServerAddrVc, core::{
introspect::{Introspectable, IntrospectableChildrenVc, IntrospectableVc}, environment::ServerAddrVc,
introspect::{Introspectable, IntrospectableChildrenVc, IntrospectableVc},
},
dev_server::source::{
Body, BodyError, ContentSource, ContentSourceContent, ContentSourceData,
ContentSourceDataVary, ContentSourceResultVc, ContentSourceVc, HeaderListVc, NeededData,
ProxyResult, RewriteBuilder,
},
node::execution_context::ExecutionContextVc,
}; };
use turbo_binding::turbopack::dev_server::source::{
Body, BodyError, ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary,
ContentSourceResultVc, ContentSourceVc, HeaderListVc, NeededData, ProxyResult, RewriteBuilder,
};
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc;
use turbo_tasks::{primitives::StringVc, CompletionVc, CompletionsVc, Value}; use turbo_tasks::{primitives::StringVc, CompletionVc, CompletionsVc, Value};
use crate::{ use crate::{
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_binding::turbopack::core::resolve::{origin::ResolveOriginVc, parse::RequestVc}; use turbo_binding::turbopack::{
use turbo_binding::turbopack::turbopack::ecmascript::{ core::resolve::{origin::ResolveOriginVc, parse::RequestVc},
chunk::EcmascriptChunkPlaceableVc, resolve::cjs_resolve, turbopack::ecmascript::{chunk::EcmascriptChunkPlaceableVc, resolve::cjs_resolve},
}; };
/// Resolves the turbopack runtime module from the given [AssetContextVc]. /// Resolves the turbopack runtime module from the given [AssetContextVc].
......
use anyhow::Result; use anyhow::Result;
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; use turbo_binding::{
use turbo_binding::turbopack::core::{ turbo::tasks_fs::FileSystemPathVc,
resolve::{find_context_file, node::node_cjs_resolve_options, FindContextFileResult}, turbopack::{
source_asset::SourceAssetVc, core::{
}; resolve::{find_context_file, node::node_cjs_resolve_options, FindContextFileResult},
use turbo_binding::turbopack::ecmascript::typescript::resolve::{ source_asset::SourceAssetVc,
read_from_tsconfigs, read_tsconfigs, tsconfig, },
}; ecmascript::typescript::resolve::{read_from_tsconfigs, read_tsconfigs, tsconfig},
use turbo_binding::turbopack::turbopack::module_options::{ turbopack::module_options::{TypescriptTransformOptions, TypescriptTransformOptionsVc},
TypescriptTransformOptions, TypescriptTransformOptionsVc, },
}; };
// Get the transform options for specifically for the typescript's runtime // Get the transform options for specifically for the typescript's runtime
......
use anyhow::{anyhow, bail, Context, Result}; use anyhow::{anyhow, bail, Context, Result};
use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde::{de::DeserializeOwned, Deserialize, Serialize};
use swc_core::ecma::ast::Program; use swc_core::ecma::ast::Program;
use turbo_binding::turbo::tasks_fs::{ use turbo_binding::{
json::parse_json_rope_with_source_context, FileContent, FileSystemPathVc, turbo::tasks_fs::{json::parse_json_rope_with_source_context, FileContent, FileSystemPathVc},
}; turbopack::{
use turbo_binding::turbopack::core::{ core::{
asset::{Asset, AssetVc}, asset::{Asset, AssetVc},
ident::AssetIdentVc, ident::AssetIdentVc,
issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc}, issue::{Issue, IssueSeverity, IssueSeverityVc, IssueVc},
reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType}, reference_type::{EcmaScriptModulesReferenceSubType, ReferenceType},
resolve::{ resolve::{
self, handle_resolve_error, node::node_cjs_resolve_options, parse::RequestVc, self, handle_resolve_error, node::node_cjs_resolve_options, parse::RequestVc,
pattern::QueryMapVc, PrimaryResolveResult, pattern::QueryMapVc, PrimaryResolveResult,
},
},
ecmascript::{
analyzer::{JsValue, ObjectPart},
parse::ParseResult,
EcmascriptModuleAssetVc,
},
turbopack::condition::ContextCondition,
}, },
}; };
use turbo_binding::turbopack::ecmascript::{
analyzer::{JsValue, ObjectPart},
parse::ParseResult,
EcmascriptModuleAssetVc,
};
use turbo_binding::turbopack::turbopack::condition::ContextCondition;
use turbo_tasks::{primitives::StringVc, trace::TraceRawVcs, Value, ValueToString}; use turbo_tasks::{primitives::StringVc, trace::TraceRawVcs, Value, ValueToString};
use crate::next_config::NextConfigVc; use crate::next_config::NextConfigVc;
......
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use turbo_binding::turbo::tasks_env::ProcessEnvVc; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::FileSystemPathVc; turbo::{tasks_env::ProcessEnvVc, tasks_fs::FileSystemPathVc},
use turbo_binding::turbopack::core::{ turbopack::{
chunk::{availability_info::AvailabilityInfo, ChunkGroupVc, ChunkableAsset, ChunkableAssetVc}, core::{
reference_type::{EntryReferenceSubType, ReferenceType}, chunk::{
resolve::{origin::PlainResolveOriginVc, parse::RequestVc}, availability_info::AvailabilityInfo, ChunkGroupVc, ChunkableAsset, ChunkableAssetVc,
}; },
use turbo_binding::turbopack::dev_server::{ reference_type::{EntryReferenceSubType, ReferenceType},
html::DevHtmlAssetVc, resolve::{origin::PlainResolveOriginVc, parse::RequestVc},
source::{asset_graph::AssetGraphContentSourceVc, ContentSourceVc}, },
dev_server::{
html::DevHtmlAssetVc,
source::{asset_graph::AssetGraphContentSourceVc, ContentSourceVc},
},
node::execution_context::ExecutionContextVc,
turbopack::ecmascript::EcmascriptModuleAssetVc,
},
}; };
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc;
use turbo_binding::turbopack::turbopack::ecmascript::EcmascriptModuleAssetVc;
use turbo_tasks::{TryJoinIterExt, Value}; use turbo_tasks::{TryJoinIterExt, Value};
use crate::{ use crate::{
......
#![feature(min_specialization)] #![feature(min_specialization)]
#![cfg(test)] #![cfg(test)]
use dunce::canonicalize;
use regex::{Captures, Regex, Replacer};
use std::{ use std::{
env, env,
fmt::Write, fmt::Write,
...@@ -25,10 +23,12 @@ use chromiumoxide::{ ...@@ -25,10 +23,12 @@ use chromiumoxide::{
}, },
error::CdpError::Ws, error::CdpError::Ws,
}; };
use dunce::canonicalize;
use futures::StreamExt; use futures::StreamExt;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use next_dev::{EntryRequest, NextDevServerBuilder}; use next_dev::{EntryRequest, NextDevServerBuilder};
use owo_colors::OwoColorize; use owo_colors::OwoColorize;
use regex::{Captures, Regex, Replacer};
use serde::Deserialize; use serde::Deserialize;
use tokio::{ use tokio::{
net::TcpSocket, net::TcpSocket,
...@@ -36,19 +36,25 @@ use tokio::{ ...@@ -36,19 +36,25 @@ use tokio::{
task::JoinSet, task::JoinSet,
}; };
use tungstenite::{error::ProtocolError::ResetWithoutClosingHandshake, Error::Protocol}; use tungstenite::{error::ProtocolError::ResetWithoutClosingHandshake, Error::Protocol};
use turbo_binding::turbo::tasks::{ use turbo_binding::{
debug::{ValueDebug, ValueDebugStringReadRef}, turbo::{
primitives::{BoolVc, StringVc}, tasks::{
NothingVc, RawVc, ReadRef, State, TransientInstance, TransientValue, TurboTasks, debug::{ValueDebug, ValueDebugStringReadRef},
}; primitives::{BoolVc, StringVc},
use turbo_binding::turbo::tasks_fs::{DiskFileSystemVc, FileSystem, FileSystemPathVc}; NothingVc, RawVc, ReadRef, State, TransientInstance, TransientValue, TurboTasks,
use turbo_binding::turbo::tasks_memory::MemoryBackend; },
use turbo_binding::turbo::tasks_testing::retry::retry_async; tasks_fs::{DiskFileSystemVc, FileSystem, FileSystemPathVc},
use turbo_binding::turbopack::core::issue::{ tasks_memory::MemoryBackend,
CapturedIssues, Issue, IssueReporter, IssueReporterVc, IssueSeverityVc, IssueVc, IssuesVc, tasks_testing::retry::retry_async,
OptionIssueSourceVc, PlainIssueReadRef, },
turbopack::{
core::issue::{
CapturedIssues, Issue, IssueReporter, IssueReporterVc, IssueSeverityVc, IssueVc,
IssuesVc, OptionIssueSourceVc, PlainIssueReadRef,
},
test_utils::snapshot::snapshot_issues,
},
}; };
use turbo_binding::turbopack::test_utils::snapshot::snapshot_issues;
fn register() { fn register() {
next_dev::register(); next_dev::register();
......
...@@ -17,9 +17,11 @@ use parking_lot::Mutex; ...@@ -17,9 +17,11 @@ use parking_lot::Mutex;
pub use prepared_app::PreparedApp; pub use prepared_app::PreparedApp;
use regex::Regex; use regex::Regex;
use tungstenite::{error::ProtocolError::ResetWithoutClosingHandshake, Error::Protocol}; use tungstenite::{error::ProtocolError::ResetWithoutClosingHandshake, Error::Protocol};
use turbo_binding::turbo::tasks_testing::retry::{retry, retry_async}; use turbo_binding::{
use turbo_binding::turbopack::create_test_app::test_app_builder::{ turbo::tasks_testing::retry::{retry, retry_async},
EffectMode, PackageJsonConfig, TestApp, TestAppBuilder, turbopack::create_test_app::test_app_builder::{
EffectMode, PackageJsonConfig, TestApp, TestAppBuilder,
},
}; };
use turbo_tasks::util::FormatDuration; use turbo_tasks::util::FormatDuration;
......
...@@ -14,7 +14,6 @@ use std::{ ...@@ -14,7 +14,6 @@ use std::{
sync::Arc, sync::Arc,
time::{Duration, Instant}, time::{Duration, Instant},
}; };
use turbo_tasks::UpdateInfo;
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use devserver_options::DevServerOptions; use devserver_options::DevServerOptions;
...@@ -27,32 +26,38 @@ use next_core::{ ...@@ -27,32 +26,38 @@ use next_core::{
source_map::NextSourceMapTraceContentSourceVc, source_map::NextSourceMapTraceContentSourceVc,
}; };
use owo_colors::OwoColorize; use owo_colors::OwoColorize;
use turbo_binding::turbo::malloc::TurboMalloc; use turbo_binding::{
use turbo_binding::turbo::tasks_fs::{DiskFileSystemVc, FileSystem, FileSystemVc}; turbo::{
use turbo_binding::turbo::tasks_memory::MemoryBackend; malloc::TurboMalloc,
use turbo_binding::turbopack::cli_utils::issue::{ConsoleUiVc, LogOptions}; tasks_fs::{DiskFileSystemVc, FileSystem, FileSystemVc},
use turbo_binding::turbopack::core::{ tasks_memory::MemoryBackend,
environment::ServerAddr, },
issue::{IssueReporterVc, IssueSeverity}, turbopack::{
resolve::{parse::RequestVc, pattern::QueryMapVc}, cli_utils::issue::{ConsoleUiVc, LogOptions},
server_fs::ServerFileSystemVc, core::{
PROJECT_FILESYSTEM_NAME, environment::ServerAddr,
}; issue::{IssueReporterVc, IssueSeverity},
use turbo_binding::turbopack::dev::DevChunkingContextVc; resolve::{parse::RequestVc, pattern::QueryMapVc},
use turbo_binding::turbopack::dev_server::{ server_fs::ServerFileSystemVc,
introspect::IntrospectionSource, PROJECT_FILESYSTEM_NAME,
source::{ },
combined::CombinedContentSourceVc, router::RouterContentSource, dev::DevChunkingContextVc,
source_maps::SourceMapContentSourceVc, static_assets::StaticAssetsContentSourceVc, dev_server::{
ContentSourceVc, introspect::IntrospectionSource,
source::{
combined::CombinedContentSourceVc, router::RouterContentSource,
source_maps::SourceMapContentSourceVc, static_assets::StaticAssetsContentSourceVc,
ContentSourceVc,
},
DevServer, DevServerBuilder,
},
node::execution_context::ExecutionContextVc,
turbopack::evaluate_context::node_build_environment,
}, },
DevServer, DevServerBuilder,
}; };
use turbo_binding::turbopack::node::execution_context::ExecutionContextVc;
use turbo_binding::turbopack::turbopack::evaluate_context::node_build_environment;
use turbo_tasks::{ use turbo_tasks::{
util::{FormatBytes, FormatDuration}, util::{FormatBytes, FormatDuration},
StatsType, TransientInstance, TurboTasks, TurboTasksBackendApi, Value, StatsType, TransientInstance, TurboTasks, TurboTasksBackendApi, UpdateInfo, Value,
}; };
#[derive(Clone)] #[derive(Clone)]
......
...@@ -2,15 +2,21 @@ use std::{sync::Arc, time::Duration}; ...@@ -2,15 +2,21 @@ use std::{sync::Arc, time::Duration};
use anyhow::Result; use anyhow::Result;
use mime::TEXT_HTML_UTF_8; use mime::TEXT_HTML_UTF_8;
use turbo_binding::turbo::tasks_fs::File; use turbo_binding::{
use turbo_binding::turbo::tasks_memory::{ turbo::{
stats::{ReferenceType, Stats}, tasks_fs::File,
viz, MemoryBackend, tasks_memory::{
}; stats::{ReferenceType, Stats},
use turbo_binding::turbopack::core::asset::AssetContentVc; viz, MemoryBackend,
use turbo_binding::turbopack::dev_server::source::{ },
ContentSource, ContentSourceContentVc, ContentSourceData, ContentSourceDataFilter, },
ContentSourceDataVary, ContentSourceResultVc, ContentSourceVc, NeededData, turbopack::{
core::asset::AssetContentVc,
dev_server::source::{
ContentSource, ContentSourceContentVc, ContentSourceData, ContentSourceDataFilter,
ContentSourceDataVary, ContentSourceResultVc, ContentSourceVc, NeededData,
},
},
}; };
use turbo_tasks::{get_invalidator, TurboTasks, TurboTasksBackendApi, Value}; use turbo_tasks::{get_invalidator, TurboTasks, TurboTasksBackendApi, Value};
......
use std::sync::Arc;
use anyhow::{Context, Error}; use anyhow::{Context, Error};
use js_sys::JsString; use js_sys::JsString;
use next_swc::{custom_before_pass, TransformOptions}; use next_swc::{custom_before_pass, TransformOptions};
use std::sync::Arc;
use wasm_bindgen::{prelude::*, JsCast};
use wasm_bindgen_futures::future_to_promise;
use turbo_binding::swc::core::{ use turbo_binding::swc::core::{
base::{config::JsMinifyOptions, config::ParseOptions, try_with_handler, Compiler}, base::{
config::{JsMinifyOptions, ParseOptions},
try_with_handler, Compiler,
},
common::{ common::{
comments::{Comments, SingleThreadedComments}, comments::{Comments, SingleThreadedComments},
errors::ColorConfig, errors::ColorConfig,
...@@ -14,6 +15,8 @@ use turbo_binding::swc::core::{ ...@@ -14,6 +15,8 @@ use turbo_binding::swc::core::{
}, },
ecma::transforms::base::pass::noop, ecma::transforms::base::pass::noop,
}; };
use wasm_bindgen::{prelude::*, JsCast};
use wasm_bindgen_futures::future_to_promise;
pub mod mdx; pub mod mdx;
......
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