swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-10-04 04:07:18 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore(deps): Update wasmer to fix broken Windows build (#9322)

Browse Source
This commit is contained in:
Donny/강동윤 2024-07-23 16:27:25 +09:00 committed by GitHub
parent 8107e985e1
commit a120faf84b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 235 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/fuzzy-cycles-remember.md Normal file
View File

@ -0,0 +1,5 @@
---
swc_plugin_runner: patch
---
chore(deps): Update `wasmer` to fix broken Windows build

2
.github/workflows/CI.yml vendored
View File

@ -345,7 +345,7 @@ jobs:
matrix:
os:
# - ubuntu-latest
# - windows-latest
- windows-latest
- macos-latest
steps:
- uses: actions/checkout@v4

340
Cargo.lock generated
View File

@ -453,6 +453,15 @@ dependencies = [
"serde",
]
[[package]]
name = "bytesize"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
dependencies = [
"serde",
]
[[package]]
name = "camino"
version = "1.1.6"
@ -567,7 +576,7 @@ dependencies = [
"once_cell",
"strsim 0.10.0",
"termcolor",
"terminal_size",
"terminal_size 0.2.6",
"textwrap",
]
@ -1231,6 +1240,27 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "document-features"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
dependencies = [
"litrs",
]
[[package]]
name = "dunce"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
[[package]]
name = "dyn-clone"
version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
name = "either"
version = "1.13.0"
@ -1592,7 +1622,7 @@ dependencies = [
"futures-core",
"futures-sink",
"futures-util",
"http",
"http 0.2.12",
"indexmap 2.2.6",
"slab",
"tokio",
@ -1723,6 +1753,17 @@ dependencies = [
"itoa",
]
[[package]]
name = "http"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
dependencies = [
"bytes",
"fnv",
"itoa",
]
[[package]]
name = "http-body"
version = "0.4.6"
@ -1730,7 +1771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
dependencies = [
"bytes",
"http",
"http 0.2.12",
"pin-project-lite",
]
@ -1757,7 +1798,7 @@ dependencies = [
"futures-core",
"futures-util",
"h2",
"http",
"http 0.2.12",
"http-body",
"httparse",
"httpdate",
@ -2123,6 +2164,12 @@ version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
[[package]]
name = "litrs"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
[[package]]
name = "lock_api"
version = "0.4.11"
@ -2157,15 +2204,6 @@ dependencies = [
"twox-hash",
]
[[package]]
name = "mach"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
dependencies = [
"libc",
]
[[package]]
name = "mach2"
version = "0.4.2"
@ -3112,7 +3150,7 @@ dependencies = [
"futures-core",
"futures-util",
"h2",
"http",
"http 0.2.12",
"http-body",
"hyper",
"hyper-tls",
@ -3285,6 +3323,31 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "schemars"
version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
dependencies = [
"dyn-clone",
"schemars_derive",
"serde",
"serde_json",
"url",
]
[[package]]
name = "schemars_derive"
version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
"syn 2.0.55",
]
[[package]]
name = "scoped-tls"
version = "1.0.1"
@ -3397,6 +3460,17 @@ dependencies = [
"syn 2.0.55",
]
[[package]]
name = "serde_derive_internals"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.55",
]
[[package]]
name = "serde_json"
version = "1.0.115"
@ -5298,7 +5372,7 @@ dependencies = [
"testing",
"tokio",
"tracing",
"virtual-fs",
"virtual-fs 0.11.1",
"wasmer",
"wasmer-cache",
"wasmer-compiler-cranelift",
@ -5517,16 +5591,6 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "term_size"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "termcolor"
version = "1.4.1"
@ -5546,6 +5610,16 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "terminal_size"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
dependencies = [
"rustix 0.38.30",
"windows-sys 0.48.0",
]
[[package]]
name = "termios"
version = "0.3.3"
@ -5601,7 +5675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
dependencies = [
"smawk",
"terminal_size",
"terminal_size 0.2.6",
"unicode-linebreak",
"unicode-width",
]
@ -5759,6 +5833,18 @@ dependencies = [
"tokio",
]
[[package]]
name = "tokio-stream"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
dependencies = [
"futures-core",
"pin-project-lite",
"tokio",
"tokio-util",
]
[[package]]
name = "tokio-util"
version = "0.7.10"
@ -6096,11 +6182,34 @@ name = "virtual-fs"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce7b7674a3d0ddb5915b8f4feccdd6e8680c5980c296688e0f0e7378b8c69e1"
dependencies = [
"async-trait",
"bytes",
"derivative",
"futures",
"getrandom",
"indexmap 1.9.3",
"lazy_static",
"pin-project-lite",
"replace_with",
"shared-buffer",
"slab",
"thiserror",
"tokio",
"tracing",
]
[[package]]
name = "virtual-fs"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab78d839de346a6805017924bb424560c5bf77c4cd7d6f7754b492a4c2ec003f"
dependencies = [
"anyhow",
"async-trait",
"bytes",
"derivative",
"dunce",
"filetime",
"fs_extra",
"futures",
@ -6137,9 +6246,9 @@ dependencies = [
[[package]]
name = "virtual-net"
version = "0.6.7"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74aa69bbb19e531d274ba1aa730028f6fcd2117513ff6696d020af05188dfe92"
checksum = "2e9f12f5b9ddecfc1bf03e91fba7e12ddf7c93c6ccf5e76a7683c89a26a34989"
dependencies = [
"anyhow",
"async-trait",
@ -6190,17 +6299,6 @@ dependencies = [
"wai-bindgen-gen-rust",
]
[[package]]
name = "wai-bindgen-gen-wasmer"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f61484185d8c520a86d5a7f7f8265f446617c2f9774b2e20a52de19b6e53432"
dependencies = [
"heck 0.3.3",
"wai-bindgen-gen-core",
"wai-bindgen-gen-rust",
]
[[package]]
name = "wai-bindgen-rust"
version = "0.2.3"
@ -6223,33 +6321,6 @@ dependencies = [
"wai-bindgen-gen-rust-wasm",
]
[[package]]
name = "wai-bindgen-wasmer"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39a8ae4f43b477b58e5f69924983a82136ccbaceccf5fac8e069bbd64f55a964"
dependencies = [
"anyhow",
"bitflags 1.3.2",
"once_cell",
"thiserror",
"tracing",
"wai-bindgen-wasmer-impl",
"wasmer",
]
[[package]]
name = "wai-bindgen-wasmer-impl"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b3488ed88d4dd0e3bf85bad4e27dac6cb31aae5d122a5dda2424803c8dc863a"
dependencies = [
"proc-macro2",
"syn 1.0.109",
"wai-bindgen-gen-core",
"wai-bindgen-gen-wasmer",
]
[[package]]
name = "wai-parser"
version = "0.2.3"
@ -6380,9 +6451,9 @@ dependencies = [
[[package]]
name = "wasmer"
version = "4.2.6"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c15724dc25d1ee57962334aea8e41ade2675e5ea2ac6b8d42da6051b0face66"
checksum = "c3a6e0f73e5ae361fe64db607eaf4ab2381d88ad2c1b0bb8cf254cf35d894687"
dependencies = [
"bytes",
"cfg-if",
@ -6410,9 +6481,9 @@ dependencies = [
[[package]]
name = "wasmer-cache"
version = "4.2.6"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3242b5cf4d27d33daa44b60b153365f733e9fb833cf61594e577ae55456e85f"
checksum = "79fd0889f8844b7c70b8ee8fbf1d1f6ccff99399c6f3d3627048cde04b1ac493"
dependencies = [
"blake3",
"hex",
@ -6422,9 +6493,9 @@ dependencies = [
[[package]]
name = "wasmer-compiler"
version = "4.2.6"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55a7f3b3a96f8d844c25e2c032af9572306dd63fa93dc17bcca4c5458ac569bd"
checksum = "cb1e7c79507f5d55f1afd99984717e8380440cd98e13d542e4d00661f986f2d4"
dependencies = [
"backtrace",
"bytes",
@ -6433,6 +6504,7 @@ dependencies = [
"enumset",
"lazy_static",
"leb128",
"libc",
"memmap2 0.5.10",
"more-asserts",
"region",
@ -6445,13 +6517,14 @@ dependencies = [
"wasmer-vm",
"wasmparser",
"winapi",
"xxhash-rust",
]
[[package]]
name = "wasmer-compiler-cranelift"
version = "4.2.6"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "102e2c5bacac69495c4025767e2fa26797ffb27f242dccb7cf57d9cefd944386"
checksum = "8f3352014573750327646a690d32774312b0e8b7920e7e8ba00c0449eac18390"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@ -6467,10 +6540,54 @@ dependencies = [
]
[[package]]
name = "wasmer-derive"
version = "4.2.6"
name = "wasmer-config"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ea737fa08f95d6abc4459f42a70a9833e8974b814e74971d77ef473814f4d4c"
checksum = "54a0f70c177b1c5062cfe0f5308c3317751796fef9403c22a0cd7b4cacd4ccd8"
dependencies = [
"anyhow",
"bytesize",
"derive_builder",
"hex",
"indexmap 2.2.6",
"schemars",
"semver 1.0.21",
"serde",
"serde_cbor",
"serde_json",
"serde_yaml",
"thiserror",
"toml 0.8.8",
"url",
]
[[package]]
name = "wasmer-config"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d35974065bb02340d7b448f8a4c5a3156b524e3a6b29d59201b940cf4c2c384f"
dependencies = [
"anyhow",
"bytesize",
"derive_builder",
"hex",
"indexmap 2.2.6",
"schemars",
"semver 1.0.21",
"serde",
"serde_cbor",
"serde_json",
"serde_yaml",
"thiserror",
"toml 0.8.8",
"url",
]
[[package]]
name = "wasmer-derive"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac6b0b0580cfa1fc7ad58cca3626a742f2b2e5ccd51cfc5de43e8edb0d1daa4c"
dependencies = [
"proc-macro-error",
"proc-macro2",
@ -6480,9 +6597,9 @@ dependencies = [
[[package]]
name = "wasmer-journal"
version = "0.1.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f7db07627d56d4b714255d8f1f7f07378dd5a3bc67e612ece42afa7e4a0e477"
checksum = "577b4a0876dc31138bb8df5cc6c6f622dcd893d5a81552583f107abcbb6eda50"
dependencies = [
"anyhow",
"async-trait",
@ -6498,51 +6615,39 @@ dependencies = [
"serde_json",
"thiserror",
"tracing",
"virtual-fs 0.15.0",
"virtual-net",
"wasmer",
"wasmer-wasix-types",
]
[[package]]
name = "wasmer-toml"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d21472954ee9443235ca32522b17fc8f0fe58e2174556266a0d9766db055cc52"
dependencies = [
"anyhow",
"derive_builder",
"indexmap 2.2.6",
"semver 1.0.21",
"serde",
"serde_cbor",
"serde_json",
"serde_yaml",
"thiserror",
"toml 0.8.8",
]
[[package]]
name = "wasmer-types"
version = "4.2.6"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0689110e291b0f07fc665f2824e5ff81df120848e8a9acfbf1a9bf7990773f9"
checksum = "576442cc3d302ca215fd40aa7826a078571dca7eaa773d8cdedca14a2ec7c9a1"
dependencies = [
"bytecheck",
"enum-iterator",
"enumset",
"getrandom",
"hex",
"indexmap 1.9.3",
"more-asserts",
"rkyv",
"serde",
"sha2",
"target-lexicon",
"thiserror",
"webc",
"xxhash-rust",
]
[[package]]
name = "wasmer-vm"
version = "4.2.6"
version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cd41f822a1ac4242d478754e8ceba2806a00ea5072803622e1fe91e8e28b2a1"
checksum = "6483035d1df84a978cd6c6a35878e913dc8ec6311f8712548a922a75e87957ba"
dependencies = [
"backtrace",
"cc",
@ -6556,7 +6661,7 @@ dependencies = [
"indexmap 1.9.3",
"lazy_static",
"libc",
"mach",
"mach2",
"memoffset",
"more-asserts",
"region",
@ -6568,14 +6673,16 @@ dependencies = [
[[package]]
name = "wasmer-wasix"
version = "0.18.1"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25cd997abba5a5b59bad212c53f953eff28c7cee38b67b989b114cf5b80e9625"
checksum = "24badb9cbb62a67df4eee4d6d690ba81b5b49e43ac49d2c0d4a97276fc3aacb5"
dependencies = [
"ahash 0.8.11",
"anyhow",
"async-trait",
"base64",
"bincode",
"blake3",
"bytecheck",
"bytes",
"cfg-if",
@ -6587,7 +6694,7 @@ dependencies = [
"getrandom",
"heapless",
"hex",
"http",
"http 1.1.0",
"js-sys",
"lazy_static",
"libc",
@ -6609,21 +6716,22 @@ dependencies = [
"sha2",
"shared-buffer",
"tempfile",
"term_size",
"terminal_size 0.3.0",
"termios",
"thiserror",
"tokio",
"tokio-stream",
"tracing",
"url",
"urlencoding",
"virtual-fs",
"virtual-fs 0.15.0",
"virtual-mio",
"virtual-net",
"wai-bindgen-wasmer",
"waker-fn",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasmer",
"wasmer-config 0.5.0",
"wasmer-journal",
"wasmer-types",
"wasmer-wasix-types",
@ -6636,9 +6744,9 @@ dependencies = [
[[package]]
name = "wasmer-wasix-types"
version = "0.18.1"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be275d30cc4c69cd2d52d4fee2e83feb3f35b381497d3f7c71ad5a4cde24d8"
checksum = "0c8b03288ec41769e99915a2b17611a74ba0680e8806d0710d892f52b4f15d6f"
dependencies = [
"anyhow",
"bitflags 1.3.2",
@ -6702,18 +6810,21 @@ dependencies = [
[[package]]
name = "webc"
version = "5.8.1"
version = "6.0.0-rc1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "973ca5a91b4fb3e4bb37cfebe03ef9364d0aff2765256abefdb7e79dc9188483"
checksum = "c1fc686c7b43c9bc630a499f6ae1f0a4c4bd656576a53ae8a147b0cc9bc983ad"
dependencies = [
"anyhow",
"base64",
"byteorder",
"bytes",
"cfg-if",
"document-features",
"flate2",
"ignore",
"indexmap 1.9.3",
"leb128",
"lexical-sort",
"libc",
"once_cell",
"path-clean 1.0.1",
"rand",
@ -6728,8 +6839,7 @@ dependencies = [
"thiserror",
"toml 0.7.8",
"url",
"walkdir",
"wasmer-toml",
"wasmer-config 0.2.0",
]
[[package]]

4
Cargo.toml
View File

@ -146,8 +146,8 @@ resolver = "2"
walkdir = "2.4.0"
wasm-bindgen = "0.2.91"
wasm-bindgen-futures = "0.4.41"
wasmer = { version = "4.2.5", default-features = false }
wasmer-wasix = { version = "0.18.0", default-features = false }
wasmer = { version = "4.3.5", default-features = false }
wasmer-wasix = { version = "0.25.0", default-features = false }
[profile.release]
lto = true

4
crates/swc_plugin_runner/Cargo.toml
View File

@ -67,8 +67,8 @@ swc_ecma_ast = { version = "0.117.0", path = "../swc_ecma_ast", optional = true
swc_plugin_proxy = { version = "0.46.0", path = "../swc_plugin_proxy" }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
wasmer-cache = { version = "4.0.0", optional = true }
wasmer-compiler-cranelift = { version = "4.0.0", default-features = false }
wasmer-cache = { version = "4.3.5", optional = true }
wasmer-compiler-cranelift = { version = "4.3.5", default-features = false }
[dev-dependencies]
codspeed-criterion-compat = { workspace = true }