diff --git a/Cargo.lock b/Cargo.lock index e59f34e4c8cb1..a50728a0a1a9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -394,7 +394,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "serde", ] @@ -3425,7 +3425,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "serde", @@ -7035,7 +7035,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "auto-hash-map", @@ -7066,7 +7066,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "cargo-lock", @@ -7078,7 +7078,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "bytes", @@ -7093,7 +7093,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "dotenvy", @@ -7107,7 +7107,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "indexmap", @@ -7124,7 +7124,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "auto-hash-map", @@ -7154,7 +7154,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "base16", "hex", @@ -7166,7 +7166,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7180,7 +7180,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "proc-macro2", "quote", @@ -7190,7 +7190,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "mimalloc", ] @@ -7198,7 +7198,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "auto-hash-map", @@ -7221,7 +7221,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "auto-hash-map", @@ -7233,7 +7233,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "async-recursion", @@ -7263,7 +7263,7 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "chromiumoxide", @@ -7293,7 +7293,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "auto-hash-map", "mdxjs", @@ -7334,7 +7334,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "clap 4.1.11", @@ -7358,7 +7358,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "async-trait", @@ -7386,7 +7386,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "clap 4.1.11", @@ -7399,7 +7399,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "async-trait", @@ -7421,7 +7421,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "indexmap", @@ -7445,7 +7445,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "async-compression", @@ -7480,7 +7480,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "async-trait", @@ -7513,13 +7513,14 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "async-trait", "indexmap", "modularize_imports", "serde", + "serde_json", "styled_components", "styled_jsx", "swc_core", @@ -7528,13 +7529,14 @@ dependencies = [ "turbo-tasks", "turbo-tasks-build", "turbo-tasks-fs", + "turbopack-core", "turbopack-ecmascript", ] [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "indoc", @@ -7551,7 +7553,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "indexmap", @@ -7567,7 +7569,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "base64 0.21.0", @@ -7587,7 +7589,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "serde", @@ -7602,7 +7604,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "mdxjs", @@ -7617,7 +7619,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "async-stream", @@ -7652,7 +7654,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "serde", @@ -7668,7 +7670,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "swc_core", "turbo-tasks", @@ -7679,7 +7681,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230526.5#e1f7c46fff2ee6deaa191e00ace412781c328023" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230530.1#ebd2988c245d2c3a7bc5ed4e44c75d5d6aff304b" dependencies = [ "anyhow", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index ef0ba3aae8636..dbd1d7668e81b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,11 +42,11 @@ swc_core = { version = "0.76.37" } testing = { version = "0.33.13" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230526.5" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230530.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-230526.5" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230530.1" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230526.5" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230530.1" } # General Deps diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json index 3ceb2486bf929..be521f1f973d2 100644 --- a/packages/next-swc/crates/next-core/js/package.json +++ b/packages/next-swc/crates/next-core/js/package.json @@ -10,8 +10,8 @@ "check": "tsc --noEmit" }, "dependencies": { - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230526.5", - "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230526.5", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230530.1", + "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230530.1", "anser": "^2.1.1", "css.escape": "^1.5.1", "next": "*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0990133383b01..7b88b09324936 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1012,8 +1012,8 @@ importers: '@types/react': 18.2.5 '@types/react-dom': 18.2.3 '@vercel/ncc': ^0.36.0 - '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230526.5 - '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230526.5 + '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230530.1 + '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230530.1 anser: ^2.1.1 css.escape: ^1.5.1 find-up: ^6.3.0 @@ -1025,8 +1025,8 @@ importers: stacktrace-parser: ^0.1.10 strip-ansi: ^7.0.1 dependencies: - '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230526.5_react-refresh@0.12.0' - '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230526.5' + '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230530.1_react-refresh@0.12.0' + '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230530.1' anser: 2.1.1 css.escape: 1.5.1 next: link:../../../../next @@ -25503,9 +25503,9 @@ packages: /zwitch/2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230526.5_react-refresh@0.12.0': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230526.5} - id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230526.5' + '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230530.1_react-refresh@0.12.0': + resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230530.1} + id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230530.1' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: @@ -25516,8 +25516,8 @@ packages: - webpack dev: false - '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230526.5': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230526.5} + '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230530.1': + resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230530.1} name: '@vercel/turbopack-node' version: 0.0.0 dependencies: