nx 17.2.0-beta.10 → 17.2.0-beta.12

package/changelog-renderer/index.d.ts

@@ -1,5 +1,6 @@
 import type { GitCommit } from '../src/command-line/release/utils/git';
 import { RepoSlug } from '../src/command-line/release/utils/github';
+import type { ProjectGraph } from '../src/config/project-graph';
 /**
  * The ChangelogRenderOptions are specific to each ChangelogRenderer implementation, and are taken
  * from the user's nx.json configuration and passed as is into the ChangelogRenderer function.
@@ -10,6 +11,7 @@ export type ChangelogRenderOptions = Record<string, unknown>;
  * and returns a string, or a Promise of a string of changelog contents (usually markdown).
  *
  * @param {Object} config The configuration object for the ChangelogRenderer
+ * @param {ProjectGraph} config.projectGraph The project graph for the workspace
  * @param {GitCommit[]} config.commits The collection of extracted commits to generate a changelog for
  * @param {string} config.releaseVersion The version that is being released
  * @param {string | null} config.project The name of specific project to generate a changelog for, or `null` if the overall workspace changelog
@@ -17,6 +19,7 @@ export type ChangelogRenderOptions = Record<string, unknown>;
  * @param {ChangelogRenderOptions} config.changelogRenderOptions The options specific to the ChangelogRenderer implementation
  */
 export type ChangelogRenderer = (config: {
+    projectGraph: ProjectGraph;
     commits: GitCommit[];
     releaseVersion: string;
     project: string | null;

package/changelog-renderer/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const github_1 = require("../src/command-line/release/utils/github");
+const shared_1 = require("../src/command-line/release/utils/shared");
 // axios types and values don't seem to match
 const _axios = require("axios");
 const axios = _axios;
@@ -8,7 +9,7 @@ const axios = _axios;
  * The default ChangelogRenderer implementation that nx exports for the common case of generating markdown
  * from the given commits and other metadata.
  */
-const defaultChangelogRenderer = async ({ commits, releaseVersion, project, entryWhenNoChanges, changelogRenderOptions, repoSlug, }) => {
+const defaultChangelogRenderer = async ({ projectGraph, commits, releaseVersion, project, entryWhenNoChanges, changelogRenderOptions, repoSlug, }) => {
     const markdownLines = [];
     const breakingChanges = [];
     const commitTypes = {
@@ -64,18 +65,18 @@ const defaultChangelogRenderer = async ({ commits, releaseVersion, project, entr
     }
     else {
         // project level changelog
-        const scopeGroups = groupBy(commits, 'scope');
-        // Treat unscoped commits as "global", and therefore also relevant to include in the project level changelog
-        const unscopedCommits = scopeGroups[''] || [];
-        // Generating for a named project, but that project has no changes in the current set of commits, exit early
-        if (!scopeGroups[project] && unscopedCommits.length === 0) {
+        const relevantCommits = await (0, shared_1.getCommitsRelevantToProjects)(projectGraph, commits, [project]);
+        // Generating for a named project, but that project has no relevant changes in the current set of commits, exit early
+        if (relevantCommits.length === 0) {
             if (entryWhenNoChanges) {
                 markdownLines.push('', `## ${releaseVersion}\n\n${entryWhenNoChanges}`, '');
             }
             return markdownLines.join('\n').trim();
         }
         markdownLines.push('', `## ${releaseVersion}`, '');
-        const typeGroups = groupBy([...(scopeGroups[project] || []), ...unscopedCommits], 'type');
+        const typeGroups = groupBy(
+        // Sort the relevant commits to have the unscoped commits first, before grouping by type
+        relevantCommits.sort((a, b) => (b.scope ? 1 : 0) - (a.scope ? 1 : 0)), 'type');
         for (const type of Object.keys(commitTypes)) {
             const group = typeGroups[type];
             if (!group || group.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "17.2.0-beta.10",
+  "version": "17.2.0-beta.12",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs": "^17.6.2",
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
-    "@nrwl/tao": "17.2.0-beta.10"
+    "@nrwl/tao": "17.2.0-beta.12"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "17.2.0-beta.10",
-    "@nx/nx-darwin-arm64": "17.2.0-beta.10",
-    "@nx/nx-linux-x64-gnu": "17.2.0-beta.10",
-    "@nx/nx-linux-x64-musl": "17.2.0-beta.10",
-    "@nx/nx-win32-x64-msvc": "17.2.0-beta.10",
-    "@nx/nx-linux-arm64-gnu": "17.2.0-beta.10",
-    "@nx/nx-linux-arm64-musl": "17.2.0-beta.10",
-    "@nx/nx-linux-arm-gnueabihf": "17.2.0-beta.10",
-    "@nx/nx-win32-arm64-msvc": "17.2.0-beta.10",
-    "@nx/nx-freebsd-x64": "17.2.0-beta.10"
+    "@nx/nx-darwin-x64": "17.2.0-beta.12",
+    "@nx/nx-darwin-arm64": "17.2.0-beta.12",
+    "@nx/nx-linux-x64-gnu": "17.2.0-beta.12",
+    "@nx/nx-linux-x64-musl": "17.2.0-beta.12",
+    "@nx/nx-win32-x64-msvc": "17.2.0-beta.12",
+    "@nx/nx-linux-arm64-gnu": "17.2.0-beta.12",
+    "@nx/nx-linux-arm64-musl": "17.2.0-beta.12",
+    "@nx/nx-linux-arm-gnueabihf": "17.2.0-beta.12",
+    "@nx/nx-win32-arm64-msvc": "17.2.0-beta.12",
+    "@nx/nx-freebsd-x64": "17.2.0-beta.12"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -146,8 +146,7 @@
                     "$ref": "#/definitions/NxReleaseChangelogConfiguration"
                   },
                   {
-                    "type": "boolean",
-                    "enum": [false]
+                    "type": "boolean"
                   }
                 ]
               },
@@ -167,8 +166,7 @@
                   "$ref": "#/definitions/NxReleaseChangelogConfiguration"
                 },
                 {
-                  "type": "boolean",
-                  "enum": [false]
+                  "type": "boolean"
                 }
               ]
             },
@@ -178,8 +176,7 @@
                   "$ref": "#/definitions/NxReleaseChangelogConfiguration"
                 },
                 {
-                  "type": "boolean",
-                  "enum": [false]
+                  "type": "boolean"
                 }
               ]
             }

package/src/adapter/ngcli-adapter.js

@@ -22,9 +22,12 @@ const executor_utils_1 = require("../command-line/run/executor-utils");
 const nx_plugin_1 = require("../utils/nx-plugin");
 const schema_utils_1 = require("../config/schema-utils");
 async function createBuilderContext(builderInfo, context) {
-    require('nx/src/adapter/compat');
+    require('./compat');
     const fsHost = new NxScopedHost(context.root);
-    const { workspace } = await core_1.workspaces.readWorkspace('angular.json', core_1.workspaces.createWorkspaceHost(fsHost));
+    // the top level import is not patched because it is imported before the
+    // patching happens so we require it here to use the patched version below
+    const { workspaces } = require('@angular-devkit/core');
+    const { workspace } = await workspaces.readWorkspace('angular.json', workspaces.createWorkspaceHost(fsHost));
     const architectHost = await getWrappedWorkspaceNodeModulesArchitectHost(workspace, context.root, context.projectsConfigurations.projects);
     const registry = new core_1.schema.CoreSchemaRegistry();
     registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
@@ -41,6 +44,28 @@ async function createBuilderContext(builderInfo, context) {
         options,
     ]).output);
     const getProjectMetadata = (target) => toPromise(architect['_scheduler'].schedule('..getProjectMetadata', target).output);
+    const getBuilderNameForTarget = (target) => {
+        if (typeof target === 'string') {
+            return Promise.resolve(context.projectGraph.nodes[context.projectName].data.targets[target]
+                .executor);
+        }
+        return Promise.resolve(context.projectGraph.nodes[target.project].data.targets[target.target]
+            .executor);
+    };
+    const getTargetOptions = (target) => {
+        if (typeof target === 'string') {
+            return Promise.resolve({
+                ...context.projectGraph.nodes[context.projectName].data.targets[target]
+                    .options,
+            });
+        }
+        return Promise.resolve({
+            ...context.projectGraph.nodes[target.project].data.targets[target.target]
+                .options,
+            ...context.projectGraph.nodes[target.project].data.targets[target.target]
+                .configurations[target.configuration],
+        });
+    };
     const builderContext = {
         workspaceRoot: context.root,
         target: {
@@ -55,9 +80,7 @@ async function createBuilderContext(builderInfo, context) {
         id: 1,
         currentDirectory: process.cwd(),
         scheduleTarget: architect.scheduleTarget,
-        getBuilderNameForTarget: architectHost.getBuilderNameForTarget,
         scheduleBuilder: architect.scheduleBuilder,
-        getTargetOptions: architectHost.getOptionsForTarget,
         addTeardown(teardown) {
             // No-op as Nx doesn't require an implementation of this function
             return;
@@ -74,8 +97,10 @@ async function createBuilderContext(builderInfo, context) {
             // No-op as Nx doesn't require an implementation of this function
             return;
         },
+        getBuilderNameForTarget,
         getProjectMetadata,
         validateOptions,
+        getTargetOptions,
     };
     return builderContext;
 }

package/src/command-line/release/changelog.js

@@ -100,14 +100,14 @@ async function releaseChangelog(args) {
         : [];
     (0, shared_1.handleDuplicateGitTags)(gitTagValues);
     const postGitTasks = [];
-    await generateChangelogForWorkspace(tree, args, nxReleaseConfig, workspaceChangelogVersion, commits, postGitTasks);
+    await generateChangelogForWorkspace(tree, args, projectGraph, nxReleaseConfig, workspaceChangelogVersion, commits, postGitTasks);
     if (args.projects?.length) {
         /**
          * Run changelog generation for all remaining release groups and filtered projects within them
          */
         for (const releaseGroup of releaseGroups) {
             const projectNodes = Array.from(releaseGroupToFilteredProjects.get(releaseGroup)).map((name) => projectGraph.nodes[name]);
-            await generateChangelogForProjects(tree, args, commits, projectsVersionData, postGitTasks, releaseGroup, projectNodes);
+            await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, projectNodes);
         }
         return await applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTasks, commitMessageValues, gitTagValues);
     }
@@ -116,7 +116,7 @@ async function releaseChangelog(args) {
      */
     for (const releaseGroup of releaseGroups) {
         const projectNodes = releaseGroup.projects.map((name) => projectGraph.nodes[name]);
-        await generateChangelogForProjects(tree, args, commits, projectsVersionData, postGitTasks, releaseGroup, projectNodes);
+        await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, projectNodes);
     }
     return await applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTasks, commitMessageValues, gitTagValues);
 }
@@ -220,7 +220,7 @@ function resolveChangelogRenderer(changelogRendererPath) {
     }
     return changelogRenderer;
 }
-async function generateChangelogForWorkspace(tree, args, nxReleaseConfig, workspaceChangelogVersion, commits, postGitTasks) {
+async function generateChangelogForWorkspace(tree, args, projectGraph, nxReleaseConfig, workspaceChangelogVersion, commits, postGitTasks) {
     const config = nxReleaseConfig.changelog.workspaceChangelog;
     // The entire feature is disabled at the workspace level, exit early
     if (config === false) {
@@ -250,17 +250,17 @@ async function generateChangelogForWorkspace(tree, args, nxReleaseConfig, worksp
         version: workspaceChangelogVersion,
         releaseTagPattern: nxReleaseConfig.releaseTagPattern,
     });
-    // We are either creating/previewing a changelog file, a Github release, or both
+    // We are either creating/previewing a changelog file, a GitHub release, or both
     let logTitle = dryRun ? 'Previewing a' : 'Generating a';
     switch (true) {
         case interpolatedTreePath && config.createRelease === 'github':
-            logTitle += ` Github release and an entry in ${interpolatedTreePath} for ${chalk.white(releaseVersion.gitTag)}`;
+            logTitle += ` GitHub release and an entry in ${interpolatedTreePath} for ${chalk.white(releaseVersion.gitTag)}`;
             break;
         case !!interpolatedTreePath:
             logTitle += `n entry in ${interpolatedTreePath} for ${chalk.white(releaseVersion.gitTag)}`;
             break;
         case config.createRelease === 'github':
-            logTitle += ` Github release for ${chalk.white(releaseVersion.gitTag)}`;
+            logTitle += ` GitHub release for ${chalk.white(releaseVersion.gitTag)}`;
     }
     output_1.output.log({
         title: logTitle,
@@ -269,6 +269,7 @@ async function generateChangelogForWorkspace(tree, args, nxReleaseConfig, worksp
         ? (0, github_1.getGitHubRepoSlug)(gitRemote)
         : undefined;
     let contents = await changelogRenderer({
+        projectGraph,
         commits,
         releaseVersion: releaseVersion.rawVersion,
         project: null,
@@ -291,7 +292,7 @@ async function generateChangelogForWorkspace(tree, args, nxReleaseConfig, worksp
     }
     /**
      * The exact logic we use for printing the summary/diff to the user is dependent upon whether they are creating
-     * a changelog file, a Github release, or both.
+     * a changelog file, a GitHub release, or both.
      */
     let printSummary = () => { };
     const noDiffInChangelogMessage = chalk.yellow(`NOTE: There was no diff detected for the changelog entry. Maybe you intended to pass alternative git references via --from and --to?`);
@@ -321,9 +322,9 @@ async function generateChangelogForWorkspace(tree, args, nxReleaseConfig, worksp
     if (config.createRelease === 'github') {
         if (!githubRepoSlug) {
             output_1.output.error({
-                title: `Unable to create a Github release because the Github repo slug could not be determined.`,
+                title: `Unable to create a GitHub release because the GitHub repo slug could not be determined.`,
                 bodyLines: [
-                    `Please ensure you have a valid Github remote configured. You can run \`git remote -v\` to list your current remotes.`,
+                    `Please ensure you have a valid GitHub remote configured. You can run \`git remote -v\` to list your current remotes.`,
                 ],
             });
             process.exit(1);
@@ -340,9 +341,9 @@ async function generateChangelogForWorkspace(tree, args, nxReleaseConfig, worksp
         catch (err) {
             if (err.response?.status === 401) {
                 output_1.output.error({
-                    title: `Unable to resolve data via the Github API. You can use any of the following options to resolve this:`,
+                    title: `Unable to resolve data via the GitHub API. You can use any of the following options to resolve this:`,
                     bodyLines: [
-                        '- Set the `GITHUB_TOKEN` or `GH_TOKEN` environment variable to a valid Github token with `repo` scope',
+                        '- Set the `GITHUB_TOKEN` or `GH_TOKEN` environment variable to a valid GitHub token with `repo` scope',
                         '- Have an active session via the official gh CLI tool (https://cli.github.com) in your current terminal',
                     ],
                 });
@@ -390,7 +391,7 @@ async function generateChangelogForWorkspace(tree, args, nxReleaseConfig, worksp
     }
     printSummary();
 }
-async function generateChangelogForProjects(tree, args, commits, projectsVersionData, postGitTasks, releaseGroup, projects) {
+async function generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, projects) {
     const config = releaseGroup.changelog;
     // The entire feature is disabled at the release group level, exit early
     if (config === false) {
@@ -422,17 +423,17 @@ async function generateChangelogForProjects(tree, args, commits, projectsVersion
             releaseTagPattern: releaseGroup.releaseTagPattern,
             projectName: project.name,
         });
-        // We are either creating/previewing a changelog file, a Github release, or both
+        // We are either creating/previewing a changelog file, a GitHub release, or both
         let logTitle = dryRun ? 'Previewing a' : 'Generating a';
         switch (true) {
             case interpolatedTreePath && config.createRelease === 'github':
-                logTitle += ` Github release and an entry in ${interpolatedTreePath} for ${chalk.white(releaseVersion.gitTag)}`;
+                logTitle += ` GitHub release and an entry in ${interpolatedTreePath} for ${chalk.white(releaseVersion.gitTag)}`;
                 break;
             case !!interpolatedTreePath:
                 logTitle += `n entry in ${interpolatedTreePath} for ${chalk.white(releaseVersion.gitTag)}`;
                 break;
             case config.createRelease === 'github':
-                logTitle += ` Github release for ${chalk.white(releaseVersion.gitTag)}`;
+                logTitle += ` GitHub release for ${chalk.white(releaseVersion.gitTag)}`;
         }
         output_1.output.log({
             title: logTitle,
@@ -441,6 +442,7 @@ async function generateChangelogForProjects(tree, args, commits, projectsVersion
             ? (0, github_1.getGitHubRepoSlug)(gitRemote)
             : undefined;
         let contents = await changelogRenderer({
+            projectGraph,
             commits,
             releaseVersion: releaseVersion.rawVersion,
             project: project.name,
@@ -469,7 +471,7 @@ async function generateChangelogForProjects(tree, args, commits, projectsVersion
         }
         /**
          * The exact logic we use for printing the summary/diff to the user is dependent upon whether they are creating
-         * a changelog file, a Github release, or both.
+         * a changelog file, a GitHub release, or both.
          */
         let printSummary = () => { };
         const noDiffInChangelogMessage = chalk.yellow(`NOTE: There was no diff detected for the changelog entry. Maybe you intended to pass alternative git references via --from and --to?`);
@@ -501,9 +503,9 @@ async function generateChangelogForProjects(tree, args, commits, projectsVersion
         if (config.createRelease === 'github') {
             if (!githubRepoSlug) {
                 output_1.output.error({
-                    title: `Unable to create a Github release because the Github repo slug could not be determined.`,
+                    title: `Unable to create a GitHub release because the GitHub repo slug could not be determined.`,
                     bodyLines: [
-                        `Please ensure you have a valid Github remote configured. You can run \`git remote -v\` to list your current remotes.`,
+                        `Please ensure you have a valid GitHub remote configured. You can run \`git remote -v\` to list your current remotes.`,
                     ],
                 });
                 process.exit(1);
@@ -520,9 +522,9 @@ async function generateChangelogForProjects(tree, args, commits, projectsVersion
             catch (err) {
                 if (err.response?.status === 401) {
                     output_1.output.error({
-                        title: `Unable to resolve data via the Github API. You can use any of the following options to resolve this:`,
+                        title: `Unable to resolve data via the GitHub API. You can use any of the following options to resolve this:`,
                         bodyLines: [
-                            '- Set the `GITHUB_TOKEN` or `GH_TOKEN` environment variable to a valid Github token with `repo` scope',
+                            '- Set the `GITHUB_TOKEN` or `GH_TOKEN` environment variable to a valid GitHub token with `repo` scope',
                             '- Have an active session via the official gh CLI tool (https://cli.github.com) in your current terminal',
                         ],
                     });

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

@@ -94,7 +94,20 @@ async function resolveGithubToken() {
         const yamlContents = await node_fs_1.promises.readFile(ghCLIPath, 'utf8');
         const { load } = require('@zkochan/js-yaml');
         const ghCLIConfig = load(yamlContents);
-        return ghCLIConfig['github.com'].oauth_token;
+        if (ghCLIConfig['github.com']) {
+            // Web based session (the token is already embedded in the config)
+            if (ghCLIConfig['github.com'].oauth_token) {
+                return ghCLIConfig['github.com'].oauth_token;
+            }
+            // SSH based session (we need to dynamically resolve a token using the CLI)
+            if (ghCLIConfig['github.com'].user &&
+                ghCLIConfig['github.com'].git_protocol === 'ssh') {
+                return (0, node_child_process_1.execSync)(`gh auth token`, {
+                    encoding: 'utf8',
+                    stdio: 'pipe',
+                }).trim();
+            }
+        }
     }
     return null;
 }

package/src/command-line/release/utils/resolve-semver-specifier.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveSemverSpecifierFromPrompt = exports.resolveSemverSpecifierFromConventionalCommits = void 0;
 const enquirer_1 = require("enquirer");
 const semver_1 = require("semver");
-const file_map_utils_1 = require("../../../project-graph/file-map-utils");
 const git_1 = require("./git");
 const semver_2 = require("./semver");
+const shared_1 = require("./shared");
 // TODO: Extract config to nx.json configuration when adding changelog customization
 const CONVENTIONAL_COMMITS_CONFIG = {
     types: {
@@ -20,16 +20,7 @@ const CONVENTIONAL_COMMITS_CONFIG = {
 async function resolveSemverSpecifierFromConventionalCommits(from, projectGraph, projectNames) {
     const commits = await (0, git_1.getGitDiff)(from);
     const parsedCommits = (0, git_1.parseCommits)(commits);
-    const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
-    const filesInReleaseGroup = new Set(projectNames.reduce((files, p) => [...files, ...fileMap.projectFileMap[p].map((f) => f.file)], []));
-    /**
-     * The relevant commits are those that either:
-     * - touch project files which are contained within the release group directly
-     * - touch non-project files and the commit is not scoped
-     */
-    const relevantCommits = parsedCommits.filter((c) => c.affectedFiles.some((f) => filesInReleaseGroup.has(f) ||
-        (!c.scope &&
-            fileMap.nonProjectFiles.some((nonProjectFile) => nonProjectFile.file === f))));
+    const relevantCommits = await (0, shared_1.getCommitsRelevantToProjects)(projectGraph, parsedCommits, projectNames);
     return (0, semver_2.determineSemverChange)(relevantCommits, CONVENTIONAL_COMMITS_CONFIG);
 }
 exports.resolveSemverSpecifierFromConventionalCommits = resolveSemverSpecifierFromConventionalCommits;

package/src/command-line/release/utils/shared.d.ts

@@ -1,4 +1,6 @@
+import { ProjectGraph } from '../../../config/project-graph';
 import type { ReleaseGroupWithName } from '../config/filter-release-groups';
+import { GitCommit } from './git';
 export type VersionData = Record<string, {
     newVersion: string;
     currentVersion: string;
@@ -20,3 +22,4 @@ export declare function commitChanges(changedFiles: string[], isDryRun: boolean,
 export declare function createCommitMessageValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData, userCommitMessage?: string): string[];
 export declare function createGitTagValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData): string[];
 export declare function handleDuplicateGitTags(gitTagValues: string[]): void;
+export declare function getCommitsRelevantToProjects(projectGraph: ProjectGraph, commits: GitCommit[], projects: string[]): Promise<GitCommit[]>;

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleDuplicateGitTags = exports.createGitTagValues = exports.createCommitMessageValues = exports.commitChanges = exports.ReleaseVersion = void 0;
+exports.getCommitsRelevantToProjects = exports.handleDuplicateGitTags = exports.createGitTagValues = exports.createCommitMessageValues = exports.commitChanges = exports.ReleaseVersion = void 0;
 const semver_1 = require("semver");
+const file_map_utils_1 = require("../../../project-graph/file-map-utils");
 const utils_1 = require("../../../tasks-runner/utils");
 const output_1 = require("../../../utils/output");
 const git_1 = require("./git");
@@ -156,3 +157,16 @@ function handleDuplicateGitTags(gitTagValues) {
     }
 }
 exports.handleDuplicateGitTags = handleDuplicateGitTags;
+async function getCommitsRelevantToProjects(projectGraph, commits, projects) {
+    const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
+    const filesInReleaseGroup = new Set(projects.reduce((files, p) => [...files, ...fileMap.projectFileMap[p].map((f) => f.file)], []));
+    /**
+     * The relevant commits are those that either:
+     * - touch project files which are contained within the list of projects directly
+     * - touch non-project files and the commit is not scoped
+     */
+    return commits.filter((c) => c.affectedFiles.some((f) => filesInReleaseGroup.has(f) ||
+        (!c.scope &&
+            fileMap.nonProjectFiles.some((nonProjectFile) => nonProjectFile.file === f))));
+}
+exports.getCommitsRelevantToProjects = getCommitsRelevantToProjects;

package/src/executors/run-commands/run-commands.impl.d.ts

@@ -38,4 +38,4 @@ export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
 export default function (options: RunCommandsOptions, context: ExecutorContext): Promise<{
     success: boolean;
 }>;
-export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'parsedArgs' | '__unparsed__'>, forwardAllArgs: boolean): string;
+export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'args' | 'parsedArgs' | '__unparsed__'>, forwardAllArgs: boolean): string;

package/src/executors/run-commands/run-commands.impl.js

@@ -185,7 +185,7 @@ function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
         return command.replace(regex, (_, group) => opts.parsedArgs[group] !== undefined ? opts.parsedArgs[group] : '');
     }
     else if (forwardAllArgs) {
-        return `${command}${opts.__unparsed__.length > 0 ? ' ' + opts.__unparsed__.join(' ') : ''}`;
+        return `${command}${opts.args ? ' ' + opts.args : ''}${opts.__unparsed__.length > 0 ? ' ' + opts.__unparsed__.join(' ') : ''}`;
     }
     else {
         return command;

package/src/native/index.d.ts

@@ -169,7 +169,7 @@ export class Watcher {
 }
 export class WorkspaceContext {
   workspaceRoot: string
-  constructor(workspaceRoot: string)
+  constructor(workspaceRoot: string, cacheDir: string)
   getWorkspaceFiles(projectRootMap: Record<string, string>): NxWorkspaceFiles
   glob(globs: Array<string>, exclude?: Array<string> | undefined | null): Array<string>
   hashFilesMatchingGlob(globs: Array<string>, exclude?: Array<string> | undefined | null): string

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

@@ -68,10 +68,16 @@ function readProjectsConfigurationFromProjectGraph(projectGraph) {
 exports.readProjectsConfigurationFromProjectGraph = readProjectsConfigurationFromProjectGraph;
 async function buildProjectGraphWithoutDaemon() {
     const nxJson = (0, nx_json_1.readNxJson)();
+    perf_hooks_1.performance.mark('retrieve-project-configurations:start');
     const { projects, externalNodes, sourceMaps, projectRootMap } = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
+    perf_hooks_1.performance.mark('retrieve-project-configurations:end');
+    perf_hooks_1.performance.mark('retrieve-workspace-files:start');
     const { allWorkspaceFiles, fileMap, rustReferences } = await (0, retrieve_workspace_files_1.retrieveWorkspaceFiles)(workspace_root_1.workspaceRoot, projectRootMap);
+    perf_hooks_1.performance.mark('retrieve-workspace-files:end');
     const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
+    perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:start');
     const projectGraph = (await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, cacheEnabled ? (0, nx_deps_cache_1.readFileMapCache)() : null, cacheEnabled)).projectGraph;
+    perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:end');
     (0, source_maps_1.writeSourceMaps)(sourceMaps);
     (0, nx_plugin_1.unregisterPluginTSTranspiler)();
     return projectGraph;
@@ -122,6 +128,9 @@ async function createProjectGraphAsync(opts = {
     if (!client_1.daemonClient.enabled()) {
         try {
             const res = await buildProjectGraphWithoutDaemon();
+            perf_hooks_1.performance.measure('create-project-graph-async >> retrieve-project-configurations', 'retrieve-project-configurations:start', 'retrieve-project-configurations:end');
+            perf_hooks_1.performance.measure('create-project-graph-async >> retrieve-workspace-files', 'retrieve-workspace-files:start', 'retrieve-workspace-files:end');
+            perf_hooks_1.performance.measure('create-project-graph-async >> build-project-graph-using-project-file-map', 'build-project-graph-using-project-file-map:start', 'build-project-graph-using-project-file-map:end');
             perf_hooks_1.performance.mark('create-project-graph-async:end');
             perf_hooks_1.performance.measure('create-project-graph-async', 'create-project-graph-async:start', 'create-project-graph-async:end');
             return res;

package/src/utils/cache-directory.d.ts

@@ -2,4 +2,5 @@
  * Path to the directory where Nx stores its cache and daemon-related files.
  */
 export declare const cacheDir: string;
+export declare function cacheDirectoryForWorkspace(workspaceRoot: string): string;
 export declare const projectGraphCacheDirectory: string;

package/src/utils/cache-directory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectGraphCacheDirectory = exports.cacheDir = void 0;
+exports.projectGraphCacheDirectory = exports.cacheDirectoryForWorkspace = exports.cacheDir = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fileutils_1 = require("./fileutils");
@@ -52,5 +52,9 @@ function defaultCacheDirectory(root) {
  * Path to the directory where Nx stores its cache and daemon-related files.
  */
 exports.cacheDir = cacheDirectory(workspace_root_1.workspaceRoot, readCacheDirectoryProperty(workspace_root_1.workspaceRoot));
+function cacheDirectoryForWorkspace(workspaceRoot) {
+    return cacheDirectory(workspaceRoot, readCacheDirectoryProperty(workspaceRoot));
+}
+exports.cacheDirectoryForWorkspace = cacheDirectoryForWorkspace;
 exports.projectGraphCacheDirectory = absolutePath(workspace_root_1.workspaceRoot, process.env.NX_PROJECT_GRAPH_CACHE_DIRECTORY ??
     defaultCacheDirectory(workspace_root_1.workspaceRoot));

package/src/utils/workspace-context.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetWorkspaceContext = exports.updateProjectFiles = exports.getAllFileDataInContext = exports.updateFilesInContext = exports.hashWithWorkspaceContext = exports.globWithWorkspaceContext = exports.getNxWorkspaceFilesFromContext = exports.setupWorkspaceContext = void 0;
 const perf_hooks_1 = require("perf_hooks");
+const cache_directory_1 = require("./cache-directory");
 let workspaceContext;
 function setupWorkspaceContext(workspaceRoot) {
     const { WorkspaceContext } = require('../native');
     perf_hooks_1.performance.mark('workspace-context');
-    workspaceContext = new WorkspaceContext(workspaceRoot);
+    workspaceContext = new WorkspaceContext(workspaceRoot, (0, cache_directory_1.cacheDirectoryForWorkspace)(workspaceRoot));
     perf_hooks_1.performance.mark('workspace-context:end');
     perf_hooks_1.performance.measure('workspace context init', 'workspace-context', 'workspace-context:end');
 }