Fix Pro RSC Rspack gate review blockers

Author: justin808

.github/workflows/pro-integration-tests.yml

@@ -554,8 +554,11 @@ jobs:
         needs.detect-changes.outputs.run_pro_dummy_tests == 'true'
       )
     runs-on: ubuntu-22.04
+    timeout-minutes: 30
     env:
       REACT_ON_RAILS_PRO_LICENSE: ${{ secrets.REACT_ON_RAILS_PRO_LICENSE_V2 }}
+      REACT_RENDERER_URL: http://127.0.0.1:3800
+      RENDERER_HOST: 127.0.0.1
       SHAKAPACKER_ASSETS_BUNDLER: rspack
     services:
       redis:
@@ -689,13 +692,14 @@ jobs:
 
           wait_for_h2c_service() {
             name="$1"
-            authority="$2"
-            path="$3"
+            path="$2"
+            shift 2
             timeout=300
             elapsed=0
 
             while true; do
-              if node - "$authority" "$path" <<'NODE'
+              for authority in "$@"; do
+                if node - "$authority" "$path" <<'NODE'
           const http2 = require('node:http2');
 
           const [authority, path] = process.argv.slice(2);
@@ -721,10 +725,11 @@ jobs:
           request.end();
           setTimeout(fail, 2000);
           NODE
-              then
-                echo "${name} started at ${authority}${path} after ${elapsed}s"
-                return 0
-              fi
+                then
+                  echo "${name} started at ${authority}${path} after ${elapsed}s"
+                  return 0
+                fi
+              done
 
               sleep 1
               elapsed=$((elapsed + 1))
@@ -736,7 +741,7 @@ jobs:
           }
 
           wait_for_service "Rails server" true "http://localhost:3000/empty"
-          wait_for_h2c_service "Node renderer" "http://[::1]:3800" "/info"
+          wait_for_h2c_service "Node renderer" "/info" "http://127.0.0.1:3800" "http://[::1]:3800"
 
       - name: Install Playwright dependencies
         run: cd spec/dummy && npx playwright install --with-deps

react_on_rails_pro/spec/dummy/config/rspack/rspack.config.js

@@ -1,5 +1,7 @@
 // Set this before loading the shared webpack config because Shakapacker reads
 // the assets_bundler setting while its config module is required.
+// Rspack CLI invokes this file in a fresh Node process, so webpack.config has
+// not already been cached with the default webpack bundler.
 const previousAssetsBundler = process.env.SHAKAPACKER_ASSETS_BUNDLER;
 process.env.SHAKAPACKER_ASSETS_BUNDLER = 'rspack';
 

react_on_rails_pro/spec/dummy/config/webpack/rscWebpackConfig.js

@@ -103,6 +103,7 @@ const configureRsc = () => {
     if (typeof rule.use === 'function') {
       // Skip if already wrapped by a previous configureRsc() call.
       // originalUse is captured before injection, so it cannot return the RSC loader itself.
+      // rule.use.name is stable in Node.js build processes because these configs are not minified.
       if (rule.use.name === 'rscLoaderWrapper') return;
       const originalUse = rule.use;
       // eslint-disable-next-line no-param-reassign

react_on_rails_pro/spec/dummy/config/webpack/serverWebpackConfig.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-param-reassign */
 const { config } = require('shakapacker');
+// The bundler choice is read at module load; tests that switch bundlers must
+// set SHAKAPACKER_ASSETS_BUNDLER before requiring this file or reset the cache.
 const bundler = config.assets_bundler === 'rspack' ? require('@rspack/core') : require('webpack');
 const RSCManifestPlugin =
   config.assets_bundler === 'rspack'

react_on_rails_pro/spec/dummy/tests/rsc-rspack-config.test.js

@@ -75,7 +75,12 @@ describe('Pro dummy RSC rspack config', () => {
     };
     const configureServer = jest.fn(() => serverConfig);
     const extractLoader = (rule, loaderName) =>
-      Array.isArray(rule.use) ? rule.use.find((item) => item?.loader?.includes(loaderName)) : null;
+      Array.isArray(rule.use)
+        ? rule.use.find((item) => {
+            const testValue = typeof item === 'string' ? item : (item?.loader ?? '');
+            return testValue.includes(loaderName);
+          })
+        : null;
 
     jest.doMock(serverConfigPath, () => ({
       default: configureServer,