Merge pull request #13 from fac/update-to-upstream

update to upstream

Author: asilano

.envrc

@@ -3,3 +3,4 @@ export PATH="$PWD/javascript/packages/printer/bin:$PATH"
 export PATH="$PWD/javascript/packages/formatter/bin:$PATH"
 export PATH="$PWD/javascript/packages/language-server/bin:$PATH"
 export PATH="$PWD/javascript/packages/highlighter/bin:$PATH"
+export PATH="$PWD/javascript/packages/stimulus-lint/bin:$PATH"

.github/workflows/build-gems.yml

@@ -65,7 +65,7 @@ jobs:
       - name: Add LLVM apt Repo
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main"
+          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
           sudo apt update
 
       - name: Install APT dependencies

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build
 
-on: [push]
+on: [push, pull_request]
 
 permissions:
   contents: read
@@ -18,7 +18,7 @@ jobs:
       - name: Add LLVM apt Repo
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main"
+          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
           sudo apt update
 
       - name: Install APT dependencies
@@ -57,13 +57,13 @@ jobs:
         run: ./run_herb_tests
 
       - name: clang-format version
-        run: clang-format-19 --version
+        run: clang-format-21 --version
 
       - name: Lint
         run: bin/lint
 
       - name: clang-tidy version
-        run: clang-tidy-19 --version
+        run: clang-tidy-21 --version
 
       - name: Tidy
         run: bin/tidy

.github/workflows/deploy.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Add LLVM apt Repo
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main"
+          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
           sudo apt update
 
       - name: Install APT dependencies

.github/workflows/javascript.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Add LLVM apt Repo
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main"
+          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
           sudo apt update
 
       - name: Install APT dependencies

Aptfile

@@ -1,7 +1,7 @@
 check
-clang-19
-clang-format-19
-clang-tidy-19
+clang-21
+clang-format-21
+clang-tidy-21
 emscripten
 doxygen
 xvfb

Brewfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 brew "check"
-brew "llvm@19" # for clang, clang-format and clang-tidy
+brew "llvm@21" # for clang, clang-format and clang-tidy
 brew "emscripten"
 brew "doxygen"

CONTRIBUTING.md

@@ -2,17 +2,17 @@
 
 Pull request, bug reports, and any other forms of contribution are welcomed and highly encouraged.
 
-If you encounter any issues when following along with this file please dont hesitate to reach out and file an issue!
+If you encounter any issues when following along with this file please don't hesitate to reach out and file an issue!
 
 ## Running Locally
 
 ### Requirements
 
 - [**Check**](https://libcheck.github.io/check/): For unit testing.
-- [**Clang 19**](https://clang.llvm.org): The compiler used to build this project.
-- [**Clang Format 19**](https://clang.llvm.org/docs/ClangFormat.html): For formatting the project.
-- [**Clang Tidy 19**](https://clang.llvm.org/extra/clang-tidy/): For linting the project.
-- [**Prism Ruby Parser v1.5.1**](https://github.com/ruby/prism/releases/tag/v1.5.1): We use Prism for Parsing the Ruby Source Code in the HTML+ERB files.
+- [**Clang 21**](https://clang.llvm.org): The compiler used to build this project.
+- [**Clang Format 21**](https://clang.llvm.org/docs/ClangFormat.html): For formatting the project.
+- [**Clang Tidy 21**](https://clang.llvm.org/extra/clang-tidy/): For linting the project.
+- [**Prism Ruby Parser v1.6.0**](https://github.com/ruby/prism/releases/tag/v1.6.0): We use Prism for Parsing the Ruby Source Code in the HTML+ERB files.
 - [**Ruby**](https://www.ruby-lang.org/en/): We need Ruby as a dependency for `bundler`.
 - [**Bundler**](https://bundler.io): We are using `bundler` to build [`prism`](https://github.com/ruby/prism) from source so we can build `herb` against it.
 - [**Emscripten**](https://emscripten.org): For the WebAssembly build of `libherb` so it can be used in the browser using the [`@herb-tools/browser`](https://github.com/marcoroth/herb/blob/main/javascript/packages/browser) package.
@@ -27,7 +27,7 @@ xargs sudo apt-get install < Aptfile
 or:
 
 ```bash
-sudo apt-get install check clang-19 clang-tidy-19 clang-format-19 emscripten doxygen
+sudo apt-get install check clang-21 clang-tidy-21 clang-format-21 emscripten doxygen
 ```
 
 ##### For macOS (using Homebrew)
@@ -38,7 +38,7 @@ brew bundle
 or:
 
 ```bash
-brew install check llvm@19 emscripten doxygen
+brew install check llvm@21 emscripten doxygen
 ```
 
 ### Building
@@ -73,7 +73,6 @@ The `herb` executable exposes a few commands for interacting with `.html.erb` fi
 Herb 🌿 Powerful and seamless HTML-aware ERB parsing and tooling.
 
 ./herb lex [file]      -  Lex a file
-./herb lex_json [file] -  Lex a file and return the result as json.
 ./herb parse [file]    -  Parse a file
 ./herb ruby [file]     -  Extract Ruby from a file
 ./herb html [file]     -  Extract HTML from a file

Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "prism", github: "ruby/prism", tag: "v1.5.1"
+gem "prism", github: "ruby/prism", tag: "v1.6.0"
 
 gem "actionview", "~> 8.0"
 gem "lz_string"

Gemfile.lock

@@ -9,15 +9,15 @@ GIT
 
 GIT
   remote: https://github.com/ruby/prism.git
-  revision: 23f16d31a7c57c4b927e1e3ec8f1281b45e7cb9f
-  tag: v1.5.1
+  revision: 2924f8f8832d57def7895cd7e2cc199ee58b3a3b
+  tag: v1.6.0
   specs:
-    prism (1.5.1)
+    prism (1.6.0)
 
 PATH
   remote: .
   specs:
-    herb (0.7.4)
+    herb (0.7.5)
 
 GEM
   remote: https://rubygems.org/