diff --git a/Cargo.lock b/Cargo.lock index a347ed99d7024..d6dc73b5dccac 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-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "serde", "smallvec", @@ -3217,7 +3217,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "serde", @@ -7159,7 +7159,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-trait", @@ -7191,7 +7191,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "cargo-lock", @@ -7203,7 +7203,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "bytes", @@ -7218,7 +7218,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "dotenvs", @@ -7232,7 +7232,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7249,7 +7249,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "auto-hash-map", @@ -7281,7 +7281,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "base16", "hex", @@ -7293,7 +7293,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7307,7 +7307,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "proc-macro2", "quote", @@ -7317,7 +7317,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "mimalloc", ] @@ -7325,7 +7325,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "auto-hash-map", @@ -7350,7 +7350,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-recursion", @@ -7383,7 +7383,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "auto-hash-map", "mdxjs", @@ -7423,7 +7423,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7449,7 +7449,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "clap", @@ -7468,7 +7468,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-recursion", @@ -7499,7 +7499,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-trait", @@ -7527,7 +7527,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-compression", @@ -7564,7 +7564,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-trait", @@ -7602,7 +7602,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "serde", "serde_json", @@ -7613,7 +7613,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-trait", @@ -7638,7 +7638,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "indoc", @@ -7655,7 +7655,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7671,7 +7671,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "base64 0.21.4", @@ -7691,7 +7691,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "serde", @@ -7706,7 +7706,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "mdxjs", @@ -7721,7 +7721,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-stream", @@ -7759,7 +7759,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7783,7 +7783,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "async-recursion", @@ -7805,7 +7805,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "serde", @@ -7821,7 +7821,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "swc_core", "turbo-tasks", @@ -7832,7 +7832,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "crossbeam-channel", @@ -7848,7 +7848,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.4#77bdb61a9371f3db9a2b9180aa6cf6676dfebaa5" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240312.5#70c36cbcce9db8870ebbf3faa20cc12fad6b6284" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 6e14f65b8bdfb..085bbb6b72fad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.90.17", features = [ testing = { version = "0.35.20" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240312.4" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240312.5" } # [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-240312.4" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240312.5" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240312.4" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240312.5" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 46d37c910c3b7..6be09a3c7cccc 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -192,7 +192,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.26.4", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.4", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.5", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 45e463fedba25..0c2cbfe245455 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1071,8 +1071,8 @@ importers: specifier: 0.26.4 version: 0.26.4 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.4 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.4' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.5 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.5' acorn: specifier: 8.5.0 version: 8.5.0 @@ -2154,6 +2154,7 @@ packages: /@babel/plugin-proposal-dynamic-import@7.16.7(@babel/core@7.22.5): resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-dynamic-import instead. peerDependencies: '@babel/core': 7.22.5 dependencies: @@ -2165,6 +2166,7 @@ packages: /@babel/plugin-proposal-export-namespace-from@7.16.7(@babel/core@7.22.5): resolution: {integrity: sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead. peerDependencies: '@babel/core': 7.22.5 dependencies: @@ -2188,6 +2190,7 @@ packages: /@babel/plugin-proposal-logical-assignment-operators@7.16.7(@babel/core@7.22.5): resolution: {integrity: sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-logical-assignment-operators instead. peerDependencies: '@babel/core': 7.22.5 dependencies: @@ -2210,6 +2213,7 @@ packages: /@babel/plugin-proposal-numeric-separator@7.16.7(@babel/core@7.22.5): resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead. peerDependencies: '@babel/core': 7.22.5 dependencies: @@ -2260,6 +2264,7 @@ packages: /@babel/plugin-proposal-private-methods@7.16.11(@babel/core@7.22.5): resolution: {integrity: sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead. peerDependencies: '@babel/core': 7.22.5 dependencies: @@ -25489,8 +25494,8 @@ 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-240312.4': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.4} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.5': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240312.5} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: