fix(misc): report should include nx-plugin (#9312)

nrwl · Mar 14, 2022 · db93879 · db93879
1 parent 6f038e7
commit db93879
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/packages/workspace/src/command-line/report.spec.ts b/packages/workspace/src/command-line/report.spec.ts
@@ -51,6 +51,30 @@ describe('report', () => {
       ]);
     });
 
+    it('should exclude misc @angluar packages', () => {
+      jest.spyOn(devkit, 'readJsonFile').mockImplementation((path) => {
+        if (path === 'package.json') {
+          return {
+            dependencies: {
+              '@angular/cdk': '1.0.0',
+            },
+            devDependencies: {
+              'plugin-two': '2.0.0',
+            },
+          };
+        } else if (
+          path.includes(join('node_modules', 'plugin-two', 'package.json'))
+        ) {
+          return {
+            schematics: {},
+            version: '1.0.0',
+          };
+        }
+      });
+      const plugins = findInstalledCommunityPlugins();
+      expect(plugins).toEqual([{ package: 'plugin-two', version: '1.0.0' }]);
+    });
+
     it('should read nx devkit plugins', () => {
       jest.spyOn(devkit, 'readJsonFile').mockImplementation((path) => {
         if (path === 'package.json') {

diff --git a/packages/workspace/src/command-line/report.ts b/packages/workspace/src/command-line/report.ts
@@ -24,6 +24,7 @@ export const packagesWeCareAbout = [
   '@nrwl/next',
   '@nrwl/node',
   '@nrwl/nx-cloud',
+  '@nrwl/nx-plugin',
   '@nrwl/react',
   '@nrwl/react-native',
   '@nrwl/schematics',
@@ -34,11 +35,12 @@ export const packagesWeCareAbout = [
   'rxjs',
 ];
 
-export const packagesWeIgnoreInCommunityReport = new Set([
+export const patternsWeIgnoreInCommunityReport: Array<string | RegExp> = [
   ...packagesWeCareAbout,
   '@schematics/angular',
+  new RegExp('@angular/*'),
   '@nestjs/schematics',
-]);
+];
 
 export const report = {
   command: 'report',
@@ -117,7 +119,13 @@ export function findInstalledCommunityPlugins(): {
 
   return deps.reduce(
     (arr: any[], nextDep: string): { project: string; version: string }[] => {
-      if (packagesWeIgnoreInCommunityReport.has(nextDep)) {
+      if (
+        patternsWeIgnoreInCommunityReport.some((pattern) =>
+          typeof pattern === 'string'
+            ? pattern === nextDep
+            : pattern.test(nextDep)
+        )
+      ) {
         return arr;
       }
       try {

diff --git a/scripts/check-imports.js b/scripts/check-imports.js
@@ -30,6 +30,7 @@ function check() {
     'packages/create-nx-plugin/bin/create-nx-plugin.ts',
     'packages/workspace/src/command-line/affected.ts',
     'packages/workspace/src/command-line/report.ts',
+    'packages/workspace/src/command-line/report.spec.ts',
     'packages/workspace/src/core/file-utils.ts',
     'packages/workspace/src/generators/preset/preset.ts',
     'packages/workspace/src/generators/init/init.ts',