Skip to content

Update erb_lint to 0.7.0 #11610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthinz merged 4 commits into from
Dec 6, 2024
Merged

Update erb_lint to 0.7.0 #11610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05b518c
Update erb_lint to 0.7.0
matthinz Dec 6, 2024
c6d332c
Rename .erb-lint.yml to silence warning
matthinz Dec 6, 2024
88af03a
We say erb_lint now
matthinz Dec 6, 2024
022ef61
Fix a couple more instances of erb-lint
matthinz Dec 6, 2024
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
0 .erb-lint.yml → .erb_lint.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ group :development, :test do
gem 'brakeman', require: false
gem 'bullet', '~> 7.0'
gem 'capybara-webmock', git: 'https://github.com/hashrocket/capybara-webmock.git', ref: 'd3f3b7c'
gem 'erb_lint', '~> 0.5.0', require: false
gem 'erb_lint', '~> 0.7.0', require: false
gem 'i18n-tasks', '~> 1.0'
gem 'knapsack'
gem 'listen'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,12 @@ GEM
htmlentities (~> 4.3.3)
launchy (~> 2.1)
mail (~> 2.7)
erb_lint (0.5.0)
erb_lint (0.7.0)
activesupport
better_html (>= 2.0.1)
parser (>= 2.7.1.4)
rainbow
rubocop
rubocop (>= 1)
smart_properties
errbase (0.2.1)
erubi (1.13.0)
Expand Down Expand Up @@ -779,7 +779,7 @@ DEPENDENCIES
devise (~> 4.8)
dotiw (>= 4.0.1)
email_spec
erb_lint (~> 0.5.0)
erb_lint (~> 0.7.0)
factory_bot_rails (>= 6.2.0)
faker
faraday (~> 2)
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ check: lint test ## Runs lint tests and spec tests

lint: ## Runs all lint tests
# Ruby
@echo "--- erb-lint ---"
@echo "--- erb_lint ---"
make lint_erb
@echo "--- rubocop ---"
mkdir -p tmp
Expand Down Expand Up @@ -112,7 +112,7 @@ audit: ## Checks packages for vulnerabilities
yarn audit --groups dependencies; test $$? -le 7

lint_erb: ## Lints ERB files
bundle exec erblint app/views app/components
bundle exec erb_lint app/views app/components

lint_yaml: normalize_yaml ## Lints YAML files
(! git diff --name-only | grep "^config/.*\.yml") || (echo "Error: Run 'make normalize_yaml' to normalize YAML"; exit 1)
Expand Down Expand Up @@ -181,8 +181,8 @@ lint_spec_file_name:
lintfix: ## Try to automatically fix any Ruby, ERB, JavaScript, YAML, or CSS lint errors
@echo "--- rubocop fix ---"
bundle exec rubocop -a
@echo "--- erblint fix ---"
bundle exec erblint app/views app/components -a
@echo "--- erb_lint fix ---"
bundle exec erb_lint app/views app/components -a
@echo "--- eslint fix ---"
yarn lint --fix
@echo "--- stylelint fix ---"
Expand Down
2 changes: 1 addition & 1 deletion spec/support/deprecated_classes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class ActionView::Helpers::TagHelper::TagBuilder
def self.deprecated_classes
@deprecated_classes ||= begin
YAML.safe_load(File.read(File.expand_path('../../../.erb-lint.yml', __FILE__))).
YAML.safe_load(File.read(File.expand_path('../../../.erb_lint.yml', __FILE__))).
dig('linters', 'DeprecatedClasses', 'rule_set').
flat_map { |rule| rule['deprecated'] }.
map { |regex_str| Regexp.new "^#{regex_str}$" }
Expand Down