Remove custom web-tree-sitter build and bump version (#94)

Author: pokey

Makefile

@@ -46,27 +46,3 @@ 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,13 +59,6 @@ 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

@@ -77,7 +77,6 @@
     "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",
@@ -139,9 +138,6 @@
   "dependencies": {
     "jsonc-parser": "^2.1.0",
     "tar": ">=4.4.2",
-    "web-tree-sitter": "file:vendor/web-tree-sitter"
-  },
-  "bundledDependencies": [
-    "web-tree-sitter"
-  ]
+    "web-tree-sitter": "^0.24.6"
+  }
 }

tree-sitter-version

@@ -2293,8 +2293,10 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
-"web-tree-sitter@file:vendor/web-tree-sitter":
-  version "0.22.6"
+web-tree-sitter@^0.24.6:
+  version "0.24.6"
+  resolved "https://registry.yarnpkg.com/web-tree-sitter/-/web-tree-sitter-0.24.6.tgz#05d15f15ca506a2615b7a97b3abc5183923812f2"
+  integrity sha512-NVG40wwFerkvOSsrY2NE56nKpzwCpn8VT51gqZZaIfkBCMu+0JZLFVwJlZLPO01Ewfq3+Xg+NY4Bot5GD0L03g==
 
 [email protected], which@^2.0.1, which@^2.0.2:
   version "2.0.2"