feat(react): remove exposed utils (#13079)

nrwl · Nov 9, 2022 · efc1005 · efc1005
1 parent 40a2d65
commit efc1005
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 132 deletions.
diff --git a/e2e/react/src/react.module-federation.test.ts b/e2e/react/src/react.module-federation.test.ts
@@ -2,13 +2,12 @@ import { stripIndents } from '@nrwl/devkit';
 import {
   checkFilesExist,
   cleanupProject,
-  getSelectedPackageManager,
   killPort,
   newProject,
   readProjectConfig,
   runCLI,
   runCLIAsync,
-  runCommand,
+  runCypressTests,
   uniq,
   updateFile,
 } from '@nrwl/e2e/utils';
@@ -93,17 +92,18 @@ describe('React Module Federation', () => {
         });
       `
     );
-
-    const e2eResults = runCLI(`e2e ${shell}-e2e --no-watch --verbose`);
-    expect(e2eResults).toContain('All specs passed!');
-    expect(
-      await killPorts([
-        readPort(shell),
-        readPort(remote1),
-        readPort(remote2),
-        readPort(remote3),
-      ])
-    ).toBeTruthy();
+    if (runCypressTests()) {
+      const e2eResults = runCLI(`e2e ${shell}-e2e --no-watch --verbose`);
+      expect(e2eResults).toContain('All specs passed!');
+      expect(
+        await killPorts([
+          readPort(shell),
+          readPort(remote1),
+          readPort(remote2),
+          readPort(remote3),
+        ])
+      ).toBeTruthy();
+    }
   }, 500_000);
 
   function readPort(appName: string): number {

diff --git a/packages/react/module-federation.ts b/packages/react/module-federation.ts
@@ -1,6 +1,5 @@
 import { withModuleFederation } from './src/module-federation/with-module-federation';
-export * from './src/module-federation/models';
-export * from './src/module-federation/webpack-utils';
+
 export { withModuleFederation };
 
 // Support for older generated code: `const withModuleFederation = require('@nrwl/react/module-federation')`

diff --git a/...ges/react/src/generators/host/files/module-federation/module-federation.config.js__tmpl__ b/...ges/react/src/generators/host/files/module-federation/module-federation.config.js__tmpl__
@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @type {import('@nrwl/react/module-federation').ModuleFederationConfig}
+ * @type {import('@nrwl/devkit').ModuleFederationConfig}
  **/
 const moduleFederationConfig = {
     name: '<%= projectName %>',

diff --git a/packages/react/src/generators/host/files/module-federation/webpack.config.js__tmpl__ b/packages/react/src/generators/host/files/module-federation/webpack.config.js__tmpl__
@@ -4,7 +4,7 @@ const { withModuleFederation } = require('@nrwl/react/module-federation');
 const baseConfig = require('./module-federation.config');
 
 /**
- * @type {import('@nrwl/react/module-federation').ModuleFederationConfig}
+ * @type {import('@nrwl/devkit').ModuleFederationConfig}
  **/
 const defaultConfig = {
     ...baseConfig,

diff --git a/packages/react/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__ b/packages/react/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__
@@ -4,7 +4,7 @@ const { withModuleFederation } = require('@nrwl/react/module-federation');
 const baseConfig = require('./module-federation.config');
 
 /**
- * @type {import('@nrwl/react/module-federation').ModuleFederationConfig}
+ * @type {import('@nrwl/devkit').ModuleFederationConfig}
  **/
 const prodConfig = {
     ...baseConfig,

diff --git a/...s/react/src/generators/remote/files/module-federation/module-federation.config.js__tmpl__ b/...s/react/src/generators/remote/files/module-federation/module-federation.config.js__tmpl__
@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @type {import('@nrwl/react/module-federation').ModuleFederationConfig}
+ * @type {import('@nrwl/devkit').ModuleFederationConfig}
  **/
 const moduleFederationConfig = {
    name: '<%= projectName %>',

diff --git a/packages/react/src/generators/remote/files/module-federation/webpack.config.js__tmpl__ b/packages/react/src/generators/remote/files/module-federation/webpack.config.js__tmpl__
@@ -4,7 +4,7 @@ const { withModuleFederation } = require('@nrwl/react/module-federation');
 const baseConfig = require('./module-federation.config');
 
 /**
- * @type {import('@nrwl/react/module-federation').ModuleFederationConfig}
+ * @type {import('@nrwl/devkit').ModuleFederationConfig}
  **/
 const defaultConfig = {
     ...baseConfig,

diff --git a/packages/react/src/module-federation/webpack-utils.ts b/packages/react/src/module-federation/webpack-utils.ts