nx 19.6.0-canary.20240731-341f295 → 19.6.0-canary.20240803-bd7a2c9

package/src/devkit-internals.d.ts

@@ -8,7 +8,7 @@ export { getExecutorInformation } from './command-line/run/executor-utils';
 export { readNxJson as readNxJsonFromDisk } from './config/nx-json';
 export { calculateDefaultProjectName } from './config/calculate-default-project-name';
 export { retrieveProjectConfigurationsWithAngularProjects } from './project-graph/utils/retrieve-workspace-files';
-export { mergeTargetConfigurations } from './project-graph/utils/project-configuration-utils';
+export { mergeTargetConfigurations, findMatchingConfigFiles, } from './project-graph/utils/project-configuration-utils';
 export { readProjectConfigurationsFromRootMap } from './project-graph/utils/project-configuration-utils';
 export { splitTarget } from './utils/split-target';
 export { combineOptionsForExecutor } from './utils/params';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.readProjectConfigurationsFromRootMap = exports.findMatchingConfigFiles = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -19,6 +19,7 @@ var retrieve_workspace_files_1 = require("./project-graph/utils/retrieve-workspa
 Object.defineProperty(exports, "retrieveProjectConfigurationsWithAngularProjects", { enumerable: true, get: function () { return retrieve_workspace_files_1.retrieveProjectConfigurationsWithAngularProjects; } });
 var project_configuration_utils_1 = require("./project-graph/utils/project-configuration-utils");
 Object.defineProperty(exports, "mergeTargetConfigurations", { enumerable: true, get: function () { return project_configuration_utils_1.mergeTargetConfigurations; } });
+Object.defineProperty(exports, "findMatchingConfigFiles", { enumerable: true, get: function () { return project_configuration_utils_1.findMatchingConfigFiles; } });
 var project_configuration_utils_2 = require("./project-graph/utils/project-configuration-utils");
 Object.defineProperty(exports, "readProjectConfigurationsFromRootMap", { enumerable: true, get: function () { return project_configuration_utils_2.readProjectConfigurationsFromRootMap; } });
 var split_target_1 = require("./utils/split-target");

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.d.ts

@@ -1,4 +1,5 @@
 import { Tree } from '../../../generators/tree';
+import { NxJsonConfiguration } from '../../../config/nx-json';
 export declare function printSuccessMessage(token: string | undefined, installationSource: string, usesGithub: boolean): Promise<string>;
 export interface ConnectToNxCloudOptions {
     analytics?: boolean;
@@ -7,5 +8,5 @@ export interface ConnectToNxCloudOptions {
     github?: boolean;
     directory?: string;
 }
-export declare function connectToNxCloud(tree: Tree, schema: ConnectToNxCloudOptions): Promise<string>;
+export declare function connectToNxCloud(tree: Tree, schema: ConnectToNxCloudOptions, nxJson?: NxJsonConfiguration<string[] | "*">): Promise<string>;
 export default connectToNxCloud;

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -9,6 +9,7 @@ const nx_json_1 = require("../../../generators/utils/nx-json");
 const format_changed_files_with_prettier_if_available_1 = require("../../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const url_shorten_1 = require("../../utilities/url-shorten");
 const get_cloud_options_1 = require("../../utilities/get-cloud-options");
+const path_1 = require("path");
 function printCloudConnectionDisabledMessage() {
     output_1.output.error({
         title: `Connections to Nx Cloud are disabled for this workspace`,
@@ -68,20 +69,21 @@ async function printSuccessMessage(token, installationSource, usesGithub) {
     });
     return connectCloudUrl;
 }
-function addNxCloudOptionsToNxJson(tree, nxJson, token) {
-    nxJson ??= {
-        extends: 'nx/presets/npm.json',
-    };
-    nxJson.nxCloudAccessToken = token;
-    const overrideUrl = process.env.NX_CLOUD_API || process.env.NRWL_API;
-    if (overrideUrl) {
-        nxJson.nxCloudUrl = overrideUrl;
+function addNxCloudOptionsToNxJson(tree, token, directory = tree.root) {
+    const nxJsonPath = (0, path_1.join)(directory, 'nx.json');
+    if (tree.exists(nxJsonPath)) {
+        (0, json_1.updateJson)(tree, (0, path_1.join)(directory, 'nx.json'), (nxJson) => {
+            const overrideUrl = process.env.NX_CLOUD_API || process.env.NRWL_API;
+            if (overrideUrl) {
+                nxJson.nxCloudUrl = overrideUrl;
+            }
+            nxJson.nxCloudAccessToken = token;
+            return nxJson;
+        });
     }
-    (0, nx_json_1.updateNxJson)(tree, nxJson);
 }
-async function connectToNxCloud(tree, schema) {
+async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)(tree)) {
     schema.installationSource ??= 'user';
-    const nxJson = (0, nx_json_1.readNxJson)(tree);
     if (nxJson?.neverConnectToCloud) {
         printCloudConnectionDisabledMessage();
         return null;
@@ -93,7 +95,7 @@ async function connectToNxCloud(tree, schema) {
         // if user is using github and is running nx-connect
         if (!(usesGithub && schema.installationSource === 'nx-connect')) {
             responseFromCreateNxCloudWorkspace = await createNxCloudWorkspace(getRootPackageName(tree), schema.installationSource, getNxInitDate());
-            addNxCloudOptionsToNxJson(tree, nxJson, responseFromCreateNxCloudWorkspace?.token);
+            addNxCloudOptionsToNxJson(tree, responseFromCreateNxCloudWorkspace?.token, schema.directory);
             await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
                 silent: schema.hideFormatLogs,
             });

package/src/nx-cloud/utilities/get-cloud-options.d.ts

@@ -1,4 +1,4 @@
 import { CloudTaskRunnerOptions } from '../nx-cloud-tasks-runner-shell';
-export declare function getCloudOptions(): CloudTaskRunnerOptions;
+export declare function getCloudOptions(directory?: string): CloudTaskRunnerOptions;
 export declare function getCloudUrl(): string;
 export declare function removeTrailingSlash(apiUrl: string): string;

package/src/nx-cloud/utilities/get-cloud-options.js

@@ -5,8 +5,9 @@ exports.getCloudUrl = getCloudUrl;
 exports.removeTrailingSlash = removeTrailingSlash;
 const nx_json_1 = require("../../config/nx-json");
 const run_command_1 = require("../../tasks-runner/run-command");
-function getCloudOptions() {
-    const nxJson = (0, nx_json_1.readNxJson)();
+const workspace_root_1 = require("../../utils/workspace-root");
+function getCloudOptions(directory = workspace_root_1.workspaceRoot) {
+    const nxJson = (0, nx_json_1.readNxJson)(directory);
     // TODO: The default is not always cloud? But it's not handled at the moment
     return (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
 }

package/src/project-graph/utils/project-configuration-utils.d.ts

@@ -37,6 +37,7 @@ export type ConfigurationResult = {
  */
 export declare function createProjectConfigurations(root: string, nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
 plugins: LoadedNxPlugin[]): Promise<ConfigurationResult>;
+export declare function findMatchingConfigFiles(projectFiles: string[], pattern: string, include: string[], exclude: string[]): string[];
 export declare function readProjectConfigurationsFromRootMap(projectRootMap: Record<string, ProjectConfiguration>): Record<string, ProjectConfiguration>;
 export declare function validateProject(project: ProjectConfiguration, knownProjects: Record<string, ProjectConfiguration>): void;
 export declare function mergeTargetDefaultWithTargetDefinition(targetName: string, project: ProjectConfiguration, targetDefault: Partial<TargetConfiguration>, sourceMap: Record<string, SourceInformation>): TargetConfiguration;

package/src/project-graph/utils/project-configuration-utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeProjectConfigurationIntoRootMap = mergeProjectConfigurationIntoRootMap;
 exports.mergeMetadata = mergeMetadata;
 exports.createProjectConfigurations = createProjectConfigurations;
+exports.findMatchingConfigFiles = findMatchingConfigFiles;
 exports.readProjectConfigurationsFromRootMap = readProjectConfigurationsFromRootMap;
 exports.validateProject = validateProject;
 exports.mergeTargetDefaultWithTargetDefinition = mergeTargetDefaultWithTargetDefinition;

package/src/tasks-runner/cache.js

@@ -25,7 +25,7 @@ class Cache {
         if (shouldSpawnProcess) {
             const scriptPath = require.resolve('./remove-old-cache-records.js');
             try {
-                const p = (0, child_process_1.spawn)('node', [scriptPath, `"${this.cachePath}"`], {
+                const p = (0, child_process_1.spawn)('node', [scriptPath, `${this.cachePath}`], {
                     stdio: 'ignore',
                     detached: true,
                     shell: false,

package/src/utils/git-utils.js

@@ -8,7 +8,9 @@ const child_process_1 = require("child_process");
 const devkit_exports_1 = require("../devkit-exports");
 function getGithubSlugOrNull() {
     try {
-        const gitRemote = (0, child_process_1.execSync)('git remote -v').toString();
+        const gitRemote = (0, child_process_1.execSync)('git remote -v', {
+            stdio: 'pipe',
+        }).toString();
         // If there are no remotes, we default to github
         if (!gitRemote || gitRemote.length === 0) {
             return 'github';