From 415feab47361167a2efb2f4c2d660e50a2bbf05f Mon Sep 17 00:00:00 2001 From: Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:34:14 +0100 Subject: [PATCH] Workaround for Wasm compile target --- Cargo.lock | 31 ++++++++++++++++++------ packages/transformers/js/wasm/Cargo.toml | 4 +++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd89f185b39..7d47aa81c96 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -225,6 +225,15 @@ dependencies = [ "vec_map", ] +[[package]] +name = "cloudabi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467" +dependencies = [ + "bitflags", +] + [[package]] name = "cloudflare-zlib" version = "0.2.9" @@ -437,7 +446,7 @@ checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.10", "winapi", ] @@ -1049,6 +1058,7 @@ version = "0.1.0" dependencies = [ "js-sys", "parcel-js-swc-core", + "parking_lot_core", "serde", "serde-wasm-bindgen", "wasm-bindgen", @@ -1056,9 +1066,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", "lock_api", @@ -1067,14 +1077,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", + "cloudabi", "instant", "libc", - "redox_syscall", + "redox_syscall 0.1.57", "smallvec", "winapi", ] @@ -1288,6 +1299,12 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + [[package]] name = "redox_syscall" version = "0.2.10" diff --git a/packages/transformers/js/wasm/Cargo.toml b/packages/transformers/js/wasm/Cargo.toml index 822b1b44b42..837c416c91e 100644 --- a/packages/transformers/js/wasm/Cargo.toml +++ b/packages/transformers/js/wasm/Cargo.toml @@ -13,3 +13,7 @@ parcel-js-swc-core = { path = "../core" } serde = "1" serde-wasm-bindgen = "0.3.0" wasm-bindgen = "0.2" + +# https://github.com/Amanieu/parking_lot/issues/269 +[target.'cfg(target_arch = "wasm32")'.dependencies] +parking_lot_core = "=0.8.0"