fix(core): fix plugin exclude option

Closes #22737
nrwl · Apr 9, 2024 · 6fa09fe · 6fa09fe
1 parent 32144bb
commit 6fa09fe
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 1 deletion.
diff --git a/packages/nx/src/project-graph/utils/project-configuration-utils.spec.ts b/packages/nx/src/project-graph/utils/project-configuration-utils.spec.ts
@@ -5,12 +5,14 @@ import {
 } from '../../config/workspace-json-project-json';
 import {
   ConfigurationSourceMaps,
+  createProjectConfigurations,
   isCompatibleTarget,
   mergeProjectConfigurationIntoRootMap,
   mergeTargetConfigurations,
   readProjectConfigurationsFromRootMap,
   readTargetDefaultsForTarget,
 } from './project-configuration-utils';
+import { CreateNodes, NxPluginV2 } from 'nx/src/utils/nx-plugin';
 
 describe('project-configuration-utils', () => {
   describe('target merging', () => {
@@ -1525,6 +1527,98 @@ describe('project-configuration-utils', () => {
       ).toBe(false);
     });
   });
+
+  describe('createProjectConfigurations', () => {
+    /* A fake plugin that sets `fake-lib` tag to libs. */
+    const fakeTagPlugin: NxPluginV2 = {
+      name: 'fake-tag-plugin',
+      createNodes: [
+        'libs/*/project.json',
+        (vitestConfigPath) => {
+          const [_libs, name, _config] = vitestConfigPath.split('/');
+          return {
+            projects: {
+              [name]: {
+                name: name,
+                root: `libs/${name}`,
+                tags: ['fake-lib'],
+              },
+            },
+          };
+        },
+      ],
+    };
+
+    it('should create nodes for files matching included patterns only', async () => {
+      const projectConfigurations = await createProjectConfigurations(
+        undefined,
+        {},
+        ['libs/a/project.json', 'libs/b/project.json'],
+        [
+          {
+            plugin: fakeTagPlugin,
+          },
+        ]
+      );
+
+      expect(projectConfigurations.projects).toEqual({
+        a: {
+          name: 'a',
+          root: 'libs/a',
+          tags: ['fake-lib'],
+        },
+        b: {
+          name: 'b',
+          root: 'libs/b',
+          tags: ['fake-lib'],
+        },
+      });
+    });
+
+    it('should create nodes for files matching included patterns only', async () => {
+      const projectConfigurations = await createProjectConfigurations(
+        undefined,
+        {},
+        ['libs/a/project.json', 'libs/b/project.json'],
+        [
+          {
+            plugin: fakeTagPlugin,
+            include: ['libs/a/**'],
+          },
+        ]
+      );
+
+      expect(projectConfigurations.projects).toEqual({
+        a: {
+          name: 'a',
+          root: 'libs/a',
+          tags: ['fake-lib'],
+        },
+      });
+    });
+
+    it('should not create nodes for files matching excluded patterns', async () => {
+      const projectConfigurations = await createProjectConfigurations(
+        undefined,
+        {},
+        ['libs/a/project.json', 'libs/b/project.json'],
+        [
+          {
+            plugin: fakeTagPlugin,
+            exclude: ['libs/b/**'],
+          },
+        ]
+      );
+
+      expect(projectConfigurations.projects).toEqual({
+        a: {
+          name: 'a',
+          root: 'libs/a',
+          tags: ['fake-lib'],
+        },
+      });
+    });
+  });
 });
 
 class RootMapBuilder {

diff --git a/packages/nx/src/project-graph/utils/project-configuration-utils.ts b/packages/nx/src/project-graph/utils/project-configuration-utils.ts
@@ -344,7 +344,7 @@ export function createProjectConfigurations(
         }
 
         if (exclude) {
-          const excluded = include.some((excludedPattern) =>
+          const excluded = exclude.some((excludedPattern) =>
             minimatch(file, excludedPattern, { dot: true })
           );
           if (excluded) {