fix(angular): skipping remotes should not only look at the current wo…

…rkspace #17473
nrwl · Jun 8, 2023 · c5daee1 · c5daee1
1 parent a9f8cc6
commit c5daee1
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 6 deletions.
diff --git a/...es/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts b/...es/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts
@@ -10,7 +10,10 @@ import {
 } from '../utilities/module-federation';
 import { existsSync } from 'fs';
 import { extname, join } from 'path';
-import { findMatchingProjects } from 'nx/src/utils/find-matching-projects';
+import {
+  findMatchingProjects,
+  parseStringPattern,
+} from 'nx/src/utils/find-matching-projects';
 
 export function executeModuleFederationDevServerBuilder(
   schema: Schema,
@@ -48,9 +51,24 @@ export function executeModuleFederationDevServerBuilder(
 
   validateDevRemotes(options, workspaceProjects);
 
+  const patternMatchedRemotesToSkip = new Set(
+    findMatchingProjects(options.skipRemotes, projectGraph.nodes)
+  );
+  const remotesNotInGraph = options.skipRemotes.filter((r) => {
+    const { exclude, type } = parseStringPattern(r, projectGraph.nodes);
+    return exclude === false && type === 'unlabeled';
+  });
   const remotesToSkip = new Set(
-    findMatchingProjects(options.skipRemotes, projectGraph.nodes) ?? []
+    [...patternMatchedRemotesToSkip, ...remotesNotInGraph] ?? []
   );
+
+  if (remotesToSkip.size > 0) {
+    console.log(
+      `Not automatically serving remotes: ${[...remotesToSkip.values()].join(
+        ', '
+      )}`
+    );
+  }
   const staticRemotes = getStaticRemotes(
     project,
     context,

diff --git a/packages/nx/src/utils/find-matching-projects.spec.ts b/packages/nx/src/utils/find-matching-projects.spec.ts
@@ -1,9 +1,10 @@
 import {
   findMatchingProjects,
   getMatchingStringsWithCache,
+  parseStringPattern,
 } from './find-matching-projects';
-import minimatch = require('minimatch');
 import type { ProjectGraphProjectNode } from '../config/project-graph';
+import minimatch = require('minimatch');
 
 describe('findMatchingProjects', () => {
   let projectGraph: Record<string, ProjectGraphProjectNode> = {
@@ -158,6 +159,16 @@ describe('findMatchingProjects', () => {
       'nested',
     ]);
   });
+
+  it('should do something when pattern is not matched', () => {
+    expect(parseStringPattern('john', projectGraph)).toMatchInlineSnapshot(`
+      {
+        "exclude": false,
+        "type": "unlabeled",
+        "value": "john",
+      }
+    `);
+  });
 });
 
 const projects = [

diff --git a/packages/nx/src/utils/find-matching-projects.ts b/packages/nx/src/utils/find-matching-projects.ts
@@ -202,7 +202,7 @@ function addMatchingProjectsByTag(
   }
 }
 
-function parseStringPattern(
+export function parseStringPattern(
   pattern: string,
   projects: Record<string, ProjectGraphProjectNode>
 ): ProjectPattern {

diff --git a/...ges/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/...ges/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts
@@ -8,7 +8,10 @@ import {
 } from '@nx/devkit/src/utils/async-iterable';
 import * as chalk from 'chalk';
 import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open';
-import { findMatchingProjects } from 'nx/src/utils/find-matching-projects';
+import {
+  findMatchingProjects,
+  parseStringPattern,
+} from 'nx/src/utils/find-matching-projects';
 import { fork } from 'child_process';
 
 type ModuleFederationDevServerOptions = WebDevServerOptions & {
@@ -38,9 +41,24 @@ export default async function* moduleFederationDevServer(
     );
   }
 
+  const patternMatchedRemotesToSkip = new Set(
+    findMatchingProjects(options.skipRemotes, context.projectGraph.nodes)
+  );
+  const remotesNotInGraph = options.skipRemotes.filter((r) => {
+    const { exclude, type } = parseStringPattern(r, context.projectGraph.nodes);
+    return exclude === false && type === 'unlabeled';
+  });
   const remotesToSkip = new Set(
-    findMatchingProjects(options.skipRemotes ?? [], context.projectGraph.nodes)
+    [...patternMatchedRemotesToSkip, ...remotesNotInGraph] ?? []
   );
+
+  if (remotesToSkip.size > 0) {
+    console.log(
+      `Not automatically serving remotes: ${[...remotesToSkip.values()].join(
+        ', '
+      )}`
+    );
+  }
   const knownRemotes = (moduleFederationConfig.remotes ?? []).filter((r) => {
     const validRemote = Array.isArray(r) ? r[0] : r;
     return !remotesToSkip.has(validRemote);