Reinstate local web-tree-sitter build (#69)

* Reinstate local web-tree-sitter build

* Get tarball instead of git cloning

* Fixed tarball

Author: pokey

Makefile

@@ -36,3 +36,27 @@ parsers/tree-sitter-c-sharp.wasm: node_modules/tree-sitter-c-sharp/package.json
 	mkdir -p $(dir $@)
 	npx tree-sitter build-wasm $(dir $^)
 	mv tree-sitter-c_sharp.wasm $@
+
+
+# Build web-tree-sitter
+
+WEB_TREE_SITTER_FILES := README.md package.json tree-sitter-web.d.ts tree-sitter.js tree-sitter.wasm
+WEB_TREE_SITTER_DIR := vendor/web-tree-sitter
+
+MAKE_CACHE_DIR := .make-work
+
+.PHONY: web-tree-sitter
+web-tree-sitter: $(addprefix $(WEB_TREE_SITTER_DIR)/,$(WEB_TREE_SITTER_FILES))
+
+$(addprefix $(WEB_TREE_SITTER_DIR)/,$(WEB_TREE_SITTER_FILES)): tree-sitter-version
+	@rm -rf $(MAKE_CACHE_DIR)/tree-sitter
+	@TREE_SITTER_VERSION=$(shell cat tree-sitter-version) ;\
+	mkdir -p $(MAKE_CACHE_DIR)/tree-sitter && \
+	curl -L https://api.github.com/repos/tree-sitter/tree-sitter/tarball/$$TREE_SITTER_VERSION | \
+	tar -xz -C $(MAKE_CACHE_DIR)/tree-sitter --strip-components=1
+	@cd $(MAKE_CACHE_DIR)/tree-sitter && \
+	./script/build-wasm
+	@mkdir -p $(WEB_TREE_SITTER_DIR)
+	@cp $(MAKE_CACHE_DIR)/tree-sitter/LICENSE $(WEB_TREE_SITTER_DIR)
+	@cp $(addprefix $(MAKE_CACHE_DIR)/tree-sitter/lib/binding_web/,$(WEB_TREE_SITTER_FILES)) $(WEB_TREE_SITTER_DIR)
+	@rm -rf $(MAKE_CACHE_DIR)/tree-sitter

README.md

@@ -59,6 +59,13 @@ When working with WSL, the host vscode instance connects to a vscode server on t
 - If you're adding language support to `vscode-parse-tree`, you need to clone that as well, build it, and link it into the `vscode-server` extension folder: `ln -s ~/your/code/vscode-parse-tree ~/.vscode-server/extensions/parse-tree` for instance.
 - If you get errors about needing to install the `Remote-WSL` extension, you might need to manually delete the extension from the host side and try again.
 
+### Updating `web-tree-sitter`
+
+We build a custom version of `web-tree-sitter` to ensure that we can always use the latest version and fix any problems as they come up.
+To update `web-tree-sitter` update the contents of [./tree-sitter-version](./tree-sitter-version) to the latest commit sha of [tree-sitter](https://github.com/tree-sitter/tree-sitter/commits/master).
+
+The script which builds our custom version is at the end of our [`Makefile`](./Makefile).
+
 ## Change Log
 
 See [CHANGELOG.md](CHANGELOG.md).

package.json

@@ -71,6 +71,7 @@
     "vscode:prepublish": "npm run compile",
     "compile": "tsc -p ./ && make parsers",
     "watch": "tsc -watch -p ./",
+    "preinstall": "make web-tree-sitter",
     "test": "npm run compile && node ./out/test",
     "benchmark": "npm run compile && node ./out/benchmark",
     "debug": "npm run compile && node --nolazy --inspect-brk=9229 ./out/test",
@@ -127,6 +128,9 @@
   "dependencies": {
     "jsonc-parser": "^2.1.0",
     "tar": ">=4.4.2",
-    "web-tree-sitter": "^0.20.8"
-  }
+    "web-tree-sitter": "file:vendor/web-tree-sitter"
+  },
+  "bundledDependencies": [
+    "web-tree-sitter"
+  ]
 }

tree-sitter-version

@@ -0,0 +1 @@
+6bbb50bef8249e6460e7d69e42cc8146622fa4fd

yarn.lock

@@ -2722,10 +2722,8 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
-web-tree-sitter@^0.20.8:
+"web-tree-sitter@file:vendor/web-tree-sitter":
   version "0.20.8"
-  resolved "https://registry.yarnpkg.com/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz#1e371cb577584789cadd75cb49c7ddfbc99d04c8"
-  integrity sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==
 
 webidl-conversions@^3.0.0:
   version "3.0.1"