Skip to content

Commit

Permalink
Update all versions of tools
Browse files Browse the repository at this point in the history
Update js, rust, and system tools. Switch to the new eslint config file
format.
  • Loading branch information
tgross35 committed Jun 24, 2024
1 parent fd814fc commit 62836f6
Show file tree
Hide file tree
Showing 9 changed files with 500 additions and 656 deletions.
28 changes: 0 additions & 28 deletions .eslintrc.js

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: taiki-e/install-action@just
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- run: pip install ruff
- name: Get npm cache directory
id: npm-cache-dir
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- uses: taiki-e/install-action@just
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- name: Get npm cache directory
id: npm-cache-dir
shell: bash
Expand Down
39 changes: 21 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ path = "bindings/rust/lib.rs"
tree-sitter = "~0.20.10"

[build-dependencies]
cc = "~1.0.83"
cc = "~1.0.100"
42 changes: 42 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import globals from "globals";
import google from "eslint-config-google";
import prettier from "eslint-config-prettier";

export default [
{
ignores: ["repositories/", "target/"],
},
prettier,
{
...google,
languageOptions: {
globals: {
...globals.commonjs,
...globals.es2021,
},

ecmaVersion: "latest",
sourceType: "module",
},

rules: {
indent: [
"error",
2,
{
SwitchCase: 1,
},
],

"max-len": [
"error",
{
code: 120,
ignoreComments: true,
ignoreUrls: true,
ignoreStrings: true,
},
],
},
},
];
3 changes: 0 additions & 3 deletions grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
* @license Apache-2.0
*/

/* eslint-disable arrow-parens */
/* eslint-disable camelcase */
/* eslint-disable-next-line spaced-comment */
/// <reference types="tree-sitter-cli/dsl" />
// @ts-check

Expand Down
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ fuzz_out := bin_dir / "fuzz.out"

ts_path := justfile_directory() / "repositories" / "tree-sitter"
ts_repo := "https://github.com/tree-sitter/tree-sitter"
ts_sha := "cdd46888603e06d6474a96c0024907f68242c45f" # v0.22.5
ts_sha := "b40f342067a89cd6331bf4c27407588320f3c263" # v0.22.6

just_path := justfile_directory() / "repositories" / "just"
just_repo := "https://github.com/casey/just.git"
just_sha := "a2ff42e6c37ba5c429d444f3a18d3633e59f9a34" # 1.24.0
just_sha := "5f91b37c82e6a92df2575babcb17a6a8e9c505f7" # 1.29.1

include_args := "-Isrc/ -I" + ts_path + "/lib/include -Inode_modules/nan"
general_cflags := "-Wall -Werror --pedantic -Wno-format-pedantic"
Expand Down
Loading

0 comments on commit 62836f6

Please sign in to comment.