chore: update tree-sitter to official version (#6237)

Turns out tree-sitter is releasing stuff much faster nowadays!

While doing this, I noticed we no longer need to hack the C build as much. Removed that the whole sysroot thing. I could remove the locked CC and AR but it has actually been pretty nice having that locked to not worry about what contributors have installed. I'd be nice to one day use zig instead.

This new tree-sitter version also seems to compile a litter faster, so that's a nice bonus.

*By submitting this pull request, I confirm that my contribution is made under the terms of the [Wing Cloud Contribution License](https://github.com/winglang/wing/blob/main/CONTRIBUTION_LICENSE.md)*.

.cargo/config.toml

@@ -1,5 +1,4 @@
 [env]
-WASI_SDK = { value = ".cargo/wasi-sdk-21.0", relative = true }
 # tree-sitter build fails with newer version of clang unless implicit-function-declaration is ignored
 CC_wasm32_wasi = { value = ".cargo/wasi-sdk-21.0/bin/clang -Wno-error=implicit-function-declaration", relative = true }
 AR_wasm32_wasi = { value = ".cargo/wasi-sdk-21.0/bin/ar", relative = true }

libs/tree-sitter-wing/Cargo.toml

@@ -17,8 +17,7 @@ include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-# Waiting for https://github.com/tree-sitter/tree-sitter/pull/3293 to be released
-tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter.git", rev = "a7a47d561d4e64eaf226f93c4d68076afa67fdda" }
+tree-sitter = "0.22.5"
 
 [build-dependencies]
 cc = "1.0.87"

libs/tree-sitter-wing/bindings/rust/build.rs

@@ -16,17 +16,5 @@ fn main() {
 	c_config.file(&scanner_path);
 	println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
 
-	if cfg!(target_arch = "wasm32") {
-		// This parser is used in a WASI context, so it needs to be compiled with
-		// the sysroot and other tools needed for WASI-compatible C
-		c_config.flag(
-			format!(
-				"--sysroot={}/share/wasi-sysroot",
-				env!("WASI_SDK", "WASI_SDK env not set")
-			)
-			.as_str(),
-		);
-	}
-
 	c_config.compile("tree-sitter-wing");
 }

libs/tree-sitter-wing/package.json

@@ -52,6 +52,6 @@
   },
   "devDependencies": {
     "nodemon": "^3.1.0",
-    "tree-sitter-cli": "0.22.4"
+    "tree-sitter-cli": "0.22.5"
   }
 }

libs/tree-sitter-wing/turbo.json

@@ -4,7 +4,7 @@
   "pipeline": {
     "build:generate": {
       "inputs": ["!*.wasm", "*", "grammar.js", "src/scanner.c"],
-      "outputs": ["src/**", "!src/scanner.c", "bindings/**", "binding.gyp"]
+      "outputs": ["src/**", "!src/scanner.c"]
     },
     "build:wasm": {
       "dependsOn": ["build:generate"],

libs/wingc/Cargo.toml

@@ -4,8 +4,7 @@ version = "0.0.0"
 edition = "2021"
 
 [dependencies]
-# Waiting for https://github.com/tree-sitter/tree-sitter/pull/3293 to be released
-tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter.git", rev = "a7a47d561d4e64eaf226f93c4d68076afa67fdda" }
+tree-sitter = "0.22.5"
 derivative = "2.2"
 tree-sitter-wing = { path = "../tree-sitter-wing" }
 wingii = { path = "../wingii" }