Rails 6 upgrades (do not merge)

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 require_relative 'lib/make_it_so/rails'
 
-ruby '2.7.3'
+ruby '3.0.2'
 
 # Specify your gem's dependencies in make_it_so.gemspec
 gemspec

lib/generators/rails_app_generator.rb

@@ -76,9 +76,11 @@ def initialize(*args)
     def finish_template
       super
 
+      build 'change_ruby_version'
       build 'pry_rails_dependency'
       build 'base_stylesheets'
       build 'eliminate_byebug'
+      build 'base_config_manifest'
       unless options[:skip_javascript]
         build 'base_javascripts'
       end

lib/make_it_so/rails.rb

@@ -1,5 +1,5 @@
 module MakeItSo
   module Rails
-    VERSION="5.2.5"
+    VERSION="6.1.4"
   end
 end

lib/make_it_so/rails/app_builder.rb

@@ -16,8 +16,18 @@ def application_record
         end
       end
 
+      def base_config_manifest
+        # new sprockets pattern for assets with sprockets 4 in Rails 6
+        empty_directory "app/assets/config"
+         inside 'app/assets/config' do
+          template 'manifest.js'
+        end
+      end
+
       def base_javascripts
         @generator.gem 'jquery-rails'
+
+        empty_directory "app/assets/javascripts"
         inside 'app/assets/javascripts' do
           template 'application.js'
           jquery_files = "//= require jquery\n" +
@@ -47,8 +57,15 @@ def eliminate_byebug
         gsub_file 'Gemfile', both_lines, "\n"
       end
 
+      def change_ruby_version
+        # @generator.gem 'pg', '3.8.2', group: [:development, :test]
+
+        default_ruby_version = /^ruby '2.6.5'$/
+        gsub_file 'Gemfile', default_ruby_version, "\n"
+      end
+
       def react
-        @generator.gem 'webpacker', '~> 3.3'
+        # @generator.gem 'webpacker', '~> 3.3'
 
         after_bundle do
           rake 'webpacker:install'
@@ -273,8 +290,6 @@ def foundation_dependency
           # foundation-rails generates an application layout so we
           # must remove it
           remove_file 'app/views/layouts/foundation.html.erb'
-
-
         end
       end
 

lib/make_it_so/version.rb

@@ -1,3 +1,3 @@
 module MakeItSo
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

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.4"
+  spec.add_dependency "activerecord", "~> 6.1.4"
   spec.add_dependency "json"
 
   spec.add_development_dependency "bundler", "~> 2.1"

templates/rails/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css
+//= link_directory ../javascripts .js