From cd3e561224ad4e290ee0653c7504f333a55f688e Mon Sep 17 00:00:00 2001 From: Boris Verkhovskiy Date: Mon, 29 Jul 2024 00:00:02 -0700 Subject: [PATCH] build(wasm): don't minify JS (#3380) --- lib/binding_web/package.json | 3 +-- script/build-wasm | 30 +++++++++--------------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/lib/binding_web/package.json b/lib/binding_web/package.json index e3b3fcc1..444afabc 100644 --- a/lib/binding_web/package.json +++ b/lib/binding_web/package.json @@ -31,7 +31,6 @@ "chai": "^4.3.7", "eslint": ">=8.56.0", "eslint-config-google": "^0.14.0", - "mocha": "^10.2.0", - "terser": "^5.16.6" + "mocha": "^10.2.0" } } diff --git a/script/build-wasm b/script/build-wasm index a30b0d25..22246738 100755 --- a/script/build-wasm +++ b/script/build-wasm @@ -33,15 +33,14 @@ WEB_DIR=lib/binding_web SRC_DIR=lib/src EMSCRIPTEN_VERSION=$(< cli/loader/emscripten-version) -minify_js=1 +verbose=0 force_docker=0 -emscripten_flags=(-O3) +emscripten_flags=(-O3 --minify 0) while (($# > 0)); do case "$1" in --debug) - minify_js=0 - emscripten_flags=(-s ASSERTIONS=1 -s SAFE_HEAP=1 -O0) + emscripten_flags=(-s ASSERTIONS=1 -s SAFE_HEAP=1 -O0 -g) ;; --help) @@ -54,7 +53,7 @@ while (($# > 0)); do ;; -v|--verbose) - emscripten_flags+=(-s VERBOSE=1 -v) + verbose=1 ;; *) @@ -66,6 +65,10 @@ while (($# > 0)); do shift done +if [[ $verbose == 1 ]]; then + emscripten_flags+=(-s VERBOSE=1 -v) +fi + emcc= docker= if [[ $force_docker == 0 ]] && command -v emcc > /dev/null; then @@ -137,20 +140,5 @@ $emcc \ ${WEB_DIR}/binding.c \ -o target/scratch/tree-sitter.js -# Use terser to write a minified version of `tree-sitter.js` into -# the `lib/binding_web` directory. -if [[ $minify_js == 1 ]]; then - if [[ ! -d ${WEB_DIR}/node_modules/terser ]]; then - (cd ${WEB_DIR} && npm install) - fi - ${WEB_DIR}/node_modules/.bin/terser \ - --compress \ - --mangle \ - --keep-classnames \ - -- target/scratch/tree-sitter.js \ - > ${WEB_DIR}/tree-sitter.js -else - cp target/scratch/tree-sitter.js ${WEB_DIR}/tree-sitter.js -fi - +mv target/scratch/tree-sitter.js ${WEB_DIR}/tree-sitter.js mv target/scratch/tree-sitter.wasm ${WEB_DIR}/tree-sitter.wasm