From ad2b58de4eada5d37e32acde894dd56d0fb7810a Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Mon, 16 Jan 2023 14:41:09 -0500 Subject: [PATCH 01/13] Generate Pack if Missing Generated Pack for Registered Component --- lib/react_on_rails/packs_generator.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/react_on_rails/packs_generator.rb b/lib/react_on_rails/packs_generator.rb index e5c4aba6f..1fe900950 100644 --- a/lib/react_on_rails/packs_generator.rb +++ b/lib/react_on_rails/packs_generator.rb @@ -29,8 +29,9 @@ def verify_setup_and_generate_packs raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries? is_generated_directory_present = Dir.exist?(generated_packs_directory_path) + stale_packs = webpack_assets_status_checker.stale_generated_component_packs - return if is_generated_directory_present && webpack_assets_status_checker.stale_generated_component_packs.empty? + return if is_generated_directory_present && stale_packs.empty? && missing_packs.empty? clean_generated_packs_directory generate_packs @@ -297,6 +298,16 @@ def prepend_to_file_if_not_present(file, text_to_prepend) File.write(file, content_with_prepended_text) puts "Prepended\n#{text_to_prepend}to #{file}." end + + def missing_packs + required_files = common_component_to_path.values + client_component_to_path.values + + required_files.each_with_object([]) do |file, missing_list| + is_generated_pack_present = File.exist?(generated_pack_path(file)) + + missing_list << file unless is_generated_pack_present + end + end end # rubocop:enable Metrics/ClassLength end From 932d9c79257ee82183ebdeca873b1b5ba66c485a Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Mon, 16 Jan 2023 15:18:02 -0500 Subject: [PATCH 02/13] Fix Rubocop Complexity Error --- lib/react_on_rails/packs_generator.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/react_on_rails/packs_generator.rb b/lib/react_on_rails/packs_generator.rb index 1fe900950..c0bf37ba4 100644 --- a/lib/react_on_rails/packs_generator.rb +++ b/lib/react_on_rails/packs_generator.rb @@ -24,9 +24,7 @@ def self.raise_nested_entries_disabled def verify_setup_and_generate_packs return unless components_subdirectory.present? - raise_webpacker_not_installed unless ReactOnRails::WebpackerUtils.using_webpacker? - raise_shakapacker_version_incompatible unless shackapacker_version_requirement_met? - raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries? + verify_configuration is_generated_directory_present = Dir.exist?(generated_packs_directory_path) stale_packs = webpack_assets_status_checker.stale_generated_component_packs @@ -308,6 +306,12 @@ def missing_packs missing_list << file unless is_generated_pack_present end end + + def verify_configuration + raise_webpacker_not_installed unless ReactOnRails::WebpackerUtils.using_webpacker? + raise_shakapacker_version_incompatible unless shackapacker_version_requirement_met? + raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries? + end end # rubocop:enable Metrics/ClassLength end From a1acd704d0f38a8bb1189e2853b2c190cde21f25 Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Mon, 16 Jan 2023 15:26:04 -0500 Subject: [PATCH 03/13] Add CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b462c4ba..81dbff36d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ Changes since last non-beta release. *Please add entries here for your pull requests that are not yet released.* - 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) - 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) ### [13.2.0] - 2022-12-23 From 4b1a53ee34804cdb8bed3e1cde4aa4b7cb19d350 Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Tue, 24 Jan 2023 12:59:17 +0530 Subject: [PATCH 04/13] Update Error Message --- lib/react_on_rails/helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/react_on_rails/helper.rb b/lib/react_on_rails/helper.rb index d6e1ac76d..05238f95b 100644 --- a/lib/react_on_rails/helper.rb +++ b/lib/react_on_rails/helper.rb @@ -557,8 +557,7 @@ def initialize_redux_stores def raise_generated_missing_pack_warning(component_name) msg = <<~MSG - **ERROR** ReactOnRails: Generated missing pack for Component: #{component_name}. Please refresh the webpage \ - once webpack has finished generating the bundles. If the problem persists + **ERROR** ReactOnRails: Generated missing pack for Component: #{component_name}. Please restart the webpack dev server 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 From 4268be9942832cbaece48bf190979f335a9aca5b Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Tue, 24 Jan 2023 13:08:17 +0530 Subject: [PATCH 05/13] Move Stale Check Logic to Helper --- lib/react_on_rails/packs_generator.rb | 14 +++++++------- .../test_helper/webpack_assets_status_checker.rb | 12 ------------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/lib/react_on_rails/packs_generator.rb b/lib/react_on_rails/packs_generator.rb index c0bf37ba4..92bd7d163 100644 --- a/lib/react_on_rails/packs_generator.rb +++ b/lib/react_on_rails/packs_generator.rb @@ -27,9 +27,8 @@ def verify_setup_and_generate_packs verify_configuration is_generated_directory_present = Dir.exist?(generated_packs_directory_path) - stale_packs = webpack_assets_status_checker.stale_generated_component_packs - return if is_generated_directory_present && stale_packs.empty? && missing_packs.empty? + return if is_generated_directory_present && stale_or_missing_packs.empty? clean_generated_packs_directory generate_packs @@ -297,13 +296,14 @@ def prepend_to_file_if_not_present(file, text_to_prepend) puts "Prepended\n#{text_to_prepend}to #{file}." end - def missing_packs - required_files = common_component_to_path.values + client_component_to_path.values + def stale_or_missing_packs + component_files = common_component_to_path.values + client_component_to_path.values + most_recent_mtime = WebpackAssetsStatusChecker.find_most_recent_mtime(component_files) - required_files.each_with_object([]) do |file, missing_list| - is_generated_pack_present = File.exist?(generated_pack_path(file)) + component_files.each_with_object([]) do |file, missing_or_stale_list| + path = generated_pack_path(file) - missing_list << file unless is_generated_pack_present + missing_or_stale_list << file if !File.exist?(path) || File.mtime(path) < most_recent_mtime end end diff --git a/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb b/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb index bd41f18cf..d5868b892 100644 --- a/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb +++ b/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb @@ -29,10 +29,6 @@ def stale_generated_webpack_files stale_generated_files(client_files) end - def stale_generated_component_packs - stale_generated_files(component_pack_files) - end - def stale_generated_files(files) manifest_needed = ReactOnRails::WebpackerUtils.using_webpacker? && !ReactOnRails::WebpackerUtils.manifest_exists? @@ -89,14 +85,6 @@ def client_files @client_files ||= make_file_list(make_globs(source_path)).to_ary end - def component_pack_files - make_file_list(make_globs(components_search_path)).to_ary - end - - def components_search_path - "#{source_path}/**/#{ReactOnRails.configuration.components_subdirectory}" - end - def make_globs(dirs) Array(dirs).map { |dir| File.join(dir, "**", "*") } end From b2f958f763e1b5549e94176e4b760f14bdc4cbc1 Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Wed, 25 Jan 2023 12:14:20 +0530 Subject: [PATCH 06/13] Refactor to move mtime logic to utils and pack-generator --- lib/react_on_rails/packs_generator.rb | 3 ++- .../test_helper/webpack_assets_status_checker.rb | 9 +-------- lib/react_on_rails/utils.rb | 7 +++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/react_on_rails/packs_generator.rb b/lib/react_on_rails/packs_generator.rb index 92bd7d163..7952e164a 100644 --- a/lib/react_on_rails/packs_generator.rb +++ b/lib/react_on_rails/packs_generator.rb @@ -298,12 +298,13 @@ def prepend_to_file_if_not_present(file, text_to_prepend) def stale_or_missing_packs component_files = common_component_to_path.values + client_component_to_path.values - most_recent_mtime = WebpackAssetsStatusChecker.find_most_recent_mtime(component_files) + most_recent_mtime = Utils.find_most_recent_mtime(component_files) component_files.each_with_object([]) do |file, missing_or_stale_list| path = generated_pack_path(file) missing_or_stale_list << file if !File.exist?(path) || File.mtime(path) < most_recent_mtime + missing_or_stale_list end end diff --git a/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb b/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb index d5868b892..9fdd08b00 100644 --- a/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb +++ b/lib/react_on_rails/test_helper/webpack_assets_status_checker.rb @@ -35,7 +35,7 @@ def stale_generated_files(files) return ["manifest.json"] if manifest_needed - most_recent_mtime = find_most_recent_mtime(files) + most_recent_mtime = Utils.find_most_recent_mtime(files) all_compiled_assets.each_with_object([]) do |webpack_generated_file, stale_gen_list| if !File.exist?(webpack_generated_file) || File.mtime(webpack_generated_file) < most_recent_mtime @@ -47,13 +47,6 @@ def stale_generated_files(files) private - def find_most_recent_mtime(files) - files.reduce(1.year.ago) do |newest_time, file| - mt = File.mtime(file) - mt > newest_time ? mt : newest_time - end - end - def all_compiled_assets @all_compiled_assets ||= begin webpack_generated_files = @webpack_generated_files.map do |bundle_name| diff --git a/lib/react_on_rails/utils.rb b/lib/react_on_rails/utils.rb index abb42a2e4..47efdc440 100644 --- a/lib/react_on_rails/utils.rb +++ b/lib/react_on_rails/utils.rb @@ -197,5 +197,12 @@ def self.smart_trim(str, max_length = 1000) rstrip = to_remove - lstrip str[0..(midpoint - lstrip - 1)] + TRUNCATION_FILLER + str[(midpoint + rstrip)..-1] end + + def self.find_most_recent_mtime(files) + files.reduce(1.year.ago) do |newest_time, file| + mt = File.mtime(file) + mt > newest_time ? mt : newest_time + end + end end end From 8b8dfb47ee89421b867b9a747e82df3c197bd78e Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Fri, 27 Jan 2023 13:33:46 +0530 Subject: [PATCH 07/13] Update error message --- lib/react_on_rails/helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/react_on_rails/helper.rb b/lib/react_on_rails/helper.rb index 05238f95b..98f689c29 100644 --- a/lib/react_on_rails/helper.rb +++ b/lib/react_on_rails/helper.rb @@ -557,7 +557,7 @@ def initialize_redux_stores def raise_generated_missing_pack_warning(component_name) msg = <<~MSG - **ERROR** ReactOnRails: Generated missing pack for Component: #{component_name}. Please restart the webpack dev server to ensure webpack generates the chunks corresponding to #{component_name} component. If the problem persists + **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 From 993b2d3c5d7b3db1bb3cf31cacd1864a8b712abf Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Fri, 27 Jan 2023 14:25:27 +0530 Subject: [PATCH 08/13] Update Pack_Generator to stop if a stale pack is found --- lib/react_on_rails/packs_generator.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/react_on_rails/packs_generator.rb b/lib/react_on_rails/packs_generator.rb index 7952e164a..a7592cfe9 100644 --- a/lib/react_on_rails/packs_generator.rb +++ b/lib/react_on_rails/packs_generator.rb @@ -28,7 +28,7 @@ def verify_setup_and_generate_packs is_generated_directory_present = Dir.exist?(generated_packs_directory_path) - return if is_generated_directory_present && stale_or_missing_packs.empty? + return if is_generated_directory_present && !stale_or_missing_packs? clean_generated_packs_directory generate_packs @@ -296,15 +296,14 @@ def prepend_to_file_if_not_present(file, text_to_prepend) puts "Prepended\n#{text_to_prepend}to #{file}." end - def stale_or_missing_packs + 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) - component_files.each_with_object([]) do |file, missing_or_stale_list| + component_files.each_with_object([]).any? do |file| path = generated_pack_path(file) - missing_or_stale_list << file if !File.exist?(path) || File.mtime(path) < most_recent_mtime - missing_or_stale_list + !File.exist?(path) || File.mtime(path) < most_recent_mtime end end From 90850fbf5a22502a04af7dfebef7c1367372bab8 Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Fri, 27 Jan 2023 15:21:53 +0530 Subject: [PATCH 09/13] Add Tests --- spec/dummy/spec/packs_generator_spec.rb | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/spec/dummy/spec/packs_generator_spec.rb b/spec/dummy/spec/packs_generator_spec.rb index 2e3f21575..f51927be7 100644 --- a/spec/dummy/spec/packs_generator_spec.rb +++ b/spec/dummy/spec/packs_generator_spec.rb @@ -4,6 +4,8 @@ # rubocop:disable Metrics/ModuleLength module ReactOnRails + GENERATED_PACKS_OUTPUT_REGEX = /Generated Packs:/.freeze + # rubocop:disable Metrics/BlockLength describe PacksGenerator do let(:webpacker_source_path) { File.expand_path("fixtures/automated_packs_generation", __dir__) } @@ -252,6 +254,45 @@ module ReactOnRails end end + context "when pack generator is called" do + let(:component_name) { "ComponentWithCommonOnly" } + let(:component_pack) { "#{generated_directory}/#{component_name}.js" } + + before do + stub_webpacker_source_path(component_name: component_name, + webpacker_source_path: webpacker_source_path) + end + + it "does not generate packs if there are no new components or stale files" do + expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + + expect { described_class.generate }.not_to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + end + + it "generate packs if a new component is added" do + expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + + create_new_component("NewComponent") + + expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + end + + it "generate packs if an old component is updated" do + expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + + create_new_component(component_name) + + expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + end + + def create_new_component(name) + components_subdirectory = ReactOnRails.configuration.components_subdirectory + path = "#{webpacker_source_path}/components/#{component_name}/#{components_subdirectory}/#{name}.jsx" + + File.write(path, "// Empty Test Component\n") + end + end + def generated_server_bundle_file_path "#{webpacker_source_entry_path}/server-bundle-generated.js" end From 3d90b020f376a043bf8387a166b75f93e8ed3b1b Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Sat, 28 Jan 2023 12:03:10 +0530 Subject: [PATCH 10/13] Update method Name --- lib/react_on_rails/helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/react_on_rails/helper.rb b/lib/react_on_rails/helper.rb index 98f689c29..3a6245fdc 100644 --- a/lib/react_on_rails/helper.rb +++ b/lib/react_on_rails/helper.rb @@ -99,7 +99,7 @@ def load_pack_for_component(component_name) if is_development && !is_component_pack_present ReactOnRails::PacksGenerator.generate - raise_generated_missing_pack_warning(component_name) + raise_missing_pack_error(component_name) end ReactOnRails::PacksGenerator.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries? @@ -555,7 +555,7 @@ def initialize_redux_stores result end - def raise_generated_missing_pack_warning(component_name) + 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`. From 70cd5a11dfd5735189d616a2a59ae4655fa5802d Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Sat, 28 Jan 2023 13:11:15 +0530 Subject: [PATCH 11/13] Update Regex to String --- spec/dummy/spec/packs_generator_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/dummy/spec/packs_generator_spec.rb b/spec/dummy/spec/packs_generator_spec.rb index f51927be7..080a77a83 100644 --- a/spec/dummy/spec/packs_generator_spec.rb +++ b/spec/dummy/spec/packs_generator_spec.rb @@ -4,7 +4,7 @@ # rubocop:disable Metrics/ModuleLength module ReactOnRails - GENERATED_PACKS_OUTPUT_REGEX = /Generated Packs:/.freeze + GENERATED_PACKS_CONSOLE_OUTPUT_TEXT= "Generated Packs:" # rubocop:disable Metrics/BlockLength describe PacksGenerator do @@ -264,25 +264,25 @@ module ReactOnRails end it "does not generate packs if there are no new components or stale files" do - expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + expect { described_class.generate }.to output(GENERATED_PACKS_CONSOLE_OUTPUT_TEXT).to_stdout - expect { described_class.generate }.not_to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + expect { described_class.generate }.not_to output(GENERATED_PACKS_CONSOLE_OUTPUT_TEXT).to_stdout end it "generate packs if a new component is added" do - expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + expect { described_class.generate }.to output(GENERATED_PACKS_CONSOLE_OUTPUT_TEXT).to_stdout create_new_component("NewComponent") - expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + expect { described_class.generate }.to output(GENERATED_PACKS_CONSOLE_OUTPUT_TEXT).to_stdout end it "generate packs if an old component is updated" do - expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + expect { described_class.generate }.to output(GENERATED_PACKS_CONSOLE_OUTPUT_TEXT).to_stdout create_new_component(component_name) - expect { described_class.generate }.to output(GENERATED_PACKS_OUTPUT_REGEX).to_stdout + expect { described_class.generate }.to output(GENERATED_PACKS_CONSOLE_OUTPUT_TEXT).to_stdout end def create_new_component(name) From 6ae3f54b6170a2c8d0ffecadab4874f90721e66c Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Sat, 28 Jan 2023 13:11:52 +0530 Subject: [PATCH 12/13] Move methods to private section --- lib/react_on_rails/helper.rb | 42 ++++++++++++------------- spec/dummy/spec/packs_generator_spec.rb | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/react_on_rails/helper.rb b/lib/react_on_rails/helper.rb index 3a6245fdc..f3876445c 100644 --- a/lib/react_on_rails/helper.rb +++ b/lib/react_on_rails/helper.rb @@ -93,27 +93,6 @@ def react_component(component_name, options = {}) end 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.generate - raise_missing_pack_error(component_name) - end - - ReactOnRails::PacksGenerator.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries? - - append_javascript_pack_tag "generated/#{component_name}" - append_stylesheet_pack_tag "generated/#{component_name}" - end - - def generated_components_pack_path(component_name) - extension = PacksGenerator::GENERATED_PACK_EXTENSION - - "#{ReactOnRails::WebpackerUtils.webpacker_source_entry_path}/generated/#{component_name}.#{extension}" - end - # react_component_hash is used to return multiple HTML strings for server rendering, such as for # adding meta-tags to a page. # It is exactly like react_component except for the following: @@ -340,6 +319,27 @@ def rails_context(server_side: true) private + 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.generate + raise_missing_pack_error(component_name) + end + + ReactOnRails::PacksGenerator.raise_nested_entries_disabled unless ReactOnRails::WebpackerUtils.nested_entries? + + append_javascript_pack_tag "generated/#{component_name}" + append_stylesheet_pack_tag "generated/#{component_name}" + end + + def generated_components_pack_path(component_name) + extension = PacksGenerator::GENERATED_PACK_EXTENSION + + "#{ReactOnRails::WebpackerUtils.webpacker_source_entry_path}/generated/#{component_name}.#{extension}" + end + def build_react_component_result_for_server_rendered_string( server_rendered_html: required("server_rendered_html"), component_specification_tag: required("component_specification_tag"), diff --git a/spec/dummy/spec/packs_generator_spec.rb b/spec/dummy/spec/packs_generator_spec.rb index 080a77a83..f345e6f9f 100644 --- a/spec/dummy/spec/packs_generator_spec.rb +++ b/spec/dummy/spec/packs_generator_spec.rb @@ -4,7 +4,7 @@ # rubocop:disable Metrics/ModuleLength module ReactOnRails - GENERATED_PACKS_CONSOLE_OUTPUT_TEXT= "Generated Packs:" + GENERATED_PACKS_CONSOLE_OUTPUT_TEXT = "Generated Packs:" # rubocop:disable Metrics/BlockLength describe PacksGenerator do From 87957e853ef00e581035b741fae39be66ce02f3f Mon Sep 17 00:00:00 2001 From: pulkitkkr Date: Sat, 28 Jan 2023 13:33:34 +0530 Subject: [PATCH 13/13] Update Changelog and version for release --- CHANGELOG.md | 7 ++++++- lib/react_on_rails/version.rb | 2 +- package.json | 2 +- spec/dummy/Gemfile.lock | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81dbff36d..a0bf61f84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,10 +16,15 @@ 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.* -- 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) + +### [13.3.0] - 2022-01-28 +### 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 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) +### 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) + ### [13.2.0] - 2022-12-23 ### Fixed diff --git a/lib/react_on_rails/version.rb b/lib/react_on_rails/version.rb index 59a81d9f1..fe920a4ab 100644 --- a/lib/react_on_rails/version.rb +++ b/lib/react_on_rails/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module ReactOnRails - VERSION = "13.2.0" + VERSION = "13.3.0" end diff --git a/package.json b/package.json index 0568fc901..6ee3a82ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-on-rails", - "version": "13.2.0", + "version": "13.3.0", "description": "react-on-rails JavaScript for react_on_rails Ruby gem", "main": "node_package/lib/ReactOnRails.js", "directories": { diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock index 745369f32..841c43774 100644 --- a/spec/dummy/Gemfile.lock +++ b/spec/dummy/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - react_on_rails (13.2.0) + react_on_rails (13.3.0) addressable connection_pool execjs (~> 2.5)