Skip to content

Commit 748251f

Browse files
committed
Revert to sprockets-rails, create manifest.js in rails template for Rails 8
1 parent f68d54a commit 748251f

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

Gemfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ gemspec
44
default_rails_version = '7.1.0'
55
default_activeadmin_version = '3.2.0'
66

7-
rails_version = ENV['RAILS'] || default_rails_version
8-
gem 'rails', "~> #{rails_version}"
7+
gem 'rails', "~> #{ENV['RAILS'] || default_rails_version}"
98
gem 'activeadmin', "~> #{ENV['AA'] || default_activeadmin_version}"
10-
11-
if Gem::Version.new(rails_version) >= Gem::Version.new('8.0.0')
12-
gem 'propshaft'
13-
else
14-
gem 'sprockets-rails'
15-
gem 'sass-rails'
16-
end
9+
gem 'sprockets-rails'
10+
gem 'sass-rails'
1711

1812
group :test do
1913
gem 'simplecov', require: false

spec/support/rails_template.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
create_file "app/assets/config/manifest.js", skip: true
2+
13
generate :model, 'author name:string{10}:uniq last_name:string birthday:date --force'
24
generate :model, 'post title:string:uniq body:text author:references --force'
35

0 commit comments

Comments
 (0)