react_on_rails 13.3.0 → 13.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e61be8a6315e32bd3127d5ed676e1235c9e44cb43ff011dde722947c4f18b518
-  data.tar.gz: 61be21f2eda6b8a58688af7a69f88b70c2b0dbfe23a9addf68f2894829e96787
+  metadata.gz: 8896ec89f83e47ce7e1eff6222dee036c4542b0fc349fa03e635d6b4960d4b94
+  data.tar.gz: c81ce4b4090451c91afdb97982e7fb7c7dc71e773291ca745a314c02fc00e4ed
 SHA512:
-  metadata.gz: '069f91f435f7609c582a197e100e0140c9d4045b472fa163a06819847d860a339d0fba56ab408d32aa7307cb2b1205dfd5387b6e503810897a4898d6acf56dee'
-  data.tar.gz: ed764a94f2cf6b4ff1a50d605c73cab97371e0a0bc68bb344bc1978988c54b213b44cbc2bce6f6045158d662e7e8201e829f801df2a07392394dfcfcade3e3d4
+  metadata.gz: 3588de292936d910ae34fd2a8325f219965346cd2174568a7d882cc9de487fea32361908ea18727711f4bdb0e00a771d5a9f8db5e5f5cdc55ed222a6b4f617c4
+  data.tar.gz: 84bf0bdc5a1f4835ba21fb8b5187ce31e9a1e1541a870d94423b9b11f47a8db49ef1033b23afeb4eccce4cdb3583b62502197e75ac63bf5d131d5d4edc612fa5

data/CHANGELOG.md

@@ -17,11 +17,18 @@ Changes since last non-beta release.
 
 *Please add entries here for your pull requests that are not yet released.*
 
+### [13.3.1] - 2022-01-30
+## Added 
+- Optimized `ReactOnRails::TestHelper`'s RSpec integration using `when_first_matching_example_defined`. [PR 1496](https://github.com/shakacode/react_on_rails/pull/1496) by [mcls](https://github.com/mcls).
+ 
+### Fixed
+- Fixed bug regarding FS-based packs generation. [PR 1515](https://github.com/shakacode/react_on_rails/pull/1515) by [pulkitkkr](https://github.com/pulkitkkr)
+
 ### [13.3.0] - 2022-01-29
 ### Fixed
-- Fixed pack not found warning while using `react_component` and `react_component_hash` helpers, even when corresponding chunks are present. [PR 1511](https://github.com/shakacode/react_on_rails/pull/1511) by [pulkitkkr](https://github.com/pulkitkkr)
+- Fixed pack not found warning while using `react_component` and `react_component_hash` helpers, even when corresponding chunks are present. [PR 1511](https://github.com/shakacode/react_on_rails/pull/1511) by [pulkitkkr](https://github.com/pulkitkkr).
 - Fixed FS-based packs generation functionality to trigger pack generation  on the creation of a new react component inside `components_subdirectory`. [PR 1506](https://github.com/shakacode/react_on_rails/pull/1506) by [pulkitkkr](https://github.com/pulkitkkr)
-- Upgrade several JS dependencies to fix security issues. [PR 1514](https://github.com/shakacode/react_on_rails/pull/1514) by [ahangarha](https://github.com/ahangarha)
+- Upgrade several JS dependencies to fix security issues. [PR 1514](https://github.com/shakacode/react_on_rails/pull/1514) by [ahangarha](https://github.com/ahangarha).
 
 ### Added
 - Added `./bin/dev` and `./bin/dev-static` executables to ease and standardize running the dev server. [PR 1491](https://github.com/shakacode/react_on_rails/pull/1491) by [ahangarha](https://github.com/ahangarha)
@@ -1060,7 +1067,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/13.3.0...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/13.3.1...master
+[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
 [13.2.0]: https://github.com/shakacode/react_on_rails/compare/13.1.0...13.2.0
 [13.1.0]: https://github.com/shakacode/react_on_rails/compare/13.0.2...13.1.0

data/lib/react_on_rails/helper.rb

@@ -328,8 +328,8 @@ module ReactOnRails
 
       ReactOnRails::WebpackerUtils.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries?
 
-      ApplicationController.helpers.append_javascript_pack_tag "generated/#{component_name}"
-      ApplicationController.helpers.append_stylesheet_pack_tag "generated/#{component_name}"
+      append_javascript_pack_tag "generated/#{component_name}"
+      append_stylesheet_pack_tag "generated/#{component_name}"
     end
 
     def generated_components_pack_path(component_name)

data/lib/react_on_rails/test_helper.rb

@@ -35,8 +35,17 @@ module ReactOnRails
     def self.configure_rspec_to_compile_assets(config, *metatags)
       metatags = %i[js server_rendering controller] if metatags.empty?
 
+      # Supported since RSpec 3.5.0
+      supports_first_matching_example = config.respond_to?(:when_first_matching_example_defined)
+
       metatags.each do |metatag|
-        config.before(:example, metatag) { ReactOnRails::TestHelper.ensure_assets_compiled }
+        if supports_first_matching_example
+          config.when_first_matching_example_defined(metatag) do
+            ReactOnRails::TestHelper.ensure_assets_compiled
+          end
+        else
+          config.before(:example, metatag) { ReactOnRails::TestHelper.ensure_assets_compiled }
+        end
       end
     end
 

data/lib/react_on_rails/utils.rb

@@ -219,9 +219,5 @@ module ReactOnRails
 
       puts "Prepended\n#{text_to_prepend}to #{file}."
     end
-
-    def self.semver_to_string(ary)
-      "#{ary[0]}.#{ary[1]}.#{ary[2]}"
-    end
   end
 end

data/lib/react_on_rails/version.rb

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

data/lib/react_on_rails/webpacker_utils.rb

@@ -27,9 +27,10 @@ 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?(ary)
-      ary[0] >= shakapacker_version_as_array[0] && ary[1] >= shakapacker_version_as_array[1] &&
-        ary[2] >= shakapacker_version_as_array[2]
+    def self.shackapacker_version_requirement_met?(required_version)
+      req_ver = semver_to_string(required_version)
+
+      Gem::Version.new(shakapacker_version) >= Gem::Version.new(req_ver)
     end
 
     # This returns either a URL for the webpack-dev-server, non-server bundle or
@@ -136,5 +137,9 @@ module ReactOnRails
 
       raise ReactOnRails::Error, msg
     end
+
+    def self.semver_to_string(ary)
+      "#{ary[0]}.#{ary[1]}.#{ary[2]}"
+    end
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "13.3.0",
+  "version": "13.3.1",
   "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: 13.3.0
+  version: 13.3.1
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-29 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable