refactor(rsc-mf): scope callback bootstrap to client/action exposes

Author: cursoragent

tests/integration/rsc-mf/remote/src/runtime/createRscExposeDefinitions.ts

@@ -3,6 +3,10 @@ const CALLBACK_BOOTSTRAP_PREFIX = './src/runtime/';
 const USERLAND_EXPOSE_PREFIX = './';
 const SOURCE_ENTRY_EXTENSION_PATTERN = /\.[cm]?[jt]sx?$/i;
 const RSC_LAYER = 'react-server-components';
+const CALLBACK_BOOTSTRAP_EXPOSE_KEY_PATTERN =
+  /^\.\/(?:RemoteClient[\w-]*|actions|nestedActions|defaultAction|actionBundle)$/;
+const CALLBACK_BOOTSTRAP_IMPORT_PATH_PATTERN =
+  /\/(?:RemoteClient[\w-]*|actions|nestedActions|defaultAction|actionBundle)\.[cm]?[jt]sx?$/;
 
 type ExposeImportInput = string | string[];
 export type ExposeDefinitionInput =
@@ -102,13 +106,25 @@ const normalizeExposeImportPaths = (
 const createRscExpose = (
   importPaths: string[],
   exposeOverrides: Record<string, unknown>,
+  includeCallbackBootstrap: boolean,
 ) =>
   ({
     ...exposeOverrides,
-    import: [CALLBACK_BOOTSTRAP_IMPORT, ...importPaths],
+    import: includeCallbackBootstrap
+      ? [CALLBACK_BOOTSTRAP_IMPORT, ...importPaths]
+      : importPaths,
     layer: RSC_LAYER,
   }) as const;
 
+const shouldInjectCallbackBootstrap = (
+  exposeKey: string,
+  importPaths: string[],
+) =>
+  CALLBACK_BOOTSTRAP_EXPOSE_KEY_PATTERN.test(exposeKey) ||
+  importPaths.some(importPath =>
+    CALLBACK_BOOTSTRAP_IMPORT_PATH_PATTERN.test(importPath),
+  );
+
 const assertValidExposeConfig = (
   normalizedExposeImportPaths: NormalizedExposeImportPaths,
 ) => {
@@ -231,6 +247,10 @@ export const createRscExposeDefinitions = (
       createRscExpose(
         normalizedDefinition.importPaths,
         normalizedDefinition.exposeOverrides,
+        shouldInjectCallbackBootstrap(
+          exposeKey,
+          normalizedDefinition.importPaths,
+        ),
       ),
     ]),
   );

tests/integration/rsc-mf/tests/createRscExposeDefinitions.test.ts

@@ -102,20 +102,19 @@ describe('createRscExposeDefinitions', () => {
   });
 
   it('allows cts and mts expose entry extensions', () => {
-    const { createRscExposeDefinitions, CALLBACK_BOOTSTRAP_MODULE } =
-      loadCreateRscExposeDefinitions();
+    const { createRscExposeDefinitions } = loadCreateRscExposeDefinitions();
     expect(
       createRscExposeDefinitions({
         './serverOnlyHelper': './src/lib/serverOnlyHelper.cts',
         './rscBridgeUtil': './src/lib/rscBridgeUtil.mts',
       }),
     ).toEqual({
       './serverOnlyHelper': {
-        import: [CALLBACK_BOOTSTRAP_MODULE, './src/lib/serverOnlyHelper.cts'],
+        import: ['./src/lib/serverOnlyHelper.cts'],
         layer: 'react-server-components',
       },
       './rscBridgeUtil': {
-        import: [CALLBACK_BOOTSTRAP_MODULE, './src/lib/rscBridgeUtil.mts'],
+        import: ['./src/lib/rscBridgeUtil.mts'],
         layer: 'react-server-components',
       },
     });
@@ -162,8 +161,7 @@ describe('createRscExposeDefinitions', () => {
   });
 
   it('deduplicates repeated entries in object expose import arrays', () => {
-    const { createRscExposeDefinitions, CALLBACK_BOOTSTRAP_MODULE } =
-      loadCreateRscExposeDefinitions();
+    const { createRscExposeDefinitions } = loadCreateRscExposeDefinitions();
     const exposeDefinitions = createRscExposeDefinitions({
       './infoBundle': {
         import: [
@@ -176,15 +174,14 @@ describe('createRscExposeDefinitions', () => {
 
     expect(exposeDefinitions).toEqual({
       './infoBundle': {
-        import: [CALLBACK_BOOTSTRAP_MODULE, './src/components/infoBundle.ts'],
+        import: ['./src/components/infoBundle.ts'],
         layer: 'react-server-components',
       },
     });
   });
 
   it('trims expose import path entries before deduping', () => {
-    const { createRscExposeDefinitions, CALLBACK_BOOTSTRAP_MODULE } =
-      loadCreateRscExposeDefinitions();
+    const { createRscExposeDefinitions } = loadCreateRscExposeDefinitions();
     const exposeDefinitions = createRscExposeDefinitions({
       './infoBundle': {
         import: [
@@ -197,7 +194,7 @@ describe('createRscExposeDefinitions', () => {
 
     expect(exposeDefinitions).toEqual({
       './infoBundle': {
-        import: [CALLBACK_BOOTSTRAP_MODULE, './src/components/infoBundle.ts'],
+        import: ['./src/components/infoBundle.ts'],
         layer: 'react-server-components',
       },
     });
@@ -322,4 +319,32 @@ describe('createRscExposeDefinitions', () => {
       }),
     ).toThrow('must remain internal-only and cannot be exposed');
   });
+
+  it('injects callback bootstrap only for callback-capable expose keys', () => {
+    const { createRscExposeDefinitions, CALLBACK_BOOTSTRAP_MODULE } =
+      loadCreateRscExposeDefinitions();
+    expect(
+      createRscExposeDefinitions({
+        './RemoteClientCounter': './src/components/RemoteClientCounter.tsx',
+        './actions': './src/components/actions.ts',
+        './RemoteServerDefault': './src/components/RemoteServerDefault.tsx',
+      }),
+    ).toEqual({
+      './RemoteClientCounter': {
+        import: [
+          CALLBACK_BOOTSTRAP_MODULE,
+          './src/components/RemoteClientCounter.tsx',
+        ],
+        layer: 'react-server-components',
+      },
+      './actions': {
+        import: [CALLBACK_BOOTSTRAP_MODULE, './src/components/actions.ts'],
+        layer: 'react-server-components',
+      },
+      './RemoteServerDefault': {
+        import: ['./src/components/RemoteServerDefault.tsx'],
+        layer: 'react-server-components',
+      },
+    });
+  });
 });

tests/integration/rsc-mf/tests/index.test.ts

@@ -26,7 +26,6 @@ const EXPECTED_BROWSER_EXPOSE_CHUNKS = [
   '__federation_expose_nestedActions',
   '__federation_expose_defaultAction',
   '__federation_expose_actionBundle',
-  '__federation_expose_infoBundle',
 ];
 const EXPECTED_REMOTE_EXPOSE_PATHS = [
   './RemoteClientCounter',

tests/integration/rsc-mf/tests/moduleFederationConfig.test.ts

@@ -155,13 +155,7 @@ describe('rsc-mf module federation config contracts', () => {
         importPath => importPath === './src/components/infoBundle.ts',
       ),
     ).toEqual(['./src/components/infoBundle.ts']);
-    expect(
-      imports.every(
-        importPath =>
-          importPath === './src/components/infoBundle.ts' ||
-          importPath === CALLBACK_BOOTSTRAP_IMPORT,
-      ),
-    ).toBe(true);
+    expect(imports).toEqual(['./src/components/infoBundle.ts']);
   });
 
   it('uses remote port env var in host manifest remote URL', () => {