diff --git a/Cargo.lock b/Cargo.lock index 535d8991..707b5790 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1369,7 +1369,7 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.21.0" +version = "0.22.0" dependencies = [ "bindgen", "cc", @@ -1380,7 +1380,7 @@ dependencies = [ [[package]] name = "tree-sitter-cli" -version = "0.21.0" +version = "0.22.0" dependencies = [ "ansi_term", "anstyle", @@ -1426,7 +1426,7 @@ dependencies = [ [[package]] name = "tree-sitter-config" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "dirs", @@ -1436,7 +1436,7 @@ dependencies = [ [[package]] name = "tree-sitter-highlight" -version = "0.21.0" +version = "0.22.0" dependencies = [ "lazy_static", "regex", @@ -1446,7 +1446,7 @@ dependencies = [ [[package]] name = "tree-sitter-loader" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "cc", @@ -1466,7 +1466,7 @@ dependencies = [ [[package]] name = "tree-sitter-tags" -version = "0.21.0" +version = "0.22.0" dependencies = [ "memchr", "regex", diff --git a/Cargo.toml b/Cargo.toml index 0ef2ba74..63ef5f0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.21.0" +version = "0.22.0" authors = ["Max Brunsfeld "] edition = "2021" rust-version = "1.74.1" @@ -86,8 +86,8 @@ wasmparser = "0.201.0" webbrowser = "0.8.13" which = "6.0.0" -tree-sitter = { version = "=0.21.0", path = "./lib" } -tree-sitter-loader = { version = "=0.21.0", path = "./cli/loader" } -tree-sitter-config = { version = "=0.21.0", path = "./cli/config" } -tree-sitter-highlight = { version = "=0.21.0", path = "./highlight" } -tree-sitter-tags = { version = "=0.21.0", path = "./tags" } +tree-sitter = { version = "0.22.0", path = "./lib" } +tree-sitter-loader = { version = "0.22.0", path = "./cli/loader" } +tree-sitter-config = { version = "0.22.0", path = "./cli/config" } +tree-sitter-highlight = { version = "0.22.0", path = "./highlight" } +tree-sitter-tags = { version = "0.22.0", path = "./tags" } diff --git a/Makefile b/Makefile index dc473a86..2e0d0741 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION := 0.21.0 +VERSION := 0.22.0 # install directory layout PREFIX ?= /usr/local diff --git a/Package.swift b/Package.swift index 3a9984cd..79084cb9 100644 --- a/Package.swift +++ b/Package.swift @@ -17,6 +17,7 @@ let package = Package( exclude: [ "binding_rust", "binding_web", + "node_modules", "Cargo.toml", "README.md", "src/unicode/README.md", diff --git a/cli/npm/package.json b/cli/npm/package.json index 873b7068..3d0f28d7 100644 --- a/cli/npm/package.json +++ b/cli/npm/package.json @@ -1,6 +1,6 @@ { "name": "tree-sitter-cli", - "version": "0.21.0", + "version": "0.22.0", "author": "Max Brunsfeld", "license": "MIT", "repository": { diff --git a/cli/src/generate/mod.rs b/cli/src/generate/mod.rs index 21c9555e..ea850c8d 100644 --- a/cli/src/generate/mod.rs +++ b/cli/src/generate/mod.rs @@ -41,6 +41,8 @@ struct GeneratedParser { node_types_json: String, } +pub const ALLOC_HEADER: &str = include_str!("./templates/alloc.h"); + pub fn generate_parser_in_directory( repo_path: &Path, grammar_path: Option<&str>, @@ -122,7 +124,7 @@ pub fn generate_parser_in_directory( write_file(&src_path.join("parser.c"), c_code)?; write_file(&src_path.join("node-types.json"), node_types_json)?; - write_file(&header_path.join("alloc.h"), tree_sitter::ALLOC_HEADER)?; + write_file(&header_path.join("alloc.h"), ALLOC_HEADER)?; write_file(&header_path.join("array.h"), tree_sitter::ARRAY_HEADER)?; write_file(&header_path.join("parser.h"), tree_sitter::PARSER_HEADER)?; diff --git a/lib/binding_rust/lib.rs b/lib/binding_rust/lib.rs index 65bed75b..0ec9a8a0 100644 --- a/lib/binding_rust/lib.rs +++ b/lib/binding_rust/lib.rs @@ -44,7 +44,6 @@ pub const LANGUAGE_VERSION: usize = ffi::TREE_SITTER_LANGUAGE_VERSION as usize; pub const MIN_COMPATIBLE_LANGUAGE_VERSION: usize = ffi::TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION as usize; -pub const ALLOC_HEADER: &str = include_str!("../../cli/src/generate/templates/alloc.h"); pub const ARRAY_HEADER: &str = include_str!("../src/array.h"); pub const PARSER_HEADER: &str = include_str!("../src/parser.h"); diff --git a/lib/binding_web/package.json b/lib/binding_web/package.json index 7710dfb6..12051fca 100644 --- a/lib/binding_web/package.json +++ b/lib/binding_web/package.json @@ -1,6 +1,6 @@ { "name": "web-tree-sitter", - "version": "0.21.0", + "version": "0.22.0", "description": "Tree-sitter bindings for the web", "main": "tree-sitter.js", "types": "tree-sitter-web.d.ts",