react_on_rails 12.2.0 → 12.5.0

data/rakelib/example_type.rb

@@ -52,7 +52,11 @@ module ReactOnRails
       attr_writer :rails_options
 
       def rails_options
-        @rails_options ||= "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record"
+        @rails_options ||= if ReactOnRails::Utils.rails_version_less_than("7.0")
+                             "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record -J"
+                           else
+                             "--skip-bundle --skip-spring --skip-git --skip-test-unit --skip-active-record -j webpack"
+                           end
       end
 
       %w[gen clobber npm_install build_webpack_bundles].each do |task_type|

data/rakelib/examples.rake

@@ -30,12 +30,17 @@ 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)
-      example_type.rails_options += " --webpack" if Rails.version >= "5.1" && Rails.version < "6"
+      if Rails::VERSION::MAJOR < 6
+        example_type.rails_options += " --webpack"
+      elsif Rails::VERSION::MAJOR >= 7
+        example_type.rails_options += "--javascript=webpack"
+      end
       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")
-      sh_in_dir(example_type.dir, "rake webpacker:install:react")
       append_to_gemfile(example_type.gemfile, example_type.required_gems)
       bundle_install_in(example_type.dir)
       sh_in_dir(example_type.dir, example_type.generator_shell_commands)

data/rakelib/release.rake

@@ -60,7 +60,7 @@ task :release, %i[gem_version dry_run tools_install] do |_t, args|
   # 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?
-  release_it_command << " --non-interactive --npm.publish --no-git.requireCleanWorkingDir"
+  release_it_command << " --npm.publish --no-git.requireCleanWorkingDir"
   release_it_command << " --dry-run --verbose" if is_dry_run
   sh_in_dir(gem_root, release_it_command)
 

data/rakelib/task_helpers.rb

@@ -12,6 +12,13 @@ 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

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.5.0"
+  s.required_ruby_version = ">= 2.7.0"
 
   s.add_dependency "addressable"
   s.add_dependency "connection_pool"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 12.5.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -173,20 +173,6 @@ files:
 - docs/api/javascript-api.md
 - docs/api/redux-store-api.md
 - docs/api/view-helpers-api.md
-- docs/basics/client-vs-server-rendering.md
-- docs/basics/configuration.md
-- docs/basics/deployment.md
-- docs/basics/hmr-and-hot-reloading-with-the-webpack-dev-server.md
-- docs/basics/how-react-on-rails-works.md
-- docs/basics/i18n.md
-- docs/basics/installation-into-an-existing-rails-app.md
-- docs/basics/minitest-configuration.md
-- docs/basics/react-server-rendering.md
-- docs/basics/render-functions-and-railscontext.md
-- docs/basics/rspec-configuration.md
-- docs/basics/tutorial.md
-- docs/basics/upgrading-react-on-rails.md
-- docs/basics/webpack-configuration.md
 - docs/contributor-info/errors-with-hooks.md
 - docs/contributor-info/generator-testing.md
 - docs/contributor-info/linters.md
@@ -194,6 +180,25 @@ files:
 - docs/contributor-info/releasing.md
 - docs/deployment/elastic-beanstalk.md
 - docs/deployment/heroku-deployment.md
+- docs/guides/client-vs-server-rendering.md
+- docs/guides/configuration.md
+- docs/guides/deployment.md
+- docs/guides/getting-started.md
+- docs/guides/hmr-and-hot-reloading-with-the-webpack-dev-server.md
+- docs/guides/how-react-on-rails-works.md
+- docs/guides/how-to-conditionally-server-render-based-on-device-type.md
+- docs/guides/how-to-use-different-files-for-client-and-server-rendering.md
+- docs/guides/i18n.md
+- docs/guides/installation-into-an-existing-rails-app.md
+- docs/guides/minitest-configuration.md
+- docs/guides/rails-webpacker-react-integration-options.md
+- docs/guides/react-on-rails-overview.md
+- docs/guides/react-server-rendering.md
+- docs/guides/render-functions-and-railscontext.md
+- docs/guides/rspec-configuration.md
+- docs/guides/tutorial.md
+- docs/guides/upgrading-react-on-rails.md
+- docs/guides/webpack-configuration.md
 - docs/home.md
 - docs/javascript/angular-js-integration-migration.md
 - docs/javascript/asset-pipeline.md
@@ -220,11 +225,11 @@ files:
 - docs/outdated/rails-assets-relative-paths.md
 - docs/outdated/rails-assets.md
 - docs/outdated/rails3.md
-- docs/rails-webpacker-react-integration-options.md
 - docs/rails/convert-rails-5-api-only-app.md
 - docs/rails/rails-engine-integration.md
 - docs/rails/rails_view_rendering_from_inline_javascript.md
 - docs/rails/turbolinks.md
+- docs/react-on-rails-pro/react-on-rails-pro.md
 - docs/testimonials/hvmn.md
 - docs/testimonials/resortpass.md
 - docs/testimonials/testimonials.md
@@ -239,13 +244,24 @@ files:
 - lib/generators/react_on_rails/react_with_redux_generator.rb
 - lib/generators/react_on_rails/templates/.eslintrc
 - lib/generators/react_on_rails/templates/base/base/Procfile.dev
-- lib/generators/react_on_rails/templates/base/base/Procfile.dev-hmr
+- lib/generators/react_on_rails/templates/base/base/Procfile.dev-static
 - lib/generators/react_on_rails/templates/base/base/app/controllers/hello_world_controller.rb
 - lib/generators/react_on_rails/templates/base/base/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx
+- lib/generators/react_on_rails/templates/base/base/app/javascript/bundles/HelloWorld/components/HelloWorld.module.css
+- lib/generators/react_on_rails/templates/base/base/app/javascript/bundles/HelloWorld/components/HelloWorldServer.js
 - lib/generators/react_on_rails/templates/base/base/app/javascript/packs/registration.js.tt
+- lib/generators/react_on_rails/templates/base/base/app/javascript/packs/server-bundle.js
 - lib/generators/react_on_rails/templates/base/base/app/views/hello_world/index.html.erb.tt
 - lib/generators/react_on_rails/templates/base/base/app/views/layouts/hello_world.html.erb
+- lib/generators/react_on_rails/templates/base/base/babel.config.js.tt
 - lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb
+- lib/generators/react_on_rails/templates/base/base/config/webpack/clientWebpackConfig.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/commonWebpackConfig.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/production.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/serverWebpackConfig.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpack/webpackConfig.js.tt
+- lib/generators/react_on_rails/templates/base/base/config/webpacker.yml
 - lib/generators/react_on_rails/templates/dev_tests/.eslintrc
 - lib/generators/react_on_rails/templates/dev_tests/.rspec
 - lib/generators/react_on_rails/templates/dev_tests/spec/rails_helper.rb
@@ -325,7 +341,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev-hmr

@@ -1,26 +0,0 @@
-# Procfile for development using HMR
-
-web: rails s -p 3000
-
-# Note, hot and live reloading don't work with the default generator setup on
-# top of the rails/webpacker Webpack config with server rendering.
-# If you have server rendering enabled (prerender is true), you either need to
-# a. Ensure that you have dev_server.hmr and dev_server.inline BOTH set to false,
-#    and you have this option in your config/initializers/react_on_rails.rb:
-#      config.same_bundle_for_client_and_server = true
-#    If you have either config/webpacker.yml option set to true, you'll see errors like
-#    "ReferenceError: window is not defined" (if hmr is true)
-#    "TypeError: Cannot read property 'prototype' of undefined" (if inline is true)
-# b. Skip using the webpack-dev-server. bin/webpack --watch is typically
-     fast enough.
-# c. See the React on Rails README for a link to documentation for how to setup
-#    SSR with HMR and React hot loading using the webpack-dev-server only for the
-#    client bundles and a static file for the server bundle.
-
-# Run the webpack-dev-server for client and maybe server files
-webpack-dev-server: bin/webpack-dev-server
-
-# Keep the JS fresh for server rendering. Remove if not server rendering.
-# Especially if you have not configured generation of a server bundle without a hash.
-# as that will conflict with the manifest created by the bin/webpack-dev-server
-# rails-server-assets: SERVER_BUNDLE_ONLY=yes bin/webpack --watch