fix(misc): workspace-lint should respect nested gitignores

Author: vsavkin

Diff for: packages/workspace/src/command-line/lint.ts

@@ -3,10 +3,9 @@ import {
   onlyWorkspaceProjects,
 } from '../core/project-graph';
 import { WorkspaceIntegrityChecks } from './workspace-integrity-checks';
-import * as path from 'path';
-import { appRootPath } from '../utils/app-root';
-import { allFilesInDir } from '../core/file-utils';
+import { readWorkspaceFiles, workspaceLayout } from '../core/file-utils';
 import { output } from '../utils/output';
+import * as path from 'path';
 
 export function workspaceLint() {
   const graph = onlyWorkspaceProjects(createProjectGraph());
@@ -25,8 +24,11 @@ export function workspaceLint() {
 }
 
 function readAllFilesFromAppsAndLibs() {
-  return [
-    ...allFilesInDir(`${appRootPath}/apps`).map((f) => f.file),
-    ...allFilesInDir(`${appRootPath}/libs`).map((f) => f.file),
-  ].filter((f) => !path.basename(f).startsWith('.'));
+  const wl = workspaceLayout();
+  return readWorkspaceFiles()
+    .map((f) => f.file)
+    .filter(
+      (f) => f.startsWith(`${wl.appsDir}/`) || f.startsWith(`${wl.libsDir}/`)
+    )
+    .filter((f) => !path.basename(f).startsWith('.'));
 }

Diff for: packages/workspace/src/core/file-utils.ts

@@ -194,6 +194,15 @@ export function readNxJson(): NxJson {
   return config;
 }
 
+export function workspaceLayout(): { appsDir: string; libsDir: string } {
+  const nxJson = readNxJson();
+  const appsDir =
+    (nxJson.workspaceLayout && nxJson.workspaceLayout.appsDir) || 'apps';
+  const libsDir =
+    (nxJson.workspaceLayout && nxJson.workspaceLayout.libsDir) || 'libs';
+  return { appsDir, libsDir };
+}
+
 // TODO: Make this list extensible
 export function rootWorkspaceFileNames(): string[] {
   return [`package.json`, workspaceFileName(), `nx.json`, `tsconfig.json`];
@@ -227,12 +236,11 @@ export function readWorkspaceFiles(): FileData[] {
     // Add known workspace files and directories
     files.push(...allFilesInDir(appRootPath, false));
     files.push(...allFilesInDir(`${appRootPath}/tools`));
-
-    // Add files for workspace projects
-    Object.keys(workspaceJson.projects).forEach((projectName) => {
-      const project = workspaceJson.projects[projectName];
-      files.push(...allFilesInDir(`${appRootPath}/${project.root}`));
-    });
+    const wl = workspaceLayout();
+    files.push(...allFilesInDir(`${appRootPath}/${wl.appsDir}`));
+    if (wl.appsDir !== wl.libsDir) {
+      files.push(...allFilesInDir(`${appRootPath}/${wl.libsDir}`));
+    }
     performance.mark('read workspace files:end');
     performance.measure(
       'read workspace files',