From 9d82b759ab75f6f7db163492901ccc0cd638eb5c Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 8 Jan 2024 14:01:36 -0500 Subject: [PATCH] refactor: deno_graph 0.63 --- Cargo.lock | 243 ++++++++++++++++++++------------------------- Cargo.toml | 5 + rs-lib/Cargo.toml | 12 +-- rs-lib/src/emit.rs | 8 +- wasm/Cargo.toml | 6 +- 5 files changed, 126 insertions(+), 148 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 87822d7..3f547a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,15 +44,14 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "ast_node" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" +checksum = "c3e3e06ec6ac7d893a0db7127d91063ad7d9da8988f8a1a256f03729e6eec026" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -63,7 +62,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -101,9 +100,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" [[package]] name = "better_scoped_tls" @@ -203,7 +202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown", "lock_api", "once_cell", "parking_lot_core 0.9.9", @@ -233,9 +232,9 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.31.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b74b2504e2428e7ef9ca491359d5f98ab46406cc71d93d0008b7823d5d35a6d" +checksum = "1d87c67f73e749f78096f517cbb57967d98a8c713b39cf88b1f0b8750a84aa29" dependencies = [ "anyhow", "base64", @@ -304,9 +303,9 @@ dependencies = [ [[package]] name = "deno_graph" -version = "0.62.0" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0c15558cd72b534064bf7ae07e0fc99e0693915a4552f67558cc0b2b09c287" +checksum = "c9a7517284a929f0f2f4db8b241c840bccd4debd6635ea0bc7a906c0254a0231" dependencies = [ "anyhow", "async-trait", @@ -315,7 +314,7 @@ dependencies = [ "deno_semver", "futures", "import_map", - "indexmap 2.1.0", + "indexmap", "log", "monch", "once_cell", @@ -421,14 +420,13 @@ dependencies = [ [[package]] name = "from_variant" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" +checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" dependencies = [ - "pmutil", "proc-macro2", "swc_macros_common", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -487,7 +485,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -536,12 +534,6 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.2" @@ -585,28 +577,17 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "import_map" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ecd467768fe83c2860e70e5de5297a7366a230ff53e1da2158bdac2384cd39d" +checksum = "1624c269d2ca7427d79471c8ba799abe9215e706cc0182d7b86fc856a35d565b" dependencies = [ - "indexmap 1.9.3", + "indexmap", "log", "serde", "serde_json", "url", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - [[package]] name = "indexmap" version = "2.1.0" @@ -614,7 +595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown", "serde", ] @@ -637,7 +618,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -844,7 +825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap", ] [[package]] @@ -877,7 +858,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -909,7 +890,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -948,9 +929,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -966,9 +947,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1115,9 +1096,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] @@ -1135,22 +1116,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ - "indexmap 2.1.0", + "indexmap", "itoa", "ryu", "serde", @@ -1255,22 +1236,21 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "string_enum" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" +checksum = "1b650ea2087d32854a0f20b837fc56ec987a1cb4f758c9757e1171ee9812da63" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "swc_atoms" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a9e1b6d97f27b6abe5571f8fe3bdbd2fa987299fc2126450c7cde6214896ef" +checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" dependencies = [ "hstr", "once_cell", @@ -1280,13 +1260,13 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.222.49" +version = "0.223.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ce581c217c6e8f66cb2eb254119f24ae6d791777e107bf9dbcb1f8b6ba4b1c" +checksum = "e912d8387fc8592465c081b2e6b8df89443117ae4ca5160f21e08d47d7d58d7a" dependencies = [ "anyhow", "crc", - "indexmap 1.9.3", + "indexmap", "is-macro", "once_cell", "parking_lot 0.12.1", @@ -1310,9 +1290,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.9" +version = "0.33.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccb656cd57c93614e4e8b33a60e75ca095383565c1a8d2bbe6a1103942831e0" +checksum = "9b3ae36feceded27f0178dc9dabb49399830847ffb7f866af01798844de8f973" dependencies = [ "ast_node", "better_scoped_tls", @@ -1336,11 +1316,11 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba1c7a40d38f9dd4e9a046975d3faf95af42937b34b2b963be4d8f01239584b" +checksum = "112884e66b60e614c0f416138b91b8b82b7fea6ed0ecc5e26bad4726c57a6c99" dependencies = [ - "indexmap 1.9.3", + "indexmap", "serde", "serde_json", "swc_config_macro", @@ -1348,22 +1328,21 @@ dependencies = [ [[package]] name = "swc_config_macro" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" +checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "swc_ecma_ast" -version = "0.110.10" +version = "0.110.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d416121da2d56bcbd1b1623725a68890af4552fef0c6d1e4bfa92776ccd6a" +checksum = "79401a45da704f4fb2552c5bf86ee2198e8636b121cb81f8036848a300edd53b" dependencies = [ "bitflags 2.4.1", "is-macro", @@ -1379,9 +1358,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.146.28" +version = "0.146.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da19dcf147798f9a6ee7416fbd2c7ba4e01c64abea6c616cad80d7fe87d340b9" +checksum = "99b61ca275e3663238b71c4b5da8e6fb745bde9989ef37d94984dfc81fc6d009" dependencies = [ "memchr", "num-bigint", @@ -1398,22 +1377,21 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" +checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "swc_ecma_loader" -version = "0.45.10" +version = "0.45.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31cf7549feec3698d0110a0a71ae547f31ae272dc92db3285ce126d6dcbdadf3" +checksum = "c5713ab3429530c10bdf167170ebbde75b046c8003558459e4de5aaec62ce0f1" dependencies = [ "anyhow", "pathdiff", @@ -1424,9 +1402,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.141.23" +version = "0.141.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc89c175ed17c7f795fb18cf778a5745ecd794ad19c4662f85843d7571957a8" +checksum = "c4d17401dd95048a6a62b777d533c0999dabdd531ef9d667e22f8ae2a2a0d294" dependencies = [ "either", "new_debug_unreachable", @@ -1446,13 +1424,13 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.134.35" +version = "0.135.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8110b783faee399cbd749fb35b832551b2b60d034593f1fbadd7af85cb157c1" +checksum = "6d4ab26ec124b03e47f54d4daade8e9a9dcd66d3a4ca3cd47045f138d267a60e" dependencies = [ "better_scoped_tls", "bitflags 2.4.1", - "indexmap 1.9.3", + "indexmap", "once_cell", "phf", "rustc-hash", @@ -1469,9 +1447,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.123.36" +version = "0.124.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4306b79869fd25df1c65df13ebf98e5e900d2a83e684cab62ef987d45bd8d42d" +checksum = "9fe4376c024fa04394cafb8faecafb4623722b92dbbe46532258cc0a6b569d9c" dependencies = [ "swc_atoms", "swc_common", @@ -1483,25 +1461,24 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_macros" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8188eab297da773836ef5cf2af03ee5cca7a563e1be4b146f8141452c28cc690" +checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "swc_ecma_transforms_optimization" -version = "0.195.43" +version = "0.196.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44f47e640dd4a4890b32df34942ab6f5f00ac7d115e905b2a8346676daab126" +checksum = "eefef9f5a80afdbd4b517401dc053825d1ac0d95bb63f3ae92d2b335d8d7d4f8" dependencies = [ "dashmap", - "indexmap 1.9.3", + "indexmap", "once_cell", "petgraph", "rustc-hash", @@ -1520,9 +1497,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.168.43" +version = "0.169.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3bb948be983016a99c60ac4b431b5d10cf894f62002912cfb77b5132ada6ad2" +checksum = "86de99757fc31d8977f47c02a26e5c9a243cb63b03fe8aa8b36d79924b8fa29c" dependencies = [ "either", "rustc-hash", @@ -1540,13 +1517,13 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.180.44" +version = "0.181.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c10b0289fbe0157875594d036a31f2a2442a157f6152e3ffe97503ce88583d" +checksum = "9918e22caf1ea4a71085f5d818d6c0bf5c19d669cfb9d38f9fdc3da0496abdc7" dependencies = [ "base64", "dashmap", - "indexmap 1.9.3", + "indexmap", "once_cell", "serde", "sha-1", @@ -1564,9 +1541,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.185.41" +version = "0.186.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed7f54a1debdf2c1de10f4ea1bfaecbcbfa69142f8e67ec96de5111be6aaf8b" +checksum = "e1d1495c969ffdc224384f1fb73646b9c1b170779f20fdb984518deb054aa522" dependencies = [ "ryu-js", "serde", @@ -1581,11 +1558,11 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.124.29" +version = "0.125.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d9434862c93aadda0b539847a5fdb82624472deed788333b35caf281773931" +checksum = "7cead1083e46b0f072a82938f16d366014468f7510350957765bb4d013496890" dependencies = [ - "indexmap 1.9.3", + "indexmap", "num_cpus", "once_cell", "rustc-hash", @@ -1599,9 +1576,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.96.10" +version = "0.96.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba962f0becf83bab12a17365dface5a4f636c9e1743d479e292b96910a753743" +checksum = "a1d0100c383fb08b6f34911ab6f925950416a5d14404c1cd520d59fb8dfbb3bf" dependencies = [ "num-bigint", "swc_atoms", @@ -1613,23 +1590,22 @@ dependencies = [ [[package]] name = "swc_eq_ignore_macros" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" +checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ - "pmutil", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "swc_fast_graph" -version = "0.21.9" +version = "0.21.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8117f6d10bbcb30cb3e549d6fa7637cb6d7c713cb71b2ce1808105a6825c788d" +checksum = "8acfc056067a0fbfe26a4763c1eb246e813fdbe6b376415d07915e96e15481b6" dependencies = [ - "indexmap 1.9.3", + "indexmap", "petgraph", "rustc-hash", "swc_common", @@ -1637,9 +1613,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.22.11" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de8f0ac33ef7486723a3acdd9c4541dac79f0433bf878b9075826bca1163d83e" +checksum = "1c6e0110c0433c27221f03e45419b7e18d1db4d472db309088caa458ac2f304e" dependencies = [ "auto_impl", "petgraph", @@ -1650,21 +1626,20 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" +checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" dependencies = [ - "pmutil", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "swc_visit" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c337fbb2d191bf371173dea6a957f01899adb8f189c6c31b122a6cfc98fc3" +checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9" dependencies = [ "either", "swc_visit_macros", @@ -1672,16 +1647,16 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" +checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d" dependencies = [ "Inflector", "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1697,9 +1672,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -1732,7 +1707,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1777,7 +1752,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1799,7 +1774,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1907,7 +1882,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -1941,7 +1916,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index d84e742..b6be193 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,11 @@ members = [ "wasm" ] +[workspace.dependencies] +anyhow = "1.0.44" +base64 = "0.21.5" +url = { version = "2.3.1" } + [profile.release] codegen-units = 1 incremental = true diff --git a/rs-lib/Cargo.toml b/rs-lib/Cargo.toml index aa2338e..8f3b4dd 100644 --- a/rs-lib/Cargo.toml +++ b/rs-lib/Cargo.toml @@ -9,15 +9,15 @@ authors = ["the Deno authors"] license = "MIT" [dependencies] -anyhow = "1.0.44" -base64 = "0.13.0" -deno_ast = { version = "0.31.5", features = ["bundler", "codegen", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "visit", "transpiling"] } -deno_graph = "0.62.0" +anyhow = { workspace = true } +base64 = { workspace = true } +deno_ast = { version = "1.0.1", features = ["bundler", "codegen", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "visit", "transpiling"] } +deno_graph = { version = "0.63.0", default-features = true } escape8259 = "0.5.2" futures = "0.3.17" -import_map = "0.18.0" +import_map = "0.18.1" parking_lot = { version = "0.11.2" } -url = { version = "2.3.1" } +url = { workspace = true } [dev-dependencies] pretty_assertions = "1.0.0" diff --git a/rs-lib/src/emit.rs b/rs-lib/src/emit.rs index f3fe1de..c1b69f6 100644 --- a/rs-lib/src/emit.rs +++ b/rs-lib/src/emit.rs @@ -3,6 +3,7 @@ use anyhow::anyhow; use anyhow::Context; use anyhow::Result; +use base64::Engine; use deno_ast::get_syntax; use deno_ast::swc; use deno_ast::swc::atoms::JsWord; @@ -246,11 +247,8 @@ pub fn bundle_graph( cm.build_source_map_with_config(&srcmap, None, source_map_config) .to_writer(&mut buf)?; if options.emit_options.inline_source_map { - let encoded_map = format!( - "//# sourceMappingURL=data:application/json;base64,{}\n", - base64::encode(buf) - ); - code.push_str(&encoded_map); + code.push_str("//# sourceMappingURL=data:application/json;base64,"); + base64::prelude::BASE64_STANDARD.encode_string(buf, &mut code); } else if options.emit_options.source_map { maybe_map = Some(String::from_utf8(buf)?); } diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index a155a11..da67a91 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -13,12 +13,12 @@ crate-type = ["cdylib", "rlib"] name = "emit" [dependencies] -anyhow = "1.0.44" -base64 = "0.13.0" +anyhow = { workspace = true } +base64 = { workspace = true } deno_emit = { path = "../rs-lib" } js-sys = { version = "=0.3.64" } serde = { version = "1.0.130", features = ["derive", "rc"] } -url = { version = "2.3.1" } +url = { workspace = true } wasm-bindgen = { version = "=0.2.87" } wasm-bindgen-futures = { version = "=0.4.37" } serde-wasm-bindgen = "0.5.0"