Skip to content

Commit cc1cdbf

Browse files
Update ReactOnRails configuration to rename server manifest file for consistency. Adjust related methods and references to use the new naming convention for the server client manifest file.
1 parent 34a8aad commit cc1cdbf

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

lib/react_on_rails/configuration.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def self.configure
1010

1111
DEFAULT_GENERATED_ASSETS_DIR = File.join(%w[public webpack], Rails.env).freeze
1212
DEFAULT_REACT_CLIENT_MANIFEST_FILE = "react-client-manifest.json"
13-
DEFAULT_REACT_SERVER_MANIFEST_FILE = "react-server-client-manifest"
13+
DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE = "react-server-client-manifest.json"
1414
DEFAULT_COMPONENT_REGISTRY_TIMEOUT = 5000
1515

1616
def self.configuration
@@ -22,7 +22,7 @@ def self.configuration
2222
server_bundle_js_file: "",
2323
rsc_bundle_js_file: "",
2424
react_client_manifest_file: DEFAULT_REACT_CLIENT_MANIFEST_FILE,
25-
react_server_manifest_file: DEFAULT_REACT_SERVER_MANIFEST_FILE,
25+
react_server_client_manifest_file: DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE,
2626
prerender: false,
2727
auto_load_bundle: false,
2828
replay_console: true,
@@ -67,7 +67,7 @@ class Configuration
6767
:same_bundle_for_client_and_server, :rendering_props_extension,
6868
:make_generated_server_bundle_the_entrypoint,
6969
:defer_generated_component_packs, :force_load, :rsc_bundle_js_file,
70-
:react_client_manifest_file, :react_server_manifest_file, :component_registry_timeout
70+
:react_client_manifest_file, :react_server_client_manifest_file, :component_registry_timeout
7171

7272
# rubocop:disable Metrics/AbcSize
7373
def initialize(node_modules_location: nil, server_bundle_js_file: nil, prerender: nil,
@@ -83,7 +83,7 @@ def initialize(node_modules_location: nil, server_bundle_js_file: nil, prerender
8383
i18n_dir: nil, i18n_yml_dir: nil, i18n_output_format: nil, i18n_yml_safe_load_options: nil,
8484
random_dom_id: nil, server_render_method: nil, rendering_props_extension: nil,
8585
components_subdirectory: nil, auto_load_bundle: nil, force_load: nil,
86-
rsc_bundle_js_file: nil, react_client_manifest_file: nil, react_server_manifest_file: nil,
86+
rsc_bundle_js_file: nil, react_client_manifest_file: nil, react_server_client_manifest_file: nil,
8787
component_registry_timeout: nil)
8888
self.node_modules_location = node_modules_location.present? ? node_modules_location : Rails.root
8989
self.generated_assets_dirs = generated_assets_dirs
@@ -114,7 +114,7 @@ def initialize(node_modules_location: nil, server_bundle_js_file: nil, prerender
114114
self.server_bundle_js_file = server_bundle_js_file
115115
self.rsc_bundle_js_file = rsc_bundle_js_file
116116
self.react_client_manifest_file = react_client_manifest_file
117-
self.react_server_manifest_file = react_server_manifest_file
117+
self.react_server_client_manifest_file = react_server_client_manifest_file
118118
self.same_bundle_for_client_and_server = same_bundle_for_client_and_server
119119
self.server_renderer_pool_size = self.development_mode ? 1 : server_renderer_pool_size
120120
self.server_renderer_timeout = server_renderer_timeout # seconds
@@ -270,7 +270,7 @@ def ensure_webpack_generated_files_exists
270270
files << server_bundle_js_file if server_bundle_js_file.present?
271271
files << rsc_bundle_js_file if rsc_bundle_js_file.present?
272272
files << react_client_manifest_file if react_client_manifest_file.present?
273-
files << react_server_manifest_file if react_server_manifest_file.present?
273+
files << react_server_client_manifest_file if react_server_client_manifest_file.present?
274274

275275
self.webpack_generated_files = files
276276
end

lib/react_on_rails/test_helper/webpack_assets_status_checker.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ def all_compiled_assets
5252
webpack_generated_files = @webpack_generated_files.map do |bundle_name|
5353
if bundle_name == ReactOnRails.configuration.react_client_manifest_file
5454
ReactOnRails::Utils.react_client_manifest_file_path
55-
elsif bundle_name == ReactOnRails.configuration.react_server_manifest_file
56-
ReactOnRails::Utils.react_server_manifest_file_path
55+
elsif bundle_name == ReactOnRails.configuration.react_server_client_manifest_file
56+
ReactOnRails::Utils.react_server_client_manifest_file_path
5757
else
5858
ReactOnRails::Utils.bundle_js_file_path(bundle_name)
5959
end

lib/react_on_rails/utils.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ def self.react_client_manifest_file_path
124124

125125
# React Server Manifest is generated by the server bundle.
126126
# So, it will never be served from the dev server.
127-
def self.react_server_manifest_file_path
127+
def self.react_server_client_manifest_file_path
128128
return @react_server_manifest_path if @react_server_manifest_path && !Rails.env.development?
129129

130-
asset_name = ReactOnRails.configuration.react_server_manifest_file
130+
asset_name = ReactOnRails.configuration.react_server_client_manifest_file
131131
@react_server_manifest_path = File.join(generated_assets_full_path, asset_name)
132132
end
133133

0 commit comments

Comments
 (0)