Unverified Commit e3843c97 authored by LongYinan's avatar LongYinan Committed by GitHub

Upgrade turbopack (#45861)

The `experimental.turbotrace.memoryLimit` is not actually working, we
need to use `turbo_malloc` as the global allocator to make it work.

~~Block by:~~
- https://github.com/swc-project/swc/pull/6940
- https://github.com/vercel/turbo/pull/3772

## This PR also upgrades `turbopack-230213.2` to `turbopack-230214.1`

- https://github.com/vercel/turbo/pull/3767
- https://github.com/vercel/turbo/pull/3772
- https://github.com/vercel/turbo/pull/3762
- https://github.com/vercel/turbo/pull/3741
- https://github.com/vercel/turbo/pull/3796
parent 776dca7a
This diff is collapsed.
[workspace] [workspace]
members = [ members = ["crates/core", "crates/napi", "crates/wasm"]
"crates/core",
"crates/napi",
"crates/wasm"
]
[profile.dev.package.swc_css_prefixer] [profile.dev.package.swc_css_prefixer]
opt-level = 2 opt-level = 2
......
...@@ -19,7 +19,7 @@ serde = "1" ...@@ -19,7 +19,7 @@ serde = "1"
serde_json = "1" serde_json = "1"
tracing = { version = "0.1.37", features = ["release_max_level_info"] } tracing = { version = "0.1.37", features = ["release_max_level_info"] }
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230213.2", features = [ next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2", features = [
"__swc_core", "__swc_core",
"__swc_core_next_core", "__swc_core_next_core",
"__swc_transform_styled_jsx", "__swc_transform_styled_jsx",
...@@ -29,7 +29,7 @@ next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-2 ...@@ -29,7 +29,7 @@ next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-2
] } ] }
[dev-dependencies] [dev-dependencies]
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230213.2", features = [ next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2", features = [
"__swc_core_testing_transform", "__swc_core_testing_transform",
"__swc_testing", "__swc_testing",
] } ] }
......
...@@ -39,9 +39,10 @@ tracing = { version = "0.1.37", features = ["release_max_level_info"] } ...@@ -39,9 +39,10 @@ tracing = { version = "0.1.37", features = ["release_max_level_info"] }
tracing-futures = "0.2.5" tracing-futures = "0.2.5"
tracing-subscriber = "0.3.9" tracing-subscriber = "0.3.9"
tracing-chrome = "0.5.0" tracing-chrome = "0.5.0"
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230213.2" } turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2" }
turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230213.2" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2" }
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230213.2", features = [ turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2" }
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2", features = [
"__swc_core_binding_napi", "__swc_core_binding_napi",
"__turbo_next_dev_server", "__turbo_next_dev_server",
"__turbo_node_file_trace", "__turbo_node_file_trace",
......
...@@ -31,8 +31,6 @@ DEALINGS IN THE SOFTWARE. ...@@ -31,8 +31,6 @@ DEALINGS IN THE SOFTWARE.
#[macro_use] #[macro_use]
extern crate napi_derive; extern crate napi_derive;
/// Explicit extern crate to use allocator.
extern crate next_binding;
use std::{env, panic::set_hook, sync::Arc}; use std::{env, panic::set_hook, sync::Arc};
...@@ -52,6 +50,12 @@ pub mod turbopack; ...@@ -52,6 +50,12 @@ pub mod turbopack;
pub mod turbotrace; pub mod turbotrace;
pub mod util; pub mod util;
// don't use turbo malloc (`mimalloc`) on linux-musl-aarch64 because of the
// compile error
#[cfg(not(all(target_os = "linux", target_env = "musl", target_arch = "aarch64")))]
#[global_allocator]
static ALLOC: turbo_malloc::TurboMalloc = turbo_malloc::TurboMalloc;
static COMPILER: Lazy<Arc<Compiler>> = Lazy::new(|| { static COMPILER: Lazy<Arc<Compiler>> = Lazy::new(|| {
let cm = Arc::new(SourceMap::new(FilePathMapping::empty())); let cm = Arc::new(SourceMap::new(FilePathMapping::empty()));
......
...@@ -6,15 +6,13 @@ use turbo_tasks::TurboTasks; ...@@ -6,15 +6,13 @@ use turbo_tasks::TurboTasks;
use turbo_tasks_memory::MemoryBackend; use turbo_tasks_memory::MemoryBackend;
#[napi] #[napi]
pub fn create_turbo_tasks(memory_limit: Option<u32>) -> External<Arc<TurboTasks<MemoryBackend>>> { pub fn create_turbo_tasks(memory_limit: Option<i64>) -> External<Arc<TurboTasks<MemoryBackend>>> {
let turbo_tasks = TurboTasks::new(MemoryBackend::new( let turbo_tasks = TurboTasks::new(MemoryBackend::new(
memory_limit.map(|m| m as usize).unwrap_or(usize::MAX), memory_limit.map(|m| m as usize).unwrap_or(usize::MAX),
)); ));
External::new_with_size_hint( External::new_with_size_hint(
turbo_tasks, turbo_tasks,
memory_limit memory_limit.map(|u| u as usize).unwrap_or(usize::MAX),
.map(|m| (m as usize) * 1024 * 1024)
.unwrap_or(usize::MAX),
) )
} }
......
...@@ -9,29 +9,29 @@ crate-type = ["cdylib"] ...@@ -9,29 +9,29 @@ crate-type = ["cdylib"]
[features] [features]
default = ["swc_v1"] default = ["swc_v1"]
swc_v1 = [] swc_v1 = []
plugin = [ plugin = ["getrandom/js", "next-binding/__swc_core_binding_wasm_plugin"]
"getrandom/js",
"next-binding/__swc_core_binding_wasm_plugin"
]
[dependencies] [dependencies]
anyhow = "1.0.66" anyhow = "1.0.66"
console_error_panic_hook = "0.1.6" console_error_panic_hook = "0.1.6"
next-swc = {version = "0.0.0", path = "../core"} next-swc = { version = "0.0.0", path = "../core" }
once_cell = "1.13.0" once_cell = "1.13.0"
parking_lot_core = "=0.8.0" parking_lot_core = "=0.8.0"
path-clean = "0.1" path-clean = "0.1"
serde = {version = "1", features = ["derive"]} serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
tracing = { version = "0.1.37", features = ["release_max_level_off","max_level_off"] } tracing = { version = "0.1.37", features = [
wasm-bindgen = {version = "0.2", features = ["enable-interning"]} "release_max_level_off",
"max_level_off",
] }
wasm-bindgen = { version = "0.2", features = ["enable-interning"] }
wasm-bindgen-futures = "0.4.8" wasm-bindgen-futures = "0.4.8"
getrandom = { version = "0.2.5", optional = true, default-features = false } getrandom = { version = "0.2.5", optional = true, default-features = false }
js-sys = "0.3.59" js-sys = "0.3.59"
serde-wasm-bindgen = "0.4.3" serde-wasm-bindgen = "0.4.3"
next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230213.2", features = [ next-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230214.2", features = [
"__swc_core_binding_wasm", "__swc_core_binding_wasm",
"__feature_mdx_rs", "__feature_mdx_rs",
] } ] }
......
...@@ -952,8 +952,10 @@ export default async function build( ...@@ -952,8 +952,10 @@ export default async function build(
let turbotraceOutputPath: string | undefined let turbotraceOutputPath: string | undefined
let turbotraceFiles: string[] | undefined let turbotraceFiles: string[] | undefined
turboTasks = binding.turbo.createTurboTasks( turboTasks = binding.turbo.createTurboTasks(
config.experimental.turbotrace?.memoryLimit ?? (config.experimental.turbotrace?.memoryLimit ??
TURBO_TRACE_DEFAULT_MEMORY_LIMIT TURBO_TRACE_DEFAULT_MEMORY_LIMIT) *
1024 *
1024
) )
const { entriesTrace, chunksTrace } = turbotraceContext const { entriesTrace, chunksTrace } = turbotraceContext
......
...@@ -22,7 +22,6 @@ module.exports = { ...@@ -22,7 +22,6 @@ module.exports = {
experimental: { experimental: {
turbotrace: { turbotrace: {
contextDirectory: path.join(__dirname, '..', '..', '..', '..'), contextDirectory: path.join(__dirname, '..', '..', '..', '..'),
memoryLimit: 4096,
}, },
}, },
} }
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