From f87a2e90447ea094e2987384c3cf3faadd535347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 10 Jun 2024 18:45:07 +0900 Subject: [PATCH 1/5] Update swc_core --- Cargo.toml | 2 +- packages/next-swc/crates/next-custom-transforms/Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 16ffbc9d43e30..71ff6cc11c2a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ next-core = { path = "packages/next-swc/crates/next-core" } next-custom-transforms = { path = "packages/next-swc/crates/next-custom-transforms" } # SWC crates -swc_core = { version = "0.92.5", features = [ +swc_core = { version = "0.93.1", features = [ "ecma_loader_lru", "ecma_loader_parking_lot", ] } diff --git a/packages/next-swc/crates/next-custom-transforms/Cargo.toml b/packages/next-swc/crates/next-custom-transforms/Cargo.toml index 58dd112cf5674..6a90108b47fc6 100644 --- a/packages/next-swc/crates/next-custom-transforms/Cargo.toml +++ b/packages/next-swc/crates/next-custom-transforms/Cargo.toml @@ -38,8 +38,8 @@ turbopack-binding = { workspace = true, features = [ ] } # To allow quote! macro works swc_core = { workspace = true, features = ["ecma_quote"] } -react_remove_properties = "0.24.12" -remove_console = "0.25.12" +react_remove_properties = "0.24.13" +remove_console = "0.25.13" preset_env_base = "0.4.12" [dev-dependencies] From 6ff0d3395301f94ea86a9a04fe42786d364eed53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 10 Jun 2024 18:45:12 +0900 Subject: [PATCH 2/5] cargo lockfile --- Cargo.lock | 160 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 105 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 593060f5cc206..0ae17a109fad3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2721,7 +2721,7 @@ checksum = "e5860860bfc09972a5d99bfb866dde39485fe397210f8a9ccf68a6c6740d687b" dependencies = [ "markdown", "serde", - "swc_core", + "swc_core 0.92.11", ] [[package]] @@ -2853,9 +2853,9 @@ dependencies = [ [[package]] name = "modularize_imports" -version = "0.68.14" +version = "0.68.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440dfda6d4b4cfa76c0b12b564c9b8d643b5c2bc8a63ed5dfc2a46cf1c68ac61" +checksum = "3d1ed4453f3dcc7ed01304aadd254f804a915e4725243e92822e18774593dea3" dependencies = [ "convert_case", "handlebars", @@ -3050,7 +3050,7 @@ dependencies = [ "serde", "serde_json", "sha1", - "swc_core", + "swc_core 0.93.1", "tracing", "turbopack-binding", "walkdir", @@ -4008,9 +4008,9 @@ dependencies = [ [[package]] name = "react_remove_properties" -version = "0.24.12" +version = "0.24.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb434309dc6f664c8f531b3965dd7f99b7f8a52d4171697bb9de6af83564265" +checksum = "78d9f9011dc19b1e02182954b3ab270f779444d27a5d173f9e51e39667d74ab4" dependencies = [ "serde", "swc_atoms", @@ -4125,9 +4125,9 @@ checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" [[package]] name = "remove_console" -version = "0.25.12" +version = "0.25.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f807e0b5d9565a8558139ad4f1ec9703dd8cfa15607e347f3f66c4b7a0327" +checksum = "07e328828feeecd4c01acc7abb541510f3adbd2250bf1a8ebae0b1e37d4f467d" dependencies = [ "serde", "swc_atoms", @@ -5000,9 +5000,9 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "styled_components" -version = "0.96.15" +version = "0.96.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e14a22b6bf299ed8c2072e719c27324be5060a39b2bd70e62ad2a9505fe71" +checksum = "b661b68dbffeb5e9186523957c3586f609c99df3ee36fa6da0e12377101f54a1" dependencies = [ "Inflector", "once_cell", @@ -5018,9 +5018,9 @@ dependencies = [ [[package]] name = "styled_jsx" -version = "0.73.21" +version = "0.73.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e38b2334f6613c9e811cc776bc9d2329c288f4dc125df68615fe6cf19b48ae" +checksum = "598108b5402971bd12dd8936ad1b3165b44505d34e5dd7ec4afa413190453a34" dependencies = [ "anyhow", "lightningcss", @@ -5036,7 +5036,7 @@ dependencies = [ "swc_css_prefixer", "swc_css_visit", "swc_ecma_ast", - "swc_ecma_minifier", + "swc_ecma_minifier 0.195.0", "swc_ecma_parser", "swc_ecma_utils", "swc_ecma_visit", @@ -5111,7 +5111,7 @@ dependencies = [ "swc_ecma_ext_transforms", "swc_ecma_lints", "swc_ecma_loader", - "swc_ecma_minifier", + "swc_ecma_minifier 0.194.9", "swc_ecma_parser", "swc_ecma_preset_env", "swc_ecma_transforms", @@ -5243,7 +5243,7 @@ dependencies = [ "swc_config", "swc_ecma_ast", "swc_ecma_codegen", - "swc_ecma_minifier", + "swc_ecma_minifier 0.194.9", "swc_ecma_parser", "swc_ecma_visit", "swc_timer", @@ -5251,9 +5251,9 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be1a689e146be1eae53139482cb061dcf0fa01dff296bbe7b96fff92d8e2936" +checksum = "84b67e115ab136fe0eb03558bb0508ca7782eeb446a96d165508c48617e3fd94" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -5278,9 +5278,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.92.5" +version = "0.92.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e317f6f8b15019358d1e48631c0e6d098d9a3d00d666ea99650201661abea855" +checksum = "1ff4628e2d0664da05c1b75ca88e3ba1904ffe6cdab7e9b49bab23609be9b466" dependencies = [ "binding_macros", "swc", @@ -5298,7 +5298,7 @@ dependencies = [ "swc_ecma_codegen", "swc_ecma_lints", "swc_ecma_loader", - "swc_ecma_minifier", + "swc_ecma_minifier 0.194.9", "swc_ecma_parser", "swc_ecma_preset_env", "swc_ecma_quote_macros", @@ -5318,6 +5318,22 @@ dependencies = [ "vergen 8.2.6", ] +[[package]] +name = "swc_core" +version = "0.93.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1a5ce192efac37d7b28eabd4713d656c90b9ccf452881413d81883f4b15e411" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_loader", + "swc_ecma_quote_macros", + "swc_ecma_transforms_base", + "swc_ecma_visit", + "vergen 8.2.6", +] + [[package]] name = "swc_css_ast" version = "0.140.23" @@ -5392,9 +5408,9 @@ dependencies = [ [[package]] name = "swc_css_modules" -version = "0.29.35" +version = "0.29.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a367c7ec6afd24bb3fcc2df95a2adf5d7462367d5b13afd8e43a7beba44358" +checksum = "b20af192df5adddac04293b5072cc00befa2d6818a9fc90ac6f5c2c49e82dd1c" dependencies = [ "rustc-hash", "serde", @@ -5466,9 +5482,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.113.4" +version = "0.113.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1690cc0c9ab60b44ac0225ba1e231ac532f7ba1d754df761c6ee607561afae" +checksum = "98a534a8360a076a030989f6d121ba6044345594bdf0457c4629f432742026b8" dependencies = [ "bitflags 2.5.0", "bytecheck", @@ -5486,9 +5502,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.149.1" +version = "0.149.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fef147127a2926ca26171c7afcbf028ff86dc543ced87d316713f25620a15b9" +checksum = "6ab6d5e7bbd9208f980b5dad2a4a6ae798c97569f809a48c3f92e6ae7e183c6c" dependencies = [ "memchr", "num-bigint", @@ -5547,9 +5563,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2015" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248532f9ae603be6bf4763f66f74ad0dfd82d6307be876ccf4c5d081826a1161" +checksum = "d5f902caf95f4475a8963a3f7c0d645c1d7fcd81464cfb8165b78d5aeb0bcff2" dependencies = [ "arrayvec", "indexmap 2.2.6", @@ -5711,9 +5727,9 @@ dependencies = [ [[package]] name = "swc_ecma_ext_transforms" -version = "0.114.1" +version = "0.114.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "259b7b69630aafde63c6304eeacb93fd54619cbdb199c978549acc76cd512d76" +checksum = "91b55ddf8b600f07d0086a9a782d55aa048d3c1ac5eabaa27733d9f45d960e52" dependencies = [ "phf 0.11.2", "swc_atoms", @@ -5767,9 +5783,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.194.4" +version = "0.194.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dbee669d44953537b6dcaad4a07aa00034fb9eabe4974b5b60acdd1fa9ce209" +checksum = "de97742f8d94e7ba458d3d5b5e7d5a7a0349ba7c67819564eb3ab83031307ea6" dependencies = [ "arrayvec", "indexmap 2.2.6", @@ -5799,11 +5815,44 @@ dependencies = [ "tracing", ] +[[package]] +name = "swc_ecma_minifier" +version = "0.195.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "574ca302d18880ff3809d83797a51eb96a8f4cef7c948286a59cd1937e0226d0" +dependencies = [ + "arrayvec", + "indexmap 2.2.6", + "num-bigint", + "num_cpus", + "once_cell", + "parking_lot", + "radix_fmt", + "regex", + "rustc-hash", + "ryu-js", + "serde", + "serde_json", + "swc_atoms", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_optimization", + "swc_ecma_usage_analyzer", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_timer", + "tracing", +] + [[package]] name = "swc_ecma_parser" -version = "0.144.1" +version = "0.144.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0499e69683ae5d67a20ff0279b94bc90f29df7922a46331b54d5dd367bf89570" +checksum = "31adf4599e8de70f3b754dfc34ec2ab09fa6841d79a9f4a888250a404eae7030" dependencies = [ "either", "new_debug_unreachable", @@ -5898,9 +5947,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.138.2" +version = "0.138.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddb95c2bdad1c9c29edf35712e1e0f9b9ddc1cdb5ba2d582fd93468cb075a03" +checksum = "f7b76d09313cdd8f99bc1519fb04f8a93427c7a6f4bfbc64b39fcc5a378ab1b7" dependencies = [ "better_scoped_tls", "bitflags 2.5.0", @@ -6012,9 +6061,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.199.1" +version = "0.199.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ea30b3df748236c619409f222f0ba68ebeebc08dfff109d2195664a15689f9" +checksum = "25982d69c91cd64cbfae714d9e953810b3f2835486d08108967cbd15016e7720" dependencies = [ "dashmap", "indexmap 2.2.6", @@ -6125,9 +6174,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.24.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a693898bd44782a234d9a4122d52b93accf447282d08c2364eb739ae864154" +checksum = "6d7d7109b3794756cc51e842dbb874d2da44293b06a9e3837b477300b0ccef8e" dependencies = [ "indexmap 2.2.6", "rustc-hash", @@ -6142,15 +6191,16 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.128.1" +version = "0.128.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5242670bc74e0a0b64b9d4912b37be36944517ce0881314162aeb4381272c3" +checksum = "02f470d8cc31adf6189b228636201ee3cdd268c0b5a2d0407f83093dfa96ff91" dependencies = [ "indexmap 2.2.6", "num_cpus", "once_cell", "rayon", "rustc-hash", + "ryu-js", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6176,9 +6226,9 @@ dependencies = [ [[package]] name = "swc_emotion" -version = "0.72.13" +version = "0.72.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b454c1b99da4da9aab3731ab34d7582d2eab96e47670d0c62711053886ef7e2" +checksum = "038b284022103a111078a012760423d6e88ba48fabe1a9fcb9229e661e6300c3" dependencies = [ "base64 0.22.1", "byteorder", @@ -6310,9 +6360,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.107.1" +version = "0.107.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73640537e0967a88a537c853de4a41ba6cdf77bfff1999f7c6c449e5bc550eed" +checksum = "0cc31ec32964d3ebaebfd5a2466a2aaa909aa00722d677f89994b2b6c27d105c" dependencies = [ "anyhow", "enumset", @@ -6335,9 +6385,9 @@ dependencies = [ [[package]] name = "swc_relay" -version = "0.44.14" +version = "0.44.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a596e01319abf55b8a8c7e36a82aa0d1ac01a18a99ce9b07a7fbcbfd544466" +checksum = "89b9cc7f85e3bd8fdd8a81a96d34e1a589c2b4deb7b5a08cd59918f612b1b3c0" dependencies = [ "once_cell", "regex", @@ -7179,7 +7229,7 @@ dependencies = [ "node-file-trace", "styled_components", "styled_jsx", - "swc_core", + "swc_core 0.92.11", "swc_emotion", "swc_relay", "testing", @@ -7269,7 +7319,7 @@ dependencies = [ "serde", "serde_json", "sourcemap", - "swc_core", + "swc_core 0.92.11", "tracing", "turbo-tasks", "turbo-tasks-build", @@ -7293,7 +7343,7 @@ dependencies = [ "regex", "serde", "smallvec", - "swc_core", + "swc_core 0.92.11", "tracing", "turbo-tasks", "turbo-tasks-build", @@ -7362,7 +7412,7 @@ dependencies = [ "serde", "serde_json", "sourcemap", - "swc_core", + "swc_core 0.92.11", "tokio", "tracing", "turbo-tasks", @@ -7401,7 +7451,7 @@ dependencies = [ "serde_json", "styled_components", "styled_jsx", - "swc_core", + "swc_core 0.92.11", "swc_emotion", "swc_relay", "tracing", @@ -7586,7 +7636,7 @@ name = "turbopack-swc-utils" version = "0.1.0" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" dependencies = [ - "swc_core", + "swc_core 0.92.11", "turbo-tasks", "turbo-tasks-build", "turbopack-core", @@ -8105,7 +8155,7 @@ dependencies = [ "next-custom-transforms", "serde-wasm-bindgen", "serde_json", - "swc_core", + "swc_core 0.93.1", "tracing", "turbopack-binding", "wasm-bindgen", From 37133d83e86539f4d313ad8898c3dd22082782fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Tue, 11 Jun 2024 15:24:59 +0900 Subject: [PATCH 3/5] Update swc_core --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 71ff6cc11c2a9..40fb9e4dccd0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ next-core = { path = "packages/next-swc/crates/next-core" } next-custom-transforms = { path = "packages/next-swc/crates/next-custom-transforms" } # SWC crates -swc_core = { version = "0.93.1", features = [ +swc_core = { version = "0.93.2", features = [ "ecma_loader_lru", "ecma_loader_parking_lot", ] } From 3f269806d38163f753f371c73555f28f8ba074ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Tue, 11 Jun 2024 15:26:09 +0900 Subject: [PATCH 4/5] link next.js --- Cargo.lock | 191 +++++++++++++++---------------------- Cargo.toml | 6 +- packages/next/package.json | 2 +- pnpm-lock.yaml | 8 +- 4 files changed, 87 insertions(+), 120 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ae17a109fad3..74310ab1a9329 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-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "serde", "smallvec", @@ -446,9 +446,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.66.0" +version = "0.67.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3f426fc63b42e1c6e6e0974d3fa3fe08513c5b441d80fd24d0c0a54b661dfa" +checksum = "4cb67bba3eb7ac48982404ebec9fabdb26b8263fcabe23b99d8c0e6f5b97cc81" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2715,13 +2715,13 @@ dependencies = [ [[package]] name = "mdxjs" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5860860bfc09972a5d99bfb866dde39485fe397210f8a9ccf68a6c6740d687b" +checksum = "08b14a30b8511133accf39b86da3d07ebbead12aa98a220accf43a99300d9620" dependencies = [ "markdown", "serde", - "swc_core 0.92.11", + "swc_core", ] [[package]] @@ -3050,7 +3050,7 @@ dependencies = [ "serde", "serde_json", "sha1", - "swc_core 0.93.1", + "swc_core", "tracing", "turbopack-binding", "walkdir", @@ -3092,7 +3092,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "serde", @@ -5036,7 +5036,7 @@ dependencies = [ "swc_css_prefixer", "swc_css_visit", "swc_ecma_ast", - "swc_ecma_minifier 0.195.0", + "swc_ecma_minifier", "swc_ecma_parser", "swc_ecma_utils", "swc_ecma_visit", @@ -5080,9 +5080,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.275.1" +version = "0.276.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac38cd938ce20693b58b26a5d1926a46074db09cf90a251d83cf17cdaea6031" +checksum = "0fecebc2d47ba1e6a0b125ea6e55d111014c78ea5bbf519f9b378dfd54f19020" dependencies = [ "anyhow", "base64 0.21.4", @@ -5111,7 +5111,7 @@ dependencies = [ "swc_ecma_ext_transforms", "swc_ecma_lints", "swc_ecma_loader", - "swc_ecma_minifier 0.194.9", + "swc_ecma_minifier", "swc_ecma_parser", "swc_ecma_preset_env", "swc_ecma_transforms", @@ -5125,6 +5125,7 @@ dependencies = [ "swc_plugin_proxy", "swc_plugin_runner", "swc_timer", + "swc_transform_common", "swc_visit", "tokio", "tracing", @@ -5147,9 +5148,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.227.0" +version = "0.228.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a212bd08b1121c7204a04407ea055779fc00cf80024fc666dd97b00749cf87" +checksum = "43e4698d94115ea10fe3c6fdde2d1e736c6ba6601abab0a61d95e1015d13359f" dependencies = [ "anyhow", "crc", @@ -5226,9 +5227,9 @@ dependencies = [ [[package]] name = "swc_compiler_base" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754058388d4f51df61f9aced73dfca96d81fed1c0a46583dc7b3da07688af80d" +checksum = "fdff81d2ae11503b2cb34b37cd481c3400d19c7c05445dd5daad5cd29692ee69" dependencies = [ "anyhow", "base64 0.21.4", @@ -5236,14 +5237,16 @@ dependencies = [ "napi-derive", "once_cell", "pathdiff", + "rustc-hash", "serde", + "serde_json", "sourcemap", "swc_atoms", "swc_common", "swc_config", "swc_ecma_ast", "swc_ecma_codegen", - "swc_ecma_minifier 0.194.9", + "swc_ecma_minifier", "swc_ecma_parser", "swc_ecma_visit", "swc_timer", @@ -5278,9 +5281,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.92.11" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4628e2d0664da05c1b75ca88e3ba1904ffe6cdab7e9b49bab23609be9b466" +checksum = "57f2da78bdc49a5bd2edc80213f2b95300b11a15068e18ab9a9dd943a8660d59" dependencies = [ "binding_macros", "swc", @@ -5298,7 +5301,7 @@ dependencies = [ "swc_ecma_codegen", "swc_ecma_lints", "swc_ecma_loader", - "swc_ecma_minifier 0.194.9", + "swc_ecma_minifier", "swc_ecma_parser", "swc_ecma_preset_env", "swc_ecma_quote_macros", @@ -5318,22 +5321,6 @@ dependencies = [ "vergen 8.2.6", ] -[[package]] -name = "swc_core" -version = "0.93.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a5ce192efac37d7b28eabd4713d656c90b9ccf452881413d81883f4b15e411" -dependencies = [ - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_loader", - "swc_ecma_quote_macros", - "swc_ecma_transforms_base", - "swc_ecma_visit", - "vergen 8.2.6", -] - [[package]] name = "swc_css_ast" version = "0.140.23" @@ -5781,40 +5768,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "swc_ecma_minifier" -version = "0.194.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de97742f8d94e7ba458d3d5b5e7d5a7a0349ba7c67819564eb3ab83031307ea6" -dependencies = [ - "arrayvec", - "indexmap 2.2.6", - "num-bigint", - "num_cpus", - "once_cell", - "parking_lot", - "radix_fmt", - "rayon", - "regex", - "rustc-hash", - "ryu-js", - "serde", - "serde_json", - "swc_atoms", - "swc_common", - "swc_config", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_optimization", - "swc_ecma_usage_analyzer", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_timer", - "tracing", -] - [[package]] name = "swc_ecma_minifier" version = "0.195.0" @@ -5828,6 +5781,7 @@ dependencies = [ "once_cell", "parking_lot", "radix_fmt", + "rayon", "regex", "rustc-hash", "ryu-js", @@ -6421,6 +6375,19 @@ dependencies = [ "syn 2.0.58", ] +[[package]] +name = "swc_transform_common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda3e80e1ad638d3575bc07745a914af13dcb02215098659f864731078271f2c" +dependencies = [ + "better_scoped_tls", + "once_cell", + "rustc-hash", + "serde", + "serde_json", +] + [[package]] name = "swc_visit" version = "0.5.14" @@ -6997,12 +6964,12 @@ dependencies = [ [[package]] name = "turbo-prehash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "async-trait", @@ -7034,7 +7001,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "cargo-lock", @@ -7046,7 +7013,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "bytes", @@ -7060,7 +7027,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "dotenvs", @@ -7074,7 +7041,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "lazy_static", @@ -7090,7 +7057,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "auto-hash-map", @@ -7122,7 +7089,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "md4", "turbo-tasks-macros", @@ -7132,7 +7099,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "proc-macro-error", @@ -7146,7 +7113,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "proc-macro2", "quote", @@ -7156,7 +7123,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "mimalloc", ] @@ -7164,7 +7131,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "auto-hash-map", @@ -7191,7 +7158,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "async-recursion", @@ -7221,7 +7188,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "auto-hash-map", "mdxjs", @@ -7229,7 +7196,7 @@ dependencies = [ "node-file-trace", "styled_components", "styled_jsx", - "swc_core 0.92.11", + "swc_core", "swc_emotion", "swc_relay", "testing", @@ -7262,7 +7229,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7285,7 +7252,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "clap", @@ -7302,7 +7269,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "async-recursion", @@ -7319,7 +7286,7 @@ dependencies = [ "serde", "serde_json", "sourcemap", - "swc_core 0.92.11", + "swc_core", "tracing", "turbo-tasks", "turbo-tasks-build", @@ -7331,7 +7298,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7343,7 +7310,7 @@ dependencies = [ "regex", "serde", "smallvec", - "swc_core 0.92.11", + "swc_core", "tracing", "turbo-tasks", "turbo-tasks-build", @@ -7358,7 +7325,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "async-compression", @@ -7394,7 +7361,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "async-trait", @@ -7412,7 +7379,7 @@ dependencies = [ "serde", "serde_json", "sourcemap", - "swc_core 0.92.11", + "swc_core", "tokio", "tracing", "turbo-tasks", @@ -7429,7 +7396,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "serde", "serde_json", @@ -7440,7 +7407,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "async-trait", @@ -7451,7 +7418,7 @@ dependencies = [ "serde_json", "styled_components", "styled_jsx", - "swc_core 0.92.11", + "swc_core", "swc_emotion", "swc_relay", "tracing", @@ -7465,7 +7432,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "indoc", @@ -7481,7 +7448,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7497,7 +7464,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "base64 0.21.4", @@ -7516,7 +7483,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "serde", @@ -7531,7 +7498,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "mdxjs", @@ -7546,7 +7513,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "async-stream", @@ -7580,7 +7547,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7600,7 +7567,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7618,7 +7585,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "serde", @@ -7634,9 +7601,9 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ - "swc_core 0.92.11", + "swc_core", "turbo-tasks", "turbo-tasks-build", "turbopack-core", @@ -7645,7 +7612,7 @@ dependencies = [ [[package]] name = "turbopack-trace-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "either", @@ -7665,7 +7632,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "crossbeam-channel", @@ -7681,7 +7648,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240610.2#efcea7608461e2c90943cbea54ef638c7e7a25d6" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8155,7 +8122,7 @@ dependencies = [ "next-custom-transforms", "serde-wasm-bindgen", "serde_json", - "swc_core 0.93.1", + "swc_core", "tracing", "turbopack-binding", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 40fb9e4dccd0b..48ba163b6f29b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.93.2", features = [ testing = { version = "0.35.25" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240610.2" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/swc-core-0-93" } # last tag: "turbopack-240610.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-240610.2" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/swc-core-0-93" } # last tag: "turbopack-240610.2" # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240610.2" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/swc-core-0-93" } # last tag: "turbopack-240610.2" # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 6bcdf71ce10e1..2e2b37467b8f9 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -206,7 +206,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.27.1", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240610.2", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b", "acorn": "8.11.3", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 88142bd78392c..ecbf02e8455a9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1090,8 +1090,8 @@ importers: specifier: 0.27.1 version: 0.27.1 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240610.2 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240610.2' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b' acorn: specifier: 8.11.3 version: 8.11.3 @@ -25890,8 +25890,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-240610.2': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240610.2} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: From d47e677e9c39d6c0ff468bae21f83bc4eadca295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Tue, 11 Jun 2024 20:46:14 +0900 Subject: [PATCH 5/5] link next.js --- Cargo.lock | 74 +++++++++++++++++++------------------- Cargo.toml | 6 ++-- packages/next/package.json | 2 +- pnpm-lock.yaml | 8 ++--- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74310ab1a9329..040f6ae61158f 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?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "serde", "smallvec", @@ -3092,7 +3092,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "serde", @@ -6964,12 +6964,12 @@ dependencies = [ [[package]] name = "turbo-prehash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "async-trait", @@ -7001,7 +7001,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "cargo-lock", @@ -7013,7 +7013,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "bytes", @@ -7027,7 +7027,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "dotenvs", @@ -7041,7 +7041,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "lazy_static", @@ -7057,7 +7057,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "auto-hash-map", @@ -7089,7 +7089,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "md4", "turbo-tasks-macros", @@ -7099,7 +7099,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "proc-macro-error", @@ -7113,7 +7113,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "proc-macro2", "quote", @@ -7123,7 +7123,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "mimalloc", ] @@ -7131,7 +7131,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "auto-hash-map", @@ -7158,7 +7158,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "async-recursion", @@ -7188,7 +7188,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "auto-hash-map", "mdxjs", @@ -7229,7 +7229,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7252,7 +7252,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "clap", @@ -7269,7 +7269,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "async-recursion", @@ -7298,7 +7298,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7325,7 +7325,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "async-compression", @@ -7361,7 +7361,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "async-trait", @@ -7396,7 +7396,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "serde", "serde_json", @@ -7407,7 +7407,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "async-trait", @@ -7432,7 +7432,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "indoc", @@ -7448,7 +7448,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7464,7 +7464,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "base64 0.21.4", @@ -7483,7 +7483,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "serde", @@ -7498,7 +7498,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "mdxjs", @@ -7513,7 +7513,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "async-stream", @@ -7547,7 +7547,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7567,7 +7567,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7585,7 +7585,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "serde", @@ -7601,7 +7601,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "swc_core", "turbo-tasks", @@ -7612,7 +7612,7 @@ dependencies = [ [[package]] name = "turbopack-trace-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "either", @@ -7632,7 +7632,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "crossbeam-channel", @@ -7648,7 +7648,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/swc-core-0-93#28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240611.2#b37b9c6ca913628cb2193b42ffc9feabaaba91f1" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 48ba163b6f29b..fcb447ed1449b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.93.2", features = [ testing = { version = "0.35.25" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/swc-core-0-93" } # last tag: "turbopack-240610.2" +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240611.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", branch = "kdy1/swc-core-0-93" } # last tag: "turbopack-240610.2" +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240611.2" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/swc-core-0-93" } # last tag: "turbopack-240610.2" +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240611.2" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 2e2b37467b8f9..72ee3e8113909 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -206,7 +206,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.27.1", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240611.2", "acorn": "8.11.3", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ecbf02e8455a9..74da2147c52ee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1090,8 +1090,8 @@ importers: specifier: 0.27.1 version: 0.27.1 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240611.2 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240611.2' acorn: specifier: 8.11.3 version: 8.11.3 @@ -25890,8 +25890,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?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28bb4ff7fa663320e68bfd3f044ac9a5df75fa7b} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240611.2': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240611.2} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: