fix(core): fix(core): abide by .nxignore when hashing files

ISSUES CLOSED: nrwl#3897
yharaskrik · Oct 19, 2020 · a927722 · a927722
1 parent cf7d779
commit a927722
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/packages/workspace/src/core/file-utils.ts b/packages/workspace/src/core/file-utils.ts
@@ -151,17 +151,17 @@ export function allFilesInDir(
   return res;
 }
 
-function getIgnoredGlobs() {
+function readFileIfExisting(path: string) {
+  return fs.existsSync(path) ? fs.readFileSync(path, 'UTF-8').toString() : '';
+}
+
+export function getIgnoredGlobs() {
   const ig = ignore();
   ig.add(readFileIfExisting(`${appRootPath}/.gitignore`));
   ig.add(readFileIfExisting(`${appRootPath}/.nxignore`));
   return ig;
 }
 
-function readFileIfExisting(path: string) {
-  return fs.existsSync(path) ? fs.readFileSync(path, 'UTF-8').toString() : '';
-}
-
 export function readWorkspaceJson(): any {
   return readJsonFile(`${appRootPath}/${workspaceFileName()}`);
 }

diff --git a/packages/workspace/src/core/hasher/hasher.ts b/packages/workspace/src/core/hasher/hasher.ts
@@ -2,14 +2,15 @@ import { ProjectGraph } from '../project-graph';
 import { NxJson } from '../shared-interfaces';
 import { Task } from '../../tasks-runner/tasks-runner';
 import { readFileSync } from 'fs';
-import { rootWorkspaceFileNames } from '../file-utils';
+import { getIgnoredGlobs, rootWorkspaceFileNames } from '../file-utils';
 import { execSync } from 'child_process';
 import {
   defaultFileHasher,
   extractNameAndVersion,
   FileHasher,
 } from './file-hasher';
 import { defaultHashing, HashingImp } from './hashing-impl';
+import { Ignore } from 'ignore';
 
 const resolve = require('resolve');
 
@@ -50,12 +51,14 @@ export class Hasher {
   private fileHasher: FileHasher;
   private projectHashes: ProjectHasher;
   private hashing: HashingImp;
+  private ignore: Ignore;
 
   constructor(
     private readonly projectGraph: ProjectGraph,
     private readonly nxJson: NxJson,
     private readonly options: any,
-    hashing: HashingImp = undefined
+    hashing: HashingImp = undefined,
+    ignore: Ignore = getIgnoredGlobs()
   ) {
     if (!hashing) {
       this.hashing = defaultHashing;
@@ -69,6 +72,7 @@ export class Hasher {
       this.fileHasher,
       this.hashing
     );
+    this.ignore = ignore;
   }
 
   async hashTasks(tasks: Task[]): Promise<Hash[]> {
@@ -153,7 +157,7 @@ export class Hasher {
 
     const fileNames = [
       ...Object.keys(this.nxJson.implicitDependencies || {}),
-      ...rootWorkspaceFileNames(),
+      ...rootWorkspaceFileNames().filter((name) => !this.ignore.ignores(name)),
       'package-lock.json',
       'yarn.lock',
     ];