From 8c9ee1d1f074dd443b799db046cd781e36b04e12 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Tue, 16 Jan 2024 10:33:00 +0100 Subject: [PATCH 1/4] Skip postcss config location resolving in node_modules --- .../next-core/src/next_client/context.rs | 22 ++++++++++++++----- .../next-core/src/next_server/context.rs | 14 +++++++++++- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs index 43e32b2435674..df94f6d07f8d2 100644 --- a/packages/next-swc/crates/next-core/src/next_client/context.rs +++ b/packages/next-swc/crates/next-core/src/next_client/context.rs @@ -18,13 +18,16 @@ use turbopack_binding::{ }, dev::{react_refresh::assert_can_resolve_react_refresh, DevChunkingContext}, ecmascript::{chunk::EcmascriptChunkingContext, TreeShakingMode}, - node::execution_context::ExecutionContext, + node::{ + execution_context::ExecutionContext, + transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions}, + }, turbopack::{ condition::ContextCondition, module_options::{ module_options_context::ModuleOptionsContext, CustomEcmascriptTransformPlugins, - JsxTransformOptions, MdxTransformModuleOptions, PostCssTransformOptions, - TypescriptTransformOptions, WebpackLoadersOptions, + JsxTransformOptions, MdxTransformModuleOptions, TypescriptTransformOptions, + WebpackLoadersOptions, }, resolve_options_context::ResolveOptionsContext, }, @@ -260,6 +263,7 @@ pub async fn get_client_module_options_context( let postcss_transform_options = Some(PostCssTransformOptions { postcss_package: Some(get_postcss_package_mapping(project_path)), + config_location: PostCssConfigLocation::ProjectPathOrLocalPath, ..Default::default() }); @@ -268,13 +272,22 @@ pub async fn get_client_module_options_context( execution_context: Some(execution_context), custom_ecma_transform_plugins, tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly), + enable_postcss_transform: postcss_transform_options, ..Default::default() }; + let postcss_foreign_transform_options = Some(PostCssTransformOptions { + // For node_modules we don't want to resolve postcss config relative to the file being + // compiled, instead it only uses the project root postcss config. + config_location: PostCssConfigLocation::ProjectPath, + ..postcss_transform_options + }); + + // node_modules context let foreign_codes_options_context = ModuleOptionsContext { enable_webpack_loaders: foreign_webpack_loaders, + enable_postcss_transform: postcss_foreign_transform_options, // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code. - enable_postcss_transform: postcss_transform_options.clone(), ..module_options_context.clone() }; @@ -284,7 +297,6 @@ pub async fn get_client_module_options_context( // the modules. enable_jsx: Some(jsx_runtime_options), enable_webpack_loaders, - enable_postcss_transform: postcss_transform_options, enable_typescript_transform: Some(tsconfig), enable_mdx_rs, decorators: Some(decorators_options), diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs index 9d516c340eaf0..102421f085c51 100644 --- a/packages/next-swc/crates/next-core/src/next_server/context.rs +++ b/packages/next-swc/crates/next-core/src/next_server/context.rs @@ -19,7 +19,10 @@ use turbopack_binding::{ }, ecmascript::{references::esm::UrlRewriteBehavior, TransformPlugin, TreeShakingMode}, ecmascript_plugin::transform::directives::client::ClientDirectiveTransformer, - node::execution_context::ExecutionContext, + node::{ + execution_context::ExecutionContext, + transforms::postcss::{PostCssConfigLocation, PostCssTransformOptions}, + }, turbopack::{ condition::ContextCondition, module_options::{ @@ -282,6 +285,7 @@ pub async fn get_server_module_options_context( foreign_code_context_condition(next_config, project_path).await?; let postcss_transform_options = Some(PostCssTransformOptions { postcss_package: Some(get_postcss_package_mapping(project_path)), + config_location: PostCssConfigLocation::ProjectPathOrLocalPath..Default::default(), ..Default::default() }); @@ -396,6 +400,14 @@ pub async fn get_server_module_options_context( ..Default::default() }; + let postcss_foreign_transform_options = Some(PostCssTransformOptions { + // For node_modules we don't want to resolve postcss config relative to the file + // being compiled, instead it only uses the project root postcss + // config. + config_location: PostCssConfigLocation::ProjectPath, + ..postcss_transform_options + }); + let foreign_code_module_options_context = ModuleOptionsContext { custom_rules: internal_custom_rules.clone(), enable_webpack_loaders: foreign_webpack_loaders, From 40356f0e295b205631b5ffe0a24935ef855a09a5 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 17 Jan 2024 09:03:41 +0000 Subject: [PATCH 2/4] make postcss options a Vc --- .../next-core/src/next_client/context.rs | 23 +++---- .../next-core/src/next_server/context.rs | 60 ++++++++++++------- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs index df94f6d07f8d2..96012a4b0c3b6 100644 --- a/packages/next-swc/crates/next-core/src/next_client/context.rs +++ b/packages/next-swc/crates/next-core/src/next_client/context.rs @@ -261,32 +261,33 @@ pub async fn get_client_module_options_context( }, )); - let postcss_transform_options = Some(PostCssTransformOptions { + let postcss_transform_options = PostCssTransformOptions { postcss_package: Some(get_postcss_package_mapping(project_path)), config_location: PostCssConfigLocation::ProjectPathOrLocalPath, ..Default::default() - }); + }; + let postcss_foreign_transform_options = PostCssTransformOptions { + // For node_modules we don't want to resolve postcss config relative to the file being + // compiled, instead it only uses the project root postcss config. + config_location: PostCssConfigLocation::ProjectPath, + ..postcss_transform_options.clone() + }; + let enable_postcss_transform = Some(postcss_transform_options.cell()); + let enable_foreign_postcss_transform = Some(postcss_foreign_transform_options.cell()); let module_options_context = ModuleOptionsContext { preset_env_versions: Some(env), execution_context: Some(execution_context), custom_ecma_transform_plugins, tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly), - enable_postcss_transform: postcss_transform_options, + enable_postcss_transform, ..Default::default() }; - let postcss_foreign_transform_options = Some(PostCssTransformOptions { - // For node_modules we don't want to resolve postcss config relative to the file being - // compiled, instead it only uses the project root postcss config. - config_location: PostCssConfigLocation::ProjectPath, - ..postcss_transform_options - }); - // node_modules context let foreign_codes_options_context = ModuleOptionsContext { enable_webpack_loaders: foreign_webpack_loaders, - enable_postcss_transform: postcss_foreign_transform_options, + enable_postcss_transform: enable_foreign_postcss_transform, // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code. ..module_options_context.clone() }; diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs index 102421f085c51..32db4cec20d14 100644 --- a/packages/next-swc/crates/next-core/src/next_server/context.rs +++ b/packages/next-swc/crates/next-core/src/next_server/context.rs @@ -27,8 +27,7 @@ use turbopack_binding::{ condition::ContextCondition, module_options::{ CustomEcmascriptTransformPlugins, JsxTransformOptions, MdxTransformModuleOptions, - ModuleOptionsContext, PostCssTransformOptions, TypescriptTransformOptions, - WebpackLoadersOptions, + ModuleOptionsContext, TypescriptTransformOptions, WebpackLoadersOptions, }, resolve_options_context::ResolveOptionsContext, transition::Transition, @@ -283,11 +282,20 @@ pub async fn get_server_module_options_context( let foreign_code_context_condition = foreign_code_context_condition(next_config, project_path).await?; - let postcss_transform_options = Some(PostCssTransformOptions { + let postcss_transform_options = PostCssTransformOptions { postcss_package: Some(get_postcss_package_mapping(project_path)), - config_location: PostCssConfigLocation::ProjectPathOrLocalPath..Default::default(), + config_location: PostCssConfigLocation::ProjectPathOrLocalPath, ..Default::default() - }); + }; + let postcss_foreign_transform_options = PostCssTransformOptions { + // For node_modules we don't want to resolve postcss config relative to the file + // being compiled, instead it only uses the project root postcss + // config. + config_location: PostCssConfigLocation::ProjectPath, + ..postcss_transform_options.clone() + }; + let enable_postcss_transform = Some(postcss_transform_options.cell()); + let enable_foreign_postcss_transform = Some(postcss_foreign_transform_options.cell()); // A separate webpack rules will be applied to codes matching // foreign_code_context_condition. This allows to import codes from @@ -400,19 +408,11 @@ pub async fn get_server_module_options_context( ..Default::default() }; - let postcss_foreign_transform_options = Some(PostCssTransformOptions { - // For node_modules we don't want to resolve postcss config relative to the file - // being compiled, instead it only uses the project root postcss - // config. - config_location: PostCssConfigLocation::ProjectPath, - ..postcss_transform_options - }); - let foreign_code_module_options_context = ModuleOptionsContext { custom_rules: internal_custom_rules.clone(), enable_webpack_loaders: foreign_webpack_loaders, // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code. - enable_postcss_transform: postcss_transform_options.clone(), + enable_postcss_transform: enable_foreign_postcss_transform, ..module_options_context.clone() }; @@ -426,7 +426,7 @@ pub async fn get_server_module_options_context( ModuleOptionsContext { enable_jsx: Some(jsx_runtime_options), enable_webpack_loaders, - enable_postcss_transform: postcss_transform_options, + enable_postcss_transform, enable_typescript_transform: Some(tsconfig), enable_mdx_rs, decorators: Some(decorators_options), @@ -481,7 +481,7 @@ pub async fn get_server_module_options_context( custom_rules: internal_custom_rules.clone(), enable_webpack_loaders: foreign_webpack_loaders, // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code. - enable_postcss_transform: postcss_transform_options.clone(), + enable_postcss_transform: enable_foreign_postcss_transform, ..module_options_context.clone() }; let internal_module_options_context = ModuleOptionsContext { @@ -503,7 +503,7 @@ pub async fn get_server_module_options_context( ModuleOptionsContext { enable_jsx: Some(jsx_runtime_options), enable_webpack_loaders, - enable_postcss_transform: postcss_transform_options, + enable_postcss_transform, enable_typescript_transform: Some(tsconfig), enable_mdx_rs, decorators: Some(decorators_options), @@ -567,7 +567,7 @@ pub async fn get_server_module_options_context( custom_rules: internal_custom_rules.clone(), enable_webpack_loaders: foreign_webpack_loaders, // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code. - enable_postcss_transform: postcss_transform_options.clone(), + enable_postcss_transform: enable_foreign_postcss_transform, ..module_options_context.clone() }; let internal_module_options_context = ModuleOptionsContext { @@ -578,7 +578,7 @@ pub async fn get_server_module_options_context( ModuleOptionsContext { enable_jsx: Some(jsx_runtime_options), enable_webpack_loaders, - enable_postcss_transform: postcss_transform_options, + enable_postcss_transform, enable_typescript_transform: Some(tsconfig), enable_mdx_rs, decorators: Some(decorators_options), @@ -603,6 +603,13 @@ pub async fn get_server_module_options_context( tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly), ..Default::default() }; + let foreign_code_module_options_context = ModuleOptionsContext { + custom_rules: internal_custom_rules.clone(), + enable_webpack_loaders: foreign_webpack_loaders, + // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code. + enable_postcss_transform: enable_foreign_postcss_transform, + ..module_options_context.clone() + }; let internal_module_options_context = ModuleOptionsContext { enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()), custom_rules: internal_custom_rules, @@ -610,14 +617,14 @@ pub async fn get_server_module_options_context( }; ModuleOptionsContext { enable_webpack_loaders, - enable_postcss_transform: postcss_transform_options, + enable_postcss_transform, enable_typescript_transform: Some(tsconfig), enable_mdx_rs, decorators: Some(decorators_options), rules: vec![ ( foreign_code_context_condition, - module_options_context.clone().cell(), + foreign_code_module_options_context.cell(), ), ( ContextCondition::InPath(next_js_fs().root()), @@ -652,6 +659,13 @@ pub async fn get_server_module_options_context( tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly), ..Default::default() }; + let foreign_code_module_options_context = ModuleOptionsContext { + custom_rules: internal_custom_rules.clone(), + enable_webpack_loaders: foreign_webpack_loaders, + // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code. + enable_postcss_transform: enable_foreign_postcss_transform, + ..module_options_context.clone() + }; let internal_module_options_context = ModuleOptionsContext { enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()), custom_rules: internal_custom_rules, @@ -660,14 +674,14 @@ pub async fn get_server_module_options_context( ModuleOptionsContext { enable_jsx: Some(jsx_runtime_options), enable_webpack_loaders, - enable_postcss_transform: postcss_transform_options, + enable_postcss_transform, enable_typescript_transform: Some(tsconfig), enable_mdx_rs, decorators: Some(decorators_options), rules: vec![ ( foreign_code_context_condition, - module_options_context.clone().cell(), + foreign_code_module_options_context.cell(), ), ( ContextCondition::InPath(next_js_fs().root()), From 9e1816a6785419ddb6f63e916afce24b388ef225 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 17 Jan 2024 09:03:54 +0000 Subject: [PATCH 3/4] link --- Cargo.lock | 70 +++++++++++++++++++------------------- Cargo.toml | 6 ++-- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +++--- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4949656dfd0d..f4607fe0a3eeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "serde", "smallvec", @@ -3497,7 +3497,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "serde", @@ -7537,7 +7537,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "async-trait", @@ -7569,7 +7569,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "cargo-lock", @@ -7581,7 +7581,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "bytes", @@ -7596,7 +7596,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "dotenvs", @@ -7610,7 +7610,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7627,7 +7627,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "auto-hash-map", @@ -7658,7 +7658,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "base16", "hex", @@ -7670,7 +7670,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7684,7 +7684,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "proc-macro2", "quote", @@ -7694,7 +7694,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "mimalloc", ] @@ -7702,7 +7702,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "auto-hash-map", @@ -7727,7 +7727,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "async-recursion", @@ -7759,7 +7759,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "auto-hash-map", "mdxjs", @@ -7800,7 +7800,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7824,7 +7824,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "clap 4.4.2", @@ -7842,7 +7842,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "async-recursion", @@ -7872,7 +7872,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "async-trait", @@ -7899,7 +7899,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7923,7 +7923,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "async-compression", @@ -7960,7 +7960,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "async-trait", @@ -7995,7 +7995,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "serde", "serde_json", @@ -8006,7 +8006,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "async-trait", @@ -8029,7 +8029,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "indoc", @@ -8046,7 +8046,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8062,7 +8062,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "base64 0.21.4", @@ -8082,7 +8082,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "serde", @@ -8097,7 +8097,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "mdxjs", @@ -8112,7 +8112,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "async-stream", @@ -8147,7 +8147,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "serde", @@ -8163,7 +8163,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "swc_core", "turbo-tasks", @@ -8174,7 +8174,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "crossbeam-channel", @@ -8190,7 +8190,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.1#145d71b0a0e4ddaffda006a07eccc55e33aad75e" +source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8212,7 +8212,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "rand", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 23d31e5c05761..4abdbcc42a8db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [ testing = { version = "0.35.14" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.1" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. -turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.1" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 74bd2af94c6da..17f1fb31a909d 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -194,7 +194,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.26.2", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eefa4a48de3b5..e63c98d42fac5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1077,8 +1077,8 @@ importers: specifier: 0.26.2 version: 0.26.2 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -25649,9 +25649,9 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.1' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: From ae660b9f15865dd24b7a4a8b26ea954d3b9afa71 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 17 Jan 2024 12:20:11 +0000 Subject: [PATCH 4/4] upgrade turbopack --- Cargo.lock | 68 +++++++++++++++++++------------------- Cargo.toml | 6 ++-- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +++--- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f4607fe0a3eeb..bea97f3c5f498 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "serde", "smallvec", @@ -3497,7 +3497,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "serde", @@ -7537,7 +7537,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-trait", @@ -7569,7 +7569,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "cargo-lock", @@ -7581,7 +7581,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "bytes", @@ -7596,7 +7596,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "dotenvs", @@ -7610,7 +7610,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7627,7 +7627,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "auto-hash-map", @@ -7658,7 +7658,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "base16", "hex", @@ -7670,7 +7670,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7684,7 +7684,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "proc-macro2", "quote", @@ -7694,7 +7694,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "mimalloc", ] @@ -7702,7 +7702,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "auto-hash-map", @@ -7727,7 +7727,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-recursion", @@ -7759,7 +7759,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "auto-hash-map", "mdxjs", @@ -7800,7 +7800,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7824,7 +7824,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "clap 4.4.2", @@ -7842,7 +7842,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-recursion", @@ -7872,7 +7872,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-trait", @@ -7899,7 +7899,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7923,7 +7923,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-compression", @@ -7960,7 +7960,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-trait", @@ -7995,7 +7995,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "serde", "serde_json", @@ -8006,7 +8006,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-trait", @@ -8029,7 +8029,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indoc", @@ -8046,7 +8046,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8062,7 +8062,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "base64 0.21.4", @@ -8082,7 +8082,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "serde", @@ -8097,7 +8097,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "mdxjs", @@ -8112,7 +8112,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-stream", @@ -8147,7 +8147,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "serde", @@ -8163,7 +8163,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "swc_core", "turbo-tasks", @@ -8174,7 +8174,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "crossbeam-channel", @@ -8190,7 +8190,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 4abdbcc42a8db..eb511e273c6be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [ testing = { version = "0.35.14" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" } # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. -turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 17f1fb31a909d..a5ac3357b45af 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -194,7 +194,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.26.2", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e63c98d42fac5..a092636f7357d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1077,8 +1077,8 @@ importers: specifier: 0.26.2 version: 0.26.2 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -25649,9 +25649,9 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: