react_on_rails 16.4.0.rc.4 → 16.4.0.rc.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c040d5433fa1cc76aeb4a740df1f95eed1fca4fd0da9d62a8820a7c849ad3a4
-  data.tar.gz: b4e40695d2c0409e523d27017724e626cb13e6ce74489e1930e714b151de0cc2
+  metadata.gz: 122f40da16cc6a79e95e0679394667388c9cae337f19be2f61db4463a221a572
+  data.tar.gz: 38213ba983ecc6d2e6ea065de078a93305e6aaed6419069d5c94e427b3cef507
 SHA512:
-  metadata.gz: e7827cb7f3064b9740256f3d94803968624318a8849571cefcc238e498b92f9c08bfbc362c194cbc4eac773d55ad65283a32c781ad4dea817d2c412857f33846
-  data.tar.gz: 184cf7171b73091ad0a219604dc1d09b3419b024d524b5b43a696efc5995d30fbad4de5f7091944f049c086f6fd44c505dba5aa436258ed9ee9c95f41b88c6c3
+  metadata.gz: 82b8e04feec8ea4f73a8fc821adaa5343ce6fe4cf7e932c5b77711a2c0036b9b2d713834d4e900d530f310b25d2fcb746492e279615427c188e8b89e7f1a29c6
+  data.tar.gz: 0d06abde7b925466f835ec2646e9969348adbdc8cb8761a5995668ab0b607ec7a79621a6461553e4511a8cc654fb8b33d388b8e3bcc0ab331f93bf3c2d723e57

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    react_on_rails (16.4.0.rc.4)
+    react_on_rails (16.4.0.rc.5)
       addressable
       connection_pool
       execjs (~> 2.5)

data/lib/generators/react_on_rails/base_generator.rb

@@ -61,12 +61,13 @@ module ReactOnRails
                         .dev-services.yml.example
                         bin/shakapacker-precompile-hook]
 
-        # HelloWorld controller/layout only when not using RSC (RSC uses HelloServer)
+        # HelloServer uses the hello_world layout so React on Rails can inject generated
+        # packs without requiring a hardcoded application.js pack entry.
+        base_files << "app/views/layouts/hello_world.html.erb"
+
+        # HelloWorld controller only when not using RSC (RSC uses HelloServer)
         # Exception: Redux still needs the HelloWorld controller even with RSC
-        unless use_rsc? && !options.redux?
-          base_files += %w[app/controllers/hello_world_controller.rb
-                           app/views/layouts/hello_world.html.erb]
-        end
+        base_files << "app/controllers/hello_world_controller.rb" unless use_rsc? && !options.redux?
         base_templates = %w[config/initializers/react_on_rails.rb]
         base_files.each { |file| copy_file("#{base_path}#{file}", file) }
         base_templates.each do |file|

data/lib/generators/react_on_rails/generator_messages.rb

@@ -38,11 +38,17 @@ module GeneratorMessages
       @output = []
     end
 
-    def helpful_message_after_installation(component_name: "HelloWorld", route: "hello_world")
+    def helpful_message_after_installation(component_name: "HelloWorld", route: "hello_world", rsc: false)
       process_manager_section = build_process_manager_section
       testing_section = build_testing_section
       package_manager = detect_package_manager
       shakapacker_status = build_shakapacker_status_section
+      render_example = build_render_example(component_name: component_name, route: route, rsc: rsc)
+      render_label = if rsc
+                       "• Streaming server rendering in app/views/#{route}/index.html.erb:"
+                     else
+                       "• Server-side rendering - Enabled with prerender option in app/views/#{route}/index.html.erb:"
+                     end
 
       <<~MSG
 
@@ -69,8 +75,8 @@ module GeneratorMessages
           <%= javascript_pack_tag %>
           <%= stylesheet_pack_tag %>
 
-        • Server-side rendering - Enabled with prerender option in app/views/#{route}/index.html.erb:
-          <%= react_component("#{component_name}", props: @#{route}_props, prerender: true) %>
+        #{render_label}
+          #{render_example}
 
         📚 LEARN MORE:
         ─────────────────────────────────────────────────────────────────────────
@@ -83,6 +89,14 @@ module GeneratorMessages
 
     private
 
+    def build_render_example(component_name:, route:, rsc:)
+      if rsc
+        "<%= stream_react_component(\"#{component_name}\", props: @#{route}_props) %>"
+      else
+        "<%= react_component(\"#{component_name}\", props: @#{route}_props, prerender: true) %>"
+      end
+    end
+
     def build_process_manager_section
       process_manager = detect_process_manager
       if process_manager

data/lib/generators/react_on_rails/install_generator.rb

@@ -253,7 +253,8 @@ module ReactOnRails
 
         GeneratorMessages.add_info(GeneratorMessages.helpful_message_after_installation(
                                      component_name: component_name,
-                                     route: route
+                                     route: route,
+                                     rsc: use_rsc?
                                    ))
       end
 

data/lib/generators/react_on_rails/templates/rsc/base/app/controllers/hello_server_controller.rb

@@ -13,6 +13,8 @@
 # https://www.shakacode.com/react-on-rails-pro/docs/react-server-components/
 
 class HelloServerController < ApplicationController
+  layout "hello_world"
+
   include ReactOnRailsPro::Stream
 
   def index

data/lib/generators/react_on_rails/templates/rsc/base/config/webpack/rscWebpackConfig.js.tt

@@ -8,13 +8,15 @@ const serverWebpackModule = require('./serverWebpackConfig');
 // - New Pro config exports: { default: configureServer, extractLoader }
 // - Legacy config exports: module.exports = configureServer
 const serverWebpackConfig = serverWebpackModule.default || serverWebpackModule;
-const extractLoader = serverWebpackModule.extractLoader || ((rule, loaderName) => {
-  if (!Array.isArray(rule.use)) return null;
-  return rule.use.find((item) => {
-    const testValue = typeof item === 'string' ? item : item.loader;
-    return testValue && testValue.includes(loaderName);
+const extractLoader =
+  serverWebpackModule.extractLoader ||
+  ((rule, loaderName) => {
+    if (!Array.isArray(rule.use)) return null;
+    return rule.use.find((item) => {
+      const testValue = typeof item === 'string' ? item : item.loader;
+      return testValue && testValue.includes(loaderName);
+    });
   });
-});
 
 const configureRsc = () => {
   // Pass true to skip RSCWebpackPlugin - RSC bundle doesn't need it
@@ -26,12 +28,29 @@ const configureRsc = () => {
   };
   rscConfig.entry = rscEntry;
 
-  // Add the RSC loader before the JS loader (babel-loader or swc-loader)
-  // This loader properly excludes client components from the RSC bundle
+  // Add the RSC WebpackLoader to the JS rule's loader chain.
+  // This loader replaces 'use client' files with registerClientReference proxies in the RSC bundle.
+  // Webpack loaders execute right-to-left, so appending makes the RSC loader run first (before babel/swc).
   const { rules } = rscConfig.module;
   rules.forEach((rule) => {
-    if (Array.isArray(rule.use)) {
-      // Find the JS loader (could be babel-loader or swc-loader depending on configuration)
+    if (typeof rule.use === 'function') {
+      // SWC transpiler defines rule.use as a function: use: ({resource}) => getSwcLoaderConfig(resource)
+      // Wrap it to append the RSC WebpackLoader to the returned loader(s).
+      const originalUse = rule.use;
+      // Must use `function` (not arrow) so `.call(this, data)` forwards webpack's context.
+      rule.use = function rscLoaderWrapper(data) {
+        const result = originalUse.call(this, data);
+        const resultArray = Array.isArray(result) ? result : result ? [result] : [];
+        const resolvedRule = { use: resultArray };
+        const jsLoader =
+          extractLoader(resolvedRule, 'babel-loader') || extractLoader(resolvedRule, 'swc-loader');
+        if (jsLoader) {
+          return [...resultArray, { loader: 'react-on-rails-rsc/WebpackLoader' }];
+        }
+        return result;
+      };
+    } else if (Array.isArray(rule.use)) {
+      // Babel transpiler defines rule.use as a static array
       const jsLoader = extractLoader(rule, 'babel-loader') || extractLoader(rule, 'swc-loader');
       if (jsLoader) {
         rule.use.push({

data/lib/react_on_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReactOnRails
-  VERSION = "16.4.0.rc.4"
+  VERSION = "16.4.0.rc.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 16.4.0.rc.4
+  version: 16.4.0.rc.5
 platform: ruby
 authors:
 - Justin Gordon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-23 00:00:00.000000000 Z
+date: 2026-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable