Checking for changes used to fail after a 'npm i ../../ --save' for installing plugins into apps recursively

PanayotCankov · KristianDD · commit 0b66b82e2cd4 · 2018-01-09T15:48:04.000+02:00
diff --git a/lib/services/project-changes-service.ts b/lib/services/project-changes-service.ts
@@ -220,7 +220,15 @@ export class ProjectChangesService implements IProjectChangesService {
 		return false;
 	}
 
-	private containsNewerFiles(dir: string, skipDir: string, projectData: IProjectData, processFunc?: (filePath: string, projectData: IProjectData) => boolean): boolean {
+	private containsNewerFiles(dir: string, skipDir: string, projectData: IProjectData, processFunc?: (filePath: string, projectData: IProjectData) => boolean, visitedRealPaths?: Set<string>): boolean {
+
+		visitedRealPaths = visitedRealPaths || new Set<string>();
+
+		const dirRPath = this.$fs.realpath(dir);
+		if (visitedRealPaths.has(dirRPath)) {
+			return false;
+		}
+		visitedRealPaths.add(dirRPath);
 
 		const dirName = path.basename(dir);
 		if (_.startsWith(dirName, '.')) {
@@ -255,7 +263,7 @@ export class ProjectChangesService implements IProjectChangesService {
 			}
 
 			if (fileStats.isDirectory()) {
-				if (this.containsNewerFiles(filePath, skipDir, projectData, processFunc)) {
+				if (this.containsNewerFiles(filePath, skipDir, projectData, processFunc, visitedRealPaths)) {
 					return true;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,15 @@ export class ProjectChangesService implements IProjectChangesService {`
`220`	`220`	`return false;`
`221`	`221`	`}`
`222`	`222`
`223`		`- private containsNewerFiles(dir: string, skipDir: string, projectData: IProjectData, processFunc?: (filePath: string, projectData: IProjectData) => boolean): boolean {`
	`223`	`+ private containsNewerFiles(dir: string, skipDir: string, projectData: IProjectData, processFunc?: (filePath: string, projectData: IProjectData) => boolean, visitedRealPaths?: Set<string>): boolean {`
	`224`	`+`
	`225`	`+ visitedRealPaths = visitedRealPaths \|\| new Set<string>();`
	`226`	`+`
	`227`	`+ const dirRPath = this.$fs.realpath(dir);`
	`228`	`+ if (visitedRealPaths.has(dirRPath)) {`
	`229`	`+ return false;`
	`230`	`+ }`
	`231`	`+ visitedRealPaths.add(dirRPath);`
`224`	`232`
`225`	`233`	`const dirName = path.basename(dir);`
`226`	`234`	`if (_.startsWith(dirName, '.')) {`
`@@ -255,7 +263,7 @@ export class ProjectChangesService implements IProjectChangesService {`
`255`	`263`	`}`
`256`	`264`
`257`	`265`	`if (fileStats.isDirectory()) {`
`258`		`- if (this.containsNewerFiles(filePath, skipDir, projectData, processFunc)) {`
	`266`	`+ if (this.containsNewerFiles(filePath, skipDir, projectData, processFunc, visitedRealPaths)) {`
`259`	`267`	`return true;`
`260`	`268`	`}`
`261`	`269`	`}`