Skip to content

Commit 2999433

Browse files
committed
Share Rubocop versions
1 parent de91e38 commit 2999433

File tree

7 files changed

+54
-53
lines changed

7 files changed

+54
-53
lines changed

.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ AllCops:
3232
Naming/FileName:
3333
Exclude:
3434
- '**/Gemfile'
35+
- '**/Gemfile.*'
3536
- '**/Rakefile'
3637

3738
Layout/LineLength:

Gemfile.shared_dev_dependencies

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# frozen_string_literal: true
2+
3+
# Shared development dependencies for react_on_rails and react_on_rails_pro
4+
# This ensures consistent versions across the monorepo
5+
6+
group :development, :test do
7+
gem "rubocop", "1.61.0", require: false
8+
gem "rubocop-performance", "~>1.20.0", require: false
9+
gem "rubocop-rspec", "~>2.26", require: false
10+
end

react_on_rails/Gemfile.development_dependencies

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# frozen_string_literal: true
22

3+
eval_gemfile File.expand_path("../Gemfile.shared_dev_dependencies", __dir__)
4+
35
gem "shakapacker", "9.4.0"
46
gem "bootsnap", require: false
57
gem "rails", "~> 7.1"
@@ -35,9 +37,6 @@ group :development, :test do
3537
gem "pry-rescue"
3638
gem "rbs", require: false
3739
gem "steep", require: false
38-
gem "rubocop", "1.61.0", require: false
39-
gem "rubocop-performance", "~>1.20.0", require: false
40-
gem "rubocop-rspec", "~>2.26", require: false
4140
gem "spring", "~> 4.0"
4241
gem "lefthook", require: false
4342
# Added for Ruby 3.5+ compatibility to silence warnings

react_on_rails_pro/Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@ source "https://rubygems.org"
55
# Specify your gem"s dependencies in react_on_rails.gemspec
66
gemspec
77

8+
# Shared dev dependencies must be loaded here (not in Gemfile.development_dependencies)
9+
# because Gemfile.loader uses eval() which breaks __dir__ resolution
10+
eval_gemfile File.expand_path("../Gemfile.shared_dev_dependencies", __dir__)
11+
812
eval_gemfile File.expand_path("./Gemfile.loader", __dir__)

react_on_rails_pro/Gemfile.development_dependencies

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Keep in sync with https://github.com/shakacode/react_on_rails/blob/master/Gemfile.development_dependencies
22
# frozen_string_literal: true
33

4+
# NOTE: Shared dev dependencies (rubocop, etc.) are loaded via eval_gemfile in
5+
# the main Gemfile, not here. This is because Gemfile.loader uses eval() which
6+
# breaks __dir__ resolution for eval_gemfile calls.
7+
48
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
59

610
ruby '3.3.7'
@@ -51,9 +55,6 @@ group :development, :test do
5155
gem 'pry-theme' # An easy way to customize Pry colors via theme files
5256

5357
gem "rbs", require: false
54-
gem "rubocop", "1.36.0", require: false
55-
gem 'rubocop-performance', "1.15.0", require: false
56-
gem 'rubocop-rspec', "2.13.2", require: false
5758
gem "scss_lint", require: false
5859
gem 'fakefs', require: 'fakefs/safe'
5960
end

react_on_rails_pro/Gemfile.lock

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ GEM
110110
addressable (2.8.8)
111111
public_suffix (>= 2.0.2, < 8.0)
112112
amazing_print (1.6.0)
113-
ast (2.4.2)
113+
ast (2.4.3)
114114
async (2.35.0)
115115
console (~> 1.29)
116116
fiber-annotation
@@ -208,6 +208,7 @@ GEM
208208
json (2.17.1)
209209
jwt (2.10.2)
210210
base64
211+
language_server-protocol (3.17.0.5)
211212
launchy (3.0.1)
212213
addressable (~> 2.8)
213214
childprocess (~> 5.0)
@@ -252,14 +253,15 @@ GEM
252253
nokogiri (1.18.10-x86_64-linux-gnu)
253254
racc (~> 1.4)
254255
package_json (0.2.0)
255-
parallel (1.25.1)
256-
parser (3.3.3.0)
256+
parallel (1.27.0)
257+
parser (3.3.10.0)
257258
ast (~> 2.4.1)
258259
racc
259260
pg (1.5.6)
260261
pp (0.6.3)
261262
prettyprint
262263
prettyprint (0.2.0)
264+
prism (1.6.0)
263265
protocol (2.0.0)
264266
ruby_parser (~> 3.0)
265267
pry (0.14.2)
@@ -356,23 +358,34 @@ GEM
356358
rspec-support (3.13.1)
357359
rspec_junit_formatter (0.6.0)
358360
rspec-core (>= 2, < 4, != 2.12.0)
359-
rubocop (1.36.0)
361+
rubocop (1.61.0)
360362
json (~> 2.3)
363+
language_server-protocol (>= 3.17.0)
361364
parallel (~> 1.10)
362-
parser (>= 3.1.2.1)
365+
parser (>= 3.3.0.2)
363366
rainbow (>= 2.2.2, < 4.0)
364367
regexp_parser (>= 1.8, < 3.0)
365368
rexml (>= 3.2.5, < 4.0)
366-
rubocop-ast (>= 1.20.1, < 2.0)
369+
rubocop-ast (>= 1.30.0, < 2.0)
367370
ruby-progressbar (~> 1.7)
368-
unicode-display_width (>= 1.4.0, < 3.0)
369-
rubocop-ast (1.31.3)
370-
parser (>= 3.3.1.0)
371-
rubocop-performance (1.15.0)
372-
rubocop (>= 1.7.0, < 2.0)
373-
rubocop-ast (>= 0.4.0)
374-
rubocop-rspec (2.13.2)
375-
rubocop (~> 1.33)
371+
unicode-display_width (>= 2.4.0, < 3.0)
372+
rubocop-ast (1.48.0)
373+
parser (>= 3.3.7.2)
374+
prism (~> 1.4)
375+
rubocop-capybara (2.21.0)
376+
rubocop (~> 1.41)
377+
rubocop-factory_bot (2.26.1)
378+
rubocop (~> 1.61)
379+
rubocop-performance (1.20.2)
380+
rubocop (>= 1.48.1, < 2.0)
381+
rubocop-ast (>= 1.30.0, < 2.0)
382+
rubocop-rspec (2.31.0)
383+
rubocop (~> 1.40)
384+
rubocop-capybara (~> 2.17)
385+
rubocop-factory_bot (~> 2.22)
386+
rubocop-rspec_rails (~> 2.28)
387+
rubocop-rspec_rails (2.29.1)
388+
rubocop (~> 1.61)
376389
ruby-progressbar (1.13.0)
377390
ruby_parser (3.21.0)
378391
racc (~> 1.5)
@@ -402,7 +415,7 @@ GEM
402415
websocket (~> 1.0)
403416
semantic_range (3.1.0)
404417
sexp_processor (4.17.1)
405-
shakapacker (9.3.0)
418+
shakapacker (9.4.0)
406419
activesupport (>= 5.2)
407420
package_json
408421
rack-proxy (>= 0.6.1)
@@ -447,7 +460,7 @@ GEM
447460
concurrent-ruby (~> 1.0)
448461
uglifier (4.2.0)
449462
execjs (>= 0.3.0, < 3)
450-
unicode-display_width (2.5.0)
463+
unicode-display_width (2.6.0)
451464
uri (1.0.3)
452465
useragent (0.16.11)
453466
web-console (4.2.1)
@@ -513,13 +526,13 @@ DEPENDENCIES
513526
rspec-rails
514527
rspec-retry
515528
rspec_junit_formatter
516-
rubocop (= 1.36.0)
517-
rubocop-performance (= 1.15.0)
518-
rubocop-rspec (= 2.13.2)
529+
rubocop (= 1.61.0)
530+
rubocop-performance (~> 1.20.0)
531+
rubocop-rspec (~> 2.26)
519532
sass-rails
520533
scss_lint
521534
selenium-webdriver (= 4.9.0)
522-
shakapacker (= 9.3.0)
535+
shakapacker (= 9.4.0)
523536
spring
524537
spring-watcher-listen
525538
sprockets

react_on_rails_pro/spec/dummy/Gemfile.lock

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ GEM
108108
addressable (2.8.7)
109109
public_suffix (>= 2.0.2, < 7.0)
110110
amazing_print (1.6.0)
111-
ast (2.4.2)
112111
async (2.34.0)
113112
console (~> 1.29)
114113
fiber-annotation
@@ -272,10 +271,6 @@ GEM
272271
nokogiri (1.18.10-x86_64-linux-musl)
273272
racc (~> 1.4)
274273
package_json (0.2.0)
275-
parallel (1.25.1)
276-
parser (3.3.3.0)
277-
ast (~> 2.4.1)
278-
racc
279274
pg (1.5.6)
280275
pp (0.6.3)
281276
prettyprint
@@ -380,24 +375,6 @@ GEM
380375
rspec-support (3.13.1)
381376
rspec_junit_formatter (0.6.0)
382377
rspec-core (>= 2, < 4, != 2.12.0)
383-
rubocop (1.36.0)
384-
json (~> 2.3)
385-
parallel (~> 1.10)
386-
parser (>= 3.1.2.1)
387-
rainbow (>= 2.2.2, < 4.0)
388-
regexp_parser (>= 1.8, < 3.0)
389-
rexml (>= 3.2.5, < 4.0)
390-
rubocop-ast (>= 1.20.1, < 2.0)
391-
ruby-progressbar (~> 1.7)
392-
unicode-display_width (>= 1.4.0, < 3.0)
393-
rubocop-ast (1.31.3)
394-
parser (>= 3.3.1.0)
395-
rubocop-performance (1.15.0)
396-
rubocop (>= 1.7.0, < 2.0)
397-
rubocop-ast (>= 0.4.0)
398-
rubocop-rspec (2.13.2)
399-
rubocop (~> 1.33)
400-
ruby-progressbar (1.13.0)
401378
ruby_parser (3.21.0)
402379
racc (~> 1.5)
403380
sexp_processor (~> 4.16)
@@ -476,7 +453,6 @@ GEM
476453
concurrent-ruby (~> 1.0)
477454
uglifier (4.2.0)
478455
execjs (>= 0.3.0, < 3)
479-
unicode-display_width (2.5.0)
480456
uri (1.0.3)
481457
useragent (0.16.11)
482458
web-console (4.2.1)
@@ -555,9 +531,6 @@ DEPENDENCIES
555531
rspec-rails
556532
rspec-retry
557533
rspec_junit_formatter
558-
rubocop (= 1.36.0)
559-
rubocop-performance (= 1.15.0)
560-
rubocop-rspec (= 2.13.2)
561534
sass-rails
562535
scss_lint
563536
selenium-webdriver (= 4.9.0)

0 commit comments

Comments
 (0)