Skip to content

Commit ca2e9ee

Browse files
char0nchar0n
authored
fix(deps): resolve downstream tree-sitter peer dep issue (#4947)
1 parent 7c36e88 commit ca2e9ee

File tree

9 files changed

+587
-544
lines changed

9 files changed

+587
-544
lines changed

‎package-lock.json

Lines changed: 549 additions & 518 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"scripts": {
21-
"prebuild": "cd ./packages/apidom-parser-adapter-json/node_modules/tree-sitter && node-gyp rebuild && cd ../../../apidom-parser-adapter-yaml-1-2/node_modules/tree-sitter && node-gyp rebuild && cd ../../../../node_modules/tree-sitter-json && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild && cd ../@tree-sitter-grammars/tree-sitter-yaml && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild",
21+
"prebuild": "cd ./node_modules/tree-sitter && node-gyp rebuild && cd ../../packages/apidom-parser-adapter-yaml-1-2/node_modules/tree-sitter && node-gyp rebuild && cd ../../../../node_modules/tree-sitter-json && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild && cd ../../packages/apidom-parser-adapter-yaml-1-2/node_modules/@tree-sitter-grammars/tree-sitter-yaml && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild",
2222
"build": "lerna run build",
2323
"build:es": "lerna run build:es",
2424
"build:cjs": "lerna run build:cjs",

‎packages/apidom-ls/tsconfig.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"compilerOptions": {
88
"resolveJsonModule": true,
99
"isolatedModules": false,
10+
"baseUrl": ".",
11+
"paths": {
12+
"tree-sitter": ["../apidom-parser-adapter-yaml-1-2/node_modules/tree-sitter/tree-sitter.d.ts"]
13+
}
1014
},
1115
"ts-node": {
1216
"files": true

‎packages/apidom-ns-api-design-systems/tsconfig.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
22
"extends": "../../tsconfig.json",
3+
"compilerOptions": {
4+
"baseUrl": ".",
5+
"paths": {
6+
"tree-sitter": ["../apidom-parser-adapter-yaml-1-2/node_modules/tree-sitter/tree-sitter.d.ts"]
7+
},
8+
},
39
"include": [
410
"src/**/*"
511
]

‎packages/apidom-parser-adapter-json/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@types/ramda": "~0.30.0",
6060
"ramda": "~0.30.0",
6161
"ramda-adjunct": "^5.0.0",
62-
"tree-sitter": "=0.22.1",
62+
"tree-sitter": "=0.21.1",
6363
"tree-sitter-json": "=0.24.8",
6464
"web-tree-sitter": "=0.24.5"
6565
},

‎packages/apidom-parser-adapter-yaml-1-2/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"build:es": "npm run build:wasm && npm run build:wasm:copy && cross-env BABEL_ENV=es babel src --out-dir src --extensions '.ts' --out-file-extension '.mjs' --root-mode 'upward'",
3131
"build:cjs": "npm run build:wasm && npm run build:wasm:copy && BABEL_ENV=cjs babel src --out-dir src --extensions '.ts' --out-file-extension '.cjs' --root-mode 'upward'",
3232
"build:umd:browser": "npm run build:wasm && npm run build:wasm:copy && cross-env BABEL_ENV=browser webpack --config config/webpack/browser.config.js --progress",
33-
"build:wasm": "node ../../scripts/file-exists.js ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm && exit 0 || cd ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild",
34-
"build:wasm:copy": "copyfiles -u 5 ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm wasm",
33+
"build:wasm": "node ../../scripts/file-exists.js ./node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm && exit 0 || cd ./node_modules/@tree-sitter-grammars/tree-sitter-yaml && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild",
34+
"build:wasm:copy": "copyfiles -u 3 ./node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm wasm",
3535
"lint": "eslint ./",
3636
"lint:fix": "eslint ./ --fix",
3737
"clean": "rimraf --glob 'src/**/*.mjs' 'src/**/*.cjs' 'test/**/*.mjs' ./dist ./types",
@@ -59,7 +59,7 @@
5959
"@types/ramda": "~0.30.0",
6060
"ramda": "~0.30.0",
6161
"ramda-adjunct": "^5.0.0",
62-
"tree-sitter": "=0.22.1",
62+
"tree-sitter": "=0.22.4",
6363
"web-tree-sitter": "=0.24.5"
6464
},
6565
"devDependencies": {

‎packages/apidom-parser-adapter-yaml-1-2/src/lexical-analysis/node.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Parser, { Tree } from 'tree-sitter';
33
import YAMLLanguage from '@tree-sitter-grammars/tree-sitter-yaml';
44

55
const parser = new Parser();
6+
// @ts-ignore
67
parser.setLanguage(YAMLLanguage);
78

89
/**

‎packages/apidom-reference/package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -268,26 +268,26 @@
268268
"ramda-adjunct": "^5.0.0"
269269
},
270270
"optionalDependencies": {
271-
"@swagger-api/apidom-json-pointer": "^1.0.0-beta.3 <1.0.0-rc.0",
272-
"@swagger-api/apidom-ns-arazzo-1": "^1.0.0-beta.3 <1.0.0-rc.0",
273-
"@swagger-api/apidom-ns-asyncapi-2": "^1.0.0-beta.3 <1.0.0-rc.0",
274-
"@swagger-api/apidom-ns-openapi-2": "^1.0.0-beta.3 <1.0.0-rc.0",
275-
"@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-beta.3 <1.0.0-rc.0",
276-
"@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-beta.3 <1.0.0-rc.0",
277-
"@swagger-api/apidom-parser-adapter-api-design-systems-json": "^1.0.0-beta.3 <1.0.0-rc.0",
278-
"@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^1.0.0-beta.3 <1.0.0-rc.0",
279-
"@swagger-api/apidom-parser-adapter-arazzo-json-1": "^1.0.0-beta.3 <1.0.0-rc.0",
280-
"@swagger-api/apidom-parser-adapter-arazzo-yaml-1": "^1.0.0-beta.3 <1.0.0-rc.0",
281-
"@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^1.0.0-beta.3 <1.0.0-rc.0",
282-
"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^1.0.0-beta.3 <1.0.0-rc.0",
283-
"@swagger-api/apidom-parser-adapter-json": "^1.0.0-beta.3 <1.0.0-rc.0",
284-
"@swagger-api/apidom-parser-adapter-openapi-json-2": "^1.0.0-beta.3 <1.0.0-rc.0",
285-
"@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^1.0.0-beta.3 <1.0.0-rc.0",
286-
"@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^1.0.0-beta.3 <1.0.0-rc.0",
287-
"@swagger-api/apidom-parser-adapter-openapi-yaml-2": "^1.0.0-beta.3 <1.0.0-rc.0",
288-
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^1.0.0-beta.3 <1.0.0-rc.0",
289-
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^1.0.0-beta.3 <1.0.0-rc.0",
290-
"@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-beta.3 <1.0.0-rc.0"
271+
"@swagger-api/apidom-json-pointer": "^1.0.0-beta.40 <1.0.0-rc.0",
272+
"@swagger-api/apidom-ns-arazzo-1": "^1.0.0-beta.40 <1.0.0-rc.0",
273+
"@swagger-api/apidom-ns-asyncapi-2": "^1.0.0-beta.40 <1.0.0-rc.0",
274+
"@swagger-api/apidom-ns-openapi-2": "^1.0.0-beta.40 <1.0.0-rc.0",
275+
"@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-beta.40 <1.0.0-rc.0",
276+
"@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-beta.40 <1.0.0-rc.0",
277+
"@swagger-api/apidom-parser-adapter-api-design-systems-json": "^1.0.0-beta.40 <1.0.0-rc.0",
278+
"@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^1.0.0-beta.40 <1.0.0-rc.0",
279+
"@swagger-api/apidom-parser-adapter-arazzo-json-1": "^1.0.0-beta.40 <1.0.0-rc.0",
280+
"@swagger-api/apidom-parser-adapter-arazzo-yaml-1": "^1.0.0-beta.40 <1.0.0-rc.0",
281+
"@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^1.0.0-beta.40 <1.0.0-rc.0",
282+
"@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^1.0.0-beta.40 <1.0.0-rc.0",
283+
"@swagger-api/apidom-parser-adapter-json": "^1.0.0-beta.40 <1.0.0-rc.0",
284+
"@swagger-api/apidom-parser-adapter-openapi-json-2": "^1.0.0-beta.40 <1.0.0-rc.0",
285+
"@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^1.0.0-beta.40 <1.0.0-rc.0",
286+
"@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^1.0.0-beta.40 <1.0.0-rc.0",
287+
"@swagger-api/apidom-parser-adapter-openapi-yaml-2": "^1.0.0-beta.40 <1.0.0-rc.0",
288+
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^1.0.0-beta.40 <1.0.0-rc.0",
289+
"@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^1.0.0-beta.40 <1.0.0-rc.0",
290+
"@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-beta.40 <1.0.0-rc.0"
291291
},
292292
"devDependencies": {
293293
"@swagger-api/apidom-json-pointer": "*",

‎packages/apidom-reference/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"paths": {
66
"#buffer": ["./src/util/polyfills/buffer/protocol-import.ts"],
77
"#fs": ["./src/util/polyfills/fs/protocol-import.ts"],
8-
"#util": ["./src/util/polyfills/util/protocol-import.ts"]
8+
"#util": ["./src/util/polyfills/util/protocol-import.ts"],
9+
"tree-sitter": ["../apidom-parser-adapter-yaml-1-2/node_modules/tree-sitter/tree-sitter.d.ts"]
910
},
1011
},
1112
"include": [

0 commit comments

Comments
 (0)