Merge pull request #1541 from dodona-edu/chore/tree-sitter-21

Update tree-sitter parsers to 0.21 or use compat layer
dodona-edu · May 31, 2024 · 06c1385 · 06c1385
2 parents 3406c47 + ae85647
commit 06c1385
Show file tree

Hide file tree

Showing 25 changed files with 213 additions and 202 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -30,10 +30,10 @@
 	url = https://github.com/tree-sitter/tree-sitter-typescript.git
 [submodule "parsers/modelica"]
 	path = parsers/modelica
-	url = https://github.com/OpenModelica/tree-sitter-modelica.git
+	url = https://github.com/rien/tree-sitter-modelica.git
 [submodule "parsers/r"]
 	path = parsers/r
-	url = https://github.com/rien/tree-sitter-r.git
+	url = https://github.com/r-lib/tree-sitter-r.git
 	branch = next
 [submodule "parsers/sql"]
 	path = parsers/sql

diff --git a/cli/package.json b/cli/package.json
@@ -42,7 +42,7 @@
     "commander": "^11.1.0",
     "csv-stringify": "^6.5.0",
     "open": "^10.1.0",
-    "tree-sitter": "^0.20.6"
+    "tree-sitter": "^0.21.1"
   },
   "bugs": {
     "url": "https://github.com/dodona-edu/dolos/issues"

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -25,7 +25,7 @@
           overlays = [
             devshell.overlays.default
             (self: super: {
-              nodejs = super.nodejs_21;
+              nodejs = super.nodejs_22;
             })
           ];
         };

diff --git a/lib/package.json b/lib/package.json
@@ -35,13 +35,13 @@
     "eslint": "8.57.0",
     "node-gyp": "^9.4.1",
     "typescript": "5.4.5",
-    "tree-sitter-json": "0.20.2"
+    "tree-sitter-json": "0.21.0"
   },
   "dependencies": {
     "@dodona/dolos-parsers": "1.1.0",
     "@dodona/dolos-core": "1.0.2",
     "d3-dsv": "^3.0.1",
-    "tree-sitter": "^0.20.6"
+    "tree-sitter": "^0.21.1"
   },
   "bugs": {
     "url": "https://github.com/dodona-edu/dolos/issues"