react_on_rails 15.0.0.rc.1 → 15.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1d81abbd291a6daa87e399d7d2e39736f23838b1b8a63d70e7a1f6480e682a
-  data.tar.gz: 29e1a1e7c59398234500c41750c7bdb99bf5aa7a1c3fc893acf74b58b3c66cb2
+  metadata.gz: 50ca168413057bb25fbd6ca60307bb48baceabcef86cbbd4a8141bb5913e9ca5
+  data.tar.gz: 6cf924cd26ae04b10d303e0c761daf19af7bd3d15417421e56c6492b6e4264ee
 SHA512:
-  metadata.gz: e547bb0bf354747db64a2539c0b1d8b4f0b971b0223beb55a6a2a3a0b34d6b4e6caafdcb91ee64b8193dc98b82531c028126d60b3d90ae45fa87d06de847db78
-  data.tar.gz: a77c0ffd2939aa428b2199c2a1f9d5f88701c3c1928b9b674b2498ba4db86154e6a5e5ebd3c936e6566fcf13e3ca2ce43489ab0d60713d3db1a29869927a5fbd
+  metadata.gz: 3485bf92e659aa921d0352ee43e3cd56b836818c17a6d643332a5e5fecaac0da696e2ab1723215d069d25201cf1da41bfadea2546bf435bfea01924ba4010096
+  data.tar.gz: a7e120190894dd8b34637274a6fb8407c8ab6b7a7e6608b744244868d661ba8e11e3d1925a7eaa86d27905cc2db2c870453f6a7af8c795c504d1dd988f0d7130

data/CHANGELOG.md

@@ -23,6 +23,14 @@ After a release, please make sure to run `bundle exec rake update_changelog`. Th
 
 Changes since the last non-beta release.
 
+#### Fixed
+
+- Enable support for ReactRefreshWebpackPlugin v0.6.0 by adding conditional logic regarding configuration. [PR 1748](https://github.com/shakacode/react_on_rails/pull/1748) by [judahmeek](https://github.com/judahmeek).
+
+- Replace RenderOptions.renderRequestId and use local trackers instead. This change should only be relevant to ReactOnRails Pro users. [PR 1745](https://github.com/shakacode/react_on_rails/pull/1745) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
+
+- Fixed invalid warnings about non-exact versions when using a pre-release version of React on Rails, as well as missing warnings when using different pre-release versions of the gem and the Node package. [PR 1742](https://github.com/shakacode/react_on_rails/pull/1742) by [alexeyr-ci2](https://github.com/alexeyr-ci2).
+
 ### [15.0.0-rc.1] - 2025-06-18
 
 #### Improved

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (15.0.0.rc.0)
+    react_on_rails (15.0.0.rc.1)
       addressable
       connection_pool
       execjs (~> 2.5)

data/README.md

@@ -92,7 +92,7 @@ Ruby on Rails >=5, rails/webpacker >= 4.2 or shakapacker > 6, Ruby >= 3.0.0
 
 # Support
 
-- [Click to join **React + Rails Slack**](https://reactrails.slack.com/join/shared_invite/enQtNjY3NTczMjczNzYxLTlmYjdiZmY3MTVlMzU2YWE0OWM0MzNiZDI0MzdkZGFiZTFkYTFkOGVjODBmOWEyYWQ3MzA2NGE1YWJjNmVlMGE).
+- [Click to join **React + Rails Slack**](https://join.slack.com/t/reactrails/shared_invite/zt-38oicm9d0-OO0V~bdg4aYNuZuUbRFSXg).
 
 - [**Subscribe**](https://app.mailerlite.com/webforms/landing/l1d9x5) for announcements of new releases of React on Rails and of our latest [blog articles](https://blog.shakacode.com) and tutorials.
 - [Discussions](https://github.com/shakacode/react_on_rails/discussions): Post your questions regarding React on Rails

data/eslint.config.ts

@@ -2,6 +2,7 @@ import path from 'node:path';
 import { globalIgnores } from 'eslint/config';
 import jest from 'eslint-plugin-jest';
 import prettierRecommended from 'eslint-plugin-prettier/recommended';
+import testingLibrary from 'eslint-plugin-testing-library';
 import globals from 'globals';
 import tsEslint from 'typescript-eslint';
 import { includeIgnoreFile } from '@eslint/compat';
@@ -198,11 +199,17 @@ const config = tsEslint.config([
   {
     files: ['node_package/tests/**', '**/*.test.{js,jsx,ts,tsx}'],
 
-    extends: [jest.configs['flat/recommended'], jest.configs['flat/style']],
+    extends: [
+      jest.configs['flat/recommended'],
+      jest.configs['flat/style'],
+      testingLibrary.configs['flat/dom'],
+    ],
 
     rules: {
       // Allows Jest mocks before import
       'import/first': 'off',
+      // Avoiding these methods complicates tests and isn't useful for our purposes
+      'testing-library/no-node-access': 'off',
     },
   },
   // must be the last config in the array

data/knip.ts

@@ -45,6 +45,9 @@ const config: KnipConfig = {
         '@eslint/js',
         // used by Jest
         'jsdom',
+        // This is an optional peer dependency because users without RSC don't need it
+        // but Knip doesn't like such dependencies to be referenced directly in code
+        'react-on-rails-rsc',
       ],
     },
     'spec/dummy': {

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

@@ -13,11 +13,7 @@ const developmentEnvOnly = (clientWebpackConfig, _serverWebpackConfig) => {
     // eslint-disable-next-line global-require
     const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
     clientWebpackConfig.plugins.push(
-      new ReactRefreshWebpackPlugin({
-        overlay: {
-          sockPort: devServer.port,
-        },
-      }),
+      new ReactRefreshWebpackPlugin({}),
     );
   }
 };

data/lib/react_on_rails/configuration.rb

@@ -180,7 +180,7 @@ module ReactOnRails
         1. Use :sync or :defer loading strategy instead of :async
         2. Upgrade to Shakapacker v8.2.0 or above to enable async script loading
       MSG
-      if PackerUtils.shakapacker_version_requirement_met?([8, 2, 0])
+      if PackerUtils.shakapacker_version_requirement_met?("8.2.0")
         self.generated_component_packs_loading_strategy ||= :async
       elsif generated_component_packs_loading_strategy.nil?
         Rails.logger.warn("**WARNING** #{msg}")

data/lib/react_on_rails/helper.rb

@@ -650,8 +650,7 @@ module ReactOnRails
                                                 "data-trace" => (render_options.trace ? true : nil),
                                                 "data-dom-id" => render_options.dom_id,
                                                 "data-store-dependencies" => render_options.store_dependencies&.to_json,
-                                                "data-force-load" => (render_options.force_load ? true : nil),
-                                                "data-render-request-id" => render_options.render_request_id)
+                                                "data-force-load" => (render_options.force_load ? true : nil))
 
       if render_options.force_load
         component_specification_tag.concat(

data/lib/react_on_rails/packer_utils.rb

@@ -10,7 +10,7 @@ module ReactOnRails
       return @using_shakapacker_const if defined?(@using_shakapacker_const)
 
       @using_shakapacker_const = ReactOnRails::Utils.gem_available?("shakapacker") &&
-                                 shakapacker_version_requirement_met?([7, 0, 0])
+                                 shakapacker_version_requirement_met?("7.0.0")
     end
 
     def self.using_webpacker_const?
@@ -57,15 +57,16 @@ module ReactOnRails
     end
 
     def self.shakapacker_version_as_array
-      match = shakapacker_version.match(ReactOnRails::VersionChecker::MAJOR_MINOR_PATCH_VERSION_REGEX)
+      return @shakapacker_version_as_array if defined?(@shakapacker_version_as_array)
 
-      @shakapacker_version_as_array = [match[1].to_i, match[2].to_i, match[3].to_i]
+      match = shakapacker_version.match(ReactOnRails::VersionChecker::VERSION_PARTS_REGEX)
+
+      # match[4] is the pre-release version, not normally a number but something like "beta.1" or `nil`
+      @shakapacker_version_as_array = [match[1].to_i, match[2].to_i, match[3].to_i, match[4]].compact
     end
 
     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)
+      Gem::Version.new(shakapacker_version) >= Gem::Version.new(required_version)
     end
 
     # This returns either a URL for the webpack-dev-server, non-server bundle or
@@ -171,9 +172,9 @@ module ReactOnRails
 
     def self.raise_shakapacker_version_incompatible_for_autobundling
       msg = <<~MSG
-        **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{semver_to_string(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION)} or \
+        **ERROR** ReactOnRails: Please upgrade Shakapacker to version #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION} or \
         above to use the automated bundle generation feature. The currently installed version is \
-        #{semver_to_string(ReactOnRails::PackerUtils.shakapacker_version_as_array)}.
+        #{ReactOnRails::PackerUtils.shakapacker_version}.
       MSG
 
       raise ReactOnRails::Error, msg
@@ -182,15 +183,11 @@ module ReactOnRails
     def self.raise_shakapacker_not_installed
       msg = <<~MSG
         **ERROR** ReactOnRails: Missing Shakapacker gem. Please upgrade to use Shakapacker \
-        #{semver_to_string(ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION)} or above to use the \
+        #{ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION} or above to use the \
         automated bundle generation feature.
       MSG
 
       raise ReactOnRails::Error, msg
     end
-
-    def self.semver_to_string(ary)
-      "#{ary[0]}.#{ary[1]}.#{ary[2]}"
-    end
   end
 end

data/lib/react_on_rails/packs_generator.rb

@@ -6,7 +6,7 @@ module ReactOnRails
   # rubocop:disable Metrics/ClassLength
   class PacksGenerator
     CONTAINS_CLIENT_OR_SERVER_REGEX = /\.(server|client)($|\.)/
-    MINIMUM_SHAKAPACKER_VERSION = [6, 5, 1].freeze
+    MINIMUM_SHAKAPACKER_VERSION = "6.5.1"
 
     def self.instance
       @instance ||= PacksGenerator.new

data/lib/react_on_rails/react_component/render_options.rb

@@ -15,17 +15,9 @@ module ReactOnRails
       def initialize(react_component_name: required("react_component_name"), options: required("options"))
         @react_component_name = react_component_name.camelize
         @options = options
-        # The render_request_id serves as a unique identifier for each render request.
-        # We cannot rely solely on dom_id, as it should be unique for each component on the page,
-        # but the server can render the same page multiple times concurrently for different users.
-        # Therefore, we need an additional unique identifier that can be used both on the client and server.
-        # This ID can also be used to associate specific data with a particular rendered component
-        # on either the server or client.
-        # This ID is only present if RSC support is enabled because it's only used in that case.
-        @render_request_id = self.class.generate_request_id if ReactOnRails::Utils.rsc_support_enabled?
       end
 
-      attr_reader :react_component_name, :render_request_id
+      attr_reader :react_component_name
 
       def throw_js_errors
         options.fetch(:throw_js_errors, false)

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "15.0.0.rc.1"
+  VERSION = "15.0.0.rc.2"
 end

data/lib/react_on_rails/version_checker.rb

@@ -6,7 +6,8 @@ module ReactOnRails
   class VersionChecker
     attr_reader :node_package_version
 
-    MAJOR_MINOR_PATCH_VERSION_REGEX = /(\d+)\.(\d+)\.(\d+)/
+    # Semver uses - to separate pre-release, but RubyGems use .
+    VERSION_PARTS_REGEX = /(\d+)\.(\d+)\.(\d+)(?:[-.]([0-9A-Za-z.-]+))?/
 
     def self.build
       new(NodePackageVersion.build)
@@ -23,13 +24,7 @@ module ReactOnRails
       return if node_package_version.raw.nil? || node_package_version.local_path_or_url?
       return log_node_semver_version_warning if node_package_version.semver_wildcard?
 
-      node_major_minor_patch = node_package_version.major_minor_patch
-      gem_major_minor_patch = gem_major_minor_patch_version
-      versions_match = node_major_minor_patch[0] == gem_major_minor_patch[0] &&
-                       node_major_minor_patch[1] == gem_major_minor_patch[1] &&
-                       node_major_minor_patch[2] == gem_major_minor_patch[2]
-
-      log_differing_versions_warning unless versions_match
+      log_differing_versions_warning unless node_package_version.parts == gem_version_parts
     end
 
     private
@@ -39,20 +34,20 @@ module ReactOnRails
          Detected: #{node_package_version.raw}
               gem: #{gem_version}
          Ensure the installed version of the gem is the same as the version of
-         your installed node package. Do not use >= or ~> in your Gemfile for react_on_rails.
-         Do not use ^ or ~ in your package.json for react-on-rails.
+         your installed Node package. Do not use >= or ~> in your Gemfile for react_on_rails.
+         Do not use ^, ~, or other non-exact versions in your package.json for react-on-rails.
          Run `yarn add react-on-rails --exact` in the directory containing folder node_modules.
       MSG
     end
 
     def log_differing_versions_warning
-      msg = "**WARNING** ReactOnRails: ReactOnRails gem and node package versions do not match\n#{common_error_msg}"
+      msg = "**WARNING** ReactOnRails: ReactOnRails gem and Node package versions do not match\n#{common_error_msg}"
       Rails.logger.warn(msg)
     end
 
     def log_node_semver_version_warning
-      msg = "**WARNING** ReactOnRails: Your node package version for react-on-rails contains a " \
-            "^ or ~\n#{common_error_msg}"
+      msg = "**WARNING** ReactOnRails: Your Node package version for react-on-rails is not an exact version\n" \
+            "#{common_error_msg}"
       Rails.logger.warn(msg)
     end
 
@@ -60,9 +55,8 @@ module ReactOnRails
       ReactOnRails::VERSION
     end
 
-    def gem_major_minor_patch_version
-      match = gem_version.match(MAJOR_MINOR_PATCH_VERSION_REGEX)
-      [match[1], match[2], match[3]]
+    def gem_version_parts
+      gem_version.match(VERSION_PARTS_REGEX)&.captures&.compact
     end
 
     class NodePackageVersion
@@ -100,7 +94,7 @@ module ReactOnRails
         # See https://docs.npmjs.com/cli/v10/configuring-npm/package-json#dependencies
         # We want to disallow all expressions other than exact versions
         # and the ones allowed by local_path_or_url?
-        raw.blank? || raw.match(/[~^><|*-]/).present?
+        raw.blank? || raw.start_with?(/[~^><*]/) || raw.include?(" - ") || raw.include?(" || ")
       end
 
       def local_path_or_url?
@@ -110,15 +104,15 @@ module ReactOnRails
         !raw.nil? && raw.include?("/") && !raw.start_with?("npm:")
       end
 
-      def major_minor_patch
+      def parts
         return if local_path_or_url?
 
-        match = raw.match(MAJOR_MINOR_PATCH_VERSION_REGEX)
+        match = raw.match(VERSION_PARTS_REGEX)
         unless match
           raise ReactOnRails::Error, "Cannot parse version number '#{raw}' (only exact versions are supported)"
         end
 
-        [match[1], match[2], match[3]]
+        match.captures.compact
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 15.0.0.rc.1
+  version: 15.0.0.rc.2
 platform: ruby
 authors:
 - Justin Gordon