RubyGems - react_on_rails - Versions diffs - 14.0.2 → 14.0.3 - Mend

react_on_rails 14.0.2 → 14.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87289fa53128766e9295ad92d57015cafddfc9668324e62977d90ace31cbac83
-  data.tar.gz: 7f1d8b3e048ff7e93d4b0506bc2421ae25d5b0961d24c1972c2ca78b26e87edf
+  metadata.gz: 97f684f9ead5fb7736c7d7836501ac3964144cb63c3e707faf51b0a212251622
+  data.tar.gz: 376bf8a5fb5d632b28cef7b36272e17a29d5270cca71f2d5c067ec206b3e9a98
 SHA512:
-  metadata.gz: c1832bb6fbfe649168ff1de8a8d1a1f86f93ba52cf59c90fb2a2d23d28776240327521efc2d674b8d566f10bf1fa52da4390cc2b008b7c42c00901eea2a6a9e0
-  data.tar.gz: 8a7c5df6bcf809ee854e1b42b48219c46b4e0607e1f22f7a3f4a97cd30f5ef279a3a189d3055b118702d02bac4efc225693966b27a2d864932dd6065d0aadd3e
+  metadata.gz: 65b1bd21643a3d515b35082f7655ab4305d2dcb22b4906995f64c9056a06648b070c4b8656f46c2c4b599aed9c4d85468e1d7136d4f56f185db919e7faa05309
+  data.tar.gz: 145d1f91174c913d97fa171f81f1dd5d1e6daf04c7190094a0552ef6238ce5966cf39f5bd4b075c5a2112da18c108c6e98bd932d2a17799c20ef38efa848c622

data/CHANGELOG.md CHANGED Viewed

@@ -18,10 +18,17 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
 ### [Unreleased]
 Changes since the last non-beta release.
+### [14.0.3] - 2024-06-28
+#### Fixed
+- Fixed css-loader installation with [PR 1634](https://github.com/shakacode/react_on_rails/pull/1634) by [vaukalak](https://github.com/vaukalak).
+- Address a number of typos and grammar mistakes [PR 1631](https://github.com/shakacode/react_on_rails/pull/1631) by [G-Rath](https://github.com/G-Rath).
+- Adds an adapter module & improves test suite to support all versions of Shakapacker. [PR 1622](https://github.com/shakacode/react_on_rails/pull/1622) by [adriangohjw](https://github.com/adriangohjw) and [judahmeek](https://github.com/judahmeek).
 ### [14.0.2] - 2024-06-11
 #### Fixed
-- Project initialization with Shakapacker v8+ fixed [PR 1629](https://github.com/shakacode/react_on_rails/pull/1629) by [vaukalak](https://github.com/vaukalak)
+- Generator errors with Shakapacker v8+ fixed [PR 1629](https://github.com/shakacode/react_on_rails/pull/1629) by [vaukalak](https://github.com/vaukalak)
 ### [14.0.1] - 2024-05-16
@@ -174,7 +181,7 @@ which was only used in the workaround. [PR 1580](https://github.com/shakacode/re
 #### Changed
 - Changed logic of determining the usage of the default rails/webpacker webpack config or a custom command to only check if the config.build_production_command is defined. [PR 1402](https://github.com/shakacode/react_on_rails/pull/1402) by [justin808](https://github.com/justin808) and [gscarv13](https://github.com/gscarv13).
-- Minimimum required Ruby is 2.7 to match lastest rails/webpacker.
+- Minimum required Ruby is 2.7 to match latest rails/webpacker.
 ### [12.4.0] - 2021-09-22
 #### Added
@@ -201,7 +208,7 @@ which was only used in the workaround. [PR 1580](https://github.com/shakacode/re
 - Added the ability to assign a module with a `call` method to `config.build_production_command`. See [the configuration docs](https://www.shakacode.com/react-on-rails/docs/guides/configuration). [PR 1362: Accept custom module for config.build_production_command](https://github.com/shakacode/react_on_rails/pull/1362).
 #### Fixed
-- Stop setting NODE_ENV value during precompile, as it interferred with rails/webpacker's setting of NODE_ENV to production by default. Fixes [#1334](https://github.com/shakacode/react_on_rails/issues/1334). [PR 1356: Don't set NODE_ENV in assets.rake](https://github.com/shakacode/react_on_rails/pull/1356) by [alexrozanski](https://github.com/alexrozanski).
+- Stop setting NODE_ENV value during precompile, as it interfered with rails/webpacker's setting of NODE_ENV to production by default. Fixes [#1334](https://github.com/shakacode/react_on_rails/issues/1334). [PR 1356: Don't set NODE_ENV in assets.rake](https://github.com/shakacode/react_on_rails/pull/1356) by [alexrozanski](https://github.com/alexrozanski).
 ### [12.0.4] - 2020-11-14
 #### Fixed
@@ -221,7 +228,7 @@ which was only used in the workaround. [PR 1580](https://github.com/shakacode/re
 ### [12.0.1] - 2020-07-09
 #### Fixed
-- Changed invocation of webpacker:clean to use a very large number of versions so it does not acidentally delete the server-bundle.js. [PR 1306](https://github.com/shakacode/react_on_rails/pull/1306) by By [justin808](https://github.com/justin808).
+- Changed invocation of webpacker:clean to use a very large number of versions so it does not accidentally delete the server-bundle.js. [PR 1306](https://github.com/shakacode/react_on_rails/pull/1306) by By [justin808](https://github.com/justin808).
 ### [12.0.0] - 2020-07-08
 For upgrade instructions, see [docs/guides/upgrading-react-on-rails.md](https://www.shakacode.com/react-on-rails/docs/guides/upgrading-react-on-rails).
@@ -380,7 +387,7 @@ Do not use. Unpublished. Caused by an issue with the release script.
 ### [11.0.7] - 2018-05-16
 #### Fixed
-- Fix npm publshing. [PR 1090](https://github.com/shakacode/react_on_rails/pull/1090) by [justin808](https://github.com/justin808).
+- Fix npm publishing. [PR 1090](https://github.com/shakacode/react_on_rails/pull/1090) by [justin808](https://github.com/justin808).
 ### [11.0.6] - 2018-05-15
 #### Changed
@@ -756,7 +763,7 @@ No changes.
 - Don't assume ActionMailer is available. [#608](https://github.com/shakacode/react_on_rails/pull/608) by [tuzz](https://github.com/tuzz).
 ## [6.2.1] - 2016-11-19
-- Removed unnecesary passing of context in the HelloWorld Container example and basic generator. [#612](https://github.com/shakacode/react_on_rails/pull/612) by [justin808](https://github.com/justin808)
+- Removed unnecessary passing of context in the HelloWorld Container example and basic generator. [#612](https://github.com/shakacode/react_on_rails/pull/612) by [justin808](https://github.com/justin808)
 - Turbolinks 5 bugfix to use `before-cache`, not `before-render`. [#611](https://github.com/shakacode/react_on_rails/pull/611) by [volkanunsal](https://github.com/volkanunsal).
@@ -782,12 +789,12 @@ No changes.
 ##### Fixed
 - React on Rails now correctly parses single-digit version strings from package.json [#491](https://github.com/shakacode/react_on_rails/pull/491) by [samphilipd ](https://github.com/samphilipd).
-- Fixed assets symlinking to correctly use filenames with spaces. Begining in [#510](https://github.com/shakacode/react_on_rails/pull/510), ending in [#513](https://github.com/shakacode/react_on_rails/pull/513) by [dzirtusss](https://github.com/dzirtusss).
+- Fixed assets symlinking to correctly use filenames with spaces. Beginning in [#510](https://github.com/shakacode/react_on_rails/pull/510), ending in [#513](https://github.com/shakacode/react_on_rails/pull/513) by [dzirtusss](https://github.com/dzirtusss).
 - Check encoding of request's original URL and force it to UTF-8 [#527](https://github.com/shakacode/react_on_rails/pull/527) by [lucke84](https://github.com/lucke84)
 ## [6.0.5] - 2016-07-11
 ##### Added
-- Added better error messages to avoid issues with shared redux stores [#470](https://github.com/shakacode/react_on_rails/pull/470) by by [justin808](https://github.com/justin808).
+- Added better error messages to avoid issues with shared redux stores [#470](https://github.com/shakacode/react_on_rails/pull/470) by [justin808](https://github.com/justin808).
 ## [6.0.4] - 2016-06-13
 ##### Fixed
@@ -799,7 +806,7 @@ No changes.
 ## [6.0.2] - 2016-06-06
 ##### Fixed
-- Fix colisions in ids of DOM nodes generated by `react_component` by indexing in using an UUID rather than an auto-increment value. This means that it should be overriden using the `id` parameter of `react_component` if one wants to generate a predictable id (_e.g._ for testing purpose). See [Issue #437](https://github.com/shakacode/react_on_rails/issues/437). Fixed in [#438](https://github.com/shakacode/react_on_rails/pull/438) by [Michael Baudino](https://github.com/michaelbaudino).
+- Fix collisions in ids of DOM nodes generated by `react_component` by indexing in using a UUID rather than an auto-increment value. This means that it should be overridden using the `id` parameter of `react_component` if one wants to generate a predictable id (_e.g._ for testing purpose). See [Issue #437](https://github.com/shakacode/react_on_rails/issues/437). Fixed in [#438](https://github.com/shakacode/react_on_rails/pull/438) by [Michael Baudino](https://github.com/michaelbaudino).
 ## [6.0.1] - 2016-05-27
 ##### Fixed
@@ -807,16 +814,16 @@ No changes.
 ## [6.0.0] - 2016-05-25
 ##### Breaking Changes
-- Added automatic compilation of assets at precompile is now done by ReactOnRails. Thus, you don't need to provide your own assets.rake file that does the precompilation.
+- Added automatic compilation of assets at precompile is now done by ReactOnRails. Thus, you don't need to provide your own `assets.rake` file that does the precompilation.
   [#398](https://github.com/shakacode/react_on_rails/pull/398) by [robwise](https://github.com/robwise), [jbhatab](https://github.com/jbhatab), and [justin808](https://github.com/justin808).
 - **Migration to v6**
   - Do not run the generator again if you've already run it.
   - See [shakacode/react-webpack-rails-tutorial/pull/287](https://github.com/shakacode/react-webpack-rails-tutorial/pull/287) for an    example of upgrading from v5.
-  - To configure the asset compliation you can either
+  - To configure the asset compilation you can either
     1. Specify a `config/react_on_rails` setting for `build_production_command` to be nil to turn this feature off.
-    2. Specify the script command you want to run to build your production assets, and remove your assets.rake file.
+    2. Specify the script command you want to run to build your production assets, and remove your `assets.rake` file.
   - If you are using the ReactOnRails test helper, then you will need to add the 'config.npm_build_test_command' to your config to tell react_on_rails what command to run when you run rspec.
@@ -903,7 +910,7 @@ All 5.1.0 changes can be found in [#362](https://github.com/shakacode/react_on_r
 ## [4.0.3] - 2016-03-17
 ##### Fixed
-- `ReactOnRailsHelper#react_component`: Invalid deprecation message when called with only one paramter, the component name.
+- `ReactOnRailsHelper#react_component`: Invalid deprecation message when called with only one parameter, the component name.
 ## [4.0.2] - 2016-03-17
@@ -1133,7 +1140,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator-related issues.
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/14.0.2...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/14.0.3...master
+[14.0.3]: https://github.com/shakacode/react_on_rails/compare/14.0.2...14.0.3
 [14.0.2]: https://github.com/shakacode/react_on_rails/compare/14.0.1...14.0.2
 [14.0.1]: https://github.com/shakacode/react_on_rails/compare/14.0.0...14.0.1
 [14.0.0]: https://github.com/shakacode/react_on_rails/compare/13.4.0...14.0.0

data/CONTRIBUTING.md CHANGED Viewed

@@ -137,12 +137,22 @@ spec/dummy.
 ```sh
-# Optionally change default selenium_firefox driver
+# Optionally change default capybara driver
 export DRIVER=selenium_firefox
 cd react_on_rails/
 yarn run dummy:spec
 ```
+To convert the development environment over to Shakapacker v6 instead of the default Shakapacker v8:
+```sh
+# Optionally change default capybara driver
+export DRIVER=selenium_firefox
+cd react_on_rails/
+script/convert
+yarn run dummy:spec
+```
 ### Run NPM JS tests
 ```sh

data/Gemfile.development_dependencies CHANGED Viewed

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-gem "shakapacker", "7.2.1"
+gem "shakapacker", "8.0.0"
 gem "bootsnap", require: false
 gem "rails", "~> 7.1"
@@ -24,6 +24,7 @@ gem "amazing_print"
 group :development, :test do
   gem "listen"
+  gem "debug"
   gem "pry"
   gem "pry-byebug"
   gem "pry-doc"

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (14.0.0)
+    react_on_rails (14.0.2)
       addressable
       connection_pool
       execjs (~> 2.5)
@@ -119,6 +119,9 @@ GEM
       tins (~> 1.6)
     crass (1.0.6)
     date (3.3.4)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     diff-lcs (1.5.1)
     docile (1.4.0)
     drb (2.2.1)
@@ -334,7 +337,7 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.0.0)
-    shakapacker (7.2.1)
+    shakapacker (8.0.0)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)
@@ -397,6 +400,7 @@ DEPENDENCIES
   capybara
   capybara-screenshot
   coveralls
+  debug
   equivalent-xml
   gem-release
   generator_spec
@@ -422,7 +426,7 @@ DEPENDENCIES
   scss_lint
   sdoc
   selenium-webdriver (= 4.9.0)
-  shakapacker (= 7.2.1)
+  shakapacker (= 8.0.0)
   spring (~> 4.0)
   sprockets (~> 4.0)
   sqlite3 (~> 1.6)

data/NEWS.md CHANGED Viewed

@@ -28,11 +28,11 @@ that supports SSR.
 * 2016-12-20: New Video on Egghead.io: [Creating a component with React on Rails](https://egghead.io/lessons/react-creating-a-component-with-react-on-rails)
 * 2016-11-03: Spoke at [LA Ruby, 7pm, Thursday, November 10 in Venice, CA: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/). [Video and pictures in this article](https://blog.shakacode.com/my-react-on-rails-talk-at-the-la-ruby-rails-meetup-november-10-2016-eaaa83aff800#.ej6h4eglp).
 * 2016-08-27: We now have a [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference.
-* 2016-08-21: v6.1 ships with serveral new features and bug fixes. See the [Changelog](CHANGELOG.md).
+* 2016-08-21: v6.1 ships with several new features and bug fixes. See the [Changelog](CHANGELOG.md).
 * 2016-07-28: If you're doing server rendering, be sure to use mini\_racer! See [issues/428](https://github.com/shakacode/react_on_rails/issues/428). It's supposedly much faster than `therubyracer`.
 * 2016-08-27: We now have a [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference.
-* 2016-08-21: v6.1 ships with serveral new features and bug fixes. See the [Changelog](CHANGELOG.md).
+* 2016-08-21: v6.1 ships with several new features and bug fixes. See the [Changelog](CHANGELOG.md).
 * 2016-06-13: 6.0.4 shipped with a critical fix regarding a missing polyfill for `clearTimeout`, used by babel-polyfill.
 * 2016-06-06: 6.0.2 shipped with a critical fix if you are fragment caching the server generated React.
 * 2016-05-24: 6.0.0 Released! Simplified generator and install process! See the [CHANGELOG.md](./CHANGELOG.md) for details.

data/SUMMARY.md CHANGED Viewed

@@ -1,6 +1,6 @@
 # Table of Contents
-Doccumentation for React on Rails has moved!
+Documentation for React on Rails has moved!
 Here is the new link:

data/lib/generators/USAGE CHANGED Viewed

@@ -21,4 +21,4 @@ Then you may run
 More Details:
-    `https://github.com/shakacode/react_on_rails/blob/master/docs/basics/generator-details.md`
+    `https://github.com/shakacode/react_on_rails/blob/master/docs/additional-details/generator-details.md`

data/lib/generators/react_on_rails/base_generator.rb CHANGED Viewed

@@ -3,7 +3,6 @@
 require "rails/generators"
 require_relative "generator_messages"
 require_relative "generator_helper"
 module ReactOnRails
   module Generators
     class BaseGenerator < Rails::Generators::Base
@@ -30,17 +29,21 @@ module ReactOnRails
       def copy_base_files
         base_path = "base/base/"
         base_files = %w[app/controllers/hello_world_controller.rb
-                        app/views/layouts/hello_world.html.erb
-                        config/initializers/react_on_rails.rb
-                        Procfile.dev
-                        Procfile.dev-static]
+                        app/views/layouts/hello_world.html.erb]
+        base_templates = %w[config/initializers/react_on_rails.rb
+                            Procfile.dev
+                            Procfile.dev-static]
         base_files.each { |file| copy_file("#{base_path}#{file}", file) }
+        base_templates.each do |file|
+          template("#{base_path}/#{file}.tt", file, { packer_type: ReactOnRails::PackerUtils.packer_type })
+        end
       end
       def copy_js_bundle_files
         base_path = "base/base/"
         base_files = %w[app/javascript/packs/server-bundle.js
-                        app/javascript/bundles/HelloWorld/components/HelloWorldServer.js]
+                        app/javascript/bundles/HelloWorld/components/HelloWorldServer.js
+                        app/javascript/bundles/HelloWorld/components/HelloWorld.module.css]
         base_files.each { |file| copy_file("#{base_path}#{file}", file) }
       end
@@ -59,16 +62,14 @@ module ReactOnRails
         config = {
           message: "// The source code including full typescript support is available at:"
         }
-        base_files.each do |file|
-          template("#{base_path}/#{file}.tt", file, config)
-        end
+        base_files.each { |file| template("#{base_path}/#{file}.tt", file, config) }
       end
-      def copy_shakapacker_config
-        puts "Adding Shakapacker v7 config file"
+      def copy_packer_config
+        puts "Adding Shakapacker #{ReactOnRails::PackerUtils.shakapacker_version} config"
         base_path = "base/base/"
-        base_files = %w[config/shakapacker.yml]
-        base_files.each { |file| copy_file("#{base_path}#{file}", file) }
+        config = "config/shakapacker.yml"
+        copy_file("#{base_path}#{config}", config)
       end
       def add_base_gems_to_gemfile
@@ -81,7 +82,7 @@ module ReactOnRails
           run "yarn add react-on-rails@#{ReactOnRails::VERSION} --exact"
         else
           # otherwise add latest
-          puts "Adding the lastest react-on-rails NPM module. Double check this is correct in package.json"
+          puts "Adding the latest react-on-rails NPM module. Double check this is correct in package.json"
           run "yarn add react-on-rails --exact"
         end
@@ -91,7 +92,7 @@ module ReactOnRails
         puts "Adding CSS handlers"
-        run "yarn add css-loader css-minimizer-webpack-plugin mini-css-extract-plugin style-loader@"
+        run "yarn add -D css-loader css-minimizer-webpack-plugin mini-css-extract-plugin style-loader"
         puts "Adding dev dependencies"
         run "yarn add -D @pmmmwh/react-refresh-webpack-plugin react-refresh"

data/lib/generators/react_on_rails/generator_messages.rb CHANGED Viewed

@@ -65,16 +65,9 @@ module GeneratorMessages
         Alternative steps to run the app:
-          - Run `rails s` to start the Rails server.
-          - Run bin/shakapacker-dev-server to start the Webpack dev server for compilation of Webpack
-            assets as soon as you save. This default setup with the dev server does not work
-            for server rendering
+          - We recommend using Procfile.dev with foreman, overmind, or a similar program. Alternately, you can run each of the processes listed in Procfile.dev in a separate tab in your terminal.
           - Visit http://localhost:3000/hello_world and see your React On Rails app running!
-          - To turn on HMR, edit config/shakapacker.yml and set HMR to true. Restart the rails server
-            and bin/shakapacker-dev-server. Or use Procfile.dev.
       MSG
     end
   end

data/lib/generators/react_on_rails/install_generator.rb CHANGED Viewed

@@ -88,19 +88,13 @@ module ReactOnRails
         Dir.chdir("#{__dir__}/bin") do
           files_to_copy.concat(Dir.glob("*"))
         end
-        files_to_become_excutable = files_to_copy.map { |filename| "bin/#{filename}" }
+        files_to_become_executable = files_to_copy.map { |filename| "bin/#{filename}" }
-        File.chmod(0o755, *files_to_become_excutable)
+        File.chmod(0o755, *files_to_become_executable)
       end
       def add_post_install_message
-        message = GeneratorMessages.helpful_message_after_installation
-        unless using_shakapacker_7_or_above?
-          message = message.gsub("config/shakapacker", "config/webpacker")
-          message = message.gsub("bin/shakapacker", "bin/webpacker")
-        end
-        GeneratorMessages.add_info(message)
+        GeneratorMessages.add_info(GeneratorMessages.helpful_message_after_installation)
       end
       def using_shakapacker_7_or_above?

data/lib/generators/react_on_rails/templates/base/base/{Procfile.dev-static → Procfile.dev-static.tt} RENAMED Viewed

@@ -5,5 +5,5 @@ web: rails s -p 3000
 # When making frequent changes to client side assets, you will prefer building webpack assets
 # upon saving rather than when you refresh your browser page.
 # Note, if using React on Rails localization you will need to run
-# `bundle exec rake react_on_rails:locale` before you run bin/shakapacker
-webpack: sh -c 'rm -rf public/packs/* || true && bin/shakapacker -w'
+# `bundle exec rake react_on_rails:locale` before you run bin/<%= config[:packer_type] %>
+webpack: sh -c 'rm -rf public/packs/* || true && bin/<%= config[:packer_type] %> -w'

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt ADDED Viewed

@@ -0,0 +1,5 @@
+# Procfile for development using HMR
+# You can run these commands in separate shells
+rails: bundle exec rails s -p 3000
+wp-client: bin/<%= config[:packer_type] %>-dev-server
+wp-server: SERVER_BUNDLE_ONLY=yes bin/<%= config[:packer_type] %> --watch

data/lib/generators/react_on_rails/templates/base/base/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx CHANGED Viewed

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import style from './HelloWorld.module.css';
+import * as style from './HelloWorld.module.css';
 const HelloWorld = (props) => {
   const [name, setName] = useState(props.name);

data/lib/generators/react_on_rails/templates/base/base/config/initializers/{react_on_rails.rb → react_on_rails.rb.tt} RENAMED Viewed

@@ -24,8 +24,8 @@ ReactOnRails.configure do |config|
   # to automatically refresh your webpack assets on every test run.
   #
   # Alternately, you can remove the `ReactOnRails::TestHelper.configure_rspec_to_compile_assets`
-  # and set the config/shakapacker.yml option for test to true.
-  config.build_test_command = "RAILS_ENV=test bin/shakapacker"
+  # and set the config/<%= config[:packer_type] %>.yml option for test to true.
+  config.build_test_command = "RAILS_ENV=test bin/<%= config[:packer_type] %>"
   ################################################################################
   ################################################################################

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx CHANGED Viewed

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import style from './HelloWorld.module.css';
+import * as style from './HelloWorld.module.css';
 const HelloWorld = ({ name, updateName }) => (
   <div>

data/lib/react_on_rails/configuration.rb CHANGED Viewed

@@ -111,29 +111,29 @@ module ReactOnRails
     # on ReactOnRails
     def setup_config_values
-      check_autobundling_requirements_if_configured
+      check_autobundling_requirements if auto_load_bundle
       ensure_webpack_generated_files_exists
       configure_generated_assets_dirs_deprecation
       configure_skip_display_none_deprecation
       ensure_generated_assets_dir_present
       check_server_render_method_is_only_execjs
-      error_if_using_webpacker_and_generated_assets_dir_not_match_public_output_path
+      error_if_using_packer_and_generated_assets_dir_not_match_public_output_path
       # check_deprecated_settings
       adjust_precompile_task
     end
     private
-    def check_autobundling_requirements_if_configured
+    def check_autobundling_requirements
       raise_missing_components_subdirectory if auto_load_bundle && !components_subdirectory.present?
       return unless components_subdirectory.present?
-      ReactOnRails::WebpackerUtils.raise_shakapacker_not_installed unless ReactOnRails::WebpackerUtils.using_webpacker?
-      ReactOnRails::WebpackerUtils.raise_shakapacker_version_incompatible_for_autobundling unless
-        ReactOnRails::WebpackerUtils.shackapacker_version_requirement_met?(
+      ReactOnRails::PackerUtils.raise_shakapacker_not_installed unless ReactOnRails::PackerUtils.using_packer?
+      ReactOnRails::PackerUtils.raise_shakapacker_version_incompatible_for_autobundling unless
+        ReactOnRails::PackerUtils.shakapacker_version_requirement_met?(
           ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION
         )
-      ReactOnRails::WebpackerUtils.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries?
+      ReactOnRails::PackerUtils.raise_nested_entries_disabled unless ReactOnRails::PackerUtils.nested_entries?
     end
     def adjust_precompile_task
@@ -141,7 +141,7 @@ module ReactOnRails
       return if skip_react_on_rails_precompile || build_production_command.blank?
-      raise(ReactOnRails::Error, compile_command_conflict_message) if shakapacker_precompile?
+      raise(ReactOnRails::Error, compile_command_conflict_message) if ReactOnRails::PackerUtils.precompile?
       precompile_tasks = lambda {
         Rake::Task["react_on_rails:generate_packs"].invoke
@@ -151,9 +151,8 @@ module ReactOnRails
         # We set it very big so that it is not used, and then clean just
         # removes files older than 1 hour.
         versions = 100_000
-        puts "Invoking task #{shakapacker_clean_task} from React on Rails"
-        Rake::Task[shakapacker_clean_task].invoke(versions)
+        puts "Invoking task #{ReactOnRails::PackerUtils.packer_type}:clean from React on Rails"
+        Rake::Task["#{ReactOnRails::PackerUtils.packer_type}:clean"].invoke(versions)
       }
       if Rake::Task.task_defined?("assets:precompile")
@@ -167,22 +166,23 @@ module ReactOnRails
       end
     end
-    def error_if_using_webpacker_and_generated_assets_dir_not_match_public_output_path
-      return unless ReactOnRails::WebpackerUtils.using_webpacker?
+    def error_if_using_packer_and_generated_assets_dir_not_match_public_output_path
+      return unless ReactOnRails::PackerUtils.using_packer?
       return if generated_assets_dir.blank?
-      webpacker_public_output_path = ReactOnRails::WebpackerUtils.webpacker_public_output_path
+      packer_public_output_path = ReactOnRails::PackerUtils.packer_public_output_path
-      if File.expand_path(generated_assets_dir) == webpacker_public_output_path.to_s
+      if File.expand_path(generated_assets_dir) == packer_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 #{ReactOnRails::PackerUtils.packer_type}. " \
+                          "Remove this line from your configuration file.")
       else
         msg = <<~MSG
-          Error configuring /config/initializers/react_on_rails.rb: You are using webpacker
+          Error configuring /config/initializers/react_on_rails.rb: You are using #{ReactOnRails::PackerUtils.packer_type}
           and your specified value for generated_assets_dir = #{generated_assets_dir}
           that does not match the value for public_output_path specified in
-          webpacker.yml = #{webpacker_public_output_path}. You should remove the configuration
+          #{ReactOnRails::PackerUtils.packer_type}.yml = #{packer_public_output_path}. You should remove the configuration
           value for "generated_assets_dir" from your config/initializers/react_on_rails.rb file.
         MSG
         raise ReactOnRails::Error, msg
@@ -202,7 +202,7 @@ module ReactOnRails
     end
     def ensure_generated_assets_dir_present
-      return if generated_assets_dir.present? || ReactOnRails::WebpackerUtils.using_webpacker?
+      return if generated_assets_dir.present? || ReactOnRails::PackerUtils.using_packer?
       self.generated_assets_dir = DEFAULT_GENERATED_ASSETS_DIR
       Rails.logger.warn "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
@@ -211,11 +211,13 @@ module ReactOnRails
     def configure_generated_assets_dirs_deprecation
       return if generated_assets_dirs.blank?
-      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}."
+      if ReactOnRails::PackerUtils.using_packer?
+        packer_public_output_path = ReactOnRails::PackerUtils.packer_public_output_path
+        # rubocop:disable Layout/LineLength
+        Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the generated_assets_dirs nor " \
+                          "the generated_assets_dir when using #{ReactOnRails::PackerUtils.packer_type.upcase_first}. This is defined by " \
+                          "public_output_path specified in #{ReactOnRails::PackerUtils.packer_type}.yml = #{packer_public_output_path}."
+        # rubocop:enable Layout/LineLength
         return
       end
@@ -225,7 +227,7 @@ module ReactOnRails
         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 " \
+                          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Shakapacker " \
                           "and define neither if using Webpacker"
       end
     end
@@ -247,7 +249,7 @@ module ReactOnRails
     def raise_missing_components_subdirectory
       msg = <<~MSG
-        **ERROR** ReactOnRails: auto_load_bundle is set to true, yet components_subdirectory is unconfigured.\
+        **ERROR** ReactOnRails: auto_load_bundle is set to true, yet components_subdirectory is not configured.\
         Please set components_subdirectory to the desired directory.  For more information, please see \
         https://www.shakacode.com/react-on-rails/docs/guides/file-system-based-automated-bundle-generation.md
       MSG
@@ -255,28 +257,16 @@ module ReactOnRails
       raise ReactOnRails::Error, msg
     end
-    def shakapacker_precompile?
-      return Webpacker.config.webpacker_precompile? if ReactOnRails::WebpackerUtils.using_shakapacker_6?
-      Webpacker.config.shakapacker_precompile?
-    end
-    def shakapacker_clean_task
-      ReactOnRails::WebpackerUtils.using_shakapacker_6? ? "webpacker:clean" : "shakapacker:clean"
-    end
     def compile_command_conflict_message
-      packer = ReactOnRails::WebpackerUtils.using_shakapacker_6? ? "webpacker" : "shakapacker"
       <<~MSG
-        React on Rails and Shakapacker error in configuration!
+        React on Rails and #{ReactOnRails::PackerUtils.packer_type.upcase_first} error in configuration!
         In order to use config/react_on_rails.rb config.build_production_command,
-        you must edit config/#{packer}.yml to include this value in the default configuration:
-        '#{packer}_precompile: false'
+        you must edit config/#{ReactOnRails::PackerUtils.packer_type}.yml to include this value in the default configuration:
+        '#{ReactOnRails::PackerUtils.packer_type}_precompile: false'
         Alternatively, remove the config/react_on_rails.rb config.build_production_command and the
-        default bin/#{packer} script will be used for assets:precompile.
+        default bin/#{ReactOnRails::PackerUtils.packer_type} script will be used for assets:precompile.
       MSG
     end

data/lib/react_on_rails/helper.rb CHANGED Viewed

@@ -316,7 +316,7 @@ module ReactOnRails
     def load_pack_for_generated_component(react_component_name, render_options)
       return unless render_options.auto_load_bundle
-      ReactOnRails::WebpackerUtils.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries?
+      ReactOnRails::PackerUtils.raise_nested_entries_disabled unless ReactOnRails::PackerUtils.nested_entries?
       if Rails.env.development?
         is_component_pack_present = File.exist?(generated_components_pack_path(react_component_name))
         raise_missing_autoloaded_bundle(react_component_name) unless is_component_pack_present
@@ -330,8 +330,8 @@ module ReactOnRails
     private
-    def generated_components_pack_path(react_component_name)
-      "#{ReactOnRails::WebpackerUtils.webpacker_source_entry_path}/generated/#{react_component_name}.js"
+    def generated_components_pack_path(component_name)
+      "#{ReactOnRails::PackerUtils.packer_source_entry_path}/generated/#{component_name}.js"
     end
     def build_react_component_result_for_server_rendered_string(

data/lib/react_on_rails/{webpacker_utils.rb → packer_utils.rb} RENAMED Viewed

@@ -1,24 +1,55 @@
 # frozen_string_literal: true
 module ReactOnRails
-  module WebpackerUtils
-    def self.using_webpacker?
-      return @using_webpacker if defined?(@using_webpacker)
+  module PackerUtils
+    def self.using_packer?
+      using_shakapacker_const? || using_webpacker_const?
+    end
+    def self.using_shakapacker_const?
+      return @using_shakapacker_const if defined?(@using_shakapacker_const)
+      @using_shakapacker_const = ReactOnRails::Utils.gem_available?("shakapacker") &&
+                                 shakapacker_version_requirement_met?([7, 0, 0])
+    end
+    def self.using_webpacker_const?
+      return @using_webpacker_const if defined?(@using_webpacker_const)
+      @using_webpacker_const = (ReactOnRails::Utils.gem_available?("shakapacker") &&
+                          shakapacker_version_as_array[0] <= 6) ||
+                               ReactOnRails::Utils.gem_available?("webpacker")
+    end
+    def self.packer_type
+      return "shakapacker" if using_shakapacker_const?
+      return "webpacker" if using_webpacker_const?
+      nil
+    end
+    def self.packer
+      return nil unless using_packer?
-      @using_webpacker = ReactOnRails::Utils.gem_available?("webpacker") ||
-                         ReactOnRails::Utils.gem_available?("shakapacker")
+      if using_shakapacker_const?
+        require "shakapacker"
+        return ::Shakapacker
+      end
+      require "webpacker"
+      ::Webpacker
     end
     def self.dev_server_running?
-      return false unless using_webpacker?
+      return false unless using_packer?
-      Webpacker.dev_server.running?
+      packer.dev_server.running?
     end
     def self.shakapacker_version
+      return @shakapacker_version if defined?(@shakapacker_version)
       return nil unless ReactOnRails::Utils.gem_available?("shakapacker")
-      @shakapacker_version ||= Gem.loaded_specs["shakapacker"].version.to_s
+      @shakapacker_version = Gem.loaded_specs["shakapacker"].version.to_s
     end
     def self.shakapacker_version_as_array
@@ -27,7 +58,7 @@ module ReactOnRails
       @shakapacker_version_as_array = [match[1].to_i, match[2].to_i, match[3].to_i]
     end
-    def self.shackapacker_version_requirement_met?(required_version)
+    def self.shakapacker_version_requirement_met?(required_version)
       req_ver = semver_to_string(required_version)
       Gem::Version.new(shakapacker_version) >= Gem::Version.new(req_ver)
@@ -36,12 +67,8 @@ module ReactOnRails
     # This returns either a URL for the webpack-dev-server, non-server bundle or
     # the hashed server bundle if using the same bundle for the client.
     # Otherwise returns a file path.
-    def self.bundle_js_uri_from_webpacker(bundle_name)
-      # Note Webpacker 3.4.3 manifest lookup is inside of the public_output_path
-      # [2] (pry) ReactOnRails::WebpackerUtils: 0> Webpacker.manifest.lookup("app-bundle.js")
-      # "/webpack/development/app-bundle-c1d2b6ab73dffa7d9c0e.js"
-      # Next line will throw if the file or manifest does not exist
-      hashed_bundle_name = Webpacker.manifest.lookup!(bundle_name)
+    def self.bundle_js_uri_from_packer(bundle_name)
+      hashed_bundle_name = packer.manifest.lookup!(bundle_name)
       # Support for hashing the server-bundle and having that built
       # the webpack-dev-server is provided by the config value
@@ -49,48 +76,52 @@ module ReactOnRails
       # would mean that the bundle is created by the webpack-dev-server
       is_server_bundle = bundle_name == ReactOnRails.configuration.server_bundle_js_file
-      if Webpacker.dev_server.running? && (!is_server_bundle ||
+      if packer.dev_server.running? && (!is_server_bundle ||
         ReactOnRails.configuration.same_bundle_for_client_and_server)
-        "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}#{hashed_bundle_name}"
+        "#{packer.dev_server.protocol}://#{packer.dev_server.host_with_port}#{hashed_bundle_name}"
       else
         File.expand_path(File.join("public", hashed_bundle_name)).to_s
       end
     end
-    def self.webpacker_source_path
-      Webpacker.config.source_path
+    def self.precompile?
+      return ::Webpacker.config.webpacker_precompile? if using_webpacker_const?
+      return ::Shakapacker.config.shakapacker_precompile? if using_shakapacker_const?
+      false
     end
-    def self.webpacker_source_entry_path
-      Webpacker.config.source_entry_path
+    def self.packer_source_path
+      packer.config.source_path
+    end
+    def self.packer_source_entry_path
+      packer.config.source_entry_path
     end
     def self.nested_entries?
-      Webpacker.config.nested_entries?
+      packer.config.nested_entries?
     end
-    def self.webpacker_public_output_path
-      # Webpacker has the full absolute path of webpacker output files in a Pathname
-      Webpacker.config.public_output_path.to_s
+    def self.packer_public_output_path
+      packer.config.public_output_path.to_s
     end
     def self.manifest_exists?
-      Webpacker.config.public_manifest_path.exist?
+      packer.config.public_manifest_path.exist?
     end
-    def self.webpacker_source_path_explicit?
-      # WARNING: Calling private method `data` on Webpacker::Configuration, lib/webpacker/configuration.rb
-      config_webpacker_yml = Webpacker.config.send(:data)
-      config_webpacker_yml[:source_path].present?
+    def self.packer_source_path_explicit?
+      packer.config.send(:data)[:source_path].present?
     end
     def self.check_manifest_not_cached
-      return unless using_webpacker? && Webpacker.config.cache_manifest?
+      return unless using_packer? && packer.config.cache_manifest?
       msg = <<-MSG.strip_heredoc
           ERROR: you have enabled cache_manifest in the #{Rails.env} env when using the
           ReactOnRails::TestHelper.configure_rspec_to_compile_assets helper
-          To fix this: edit your config/webpacker.yml file and set cache_manifest to false for test.
+          To fix this: edit your config/#{packer_type}.yml file and set cache_manifest to false for test.
       MSG
       puts wrap_message(msg)
       exit!
@@ -111,7 +142,7 @@ module ReactOnRails
     def self.raise_nested_entries_disabled
       msg = <<~MSG
         **ERROR** ReactOnRails: `nested_entries` is configured to be disabled in shakapacker. Please update \
-        webpacker.yml to enable nested entries. for more information read
+        config/#{packer_type}.yml to enable nested entries. for more information read
         https://www.shakacode.com/react-on-rails/docs/guides/file-system-based-automated-bundle-generation.md#enable-nested_entries-for-shakapacker
       MSG
@@ -120,9 +151,9 @@ module ReactOnRails
     def self.raise_shakapacker_version_incompatible_for_autobundling
       msg = <<~MSG
-        **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{ReactOnRails::WebpackerUtils.semver_to_string(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION)} or \
+        **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{semver_to_string(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION)} or \
         above to use the automated bundle generation feature. The currently installed version is \
-        #{ReactOnRails::WebpackerUtils.semver_to_string(ReactOnRails::WebpackerUtils.shakapacker_version_as_array)}.
+        #{semver_to_string(ReactOnRails::PackerUtils.shakapacker_version_as_array)}.
       MSG
       raise ReactOnRails::Error, msg
@@ -131,7 +162,7 @@ module ReactOnRails
     def self.raise_shakapacker_not_installed
       msg = <<~MSG
         **ERROR** ReactOnRails: Missing Shakapacker gem. Please upgrade to use Shakapacker \
-        #{ReactOnRails::WebpackerUtils.semver_to_string(minimum_required_shakapacker_version)} or above to use the \
+        #{semver_to_string(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION)} or above to use the \
         automated bundle generation feature.
       MSG
@@ -141,11 +172,5 @@ module ReactOnRails
     def self.semver_to_string(ary)
       "#{ary[0]}.#{ary[1]}.#{ary[2]}"
     end
-    def self.using_shakapacker_6?
-      shakapacker_major_version = shakapacker_version_as_array[0]
-      shakapacker_major_version == 6
-    end
   end
 end

data/lib/react_on_rails/packs_generator.rb CHANGED Viewed

@@ -102,7 +102,7 @@ module ReactOnRails
       generated_interim_server_bundle_path = server_bundle_entrypoint.sub(".js", "-generated.js")
       generated_server_bundle_file_name = component_name(generated_interim_server_bundle_path)
-      source_entrypoint_parent = Pathname(ReactOnRails::WebpackerUtils.webpacker_source_entry_path).parent
+      source_entrypoint_parent = Pathname(ReactOnRails::PackerUtils.packer_source_entry_path).parent
       generated_nonentrypoints_path = "#{source_entrypoint_parent}/generated"
       FileUtils.mkdir_p(generated_nonentrypoints_path)
@@ -115,12 +115,12 @@ module ReactOnRails
     end
     def server_bundle_entrypoint
-      Rails.root.join(ReactOnRails::WebpackerUtils.webpacker_source_entry_path,
+      Rails.root.join(ReactOnRails::PackerUtils.packer_source_entry_path,
                       ReactOnRails.configuration.server_bundle_js_file)
     end
     def generated_packs_directory_path
-      source_entry_path = ReactOnRails::WebpackerUtils.webpacker_source_entry_path
+      source_entry_path = ReactOnRails::PackerUtils.packer_source_entry_path
       "#{source_entry_path}/generated"
     end
@@ -185,7 +185,7 @@ module ReactOnRails
     end
     def components_search_path
-      source_path = ReactOnRails::WebpackerUtils.webpacker_source_path
+      source_path = ReactOnRails::PackerUtils.packer_source_path
       "#{source_path}/**/#{ReactOnRails.configuration.components_subdirectory}"
     end

data/lib/react_on_rails/test_helper/ensure_assets_compiled.rb CHANGED Viewed

@@ -19,8 +19,8 @@ module ReactOnRails
       end
       # Several Scenarios:
-      # 1. No webpack watch processes for static assets and files are mising or out of date.
-      # 2. Only webpack watch process for server bundle as we're the  hot reloading setup.
+      # 1. No webpack watch processes for static assets and files are missing or out of date.
+      # 2. Only webpack watch process for server bundle as we're the hot reloading setup.
       # 3. For whatever reason, the watch processes are running, but some clean script removed
       #    the generated bundles.
       def call

data/lib/react_on_rails/test_helper/webpack_assets_compiler.rb CHANGED Viewed

@@ -16,7 +16,7 @@ module ReactOnRails
             React on Rails is aborting your test run
-            If you wish to use the config/webpacker.yml compile option for tests
+            If you wish to use the config/#{ReactOnRails::PackerUtils.packer_type}.yml compile option for tests
             them remove your call to the ReactOnRails test helper.
           MSG
           puts Rainbow(msg).red

data/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module ReactOnRails
   module TestHelper
     class WebpackAssetsStatusChecker
       include Utils::Required
-      # source_path is typically configured in the webpacker.yml file
+      # source_path is typically configured in the (shaka/web)packer.yml file
       # for `source_path`
       # or for legacy React on Rails, it's /client, where all client files go
       attr_reader :source_path, :generated_assets_full_path
@@ -30,8 +30,8 @@ module ReactOnRails
       end
       def stale_generated_files(files)
-        manifest_needed = ReactOnRails::WebpackerUtils.using_webpacker? &&
-                          !ReactOnRails::WebpackerUtils.manifest_exists?
+        manifest_needed = ReactOnRails::PackerUtils.using_packer? &&
+                          !ReactOnRails::PackerUtils.manifest_exists?
         return ["manifest.json"] if manifest_needed
@@ -63,7 +63,7 @@ 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 " \
+                 "which files are required. If you are using Shakapacker, you typically need to only " \
                  "include 'manifest.json'."
             puts "Detected the possible following files to check for webpack compilation in " \
                  "#{generated_assets_full_path}"

data/lib/react_on_rails/test_helper.rb CHANGED Viewed

@@ -67,7 +67,7 @@ module ReactOnRails
                                     source_path: nil,
                                     generated_assets_full_path: nil,
                                     webpack_generated_files: nil)
-      ReactOnRails::WebpackerUtils.check_manifest_not_cached
+      ReactOnRails::PackerUtils.check_manifest_not_cached
       if webpack_assets_status_checker.nil?
         source_path ||= ReactOnRails::Utils.source_path
         generated_assets_full_path ||= ReactOnRails::Utils.generated_assets_full_path
@@ -86,10 +86,10 @@ module ReactOnRails
           puts
           @printed_once = true
-          if ReactOnRails::WebpackerUtils.using_webpacker? &&
-             ReactOnRails::Utils.using_webpacker_source_path_is_not_defined_and_custom_node_modules?
+          if ReactOnRails::PackerUtils.using_packer? &&
+             ReactOnRails::Utils.using_packer_source_path_is_not_defined_and_custom_node_modules?
             msg = <<-MSG.strip_heredoc
-              WARNING: Define config.webpacker.yml to include sourcePath to configure
+              WARNING: Define config/#{ReactOnRails::PackerUtils.packer_type}.yml to include sourcePath to configure
               the location of your JavaScript source for React on Rails.
               Default location of #{source_path} is used.
             MSG

data/lib/react_on_rails/utils.rb CHANGED Viewed

@@ -79,12 +79,14 @@ module ReactOnRails
       return @server_bundle_path if @server_bundle_path && !Rails.env.development?
       bundle_name = ReactOnRails.configuration.server_bundle_js_file
-      @server_bundle_path = if ReactOnRails::WebpackerUtils.using_webpacker?
+      @server_bundle_path = if ReactOnRails::PackerUtils.using_packer?
                               begin
                                 bundle_js_file_path(bundle_name)
-                              rescue Webpacker::Manifest::MissingEntryError
+                              rescue Object.const_get(
+                                ReactOnRails::PackerUtils.packer_type.capitalize
+                              )::Manifest::MissingEntryError
                                 File.expand_path(
-                                  File.join(ReactOnRails::WebpackerUtils.webpacker_public_output_path,
+                                  File.join(ReactOnRails::PackerUtils.packer_public_output_path,
                                             bundle_name)
                                 )
                               end
@@ -94,12 +96,12 @@ module ReactOnRails
     end
     def self.bundle_js_file_path(bundle_name)
-      if ReactOnRails::WebpackerUtils.using_webpacker? && bundle_name != "manifest.json"
-        ReactOnRails::WebpackerUtils.bundle_js_uri_from_webpacker(bundle_name)
+      if ReactOnRails::PackerUtils.using_packer? && bundle_name != "manifest.json"
+        ReactOnRails::PackerUtils.bundle_js_uri_from_packer(bundle_name)
       else
         # Default to the non-hashed name in the specified output directory, which, for legacy
         # React on Rails, this is the output directory picked up by the asset pipeline.
-        # For Webpacker, this is the public output path defined in the webpacker.yml file.
+        # For Shakapacker, this is the public output path defined in the (shaka/web)packer.yml file.
         File.join(generated_assets_full_path, bundle_name)
       end
     end
@@ -129,23 +131,23 @@ module ReactOnRails
     end
     def self.source_path
-      if ReactOnRails::WebpackerUtils.using_webpacker?
-        ReactOnRails::WebpackerUtils.webpacker_source_path
+      if ReactOnRails::PackerUtils.using_packer?
+        ReactOnRails::PackerUtils.packer_source_path
       else
         ReactOnRails.configuration.node_modules_location
       end
     end
-    def self.using_webpacker_source_path_is_not_defined_and_custom_node_modules?
-      return false unless ReactOnRails::WebpackerUtils.using_webpacker?
+    def self.using_packer_source_path_is_not_defined_and_custom_node_modules?
+      return false unless ReactOnRails::PackerUtils.using_packer?
-      !ReactOnRails::WebpackerUtils.webpacker_source_path_explicit? &&
+      !ReactOnRails::PackerUtils.packer_source_path_explicit? &&
         ReactOnRails.configuration.node_modules_location.present?
     end
     def self.generated_assets_full_path
-      if ReactOnRails::WebpackerUtils.using_webpacker?
-        ReactOnRails::WebpackerUtils.webpacker_public_output_path
+      if ReactOnRails::PackerUtils.using_packer?
+        ReactOnRails::PackerUtils.packer_public_output_path
       else
         File.expand_path(ReactOnRails.configuration.generated_assets_dir)
       end
@@ -156,7 +158,11 @@ module ReactOnRails
     rescue Gem::LoadError
       false
     rescue StandardError
-      Gem.available?(name).present?
+      begin
+        Gem.available?(name).present?
+      rescue NoMethodError
+        false
+      end
     end
     # Todo -- remove this for v13, as we don't need both boolean and number

data/lib/react_on_rails/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "14.0.2"
+  VERSION = "14.0.3"
 end

data/lib/react_on_rails/version_checker.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 module ReactOnRails
   # Responsible for checking versions of rubygem versus yarn node package
-  # against each otherat runtime.
+  # against each other at runtime.
   class VersionChecker
     attr_reader :node_package_version

data/lib/react_on_rails.rb CHANGED Viewed

@@ -18,7 +18,7 @@ require "react_on_rails/version_syntax_converter"
 require "react_on_rails/test_helper"
 require "react_on_rails/git_utils"
 require "react_on_rails/utils"
-require "react_on_rails/webpacker_utils"
+require "react_on_rails/packer_utils"
 require "react_on_rails/packs_generator"
 require "react_on_rails/test_helper/webpack_assets_compiler"
 require "react_on_rails/test_helper/webpack_assets_status_checker"

data/lib/tasks/assets.rake CHANGED Viewed

@@ -5,7 +5,7 @@ namespace :react_on_rails do
   namespace :assets do
     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.
+      added to task assets:precompile and the regular packer compile will not run.
       The defined command is either a script or a module with a method `call`.
     DESC
     task webpack: :locale do

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 14.0.2
+  version: 14.0.3
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -129,8 +129,8 @@ files:
 - lib/generators/react_on_rails/react_no_redux_generator.rb
 - 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-static
+- lib/generators/react_on_rails/templates/base/base/Procfile.dev-static.tt
+- lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt
 - 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
@@ -140,7 +140,7 @@ files:
 - 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/initializers/react_on_rails.rb.tt
 - lib/generators/react_on_rails/templates/base/base/config/shakapacker.yml
 - 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
@@ -175,6 +175,7 @@ files:
 - lib/react_on_rails/locales/base.rb
 - lib/react_on_rails/locales/to_js.rb
 - lib/react_on_rails/locales/to_json.rb
+- lib/react_on_rails/packer_utils.rb
 - lib/react_on_rails/packs_generator.rb
 - lib/react_on_rails/prerender_error.rb
 - lib/react_on_rails/react_component/render_options.rb
@@ -189,7 +190,6 @@ files:
 - lib/react_on_rails/version.rb
 - lib/react_on_rails/version_checker.rb
 - lib/react_on_rails/version_syntax_converter.rb
-- lib/react_on_rails/webpacker_utils.rb
 - lib/tasks/assets.rake
 - lib/tasks/generate_packs.rake
 - lib/tasks/locale.rake
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Rails with react server rendering with webpack.

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev DELETED Viewed

@@ -1,5 +0,0 @@
-# Procfile for development using HMR
-# You can run these commands in separate shells
-rails: bundle exec rails s -p 3000
-wp-client: bin/shakapacker-dev-server
-wp-server: SERVER_BUNDLE_ONLY=yes bin/shakapacker --watch