Skip to content

Commit 5e2a44a

Browse files
include generated files (#245)
* include generated files * add node-addon-api as dependency * bump node version * specify yarn and node versions for repo * update binding.gyp * check that generated files have been checked in * add automatic code generation hooks
1 parent 17b0805 commit 5e2a44a

File tree

12 files changed

+182744
-30
lines changed

12 files changed

+182744
-30
lines changed

.github/workflows/build-test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- uses: actions/checkout@v3
99
- uses: actions/setup-node@v3
1010
with:
11-
node-version: 16
11+
node-version: 20
1212

1313
- name: Display Node versions
1414
run: |
@@ -21,6 +21,11 @@ jobs:
2121
- name: Generate
2222
run: make
2323

24+
- run: ls src
25+
26+
- name: Check Git Contains Generated
27+
run: git add src && git diff --quiet HEAD -- src
28+
2429
- name: Test
2530
run: make test
2631

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
bindings/
21
node_modules/
3-
src/*
4-
!src/scanner.c
52
log.html
6-
binding.gyp
73
test_wild/
84
build/
5+
binding.gyp

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v20.12.0

binding.gyp.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
"targets": [
33
{
44
"target_name": "tree_sitter_rescript_binding",
5+
"dependencies": [
6+
"<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
7+
],
58
"include_dirs": [
6-
"<!(node -e \"require('nan')\")",
7-
"src"
9+
"src",
810
],
911
"sources": [
1012
"bindings/node/binding.cc",
1113
"src/parser.c",
1214
"src/scanner.c",
1315
],
1416
"cflags_c": [
15-
"-std=c99",
16-
]
17+
"-std=c11",
18+
],
1719
}
1820
]
1921
}

package.json

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,26 @@
55
"author": "Victor Nakoryakov",
66
"license": "MIT",
77
"dependencies": {
8-
"nan": "^2.15.0"
8+
"nan": "^2.15.0",
9+
"node-addon-api": "^8.0.0"
910
},
1011
"devDependencies": {
12+
"simple-git-hooks": "^2.11.1",
1113
"tree-sitter-cli": "^0.22.2"
1214
},
15+
"simple-git-hooks": {
16+
"pre-commit": "make generate && git add src"
17+
},
1318
"tree-sitter": [
1419
{
1520
"scope": "source.rescript",
16-
"file-types": [
17-
"res",
18-
"resi"
19-
],
21+
"file-types": ["res", "resi"],
2022
"injection-regex": "rescript",
21-
"highlights": [
22-
"queries/rescript/highlights.scm"
23-
],
24-
"locals": [
25-
"queries/rescript/locals.scm"
26-
],
27-
"injections": [
28-
"queries/rescript/injections.scm"
29-
],
30-
"textobjects": [
31-
"queries/rescript/textobjects.scm"
32-
]
23+
"highlights": ["queries/rescript/highlights.scm"],
24+
"locals": ["queries/rescript/locals.scm"],
25+
"injections": ["queries/rescript/injections.scm"],
26+
"textobjects": ["queries/rescript/textobjects.scm"]
3327
}
34-
]
28+
],
29+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
3530
}

0 commit comments

Comments
 (0)