react_on_rails 12.5.0 → 13.0.0.beta.0

data/lib/generators/react_on_rails/templates/base/base/babel.config.js.tt

@@ -1,15 +1,32 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/babel.config.js") %>
 
-const defaultConfigFunc = require('@rails/webpacker/package/babel/preset.js');
-
 module.exports = function (api) {
-  const resultConfig = defaultConfigFunc(api);
+  const defaultConfigFunc = require('shakapacker/package/babel/preset.js')
+  const resultConfig = defaultConfigFunc(api)
+  const isProductionEnv = api.env('production')
 
   const changesOnDefault = {
-    plugins: [process.env.WEBPACK_SERVE && 'react-refresh/babel'].filter(Boolean),
-  };
+    presets: [
+      [
+        '@babel/preset-react',
+        {
+          development: !isProductionEnv,
+          useBuiltIns: true
+        }
+      ]
+    ].filter(Boolean),
+    plugins: [
+      process.env.WEBPACK_SERVE && 'react-refresh/babel',
+      isProductionEnv && ['babel-plugin-transform-react-remove-prop-types',
+        {
+          removeImport: true
+        }
+      ]
+    ].filter(Boolean),
+  }
 
-  resultConfig.plugins = [...resultConfig.plugins, ...changesOnDefault.plugins];
+  resultConfig.presets = [...resultConfig.presets, ...changesOnDefault.presets]
+  resultConfig.plugins = [...resultConfig.plugins, ...changesOnDefault.plugins ]
 
-  return resultConfig;
-};
+  return resultConfig
+}

data/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb

@@ -6,7 +6,7 @@
 ReactOnRails.configure do |config|
   # This configures the script to run to build the production assets by webpack. Set this to nil
   # if you don't want react_on_rails building this file for you.
-  # If nil, then the standard rails/webpacker assets:precompile will run
+  # If nil, then the standard shakacode/shakapacker assets:precompile will run
   # config.build_production_command = nil
 
   ################################################################################
@@ -25,7 +25,7 @@ ReactOnRails.configure do |config|
   #
   # Alternately, you can remove the `ReactOnRails::TestHelper.configure_rspec_to_compile_assets`
   # and set the config/webpacker.yml option for test to true.
-  config.build_test_command = "RAILS_ENV=test bin/webpack"
+  config.build_test_command = "RAILS_ENV=test bin/webpacker"
 
   ################################################################################
   ################################################################################

data/lib/generators/react_on_rails/templates/base/base/config/webpack/commonWebpackConfig.js.tt

@@ -1,7 +1,7 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/config/webpack/commonWebpackConfig.js") %>
 
 // Common configuration applying to client and server configuration
-const { webpackConfig: baseClientWebpackConfig, merge } = require('@rails/webpacker');
+const { webpackConfig: baseClientWebpackConfig, merge } = require('shakapacker');
 
 const commonOptions = {
   resolve: {

data/lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt

@@ -2,7 +2,7 @@
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const { devServer, inliningCss } = require('@rails/webpacker');
+const { devServer, inliningCss } = require('shakapacker');
 
 const webpackConfig = require('./webpackConfig');
 

data/lib/generators/react_on_rails/templates/base/base/config/webpack/serverWebpackConfig.js.tt

@@ -1,6 +1,6 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/blob/master/config/webpack/serverWebpackConfig.js") %>
 
-const { merge, config } = require('@rails/webpacker');
+const { merge, config } = require('shakapacker');
 const commonWebpackConfig = require('./commonWebpackConfig');
 
 const webpack = require('webpack');

data/lib/generators/react_on_rails/templates/base/base/config/webpack/webpack.config.js.tt

@@ -0,0 +1,15 @@
+const { env, webpackConfig } = require('shakapacker')
+const { existsSync } = require('fs')
+const { resolve } = require('path')
+
+const envSpecificConfig = () => {
+  const path = resolve(__dirname, `${env.nodeEnv}.js`)
+  if (existsSync(path)) {
+    console.log(`Loading ENV specific webpack configuration file ${path}`)
+    return require(path)
+  } else {
+    return webpackConfig
+  }
+}
+
+module.exports = envSpecificConfig()

data/lib/generators/react_on_rails/templates/base/base/config/webpacker.yml

@@ -1,4 +1,4 @@
-# Note: You must restart bin/webpack-dev-server for changes to take effect
+# Note: You must restart bin/webpacker-dev-server for changes to take effect
 
 default: &default
   source_path: app/javascript
@@ -17,7 +17,7 @@ default: &default
 
 development:
   <<: *default
-  # This is false since we're running `bin/webpack -w` in Procfile.dev-setic
+  # This is false since we're running `bin/webpacker -w` in Procfile.dev-setic
   compile: false
 
   # Reference: https://webpack.js.org/configuration/dev-server/

data/lib/react_on_rails/configuration.rb

@@ -32,6 +32,7 @@ module ReactOnRails
       # skip_display_none is deprecated
       webpack_generated_files: %w[manifest.json],
       rendering_extension: nil,
+      rendering_props_extension: nil,
       server_render_method: nil,
       build_test_command: "",
       build_production_command: "",
@@ -51,7 +52,7 @@ module ReactOnRails
                   :build_production_command,
                   :i18n_dir, :i18n_yml_dir, :i18n_output_format,
                   :server_render_method, :random_dom_id,
-                  :same_bundle_for_client_and_server
+                  :same_bundle_for_client_and_server, :rendering_props_extension
 
     # rubocop:disable Metrics/AbcSize
     def initialize(node_modules_location: nil, server_bundle_js_file: nil, prerender: nil,
@@ -65,7 +66,7 @@ module ReactOnRails
                    build_production_command: nil,
                    same_bundle_for_client_and_server: nil,
                    i18n_dir: nil, i18n_yml_dir: nil, i18n_output_format: nil,
-                   random_dom_id: nil, server_render_method: nil)
+                   random_dom_id: nil, server_render_method: nil, rendering_props_extension: nil)
       self.node_modules_location = node_modules_location.present? ? node_modules_location : Rails.root
       self.generated_assets_dirs = generated_assets_dirs
       self.generated_assets_dir = generated_assets_dir
@@ -87,6 +88,7 @@ module ReactOnRails
       self.trace = trace.nil? ? Rails.env.development? : trace
       self.raise_on_prerender_error = raise_on_prerender_error
       self.skip_display_none = skip_display_none
+      self.rendering_props_extension = rendering_props_extension
 
       # Server rendering:
       self.server_bundle_js_file = server_bundle_js_file
@@ -111,44 +113,41 @@ module ReactOnRails
       check_i18n_yml_directory_exists
       check_server_render_method_is_only_execjs
       error_if_using_webpacker_and_generated_assets_dir_not_match_public_output_path
-      check_deprecated_settings
+      # check_deprecated_settings
+      adjust_precompile_task
     end
 
     private
 
-    def check_deprecated_settings
-      if build_production_command.present? &&
-         ReactOnRails::WebpackerUtils.webpacker_webpack_production_config_exists?
-        msg = <<~MSG
-          Setting ReactOnRails configuration for `build_production_command` is
-          not necessary if you have config/webpack/production.js. When that file
-          exists, React on Rails DOES NOT modify the standard assets:precompile.
-          If you want React on Rails to modify to the standard assets:precompile
-          to use your config/initializers/react_on_rails.rb config.build_production_command
-          then delete the config/webpack/production.js.
-        MSG
-        Rails.logger.warn(msg)
+    def adjust_precompile_task
+      skip_react_on_rails_precompile = %w[no false n f].include?(ENV["REACT_ON_RAILS_PRECOMPILE"])
+
+      return if skip_react_on_rails_precompile || build_production_command.blank?
+
+      # Ensure that shakacode/shakapacker does not call bin/webpacker if we're providing
+      # the build command.
+      ENV["WEBPACKER_PRECOMPILE"] = "false"
+
+      precompile_tasks = lambda {
+        Rake::Task["react_on_rails:assets:webpack"].invoke
+        puts "Invoking task webpacker:clean from React on Rails"
+
+        # VERSIONS is per the shakacode/shakapacker clean method definition.
+        # We set it very big so that it is not used, and then clean just
+        # removes files older than 1 hour.
+        versions = 100_000
+        Rake::Task["webpacker:clean"].invoke(versions)
+      }
+
+      if Rake::Task.task_defined?("assets:precompile")
+        Rake::Task["assets:precompile"].enhance do
+          precompile_tasks.call
+        end
+      else
+        Rake::Task.define_task("assets:precompile") do
+          precompile_tasks.call
+        end
       end
-      #
-      # msg = <<~MSG
-      #   ReactOnRails configuration for `build_production_command` is removed.
-      #   Move this command into `bin/webpack` converting the script to a shell script.
-      # MSG
-      # raise ReactOnRails::Error, msg
-      # Commenting out until v13 when
-      # https://github.com/rails/webpacker/issues/2640 gets resolved
-      # if node_modules_location.present?
-      #   Rails.logger.warn("ReactOnRails configuration for `node_modules_location` is deprecated. "\
-      #    "Instead, prepend a `cd client` (or whichever location) before your test command.")
-      # end
-      #
-      # return unless build_production_command.present?
-      #
-      # msg = <<~MSG
-      #   ReactOnRails configuration for `build_production_command` is removed.
-      #   Move this command into `bin/webpack` converting the script to a shell script.
-      # MSG
-      # raise ReactOnRails::Error, msg
     end
 
     def error_if_using_webpacker_and_generated_assets_dir_not_match_public_output_path
@@ -160,7 +159,7 @@ module ReactOnRails
 
       if File.expand_path(generated_assets_dir) == webpacker_public_output_path.to_s
         Rails.logger.warn("You specified generated_assets_dir in `config/initializers/react_on_rails.rb` "\
-        "with Webpacker. Remove this line from your configuration file.")
+                          "with Webpacker. Remove this line from your configuration file.")
       else
         msg = <<~MSG
           Error configuring /config/initializers/react_on_rails.rb: You are using webpacker
@@ -222,19 +221,19 @@ module ReactOnRails
       if ReactOnRails::WebpackerUtils.using_webpacker?
         webpacker_public_output_path = ReactOnRails::WebpackerUtils.webpacker_public_output_path
         Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the "\
-        "generated_assets_dirs no the generated_assets_dir when using Webpacker. This is defined by "\
-        "public_output_path specified in webpacker.yml = #{webpacker_public_output_path}."
+                          "generated_assets_dirs no the generated_assets_dir when using Webpacker. This is defined by "\
+                          "public_output_path specified in webpacker.yml = #{webpacker_public_output_path}."
         return
       end
 
       Rails.logger.warn "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
-        "generated_assets_dirs"
+                        "generated_assets_dirs"
       if generated_assets_dir.blank?
         self.generated_assets_dir = generated_assets_dirs
       else
         Rails.logger.warn "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
-          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Webpacker"\
-          " and define neither if using Webpacker"
+                          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Webpacker"\
+                          " and define neither if using Webpacker"
       end
     end
 

data/lib/react_on_rails/helper.rb

@@ -154,7 +154,7 @@ module ReactOnRails
         @registered_stores_defer_render ||= []
         @registered_stores_defer_render << redux_store_data
         "YOU SHOULD NOT SEE THIS ON YOUR VIEW -- Uses as a code block, like <% redux_store %> "\
-        "and not <%= redux store %>"
+          "and not <%= redux store %>"
       else
         @registered_stores ||= []
         @registered_stores << redux_store_data
@@ -244,7 +244,7 @@ module ReactOnRails
 
       unless hash_or_string.is_a?(String) || hash_or_string.is_a?(Hash)
         raise ReactOnRails::Error, "#{__method__} only accepts String or Hash as argument "\
-            "(#{hash_or_string.class} given)."
+                                   "(#{hash_or_string.class} given)."
       end
 
       json_value = hash_or_string.is_a?(String) ? hash_or_string : hash_or_string.to_json
@@ -413,7 +413,7 @@ module ReactOnRails
       # Setup the page_loaded_js, which is the same regardless of prerendering or not!
       # The reason is that React is smart about not doing extra work if the server rendering did its job.
       component_specification_tag = content_tag(:script,
-                                                json_safe_and_pretty(render_options.props).html_safe,
+                                                json_safe_and_pretty(render_options.client_props).html_safe,
                                                 type: "application/json",
                                                 class: "js-react-on-rails-component",
                                                 "data-component-name" => render_options.react_component_name,

data/lib/react_on_rails/locales/base.rb

@@ -85,9 +85,7 @@ module ReactOnRails
 
       def generate_file(template, path)
         result = ERB.new(template).result()
-        File.open(path, "w") do |f|
-          f.write(result)
-        end
+        File.write(path, result)
       end
 
       def generate_translations

data/lib/react_on_rails/react_component/render_options.rb

@@ -27,6 +27,20 @@ module ReactOnRails
         options.fetch(:props) { NO_PROPS }
       end
 
+      def client_props
+        props_extension = ReactOnRails.configuration.rendering_props_extension
+        if props_extension.present?
+          if props_extension.respond_to?(:adjust_props_for_client_side_hydration)
+            return props_extension.adjust_props_for_client_side_hydration(react_component_name,
+                                                                          props.clone)
+          end
+
+          raise ReactOnRails::Error, "ReactOnRails: your rendering_props_extension module is missing the "\
+                                     "required adjust_props_for_client_side_hydration method & can not be used"
+        end
+        props
+      end
+
       def random_dom_id
         retrieve_configuration_value_for(:random_dom_id)
       end

data/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -133,15 +133,15 @@ module ReactOnRails
             if ReactOnRails.configuration.trace
               Rails.logger.info do
                 "[react_on_rails] Created JavaScript context with file "\
-                "#{ReactOnRails::Utils.server_bundle_js_file_path}"
+                  "#{ReactOnRails::Utils.server_bundle_js_file_path}"
               end
             end
             ExecJS.compile(base_js_code)
           rescue StandardError => e
             msg = "ERROR when compiling base_js_code! "\
-              "See file #{file_name} to "\
-              "correlate line numbers of error. Error is\n\n#{e.message}"\
-              "\n\n#{e.backtrace.join("\n")}"
+                  "See file #{file_name} to "\
+                  "correlate line numbers of error. Error is\n\n#{e.message}"\
+                  "\n\n#{e.backtrace.join("\n")}"
             Rails.logger.error(msg)
             trace_js_code_used("Error when compiling JavaScript code for the context.", base_js_code,
                                file_name, force: true)
@@ -150,7 +150,9 @@ module ReactOnRails
         end
 
         def execjs_timer_polyfills
-          if ReactOnRails::Utils.react_on_rails_pro? && ReactOnRailsPro.configuration.include_execjs_polyfills == false
+          if ReactOnRails::Utils.react_on_rails_pro? &&
+             ReactOnRailsPro.configuration.respond_to?(:include_execjs_polyfills) &&
+             ReactOnRailsPro.configuration.include_execjs_polyfills == false
             return ""
           end
 
@@ -184,7 +186,7 @@ module ReactOnRails
         def undefined_for_exec_js_logging(function_name)
           if ReactOnRails.configuration.trace
             "console.error('[React on Rails Rendering] #{function_name} is not defined for server rendering.');\n"\
-            "  console.error(getStackTrace().join('\\n'));"
+              "  console.error(getStackTrace().join('\\n'));"
           else
             ""
           end

data/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

@@ -66,10 +66,10 @@ module ReactOnRails
             file_list = make_file_list(make_globs(generated_assets_full_path)).to_ary
             puts "V" * 80
             puts "Please define config.webpack_generated_files (array) so the test helper knows "\
-            "which files are required. If you are using webpacker, you typically need to only "\
-            "include 'manifest.json'."
+                 "which files are required. If you are using webpacker, you typically need to only "\
+                 "include 'manifest.json'."
             puts "Detected the possible following files to check for webpack compilation in "\
-              "#{generated_assets_full_path}"
+                 "#{generated_assets_full_path}"
             puts file_list.join("\n")
             puts "^" * 80
             file_list

data/lib/react_on_rails/test_helper.rb

@@ -72,8 +72,8 @@ module ReactOnRails
         unless @printed_once
           puts
           puts "====> React On Rails: Checking files in "\
-            "#{webpack_assets_status_checker.generated_assets_full_path} for "\
-            "outdated/missing bundles based on source_path #{source_path}"
+               "#{webpack_assets_status_checker.generated_assets_full_path} for "\
+               "outdated/missing bundles based on source_path #{source_path}"
           puts
           @printed_once = true
 

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "12.5.0"
+  VERSION = "13.0.0.beta.0"
 end

data/lib/react_on_rails/webpacker_utils.rb

@@ -7,13 +7,8 @@ module ReactOnRails
     def self.using_webpacker?
       return @using_webpacker if defined?(@using_webpacker)
 
-      @using_webpacker = ReactOnRails::Utils.gem_available?("webpacker")
-    end
-
-    def self.webpacker_webpack_production_config_exists?
-      webpacker_webpack_config_abs_path = File.join(Rails.root,
-                                                    "config/webpack/production.js")
-      File.exist?(webpacker_webpack_config_abs_path)
+      @using_webpacker = ReactOnRails::Utils.gem_available?("webpacker") ||
+                         ReactOnRails::Utils.gem_available?("shakapacker")
     end
 
     def self.dev_server_running?

data/lib/tasks/assets.rake

@@ -1,46 +1,9 @@
 # frozen_string_literal: true
 
-# Important: The default assets:precompile is modified ONLY if the rails/webpacker webpack config
-# does not exist!
-
-require "active_support"
-
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-
-skip_react_on_rails_precompile = %w[no false n f].include?(ENV["REACT_ON_RAILS_PRECOMPILE"])
-
-if !skip_react_on_rails_precompile && ReactOnRails.configuration.build_production_command.present?
-  # Ensure that rails/webpacker does not call bin/webpack if we're providing
-  # the build command.
-  ENV["WEBPACKER_PRECOMPILE"] = "false"
-
-  precompile_tasks = lambda {
-    Rake::Task["react_on_rails:assets:webpack"].invoke
-    puts "Invoking task webpacker:clean from React on Rails"
-
-    # VERSIONS is per the rails/webpacker clean method definition.
-    # We set it very big so that it is not used, and then clean just
-    # removes files older than 1 hour.
-    versions = 100_000
-    Rake::Task["webpacker:clean"].invoke(versions)
-  }
-
-  if Rake::Task.task_defined?("assets:precompile")
-    Rake::Task["assets:precompile"].enhance do
-      precompile_tasks.call
-    end
-  else
-    Rake::Task.define_task("assets:precompile") do
-      precompile_tasks.call
-    end
-  end
-end
-
-# Sprockets independent tasks
 # rubocop:disable Metrics/BlockLength
 namespace :react_on_rails do
   namespace :assets do
-    desc <<~DESC.strip_heredoc
+    desc <<~DESC
       If config.build_production_command is defined, this command is automatically
       added to task assets:precompile and the regular webpacker compile will not run.
       The defined command is either a script or a module with a method `call`.
@@ -65,10 +28,6 @@ namespace :react_on_rails do
         msg = <<~MSG
           React on Rails is aborting webpack compilation from task react_on_rails:assets:webpack
           because you do not have the `config.build_production_command` defined.
-
-          Note, this task may have run as part of `assets:precompile`. If file
-          config/webpack/production.js does not exist, React on Rails will modify
-          the default `asset:precompile` to run task `react_on_rails:assets:webpack`.
         MSG
         puts Rainbow(msg).red
         exit!(1)

data/lib/tasks/locale.rake

@@ -3,10 +3,9 @@
 require "react_on_rails/locales/base"
 require "react_on_rails/locales/to_js"
 require "react_on_rails/locales/to_json"
-require "active_support"
 
 namespace :react_on_rails do
-  desc <<-DESC.strip_heredoc
+  desc <<~DESC
     Generate i18n javascript files
     This task generates javascript locale files: `translations.js` & `default.js` and places them in
     the "ReactOnRails.configuration.i18n_dir".

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "12.5.0",
+  "version": "13.0.0-beta.0",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/rakelib/example_type.rb

@@ -45,7 +45,10 @@ module ReactOnRails
       # Gems we need to add to the Gemfile before bundle installing
       def required_gems
         relative_gem_root = Pathname(gem_root).relative_path_from(Pathname(dir))
-        ["gem 'react_on_rails', path: '#{relative_gem_root}'"]
+        [
+          "gem 'react_on_rails', path: '#{relative_gem_root}'",
+          "gem 'shakapacker'"
+        ]
       end
 
       # Options we pass when running `rails new` from the command-line.
@@ -78,7 +81,7 @@ module ReactOnRails
       # Assumes we are inside a rails app's folder and necessary gems have been installed
       def generator_shell_commands
         shell_commands = []
-        shell_commands << "rails generate react_on_rails:install #{generator_options} --ignore-warnings"
+        shell_commands << "rails generate react_on_rails:install #{generator_options} --ignore-warnings --force"
         shell_commands << "rails generate react_on_rails:dev_tests #{generator_options}"
       end
 

data/rakelib/examples.rake

@@ -16,7 +16,7 @@ namespace :examples do # rubocop:disable Metrics/BlockLength
   # Loads data from examples_config.yml and instantiates corresponding ExampleType objects
   examples_config_file = File.expand_path("examples_config.yml", __dir__)
   examples_config = symbolize_keys(YAML.safe_load(File.read(examples_config_file)))
-  examples_config[:example_type_data].each { |example_type_data| ExampleType.new(symbolize_keys(example_type_data)) }
+  examples_config[:example_type_data].each { |example_type_data| ExampleType.new(**symbolize_keys(example_type_data)) }
 
   # Define tasks for each example type
   ExampleType.all.each do |example_type|
@@ -30,19 +30,12 @@ namespace :examples do # rubocop:disable Metrics/BlockLength
     desc "Generates #{example_type.name_pretty}"
     task example_type.gen_task_name_short => example_type.clobber_task_name do
       mkdir_p(example_type.dir)
-      if Rails::VERSION::MAJOR < 6
-        example_type.rails_options += " --webpack"
-      elsif Rails::VERSION::MAJOR >= 7
-        example_type.rails_options += "--javascript=webpack"
-      end
+      example_type.rails_options += "--skip-javascript"
       sh_in_dir(examples_dir, "rails new #{example_type.name} #{example_type.rails_options}")
       sh_in_dir(example_type.dir, "touch .gitignore")
-      copy_generator_webpacker_yml_to(example_type.dir)
-      sh_in_dir(example_type.dir, "bundle add webpacker --version 6.0.0.rc.6")
-      sh_in_dir(example_type.dir, "rake webpacker:install")
-      sh_in_dir(example_type.dir, "bundle binstubs --path=#{example_type.dir}/bin webpacker")
       append_to_gemfile(example_type.gemfile, example_type.required_gems)
       bundle_install_in(example_type.dir)
+      sh_in_dir(example_type.dir, "rake webpacker:install")
       sh_in_dir(example_type.dir, example_type.generator_shell_commands)
       sh_in_dir(example_type.dir, "yarn")
     end

data/rakelib/release.rake

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "bundler"
 require_relative "task_helpers"
 require_relative File.join(gem_root, "lib", "react_on_rails", "version_syntax_converter")
 require_relative File.join(gem_root, "lib", "react_on_rails", "git_utils")
@@ -27,6 +28,8 @@ which are installed via `bundle install` and `yarn global add release-it`
               automatically perform a patch version bump.
 2nd argument: Perform a dry run by passing 'true' as a second argument.
 
+Note, accept defaults for npmjs options. Script will pause to get 2FA tokens.
+
 Example: `rake release[2.1.0,false]`")
 task :release, %i[gem_version dry_run tools_install] do |_t, args|
   include ReactOnRails::TaskHelpers
@@ -57,6 +60,7 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   # Update dummy app's Gemfile.lock
   bundle_install_in(dummy_app_dir)
 
+  puts "Carefully add your OTP for NPM. If you get an error, 'git reset --hard' and start over."
   # Will bump the yarn version, commit, tag the commit, push to repo, and release on yarn
   release_it_command = +"release-it"
   release_it_command << " #{npm_version}" unless npm_version.strip.empty?
@@ -65,6 +69,8 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   sh_in_dir(gem_root, release_it_command)
 
   # Release the new gem version
+
+  puts "Carefully add your OTP for Rubygems. If you get an error, run 'gem release' again."
   sh_in_dir(gem_root, "gem release") unless is_dry_run
 
   msg = <<~MSG

data/rakelib/task_helpers.rb

@@ -12,13 +12,6 @@ module ReactOnRails
       File.join(gem_root, "gen-examples", "examples")
     end
 
-    # This method is used to prevent an error that when installing webpacker 6.0.0.rc.6
-    # without a previous config/webpacker.yml will throw and error
-    def copy_generator_webpacker_yml_to(destination)
-      webpacker_file = File.join(gem_root, "lib/generators/react_on_rails/templates/base/base/config/webpacker.yml")
-      sh %( cp #{webpacker_file} #{destination}/config/webpacker.yml )
-    end
-
     def dummy_app_dir
       File.join(gem_root, "spec/dummy")
     end

data/react_on_rails.gemspec

@@ -28,9 +28,8 @@ Gem::Specification.new do |s|
   s.add_dependency "addressable"
   s.add_dependency "connection_pool"
   s.add_dependency "execjs", "~> 2.5"
-  s.add_dependency "rails", ">= 3.2"
+  s.add_dependency "rails", ">= 5.2"
   s.add_dependency "rainbow", "~> 3.0"
-  s.add_dependency "webpacker", ">= 4.0"
 
   s.add_development_dependency "bundler", "~> 2"
   s.add_development_dependency "gem-release"