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

Merge upstream into main

Author: asilano

.github/workflows/build-gems.yml

@@ -101,3 +101,68 @@ jobs:
           path: pkg/*.gem
           if-no-files-found: error
           retention-days: 7
+
+  push:
+    name: Push gems with trusted publishing
+    if: github.event_name == 'release' && github.repository_owner == 'marcoroth'
+    needs: build
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - default
+          - aarch64-linux-gnu
+          - x86_64-linux-gnu
+          - x86_64-linux-musl
+          - aarch64-linux-musl
+          - x86_64-darwin
+          - arm64-darwin
+          - arm-linux-gnu
+          - arm-linux-musl
+          - x86-linux-gnu
+          - x86-linux-musl
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Vendor the attestation patch from rubygems/release-gem
+      - name: Vendor release-gem patch
+        uses: actions/checkout@v4
+        with:
+          repository: rubygems/release-gem
+          ref: a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
+          path: .github/_release-gem
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.4'
+          bundler-cache: false
+
+      - name: Download gem artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: gem-${{ matrix.target }}
+          path: pkg/
+
+      - name: Configure trusted publishing credentials
+        uses: rubygems/configure-rubygems-credentials@v1.0.0
+
+      - name: Push gem with Sigstore attestation
+        env:
+          # Preload the attestation patch so `gem push` generates & attaches the bundle
+          RUBYOPT: "-r${{ github.workspace }}/.github/_release-gem/rubygems-attestation-patch.rb"
+        run: |
+          cd pkg
+          for gem_file in *.gem; do
+            if [ -f "$gem_file" ]; then
+              echo "Pushing $gem_file"
+              gem push "$gem_file"
+            fi
+          done

.gitignore

@@ -78,6 +78,9 @@ vendor/*
 vendor/bundle/*
 vendor/cache/*
 
+# Prism Vendor
+vendor/prism/*
+
 # Bundled .gem files
 pkg/*
 

CONTRIBUTING.md

@@ -12,7 +12,7 @@ If you encounter any issues when following along with this file please dont hesi
 - [**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.4.0**](https://github.com/ruby/prism/releases/tag/v1.4.0): We use Prism for Parsing the Ruby Source Code in the HTML+ERB files.
+- [**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.
 - [**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.
@@ -159,4 +159,3 @@ The integration was successful if you see:
 
 Integration successful!
 ```
-

Gemfile

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

Gemfile.lock

@@ -9,15 +9,15 @@ GIT
 
 GIT
   remote: https://github.com/ruby/prism.git
-  revision: 266f83de6a2b0c1557404dde33ad3d41ceba7043
-  tag: v1.4.0
+  revision: 23f16d31a7c57c4b927e1e3ec8f1281b45e7cb9f
+  tag: v1.5.1
   specs:
-    prism (1.4.0)
+    prism (1.5.1)
 
 PATH
   remote: .
   specs:
-    herb (0.7.0)
+    herb (0.7.4)
 
 GEM
   remote: https://rubygems.org/

Makefile

@@ -101,6 +101,7 @@ clean:
 	rm -f $(exec) $(test_exec) $(lib_name) $(shared_lib_name) $(ruby_extension)
 	rm -rf $(objects) $(test_objects) $(extension_objects) lib/herb/*.bundle tmp
 	rm -rf $(prism_path)
+	rake prism:clean
 
 bundle_install:
 	bundle install
@@ -110,6 +111,7 @@ templates: bundle_install
 
 prism: bundle_install
 	cd $(prism_path) && ruby templates/template.rb && make static && cd -
+	rake prism:vendor
 
 format:
 	$(clang_format) -i $(project_and_extension_files)

README.md

@@ -99,7 +99,7 @@ Commands:
   bundle exec herb version            Prints the versions of the Herb gem and the libherb library.
 ```
 
-For detailed information, like how you can use Herb progamatiacally in Ruby and JavaScript, visit the [documentation site](https://herb-tools.dev/bindings/ruby/reference).
+For detailed information, like how you can use Herb programatically in Ruby and JavaScript, visit the [documentation site](https://herb-tools.dev/bindings/ruby/reference).
 
 
 ## Background and Talk

Rakefile

@@ -128,6 +128,51 @@ task :templates do
   end
 end
 
+prism_vendor_path = "vendor/prism"
+
+namespace :prism do
+  desc "Setup and vendor Prism"
+  task :vendor do
+    Rake::Task["prism:clean"].execute
+
+    prism_bundle_path = `bundle show prism`.chomp
+
+    puts prism_bundle_path
+
+    if prism_bundle_path.empty?
+      puts "Make sure to run `bundle install` in the herb project directory first"
+      exit 1
+    end
+
+    FileUtils.mkdir_p(prism_vendor_path)
+
+    files = [
+      "config.yml",
+      "Rakefile",
+      "src/",
+      "include/",
+      "templates/"
+    ]
+
+    files.each do |file|
+      vendored_file_path = prism_vendor_path + "/#{file}"
+      puts "Vendoring '#{file}' Prism file to #{vendored_file_path}"
+      FileUtils.cp_r(prism_bundle_path + "/#{file}", prism_vendor_path)
+    end
+  end
+
+  desc "Clean vendored Prism in vendor/prism/"
+  task :clean do
+    puts "Cleaning up vendored Prism at #{prism_vendor_path}..."
+    begin
+      FileUtils.rm_r(prism_vendor_path)
+      puts "Cleaned up vendored Prism."
+    rescue Errno::ENOENT
+      puts "Vendored prism at: #{prism_vendor_path} didn't exist. Skipping."
+    end
+  end
+end
+
 namespace :templates do
   desc "Watch template files and regenerate on changes"
   task :watch do
@@ -199,4 +244,4 @@ task rbs_inline: :templates do
   end
 end
 
-task default: [:templates, :make, :compile, :test]
+task default: [:templates, "prism:vendor", :make, :compile, :test]

docs/package.json

@@ -19,9 +19,9 @@
     "fetch:contributors": "mkdir -p .vitepress/data/ && gh api -X get https://api.github.com/repos/marcoroth/herb/contributors > .vitepress/data/contributors.json"
   },
   "dependencies": {
-    "@herb-tools/browser": "0.7.0",
-    "@herb-tools/core": "0.7.0",
-    "@herb-tools/node": "0.7.0"
+    "@herb-tools/browser": "0.7.4",
+    "@herb-tools/core": "0.7.4",
+    "@herb-tools/node": "0.7.4"
   },
   "devDependencies": {
     "@shikijs/vitepress-twoslash": "^3.4.2",

examples/comment_before_content.html.erb

@@ -0,0 +1,2 @@
+<% # This file contains a comment before other content %>
+<div>Hey there</div>