react_on_rails 14.1.0 → 15.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8ff0817a7547720cf418f0f13cb7e6cdb681e14dd1e429710805534da73cffe
-  data.tar.gz: 963ac73c65c73a94d602488c63ba97073779100bfed64bb4c731cf24da37a192
+  metadata.gz: 7d60051000fbd817b3499b1de6f13c9abeaf5627bee250c50bf0d748ce3532a5
+  data.tar.gz: 4eccfe81e12b647503fa6e690c514d4d14d6704ab1e5c7f64282cafa7709d6e2
 SHA512:
-  metadata.gz: 9793268e809976118cf7efe90b0dba1ebc32f3a58137c4e0fffec895c2f43c6c68fd0634f1452cca1aebc2776b89325cd945b1e6fa276d94c3576d32a8ad8124
-  data.tar.gz: 98013bd6cdfa9bb8eee1e7d7cda819f13a747e47e7fa8495f1bec73cca3bbaa363a92c18660948d0d6254d4936ca8bc947482882142e710fad902d88c22c29ea
+  metadata.gz: 99004f6792fe209d21474c7b5b311ac8a02cce27740b69164e44079983a5852895aa99ed12530043ba64ad6920d189cb6b19ce3957aca83b6bab06f75bf702ee
+  data.tar.gz: 2be5eb3178a913c90c7b4e640812bccc479245d0052d95751317f543c80e7bf9429f9fd61cbc1c5edb917aafbead33502c75fb63fd8ab183480aaa44124f3dc5

data/CHANGELOG.md

@@ -18,14 +18,7 @@ Please follow the recommendations outlined at [keepachangelog.com](http://keepac
 ### [Unreleased]
 Changes since the last non-beta release.
 
-#### Fixed
-
-- Incorrect type and confusing name for `ReactOnRails.registerStore`, use `registerStoreGenerators` instead. [PR 1651](https://github.com/shakacode/react_on_rails/pull/1651) by [alexeyr-ci](https://github.com/alexeyr-ci).
-- Changed the ReactOnRails' version checker to use `ReactOnRails.configuration.node_modules_location` to determine the location of the package.json that the `react-on-rails` dependency is expected to be set by.
-- Also, all errors that would be raised by the version checking have been converted to `Rails.Logger` warnings to avoid any breaking changes. [PR 1657](https://github.com/shakacode/react_on_rails/pull/1657) by [judahmeek](https://github.com/judahmeek).
-- Enable use as a `git:` dependency. [PR 1664](https://github.com/shakacode/react_on_rails/pull/1664) by [alexeyr-ci](https://github.com/alexeyr-ci).
-
-#### Added
+#### Added(https://github.com/AbanoubGhadban).
 - Added streaming server rendering support:
   - [PR #1633](https://github.com/shakacode/react_on_rails/pull/1633) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
     - New `stream_react_component` helper for adding streamed components to views
@@ -33,11 +26,13 @@ Changes since the last non-beta release.
     - Enables progressive page loading and improved performance for server-rendered React components
   - Added support for replaying console logs that occur during server rendering of streamed React components. This enables debugging of server-side rendering issues by capturing and displaying console output on the client and on the server output. [PR #1647](https://github.com/shakacode/react_on_rails/pull/1647) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
   - Added support for handling errors happening during server rendering of streamed React components. It handles errors that happen during the initial render and errors that happen inside suspense boundaries. [PR #1648](https://github.com/shakacode/react_on_rails/pull/1648) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
-  - Added support for passing options to `YAML.safe_load` when loading locale files with `config.i18n_yml_safe_load_options`. [PR #1668](https://github.com/shakacode/react_on_rails/pull/1668) by [dzirtusss](https://github.com/dzirtusss).
 
 #### Changed
 - Console replay script generation now awaits the render request promise before generating, allowing it to capture console logs from asynchronous operations. This requires using a version of the Node renderer that supports replaying async console logs. [PR #1649](https://github.com/shakacode/react_on_rails/pull/1649) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 
+#### Fixed
+- Incorrect type and confusing name for `ReactOnRails.registerStore`, use `registerStoreGenerators` instead. [PR 1651](https://github.com/shakacode/react_on_rails/pull/1651) by [alexeyr-ci](https://github.com/alexeyr-ci).
+
 ### [14.0.5] - 2024-08-20
 #### Fixed
 - Should force load react-components which send over turbo-stream [PR #1620](https://github.com/shakacode/react_on_rails/pull/1620) by [theforestvn88](https://github.com/theforestvn88).

data/Gemfile.lock

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

data/lib/react_on_rails/configuration.rb

@@ -52,7 +52,6 @@ module ReactOnRails
                   :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,
-                  :i18n_yml_safe_load_options,
                   :server_render_method, :random_dom_id, :auto_load_bundle,
                   :same_bundle_for_client_and_server, :rendering_props_extension,
                   :make_generated_server_bundle_the_entrypoint,
@@ -70,7 +69,7 @@ module ReactOnRails
                    rendering_extension: nil, build_test_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, i18n_yml_safe_load_options: nil,
+                   i18n_dir: nil, i18n_yml_dir: nil, i18n_output_format: nil,
                    random_dom_id: nil, server_render_method: nil, rendering_props_extension: nil,
                    components_subdirectory: nil, auto_load_bundle: nil, force_load: nil)
       self.node_modules_location = node_modules_location.present? ? node_modules_location : Rails.root
@@ -81,7 +80,6 @@ module ReactOnRails
       self.i18n_dir = i18n_dir
       self.i18n_yml_dir = i18n_yml_dir
       self.i18n_output_format = i18n_output_format
-      self.i18n_yml_safe_load_options = i18n_yml_safe_load_options
 
       self.random_dom_id = random_dom_id
       self.prerender = prerender

data/lib/react_on_rails/engine.rb

@@ -5,7 +5,9 @@ require "rails/railtie"
 module ReactOnRails
   class Engine < ::Rails::Engine
     config.to_prepare do
-      VersionChecker.build.log_if_gem_and_node_package_versions_differ
+      if File.exist?(VersionChecker::NodePackageVersion.package_json_path)
+        VersionChecker.build.raise_if_gem_and_node_package_versions_differ
+      end
       ReactOnRails::ServerRenderingPool.reset_pool
     end
   end

data/lib/react_on_rails/locales/base.rb

@@ -115,17 +115,11 @@ module ReactOnRails
         translations = {}
         defaults = {}
         locale_files.each do |f|
-          safe_load_options = ReactOnRails.configuration.i18n_yml_safe_load_options || {}
-          translation = YAML.safe_load(File.open(f), **safe_load_options)
+          translation = YAML.safe_load(File.open(f))
           key = translation.keys[0]
           val = flatten(translation[key])
           translations = translations.deep_merge(key => val)
           defaults = defaults.deep_merge(flatten_defaults(val)) if key == default_locale
-        rescue Psych::Exception => e
-          raise ReactOnRails::Error, <<~MSG
-            Error parsing #{f}: #{e.message}
-            Consider fixing unsafe YAML or permitting with config.i18n_yml_safe_load_options
-          MSG
         end
         [translations.to_json, defaults.to_json]
       end

data/lib/react_on_rails/version.rb

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

data/lib/react_on_rails/version_checker.rb

@@ -19,9 +19,8 @@ module ReactOnRails
     # For compatibility, the gem and the node package versions should always match,
     # unless the user really knows what they're doing. So we will give a
     # warning if they do not.
-    def log_if_gem_and_node_package_versions_differ
-      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?
+    def raise_if_gem_and_node_package_versions_differ
+      return if node_package_version.relative_path?
 
       node_major_minor_patch = node_package_version.major_minor_patch
       gem_major_minor_patch = gem_major_minor_patch_version
@@ -29,7 +28,9 @@ module ReactOnRails
                        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
+      raise_differing_versions_warning unless versions_match
+
+      raise_node_semver_version_warning if node_package_version.semver_wildcard?
     end
 
     private
@@ -45,15 +46,15 @@ module ReactOnRails
       MSG
     end
 
-    def log_differing_versions_warning
-      msg = "**WARNING** ReactOnRails: ReactOnRails gem and node package versions do not match\n#{common_error_msg}"
-      Rails.logger.warn(msg)
+    def raise_differing_versions_warning
+      msg = "**ERROR** ReactOnRails: ReactOnRails gem and node package versions do not match\n#{common_error_msg}"
+      raise ReactOnRails::Error, msg
     end
 
-    def log_node_semver_version_warning
-      msg = "**WARNING** ReactOnRails: Your node package version for react-on-rails contains a " \
+    def raise_node_semver_version_warning
+      msg = "**ERROR** ReactOnRails: Your node package version for react-on-rails contains a " \
             "^ or ~\n#{common_error_msg}"
-      Rails.logger.warn(msg)
+      raise ReactOnRails::Error, msg
     end
 
     def gem_version
@@ -73,7 +74,7 @@ module ReactOnRails
       end
 
       def self.package_json_path
-        Rails.root.join(ReactOnRails.configuration.node_modules_location, "package.json")
+        Rails.root.join("client", "package.json")
       end
 
       def initialize(package_json)
@@ -81,41 +82,29 @@ module ReactOnRails
       end
 
       def raw
-        return @raw if defined?(@raw)
-
-        if File.exist?(package_json)
-          parsed_package_contents = JSON.parse(package_json_contents)
-          if parsed_package_contents.key?("dependencies") &&
-             parsed_package_contents["dependencies"].key?("react-on-rails")
-            return @raw = parsed_package_contents["dependencies"]["react-on-rails"]
-          end
+        parsed_package_contents = JSON.parse(package_json_contents)
+        if parsed_package_contents.key?("dependencies") &&
+           parsed_package_contents["dependencies"].key?("react-on-rails")
+          parsed_package_contents["dependencies"]["react-on-rails"]
+        else
+          raise ReactOnRails::Error, "No 'react-on-rails' entry in package.json dependencies"
         end
-        msg = "No 'react-on-rails' entry in the dependencies of #{NodePackageVersion.package_json_path}, " \
-              "which is the expected location according to ReactOnRails.configuration.node_modules_location"
-        Rails.logger.warn(msg)
-        @raw = nil
       end
 
       def semver_wildcard?
-        # 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.match(/[~^]/).present?
       end
 
-      def local_path_or_url?
-        # See https://docs.npmjs.com/cli/v10/configuring-npm/package-json#dependencies
-        # All path and protocol "version ranges" include / somewhere,
-        # but we want to make an exception for npm:@scope/pkg@version.
-        !raw.nil? && raw.include?("/") && !raw.start_with?("npm:")
+      def relative_path?
+        raw.match(%r{(\.\.|\Afile:///)}).present?
       end
 
       def major_minor_patch
-        return if local_path_or_url?
+        return if relative_path?
 
         match = raw.match(MAJOR_MINOR_PATCH_VERSION_REGEX)
         unless match
-          raise ReactOnRails::Error, "Cannot parse version number '#{raw}' (only exact versions are supported)"
+          raise ReactOnRails::Error, "Cannot parse version number '#{raw}' (wildcard versions are not supported)"
         end
 
         [match[1], match[2], match[3]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 14.1.0
+  version: 15.0.0.alpha.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable