Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ jobs:
- name: Lint
run: bin/lint

- name: RBS Validation
run: |-
bundle exec rbs collection install --frozen
bundle exec rbs -Isig validate

- name: Steep
run: bundle exec steep check

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ tmp/*
# Bundler Config
!/.bundle/config

# RBS Collection files
.gem_rbs_collection/*

# Bundler
vendor/*
vendor/bundle/*
Expand Down
5 changes: 1 addition & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,5 @@ gem "reactionview", "~> 0.3.0"
gem "reline", "~> 0.6"
gem "rubocop", "~> 1.71"
gem "sorbet"
gem "steep", "~> 2.0"
gem "turbo-rails", "~> 2.0"

# TODO: Remove once https://github.com/ruby/rbs/pull/2850 is merged and released
gem "rbs", github: "marcoroth/rbs", branch: "psych-load-unsafe-file"
gem "steep", github: "soutaro/steep", branch: "master"
57 changes: 21 additions & 36 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,43 +1,10 @@
GIT
remote: https://github.com/marcoroth/rbs.git
revision: 6ed90f144c592a5d744b1a03df42bf834f137416
branch: psych-load-unsafe-file
specs:
rbs (4.0.0.dev.5)
logger
prism (>= 1.6.0)
tsort

GIT
remote: https://github.com/ruby/prism.git
revision: c0e37816e97e23e92524a4070e1b99a4025bc63f
tag: v1.9.0
specs:
prism (1.9.0)

GIT
remote: https://github.com/soutaro/steep.git
revision: 03e3440e16b64f314c9c7b5afd33888fb74ac11a
branch: master
specs:
steep (2.0.0.dev)
activesupport (>= 5.1)
concurrent-ruby (>= 1.1.10)
csv (>= 3.0.9)
fileutils (>= 1.1.0)
json (>= 2.1.0)
language_server-protocol (>= 3.17.0.4, < 4.0)
listen (~> 3.0)
logger (>= 1.3.0)
mutex_m (>= 0.3.0)
parser (>= 3.2)
rainbow (>= 2.2.2, < 4.0)
rbs (~> 4.0.0.dev)
securerandom (>= 0.1)
strscan (>= 1.0.0)
terminal-table (>= 2, < 5)
uri (>= 0.12.0)

PATH
remote: .
specs:
Expand Down Expand Up @@ -185,7 +152,6 @@ GEM
minitest (5.27.0)
minitest-difftastic (0.2.1)
difftastic (~> 0.6)
mutex_m (0.3.0)
nokogiri (1.19.3-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.3-aarch64-linux-musl)
Expand Down Expand Up @@ -249,6 +215,10 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rbs (4.0.2)
logger
prism (>= 1.6.0)
tsort
rbs-inline (0.13.0)
prism (>= 0.29)
rbs (>= 3.8.0)
Expand Down Expand Up @@ -283,6 +253,22 @@ GEM
sorbet-static (0.6.13185-aarch64-linux)
sorbet-static (0.6.13185-universal-darwin)
sorbet-static (0.6.13185-x86_64-linux)
steep (2.0.0)
concurrent-ruby (>= 1.1.10)
csv (>= 3.0.9)
fileutils (>= 1.1.0)
json (>= 2.1.0)
language_server-protocol (>= 3.17.0.4, < 4.0)
listen (~> 3.0)
logger (>= 1.3.0)
parser (>= 3.2)
prism (>= 0.25.0)
rainbow (>= 2.2.2, < 4.0)
rbs (~> 4.0)
securerandom (>= 0.1)
strscan (>= 1.0.0)
terminal-table (>= 2, < 5)
uri (>= 0.12.0)
stringio (3.2.0)
strscan (3.1.7)
terminal-table (4.0.0)
Expand Down Expand Up @@ -328,13 +314,12 @@ DEPENDENCIES
rake (~> 13.4)
rake-compiler (~> 1.3)
rake-compiler-dock (~> 1.12)
rbs!
rbs-inline (~> 0.13)
reactionview (~> 0.3.0)
reline (~> 0.6)
rubocop (~> 1.71)
sorbet
steep!
steep (~> 2.0)
turbo-rails (~> 2.0)

BUNDLED WITH
Expand Down
1 change: 1 addition & 0 deletions Steepfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ target :lib do
check "lib"

library "delegate"
library "did_you_mean"
library "digest"
library "json"
library "pathname"
Expand Down
2 changes: 1 addition & 1 deletion lib/herb/action_view/render_analyzer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ def process_file_for_render_calls(file)
def ensure_parallel!
return if defined?(Parallel)

Herb.ensure_installed { gem "parallel" } # steep:ignore
Herb.ensure_installed { gem "parallel" }
end

def collect_ruby_render_references
Expand Down
Loading
Loading