diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5679996..31f2deb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,10 @@ jobs: shell: bash run: | npm install + export PATH=./node_modules/.bin:$PATH + tree-sitter generate + tree-sitter test + tree-sitter parse examples/*.scala --quiet --time npm test - name: Check fidelity of checked-in C code diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index ccf6b6a..1cf38d7 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -20,12 +20,14 @@ jobs: - name: Generate parser from scratch run: | npm install - npm run build + export PATH=./node_modules/.bin:$PATH + tree-sitter generate - name: Format Javascipt run: | npm install - npm run format + export PATH=./node_modules/.bin:$PATH + prettier --write --ignore-unknown grammar.js - name: Check for changes uses: tj-actions/verify-changed-files@v19 diff --git a/package-lock.json b/package-lock.json index 89b6deb..2f68803 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,11 +20,6 @@ }, "peerDependencies": { "tree-sitter": "^0.21.1" - }, - "peerDependenciesMeta": { - "tree-sitter": { - "optional": true - } } }, "node_modules/base64-js": { @@ -329,6 +324,18 @@ "node": ">=6" } }, + "node_modules/tree-sitter": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.21.1.tgz", + "integrity": "sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==", + "hasInstallScript": true, + "license": "MIT", + "peer": true, + "dependencies": { + "node-addon-api": "^8.0.0", + "node-gyp-build": "^4.8.0" + } + }, "node_modules/tree-sitter-cli": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.23.0.tgz", diff --git a/package.json b/package.json index cd166b9..dc02ede 100644 --- a/package.json +++ b/package.json @@ -37,10 +37,7 @@ "install": "node-gyp-build", "prestart": "tree-sitter build --wasm", "start": "tree-sitter playground", - "build": "tree-sitter generate && node-gyp build", - "test": "tree-sitter test && tree-sitter parse examples/*.scala --quiet --time && node --test bindings/node/*_test.js", - "format": "prettier --write --ignore-unknown grammar.js", - "prebuildify": "prebuildify --napi --strip" + "test": "node --test bindings/node/*_test.js" }, "tree-sitter": [ {