react_on_rails 13.3.3 → 13.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68dc51cc2eb837fd5ff976cdba5aeaefdec1ca13540e574e8f4e2ec054ec8769
-  data.tar.gz: 80d926e7a845cb55f27763de6050b3b4d3f829323b46362ca6f3e92a1daac3aa
+  metadata.gz: 0b5950d1de16d2db5f3944bb18bb65155f038f5587e8856e8c6418bc59cbcca9
+  data.tar.gz: d40aa0a760a7ef09df3a7b6550e1d1619001183895c28293bd3f993cb08e16c2
 SHA512:
-  metadata.gz: ea748cde016bbdae69f2ffa4047324fdd9d2426413e1baf4e5adf9043e6540f4fbcf0d4ec2237ec4854d79eab257b9022afc91576bb9517cf5e2ae2490f06777
-  data.tar.gz: a5c39c15e12231ad30bb15ef56517092cc50d368cd477d4653a4fad57b4f91c4b33143058718f09129623afd46ef81639b3f8add303b1125e4926641cc0b5c54
+  metadata.gz: 324d1e13a73437cdcd302961ae9d4a91303bdb2872e8355b9d4677d6ff9a92aa77e98df0ff21934782ae39e4bf540e39c37aca38337385d85aaeef72cbab37cd
+  data.tar.gz: f762b29b6619e39067573317c027b9aa7a390a6d2d86b78f73a039ad3c1c1e26c6985ec8df3c3e00c10d0ed179f4246415cb573efc77d0f2d619737e643e54cb

data/.circleci/config.yml

@@ -1,3 +1,4 @@
+# CircleCI is not longer in use by this repository & this file is now for reference only.
 version: 2
 
 aliases:
@@ -53,7 +54,7 @@ aliases:
   - &install-dummy-app-ruby-gems
     name: Install Ruby Gems for dummy app
     command: |
-      gem install bundler
+      gem install bundler:2.4.9
       echo "Bundler version: "; bundle --version
       cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
 
@@ -61,7 +62,7 @@ aliases:
   - &install-package-ruby-gems
     name: Install Ruby Gems for package
     command: |
-      gem install bundler
+      gem install bundler:2.4.9
       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
@@ -272,12 +273,12 @@ jobs:
           name: Prep for CI
           # TODO -- need to leverage Circle CI containers
           command: |
-            bundle exec rails prepare_for_ci
+            bundle exec rake prepare_for_ci
       - run:
           name: Main CI
           # TODO -- need to leverage Circle CI containers
           command: |
-            bundle exec rails run_rspec:all_dummy
+            bundle exec rake run_rspec:all_dummy
       # The following step will run only if the main job is finished successfully.
       # Build hook is triggered by curl command described here https://docs.netlify.com/configure-builds/build-hooks/
       # NETLIFY_HOOK is an environment variable on CircleCI to keep sensitive data outside the repo

data/.github/workflows/lint-js-and-ruby.yml

@@ -15,6 +15,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler: 2.4.9
     - name: Setup Node
       uses: actions/setup-node@v2-beta
       with:
@@ -44,7 +45,7 @@ jobs:
         yarn run eslint -v
         sudo yarn global add yalc
     - name: Install Ruby Gems for package
-      run: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
+      run: bundle check --path=vendor/bundle || bundle _2.4.9_ install --path=vendor/bundle --jobs=4 --retry=3
     - name: Linting of Ruby
       run: bundle exec rubocop
     - name: Linting of JS

data/.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: Main test
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build-dummy-app-webpack-test-bundles:
@@ -15,6 +15,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler: 2.4.9
     # libyaml-dev is needed for psych v5
     # this gem depends on sdoc which depends on rdoc which depends on psych
     - name: Fix dependency for libyaml-dev
@@ -33,7 +34,7 @@ jobs:
         echo "Yarn version: "; yarn --version
         echo "Bundler version: "; bundle --version
     - name: Save root node_modules to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: node_modules
         key: v5-package-node-modules-cache-${{ hashFiles('yarn.lock') }}
@@ -45,7 +46,7 @@ jobs:
     - name: yalc publish for react-on-rails
       run: yalc publish
     - name: Save spec/dummy/node_modules to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: spec/dummy/node_modules
         key: v5-dummy-app-node-modules-cache-${{ hashFiles('spec/dummy/yarn.lock') }}
@@ -54,12 +55,12 @@ jobs:
     - name: Install Node modules with Yarn for dummy app
       run: cd spec/dummy && yarn install --no-progress --no-emoji
     - name: Save dummy app ruby gems to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: spec/dummy/vendor/bundle
         key: v5-dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}
     - name: Install Ruby Gems for dummy app
-      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
+      run: cd spec/dummy && bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.4.9_ install --path=vendor/bundle --jobs=4 --retry=3
     - name: generate file system-based packs
       run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
     - name: Build test bundles for dummy app
@@ -67,7 +68,7 @@ jobs:
     - id: get-sha
       run: echo "::set-output name=sha::$(git rev-parse HEAD)"
     - name: Save test webpack bundles to cache (for build number checksum used by rspec job)
-      uses: actions/cache@v2
+      uses: actions/cache/save@v3
       with:
         path: spec/dummy/public/webpack
         key: v5-dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}
@@ -78,7 +79,7 @@ jobs:
       matrix:
         ruby: [2.7]
         node: [14]
-        rake_task: ['run_rspec:all_dummy', 'run_rspec:all_but_examples', 'run_rspec:examples']
+        rake_task: ['run_rspec:all_but_examples', 'run_rspec:examples']
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
@@ -86,6 +87,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler: 2.4.9
     - name: Setup Node
       uses: actions/setup-node@v2-beta
       with:
@@ -100,33 +102,32 @@ jobs:
         echo "Yarn version: "; yarn --version
         echo "Bundler version: "; bundle --version
     - name: Save root node_modules to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: node_modules
         key: v5-package-node-modules-cache-${{ hashFiles('yarn.lock') }}
     - name: Save root ruby gems to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: vendor/bundle
         key: v5-package-app-gem-cache-${{ hashFiles('react_on_rails.gemspec') }}
     - name: Save dummy app ruby gems to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: spec/dummy/vendor/bundle
         key: v5-dummy-app-gem-cache-${{ hashFiles('spec/dummy/Gemfile.lock') }}
     - name: Save spec/dummy/node_modules to cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: spec/dummy/node_modules
         key: v5-dummy-app-node-modules-cache-${{ hashFiles('spec/dummy/yarn.lock') }}
     - id: get-sha
       run: echo "::set-output name=sha::$(git rev-parse HEAD)"
     - name: Save test webpack bundles to cache (for build number checksum used by rspec job)
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: spec/dummy/public/webpack
         key: v5-dummy-app-webpack-bundle-${{ steps.get-sha.outputs.sha }}
-
     - name: Install Node modules with Yarn for renderer package
       run: |
         yarn install --no-progress --no-emoji
@@ -139,7 +140,7 @@ jobs:
     - name: Install Ruby Gems for package
       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 lock --add-platform 'x86_64-linux' && 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 _2.4.9_ install --path=vendor/bundle --jobs=4 --retry=3
     - name: Ensure minimum required Chrome version
       run: |
         echo -e "Already installed $(google-chrome --version)\n"
@@ -152,16 +153,14 @@ jobs:
           sudo apt-get install google-chrome-stable
           echo -e "\nInstalled $(google-chrome --version)"
         fi
-    - name: Touch webpack bundles
-      run: touch spec/dummy/public/webpack/test/*
     - name: Install yalc globally
       run: sudo yarn global add yalc
     - name: Increase the amount of inotify watchers
       run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-    - name: Prep for CI
-      run: bundle exec rails prepare_for_ci
+    - name: generate file system-based packs
+      run: cd spec/dummy && RAILS_ENV=test bundle exec rake react_on_rails:generate_packs
     - name: Main CI
-      run: bundle exec rails ${{ matrix.rake_task }}
+      run: bundle exec rake ${{ matrix.rake_task }}
     - name: Store test results
       uses: actions/upload-artifact@v2
       with:

data/.github/workflows/rspec-package-specs.yml

@@ -15,6 +15,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler: 2.4.9
     - name: Print system information
       run: |
         echo "Linux release: "; cat /etc/issue

data/.prettierignore

@@ -3,10 +3,12 @@ package.json
 tmp/
 coverage/
 **/app/assets/webpack/
-spec/dummy/public
 gen-examples/examples/*
 node_package/lib/*
 spec/react_on_rails/dummy-for-generators/app/javascript/bundles/HelloWorld/*
 bundle/
 spec/dummy/lib/bs/**
+spec/dummy/public
+**/.yalc/**
+**/generated/**
 *.bs.js

data/CHANGELOG.md

@@ -17,6 +17,19 @@ Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
 
+### [13.3.4] - 2022-05-23
+
+### Added
+- Improved functionality of Filesystem-based pack generation & auto-bundling. Added `make_generated_server_bundle_the_entrypoint` configuration key. [PR 1531](https://github.com/shakacode/react_on_rails/pull/1531) by [judahmeek](https://github.com/judahmeek)
+
+### Removed
+- Removed unneeded `HMR=true` from `Procfile.dev` in install template [PR 1537](https://github.com/shakacode/react_on_rails/pull/1537) by [ahangarha](https://github.com/ahangarha).
+
+### [13.3.3] - 2022-03-21
+
+### Fixed
+- Fixed bug regarding loading FS-based packs. [PR 1527](https://github.com/shakacode/react_on_rails/pull/1527) by [judahmeek](https://github.com/judahmeek)
+
 ### [13.3.2] - 2022-02-24
 
 ### Fixed
@@ -1072,7 +1085,9 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/13.3.2...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/13.3.4...master
+[13.3.4]: https://github.com/shakacode/react_on_rails/compare/13.3.3...13.3.4
+[13.3.3]: https://github.com/shakacode/react_on_rails/compare/13.3.2...13.3.3
 [13.3.2]: https://github.com/shakacode/react_on_rails/compare/13.3.1...13.3.2
 [13.3.1]: https://github.com/shakacode/react_on_rails/compare/13.3.0...13.3.1
 [13.3.0]: https://github.com/shakacode/react_on_rails/compare/13.2.0...13.3.0

data/Gemfile.development_dependencies

@@ -8,6 +8,7 @@ gem "sass-rails", "~> 6.0"
 gem "uglifier"
 gem "jquery-rails"
 gem "puma", "~> 5.0"
+gem "bundler", "2.4.9"
 
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem "turbolinks" if ENV["DISABLE_TURBOLINKS"].nil? || ENV["DISABLE_TURBOLINKS"].strip.empty?
@@ -46,5 +47,5 @@ group :test do
   gem "rspec-rails"
   gem "rspec-retry"
   gem "selenium-webdriver"
-  gem "webdrivers", "3.9.4"
+  gem "webdrivers"
 end

data/README.md

@@ -53,7 +53,7 @@ Given that `rails/webpacker` gem already provides basic React integration, why w
 1. Easy passing of props directly from your Rails view to your React components rather than having your Rails view load and then make a separate request to your API.
 Tight integration with [shakapacker](https://github.com/shakacode/shakapacker) (or it's predecessor [rails/webpacker](https://github.com/rails/webpacker)).
 1. Server-Side Rendering (SSR), often used for SEO crawler indexing and UX performance.
-1. [Automated optimized entry-point creation and bundle inclusion when placing a component on a page. With this feature, you no longer need to configure `javascript_pack_tags` and `stylesheet_pack_tags` on your layouts based on what’s shown. “It just works!”](https://www.shakacode.com/react-on-rails/docs/guides/file-system-based-automated-bundle-generation.md)
+1. [Automated optimized entry-point creation and bundle inclusion when placing a component on a page. With this feature, you no longer need to configure `javascript_pack_tags` and `stylesheet_pack_tags` on your layouts based on what’s shown. “It just works!”](https://www.shakacode.com/react-on-rails/docs/guides/file-system-based-automated-bundle-generation/)
 1. [Redux](https://github.com/reactjs/redux) and [React Router](https://github.com/ReactTraining/react-router#readme) integration with server-side-rendering.
 1. [Internationalization (I18n) and (localization)](https://www.shakacode.com/react-on-rails/docs/guides/i18n)
 1. A supportive community. This [web search shows how live public sites are using React on Rails](https://publicwww.com/websites/%22react-on-rails%22++-undeveloped.com+depth%3Aall/).
@@ -127,3 +127,6 @@ The following companies support our open source projects, and ShakaCode uses the
 <a href="https://www.honeybadger.io">
   <img src="https://user-images.githubusercontent.com/4244251/184881133-79ee9c3c-8165-4852-958e-31687b9536f4.png" alt="Honeybadger" height="55px">
 </a>
+<a href="https://reviewable.io">
+  <img src="https://user-images.githubusercontent.com/20628911/230848305-c94510a4-82d7-468f-bf9f-eeb81d3f2ce0.png" alt="Reviewable" height="55px">
+</a>

data/docs/guides/configuration.md

@@ -178,11 +178,21 @@ ReactOnRails.configure do |config|
   # Change to a value like this example to enable this feature 
   # config.components_subdirectory = "ror_components"
 
-  # Default configuration to auto loading bundles for components.
-  # default is false. The default can be overrident as an option in calls to view helpers
+  # Default is false.
+  # The default can be overidden as an option in calls to view helpers
   # `render_component` and `render_component_hash`. You may set to true to change the default to auto loading.
   config.auto_load_bundle = false
 
+  # Default is false
+  # Set this to true & instead of trying to import the generated server components into your existing
+  # server bundle entrypoint, the PacksGenerator will create a server bundle entrypoint using
+  # config.server_bundle_js_file for the filename.
+  config.make_generated_server_bundle_the_entrypoint = false
+
+  # Default is true, which matches Webpacker/Shakapacker's defer default for `append_javascript_pack`
+  # Set this to false to have `defer: false` added to your `append_javascript_pack` calls for generated entrypoints.
+  config.defer_generated_component_packs = true
+
   ################################################################################
   # I18N OPTIONS
   ################################################################################

data/docs/guides/file-system-based-automated-bundle-generation.md

@@ -101,7 +101,7 @@ Your layout would contain:
   <%= stylesheet_pack_tag 'application' %>
 ```
 
-Suppose, you want to use bundle splitting to minimize unnecessary javascript loaded on each page, you would put each of your components in the `packs` directory.
+Now suppose you want to use bundle splitting to minimize unnecessary javascript loaded on each page, you would put each of your components in the `packs` directory.
 
 ```
 app/javascript:
@@ -124,23 +124,26 @@ The tricky part is to figure out which bundles to load on any Rails view. [Shaka
 
 #### Solution
 
-File-system-based automated pack generation simplifies this process with a new option for the view helpers. The steps to use it in this example are:
+File-system-based automated pack generation simplifies this process with a new option for the view helpers.
 
-1. Remove parameters passed directly to `javascript_pack_tag` and `stylesheet_pack_tag`.
-2. Remove parameters passed directly to `append_javascript_pack_tag` and `append_stylesheet_pack_tag`.
+For example, if you wanted to utilize our file-system based entrypoint generation for `FooComponentOne` & `BarComponentOne`, but not `BarComponentTwo` (for whatever reason), then...
+
+1. Remove generated entrypoints from parameters passed directly to `javascript_pack_tag` and `stylesheet_pack_tag`.
+2. Remove generated entrypoints from parameters passed directly to `append_javascript_pack_tag` and `append_stylesheet_pack_tag`.
 
 Your layout would now contain:
 
 ```erb
-  <%= javascript_pack_tag %>
-  <%= stylesheet_pack_tag %>
+  <%= javascript_pack_tag('BarComponentTwo') %>
+  <%= stylesheet_pack_tag('BarComponentTwo') %>
 ```
 
-3. Create a directory structure as mentioned below:
+3. Create a directory structure where the components that you want to be auto-generated are within `ReactOnRails.configuration.components_subdirectory`, which should be a subdirectory of `Shakapacker.config.source_path`:
 
 ```
 app/javascript:
-  └── packs
+  └── packs:
+  │   └── BarComponentTwo.jsx  # Internally uses ReactOnRails.register
   └── src:
   │   └── Foo
   │   │ └── ...
@@ -150,18 +153,20 @@ app/javascript:
   │   │ └── ...
   │   │ └── ror_components          # configured as `components_subdirectory`
   │   │   │ └── BarComponentOne.jsx
+  │   │ └── something_else
   │   │   │ └── BarComponentTwo.jsx
 ```
 
-4. You no longer need to register these React components nor directly add their bundles. For example you can have a Rails view using three components:
+4. You no longer need to register the React components within the `ReactOnRails.configuration.components_subdirectory` nor directly add their bundles. For example you can have a Rails view using three components:
 
 ```erb
+    <% append_javascript_pack('BarComponentTwo'))>
     <%= react_component("FooComponentOne", {}, auto_load_bundle: true) %>
     <%= react_component("BarComponentOne", {}, auto_load_bundle: true) %>
-    <%= react_component("BarComponentTwo", {}, auto_load_bundle: true) %>
+    <%= react_component("BarComponentTwo", {}) %>
 ```
 
-If `FooComponentOne` uses multiple HTML strings for server rendering, the [`react_component_hash`](https://www.shakacode.com/react-on-rails/docs/api/view-helpers-api/#react_component_hash) view helper can be used on the Rails view, as illustrated below.
+If a component uses multiple HTML strings for server rendering, the [`react_component_hash`](https://www.shakacode.com/react-on-rails/docs/api/view-helpers-api/#react_component_hash) view helper can be used on the Rails view, as illustrated below.
 
 ```erb
 <% foo_component_one_data = react_component_hash("FooComponentOne",
@@ -185,6 +190,14 @@ Once generated, all server entrypoints will be imported into a file named `[Reac
 
 *Note: If specifying separate definitions for client and server rendering, please make sure to delete the generalized `ComponentName.jsx` file.*
 
+### Integrating auto-bundling into CI workflows
+
+Currently, ReactOnRails contains conditional logic that checks for the existence of generated entrypoint files whenever `react_component` or one of its derivative methods are called. If a generated entrypoint of the same name as provided to `react_component` or `react_component_hash` exists, then an `append_javascript_pack` call is made automatically.
+
+This means that `rake react_on_rails:generate_packs` or its programmatic equivalent must be run as a prerequisite to any sort of test or spec that would result in `react_component` or `react_component_hash` being called, even if the generated entrypoint files have already been bundled in a previous workflow/job.
+
+Caching of the generated entrypoints between workflow/jobs should also resolve this issue.
+
 ### Using Automated Bundle Generation Feature with already defined packs
 
 To use the Automated Bundle Generation feature with already defined packs, `config/initializers/react_on_rails` should explicitly be configured with `config.auto_load_bundle = false` and you can explicitly pass `auto_load_bundle` option in [`react_component`](https://www.shakacode.com/react-on-rails/docs/api/view-helpers-api/#react_component) and  [`react_component_hash`](https://www.shakacode.com/react-on-rails/docs/api/view-helpers-api/#react_component_hash) for the components using this feature.

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

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

data/lib/react_on_rails/configuration.rb

@@ -9,10 +9,6 @@ module ReactOnRails
   end
 
   DEFAULT_GENERATED_ASSETS_DIR = File.join(%w[public webpack], Rails.env).freeze
-  DEFAULT_COMPONENTS_SUBDIRECTORY = nil
-  DEFAULT_SERVER_RENDER_TIMEOUT = 20
-  DEFAULT_POOL_SIZE = 1
-  DEFAULT_RANDOM_DOM_ID = true # for backwards compatability
 
   def self.configuration
     @configuration ||= Configuration.new(
@@ -28,8 +24,8 @@ module ReactOnRails
       raise_on_prerender_error: Rails.env.development?,
       trace: Rails.env.development?,
       development_mode: Rails.env.development?,
-      server_renderer_pool_size: DEFAULT_POOL_SIZE,
-      server_renderer_timeout: DEFAULT_SERVER_RENDER_TIMEOUT,
+      server_renderer_pool_size: 1,
+      server_renderer_timeout: 20,
       skip_display_none: nil,
       # skip_display_none is deprecated
       webpack_generated_files: %w[manifest.json],
@@ -38,35 +34,37 @@ module ReactOnRails
       server_render_method: nil,
       build_test_command: "",
       build_production_command: "",
-      random_dom_id: DEFAULT_RANDOM_DOM_ID,
+      random_dom_id: true,
       same_bundle_for_client_and_server: false,
       i18n_output_format: nil,
-      components_subdirectory: DEFAULT_COMPONENTS_SUBDIRECTORY
+      components_subdirectory: nil,
+      make_generated_server_bundle_the_entrypoint: false,
+      defer_generated_component_packs: true
     )
   end
 
   class Configuration
     attr_accessor :node_modules_location, :server_bundle_js_file, :prerender, :replay_console,
-                  :trace, :development_mode,
-                  :logging_on_server, :server_renderer_pool_size,
+                  :trace, :development_mode, :logging_on_server, :server_renderer_pool_size,
                   :server_renderer_timeout, :skip_display_none, :raise_on_prerender_error,
-                  :generated_assets_dirs, :generated_assets_dir,
+                  :generated_assets_dirs, :generated_assets_dir, :components_subdirectory,
                   :webpack_generated_files, :rendering_extension, :build_test_command,
-                  :build_production_command,
-                  :i18n_dir, :i18n_yml_dir, :i18n_output_format,
+                  :build_production_command, :i18n_dir, :i18n_yml_dir, :i18n_output_format,
                   :server_render_method, :random_dom_id, :auto_load_bundle,
-                  :same_bundle_for_client_and_server, :rendering_props_extension, :components_subdirectory
+                  :same_bundle_for_client_and_server, :rendering_props_extension,
+                  :make_generated_server_bundle_the_entrypoint,
+                  :defer_generated_component_packs
 
     # rubocop:disable Metrics/AbcSize
     def initialize(node_modules_location: nil, server_bundle_js_file: nil, prerender: nil,
-                   replay_console: nil,
+                   replay_console: nil, make_generated_server_bundle_the_entrypoint: nil,
                    trace: nil, development_mode: nil,
                    logging_on_server: nil, server_renderer_pool_size: nil,
                    server_renderer_timeout: nil, raise_on_prerender_error: true,
                    skip_display_none: nil, generated_assets_dirs: nil,
                    generated_assets_dir: nil, webpack_generated_files: nil,
                    rendering_extension: nil, build_test_command: nil,
-                   build_production_command: nil,
+                   build_production_command: nil, defer_generated_component_packs: 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, rendering_props_extension: nil,
@@ -106,6 +104,8 @@ module ReactOnRails
       self.server_render_method = server_render_method
       self.components_subdirectory = components_subdirectory
       self.auto_load_bundle = auto_load_bundle
+      self.make_generated_server_bundle_the_entrypoint = make_generated_server_bundle_the_entrypoint
+      self.defer_generated_component_packs = defer_generated_component_packs
     end
     # rubocop:enable Metrics/AbcSize
 

data/lib/react_on_rails/helper.rb

@@ -313,19 +313,12 @@ module ReactOnRails
       @rails_context.merge(serverSide: server_side)
     end
 
-    def load_pack_for_component(component_name)
-      is_component_pack_present = File.exist?(generated_components_pack_path(component_name))
-      is_development = ENV["RAILS_ENV"] == "development"
-
-      if is_development && !is_component_pack_present
-        ReactOnRails::PacksGenerator.instance.generate_packs_if_stale
-        raise_missing_pack_error(component_name)
-      end
-
+    def load_pack_for_generated_component(component_name)
       ReactOnRails::WebpackerUtils.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries?
 
-      append_javascript_pack_tag "generated/#{component_name}"
-      append_stylesheet_pack_tag "generated/#{component_name}"
+      append_javascript_pack_tag("generated/#{component_name}",
+                                 defer: ReactOnRails.configuration.defer_generated_component_packs)
+      append_stylesheet_pack_tag("generated/#{component_name}")
     end
 
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
@@ -446,7 +439,11 @@ module ReactOnRails
       # Create the HTML rendering part
       result = server_rendered_react_component(render_options)
 
-      load_pack_for_component react_component_name if render_options.auto_load_bundle
+      if render_options.auto_load_bundle
+        is_component_pack_present = File.exist?(generated_components_pack_path(react_component_name))
+
+        load_pack_for_generated_component(react_component_name) if is_component_pack_present
+      end
 
       {
         render_options: render_options,
@@ -551,16 +548,6 @@ module ReactOnRails
       result
     end
 
-    def raise_missing_pack_error(component_name)
-      msg = <<~MSG
-        **ERROR** ReactOnRails: Generated missing pack for Component: #{component_name}. Please restart the webpack dev server or webpack in watch mode, to ensure webpack generates the chunks corresponding to #{component_name} component. If the problem persists
-        1. Verify `components_subdirectory` is configured in `config/initializers/react_on_rails`.
-        2. Component: #{component_name} is placed inside the configured `components_subdirectory`.
-      MSG
-
-      raise ReactOnRails::Error, msg
-    end
-
     def replay_console_option(val)
       val.nil? ? ReactOnRails.configuration.replay_console : val
     end

data/lib/react_on_rails/packs_generator.rb

@@ -78,6 +78,8 @@ module ReactOnRails
     end
 
     def add_generated_pack_to_server_bundle
+      return if ReactOnRails.configuration.make_generated_server_bundle_the_entrypoint
+
       relative_path_to_generated_server_bundle = relative_path(server_bundle_entrypoint,
                                                                generated_server_bundle_file_path)
       content = <<~FILE_CONTENT
@@ -93,11 +95,15 @@ module ReactOnRails
     end
 
     def generated_server_bundle_file_path
+      return server_bundle_entrypoint if ReactOnRails.configuration.make_generated_server_bundle_the_entrypoint
+
       generated_server_bundle_file_path = server_bundle_entrypoint.sub(".js", "-generated.js")
       generated_server_bundle_file_name = component_name(generated_server_bundle_file_path)
-      source_entry_path = ReactOnRails::WebpackerUtils.webpacker_source_entry_path
+      source_entrypoint_parent = Pathname(ReactOnRails::WebpackerUtils.webpacker_source_entry_path).parent
+      generated_nonentrypoints_path = "#{source_entrypoint_parent}/generated"
 
-      "#{source_entry_path}/#{generated_server_bundle_file_name}.js"
+      FileUtils.mkdir_p(generated_nonentrypoints_path)
+      "#{generated_nonentrypoints_path}/#{generated_server_bundle_file_name}.js"
     end
 
     def clean_generated_packs_directory
@@ -214,12 +220,11 @@ module ReactOnRails
 
     def stale_or_missing_packs?
       component_files = common_component_to_path.values + client_component_to_path.values
-      most_recent_mtime = Utils.find_most_recent_mtime(component_files)
+      most_recent_mtime = Utils.find_most_recent_mtime(component_files).to_i
 
       component_files.each_with_object([]).any? do |file|
         path = generated_pack_path(file)
-
-        !File.exist?(path) || File.mtime(path) < most_recent_mtime
+        !File.exist?(path) || File.mtime(path).to_i < most_recent_mtime
       end
     end
   end

data/lib/react_on_rails/test_helper/ensure_assets_compiled.rb

@@ -37,7 +37,7 @@ module ReactOnRails
         # All done if no stale files!
         return if stale_gen_files.empty?
 
-        ReactOnRails::PacksGenerator.instance.generate_packs_if_stale
+        ReactOnRails::PacksGenerator.instance.generate_packs_if_stale if ReactOnRails.configuration.auto_load_bundle
 
         # Inform the developer that we're ensuring gen assets are ready.
         puts_start_compile_check_message(stale_gen_files)

data/lib/react_on_rails/version.rb

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

data/package.json

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

data/rakelib/dummy_apps.rake

@@ -16,7 +16,12 @@ namespace :dummy_apps do
     bundle_install_in(dummy_app_dir)
   end
 
-  task dummy_apps: %i[dummy_app node_package] do
+  task :generate_packs do
+    dummy_app_dir = File.join(gem_root, "spec/dummy")
+    sh_in_dir(dummy_app_dir, "bundle exec rake react_on_rails:generate_packs")
+  end
+
+  task dummy_apps: %i[dummy_app node_package generate_packs] do
     puts "Prepared all Dummy Apps"
   end
 end

data/rakelib/run_rspec.rake

@@ -20,15 +20,11 @@ namespace :run_rspec do
 
   desc "Runs dummy rspec with turbolinks"
   task dummy: ["dummy_apps:dummy_app"] do
-    clean_gen_assets(spec_dummy_dir)
-    bundle_install_in(dummy_app_dir)
     run_tests_in(spec_dummy_dir)
   end
 
   desc "Runs dummy rspec without turbolinks"
   task dummy_no_turbolinks: ["dummy_apps:dummy_app"] do
-    clean_gen_assets(spec_dummy_dir)
-    bundle_install_in(dummy_app_dir)
     run_tests_in(spec_dummy_dir,
                  env_vars: "DISABLE_TURBOLINKS=TRUE",
                  command_name: "dummy_no_turbolinks")
@@ -47,15 +43,10 @@ namespace :run_rspec do
     ExampleType.all.each { |example_type| Rake::Task[example_type.rspec_task_name].invoke }
   end
 
-  desc "(HACK) Run RSpec on spec/empty_spec in order to have SimpleCov generate a coverage report from cache"
-  task :empty do
-    sh %(#{ENV['USE_COVERALLS'] ? 'COVERAGE=true' : ''} rspec spec/empty_spec.rb)
-  end
-
   Coveralls::RakeTask.new if ENV["USE_COVERALLS"] == "TRUE"
 
   desc "run all tests no examples"
-  task all_but_examples: %i[gem dummy_no_turbolinks dummy empty js_tests] do
+  task all_but_examples: %i[gem dummy_no_turbolinks dummy js_tests] do
     puts "Completed all RSpec tests"
   end
 
@@ -110,8 +101,3 @@ def run_tests_in(dir, options = {})
   env_vars << "COVERAGE=true" if ENV["USE_COVERALLS"]
   sh_in_dir(path.realpath, "#{env_vars} bundle exec rspec #{rspec_args}")
 end
-
-def clean_gen_assets(dir)
-  path = calc_path(dir)
-  sh_in_dir(path.realpath, "yarn run build:clean")
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 13.3.3
+  version: 13.3.4
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable