refactor(ngfs): allow multiple ignore patterns

- update - ignore dist and node_modules by default
- upgrade-packages - set default framework & project type

Author: jackofdiamond5

packages/core/types/FileSystem.ts

@@ -8,8 +8,9 @@ export interface IFileSystem {
 	 * Returns a list of file paths under a directory based on a match pattern
 	 * @param dirPath Root dir to search in
 	 * @param pattern Pattern to match
+	 * @param ignorePatterns Optional pattern to ignore for each subdirectory
 	 */
-	glob(dirPath: string, pattern: string, ignorePattern?: string): string[];
+	glob(dirPath: string, pattern: string, ignorePatterns?: string[]): string[];
 }
 
 export const FS_TOKEN: string = "fs";

packages/core/update/Update.ts

@@ -61,7 +61,7 @@ export async function updateWorkspace(rootPath: string): Promise<boolean> {
 	const logicFiles = [];
 	const styleFiles = [];
 	const pkgJsonFiles = [];
-	pkgJsonFiles.push(...fs.glob(rootPath, `package.json`, "node_modules"));
+	pkgJsonFiles.push(...fs.glob(rootPath, `package.json`, ['node_modules', 'dist']));
 
 	let workspaceConfig = null;
 	switch (framework.toLowerCase()) {

packages/ng-schematics/src/upgrade-packages/index.ts

@@ -18,9 +18,9 @@ export default function(options: UpgradeOptions): Rule {
 		});
 		const templateManager = new SchematicsTemplateManager();
 		const config = ProjectConfig.getConfig();
-		const library = templateManager.getProjectLibrary(config.project.framework, config.project.projectType);
+		const library = templateManager.getProjectLibrary('angular', config.project?.projectType || 'igx-ts');
 		let project: ProjectTemplate;
-		if (!config.project.projectTemplate || !library.hasProject(config.project.projectTemplate)) {
+		if (!config.project?.projectTemplate || !library.hasProject(config.project?.projectTemplate)) {
 			// in case project template is missing from the config we provide backward.
 			project = library.getProject(library.projectIds[0]);
 		} else {

packages/ng-schematics/src/utils/NgFileSystem.ts

@@ -1,6 +1,7 @@
 import { DirEntry, FileEntry, Tree } from "@angular-devkit/schematics";
 import { App, FS_TOKEN, FS_TYPE_TOKEN, FsTypes, IFileSystem } from "@igniteui/cli-core";
 import { minimatch } from 'minimatch';
+import * as path from "path";
 
 export class NgTreeFileSystem implements IFileSystem {
 	constructor(private tree: Tree) { }
@@ -25,9 +26,9 @@ export class NgTreeFileSystem implements IFileSystem {
 	 * Returns a list of file paths under a directory based on a match pattern
 	 * @param dirPath Root dir to search in
 	 * @param pattern Supports only recursive wildcard `\*\*\/\*`
-	 * @param ignorePattern Optional pattern to ignore for each subdirectory
+	 * @param ignorePatterns Optional patterns to ignore for each subdirectory
 	 */
-	public glob(dirPath: string, pattern: string, ignorePattern?: string): string[] {
+	public glob(dirPath: string, pattern: string, ignorePatterns?: string[]): string[] {
 		const dir = this.tree.getDir(dirPath);
 		const entries: string[] = [];
 
@@ -37,22 +38,20 @@ export class NgTreeFileSystem implements IFileSystem {
 			}
 		};
 
-		if (ignorePattern) {
-			dir.subfiles.forEach(file => {
-				if (minimatch(file, pattern) && !minimatch(file, ignorePattern)) {
-					entries.push(file);
-				}
-			});
-
+		if (ignorePatterns?.length) {
 			const recurse = (dir: DirEntry): void => {
 				for (const subdirPath of dir.subdirs) {
-					if (!minimatch(subdirPath, ignorePattern)) {
-						const currDir = dir.dir(subdirPath);
-						if (currDir.subdirs.length) {
-							recurse(currDir);
-							return;
+					if (ignorePatterns.every(p => !minimatch(subdirPath, p))) {
+						const subDir = dir.dir(subdirPath);
+						if (subDir.subdirs.length) {
+							recurse(subDir);
+							continue;
+						}
+						for (const file of dir.subfiles) {
+							if (minimatch(file, pattern) && ignorePatterns.every(p => !minimatch(file, p))) {
+								entries.push(path.posix.normalize(`${dir.path}/${file}`));
+							}
 						}
-						currDir.visit(visitor);
 					}
 				}
 			};