Unverified Commit ed539c5d authored by Alex Kirszenberg's avatar Alex Kirszenberg Committed by GitHub

Update Turbopack to turbopack-230321.1 (#47342)

Updates Turbopack to latest nightly and fix build errors.

# New features

* https://github.com/vercel/turbo/pull/4198

# Bug Fixes

* https://github.com/vercel/turbo/pull/4241

# Misc.

* https://github.com/vercel/turbo/pull/4249

---------
Co-authored-by: 's avatarkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
parent 509ed00f
This diff is collapsed.
...@@ -46,36 +46,36 @@ swc_emotion = { version = "0.29.10" } ...@@ -46,36 +46,36 @@ swc_emotion = { version = "0.29.10" }
testing = { version = "0.31.31" } testing = { version = "0.31.31" }
# Turbo crates # Turbo crates
auto-hash-map = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } auto-hash-map = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
node-file-trace = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } node-file-trace = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2", default-features = false } turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1", default-features = false }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2", default-features = false } turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1", default-features = false }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbo-updater = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbo-updater = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-core = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-core = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-css = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-css = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-static = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-static = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
turbopack-tests = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } turbopack-tests = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" }
# General Deps # General Deps
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_tasks::Value; use turbo_tasks::{primitives::OptionStringVc, Value};
use turbo_tasks_fs::FileSystemPathVc; use turbo_tasks_fs::FileSystemPathVc;
use turbopack::{ use turbopack::{
self, self,
...@@ -69,7 +69,11 @@ impl Transition for NextLayoutEntryTransition { ...@@ -69,7 +69,11 @@ impl Transition for NextLayoutEntryTransition {
EcmascriptInputTransform::TypeScript { EcmascriptInputTransform::TypeScript {
use_define_for_class_fields: false, use_define_for_class_fields: false,
}, },
EcmascriptInputTransform::React { refresh: false }, EcmascriptInputTransform::React {
refresh: false,
import_source: OptionStringVc::cell(None),
runtime: OptionStringVc::cell(None),
},
]), ]),
context.compile_time_info(), context.compile_time_info(),
InnerAssetsVc::cell(indexmap! { InnerAssetsVc::cell(indexmap! {
......
...@@ -6,7 +6,7 @@ use std::{ ...@@ -6,7 +6,7 @@ use std::{
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use indexmap::indexmap; use indexmap::indexmap;
use turbo_tasks::{TryJoinIterExt, Value, ValueToString}; use turbo_tasks::{primitives::OptionStringVc, TryJoinIterExt, Value, ValueToString};
use turbo_tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc}; use turbo_tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc};
use turbo_tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc}; use turbo_tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc};
use turbopack::{ use turbopack::{
...@@ -658,7 +658,11 @@ import BOOTSTRAP from {}; ...@@ -658,7 +658,11 @@ import BOOTSTRAP from {};
context, context,
Value::new(EcmascriptModuleAssetType::Typescript), Value::new(EcmascriptModuleAssetType::Typescript),
EcmascriptInputTransformsVc::cell(vec![ EcmascriptInputTransformsVc::cell(vec![
EcmascriptInputTransform::React { refresh: false }, EcmascriptInputTransform::React {
refresh: false,
import_source: OptionStringVc::cell(None),
runtime: OptionStringVc::cell(None),
},
EcmascriptInputTransform::TypeScript { EcmascriptInputTransform::TypeScript {
use_define_for_class_fields: false, use_define_for_class_fields: false,
}, },
......
...@@ -8,7 +8,7 @@ use turbo_tasks_fs::{FileSystem, FileSystemPathVc}; ...@@ -8,7 +8,7 @@ use turbo_tasks_fs::{FileSystem, FileSystemPathVc};
use turbopack::{ use turbopack::{
module_options::{ module_options::{
module_options_context::{ModuleOptionsContext, ModuleOptionsContextVc}, module_options_context::{ModuleOptionsContext, ModuleOptionsContextVc},
PostCssTransformOptions, WebpackLoadersOptions, JsxTransformOptions, PostCssTransformOptions, WebpackLoadersOptions,
}, },
resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc}, resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
transition::TransitionsByNameVc, transition::TransitionsByNameVc,
...@@ -156,7 +156,13 @@ pub async fn get_client_module_options_context( ...@@ -156,7 +156,13 @@ pub async fn get_client_module_options_context(
// We don't need to resolve React Refresh for each module. Instead, // We don't need to resolve React Refresh for each module. Instead,
// we try resolve it once at the root and pass down a context to all // we try resolve it once at the root and pass down a context to all
// the modules. // the modules.
enable_jsx: true, enable_jsx: Some(
JsxTransformOptions {
import_source: None,
runtime: None,
}
.cell(),
),
enable_emotion: true, enable_emotion: true,
enable_react_refresh, enable_react_refresh,
enable_styled_components: true, enable_styled_components: true,
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_tasks::Value; use turbo_tasks::{primitives::OptionStringVc, Value};
use turbo_tasks_fs::FileSystemPathVc; use turbo_tasks_fs::FileSystemPathVc;
use turbopack::{ use turbopack::{
ecmascript::chunk_group_files_asset::ChunkGroupFilesAsset, ecmascript::chunk_group_files_asset::ChunkGroupFilesAsset,
...@@ -83,7 +83,11 @@ impl Transition for NextClientTransition { ...@@ -83,7 +83,11 @@ impl Transition for NextClientTransition {
EcmascriptInputTransform::TypeScript { EcmascriptInputTransform::TypeScript {
use_define_for_class_fields: false, use_define_for_class_fields: false,
}, },
EcmascriptInputTransform::React { refresh: false }, EcmascriptInputTransform::React {
refresh: false,
import_source: OptionStringVc::cell(None),
runtime: OptionStringVc::cell(None),
},
]), ]),
context.compile_time_info(), context.compile_time_info(),
InnerAssetsVc::cell(indexmap! { InnerAssetsVc::cell(indexmap! {
......
use anyhow::Result; use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use turbo_tasks::Value; use turbo_tasks::{primitives::OptionStringVc, Value};
use turbopack::{ use turbopack::{
transition::{Transition, TransitionVc}, transition::{Transition, TransitionVc},
ModuleAssetContextVc, ModuleAssetContextVc,
...@@ -57,7 +57,11 @@ impl Transition for NextServerToClientTransition { ...@@ -57,7 +57,11 @@ impl Transition for NextServerToClientTransition {
EcmascriptInputTransform::TypeScript { EcmascriptInputTransform::TypeScript {
use_define_for_class_fields: false, use_define_for_class_fields: false,
}, },
EcmascriptInputTransform::React { refresh: false }, EcmascriptInputTransform::React {
refresh: false,
import_source: OptionStringVc::cell(None),
runtime: OptionStringVc::cell(None),
},
]), ]),
context.compile_time_info(), context.compile_time_info(),
InnerAssetsVc::cell(indexmap! { InnerAssetsVc::cell(indexmap! {
......
...@@ -4,8 +4,8 @@ use turbo_tasks_env::ProcessEnvVc; ...@@ -4,8 +4,8 @@ use turbo_tasks_env::ProcessEnvVc;
use turbo_tasks_fs::FileSystemPathVc; use turbo_tasks_fs::FileSystemPathVc;
use turbopack::{ use turbopack::{
module_options::{ module_options::{
ModuleOptionsContext, ModuleOptionsContextVc, PostCssTransformOptions, JsxTransformOptions, JsxTransformOptionsVc, ModuleOptionsContext, ModuleOptionsContextVc,
WebpackLoadersOptions, PostCssTransformOptions, WebpackLoadersOptions,
}, },
resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc}, resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc},
}; };
...@@ -238,7 +238,7 @@ pub async fn get_server_module_options_context( ...@@ -238,7 +238,7 @@ pub async fn get_server_module_options_context(
..Default::default() ..Default::default()
}; };
ModuleOptionsContext { ModuleOptionsContext {
enable_jsx: true, enable_jsx: Some(get_jsx_transform_options()),
enable_styled_jsx: true, enable_styled_jsx: true,
enable_postcss_transform, enable_postcss_transform,
enable_webpack_loaders, enable_webpack_loaders,
...@@ -257,7 +257,7 @@ pub async fn get_server_module_options_context( ...@@ -257,7 +257,7 @@ pub async fn get_server_module_options_context(
..Default::default() ..Default::default()
}; };
ModuleOptionsContext { ModuleOptionsContext {
enable_jsx: true, enable_jsx: Some(get_jsx_transform_options()),
enable_styled_jsx: true, enable_styled_jsx: true,
enable_postcss_transform, enable_postcss_transform,
enable_webpack_loaders, enable_webpack_loaders,
...@@ -279,7 +279,7 @@ pub async fn get_server_module_options_context( ...@@ -279,7 +279,7 @@ pub async fn get_server_module_options_context(
..Default::default() ..Default::default()
}; };
ModuleOptionsContext { ModuleOptionsContext {
enable_jsx: true, enable_jsx: Some(get_jsx_transform_options()),
enable_postcss_transform, enable_postcss_transform,
enable_webpack_loaders, enable_webpack_loaders,
enable_typescript_transform: Some(tsconfig), enable_typescript_transform: Some(tsconfig),
...@@ -314,7 +314,7 @@ pub async fn get_server_module_options_context( ...@@ -314,7 +314,7 @@ pub async fn get_server_module_options_context(
..Default::default() ..Default::default()
}; };
ModuleOptionsContext { ModuleOptionsContext {
enable_jsx: true, enable_jsx: Some(get_jsx_transform_options()),
enable_styled_jsx: true, enable_styled_jsx: true,
enable_postcss_transform, enable_postcss_transform,
enable_webpack_loaders, enable_webpack_loaders,
...@@ -333,6 +333,15 @@ pub async fn get_server_module_options_context( ...@@ -333,6 +333,15 @@ pub async fn get_server_module_options_context(
Ok(module_options_context) Ok(module_options_context)
} }
#[turbo_tasks::function]
pub fn get_jsx_transform_options() -> JsxTransformOptionsVc {
JsxTransformOptions {
import_source: None,
runtime: None,
}
.cell()
}
#[turbo_tasks::function] #[turbo_tasks::function]
pub fn get_build_module_options_context() -> ModuleOptionsContextVc { pub fn get_build_module_options_context() -> ModuleOptionsContextVc {
ModuleOptionsContext { ModuleOptionsContext {
......
...@@ -2,7 +2,7 @@ use anyhow::Result; ...@@ -2,7 +2,7 @@ use anyhow::Result;
use indexmap::indexmap; use indexmap::indexmap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{ use turbo_tasks::{
primitives::{StringVc, StringsVc}, primitives::{OptionStringVc, StringVc, StringsVc},
trace::TraceRawVcs, trace::TraceRawVcs,
Value, Value,
}; };
...@@ -721,7 +721,11 @@ impl SsrEntryVc { ...@@ -721,7 +721,11 @@ impl SsrEntryVc {
EcmascriptInputTransform::TypeScript { EcmascriptInputTransform::TypeScript {
use_define_for_class_fields: false, use_define_for_class_fields: false,
}, },
EcmascriptInputTransform::React { refresh: false }, EcmascriptInputTransform::React {
refresh: false,
import_source: OptionStringVc::cell(None),
runtime: OptionStringVc::cell(None),
},
]), ]),
this.context.compile_time_info(), this.context.compile_time_info(),
InnerAssetsVc::cell(inner_assets), InnerAssetsVc::cell(inner_assets),
......
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