react_on_rails 12.5.1 → 12.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88901566a8542a69dca5cdad520c369e4fb7308c8e762879833857f98227df4f
-  data.tar.gz: 4248d3aa6267a69e480f371d543f00440aecc29eb1c26ddc9abd1d6ed06a4a26
+  metadata.gz: 42095c4558f10348cc26cb16a990b85bc2a5b7ccdc21d297fa1c461ce3b87ad5
+  data.tar.gz: 3592b3bf2a9d21746ea977f3be2c17478b7c440f4905dde5c5d7102e911715ee
 SHA512:
-  metadata.gz: dc7a0186cb28fe7e0aa157685228e648ebb64afc991690a4a6dd541e0584b03573deb977553d70ddbe48332ca47108c6af2590f338a1b27491de941b95df4855
-  data.tar.gz: 6a76d0c809e2a098c1425094f98c19f8cac91f426b7e826bf2f438b1fb15e541f048c4a5bdfb55f2e9c8ae1cc4521433e3d60ad81c1be0c08aaa958d5ea1b0b6
+  metadata.gz: f32f47937ffe6af27f69b6f6b95a0ced2cb7b6c268f1c0e7ea04bd55c42c421cf1cae37ff479702bd47de8435bb802ce273e0aff9d533456dfe7a46d4abe9847
+  data.tar.gz: 338aef5f7c66e7d167afb518e9c28056b8425b29e9c98d783701ad492b6766b80cc25aaa993dec655941ee855883c15ef32321e6694984a8f2833a3a6629e560

data/.circleci/config.yml

@@ -55,7 +55,7 @@ aliases:
     command: |
       gem install bundler
       echo "Bundler version: "; bundle --version
-      cd spec/dummy && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
+      cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
 
   # Install ruby gems unless existing set of gems is satisfying bundler.
   - &install-package-ruby-gems
@@ -63,6 +63,7 @@ aliases:
     command: |
       gem install bundler
       echo "Bundler version: "; bundle --version
+      bundle lock --add-platform 'x86_64-linux'
       bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
 
   # Restore node_modules dir from cache using yarn.lock checksum as a key.

data/.github/workflows/main.yml

@@ -55,7 +55,7 @@ jobs:
         path: spec/dummy/vendor/bundle
         key: v4-dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}
     - name: Install Ruby Gems for dummy app
-      run: cd spec/dummy && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
+      run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
     - name: Build test bundles for dummy app
       run: cd spec/dummy && yarn run build:test
     - id: get-sha
@@ -131,9 +131,9 @@ jobs:
     - name: yalc add react-on-rails
       run: cd spec/dummy && yalc add react-on-rails
     - name: Install Ruby Gems for package
-      run: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
+      run:  bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
     - name: Install Ruby Gems for dummy app
-      run: cd spec/dummy && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
+      run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
     - name: Ensure minimum required Chrome version
       run: |
         echo -e "Already installed $(google-chrome --version)\n"

data/CHANGELOG.md

@@ -16,11 +16,14 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
 Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
+### [12.5.2] - 2021-12-29
+### Fixed
+- Usage of config.build_production_command for custom command for production builds fixed. [PR 1415](https://github.com/shakacode/react_on_rails/pull/1415) by [judahmeek](https://github.com/judahmeek).
 
 ### [12.5.1] - 2021-12-27
 
 ### Fixed
-- A fatal server rendering error if running an ReactOnRails >=12.4.0 with ReactOnRails Pro <2.4.0. [PR 1412](https://github.com/shakacode/react_on_rails/pull/1412) by [judahmeek](https://github.com/judahmeek)
+- A fatal server rendering error if running an ReactOnRails >=12.4.0 with ReactOnRails Pro <2.4.0. [PR 1412](https://github.com/shakacode/react_on_rails/pull/1412) by [judahmeek](https://github.com/judahmeek).
 
 ### [12.5.0] - 2021-12-26
 
@@ -990,7 +993,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/12.5.1...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/12.5.2...master
+[12.5.2]: https://github.com/shakacode/react_on_rails/compare/12.5.1...12.5.2
 [12.5.1]: https://github.com/shakacode/react_on_rails/compare/12.5.0...12.5.1
 [12.5.0]: https://github.com/shakacode/react_on_rails/compare/12.4.0...12.5.0
 [12.4.0]: https://github.com/shakacode/react_on_rails/compare/12.3.0...12.4.0

data/lib/react_on_rails/configuration.rb

@@ -111,46 +111,79 @@ 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 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
-      #
-      # 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
 
+    # Pending updates to rails/webpacker v6, we may have some message that prints after configuration runs.
+    # 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)
+    #  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
       return unless ReactOnRails::WebpackerUtils.using_webpacker?
 

data/lib/react_on_rails/version.rb

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

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.1",
+  "version": "12.5.2",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 12.5.1
+  version: 12.5.2
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable