test(rsc-mf): revert shared config to singleton defaults

Author: cursoragent

tests/integration/rsc-mf/host/module-federation.config.ts

@@ -1,84 +1,16 @@
-import path from 'path';
 import { createModuleFederationConfig } from '@module-federation/modern-js-v3';
 
 const REMOTE_PORT = process.env.RSC_MF_REMOTE_PORT || '3008';
-const LAYERS = {
-  ssr: 'server-side-rendering',
-  rsc: 'react-server-components',
-} as const;
-
-const reactClientPath = require.resolve('react');
-const reactDomClientPath = require.resolve('react-dom');
-const reactServerPath = path.join(
-  path.dirname(require.resolve('react/package.json')),
-  'react.react-server.js',
-);
-
-const layeredShared = [
-  {
-    react: {
-      import: reactClientPath,
-      shareKey: 'react',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'default',
-    },
-    'react-dom': {
-      import: reactDomClientPath,
-      shareKey: 'react-dom',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'default',
-    },
-  },
-  {
-    react: {
-      import: reactClientPath,
-      shareKey: 'react',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'ssr',
-      layer: LAYERS.ssr,
-      issuerLayer: LAYERS.ssr,
-    },
-    'react-dom': {
-      import: reactDomClientPath,
-      shareKey: 'react-dom',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'ssr',
-      layer: LAYERS.ssr,
-      issuerLayer: LAYERS.ssr,
-    },
-  },
-  {
-    react: {
-      import: reactServerPath,
-      shareKey: 'react',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'rsc',
-      layer: LAYERS.rsc,
-      issuerLayer: LAYERS.rsc,
-    },
-    'react-dom': {
-      import: reactDomClientPath,
-      shareKey: 'react-dom',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'rsc',
-      layer: LAYERS.rsc,
-      issuerLayer: LAYERS.rsc,
-    },
-  },
-] as const;
 
 export default createModuleFederationConfig({
   name: 'rscHost',
   remotes: {
     rscRemote: `rscRemote@http://127.0.0.1:${REMOTE_PORT}/static/mf-manifest.json`,
   },
-  shared: layeredShared as any,
+  shared: {
+    react: { singleton: true },
+    'react-dom': { singleton: true },
+  },
   dts: false,
   experiments: {
     asyncStartup: true,

tests/integration/rsc-mf/remote/module-federation.config.ts

@@ -1,77 +1,10 @@
-import path from 'path';
 import { createModuleFederationConfig } from '@module-federation/modern-js-v3';
 
 const LAYERS = {
   ssr: 'server-side-rendering',
   rsc: 'react-server-components',
 } as const;
 
-const reactClientPath = require.resolve('react');
-const reactDomClientPath = require.resolve('react-dom');
-const reactServerPath = path.join(
-  path.dirname(require.resolve('react/package.json')),
-  'react.react-server.js',
-);
-
-const layeredShared = [
-  {
-    react: {
-      import: reactClientPath,
-      shareKey: 'react',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'default',
-    },
-    'react-dom': {
-      import: reactDomClientPath,
-      shareKey: 'react-dom',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'default',
-    },
-  },
-  {
-    react: {
-      import: reactClientPath,
-      shareKey: 'react',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'ssr',
-      layer: LAYERS.ssr,
-      issuerLayer: LAYERS.ssr,
-    },
-    'react-dom': {
-      import: reactDomClientPath,
-      shareKey: 'react-dom',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'ssr',
-      layer: LAYERS.ssr,
-      issuerLayer: LAYERS.ssr,
-    },
-  },
-  {
-    react: {
-      import: reactServerPath,
-      shareKey: 'react',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'rsc',
-      layer: LAYERS.rsc,
-      issuerLayer: LAYERS.rsc,
-    },
-    'react-dom': {
-      import: reactDomClientPath,
-      shareKey: 'react-dom',
-      singleton: true,
-      requiredVersion: false,
-      shareScope: 'rsc',
-      layer: LAYERS.rsc,
-      issuerLayer: LAYERS.rsc,
-    },
-  },
-] as const;
-
 export default createModuleFederationConfig({
   name: 'rscRemote',
   manifest: {
@@ -128,7 +61,10 @@ export default createModuleFederationConfig({
       layer: LAYERS.rsc,
     } as any,
   },
-  shared: layeredShared as any,
+  shared: {
+    react: { singleton: true },
+    'react-dom': { singleton: true },
+  },
   dts: false,
   experiments: {
     asyncStartup: true,