From 9eac8f3648128ace4d5046d43fe25d3d0a52e3dc Mon Sep 17 00:00:00 2001 From: Beaglefoot Date: Mon, 18 Sep 2023 18:00:08 +0300 Subject: [PATCH] Update tree-sitter deps --- server/package.json | 4 ++-- server/src/parser.ts | 1 - server/src/workarounds/nodejs18.ts | 6 ------ server/yarn.lock | 16 ++++++++-------- 4 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 server/src/workarounds/nodejs18.ts diff --git a/server/package.json b/server/package.json index f736625..337901d 100644 --- a/server/package.json +++ b/server/package.json @@ -24,10 +24,10 @@ }, "dependencies": { "minimist": "1.2.6", - "tree-sitter-awk": "0.5.4", + "tree-sitter-awk": "0.6.0", "vscode-languageserver": "^7.0.0", "vscode-languageserver-textdocument": "^1.0.1", - "web-tree-sitter": "0.20.7" + "web-tree-sitter": "0.20.8" }, "devDependencies": { "@types/minimist": "1.2.2" diff --git a/server/src/parser.ts b/server/src/parser.ts index f8ccd41..32f5d5a 100644 --- a/server/src/parser.ts +++ b/server/src/parser.ts @@ -1,4 +1,3 @@ -import './workarounds/nodejs18' import * as Parser from 'web-tree-sitter' import * as path from 'path' diff --git a/server/src/workarounds/nodejs18.ts b/server/src/workarounds/nodejs18.ts deleted file mode 100644 index 126fde6..0000000 --- a/server/src/workarounds/nodejs18.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Workaround to make tree-sitter work with nodejs18 as shown here: -// https://github.com/tree-sitter/tree-sitter/issues/1765#issuecomment-1271790298 -try { - //@ts-ignore - delete WebAssembly.instantiateStreaming -} catch {} diff --git a/server/yarn.lock b/server/yarn.lock index 41f29d6..e55c448 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -17,10 +17,10 @@ nan@2.17.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== -tree-sitter-awk@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/tree-sitter-awk/-/tree-sitter-awk-0.5.4.tgz#cff4e7fe904325b3b8bc6a7d94f7fcad54ce4c34" - integrity sha512-jIT1zkvRVTvoHDhLzEHCmaw3zi0uJJs9D9AO9qaqBcxKqKfwUMKUKVo+W8Xz+KT+1UwixRjkx8pCr+gCYnn//g== +tree-sitter-awk@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tree-sitter-awk/-/tree-sitter-awk-0.6.0.tgz#c99bf1f0a6ba1619ebc317958d826a995add1e72" + integrity sha512-bOz2UWopGA5vdgXWRBweiscyQWd8PuZtgGHpKKf1TQ0IMfZMRHqCo9YM5qcrBeMESDBOzu4pcAT6xT9z/18Uqw== dependencies: nan "2.17.0" @@ -54,7 +54,7 @@ vscode-languageserver@^7.0.0: dependencies: vscode-languageserver-protocol "3.16.0" -web-tree-sitter@0.20.7: - version "0.20.7" - resolved "https://registry.yarnpkg.com/web-tree-sitter/-/web-tree-sitter-0.20.7.tgz#b0ddb78e8244221a3100f432c7e162516cd9cd09" - integrity sha512-flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A== +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==