fix(angular): mfe migration failing in certain scenarios (#8384)

nrwl · Jan 5, 2022 · 0f50de7 · 0f50de7
1 parent 8a0010b
commit 0f50de7
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 1 deletion.
diff --git a/packages/angular/src/migrations/update-13-3-0/update-mfe-webpack-config.spec.ts b/packages/angular/src/migrations/update-13-3-0/update-mfe-webpack-config.spec.ts
@@ -7,6 +7,61 @@ import updateMfeConfig, { removeRemoteName } from './update-mfe-webpack-config';
 
 describe('update-mfe-webpack-config', () => {
   describe('run the migration', () => {
+    it('should skip the migration when there is no MFE config', async () => {
+      // ARRANGE
+      const tree = createTreeWithEmptyWorkspace(2);
+      addProjectConfiguration(tree, 'app', {
+        root: 'apps/testing',
+        targets: {
+          build: {
+            executor: '@nrwl/angular:webpack-browser',
+            options: {},
+          },
+          serve: {
+            executor: '@nrwl/angular:webpack-server',
+            options: {
+              port: 4201,
+            },
+          },
+        },
+      });
+
+      // ACT
+      let error = undefined;
+      try {
+        await updateMfeConfig(tree);
+      } catch (err) {
+        error = err;
+      }
+
+      // ASSERT
+      expect(error).toBeUndefined();
+    });
+
+    it('should skip the migration when using a different executor', async () => {
+      // ARRANGE
+      const tree = createTreeWithEmptyWorkspace(2);
+      addProjectConfiguration(tree, 'app', {
+        root: 'apps/testing',
+        targets: {
+          build: {
+            executor: '@angular-devkit/build-angular',
+          },
+        },
+      });
+
+      // ACT
+      let error = undefined;
+      try {
+        await updateMfeConfig(tree);
+      } catch (err) {
+        error = err;
+      }
+
+      // ASSERT
+      expect(error).toBeUndefined();
+    });
+
     it('shouldnt run for non mfe configs', async () => {
       // ARRANGE
       const tree = createTreeWithEmptyWorkspace(2);

diff --git a/packages/angular/src/migrations/update-13-3-0/update-mfe-webpack-config.ts b/packages/angular/src/migrations/update-13-3-0/update-mfe-webpack-config.ts
@@ -20,7 +20,7 @@ export default async function (tree: Tree) {
     (opts, projectName) => {
       // Update the webpack config
       const webpackPath = opts[CUSTOM_WEBPACK_OPTION]?.path;
-      if (!tree.exists(webpackPath)) {
+      if (!webpackPath || !tree.exists(webpackPath)) {
         logger.warn(
           `Webpack config file for project: ${projectName} does not exist. Skipping project.`
         );