Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 28 additions & 7 deletions lib/react_on_rails/configuration.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# frozen_string_literal: true

require "active_support/core_ext/enumerable"
require "active_support/core_ext/object/blank"

# Polyfill for compact_blank (added in Rails 6.1) to support Rails 5.2-6.0
unless [].respond_to?(:compact_blank)
module Enumerable
def compact_blank
reject(&:blank?)
end
end

class Array
def compact_blank
reject(&:blank?)
end
end
end

# rubocop:disable Metrics/ClassLength

module ReactOnRails
Expand Down Expand Up @@ -360,13 +378,16 @@ def configure_generated_assets_dirs_deprecation
def ensure_webpack_generated_files_exists
return unless webpack_generated_files.empty?

self.webpack_generated_files = [
"manifest.json",
server_bundle_js_file,
rsc_bundle_js_file,
react_client_manifest_file,
react_server_client_manifest_file
].compact_blank
files = ["manifest.json", server_bundle_js_file]

if ReactOnRails::Utils.react_on_rails_pro?
pro_config = ReactOnRailsPro.configuration
files << pro_config.rsc_bundle_js_file
files << pro_config.react_client_manifest_file
files << pro_config.react_server_client_manifest_file
end

self.webpack_generated_files = files.compact_blank
end

def configure_skip_display_none_deprecation
Expand Down
Loading