From 91545e2917fd0fc164369b0bd57164739036cdf4 Mon Sep 17 00:00:00 2001 From: Dan Pickett Date: Mon, 29 Mar 2021 18:53:12 -0400 Subject: [PATCH] upgrade to rails 6.1 --- Gemfile | 4 ++-- lib/make_it_so/rails.rb | 2 +- lib/make_it_so/rails/app_builder.rb | 8 ++------ make_it_so.gemspec | 4 ++-- spec/features/rails/user_generates_rails_spec.rb | 9 ++------- spec/support/make_it_so_spec_helpers.rb | 2 +- templates/rails/app/assets/config/manifest.js | 2 ++ templates/rails/app/assets/javascripts/application.js | 1 + .../rails/app/views/layouts/application.html.erb.tt | 4 ++-- 9 files changed, 15 insertions(+), 21 deletions(-) create mode 100644 templates/rails/app/assets/config/manifest.js create mode 100644 templates/rails/app/assets/javascripts/application.js diff --git a/Gemfile b/Gemfile index 41790f9..805bba4 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' require_relative 'lib/make_it_so/rails' -ruby '2.6.3' +ruby '2.7.2' # Specify your gem's dependencies in make_it_so.gemspec gemspec @@ -19,7 +19,7 @@ group :development do gem gem_name, MakeItSo::Rails::VERSION end - gem 'sprockets-rails', '3.0.4' + gem 'sprockets-rails', '3.2.2' gem 'listen' gem 'rspec-rails' gem 'devise' diff --git a/lib/make_it_so/rails.rb b/lib/make_it_so/rails.rb index 6adcdb3..e018187 100644 --- a/lib/make_it_so/rails.rb +++ b/lib/make_it_so/rails.rb @@ -1,5 +1,5 @@ module MakeItSo module Rails - VERSION="5.2.3" + VERSION="6.1.3.1" end end diff --git a/lib/make_it_so/rails/app_builder.rb b/lib/make_it_so/rails/app_builder.rb index 4a16139..88b81d2 100644 --- a/lib/make_it_so/rails/app_builder.rb +++ b/lib/make_it_so/rails/app_builder.rb @@ -20,13 +20,11 @@ def base_javascripts @generator.gem 'jquery-rails' inside 'app/assets/javascripts' do template 'application.js' - jquery_files = "//= require jquery\n" + - "//= require jquery_ujs\n" - gsub_file 'application.js', "//= require rails-ujs\n", jquery_files end end def base_stylesheets + template "app/assets/config/manifest.js" inside 'app/assets/stylesheets' do template 'application.css' end @@ -48,8 +46,6 @@ def eliminate_byebug end def react - @generator.gem 'webpacker', '~> 3.3' - after_bundle do rake 'webpacker:install' rake 'webpacker:install:react' @@ -294,7 +290,7 @@ def add_test_dependency_snippets(snippet_paths) end end - def create_enzyme_config + def create_enzyme_config run 'mkdir -p spec/javascript/support' devDependencies = parsed_package_json["devDependencies"].keys enzymeAdapter = devDependencies.select{ |d| d =~ /^enzyme-adapter-react-[0-9]*/ }[0] diff --git a/make_it_so.gemspec b/make_it_so.gemspec index 44b718e..46bdff3 100644 --- a/make_it_so.gemspec +++ b/make_it_so.gemspec @@ -19,8 +19,8 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "thor" - spec.add_dependency "railties", "~> 5.2" - spec.add_dependency "activerecord", "~> 5.2" + spec.add_dependency "railties", "~> 6.1" + spec.add_dependency "activerecord", "~> 6.1" spec.add_dependency "json" spec.add_development_dependency "bundler", "~> 2.1" diff --git a/spec/features/rails/user_generates_rails_spec.rb b/spec/features/rails/user_generates_rails_spec.rb index e4d68db..0b72e30 100644 --- a/spec/features/rails/user_generates_rails_spec.rb +++ b/spec/features/rails/user_generates_rails_spec.rb @@ -25,11 +25,6 @@ def app_path expect(FileTest.exists?(join_paths(app_path, 'app/models'))).to eq(true) end - scenario 'creates an application.js manifest' do - js_file = join_paths(app_path, 'app/assets/javascripts/application.js') - expect(FileTest.exists?(js_file)).to eq(true) - end - scenario 'creates an application.css manifest' do expect(FileTest.exists?(css_manifest_path)).to eq(true) end @@ -257,7 +252,7 @@ def app_path end end - it 'does not create .babelrc' do + it 'does not create .babelrc' do babelrc = File.join(app_path, '.babelrc') expect(FileTest.exists?(babelrc)).to eq(false) end @@ -302,7 +297,7 @@ def app_path expect(json["jest"]).to_not be_nil expect(json["jest"]["setupFiles"]).to include('./spec/javascript/support/enzyme.js') end - end + end end context 'jest' do diff --git a/spec/support/make_it_so_spec_helpers.rb b/spec/support/make_it_so_spec_helpers.rb index 1eb7b35..1b4280a 100644 --- a/spec/support/make_it_so_spec_helpers.rb +++ b/spec/support/make_it_so_spec_helpers.rb @@ -1,7 +1,7 @@ module MakeItSoSpecHelpers def make_it_so!(subcommand_with_args) Dir.chdir(tmp_path) do - Bundler.with_clean_env do + Bundler.with_unbundled_env do `#{join_paths(bin_path, 'make_it_so')} #{subcommand_with_args}` end end diff --git a/templates/rails/app/assets/config/manifest.js b/templates/rails/app/assets/config/manifest.js new file mode 100644 index 0000000..21a7880 --- /dev/null +++ b/templates/rails/app/assets/config/manifest.js @@ -0,0 +1,2 @@ +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/templates/rails/app/assets/javascripts/application.js b/templates/rails/app/assets/javascripts/application.js new file mode 100644 index 0000000..fadb0e8 --- /dev/null +++ b/templates/rails/app/assets/javascripts/application.js @@ -0,0 +1 @@ +//= require rails-ujs diff --git a/templates/rails/app/views/layouts/application.html.erb.tt b/templates/rails/app/views/layouts/application.html.erb.tt index a4fade4..0d1d32a 100644 --- a/templates/rails/app/views/layouts/application.html.erb.tt +++ b/templates/rails/app/views/layouts/application.html.erb.tt @@ -12,8 +12,8 @@