diff --git a/Cargo.lock b/Cargo.lock index 29fda76..cf6bc08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,7 +285,6 @@ dependencies = [ "anyhow", "base64 0.13.0", "data-url", - "dprint-swc-ecma-ast-view", "serde", "swc_atoms", "swc_common", @@ -386,21 +385,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "dprint-swc-ecma-ast-view" -version = "0.48.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d189ada8940380247d23993d0ecf13e8b3b5b3a948dffa6fb7291fbd75cf961" -dependencies = [ - "bumpalo", - "num-bigint", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecmascript", - "text_lines", -] - [[package]] name = "either" version = "1.6.1" diff --git a/Cargo.toml b/Cargo.toml index 5cd08b8..33ba6f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ path = "src/examples/load.rs" [dependencies] anyhow = "1" base64 = "0.13.0" -deno_ast = { version = "0.10.0", features = ["utils", "transpiling", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] } +deno_ast = { version = "0.10.0", features = ["transpiling"] } deno_graph = "0.21.0" futures = "0.3.19" serde = "1" diff --git a/README.md b/README.md index 68c091d..29ddc18 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,34 @@ SourceMaps: There is one optimization for empty source / source map entries. If both the offset and size are set to 0, no entry and no hash is present in the data sections for that module. + +## Development + +``` +rustup target add wasm32-unknown-unknown +cargo install wasm-bindgen-cli +deno install --unstable -A -f -n wasmbuild https://raw.githubusercontent.com/denoland/wasmbuild/7b714ee749e4dc1e4ed1bc6f7258235a6c289aec/main.ts +brew install binaryen +``` + +When opening a PR make sure to rebuild WASM by running: + +``` +make release +``` + +### Troubleshooting + +Errors like: + +``` +thread 'main' panicked at 'remaining data [20, 10, 85, 105, 110, 116, 56, 65, 114, 114, 97, 121]', /.cargo/registry/src/github.com-1ecc6299db9ec823/wasm-bindgen-cli-support-0.2.78/src/descriptor.rs:111:9 +note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace +wasm-bindgen failed +make: *** [build] Error 1 +``` + +mean that `wasm-bindgen-cli` doesn't match version specified in `Cargo.toml`. + +To fix it, run `cargo install wasm-bindgen-cli@VERSION` where `VERSION` matches +what's specified in `Cargo.toml`. diff --git a/lib/eszip_wasm.generated.js b/lib/eszip_wasm.generated.js index 277f845..29f294d 100644 --- a/lib/eszip_wasm.generated.js +++ b/lib/eszip_wasm.generated.js @@ -210,7 +210,7 @@ function makeMutClosure(arg0, arg1, dtor, f) { } function __wbg_adapter_24(arg0, arg1, arg2) { wasm - ._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc4c17f990ab4b253( + ._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc44760f2e4b85178( arg0, arg1, addHeapObject(arg2), @@ -242,7 +242,7 @@ function handleError(f, args) { } } function __wbg_adapter_60(arg0, arg1, arg2, arg3) { - wasm.wasm_bindgen__convert__closures__invoke2_mut__h4055494abbe69ef3( + wasm.wasm_bindgen__convert__closures__invoke2_mut__h369a4291dfaf1101( arg0, arg1, addHeapObject(arg2), @@ -347,6 +347,10 @@ const imports = { var ret = getStringFromWasm0(arg0, arg1); return addHeapObject(ret); }, + __wbg_resolve_4f8f547f26b30b27: function (arg0) { + var ret = Promise.resolve(getObject(arg0)); + return addHeapObject(ret); + }, __wbindgen_json_serialize: function (arg0, arg1) { const obj = getObject(arg1); var ret = JSON.stringify(obj === undefined ? null : obj); @@ -359,6 +363,14 @@ const imports = { getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }, + __wbg_new_16f24b0728c5e67b: function () { + var ret = new Array(); + return addHeapObject(ret); + }, + __wbg_push_a72df856079e6930: function (arg0, arg1) { + var ret = getObject(arg0).push(getObject(arg1)); + return ret; + }, __wbindgen_memory: function () { var ret = wasm.memory; return addHeapObject(ret); @@ -379,18 +391,6 @@ const imports = { var ret = new Uint8Array(getObject(arg0)); return addHeapObject(ret); }, - __wbg_new_16f24b0728c5e67b: function () { - var ret = new Array(); - return addHeapObject(ret); - }, - __wbg_push_a72df856079e6930: function (arg0, arg1) { - var ret = getObject(arg0).push(getObject(arg1)); - return ret; - }, - __wbg_resolve_4f8f547f26b30b27: function (arg0) { - var ret = Promise.resolve(getObject(arg0)); - return addHeapObject(ret); - }, __wbg_newwithlength_5f4ce114a24dfe1e: function (arg0) { var ret = new Uint8Array(arg0 >>> 0); return addHeapObject(ret); @@ -415,11 +415,13 @@ const imports = { __wbindgen_string_get: function (arg0, arg1) { const obj = getObject(arg1); var ret = typeof (obj) === "string" ? obj : undefined; - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0( - ret, - wasm.__wbindgen_malloc, - wasm.__wbindgen_realloc, - ); + var ptr0 = isLikeNone(ret) + ? 0 + : passStringToWasm0( + ret, + wasm.__wbindgen_malloc, + wasm.__wbindgen_realloc, + ); var len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; @@ -578,7 +580,7 @@ const imports = { var ret = getObject(arg0).then(getObject(arg1)); return addHeapObject(ret); }, - __wbindgen_closure_wrapper8776: function (arg0, arg1, arg2) { + __wbindgen_closure_wrapper8774: function (arg0, arg1, arg2) { var ret = makeMutClosure(arg0, arg1, 127, __wbg_adapter_24); return addHeapObject(ret); }, diff --git a/lib/eszip_wasm_bg.wasm b/lib/eszip_wasm_bg.wasm index 6dd0368..cff2840 100644 Binary files a/lib/eszip_wasm_bg.wasm and b/lib/eszip_wasm_bg.wasm differ