From c3d907303a32b46792311ddb460569faf1b525f2 Mon Sep 17 00:00:00 2001 From: Redfire Date: Wed, 18 Oct 2023 22:13:22 +0800 Subject: [PATCH] Updated Dependencies --- Cargo.lock | 326 +++++++++++++++++-------------------- Cargo.toml | 4 +- cli/Cargo.toml | 2 +- ion-proc/Cargo.toml | 4 +- ion/Cargo.toml | 4 +- modules/Cargo.toml | 2 +- runtime/Cargo.toml | 27 +-- runtime/src/cache/cache.rs | 3 +- runtime/src/typescript.rs | 25 ++- 9 files changed, 183 insertions(+), 214 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c976d14..5fefe505 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,9 +29,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cd65a4b849ace0b7f6daeebcc1a1d111282227ca745458c61dbf670e52a597" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -67,15 +67,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0238ca56c96dfa37bdf7c373c8886dd591322500aceeeccdb2216fe06dc2f796" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -115,7 +115,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -186,7 +186,7 @@ version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -197,7 +197,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.37", + "syn 2.0.38", "which", ] @@ -209,9 +209,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -236,9 +236,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -326,7 +326,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -451,9 +451,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -559,7 +562,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -570,25 +573,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "error-code" version = "2.3.1" @@ -634,7 +626,7 @@ dependencies = [ "pmutil", "proc-macro2", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -693,7 +685,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -888,16 +880,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -955,7 +947,7 @@ dependencies = [ name = "ion" version = "0.1.0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bytemuck", "byteorder", "chrono", @@ -981,7 +973,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -994,7 +986,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1046,9 +1038,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libffi" @@ -1093,15 +1085,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1115,9 +1107,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "minimal-lexical" @@ -1164,7 +1156,7 @@ dependencies = [ [[package]] name = "mozjs" version = "0.14.1" -source = "git+https://github.com/servo/mozjs#2fa4b2bd309f6246a8abfbae074b9903c4b18778" +source = "git+https://github.com/servo/mozjs#ec63ca39efb346c414e0f55ef26e63c0b17ee69a" dependencies = [ "bindgen", "cc", @@ -1178,7 +1170,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.68.2" -source = "git+https://github.com/servo/mozjs#2fa4b2bd309f6246a8abfbae074b9903c4b18778" +source = "git+https://github.com/servo/mozjs#ec63ca39efb346c414e0f55ef26e63c0b17ee69a" dependencies = [ "bindgen", "cc", @@ -1249,9 +1241,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1287,15 +1279,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" -dependencies = [ - "memchr", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -1308,13 +1291,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -1407,9 +1390,15 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1429,7 +1418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1464,9 +1453,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1540,9 +1529,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -1560,9 +1549,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -1572,9 +1561,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1583,9 +1572,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ring" @@ -1623,13 +1612,10 @@ dependencies = [ "indexmap 2.0.2", "ion", "mozjs", - "os_str_bytes", "paste", "sha3", "sourcemap", - "swc_common", "swc_core", - "swc_ecmascript", "term-table", "tokio", "url", @@ -1658,11 +1644,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -1713,7 +1699,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "clipboard-win", "fd-lock", @@ -1738,7 +1724,7 @@ checksum = "5a32af5427251d2e4be14fc151eabe18abb4a7aad5efee7044da9f096c906a43" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1747,6 +1733,12 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[package]] +name = "ryu-js" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" + [[package]] name = "same-file" version = "1.0.6" @@ -1795,22 +1787,22 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1992,7 +1984,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2003,9 +1995,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "swc_atoms" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f54563d7dcba626d4acfe14ed12def7ecc28e004debe3ecd2c3ee07cc47e449" +checksum = "ebf7a12229f0c0efb654a6a0f8cbfd94fbd320a57c764857a82d8abe9342b450" dependencies = [ "once_cell", "rustc-hash", @@ -2017,9 +2009,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.31.22" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d00f960c667c59c133f30492f4d07f26242fcf988a066d3871e6d3d838d528" +checksum = "490e199e25d2aa3fbef675524fa81408651f4e7178b51110470ddd1b3e3bbe75" dependencies = [ "ast_node", "atty", @@ -2066,26 +2058,33 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "swc_core" -version = "0.79.71" +version = "0.86.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cc00b001e77b2c9019cbd5034fddbb627bb23010864a0e57d4943efa70644b" +checksum = "7ae267e38de50fd933e8353139c84773097e1ae002c3470660a6cd62a5ab3077" dependencies = [ + "swc_atoms", "swc_common", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_typescript", + "swc_ecma_visit", "vergen", ] [[package]] name = "swc_ecma_ast" -version = "0.107.8" +version = "0.110.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6528f3dd33e11eae9d7fe9fee4a79d5bbd211c74426ab2eec64dc82bd2eb74d" +checksum = "5cbbf9918976a7e7fbdb4f76fe659d08e291a8b56b524b424183fc67d1189679" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "is-macro", "num-bigint", "scoped-tls", @@ -2097,9 +2096,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.142.18" +version = "0.146.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933643517578f6c383fead24be0ba707c8548d43a9f80c46cc6972c5d7a0ab3a" +checksum = "fa38b8961c26a4c35d9386e143d2037697bc2b2c816bef4505546ca441c2b32e" dependencies = [ "memchr", "num-bigint", @@ -2124,14 +2123,14 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "swc_ecma_parser" -version = "0.137.16" +version = "0.141.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f95601ae9654b664a44154bd5186af106df8e7de2dfecad211b29dc90b84185" +checksum = "97025b945d6d0b80089225de57a031bee01b3754a148eb5469b2d13a3b1dda48" dependencies = [ "either", "num-bigint", @@ -2147,29 +2146,14 @@ dependencies = [ "typed-arena", ] -[[package]] -name = "swc_ecma_transforms" -version = "0.221.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498af08c18e13caec88608751d90b18634c4f2098a98e1e510b0beec6728c379" -dependencies = [ - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_transforms_base", - "swc_ecma_transforms_typescript", - "swc_ecma_utils", - "swc_ecma_visit", -] - [[package]] name = "swc_ecma_transforms_base" -version = "0.130.25" +version = "0.134.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42198e3909a6d852ebd88897267ee89323a8ebdbdb436ec60f48079f7c188018" +checksum = "eb62881d11242b097e10815834a44063ce7d1308290f9c00a2a5c6ab70404984" dependencies = [ "better_scoped_tls", - "bitflags 2.4.0", + "bitflags 2.4.1", "indexmap 1.9.3", "once_cell", "phf", @@ -2195,14 +2179,14 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "swc_ecma_transforms_react" -version = "0.176.38" +version = "0.180.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "541af7444d05aeb25552b9a894a553b57152442990947ac6d5635a337977bbfa" +checksum = "e2009bb4d5c37f02d618df6369ddcdfc61cdf2ea2994c233cf020b8383d459e2" dependencies = [ "base64 0.13.1", "dashmap", @@ -2224,10 +2208,11 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.180.36" +version = "0.185.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f5517491b43112f1560e1acd9fbf28ababc0e551ea395f05efaeee7dff1ece" +checksum = "1deb992844c0d195c4cdde9d69c012269d5fc69206173fc42e028dba2c8e280b" dependencies = [ + "ryu-js", "serde", "swc_atoms", "swc_common", @@ -2240,9 +2225,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.120.20" +version = "0.124.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058e23023eab86b548b0488b84a4d490f8d2f5e1de6483d82e352218fd59ae31" +checksum = "ca44c8eb2841389493b6b532fc80c635b73a9f3f0e936edec4783abc7fa8e979" dependencies = [ "indexmap 1.9.3", "num_cpus", @@ -2258,9 +2243,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.93.8" +version = "0.96.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9abcc6c3255eea772716872d9c958abfe97b1f4658c7a9d1d9dc55eb7e6da254" +checksum = "47081acd84cdb2d49d6340ed3204e17738b444da10a3e1dd1eb3d7c8e4d47091" dependencies = [ "num-bigint", "swc_atoms", @@ -2270,19 +2255,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "swc_ecmascript" -version = "0.231.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e2e793cfce986a64d24aa03ff369d96831859aea774c8136fee4d27807a8226" -dependencies = [ - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_parser", - "swc_ecma_transforms", - "swc_ecma_visit", -] - [[package]] name = "swc_eq_ignore_macros" version = "0.1.2" @@ -2292,7 +2264,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2304,7 +2276,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2328,7 +2300,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2344,9 +2316,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2375,32 +2347,33 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "time" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2438,9 +2411,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "libc", @@ -2459,7 +2432,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2491,11 +2464,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2503,20 +2475,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -2622,9 +2594,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" [[package]] name = "vcpkg" @@ -2699,7 +2671,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -2721,7 +2693,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2795,10 +2767,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] diff --git a/Cargo.toml b/Cargo.toml index 20076175..41ff6c71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,5 +33,5 @@ default-features = false features = ["http1", "logging", "tls12", "webpki-tokio"] [workspace.dependencies.tokio] -version = "1.32.0" -features = ["rt"] +version = "1.33.0" +default-features = false diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f80467f4..deb81bc5 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -26,7 +26,7 @@ features = ["fetch", "promise-logger"] [dependencies.tokio] workspace = true -features = ["macros"] +features = ["macros", "rt"] [features] debugmozjs = ["ion/debugmozjs"] diff --git a/ion-proc/Cargo.toml b/ion-proc/Cargo.toml index 7066b7ee..b7fa4c06 100644 --- a/ion-proc/Cargo.toml +++ b/ion-proc/Cargo.toml @@ -10,10 +10,10 @@ convert_case = "0.6.0" either = "1.9.0" quote = "1.0.33" prettyplease = "0.2.15" -proc-macro2 = "1.0.67" +proc-macro2 = "1.0.69" [dependencies.syn] -version = "2.0.37" +version = "2.0.38" features = ["extra-traits", "full", "visit-mut"] [lib] diff --git a/ion/Cargo.toml b/ion/Cargo.toml index 5807063e..74321b2b 100644 --- a/ion/Cargo.toml +++ b/ion/Cargo.toml @@ -6,8 +6,8 @@ authors = ["Redfire "] license = "MPL-2.0" [dependencies] -bitflags = "2.4.0" -byteorder = "1.4.3" +bitflags = "2.4.1" +byteorder = "1.5.0" bytemuck = "1.14.0" libffi = "3.2.0" typed-arena = "2.0.2" diff --git a/modules/Cargo.toml b/modules/Cargo.toml index 15fa2dcc..8cae6d00 100644 --- a/modules/Cargo.toml +++ b/modules/Cargo.toml @@ -35,7 +35,7 @@ version = "0.1.14" features = ["fs"] [dev-dependencies.tokio] -version = "1.32.0" +version = "1.33.0" features = ["macros", "rt"] [features] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index a49fe93a..4da05393 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -12,7 +12,6 @@ dirs = "5.0.1" encoding_rs = "0.8.33" form_urlencoded = "1.2.0" indexmap = "2.0.2" -os_str_bytes = "6.5.1" paste = "1.0.14" sha3 = "0.10.8" term-table = "1.3.2" @@ -47,20 +46,22 @@ path = "../ion" features = ["macros", "sourcemap"] [dependencies.swc_core] -version = "0.79.69" -features = ["common"] - -[dependencies.swc_common] -version = "0.31.21" -features = ["sourcemap", "tty-emitter"] - -[dependencies.swc_ecmascript] -version = "0.231.59" -features = ["codegen", "parser", "transforms", "typescript", "visit"] +version = "0.86.4" +features = [ + "common", + "common_sourcemap", + "common_tty", + "ecma_ast", + "ecma_codegen", + "ecma_parser", + "ecma_transforms", + "ecma_parser_typescript", + "ecma_transforms_typescript", + "ecma_visit", +] [dependencies.tokio] -version = "1.32.0" -default-features = false +workspace = true features = ["sync"] [features] diff --git a/runtime/src/cache/cache.rs b/runtime/src/cache/cache.rs index 76bbb404..cd6184a3 100644 --- a/runtime/src/cache/cache.rs +++ b/runtime/src/cache/cache.rs @@ -14,7 +14,6 @@ use std::str::{from_utf8, Utf8Error}; use base64_url::encode; use dirs::home_dir; use dunce::canonicalize; -use os_str_bytes::OsStrBytes; use sha3::{Digest, Sha3_512}; use sourcemap::SourceMap; @@ -52,7 +51,7 @@ impl Cache { let folder = canonical.parent().ok_or(Error::Other)?; let folder_name = folder.file_name().and_then(OsStr::to_str).ok_or(Error::Other)?; - let hash = hash(folder.to_raw_bytes(), Some(16)); + let hash = hash(folder.as_os_str().to_str().unwrap().as_bytes(), Some(16)); let folder = self.dir.join(format!("{}-{}", folder_name, hash)); Ok(folder) } diff --git a/runtime/src/typescript.rs b/runtime/src/typescript.rs index ba8b36d5..03e313c2 100644 --- a/runtime/src/typescript.rs +++ b/runtime/src/typescript.rs @@ -15,14 +15,16 @@ use swc_core::common::comments::{Comments, SingleThreadedComments}; use swc_core::common::errors::{ColorConfig, Handler}; use swc_core::common::input::StringInput; use swc_core::common::sync::Lrc; -use swc_ecmascript::ast::EsVersion; -use swc_ecmascript::codegen::{Config as CodegenConfig, Emitter}; -use swc_ecmascript::codegen::text_writer::JsWriter; -use swc_ecmascript::parser::{Capturing, Parser, Syntax}; -use swc_ecmascript::parser::lexer::Lexer; -use swc_ecmascript::transforms::{fixer, hygiene, resolver}; -use swc_ecmascript::transforms::typescript::strip; -use swc_ecmascript::visit::FoldWith; +use swc_core::ecma::ast::EsVersion; +use swc_core::ecma::codegen::{Config as CodegenConfig, Emitter}; +use swc_core::ecma::codegen::text_writer::JsWriter; +use swc_core::ecma::parser::{Capturing, Parser, Syntax}; +use swc_core::ecma::parser::lexer::Lexer; +use swc_core::ecma::transforms::base::fixer::fixer; +use swc_core::ecma::transforms::base::hygiene::hygiene; +use swc_core::ecma::transforms::base::resolver; +use swc_core::ecma::transforms::typescript::strip; +use swc_core::ecma::visit::FoldWith; use crate::config::Config; @@ -115,12 +117,7 @@ fn initialise_emitter<'a>( source_map: Lrc, comments: &'a dyn Comments, buffer: &'a mut Vec, mappings: &'a mut Vec<(BytePos, LineCol)>, ) -> Emitter<'a, JsWriter<'a, &'a mut Vec>, SwcSourceMap> { Emitter { - cfg: CodegenConfig { - target: EsVersion::Es2022, - ascii_only: false, - minify: false, - omit_last_semi: false, - }, + cfg: CodegenConfig::default().with_target(EsVersion::Es2022), cm: source_map.clone(), comments: Some(comments), wr: JsWriter::new(source_map, "\n", buffer, Some(mappings)),