diff --git a/Cargo.lock b/Cargo.lock index 76dfcfc7aa0aa..9dda99d6d64e9 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-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "serde", "smallvec", @@ -1144,7 +1144,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.10.1", + "phf 0.11.2", "serde", "smallvec", ] @@ -3085,7 +3085,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "serde", @@ -3555,9 +3555,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", "phf_shared 0.10.0", - "proc-macro-hack", ] [[package]] @@ -3566,7 +3564,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.2", + "phf_macros", "phf_shared 0.11.2", ] @@ -3600,20 +3598,6 @@ dependencies = [ "rand", ] -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "phf_macros" version = "0.11.2" @@ -3808,12 +3792,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" version = "1.0.79" @@ -6934,7 +6912,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "async-trait", @@ -6965,7 +6943,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "cargo-lock", @@ -6977,7 +6955,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "bytes", @@ -6991,7 +6969,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "dotenvs", @@ -7005,7 +6983,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "lazy_static", @@ -7021,7 +6999,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "auto-hash-map", @@ -7053,7 +7031,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "base16", "hex", @@ -7065,7 +7043,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "proc-macro-error", @@ -7078,7 +7056,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "proc-macro2", "quote", @@ -7088,7 +7066,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "mimalloc", ] @@ -7096,7 +7074,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "auto-hash-map", @@ -7121,7 +7099,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "async-recursion", @@ -7151,7 +7129,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "auto-hash-map", "mdxjs", @@ -7191,7 +7169,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7214,7 +7192,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "clap", @@ -7231,7 +7209,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "async-recursion", @@ -7260,7 +7238,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7287,7 +7265,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "async-compression", @@ -7323,7 +7301,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "async-trait", @@ -7358,7 +7336,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "serde", "serde_json", @@ -7369,7 +7347,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "async-trait", @@ -7393,7 +7371,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "indoc", @@ -7409,7 +7387,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7425,7 +7403,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "base64 0.21.4", @@ -7444,7 +7422,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "serde", @@ -7459,7 +7437,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "mdxjs", @@ -7474,7 +7452,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "async-stream", @@ -7508,7 +7486,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7528,7 +7506,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7546,7 +7524,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "serde", @@ -7562,7 +7540,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "swc_core", "turbo-tasks", @@ -7573,7 +7551,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "crossbeam-channel", @@ -7589,7 +7567,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?branch=hrmny/import-attribute-annotations#61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 570e48db36200..d192cbcee2799 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.90.33", features = [ testing = { version = "0.35.22" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240423.1" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "hrmny/import-attribute-annotations" } # last tag: "turbopack-240423.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-240423.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "hrmny/import-attribute-annotations" } # last tag: "turbopack-240423.1" # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240423.1" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "hrmny/import-attribute-annotations" } # last tag: "turbopack-240423.1" # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 086c06621f698..54a117bec3167 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -200,7 +200,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-240423.1", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 21ef0077e9147..492c89e508c8b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1072,8 +1072,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-240423.1 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240423.1' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad' acorn: specifier: 8.5.0 version: 8.5.0 @@ -25773,8 +25773,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-240423.1': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240423.1} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?61f64d2a7cb0c1c10f2e7614d6b58204cd1c3dad} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: