nx 22.7.0-beta.11 → 22.7.0-beta.13

package/dist/schemas/nx-schema.json

@@ -772,6 +772,31 @@
             },
             "required": ["dependentTasksOutputFiles"],
             "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "json": {
+                "type": "string",
+                "description": "Path to a JSON file. Must start with {workspaceRoot} or {projectRoot}. Supports globs."
+              },
+              "fields": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "Allowlist of fields to include in the hash. Supports dot notation for nested paths (e.g. 'compilerOptions.target')."
+              },
+              "excludeFields": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "Denylist of fields to exclude from the hash. Supports dot notation for nested paths."
+              }
+            },
+            "required": ["json"],
+            "additionalProperties": false
           }
         ]
       }

package/dist/schemas/project-schema.json

@@ -322,6 +322,31 @@
             },
             "required": ["dependentTasksOutputFiles"],
             "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "properties": {
+              "json": {
+                "type": "string",
+                "description": "Path to a JSON file. Must start with {workspaceRoot} or {projectRoot}. Supports globs."
+              },
+              "fields": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "Allowlist of fields to include in the hash. Supports dot notation for nested paths (e.g. 'compilerOptions.target')."
+              },
+              "excludeFields": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "Denylist of fields to exclude from the hash. Supports dot notation for nested paths."
+              }
+            },
+            "required": ["json"],
+            "additionalProperties": false
           }
         ]
       }

package/dist/src/adapter/ngcli-adapter.js

@@ -40,6 +40,15 @@ function getProjectGraph() {
         return (0, project_graph_1.createProjectGraphAsync)();
     }
 }
+function getUndefinedDefaultsTransform(isAngularBuild) {
+    // `addUndefinedObjectDefaults` was introduced in @angular-devkit/core v20.
+    // `@nx/angular` supports Angular >=19, so fall back to `addUndefinedDefaults`
+    // when the object-specific transform is unavailable.
+    if (isAngularBuild && core_1.schema.transforms.addUndefinedObjectDefaults) {
+        return core_1.schema.transforms.addUndefinedObjectDefaults;
+    }
+    return core_1.schema.transforms.addUndefinedDefaults;
+}
 async function createBuilderContext(builderInfo, context) {
     require('./compat');
     const fsHost = new NxScopedHostForBuilders(context.root, context.projectGraph);
@@ -51,12 +60,7 @@ async function createBuilderContext(builderInfo, context) {
     const registry = new core_1.schema.CoreSchemaRegistry();
     const isAngularBuild = builderInfo.builderName.startsWith('@angular/build:') ||
         ['@nx/angular:application', '@nx/angular:unit-test'].includes(builderInfo.builderName);
-    if (isAngularBuild) {
-        registry.addPostTransform(core_1.schema.transforms.addUndefinedObjectDefaults);
-    }
-    else {
-        registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
-    }
+    registry.addPostTransform(getUndefinedDefaultsTransform(isAngularBuild));
     registry.addSmartDefaultProvider('unparsed', () => {
         // This happens when context.scheduleTarget is used to run a target using nx:run-commands
         return [];
@@ -150,12 +154,7 @@ async function scheduleTarget(root, opts, verbose, projectGraph) {
     const isAngularBuild = builderName.startsWith('@angular/build:') ||
         ['@nx/angular:application', '@nx/angular:unit-test'].includes(builderName);
     const registry = new core_1.schema.CoreSchemaRegistry();
-    if (isAngularBuild) {
-        registry.addPostTransform(core_1.schema.transforms.addUndefinedObjectDefaults);
-    }
-    else {
-        registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
-    }
+    registry.addPostTransform(getUndefinedDefaultsTransform(isAngularBuild));
     registry.addSmartDefaultProvider('unparsed', () => {
         // This happens when context.scheduleTarget is used to run a target using nx:run-commands
         return [];

package/dist/src/command-line/daemon/daemon.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.daemonHandler = daemonHandler;
+const cache_1 = require("../../daemon/cache");
 const tmp_dir_1 = require("../../daemon/tmp-dir");
 const handle_import_1 = require("../../utils/handle-import");
 const output_1 = require("../../utils/output");
-const generate_help_output_1 = require("../../daemon/client/generate-help-output");
 async function daemonHandler(args) {
+    const { daemonClient } = await (0, handle_import_1.handleImport)('../../daemon/client/client.js', __dirname);
     if (args.start) {
-        const { daemonClient } = await (0, handle_import_1.handleImport)('../../daemon/client/client.js', __dirname);
         const pid = await daemonClient.startInBackground();
         output_1.output.log({
             title: `Daemon Server - Started in a background process...`,
@@ -17,11 +17,15 @@ async function daemonHandler(args) {
         });
     }
     else if (args.stop) {
-        const { daemonClient } = await (0, handle_import_1.handleImport)('../../daemon/client/client.js', __dirname);
         await daemonClient.stop();
         output_1.output.log({ title: 'Daemon Server - Stopped' });
     }
+    else if (await daemonClient.isServerAvailable()) {
+        const pid = (0, cache_1.getDaemonProcessIdSync)();
+        console.log(`Nx Daemon is currently running:
+  - Logs: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}${pid ? `\n  - Process ID: ${pid}` : ''}`);
+    }
     else {
-        console.log((0, generate_help_output_1.generateDaemonHelpOutput)());
+        console.log('Nx Daemon is not running.');
     }
 }

package/dist/src/command-line/graph/graph.js

@@ -31,6 +31,7 @@ const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
 const task_hasher_1 = require("../../hasher/task-hasher");
 const find_matching_projects_1 = require("../../utils/find-matching-projects");
 const create_task_hasher_1 = require("../../hasher/create-task-hasher");
+const task_env_1 = require("../../tasks-runner/task-env");
 const error_types_1 = require("../../project-graph/error-types");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 // maps file extention to MIME types
@@ -942,7 +943,13 @@ async function createJsonOutput(prunedGraph, rawGraph, projects, targets) {
         const taskGraph = (0, create_task_graph_1.createTaskGraph)(rawGraph, {}, projects, targets, undefined, {});
         const hasher = (0, create_task_hasher_1.createTaskHasher)(rawGraph, (0, configuration_1.readNxJson)());
         let tasks = Object.values(taskGraph.tasks);
-        const hashes = await hasher.hashTasks(tasks, taskGraph);
+        // Match the runtime path: each task is hashed against its own env so
+        // the graph-view hash matches the hash used when the task actually runs.
+        const perTaskEnvs = {};
+        for (const task of tasks) {
+            perTaskEnvs[task.id] = (0, task_env_1.getTaskSpecificEnv)(task, rawGraph);
+        }
+        const hashes = await hasher.hashTasks(tasks, taskGraph, perTaskEnvs);
         response.tasks = taskGraph;
         response.taskPlans = tasks.reduce((acc, task, index) => {
             acc[task.id] = Object.keys(hashes[index].details.nodes).sort();

package/dist/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -17,7 +17,7 @@ async function addNxToMonorepo(options, guided = true) {
     let targetDefaults;
     let cacheableOperations;
     let scriptOutputs = {};
-    let useNxCloud;
+    let nxCloudChoice;
     if (options.interactive && scripts.length > 0 && guided) {
         output_1.output.log({
             title: '🧑‍🔧 Please answer the following questions about the scripts found in your workspace in order to generate task runner configuration',
@@ -55,27 +55,37 @@ async function addNxToMonorepo(options, guided = true) {
                 },
             ]))[scriptName];
         }
-        useNxCloud =
-            options.nxCloud ?? (await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)());
+        nxCloudChoice =
+            options.nxCloud === true
+                ? 'yes'
+                : options.nxCloud === false
+                    ? 'skip'
+                    : await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)();
     }
     else {
         targetDefaults = [];
         cacheableOperations = options.cacheable ?? [];
-        useNxCloud =
-            options.nxCloud ??
-                (options.interactive
-                    ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
-                    : false);
+        nxCloudChoice =
+            options.nxCloud === true
+                ? 'yes'
+                : options.nxCloud === false
+                    ? 'skip'
+                    : options.interactive
+                        ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+                        : 'skip';
     }
     (0, utils_1.createNxJsonFile)(repoRoot, targetDefaults, cacheableOperations, scriptOutputs);
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot);
-    if (useNxCloud) {
+    if (nxCloudChoice === 'yes') {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
         await (0, utils_1.initCloud)('nx-init-monorepo');
     }
+    else if (nxCloudChoice === 'never') {
+        (0, utils_1.setNeverConnectToCloud)(repoRoot);
+    }
 }
 // scanning package.json files
 function allProjectPackageJsonFiles(repoRoot) {

package/dist/src/command-line/init/implementation/add-nx-to-nest.js

@@ -41,7 +41,7 @@ async function addNxToNest(options, packageJson) {
     });
     let cacheableOperations;
     let scriptOutputs = {};
-    let useNxCloud;
+    let nxCloudChoice;
     if (options.interactive && scripts.length > 0) {
         output_1.output.log({
             title: '🧑‍🔧 Please answer the following questions about the scripts found in your package.json in order to generate task runner configuration',
@@ -67,16 +67,23 @@ async function addNxToNest(options, packageJson) {
                 },
             ]))[scriptName];
         }
-        useNxCloud =
-            options.nxCloud ?? (await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)());
+        nxCloudChoice =
+            options.nxCloud === true
+                ? 'yes'
+                : options.nxCloud === false
+                    ? 'skip'
+                    : await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)();
     }
     else {
         cacheableOperations = options.cacheable ?? [];
-        useNxCloud =
-            options.nxCloud ??
-                (options.interactive
-                    ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
-                    : false);
+        nxCloudChoice =
+            options.nxCloud === true
+                ? 'yes'
+                : options.nxCloud === false
+                    ? 'skip'
+                    : options.interactive
+                        ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+                        : 'skip';
     }
     (0, utils_1.createNxJsonFile)(repoRoot, [], [...cacheableOperations, ...nestCacheableScripts], scriptOutputs);
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
@@ -92,10 +99,13 @@ async function addNxToNest(options, packageJson) {
     }
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot);
-    if (useNxCloud) {
+    if (nxCloudChoice === 'yes') {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
         await (0, utils_1.initCloud)('nx-init-nest');
     }
+    else if (nxCloudChoice === 'never') {
+        (0, utils_1.setNeverConnectToCloud)(repoRoot);
+    }
 }
 function addNestPluginToPackageJson(repoRoot) {
     const path = (0, path_1.join)(repoRoot, `package.json`);

package/dist/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -14,7 +14,7 @@ async function addNxToNpmRepo(options, guided = true) {
     output_1.output.log({ title: '🐳 Nx initialization' });
     let cacheableOperations;
     let scriptOutputs = {};
-    let useNxCloud;
+    let nxCloudChoice;
     const packageJson = (0, fileutils_1.readJsonFile)('package.json');
     const scripts = Object.keys(packageJson.scripts ?? {}).filter((s) => !s.startsWith('pre') && !s.startsWith('post'));
     if (options.interactive && scripts.length > 0 && guided) {
@@ -43,16 +43,23 @@ async function addNxToNpmRepo(options, guided = true) {
                 },
             ]))[scriptName];
         }
-        useNxCloud =
-            options.nxCloud ?? (await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)());
+        nxCloudChoice =
+            options.nxCloud === true
+                ? 'yes'
+                : options.nxCloud === false
+                    ? 'skip'
+                    : await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)();
     }
     else {
         cacheableOperations = options.cacheable ?? [];
-        useNxCloud =
-            options.nxCloud ??
-                (options.interactive
-                    ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
-                    : false);
+        nxCloudChoice =
+            options.nxCloud === true
+                ? 'yes'
+                : options.nxCloud === false
+                    ? 'skip'
+                    : options.interactive
+                        ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+                        : 'skip';
     }
     (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, scriptOutputs);
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
@@ -66,8 +73,11 @@ async function addNxToNpmRepo(options, guided = true) {
     }
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot, pmc);
-    if (useNxCloud) {
+    if (nxCloudChoice === 'yes') {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
         await (0, utils_1.initCloud)('nx-init-npm-repo');
     }
+    else if (nxCloudChoice === 'never') {
+        (0, utils_1.setNeverConnectToCloud)(repoRoot);
+    }
 }

package/dist/src/command-line/init/implementation/angular/index.js

@@ -37,16 +37,24 @@ async function addNxToAngularCliRepo(options) {
     const cacheableOperations = !options.integrated
         ? await collectCacheableOperations(options)
         : [];
-    const useNxCloud = options.nxCloud ??
-        (options.interactive ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)() : false);
+    const nxCloudChoice = options.nxCloud === true
+        ? 'yes'
+        : options.nxCloud === false
+            ? 'skip'
+            : options.interactive
+                ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+                : 'skip';
     output_1.output.log({ title: '📦 Installing dependencies' });
     installDependencies();
     output_1.output.log({ title: '📝 Setting up workspace' });
     await setupWorkspace(cacheableOperations, options.integrated);
-    if (useNxCloud) {
+    if (nxCloudChoice === 'yes') {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
         await (0, utils_1.initCloud)('nx-init-angular');
     }
+    else if (nxCloudChoice === 'never') {
+        (0, utils_1.setNeverConnectToCloud)(repoRoot);
+    }
 }
 async function collectCacheableOperations(options) {
     let cacheableOperations;

package/dist/src/command-line/init/implementation/angular/legacy-angular-versions.js

@@ -90,10 +90,13 @@ async function getLegacyMigrationFunctionIfApplicable(repoRoot, options) {
     }
     return async () => {
         output_1.output.log({ title: '🐳 Nx initialization' });
-        const useNxCloud = options.nxCloud ??
-            (options.interactive
-                ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
-                : false);
+        const nxCloudChoice = options.nxCloud === true
+            ? 'yes'
+            : options.nxCloud === false
+                ? 'skip'
+                : options.interactive
+                    ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+                    : 'skip';
         output_1.output.log({ title: '📦 Installing dependencies' });
         const pmc = (0, package_manager_1.getPackageManagerCommand)();
         await installDependencies(repoRoot, {
@@ -107,10 +110,13 @@ async function getLegacyMigrationFunctionIfApplicable(repoRoot, options) {
             stdio: [0, 1, 2],
             windowsHide: true,
         });
-        if (useNxCloud) {
+        if (nxCloudChoice === 'yes') {
             output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
             await (0, utils_1.initCloud)('nx-init-angular');
         }
+        else if (nxCloudChoice === 'never') {
+            (0, utils_1.setNeverConnectToCloud)(repoRoot);
+        }
     };
 }
 async function installDependencies(repoRoot, pkgInfo, pmc) {

package/dist/src/command-line/init/implementation/utils.d.ts

@@ -9,6 +9,7 @@ export declare function addDepsToPackageJson(repoRoot: string, additionalPackage
 export declare function updateGitIgnore(root: string): void;
 export declare function runInstall(repoRoot: string, pmc?: PackageManagerCommands): void;
 export declare function initCloud(installationSource: 'nx-init' | 'nx-init-angular' | 'nx-init-monorepo' | 'nx-init-nest' | 'nx-init-npm-repo' | 'nx-init-turborepo'): Promise<void>;
+export declare function setNeverConnectToCloud(repoRoot: string): void;
 export declare function addVsCodeRecommendedExtensions(repoRoot: string, extensions: string[]): void;
 export declare function markRootPackageJsonAsNxProjectLegacy(repoRoot: string, cacheableScripts: string[], pmc: PackageManagerCommands): void;
 export declare function markPackageJsonAsNxProject(packageJsonPath: string): void;

package/dist/src/command-line/init/implementation/utils.js

@@ -6,6 +6,7 @@ exports.addDepsToPackageJson = addDepsToPackageJson;
 exports.updateGitIgnore = updateGitIgnore;
 exports.runInstall = runInstall;
 exports.initCloud = initCloud;
+exports.setNeverConnectToCloud = setNeverConnectToCloud;
 exports.addVsCodeRecommendedExtensions = addVsCodeRecommendedExtensions;
 exports.markRootPackageJsonAsNxProjectLegacy = markRootPackageJsonAsNxProjectLegacy;
 exports.markPackageJsonAsNxProject = markPackageJsonAsNxProject;
@@ -191,7 +192,7 @@ function updateGitIgnore(root) {
 }
 function runInstall(repoRoot, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
     (0, child_process_1.execSync)(pmc.install, {
-        stdio: [0, 1, 2],
+        stdio: ['ignore', 'ignore', 'inherit'],
         cwd: repoRoot,
         windowsHide: true,
     });
@@ -202,6 +203,12 @@ async function initCloud(installationSource) {
     });
     await (0, connect_to_nx_cloud_1.printSuccessMessage)(token, installationSource);
 }
+function setNeverConnectToCloud(repoRoot) {
+    const nxJsonPath = (0, path_1.join)(repoRoot, 'nx.json');
+    const nxJson = (0, fileutils_1.readJsonFile)(nxJsonPath);
+    nxJson.neverConnectToCloud = true;
+    (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+}
 function addVsCodeRecommendedExtensions(repoRoot, extensions) {
     const vsCodeExtensionsPath = (0, path_1.join)(repoRoot, '.vscode/extensions.json');
     if ((0, fileutils_1.fileExists)(vsCodeExtensionsPath)) {

package/dist/src/command-line/init/init-v2.js

@@ -4,6 +4,7 @@ exports.initHandler = initHandler;
 exports.getPluginReason = getPluginReason;
 exports.detectPlugins = detectPlugins;
 const fs_1 = require("fs");
+const path_1 = require("path");
 const enquirer_1 = require("enquirer");
 const semver_1 = require("semver");
 const nx_json_1 = require("../../config/nx-json");
@@ -102,6 +103,42 @@ async function initHandlerImpl(options) {
         });
         return;
     }
+    // When in an empty directory (no package.json) and the user hasn't explicitly
+    // chosen a setup method, prompt them to pick between .nx and package.json setup.
+    // Skip the prompt when stdin is not a TTY (e.g. CI, e2e tests) to avoid hangs.
+    if (!(0, fs_1.existsSync)('package.json') &&
+        !options.useDotNxInstallation &&
+        options.interactive &&
+        !aiMode &&
+        process.stdin.isTTY) {
+        const setupMode = await (0, enquirer_1.prompt)([
+            {
+                type: 'select',
+                name: 'setupMode',
+                message: 'How would you like to set up Nx in this directory?',
+                choices: [
+                    {
+                        name: '.nx installation (recommended for non-JavaScript projects)',
+                    },
+                    {
+                        name: 'package.json installation (recommended for JavaScript/TypeScript projects)',
+                    },
+                ],
+            },
+        ]).then((r) => r.setupMode);
+        if (setupMode.startsWith('package.json')) {
+            // Create a minimal package.json so the JS/TS workflow takes over
+            const workspaceName = (0, path_1.basename)(process.cwd());
+            (0, fileutils_1.writeJsonFile)('package.json', {
+                name: workspaceName,
+                version: '0.0.0',
+                private: true,
+            });
+        }
+        else {
+            options.useDotNxInstallation = true;
+        }
+    }
     const _isNonJs = !(0, fs_1.existsSync)('package.json') || options.useDotNxInstallation;
     const packageJson = _isNonJs
         ? null
@@ -251,22 +288,31 @@ async function initHandlerImpl(options) {
             results.errors.forEach((e) => output_1.output.error(e));
         }
     }
-    let useNxCloud = options.nxCloud;
-    if (useNxCloud === undefined) {
-        output_1.output.log({ title: '🛠️ Setting up Self-Healing CI and Remote Caching' });
-        useNxCloud = options.interactive
+    let nxCloudChoice;
+    if (options.nxCloud === true) {
+        nxCloudChoice = 'yes';
+    }
+    else if (options.nxCloud === false) {
+        nxCloudChoice = 'skip';
+    }
+    else {
+        nxCloudChoice = options.interactive
             ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
-            : false;
+            : 'skip';
     }
-    if (useNxCloud) {
+    if (nxCloudChoice === 'yes') {
         await (0, utils_1.initCloud)('nx-init');
     }
+    else if (nxCloudChoice === 'never') {
+        (0, utils_1.setNeverConnectToCloud)(repoRoot);
+    }
     await (0, ab_testing_1.recordStat)({
         command: 'init',
         nxVersion: version,
-        useCloud: !!useNxCloud,
+        useCloud: nxCloudChoice === 'yes',
         meta: {
             type: 'complete',
+            nxCloudArg: nxCloudChoice,
             nodeVersion: process.versions.node,
             os: process.platform,
             packageManager: (0, package_manager_2.detectPackageManager)(),

package/dist/src/command-line/migrate/migrate.js

@@ -949,6 +949,7 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
                 ['nx', '@nrwl/workspace'].includes(opts.targetPackage) &&
                 (await isMigratingToNewMajor(from, opts.targetVersion)) &&
                 !(0, is_ci_1.isCI)() &&
+                !(0, nx_cloud_utils_1.isNxCloudDisabled)(originalNxJson) &&
                 !(0, nx_cloud_utils_1.isNxCloudUsed)(originalNxJson)) {
                 output_1.output.success({
                     title: 'Connect to Nx Cloud',

package/dist/src/command-line/nx-cloud/connect/connect-to-nx-cloud.d.ts

@@ -1,7 +1,7 @@
 import { ConnectToNxCloudOptions } from '../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud';
 import { NxJsonConfiguration } from '../../../config/nx-json';
 import { NxArgs } from '../../../utils/command-line-utils';
-import { MessageKey } from '../../../utils/ab-testing';
+import { MessageKey, MessageOptionKey } from '../../../utils/ab-testing';
 export declare function onlyDefaultRunnerIsUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function connectToNxCloudIfExplicitlyAsked(opts: NxArgs): Promise<void>;
 export declare function connectWorkspaceToCloud(options: ConnectToNxCloudOptions, directory?: string): Promise<string>;
@@ -9,5 +9,5 @@ export declare function connectToNxCloudCommand(options: {
     generateToken?: boolean;
     checkRemote?: boolean;
 }, command?: string): Promise<boolean>;
-export declare function connectExistingRepoToNxCloudPrompt(command?: string, key?: MessageKey): Promise<boolean>;
+export declare function connectExistingRepoToNxCloudPrompt(command?: string, key?: MessageKey): Promise<MessageOptionKey>;
 export declare function connectToNxCloudWithPrompt(command: string): Promise<void>;

package/dist/src/command-line/nx-cloud/connect/connect-to-nx-cloud.js

@@ -7,6 +7,7 @@ exports.connectToNxCloudCommand = connectToNxCloudCommand;
 exports.connectExistingRepoToNxCloudPrompt = connectExistingRepoToNxCloudPrompt;
 exports.connectToNxCloudWithPrompt = connectToNxCloudWithPrompt;
 const tslib_1 = require("tslib");
+const path_1 = require("path");
 const handle_import_1 = require("../../../utils/handle-import");
 const output_1 = require("../../../utils/output");
 const configuration_1 = require("../../../config/configuration");
@@ -14,6 +15,7 @@ const tree_1 = require("../../../generators/tree");
 const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
 const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
 const nx_cloud_utils_1 = require("../../../utils/nx-cloud-utils");
+const fileutils_1 = require("../../../utils/fileutils");
 const child_process_1 = require("../../../utils/child-process");
 const ab_testing_1 = require("../../../utils/ab-testing");
 const versions_1 = require("../../../utils/versions");
@@ -124,14 +126,15 @@ function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function connectExistingRepoToNxCloudPrompt(command = 'init', key = 'setupNxCloud') {
-    const res = await nxCloudPrompt(key).then((value) => value === 'yes');
+    const res = await nxCloudPrompt(key);
     await (0, ab_testing_1.recordStat)({
         command,
         nxVersion: versions_1.nxVersion,
-        useCloud: res,
+        useCloud: res === 'yes',
         meta: {
             type: 'complete',
             setupCloudPrompt: ab_testing_1.messages.codeOfSelectedPromptMessage(key) || '',
+            nxCloudArg: res,
             nodeVersion: process.versions.node,
             os: process.platform,
             packageManager: (0, package_manager_1.detectPackageManager)(),
@@ -143,9 +146,18 @@ async function connectExistingRepoToNxCloudPrompt(command = 'init', key = 'setup
 }
 async function connectToNxCloudWithPrompt(command) {
     const setNxCloud = await nxCloudPrompt('setupNxCloud');
-    const useCloud = setNxCloud === 'yes'
-        ? await connectToNxCloudCommand({ generateToken: false }, command)
-        : false;
+    let useCloud = false;
+    if (setNxCloud === 'yes') {
+        useCloud = await connectToNxCloudCommand({ generateToken: false }, command);
+    }
+    else if (setNxCloud === 'never') {
+        const nxJsonPath = (0, path_1.join)(workspace_root_1.workspaceRoot, 'nx.json');
+        const nxJson = (0, configuration_1.readNxJson)();
+        if (nxJson) {
+            nxJson.neverConnectToCloud = true;
+            (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
+        }
+    }
     await (0, ab_testing_1.recordStat)({
         command,
         nxVersion: versions_1.nxVersion,
@@ -153,6 +165,7 @@ async function connectToNxCloudWithPrompt(command) {
         meta: {
             type: 'complete',
             setupCloudPrompt: ab_testing_1.messages.codeOfSelectedPromptMessage('setupNxCloud') || '',
+            nxCloudArg: setNxCloud,
             nodeVersion: process.versions.node,
             os: process.platform,
             packageManager: (0, package_manager_1.detectPackageManager)(),

package/dist/src/command-line/nx-cloud/connect/view-logs.js

@@ -19,7 +19,7 @@ async function viewLogs() {
         return 1;
     }
     const setupNxCloud = await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)('view-logs', 'setupViewLogs');
-    if (!setupNxCloud) {
+    if (setupNxCloud !== 'yes') {
         return;
     }
     try {

package/dist/src/command-line/show/command-object.js

@@ -154,7 +154,7 @@ const showTargetInfoCommand = {
         .example('$0 show target my-app:build -c production', 'Show target configuration with production configuration applied'),
     handler: async (args) => {
         const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
-            const { showTargetInfoHandler, showTargetInputsHandler, showTargetOutputsHandler, } = await (0, handle_import_1.handleImport)('./target.js', __dirname);
+            const { showTargetInfoHandler, showTargetInputsHandler, showTargetOutputsHandler, } = await (0, handle_import_1.handleImport)('./show-target/index.js', __dirname);
             if (args.subcommand === 'inputs') {
                 await showTargetInputsHandler(args);
                 return;
@@ -187,7 +187,7 @@ const showTargetInputsCommand = {
         .example('$0 show target inputs my-app:build --check src/main.ts', 'Check if src/main.ts is an input for my-app:build'),
     handler: async (args) => {
         const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
-            const { showTargetInputsHandler } = await (0, handle_import_1.handleImport)('./target.js', __dirname);
+            const { showTargetInputsHandler } = await (0, handle_import_1.handleImport)('./show-target/index.js', __dirname);
             await showTargetInputsHandler(args);
         });
         process.exit(process.exitCode || exitCode);
@@ -217,7 +217,7 @@ const showTargetOutputsCommand = {
         .example('$0 show target outputs my-app:build --check dist/my-app', 'Check if dist/my-app is an output of my-app:build'),
     handler: async (args) => {
         const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
-            const { showTargetOutputsHandler } = await (0, handle_import_1.handleImport)('./target.js', __dirname);
+            const { showTargetOutputsHandler } = await (0, handle_import_1.handleImport)('./show-target/index.js', __dirname);
             await showTargetOutputsHandler(args);
         });
         process.exit(process.exitCode || exitCode);