From 751ffd2ee13ef7b29de60585fec3a52dab1f5b4e Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 30 Nov 2020 16:25:01 -0800
Subject: [PATCH] Use new emscripten when building with docker

---
 cli/src/wasm.rs               |  2 +-
 script/build-wasm             | 10 +++++-----
 script/generate-fixtures-wasm |  8 +++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/cli/src/wasm.rs b/cli/src/wasm.rs
index 47cea90a..8bbcfbdf 100644
--- a/cli/src/wasm.rs
+++ b/cli/src/wasm.rs
@@ -57,7 +57,7 @@ pub fn compile_language_to_wasm(language_dir: &Path, force_docker: bool) -> Resu
         }
 
         // Run `emcc` in a container using the `emscripten-slim` image
-        command.args(&["trzeci/emscripten-slim", "emcc"]);
+        command.args(&["emscripten/emsdk", "emcc"]);
     } else {
         return Error::err(
             "You must have either emcc or docker on your PATH to run this command".to_string(),
diff --git a/script/build-wasm b/script/build-wasm
index b139f6c2..75c6a7d1 100755
--- a/script/build-wasm
+++ b/script/build-wasm
@@ -64,11 +64,11 @@ emcc=
 if which emcc > /dev/null && [[ "$force_docker" == "0" ]]; then
   emcc=emcc
 elif which docker > /dev/null; then
-  emcc="docker run               \
-    --rm                         \
-    -v $(pwd):/src:Z             \
-    -u $(id -u)                  \
-    trzeci/emscripten-slim       \
+  emcc="docker run    \
+    --rm              \
+    -v $(pwd):/src:Z  \
+    -u $(id -u)       \
+    emscripten/emsdk  \
     emcc"
 else
   echo 'You must have either `docker` or `emcc` on your PATH to run this script'
diff --git a/script/generate-fixtures-wasm b/script/generate-fixtures-wasm
index a987e31a..9d44b58c 100755
--- a/script/generate-fixtures-wasm
+++ b/script/generate-fixtures-wasm
@@ -4,6 +4,12 @@ set -e
 
 cargo build --release
 
+build_wasm_args=
+if [[ $1 == "--docker" ]]; then
+  build_wasm_args="--docker"
+  shift
+fi
+
 filter_grammar_name=$1
 
 root_dir=$PWD
@@ -20,7 +26,7 @@ while read -r grammar_file; do
   fi
 
   echo "Compiling ${grammar_name} parser to wasm"
-  "$tree_sitter" build-wasm $grammar_dir
+  "$tree_sitter" build-wasm $build_wasm_args $grammar_dir
 done <<< "$grammar_files"
 
 mv tree-sitter-*.wasm target/release/