chore: fix conflicts

Author: ScriptedAlchemy

packages/enhanced/src/lib/container/ContainerReferencePlugin.ts

@@ -135,7 +135,7 @@ class ContainerReferencePlugin {
                     //@ts-ignore
                     config.shareScope,
                   );
-                  hooks.addRemoteDependency.call(remoteModule);
+                  // Note: RemoteModule will call hooks.addRemoteDependency itself during build
                   return remoteModule;
                 }
               }

packages/enhanced/test/unit/container/RemoteModule.test.ts

@@ -42,7 +42,10 @@ jest.mock('../../../src/lib/container/runtime/FederationModulesPlugin', () => {
     })),
   };
 
-  return mockFederationModulesPlugin;
+  return {
+    default: mockFederationModulesPlugin,
+    ...mockFederationModulesPlugin,
+  };
 });
 
 describe('RemoteModule', () => {
@@ -159,25 +162,21 @@ describe('RemoteModule', () => {
     let mockGetCompilationHooks: jest.SpyInstance;
 
     beforeEach(() => {
-      const FederationModulesPlugin =
-        require('../../../src/lib/container/runtime/FederationModulesPlugin').default;
-      // Mock the SyncHook instances more accurately
-      const mockHook = () => ({
-        tap: jest.fn(),
-        call: jest.fn(), // Add the call method
-      });
-
-      mockGetCompilationHooks = jest
-        .spyOn(FederationModulesPlugin, 'getCompilationHooks')
-        .mockReturnValue({
-          addContainerEntryDependency: mockHook() as any,
-          addFederationRuntimeDependency: mockHook() as any,
-          addRemoteDependency: mockHook() as any,
-        });
+      // The mock is already set up in the module mock above
+      // Just reference it for spying if needed
+      const FederationModulesPlugin = require('../../../src/lib/container/runtime/FederationModulesPlugin');
+
+      // Since we already have a mock, we can just access it directly
+      mockGetCompilationHooks =
+        FederationModulesPlugin.getCompilationHooks ||
+        FederationModulesPlugin.default?.getCompilationHooks;
     });
 
     afterEach(() => {
-      mockGetCompilationHooks.mockRestore();
+      // Clear mocks but don't restore since it's a module mock
+      if (mockGetCompilationHooks && mockGetCompilationHooks.mockClear) {
+        mockGetCompilationHooks.mockClear();
+      }
     });
 
     it('should set buildInfo and buildMeta', () => {

packages/enhanced/test/unit/sharing/SharePlugin.test.ts

@@ -846,7 +846,7 @@ describe('SharePlugin', () => {
       ProvideSharedPluginMock.mockClear();
     });
 
-    it('should transform all properties from SharedConfig to ConsumesConfig', () => {
+    it('should transform all properties from SharedConfig to ConsumesConfig with exclude', () => {
       const sharedConfig = {
         import: './path/to/module',
         shareKey: 'customKey',
@@ -861,7 +861,6 @@ describe('SharePlugin', () => {
         layer: 'layer',
         request: 'custom-request',
         exclude: { version: '^0.9.0' },
-        include: { version: '^1.0.0' },
       };
 
       const plugin = new SharePlugin({
@@ -893,11 +892,59 @@ describe('SharePlugin', () => {
         layer: sharedConfig.layer,
         request: sharedConfig.request,
         exclude: sharedConfig.exclude,
+      });
+    });
+
+    it('should transform all properties from SharedConfig to ConsumesConfig with include', () => {
+      const sharedConfig = {
+        import: './path/to/module',
+        shareKey: 'customKey',
+        shareScope: 'customScope',
+        requiredVersion: '^1.0.0',
+        strictVersion: true,
+        singleton: true,
+        packageName: 'my-package',
+        eager: true,
+        version: '1.0.0',
+        issuerLayer: 'issuerLayer',
+        layer: 'layer',
+        request: 'custom-request',
+        include: { version: '^1.0.0' },
+      };
+
+      const plugin = new SharePlugin({
+        shared: {
+          react: sharedConfig,
+        },
+      });
+
+      plugin.apply(mockCompiler);
+
+      // Check ConsumeSharedPlugin properties
+      expect(ConsumeSharedPluginMock).toHaveBeenCalledTimes(1);
+      const consumeOptions = ConsumeSharedPluginMock.mock.calls[0][0];
+      const reactConsume = consumeOptions.consumes.find(
+        (consume) => Object.keys(consume)[0] === 'react',
+      );
+
+      // All expected properties should be passed through
+      expect(reactConsume.react).toMatchObject({
+        import: sharedConfig.import,
+        shareKey: sharedConfig.shareKey,
+        shareScope: sharedConfig.shareScope,
+        requiredVersion: sharedConfig.requiredVersion,
+        strictVersion: sharedConfig.strictVersion,
+        singleton: sharedConfig.singleton,
+        packageName: sharedConfig.packageName,
+        eager: sharedConfig.eager,
+        issuerLayer: sharedConfig.issuerLayer,
+        layer: sharedConfig.layer,
+        request: sharedConfig.request,
         include: sharedConfig.include,
       });
     });
 
-    it('should transform all properties from SharedConfig to ProvidesConfig', () => {
+    it('should transform all properties from SharedConfig to ProvidesConfig with exclude', () => {
       const sharedConfig = {
         import: './path/to/module',
         shareKey: 'customKey',
@@ -910,7 +957,6 @@ describe('SharePlugin', () => {
         layer: 'layer',
         request: 'custom-request',
         exclude: { version: '^0.9.0' },
-        include: { version: '^1.0.0' },
       };
 
       const plugin = new SharePlugin({
@@ -940,6 +986,50 @@ describe('SharePlugin', () => {
         layer: sharedConfig.layer,
         request: sharedConfig.request,
         exclude: sharedConfig.exclude,
+      });
+    });
+
+    it('should transform all properties from SharedConfig to ProvidesConfig with include', () => {
+      const sharedConfig = {
+        import: './path/to/module',
+        shareKey: 'customKey',
+        shareScope: 'customScope',
+        version: '1.0.0',
+        eager: true,
+        requiredVersion: '^1.0.0',
+        strictVersion: true,
+        singleton: true,
+        layer: 'layer',
+        request: 'custom-request',
+        include: { version: '^1.0.0' },
+      };
+
+      const plugin = new SharePlugin({
+        shared: {
+          react: sharedConfig,
+        },
+      });
+
+      plugin.apply(mockCompiler);
+
+      // Check ProvideSharedPlugin properties
+      expect(ProvideSharedPluginMock).toHaveBeenCalledTimes(1);
+      const provideOptions = ProvideSharedPluginMock.mock.calls[0][0];
+      const reactProvide = provideOptions.provides.find(
+        (provide) => Object.keys(provide)[0] === './path/to/module',
+      );
+
+      // All expected properties should be passed through
+      expect(reactProvide['./path/to/module']).toMatchObject({
+        shareKey: sharedConfig.shareKey,
+        shareScope: sharedConfig.shareScope,
+        version: sharedConfig.version,
+        eager: sharedConfig.eager,
+        requiredVersion: sharedConfig.requiredVersion,
+        strictVersion: sharedConfig.strictVersion,
+        singleton: sharedConfig.singleton,
+        layer: sharedConfig.layer,
+        request: sharedConfig.request,
         include: sharedConfig.include,
       });
     });