diff --git a/Cargo.lock b/Cargo.lock index 13fe4562c1..297c7aa133 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -412,7 +412,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "serde", ] @@ -1643,10 +1643,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] -name = "dotenvy" -version = "0.15.7" +name = "dotenvs" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +checksum = "88e3201db19ec4199af513d38c49fcbc5f8ca31d268f942e97324a826c9e9fdb" +dependencies = [ + "nom", +] [[package]] name = "dunce" @@ -3550,7 +3553,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "serde", @@ -7210,7 +7213,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "auto-hash-map", @@ -7241,7 +7244,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "cargo-lock", @@ -7253,7 +7256,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "bytes", @@ -7268,10 +7271,10 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", - "dotenvy", + "dotenvs", "indexmap", "serde", "turbo-tasks", @@ -7282,7 +7285,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "indexmap", @@ -7299,7 +7302,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "auto-hash-map", @@ -7329,7 +7332,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "base16", "hex", @@ -7341,7 +7344,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7355,7 +7358,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "proc-macro2", "quote", @@ -7365,7 +7368,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "mimalloc", ] @@ -7373,7 +7376,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "auto-hash-map", @@ -7396,7 +7399,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "auto-hash-map", @@ -7409,7 +7412,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "async-recursion", @@ -7439,7 +7442,7 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "chromiumoxide", @@ -7469,7 +7472,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "auto-hash-map", "mdxjs", @@ -7511,7 +7514,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "indexmap", @@ -7531,7 +7534,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "clap 4.1.11", @@ -7555,7 +7558,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "async-trait", @@ -7583,7 +7586,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "clap 4.1.11", @@ -7596,7 +7599,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "async-trait", @@ -7618,7 +7621,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "indexmap", @@ -7642,7 +7645,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "async-compression", @@ -7678,7 +7681,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "async-trait", @@ -7711,7 +7714,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "async-trait", @@ -7734,7 +7737,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "indoc", @@ -7751,7 +7754,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "indexmap", @@ -7767,7 +7770,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "base64 0.21.0", @@ -7787,7 +7790,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "serde", @@ -7802,7 +7805,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "mdxjs", @@ -7817,7 +7820,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "async-stream", @@ -7852,7 +7855,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "serde", @@ -7868,7 +7871,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "swc_core", "turbo-tasks", @@ -7879,7 +7882,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.3#c26e60b80a06deca2f648ab010cda14ed91dd2b6" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230704.5#c9868f7310dfd1edc57e0e3d975394e8f7086c39" dependencies = [ "anyhow", "once_cell", @@ -7898,7 +7901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if 1.0.0", - "rand 0.8.5", + "rand 0.4.6", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 0d34484d2a..0dca634e35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,11 +42,11 @@ swc_core = { version = "0.78.24" } testing = { version = "0.33.19" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230704.3" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230704.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-230704.3" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230704.5" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230704.3" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230704.5" } # 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 1b5bc93e1c..c0ebed3e8e 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-230704.3", - "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230704.3", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.5", + "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230704.5", "anser": "^2.1.1", "css.escape": "^1.5.1", "next": "*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8aac8b9f68..25c95936bb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -992,8 +992,8 @@ importers: '@types/react': 18.2.7 '@types/react-dom': 18.2.4 '@vercel/ncc': ^0.36.0 - '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.3 - '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230704.3 + '@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.5 + '@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230704.5 anser: ^2.1.1 css.escape: ^1.5.1 find-up: ^6.3.0 @@ -1005,8 +1005,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-230704.3_react-refresh@0.12.0' - '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230704.3' + '@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.5_react-refresh@0.12.0' + '@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230704.5' anser: 2.1.1 css.escape: 1.5.1 next: link:../../../../next @@ -25573,9 +25573,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-230704.3_react-refresh@0.12.0': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.3} - id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.3' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.5_react-refresh@0.12.0': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.5} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230704.5' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: @@ -25586,8 +25586,8 @@ packages: - webpack dev: false - '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230704.3': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230704.3} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230704.5': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230704.5} name: '@vercel/turbopack-node' version: 0.0.0 dependencies: