nx 20.0.0-canary.20240924-3e1a879 → 20.0.0-canary.20240926-529ab94

package/src/tasks-runner/cache.d.ts

@@ -1,5 +1,6 @@
 import { DefaultTasksRunnerOptions, RemoteCache } from './default-tasks-runner';
 import { Task } from '../config/task-graph';
+import { NxJsonConfiguration } from '../config/nx-json';
 export type CachedResult = {
     terminalOutput: string;
     outputsPath: string;
@@ -10,7 +11,7 @@ export type TaskWithCachedResult = {
     task: Task;
     cachedResult: CachedResult;
 };
-export declare function getCache(options: DefaultTasksRunnerOptions): DbCache | Cache;
+export declare function getCache(nxJson: NxJsonConfiguration, options: DefaultTasksRunnerOptions): DbCache | Cache;
 export declare class DbCache {
     private readonly options;
     private cache;
@@ -30,6 +31,7 @@ export declare class DbCache {
     private _getRemoteCache;
     private getPowerpackS3Cache;
     private getPowerpackSharedCache;
+    private getPowerpackCache;
     private resolvePackage;
     private assertCacheIsValid;
 }

package/src/tasks-runner/cache.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cache = exports.DbCache = void 0;
 exports.getCache = getCache;
 const workspace_root_1 = require("../utils/workspace-root");
-const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
 const default_tasks_runner_1 = require("./default-tasks-runner");
 const child_process_1 = require("child_process");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const cache_directory_1 = require("../utils/cache-directory");
 const node_machine_id_1 = require("node-machine-id");
 const native_1 = require("../native");
@@ -18,9 +19,9 @@ const update_manager_1 = require("../nx-cloud/update-manager");
 const get_cloud_options_1 = require("../nx-cloud/utilities/get-cloud-options");
 const is_ci_1 = require("../utils/is-ci");
 const output_1 = require("../utils/output");
-function getCache(options) {
+function getCache(nxJson, options) {
     return process.env.NX_DISABLE_DB !== 'true' &&
-        process.env.NX_DB_CACHE === 'true'
+        (nxJson.enableDbCache === true || process.env.NX_DB_CACHE === 'true')
         ? new DbCache({
             // Remove this in Nx 21
             nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())
@@ -114,23 +115,21 @@ class DbCache {
                 null);
         }
     }
-    async getPowerpackS3Cache() {
-        try {
-            const { getRemoteCache } = await Promise.resolve(`${this.resolvePackage('@nx/powerpack-s3-cache')}`).then(s => require(s));
-            return getRemoteCache();
-        }
-        catch {
-            return null;
-        }
+    getPowerpackS3Cache() {
+        return this.getPowerpackCache('@nx/powerpack-s3-cache');
+    }
+    getPowerpackSharedCache() {
+        return this.getPowerpackCache('@nx/powerpack-shared-fs-cache');
     }
-    async getPowerpackSharedCache() {
+    async getPowerpackCache(pkg) {
+        let getRemoteCache = null;
         try {
-            const { getRemoteCache } = await Promise.resolve(`${this.resolvePackage('@nx/powerpack-shared-fs-cache')}`).then(s => require(s));
-            return getRemoteCache();
+            getRemoteCache = (await Promise.resolve(`${this.resolvePackage(pkg)}`).then(s => require(s))).getRemoteCache;
         }
         catch {
             return null;
         }
+        return getRemoteCache();
     }
     resolvePackage(pkg) {
         return require.resolve(pkg, {
@@ -183,6 +182,7 @@ class Cache {
                     stdio: 'ignore',
                     detached: true,
                     shell: false,
+                    windowsHide: true,
                 });
                 p.unref();
             }
@@ -234,13 +234,13 @@ class Cache {
             // might be left overs from partially-completed cache invocations
             await this.remove(tdCommit);
             await this.remove(td);
-            await (0, fs_extra_1.mkdir)(td);
-            await (0, fs_extra_1.writeFile)((0, path_1.join)(td, 'terminalOutput'), terminalOutput ?? 'no terminal output');
-            await (0, fs_extra_1.mkdir)((0, path_1.join)(td, 'outputs'));
+            await (0, promises_1.mkdir)(td, { recursive: true });
+            await (0, promises_1.writeFile)((0, path_1.join)(td, 'terminalOutput'), terminalOutput ?? 'no terminal output');
+            await (0, promises_1.mkdir)((0, path_1.join)(td, 'outputs'));
             const expandedOutputs = await this.expandOutputsInWorkspace(outputs);
             await Promise.all(expandedOutputs.map(async (f) => {
                 const src = (0, path_1.join)(this.root, f);
-                if (await (0, fs_extra_1.pathExists)(src)) {
+                if ((0, node_fs_1.existsSync)(src)) {
                     const cached = (0, path_1.join)(td, 'outputs', f);
                     await this.copy(src, cached);
                 }
@@ -249,15 +249,15 @@ class Cache {
             // creating this file is atomic, whereas creating a folder is not.
             // so if the process gets terminated while we are copying stuff into cache,
             // the cache entry won't be used.
-            await (0, fs_extra_1.writeFile)((0, path_1.join)(td, 'code'), code.toString());
-            await (0, fs_extra_1.writeFile)((0, path_1.join)(td, 'source'), await this.currentMachineId());
-            await (0, fs_extra_1.writeFile)(tdCommit, 'true');
+            await (0, promises_1.writeFile)((0, path_1.join)(td, 'code'), code.toString());
+            await (0, promises_1.writeFile)((0, path_1.join)(td, 'source'), await this.currentMachineId());
+            await (0, promises_1.writeFile)(tdCommit, 'true');
             if (this.options.remoteCache) {
                 await this.options.remoteCache.store(task.hash, this.cachePath);
             }
             if (terminalOutput) {
                 const outputPath = this.temporaryOutputPath(task);
-                await (0, fs_extra_1.writeFile)(outputPath, terminalOutput);
+                await (0, promises_1.writeFile)(outputPath, terminalOutput);
             }
         });
     }
@@ -266,7 +266,7 @@ class Cache {
             const expandedOutputs = await this.expandOutputsInCache(outputs, cachedResult);
             await Promise.all(expandedOutputs.map(async (f) => {
                 const cached = (0, path_1.join)(cachedResult.outputsPath, f);
-                if (await (0, fs_extra_1.pathExists)(cached)) {
+                if ((0, node_fs_1.existsSync)(cached)) {
                     const src = (0, path_1.join)(this.root, f);
                     await this.remove(src);
                     await this.copy(cached, src);
@@ -322,11 +322,11 @@ class Cache {
     async getFromLocalDir(task) {
         const tdCommit = (0, path_1.join)(this.cachePath, `${task.hash}.commit`);
         const td = (0, path_1.join)(this.cachePath, task.hash);
-        if (await (0, fs_extra_1.pathExists)(tdCommit)) {
-            const terminalOutput = await (0, fs_extra_1.readFile)((0, path_1.join)(td, 'terminalOutput'), 'utf-8');
+        if ((0, node_fs_1.existsSync)(tdCommit)) {
+            const terminalOutput = await (0, promises_1.readFile)((0, path_1.join)(td, 'terminalOutput'), 'utf-8');
             let code = 0;
             try {
-                code = Number(await (0, fs_extra_1.readFile)((0, path_1.join)(td, 'code'), 'utf-8'));
+                code = Number(await (0, promises_1.readFile)((0, path_1.join)(td, 'code'), 'utf-8'));
             }
             catch { }
             return {
@@ -343,7 +343,7 @@ class Cache {
         const td = (0, path_1.join)(this.cachePath, task.hash);
         let sourceMachineId = null;
         try {
-            sourceMachineId = await (0, fs_extra_1.readFile)((0, path_1.join)(td, 'source'), 'utf-8');
+            sourceMachineId = await (0, promises_1.readFile)((0, path_1.join)(td, 'source'), 'utf-8');
         }
         catch { }
         if (sourceMachineId && sourceMachineId != (await this.currentMachineId())) {
@@ -362,12 +362,12 @@ class Cache {
         }
     }
     createCacheDir() {
-        (0, fs_extra_1.mkdirSync)(cache_directory_1.cacheDir, { recursive: true });
+        (0, node_fs_1.mkdirSync)(cache_directory_1.cacheDir, { recursive: true });
         return cache_directory_1.cacheDir;
     }
     createTerminalOutputsDir() {
         const path = (0, path_1.join)(this.cachePath, 'terminalOutputs');
-        (0, fs_extra_1.mkdirSync)(path, { recursive: true });
+        (0, node_fs_1.mkdirSync)(path, { recursive: true });
         return path;
     }
 }

package/src/tasks-runner/default-tasks-runner.js

@@ -56,7 +56,7 @@ const defaultTasksRunner = async (tasks, options, context) => {
 };
 exports.defaultTasksRunner = defaultTasksRunner;
 async function runAllTasks(tasks, options, context) {
-    const orchestrator = new task_orchestrator_1.TaskOrchestrator(context.hasher, context.initiatingProject, context.projectGraph, context.taskGraph, options, context.nxArgs?.nxBail, context.daemon, context.nxArgs?.outputStyle);
+    const orchestrator = new task_orchestrator_1.TaskOrchestrator(context.hasher, context.initiatingProject, context.projectGraph, context.taskGraph, context.nxJson, options, context.nxArgs?.nxBail, context.daemon, context.nxArgs?.outputStyle);
     return orchestrator.run();
 }
 exports.default = exports.defaultTasksRunner;

package/src/tasks-runner/remove-old-cache-records.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const WEEK_IN_MS = 1000 * 60 * 60 * 24 * 7;
 const folder = process.argv[2];
@@ -34,11 +33,11 @@ function removeOld(records) {
                 if (time - s.mtimeMs > WEEK_IN_MS) {
                     if (s.isDirectory()) {
                         try {
-                            (0, fs_extra_1.removeSync)(`${r}.commit`);
+                            (0, fs_1.rmSync)(`${r}.commit`, { recursive: true, force: true });
                         }
                         catch (e) { }
                     }
-                    (0, fs_extra_1.removeSync)(r);
+                    (0, fs_1.rmSync)(r, { recursive: true, force: true });
                 }
             }
             catch (e) { }

package/src/tasks-runner/task-orchestrator.d.ts

@@ -4,11 +4,13 @@ import { TaskStatus } from './tasks-runner';
 import { ProjectGraph } from '../config/project-graph';
 import { TaskGraph } from '../config/task-graph';
 import { DaemonClient } from '../daemon/client/client';
+import { NxJsonConfiguration } from '../config/nx-json';
 export declare class TaskOrchestrator {
     private readonly hasher;
     private readonly initiatingProject;
     private readonly projectGraph;
     private readonly taskGraph;
+    private readonly nxJson;
     private readonly options;
     private readonly bail;
     private readonly daemon;
@@ -24,7 +26,7 @@ export declare class TaskOrchestrator {
     private waitingForTasks;
     private groups;
     private bailed;
-    constructor(hasher: TaskHasher, initiatingProject: string | undefined, projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions, bail: boolean, daemon: DaemonClient, outputStyle: string);
+    constructor(hasher: TaskHasher, initiatingProject: string | undefined, projectGraph: ProjectGraph, taskGraph: TaskGraph, nxJson: NxJsonConfiguration, options: DefaultTasksRunnerOptions, bail: boolean, daemon: DaemonClient, outputStyle: string);
     run(): Promise<{
         [id: string]: TaskStatus;
     }>;

package/src/tasks-runner/task-orchestrator.js

@@ -17,16 +17,17 @@ const output_1 = require("../utils/output");
 const params_1 = require("../utils/params");
 class TaskOrchestrator {
     // endregion internal state
-    constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail, daemon, outputStyle) {
+    constructor(hasher, initiatingProject, projectGraph, taskGraph, nxJson, options, bail, daemon, outputStyle) {
         this.hasher = hasher;
         this.initiatingProject = initiatingProject;
         this.projectGraph = projectGraph;
         this.taskGraph = taskGraph;
+        this.nxJson = nxJson;
         this.options = options;
         this.bail = bail;
         this.daemon = daemon;
         this.outputStyle = outputStyle;
-        this.cache = (0, cache_1.getCache)(this.options);
+        this.cache = (0, cache_1.getCache)(this.nxJson, this.options);
         this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
         this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.projectGraph, this.taskGraph, this.options);
         // region internal state

package/src/utils/ab-testing.js

@@ -97,7 +97,10 @@ function shouldRecordStats() {
         return true;
     }
     try {
-        const stdout = (0, node_child_process_1.execSync)(pmc.getRegistryUrl, { encoding: 'utf-8' });
+        const stdout = (0, node_child_process_1.execSync)(pmc.getRegistryUrl, {
+            encoding: 'utf-8',
+            windowsHide: true,
+        });
         const url = new URL(stdout.trim());
         // don't record stats when testing locally
         return url.hostname !== 'localhost';

package/src/utils/child-process.js

@@ -16,6 +16,7 @@ function runNxSync(cmd, options) {
     else {
         options ??= {};
         options.cwd ??= process.cwd();
+        options.windowsHide ??= true;
         const offsetFromRoot = (0, path_1.relative)(options.cwd, (0, workspace_root_1.workspaceRootInner)(options.cwd, null));
         if (process.platform === 'win32') {
             baseCmd = '.\\' + (0, path_1.join)(`${offsetFromRoot}`, 'nx.bat');
@@ -34,6 +35,7 @@ async function runNxAsync(cmd, options) {
     else {
         options ??= {};
         options.cwd ??= process.cwd();
+        options.windowsHide ??= true;
         const offsetFromRoot = (0, path_1.relative)(options.cwd, (0, workspace_root_1.workspaceRootInner)(options.cwd, null));
         if (process.platform === 'win32') {
             baseCmd = '.\\' + (0, path_1.join)(`${offsetFromRoot}`, 'nx.bat');
@@ -46,13 +48,13 @@ async function runNxAsync(cmd, options) {
     if (options?.silent) {
         delete options.silent;
     }
-    await new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
         const child = (0, child_process_1.exec)(`${baseCmd} ${cmd}`, options, (error, stdout, stderr) => {
             if (error) {
-                reject(error);
+                reject(stderr || stdout || error.message);
             }
             else {
-                resolve(stdout);
+                resolve();
             }
         });
         if (!silent) {

package/src/utils/command-line-utils.js

@@ -222,6 +222,7 @@ function getMergeBase(base, head = 'HEAD') {
             maxBuffer: file_utils_1.TEN_MEGABYTES,
             cwd: workspace_root_1.workspaceRoot,
             stdio: 'pipe',
+            windowsHide: true,
         })
             .toString()
             .trim();
@@ -232,6 +233,7 @@ function getMergeBase(base, head = 'HEAD') {
                 maxBuffer: file_utils_1.TEN_MEGABYTES,
                 cwd: workspace_root_1.workspaceRoot,
                 stdio: 'pipe',
+                windowsHide: true,
             })
                 .toString()
                 .trim();
@@ -245,7 +247,11 @@ function getFilesUsingBaseAndHead(base, head) {
     return parseGitOutput(`git diff --name-only --no-renames --relative "${base}" "${head}"`);
 }
 function parseGitOutput(command) {
-    return (0, child_process_1.execSync)(command, { maxBuffer: file_utils_1.TEN_MEGABYTES, cwd: workspace_root_1.workspaceRoot })
+    return (0, child_process_1.execSync)(command, {
+        maxBuffer: file_utils_1.TEN_MEGABYTES,
+        cwd: workspace_root_1.workspaceRoot,
+        windowsHide: true,
+    })
         .toString('utf-8')
         .split('\n')
         .map((a) => a.trim())

package/src/utils/default-base.js

@@ -5,8 +5,11 @@ const child_process_1 = require("child_process");
 function deduceDefaultBase() {
     const nxDefaultBase = 'main';
     try {
-        return ((0, child_process_1.execSync)('git config --get init.defaultBranch').toString().trim() ||
-            nxDefaultBase);
+        return ((0, child_process_1.execSync)('git config --get init.defaultBranch', {
+            windowsHide: true,
+        })
+            .toString()
+            .trim() || nxDefaultBase);
     }
     catch {
         return nxDefaultBase;

package/src/utils/fileutils.d.ts

@@ -1,5 +1,5 @@
 import type { JsonParseOptions, JsonSerializeOptions } from './json';
-import { PathLike } from 'fs';
+import { PathLike } from 'node:fs';
 export interface JsonReadOptions extends JsonParseOptions {
     /**
      * mutable field recording whether JSON ends with new line
@@ -43,6 +43,14 @@ export declare function readYamlFile<T extends object = any>(path: string, optio
  * @param options JSON serialize options
  */
 export declare function writeJsonFile<T extends object = object>(path: string, data: T, options?: JsonWriteOptions): void;
+/**
+ * Serializes the given data to JSON and writes it to a file asynchronously.
+ *
+ * @param path A path to a file.
+ * @param data data which should be serialized to JSON and written to the file
+ * @param options JSON serialize options
+ */
+export declare function writeJsonFileAsync<T extends object = object>(path: string, data: T, options?: JsonWriteOptions): Promise<void>;
 /**
  * Check if a directory exists
  * @param path Path to directory

package/src/utils/fileutils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readJsonFile = readJsonFile;
 exports.readYamlFile = readYamlFile;
 exports.writeJsonFile = writeJsonFile;
+exports.writeJsonFileAsync = writeJsonFileAsync;
 exports.directoryExists = directoryExists;
 exports.fileExists = fileExists;
 exports.createDirectory = createDirectory;
@@ -10,7 +11,8 @@ exports.isRelativePath = isRelativePath;
 exports.extractFileFromTarball = extractFileFromTarball;
 exports.readFileIfExisting = readFileIfExisting;
 const json_1 = require("./json");
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const path_1 = require("path");
 const tar = require("tar-stream");
 const zlib_1 = require("zlib");
@@ -22,7 +24,7 @@ const zlib_1 = require("zlib");
  * @returns Object the JSON content of the file represents
  */
 function readJsonFile(path, options) {
-    const content = (0, fs_1.readFileSync)(path, 'utf-8');
+    const content = (0, node_fs_1.readFileSync)(path, 'utf-8');
     if (options) {
         options.endsWithNewline = content.charCodeAt(content.length - 1) === 10;
     }
@@ -41,7 +43,7 @@ function readJsonFile(path, options) {
  * @returns
  */
 function readYamlFile(path, options) {
-    const content = (0, fs_1.readFileSync)(path, 'utf-8');
+    const content = (0, node_fs_1.readFileSync)(path, 'utf-8');
     const { load } = require('@zkochan/js-yaml');
     return load(content, { ...options, filename: path });
 }
@@ -53,12 +55,27 @@ function readYamlFile(path, options) {
  * @param options JSON serialize options
  */
 function writeJsonFile(path, data, options) {
-    (0, fs_1.mkdirSync)((0, path_1.dirname)(path), { recursive: true });
+    (0, node_fs_1.mkdirSync)((0, path_1.dirname)(path), { recursive: true });
     const serializedJson = (0, json_1.serializeJson)(data, options);
     const content = options?.appendNewLine
         ? `${serializedJson}\n`
         : serializedJson;
-    (0, fs_1.writeFileSync)(path, content, { encoding: 'utf-8' });
+    (0, node_fs_1.writeFileSync)(path, content, { encoding: 'utf-8' });
+}
+/**
+ * Serializes the given data to JSON and writes it to a file asynchronously.
+ *
+ * @param path A path to a file.
+ * @param data data which should be serialized to JSON and written to the file
+ * @param options JSON serialize options
+ */
+async function writeJsonFileAsync(path, data, options) {
+    await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true });
+    const serializedJson = (0, json_1.serializeJson)(data, options);
+    const content = options?.appendNewLine
+        ? `${serializedJson}\n`
+        : serializedJson;
+    await (0, promises_1.writeFile)(path, content, { encoding: 'utf-8' });
 }
 /**
  * Check if a directory exists
@@ -66,7 +83,7 @@ function writeJsonFile(path, data, options) {
  */
 function directoryExists(path) {
     try {
-        return (0, fs_1.statSync)(path).isDirectory();
+        return (0, node_fs_1.statSync)(path).isDirectory();
     }
     catch {
         return false;
@@ -78,14 +95,14 @@ function directoryExists(path) {
  */
 function fileExists(path) {
     try {
-        return (0, fs_1.statSync)(path).isFile();
+        return (0, node_fs_1.statSync)(path).isFile();
     }
     catch {
         return false;
     }
 }
 function createDirectory(path) {
-    (0, fs_1.mkdirSync)(path, { recursive: true });
+    (0, node_fs_1.mkdirSync)(path, { recursive: true });
 }
 function isRelativePath(path) {
     return (path === '.' ||
@@ -102,9 +119,9 @@ function isRelativePath(path) {
  */
 async function extractFileFromTarball(tarballPath, file, destinationFilePath) {
     return new Promise((resolve, reject) => {
-        (0, fs_1.mkdirSync)((0, path_1.dirname)(destinationFilePath), { recursive: true });
+        (0, node_fs_1.mkdirSync)((0, path_1.dirname)(destinationFilePath), { recursive: true });
         var tarExtractStream = tar.extract();
-        const destinationFileStream = (0, fs_1.createWriteStream)(destinationFilePath);
+        const destinationFileStream = (0, node_fs_1.createWriteStream)(destinationFilePath);
         let isFileExtracted = false;
         tarExtractStream.on('entry', function (header, stream, next) {
             if (header.name === file) {
@@ -126,9 +143,9 @@ async function extractFileFromTarball(tarballPath, file, destinationFilePath) {
                 reject();
             }
         });
-        (0, fs_1.createReadStream)(tarballPath).pipe((0, zlib_1.createGunzip)()).pipe(tarExtractStream);
+        (0, node_fs_1.createReadStream)(tarballPath).pipe((0, zlib_1.createGunzip)()).pipe(tarExtractStream);
     });
 }
 function readFileIfExisting(path) {
-    return (0, fs_1.existsSync)(path) ? (0, fs_1.readFileSync)(path, 'utf-8') : '';
+    return (0, node_fs_1.existsSync)(path) ? (0, node_fs_1.readFileSync)(path, 'utf-8') : '';
 }

package/src/utils/git-utils.index-filter.js

@@ -9,9 +9,10 @@ try {
     const { execSync } = require('child_process');
     // NOTE: Using env vars because Windows PowerShell has its own handling of quotes (") messes up quotes in args, even if escaped.
     const src = process.env.NX_IMPORT_SOURCE;
-    execSync('git read-tree --empty', { stdio: 'inherit' });
+    execSync('git read-tree --empty', { stdio: 'inherit', windowsHide: true });
     execSync(`git reset ${process.env.GIT_COMMIT} -- "${src}"`, {
         stdio: 'inherit',
+        windowsHide: true,
     });
 }
 catch (error) {

package/src/utils/git-utils.js

@@ -36,6 +36,7 @@ class GitRepository {
     getGitRootPath(cwd) {
         return (0, child_process_1.execSync)('git rev-parse --show-toplevel', {
             cwd,
+            windowsHide: true,
         })
             .toString()
             .trim();
@@ -176,6 +177,7 @@ function getGithubSlugOrNull() {
     try {
         const gitRemote = (0, child_process_1.execSync)('git remote -v', {
             stdio: 'pipe',
+            windowsHide: true,
         }).toString();
         // If there are no remotes, we default to github
         if (!gitRemote || gitRemote.length === 0) {
@@ -226,6 +228,7 @@ function commitChanges(commitMessage, directory) {
             stdio: 'pipe',
             input: commitMessage,
             cwd: directory,
+            windowsHide: true,
         });
     }
     catch (err) {
@@ -247,6 +250,7 @@ function getLatestCommitSha() {
         return (0, child_process_1.execSync)('git rev-parse HEAD', {
             encoding: 'utf8',
             stdio: 'pipe',
+            windowsHide: true,
         }).trim();
     }
     catch {

package/src/utils/git-utils.tree-filter.js

@@ -14,7 +14,9 @@ try {
     // NOTE: Using env vars because Windows PowerShell has its own handling of quotes (") messes up quotes in args, even if escaped.
     const src = process.env.NX_IMPORT_SOURCE;
     const dest = process.env.NX_IMPORT_DESTINATION;
-    const files = execSync(`git ls-files -z ${src}`)
+    const files = execSync(`git ls-files -z ${src}`, {
+        windowsHide: true,
+    })
         .toString()
         .trim()
         .split('\x00')

package/src/utils/ignore.js

@@ -4,7 +4,7 @@ exports.ALWAYS_IGNORE = void 0;
 exports.getIgnoredGlobs = getIgnoredGlobs;
 exports.getAlwaysIgnore = getAlwaysIgnore;
 exports.getIgnoreObject = getIgnoreObject;
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const ignore_1 = require("ignore");
 const fileutils_1 = require("./fileutils");
 const path_1 = require("./path");
@@ -48,7 +48,7 @@ function getIgnoreObject(root = workspace_root_1.workspaceRoot) {
 function getIgnoredGlobsFromFile(file, root) {
     try {
         const results = [];
-        const contents = (0, fs_extra_1.readFileSync)(file, 'utf-8');
+        const contents = (0, node_fs_1.readFileSync)(file, 'utf-8');
         const lines = contents.split('\n');
         for (const line of lines) {
             const trimmed = line.trim();

package/src/utils/package-manager.js

@@ -15,7 +15,7 @@ exports.packageRegistryView = packageRegistryView;
 exports.packageRegistryPack = packageRegistryPack;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
+const promises_1 = require("node:fs/promises");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const tmp_1 = require("tmp");
@@ -301,7 +301,7 @@ function createTempNpmDirectory() {
     copyPackageManagerConfigurationFiles(workspace_root_1.workspaceRoot, dir);
     const cleanup = async () => {
         try {
-            await (0, fs_extra_1.remove)(dir);
+            await (0, promises_1.rm)(dir, { recursive: true, force: true });
         }
         catch {
             // It's okay if this fails, the OS will clean it up eventually

package/src/utils/powerpack.d.ts

@@ -1,5 +1,5 @@
 export declare function printPowerpackLicense(): Promise<void>;
-export declare function getPowerpackLicenseInformation(): Promise<any>;
+export declare function getPowerpackLicenseInformation(): Promise<import("@nx/powerpack-license").PowerpackLicense>;
 export declare class NxPowerpackNotInstalledError extends Error {
     constructor(e: Error);
 }

package/src/utils/powerpack.js

@@ -9,22 +9,17 @@ const workspace_root_1 = require("./workspace-root");
 async function printPowerpackLicense() {
     try {
         const { organizationName, seatCount, workspaceCount } = await getPowerpackLicenseInformation();
-        logger_1.logger.log(`Nx Powerpack Licensed to ${organizationName} for ${seatCount} user${seatCount > 1 ? '' : 's'} in ${workspaceCount} workspace${workspaceCount > 1 ? '' : 's'}`);
+        logger_1.logger.log(`Nx Powerpack Licensed to ${organizationName} for ${seatCount} user${seatCount > 1 ? '' : 's'} in ${workspaceCount === 9999 ? 'an unlimited number of' : workspaceCount} workspace${workspaceCount > 1 ? '' : 's'}`);
     }
     catch { }
 }
 async function getPowerpackLicenseInformation() {
     try {
-        const { getPowerpackLicenseInformation } = (await Promise.resolve().then(() => require(
-        // @ts-ignore
-        '@nx/powerpack-license'
-        // TODO(@FrozenPandaz): Provide the right type here.
-        )));
-        // )) as typeof import('@nx/powerpack-license');
+        const { getPowerpackLicenseInformation } = (await Promise.resolve().then(() => require('@nx/powerpack-license')));
         return getPowerpackLicenseInformation(workspace_root_1.workspaceRoot);
     }
     catch (e) {
-        if ('code' in e && e.code === 'ERR_MODULE_NOT_FOUND') {
+        if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
             throw new NxPowerpackNotInstalledError(e);
         }
         throw e;

package/src/utils/sync-generators.d.ts

@@ -18,6 +18,8 @@ export type SyncGeneratorRunSuccessResult = {
 type SerializableSimpleError = {
     message: string;
     stack: string | undefined;
+    title?: string;
+    bodyLines?: string[];
 };
 export type SyncGeneratorRunErrorResult = {
     generatorName: string;
@@ -36,16 +38,24 @@ type FlushSyncGeneratorChangesFailure = {
     generalFailure?: SerializableSimpleError;
 };
 export type FlushSyncGeneratorChangesResult = FlushSyncGeneratorChangesSuccess | FlushSyncGeneratorChangesFailure;
+export declare class SyncError extends Error {
+    title: string;
+    bodyLines?: string[];
+    constructor(title: string, bodyLines?: string[]);
+}
 export declare function getSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorRunResult[]>;
 export declare function flushSyncGeneratorChanges(results: SyncGeneratorRunResult[]): Promise<FlushSyncGeneratorChangesResult>;
-export declare function collectAllRegisteredSyncGenerators(projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Promise<string[]>;
+export declare function collectAllRegisteredSyncGenerators(projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Promise<{
+    globalGenerators: string[];
+    taskGenerators: string[];
+}>;
 export declare function runSyncGenerator(tree: Tree, generatorSpecifier: string, projects: Record<string, ProjectConfiguration>): Promise<SyncGeneratorRunResult>;
 export declare function collectEnabledTaskSyncGeneratorsFromProjectGraph(projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Set<string>;
 export declare function collectEnabledTaskSyncGeneratorsFromTaskGraph(taskGraph: TaskGraph, projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Set<string>;
 export declare function collectRegisteredGlobalSyncGenerators(nxJson?: NxJsonConfiguration<string[] | "*">): Set<string>;
 export declare function getSyncGeneratorSuccessResultsMessageLines(results: SyncGeneratorRunResult[]): string[];
-export declare function getFailedSyncGeneratorsFixMessageLines(results: SyncGeneratorRunResult[], verbose: boolean): string[];
-export declare function getFlushFailureMessageLines(result: FlushSyncGeneratorChangesFailure, verbose: boolean): string[];
+export declare function getFailedSyncGeneratorsFixMessageLines(results: SyncGeneratorRunResult[], verbose: boolean, globalGeneratorSet?: Set<string>): string[];
+export declare function getFlushFailureMessageLines(result: FlushSyncGeneratorChangesFailure, verbose: boolean, globalGeneratorSet?: Set<string>): string[];
 export declare function processSyncGeneratorResultErrors(results: SyncGeneratorRunResult[]): {
     failedGeneratorsCount: number;
     areAllResultsFailures: boolean;