Stop vendoring web-tree-sitter (#68)

Author: pokey

Makefile

@@ -2,12 +2,6 @@
 # See https://www.npmjs.com/package/web-tree-sitter
 LANGUAGES = agda bash c c-sharp clojure cpp css elm elixir go haskell html java javascript json julia kotlin latex markdown perl php python query ruby rust scala scss sparql talon tsx typescript yaml
 
-
-# NOTE: Update the version number in the filepath for web-tree-sitter in package.json,
-#       when you change this version number.
-TREE_SITTER_VERSION := 0.20.4
-
-
 # Build web-tree-sitter parsers for $(LANGUAGES)
 
 .PHONY: parsers
@@ -42,32 +36,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/$(TREE_SITTER_VERSION)
-WEB_TREE_SITTER_PATCH := patches/tree-sitter+$(TREE_SITTER_VERSION).patch
-
-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)):
-	@rm -rf $(MAKE_CACHE_DIR)/tree-sitter
-	@git clone                                       \
-		-c advice.detachedHead=false --quiet           \
-		--depth=1 --branch=v$(TREE_SITTER_VERSION)     \
-		https://github.com/tree-sitter/tree-sitter.git \
-		$(MAKE_CACHE_DIR)/tree-sitter
-ifneq (,$(wildcard $(WEB_TREE_SITTER_PATCH)))
-	@(cp $(WEB_TREE_SITTER_PATCH) $(MAKE_CACHE_DIR)/tree-sitter)
-	@(cd $(MAKE_CACHE_DIR)/tree-sitter && git apply $(notdir $(WEB_TREE_SITTER_PATCH)))
-endif
-	@(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,17 +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`:
-
-1. Update the variable `TREE_SITTER_VERSION` in the [`Makefile`](Makefile#L8);
-2. Update the path to `web-tree-sitter` in [`package.json`](package.json#103);
-3. (Optional) Create a new patch in `patches/tree-sitter+$TREE_SITTER_VERSION.patch`.
-
-The script which builds our custom version is in the [`Makefile`](Makefile#L37-63).
-
 ## Change Log
 
 See [CHANGELOG.md](CHANGELOG.md).

package.json

@@ -70,7 +70,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",
@@ -126,9 +125,6 @@
   "dependencies": {
     "jsonc-parser": "^2.1.0",
     "tar": ">=4.4.2",
-    "web-tree-sitter": "file:vendor/web-tree-sitter/0.20.4"
-  },
-  "bundledDependencies": [
-    "web-tree-sitter"
-  ]
+    "web-tree-sitter": "^0.20.8"
+  }
 }

patches/tree-sitter+0.20.4.patch

@@ -2716,8 +2716,10 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
-"web-tree-sitter@file:vendor/web-tree-sitter/0.20.4":
-  version "0.20.4"
+web-tree-sitter@^0.20.8:
+  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"