Skip to content

Commit

Permalink
Rename Turbopack/tasks crates to common prefixes (#49446)
Browse files Browse the repository at this point in the history
See vercel/turbo#4866

This also updates Turbopack to turbopack-230511.2 with the following
changes:

* vercel/turbo#4636 <!-- Alex Kirszenberg - Add
support for logging events and intervals in the macOS profiler -->
* vercel/turbo#4793 <!-- OJ Kwon - ci(workflow):
enable more test -->
* vercel/turbo#4886 <!-- OJ Kwon -
refactor(ecmascript-plugins): update serverdirective signature -->
* vercel/turbo#4866 <!-- Alex Kirszenberg -
Rename Turbopack/tasks crates to common prefixes -->
  • Loading branch information
alexkirsz committed May 11, 2023
1 parent 02d020c commit 34f551d
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 119 deletions.
175 changes: 88 additions & 87 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ swc_core = { version = "0.75.41" }
testing = { version = "0.33.4" }

# Turbo crates
turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230510.1" }
turbo-binding = { package = "turbopack-binding", git = "https://github.com/vercel/turbo.git", tag = "turbopack-230511.2" }
# [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-230510.1" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230511.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230510.1" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230511.2" }

# General Deps

Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/crates/napi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ turbo-binding = { workspace = true, features = [

[target.'cfg(not(all(target_os = "linux", target_env = "musl", target_arch = "aarch64")))'.dependencies]
turbo-binding = { workspace = true, features = [
"__turbo_malloc"
"__turbo_tasks_malloc"
] }

# There are few build targets we can't use native-tls which default features rely on,
Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/crates/next-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ autobenches = false
[features]
native-tls = ["next-core/native-tls"]
rustls-tls = ["next-core/rustls-tls"]
custom_allocator = ["turbo-binding/__turbo_malloc", "turbo-binding/__turbo_malloc_custom_allocator"]
custom_allocator = ["turbo-binding/__turbo_tasks_malloc", "turbo-binding/__turbo_tasks_malloc_custom_allocator"]

[dependencies]
anyhow = "1.0.47"
Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/next-core/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"check": "tsc --noEmit"
},
"dependencies": {
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230504.3",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230504.3",
"@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230511.2",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230511.2",
"anser": "^2.1.1",
"css.escape": "^1.5.1",
"next": "*",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/crates/next-dev-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tokio = { workspace = true, features = ["full"] }
# sync with chromiumoxide's tungstenite requirement.
tungstenite = { workspace = true }
turbo-binding = { workspace = true, features = [
"__turbo_malloc",
"__turbo_tasks_malloc",
"__turbo_tasks_memory",
"__turbo_tasks",
"__turbo_tasks_fs",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/crates/next-dev/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tokio_console = [
"turbo-tasks/tokio_tracing",
]
profile = []
custom_allocator = ["turbo-binding/__turbo_malloc", "turbo-binding/__turbo_malloc_custom_allocator"]
custom_allocator = ["turbo-binding/__turbo_tasks_malloc", "turbo-binding/__turbo_tasks_malloc_custom_allocator"]
native-tls = ["next-core/native-tls"]
rustls-tls = ["next-core/rustls-tls"]
# Internal only. Enabled when building for the Next.js integration test suite.
Expand Down
33 changes: 10 additions & 23 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 34f551d

Please sign in to comment.