diff --git a/package-lock.json b/package-lock.json index 4d515e7c09..80e70c1acb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "dependencies": { "@nrwl/nx-cloud": "^14.6.2", "eslint-plugin-header": "^3.1.1", - "fast-glob": "^3.3.0", + "fdir": "^6.0.2", "listr": "^0.14.3", "nx": "^16.3.2", "patch-package": "^7.0.0", @@ -5504,6 +5504,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", + "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -5519,6 +5520,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -5553,6 +5555,19 @@ "reusify": "^1.0.4" } }, + "node_modules/fdir": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.0.2.tgz", + "integrity": "sha512-XJVxBciDoEpRipMYyrTCqVQA4jMTfHNiYNy8OvIGTaQzEFPuMJEvmps+Rouo6rsnivkQax9s5m5gy1lHmY2Hmg==", + "peerDependencies": { + "picomatch": "2.x" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, "node_modules/figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -13634,6 +13649,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", + "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -13646,6 +13662,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -13679,6 +13696,12 @@ "reusify": "^1.0.4" } }, + "fdir": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.0.2.tgz", + "integrity": "sha512-XJVxBciDoEpRipMYyrTCqVQA4jMTfHNiYNy8OvIGTaQzEFPuMJEvmps+Rouo6rsnivkQax9s5m5gy1lHmY2Hmg==", + "requires": {} + }, "figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", diff --git a/package.json b/package.json index 40ea141055..cc0804bd96 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "dependencies": { "@nrwl/nx-cloud": "^14.6.2", "eslint-plugin-header": "^3.1.1", - "fast-glob": "^3.3.0", + "fdir": "^6.0.2", "listr": "^0.14.3", "nx": "^16.3.2", "patch-package": "^7.0.0", diff --git a/scripts/bootstrap.mjs b/scripts/bootstrap.mjs index f66d14a00a..06d4182bb6 100644 --- a/scripts/bootstrap.mjs +++ b/scripts/bootstrap.mjs @@ -22,7 +22,7 @@ import { readFile } from "fs/promises"; import path from "path"; import os from "os"; import parser from "yargs-parser"; -import glob from "fast-glob"; +import { fdir } from "fdir"; import Listr from "listr"; const THREADS = Math.min(4, process.env.THREADS || os.cpus().length / 2); @@ -43,10 +43,14 @@ if (args.scope && !scopes[args.scope]) const IS_BOOTSTRAP_ALL = !args.scope; if (IS_BOOTSTRAP_ALL) { - const allPackages = await glob(["packages/**", "apps/**", "extensions/**"], { - deep: 1, - onlyDirectories: true - }); + const allPackages = ( + await new fdir() + .onlyDirs() + .withMaxDepth(2) + .glob("packages/**", "apps/**", "extensions/**") + .crawl(".") + .withPromise() + ).slice(3); const dependencies = Array.from( new Set(