fix(cli): update glob to 11.0.0 and fix tests

Author: Hristo Hristov

packages/core/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@inquirer/prompts": "~5.4.0",
     "chalk": "^2.3.2",
-    "glob": "^7.1.2",
+    "glob": "^11.0.0",
     "through2": "^2.0.3",
     "typescript": "~5.5.4"
   },

packages/core/util/FileSystem.ts

@@ -30,6 +30,7 @@ export class FsFileSystem implements IFileSystem {
 	}
 
 	public glob(dirPath: string, pattern: string): string[] {
-		return glob.sync(path.join(dirPath, pattern), { nodir: true });
+		return glob.sync(path.join(dirPath, pattern), { nodir: true })
+			.map(filePath => filePath.replace(/\\/g, "/"));
 	}
 }

packages/core/util/Util.ts

@@ -79,7 +79,8 @@ export class Util {
 		}
 
 		return new Promise((resolve, reject) => {
-			const filePaths: string[] = glob.sync(sourcePath + "/**/*", { nodir: true });
+			const filePaths: string[] = glob.sync(sourcePath + "/**/*", { nodir: true })
+				.map(filePath => filePath.replace(/\\/g, "/"));
 			let fileCount = filePaths.length;
 			// if no files should be created, resolve
 			if (fileCount === 0) {
@@ -608,9 +609,11 @@ export class Util {
 		sourcePath = sourcePath.replace(/\\/g, "/");
 		destinationPath = destinationPath.replace(/\\/g, "/");
 
-		let paths: string[] = glob.sync(sourcePath + "/**/*", { nodir: true });
+		let paths: string[] = glob.sync(sourcePath + "/**/*", { nodir: true })
+			.map(filePath => filePath.replace(/\\/g, "/"));
 		// TODO: D.P Temporary ignoring asset files
-		const ignorePaths: string[] = glob.sync(sourcePath + "/**/+(assets|data)/**/*", { nodir: true });
+		const ignorePaths: string[] = glob.sync(sourcePath + "/**/+(assets|data)/**/*", { nodir: true })
+			.map(filePath => filePath.replace(/\\/g, "/"));
 		paths = paths.filter(x => ignorePaths.indexOf(x) === -1);
 
 		for (let filePath of paths) {

spec/acceptance/add-spec.ts

@@ -128,7 +128,7 @@ describe("Add command", () => {
 		await cli.run(["add", "grid", "Test view"]);
 
 		expect(console.error).toHaveBeenCalledWith(
-			jasmine.stringMatching(/test-view[\\\/]index.html already exists!*/)
+			jasmine.stringMatching(/test-view[\\\/]style.css already exists!*/)
 		);
 		expect(fs.readFileSync("./test-view/index.html").toString()).toEqual("test", "Shouldn't overwrite file contents");
 
@@ -137,7 +137,7 @@ describe("Add command", () => {
 		await cli.run(["add", "grid", "test-View"]);
 
 		expect(console.error).toHaveBeenCalledWith(
-			jasmine.stringMatching(/test-view[\\\/]index.html already exists!*/)
+			jasmine.stringMatching(/test-view[\\\/]style.css already exists!*/)
 		);
 		expect(fs.readFileSync("./test-view/index.html").toString()).toEqual("test", "Shouldn't overwrite file contents");
 
@@ -146,7 +146,7 @@ describe("Add command", () => {
 		await cli.run(["add", "grid", "    Test-view  \t "]);
 
 		expect(console.error).toHaveBeenCalledWith(
-			jasmine.stringMatching(/test-view[\\\/]index.html already exists!*/)
+			jasmine.stringMatching(/test-view[\\\/]style.css already exists!*/)
 		);
 		expect(fs.readFileSync("./test-view/index.html").toString()).toEqual("test", "Shouldn't overwrite file contents");
 

spec/helpers/utils.ts

@@ -6,9 +6,11 @@ import * as glob from "glob";
  * @param folderPath Folder path
  */
 export function deleteAll(folderPath: string) {
-	const files: string[] = glob.sync(folderPath + "/**/*", { dot: true, nodir: true });
+	const files: string[] = glob.sync(folderPath + "/**/*", { dot: true, nodir: true })
+		.map(filePath => filePath.replace(/\\/g, "/"));
 	files.forEach(x => fs.unlinkSync(x));
-	const folders: string[] = glob.sync(folderPath + "/**/*", { dot: true });
+	const folders: string[] = glob.sync(folderPath + "/**/*", { dot: true })
+		.map(filePath => filePath.replace(/\\/g, "/"));
 	folders.reverse().forEach(x => fs.rmdirSync(x));
 }
 
@@ -25,8 +27,10 @@ export function filesDiff(
 	transform1?: (val: string) => string,
 	transform2?: (val: string) => string
 ): string[] {
-	let files1: string[] = glob.sync("**/*", {cwd: folderPath1, dot: true, nodir: true });
-	let files2: string[] = glob.sync("**/*", {cwd: folderPath1, dot: true, nodir: true });
+	let files1: string[] = glob.sync("**/*", {cwd: folderPath1, dot: true, nodir: true })
+		.map(filePath => filePath.replace(/\\/g, "/"));
+	let files2: string[] = glob.sync("**/*", {cwd: folderPath1, dot: true, nodir: true })
+		.map(filePath => filePath.replace(/\\/g, "/"));
 	if (transform1) {
 		files1 = files1.map(transform1);
 	}

yarn.lock

@@ -3521,7 +3521,7 @@ glob@^11.0.0:
     package-json-from-dist "^1.0.0"
     path-scurry "^2.0.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
+glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==