Avoid undefined RSC client references

Author: cursoragent

react_on_rails/lib/generators/react_on_rails/rsc_setup.rb

@@ -489,6 +489,7 @@ def check_rsc_server_config
         missing = []
         missing << "RSCWebpackPlugin in serverWebpackConfig.js" unless content.include?("RSCWebpackPlugin")
         missing << "rscBundle parameter in serverWebpackConfig.js" unless content.include?("rscBundle")
+        missing.concat(check_rsc_client_references(content, "serverWebpackConfig.js"))
         missing
       end
 
@@ -497,7 +498,10 @@ def check_rsc_client_config
         return [] unless File.exist?(path)
 
         content = File.read(path)
-        content.include?("RSCWebpackPlugin") ? [] : ["RSCWebpackPlugin in clientWebpackConfig.js"]
+        missing = []
+        missing << "RSCWebpackPlugin in clientWebpackConfig.js" unless content.include?("RSCWebpackPlugin")
+        missing.concat(check_rsc_client_references(content, "clientWebpackConfig.js"))
+        missing
       end
 
       def check_rsc_scob_config
@@ -521,7 +525,7 @@ def rsc_client_references_js
       def update_existing_rsc_webpack_config(config_path, content, is_server:)
         return if content.include?("clientReferences: rscClientReferences")
 
-        add_rsc_client_references_setup(config_path, content, is_server: is_server)
+        return unless add_rsc_client_references_setup(config_path, content, is_server: is_server)
 
         gsub_file(
           config_path,
@@ -549,7 +553,23 @@ def add_rsc_client_references_setup(config_path, content, is_server:)
                            %r{(const commonWebpackConfig = require\('\./commonWebpackConfig'\);)}
                          end
 
+        return false unless content.match?(import_pattern)
+
         gsub_file(config_path, import_pattern, injected_imports)
+        true
+      end
+
+      def check_rsc_client_references(content, filename)
+        return [] unless content.include?("RSCWebpackPlugin")
+
+        missing = []
+        unless content.include?("clientReferences: rscClientReferences")
+          missing << "clientReferences option in #{filename}"
+        end
+        if content.include?("clientReferences: rscClientReferences") && !content.include?("const rscClientReferences =")
+          missing << "rscClientReferences definition in #{filename}"
+        end
+        missing
       end
 
       def shakapacker_config_imported?(content)

react_on_rails/spec/react_on_rails/generators/rsc_generator_spec.rb

@@ -303,6 +303,68 @@
     end
   end
 
+  context "when existing RSC webpack configs have customized import anchors" do
+    before(:all) do
+      prepare_destination
+      simulate_existing_rails_files(package_json: true)
+      simulate_npm_files(package_json: true)
+      simulate_existing_file("config/initializers/react_on_rails_pro.rb", <<~RUBY)
+        ReactOnRailsPro.configure do |config|
+          config.server_renderer = "NodeRenderer"
+        end
+      RUBY
+      simulate_existing_file("Procfile.dev", "rails: bin/rails s\n")
+      simulate_pro_webpack_files
+      simulate_existing_file("config/webpack/serverWebpackConfig.js", <<~JS)
+        const { RSCWebpackPlugin } = require('react-on-rails-rsc/WebpackPlugin');
+        const webpack = require('webpack');
+
+        const configureServer = (rscBundle = false) => {
+          const serverWebpackConfig = { plugins: [] };
+
+          if (!rscBundle) {
+            serverWebpackConfig.plugins.push(new RSCWebpackPlugin({ isServer: true }));
+          }
+
+          return serverWebpackConfig;
+        };
+
+        module.exports = { default: configureServer };
+      JS
+      simulate_existing_file("config/webpack/clientWebpackConfig.js", <<~JS)
+        const { RSCWebpackPlugin } = require('react-on-rails-rsc/WebpackPlugin');
+
+        const configureClient = () => {
+          const clientConfig = { plugins: [] };
+          clientConfig.plugins.push(new RSCWebpackPlugin({ isServer: false }));
+
+          return clientConfig;
+        };
+
+        module.exports = configureClient;
+      JS
+
+      Dir.chdir(destination_root) do
+        run_generator(["--force"])
+      end
+    end
+
+    it "does not add undefined rscClientReferences references" do
+      assert_file "config/webpack/serverWebpackConfig.js" do |content|
+        expect(content).not_to include("clientReferences: rscClientReferences")
+        expect(content).not_to include("const rscClientReferences =")
+      end
+      assert_file "config/webpack/clientWebpackConfig.js" do |content|
+        expect(content).not_to include("clientReferences: rscClientReferences")
+        expect(content).not_to include("const rscClientReferences =")
+      end
+
+      warning_text = GeneratorMessages.messages.join("\n")
+      expect(warning_text).to include("clientReferences option in serverWebpackConfig.js")
+      expect(warning_text).to include("clientReferences option in clientWebpackConfig.js")
+    end
+  end
+
   context "when the client webpack config uses aliased imports" do
     before(:all) do
       prepare_destination