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