nx 23.3.0-beta.2 → 23.3.0-beta.4

package/dist/src/daemon/server/server.js

@@ -67,6 +67,7 @@ const project_graph_listener_sockets_1 = require("./project-graph-listener-socke
 const shutdown_utils_1 = require("./shutdown-utils");
 const sync_generators_1 = require("./sync-generators");
 const workspace_context_1 = require("../../utils/workspace-context");
+const is_ci_1 = require("../../utils/is-ci");
 let workspaceWatcherError;
 global.NX_DAEMON = true;
 process.env.NX_DAEMON_PROCESS = 'true';
@@ -458,14 +459,16 @@ async function startServer() {
                     // register file change listener to invalidate sync generator cache
                     (0, file_change_events_1.registerFileChangeListener)(sync_generators_1.clearSyncGeneratorsCache);
                     (0, project_graph_incremental_recomputation_1.scheduleInitialProjectGraphComputation)();
-                    // Kick off Nx Console check in background to prime the cache
-                    (0, handle_nx_console_1.handleGetNxConsoleStatus)().catch(() => {
-                        // Ignore errors, this is a background operation
-                    });
-                    // Kick off AI agents outdated check in background to prime the cache
-                    (0, handle_configure_ai_agents_1.handleGetConfigureAiAgentsStatus)().catch(() => {
-                        // Ignore errors, this is a background operation
-                    });
+                    // Prime the Nx Console and AI agents caches in the background. Both
+                    // pull nx@latest, and the CLI never shows their results in CI.
+                    if (!(0, is_ci_1.isCI)()) {
+                        (0, handle_nx_console_1.handleGetNxConsoleStatus)().catch(() => {
+                            // Ignore errors, this is a background operation
+                        });
+                        (0, handle_configure_ai_agents_1.handleGetConfigureAiAgentsStatus)().catch(() => {
+                            // Ignore errors, this is a background operation
+                        });
+                    }
                     return resolve(server);
                 }
                 catch (err) {

package/dist/src/tasks-runner/run-command.js

@@ -418,6 +418,9 @@ async function runCommandForTasks(projectsToRun, currentProjectGraph, { nxJson }
 }
 async function printConfigureAiAgentsDisclaimer() {
     try {
+        if ((0, is_ci_1.isCI)()) {
+            return;
+        }
         if (!client_1.daemonClient.enabled() || !(await client_1.daemonClient.isServerAvailable())) {
             return;
         }

package/dist/src/utils/git-utils.d.ts

@@ -90,6 +90,18 @@ export declare function commitChanges(commitMessage: string, directory?: string)
  * callers' own constants, never from user input.
  */
 export declare function tryCommitChanges(commitMessage: string, directory: string, excludePaths?: string[]): string | null;
+/**
+ * `tryCommitChanges` for a process that has to stay responsive while git
+ * runs: a signing prompt or a hook can hold the commit for minutes.
+ */
+export declare function tryCommitChangesAsync(commitMessage: string, directory: string, excludePaths?: string[]): Promise<string | null>;
+/**
+ * `git reset --hard <ref>` then `git clean -fd`, keeping `keepPaths` (git
+ * exclusion patterns, repo-relative) out of the clean. Throws with git's
+ * stderr when either fails. `ref` is a sha a caller validated with `GIT_SHA`,
+ * never user input.
+ */
+export declare function resetWorkingTree(ref: string, keepPaths: string[], directory: string): void;
 export declare function getLatestCommitSha(directory?: string): string | null;
 /**
  * The shape of a recorded `git rev-parse` output: 40 hex chars, or 64 in a

package/dist/src/utils/git-utils.js

@@ -19,6 +19,8 @@ exports.getPathCommitExposure = getPathCommitExposure;
 exports.getUncommittedChangesSnapshot = getUncommittedChangesSnapshot;
 exports.commitChanges = commitChanges;
 exports.tryCommitChanges = tryCommitChanges;
+exports.tryCommitChangesAsync = tryCommitChangesAsync;
+exports.resetWorkingTree = resetWorkingTree;
 exports.getLatestCommitSha = getLatestCommitSha;
 exports.isAncestorCommit = isAncestorCommit;
 const tslib_1 = require("tslib");
@@ -849,47 +851,91 @@ function commitChanges(commitMessage, directory) {
  */
 function tryCommitChanges(commitMessage, directory, excludePaths = []) {
     try {
-        (0, child_process_1.execSync)('git add -A', {
-            encoding: 'utf8',
-            stdio: 'pipe',
-            cwd: directory,
-            windowsHide: true,
-        });
-        // Exclusion happens as an unstage rather than an add-time pathspec:
-        // `git add` refuses a pathspec naming an ignored directory (exit 1) even
-        // as an exclusion, and an add-time pathspec cannot cover entries that
-        // were already staged before this call. The reset is relative to cwd, so
-        // a workspace nested inside a larger repo excludes its own path; a path
-        // with no index entry is a quiet no-op, unborn HEAD included.
-        for (const excludePath of excludePaths) {
-            (0, child_process_1.execSync)(`git reset -q -- "${excludePath}"`, {
+        for (const { command, input } of commitCommands(commitMessage, excludePaths)) {
+            (0, child_process_1.execSync)(command, {
                 encoding: 'utf8',
                 stdio: 'pipe',
+                input,
                 cwd: directory,
                 windowsHide: true,
             });
         }
-        (0, child_process_1.execSync)('git commit --no-verify -F -', {
-            encoding: 'utf8',
-            stdio: 'pipe',
-            input: commitMessage,
-            cwd: directory,
-            windowsHide: true,
-        });
     }
     catch (err) {
-        const stderr = err?.stderr?.toString();
-        const stdout = err?.stdout?.toString();
-        const detail = [stderr, stdout]
-            .map((s) => s?.trim())
-            .filter(Boolean)
-            .join('\n');
-        // `{ cause }` preserves structured fields (.signal, .status, .code)
-        // for callers to inspect; otherwise only stderr/stdout text survives.
-        throw new Error(detail || (err instanceof Error ? err.message : String(err)), { cause: err });
+        throw commitFailure(err);
     }
     return getLatestCommitSha(directory);
 }
+/**
+ * `tryCommitChanges` for a process that has to stay responsive while git
+ * runs: a signing prompt or a hook can hold the commit for minutes.
+ */
+async function tryCommitChangesAsync(commitMessage, directory, excludePaths = []) {
+    try {
+        for (const { command, input } of commitCommands(commitMessage, excludePaths)) {
+            await execAsync(command, directory, input);
+        }
+    }
+    catch (err) {
+        throw commitFailure(err);
+    }
+    return getLatestCommitSha(directory);
+}
+function commitCommands(commitMessage, excludePaths) {
+    return [
+        { command: 'git add -A' },
+        // Exclusion happens as an unstage rather than an add-time pathspec:
+        // `git add` refuses a pathspec naming an ignored directory (exit 1) even
+        // as an exclusion, and an add-time pathspec cannot cover entries that
+        // were already staged before this call. The reset is relative to cwd, so
+        // a workspace nested inside a larger repo excludes its own path; a path
+        // with no index entry is a quiet no-op, unborn HEAD included.
+        ...excludePaths.map((excludePath) => ({
+            command: `git reset -q -- "${excludePath}"`,
+        })),
+        { command: 'git commit --no-verify -F -', input: commitMessage },
+    ];
+}
+function commitFailure(err) {
+    const stderr = err?.stderr?.toString();
+    const stdout = err?.stdout?.toString();
+    const detail = [stderr, stdout]
+        .map((s) => s?.trim())
+        .filter(Boolean)
+        .join('\n');
+    // `{ cause }` preserves structured fields (.signal, .status, .code)
+    // for callers to inspect; otherwise only stderr/stdout text survives.
+    return new Error(detail || (err instanceof Error ? err.message : String(err)), { cause: err });
+}
+function execAsync(command, cwd, input) {
+    return new Promise((res, rej) => {
+        const child = (0, child_process_1.exec)(command, { encoding: 'utf8', cwd, windowsHide: true }, 
+        // The streams ride on the error as `execSync` reports them, so
+        // `commitFailure` shapes both the same way.
+        (err, stdout, stderr) => err ? rej(Object.assign(err, { stdout, stderr })) : res());
+        // Closed for every command, since `git commit -F -` reads to end of
+        // input. A child that exits before reading raises EPIPE here, which the
+        // exit callback already reports.
+        child.stdin?.on('error', () => { });
+        child.stdin?.end(input ?? '');
+    });
+}
+/**
+ * `git reset --hard <ref>` then `git clean -fd`, keeping `keepPaths` (git
+ * exclusion patterns, repo-relative) out of the clean. Throws with git's
+ * stderr when either fails. `ref` is a sha a caller validated with `GIT_SHA`,
+ * never user input.
+ */
+function resetWorkingTree(ref, keepPaths, directory) {
+    const options = {
+        encoding: 'utf8',
+        stdio: 'pipe',
+        cwd: directory,
+        windowsHide: true,
+    };
+    (0, child_process_1.execFileSync)('git', ['reset', '--hard', ref], options);
+    (0, child_process_1.execFileSync)('git', ['clean', '-fd', ...keepPaths.flatMap((keepPath) => ['-e', keepPath])], options);
+}
 function getLatestCommitSha(directory) {
     try {
         return (0, child_process_1.execSync)('git rev-parse HEAD', {

package/dist/src/utils/package-json.js

@@ -279,11 +279,18 @@ function preparePackageInstallation(pkg, requiredVersion, packageManager) {
     // npm needs `--legacy-peer-deps` rather than `--omit=peer`: npm marks a package
     // as a peer if anything in the tree peer-depends on it, so `--omit=peer` also
     // prunes packages that are real dependencies. Bun's `--omit=peer` does not.
+    //
+    // pnpm has no plain flag for it. Up to 11 it takes `--config.<setting>`;
+    // pnpm 12 gave `--config` a meaning of its own and takes the setting from
+    // the environment instead.
     const skipPeerDependenciesFlags = {
         npm: '--legacy-peer-deps',
         bun: '--omit=peer',
         pnpm: '--config.auto-install-peers=false',
     };
+    const skipPeerDependenciesEnv = packageManager === 'pnpm'
+        ? { PNPM_CONFIG_AUTO_INSTALL_PEERS: 'false' }
+        : {};
     const installCommand = [
         pmCommands.addDev,
         `${pkg}@${requiredVersion}`,
@@ -301,6 +308,7 @@ function preparePackageInstallation(pkg, requiredVersion, packageManager) {
         env: {
             ...process.env,
             YARN_ENABLE_SCRIPTS: 'false',
+            ...skipPeerDependenciesEnv,
         },
     };
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "23.3.0-beta.2",
+  "version": "23.3.0-beta.4",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -184,16 +184,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "23.3.0-beta.2",
-    "@nx/nx-darwin-x64": "23.3.0-beta.2",
-    "@nx/nx-freebsd-x64": "23.3.0-beta.2",
-    "@nx/nx-linux-arm-gnueabihf": "23.3.0-beta.2",
-    "@nx/nx-linux-arm64-gnu": "23.3.0-beta.2",
-    "@nx/nx-linux-arm64-musl": "23.3.0-beta.2",
-    "@nx/nx-linux-x64-gnu": "23.3.0-beta.2",
-    "@nx/nx-linux-x64-musl": "23.3.0-beta.2",
-    "@nx/nx-win32-arm64-msvc": "23.3.0-beta.2",
-    "@nx/nx-win32-x64-msvc": "23.3.0-beta.2"
+    "@nx/nx-darwin-arm64": "23.3.0-beta.4",
+    "@nx/nx-darwin-x64": "23.3.0-beta.4",
+    "@nx/nx-freebsd-x64": "23.3.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "23.3.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "23.3.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "23.3.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "23.3.0-beta.4",
+    "@nx/nx-linux-x64-musl": "23.3.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "23.3.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "23.3.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",