nx 19.6.0-beta.1 → 19.6.0-beta.3

package/bin/post-install.js

@@ -53,3 +53,11 @@ function isMainNxPackage() {
     const thisNxPath = require.resolve('nx');
     return mainNxPath === thisNxPath;
 }
+process.on('uncaughtException', (e) => {
+    logger_1.logger.verbose(e);
+    process.exit(0);
+});
+process.on('unhandledRejection', (e) => {
+    logger_1.logger.verbose(e);
+    process.exit(0);
+});

package/package.json

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

package/schemas/nx-schema.json

@@ -186,8 +186,15 @@
                 "type": "string"
               },
               "versionPlans": {
-                "type": "boolean",
-                "description": "Enables using version plans as a specifier source for versioning and to determine changes for changelog generation."
+                "oneOf": [
+                  {
+                    "$ref": "#/definitions/NxReleaseVersionPlansConfiguration"
+                  },
+                  {
+                    "type": "boolean",
+                    "description": "Enables using version plans as a specifier source for versioning and to determine changes for changelog generation."
+                  }
+                ]
               }
             },
             "required": ["projects"]
@@ -239,13 +246,45 @@
           "$ref": "#/definitions/NxReleaseVersionConfiguration"
         },
         "versionPlans": {
-          "type": "boolean",
-          "description": "Enables using version plans as a specifier source for versioning and to determine changes for changelog generation."
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NxReleaseVersionPlansConfiguration"
+            },
+            {
+              "type": "boolean",
+              "description": "Enables using version plans as a specifier source for versioning and to determine changes for changelog generation."
+            }
+          ]
         },
         "releaseTagPattern": {
           "type": "string"
         }
       }
+    },
+    "sync": {
+      "type": "object",
+      "description": "Configuration for the `nx sync` command",
+      "properties": {
+        "globalGenerators": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of workspace-wide sync generators to be run (not attached to targets)"
+        },
+        "generatorOptions": {
+          "type": "object",
+          "description": "Options for the sync generators.",
+          "additionalProperties": {
+            "type": "object"
+          }
+        },
+        "applyChanges": {
+          "type": "boolean",
+          "description": "Whether to automatically apply sync generator changes when running tasks. If not set, the user will be prompted. If set to `true`, the user will not be prompted and the changes will be applied. If set to `false`, the user will not be prompted and the changes will not be applied."
+        }
+      },
+      "additionalProperties": false
     }
   },
   "definitions": {
@@ -673,6 +712,18 @@
         }
       }
     },
+    "NxReleaseVersionPlansConfiguration": {
+      "type": "object",
+      "properties": {
+        "ignorePatternsForPlanCheck": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Changes to files matching any of these optional patterns will be excluded from the affected project logic within the `nx release plan:check` command. This is useful for ignoring files that are not relevant to the versioning process, such as documentation or configuration files."
+        }
+      }
+    },
     "ChangelogRenderOptions": {
       "type": "object",
       "additionalProperties": true

package/schemas/project-schema.json

@@ -153,6 +153,13 @@
               }
             },
             "additionalProperties": true
+          },
+          "syncGenerators": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "List of generators to run before the target to ensure the workspace is up to date"
           }
         }
       }

package/src/adapter/compat.d.ts

@@ -1,2 +1,2 @@
 export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata"];
-export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud"];
+export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync"];

package/src/adapter/compat.js

@@ -62,6 +62,7 @@ exports.allowedWorkspaceExtensions = [
     'useDaemonProcess',
     'useInferencePlugins',
     'neverConnectToCloud',
+    'sync',
 ];
 if (!patched) {
     Module.prototype.require = function () {

package/src/command-line/nx-commands.js

@@ -24,6 +24,7 @@ const command_object_18 = require("./reset/command-object");
 const command_object_19 = require("./release/command-object");
 const command_object_20 = require("./add/command-object");
 const command_objects_1 = require("./deprecated/command-objects");
+const command_object_21 = require("./sync/command-object");
 // Ensure that the output takes up the available width of the terminal.
 yargs.wrap(yargs.terminalWidth());
 exports.parserConfiguration = {
@@ -67,6 +68,8 @@ exports.commandsObject = yargs
     .command(command_object_14.yargsRunCommand)
     .command(command_object_15.yargsRunManyCommand)
     .command(command_object_16.yargsShowCommand)
+    .command(command_object_21.yargsSyncCommand)
+    .command(command_object_21.yargsSyncCheckCommand)
     .command(command_object_2.yargsViewLogsCommand)
     .command(command_object_17.yargsWatchCommand)
     .command(command_object_14.yargsNxInfixCommand)

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

@@ -84,7 +84,7 @@ function createAPI(overrideReleaseConfig) {
             process.exit(1);
         }
         const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
-        (0, version_plans_1.setVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes));
+        (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes));
         if (args.deleteVersionPlans === undefined) {
             // default to deleting version plans in this command instead of after versioning
             args.deleteVersionPlans = true;
@@ -140,12 +140,12 @@ function createAPI(overrideReleaseConfig) {
         // TODO: remove this after the changelog renderer is refactored to remove coupling with git commits
         let workspaceChangelogCommits = [];
         // If there are multiple release groups, we'll just skip the workspace changelog anyway.
-        const versionPlansEnabledForWorkspaceChangelog = releaseGroups[0].versionPlans;
+        const versionPlansEnabledForWorkspaceChangelog = releaseGroups[0].resolvedVersionPlans;
         if (versionPlansEnabledForWorkspaceChangelog) {
             if (releaseGroups.length === 1) {
                 const releaseGroup = releaseGroups[0];
                 if (releaseGroup.projectsRelationship === 'fixed') {
-                    const versionPlans = releaseGroup.versionPlans;
+                    const versionPlans = releaseGroup.resolvedVersionPlans;
                     workspaceChangelogChanges = versionPlans
                         .flatMap((vp) => {
                         const releaseType = versionPlanSemverReleaseTypeToChangelogType(vp.groupVersionBump);
@@ -296,8 +296,8 @@ function createAPI(overrideReleaseConfig) {
                     let changes = null;
                     // TODO: remove this after the changelog renderer is refactored to remove coupling with git commits
                     let commits;
-                    if (releaseGroup.versionPlans) {
-                        changes = releaseGroup.versionPlans
+                    if (releaseGroup.resolvedVersionPlans) {
+                        changes = releaseGroup.resolvedVersionPlans
                             .map((vp) => {
                             const bumpForProject = vp.projectVersionBumps[project.name];
                             if (!bumpForProject) {
@@ -396,8 +396,8 @@ function createAPI(overrideReleaseConfig) {
                 let changes = [];
                 // TODO: remove this after the changelog renderer is refactored to remove coupling with git commits
                 let commits = [];
-                if (releaseGroup.versionPlans) {
-                    changes = releaseGroup.versionPlans
+                if (releaseGroup.resolvedVersionPlans) {
+                    changes = releaseGroup.resolvedVersionPlans
                         .flatMap((vp) => {
                         const releaseType = versionPlanSemverReleaseTypeToChangelogType(vp.groupVersionBump);
                         const changes = !vp.triggeredByProjects
@@ -585,8 +585,8 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
     if (args.deleteVersionPlans && !args.dryRun) {
         const planFiles = new Set();
         releaseGroups.forEach((group) => {
-            if (group.versionPlans) {
-                group.versionPlans.forEach((plan) => {
+            if (group.resolvedVersionPlans) {
+                group.resolvedVersionPlans.forEach((plan) => {
                     (0, fs_extra_1.removeSync)(plan.absolutePath);
                     planFiles.add(plan.relativePath);
                 });

package/src/command-line/release/command-object.d.ts

@@ -1,12 +1,14 @@
 import { CommandModule } from 'yargs';
 import { OutputStyle, RunManyOptions } from '../yargs-utils/shared-options';
 import { VersionData } from './utils/shared';
-export interface NxReleaseArgs {
+export interface BaseNxReleaseArgs {
+    verbose?: boolean;
+    printConfig?: boolean | 'debug';
+}
+export interface NxReleaseArgs extends BaseNxReleaseArgs {
     groups?: string[];
     projects?: string[];
     dryRun?: boolean;
-    verbose?: boolean;
-    printConfig?: boolean | 'debug';
 }
 interface GitCommitAndTagOptions {
     stageChanges?: boolean;
@@ -43,6 +45,13 @@ export type PlanOptions = NxReleaseArgs & {
     bump?: string;
     message?: string;
 };
+export type PlanCheckOptions = BaseNxReleaseArgs & {
+    base?: string;
+    head?: string;
+    files?: string;
+    uncommitted?: boolean;
+    untracked?: boolean;
+};
 export type ReleaseOptions = NxReleaseArgs & FirstReleaseArgs & {
     yes?: boolean;
     skipPublish?: boolean;

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsReleaseCommand = void 0;
 const yargs_1 = require("yargs");
 const nx_json_1 = require("../../config/nx-json");
+const command_line_utils_1 = require("../../utils/command-line-utils");
 const logger_1 = require("../../utils/logger");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const command_line_utils_1 = require("../../utils/command-line-utils");
 exports.yargsReleaseCommand = {
     command: 'release',
     describe: 'Orchestrate versioning and publishing of applications and libraries',
@@ -15,6 +15,7 @@ exports.yargsReleaseCommand = {
         .command(changelogCommand)
         .command(publishCommand)
         .command(planCommand)
+        .command(planCheckCommand)
         .demandCommand()
         // Error on typos/mistyped CLI args, there is no reason to support arbitrary unknown args for these commands
         .strictOptions()
@@ -206,6 +207,7 @@ const publishCommand = {
 const planCommand = {
     command: 'plan [bump]',
     aliases: ['pl'],
+    // TODO: Remove this when docs are added
     // Create a plan to pick a new version and generate a changelog entry.
     // Hidden for now until the feature is more stable
     describe: false,
@@ -237,6 +239,19 @@ const planCommand = {
         process.exit(result);
     },
 };
+const planCheckCommand = {
+    command: 'plan:check',
+    // TODO: Remove this when docs are added
+    // Create a plan to pick a new version and generate a changelog entry.
+    // Hidden for now until the feature is more stable
+    describe: false,
+    builder: (yargs) => (0, shared_options_1.withAffectedOptions)(yargs),
+    handler: async (args) => {
+        const release = await Promise.resolve().then(() => require('./plan-check'));
+        const result = await release.releasePlanCheckCLIHandler(args);
+        process.exit(result);
+    },
+};
 function coerceParallelOption(args) {
     return {
         ...args,

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

@@ -144,7 +144,8 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
                 ? defaultIndependentReleaseTagPattern
                 : defaultFixedReleaseTagPattern),
         conventionalCommits: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG,
-        versionPlans: false,
+        versionPlans: (userConfig.versionPlans ||
+            false),
     };
     const groupProjectsRelationship = userConfig.projectsRelationship || WORKSPACE_DEFAULTS.projectsRelationship;
     const GROUP_DEFAULTS = {
@@ -200,7 +201,8 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             git: userConfig.git,
         },
     ], normalizeTrueToEmptyObject(userConfig.changelog));
-    const rootVersionPlansConfig = userConfig.versionPlans ?? WORKSPACE_DEFAULTS.versionPlans;
+    const rootVersionPlansConfig = (userConfig.versionPlans ??
+        WORKSPACE_DEFAULTS.versionPlans);
     const rootConventionalCommitsConfig = deepMergeDefaults([WORKSPACE_DEFAULTS.conventionalCommits], fillUnspecifiedConventionalCommitsProperties(normalizeConventionalCommitsConfig(userConfig.conventionalCommits)));
     // these options are not supported at the group level, only the root/command level
     const rootVersionWithoutGlobalOptions = { ...rootVersionConfig };

package/src/command-line/release/config/filter-release-groups.d.ts

@@ -1,9 +1,9 @@
 import { ProjectGraph } from '../../../config/project-graph';
 import { NxReleaseConfig } from './config';
 import { GroupVersionPlan, ProjectsVersionPlan } from './version-plans';
-export type ReleaseGroupWithName = Omit<NxReleaseConfig['groups'][string], 'versionPlans'> & {
+export type ReleaseGroupWithName = NxReleaseConfig['groups'][string] & {
     name: string;
-    versionPlans: (ProjectsVersionPlan | GroupVersionPlan)[] | false;
+    resolvedVersionPlans: (ProjectsVersionPlan | GroupVersionPlan)[] | false;
 };
 export declare function filterReleaseGroups(projectGraph: ProjectGraph, nxReleaseConfig: NxReleaseConfig, projectsFilter?: string[], groupsFilter?: string[]): {
     error: null | {

package/src/command-line/release/config/filter-release-groups.js

@@ -9,7 +9,7 @@ function filterReleaseGroups(projectGraph, nxReleaseConfig, projectsFilter, grou
         return {
             ...group,
             name,
-            versionPlans: group.versionPlans ? [] : false,
+            resolvedVersionPlans: group.versionPlans ? [] : false,
         };
     });
     const filteredProjectToReleaseGroup = new Map();

package/src/command-line/release/config/version-plans.d.ts

@@ -25,5 +25,5 @@ export interface ProjectsVersionPlan extends VersionPlan {
     projectVersionBumps: Record<string, ReleaseType>;
 }
 export declare function readRawVersionPlans(): Promise<RawVersionPlan[]>;
-export declare function setVersionPlansOnGroups(rawVersionPlans: RawVersionPlan[], releaseGroups: ReleaseGroupWithName[], allProjectNamesInWorkspace: string[]): ReleaseGroupWithName[];
+export declare function setResolvedVersionPlansOnGroups(rawVersionPlans: RawVersionPlan[], releaseGroups: ReleaseGroupWithName[], allProjectNamesInWorkspace: string[]): ReleaseGroupWithName[];
 export declare function getVersionPlansAbsolutePath(): string;

package/src/command-line/release/config/version-plans.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readRawVersionPlans = readRawVersionPlans;
-exports.setVersionPlansOnGroups = setVersionPlansOnGroups;
+exports.setResolvedVersionPlansOnGroups = setResolvedVersionPlansOnGroups;
 exports.getVersionPlansAbsolutePath = getVersionPlansAbsolutePath;
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
@@ -35,7 +35,7 @@ async function readRawVersionPlans() {
     }
     return versionPlans;
 }
-function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNamesInWorkspace) {
+function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNamesInWorkspace) {
     const groupsByName = releaseGroups.reduce((acc, group) => acc.set(group.name, group), new Map());
     const isDefaultGroup = isDefault(releaseGroups);
     for (const rawVersionPlan of rawVersionPlans) {
@@ -45,7 +45,7 @@ function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNames
         for (const [key, value] of Object.entries(rawVersionPlan.content)) {
             if (groupsByName.has(key)) {
                 const group = groupsByName.get(key);
-                if (!group.versionPlans) {
+                if (!group.resolvedVersionPlans) {
                     if (isDefaultGroup) {
                         throw new Error(`Found a version bump in '${rawVersionPlan.fileName}' but version plans are not enabled.`);
                     }
@@ -69,7 +69,7 @@ function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNames
                         throw new Error(`Found a version bump for group '${key}' in '${rawVersionPlan.fileName}' with an invalid release type. Please specify one of ${semver_1.RELEASE_TYPES.join(', ')}.`);
                     }
                 }
-                const existingPlan = (group.versionPlans.find((plan) => plan.fileName === rawVersionPlan.fileName));
+                const existingPlan = (group.resolvedVersionPlans.find((plan) => plan.fileName === rawVersionPlan.fileName));
                 if (existingPlan) {
                     if (existingPlan.groupVersionBump !== value) {
                         if (isDefaultGroup) {
@@ -81,7 +81,7 @@ function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNames
                     }
                 }
                 else {
-                    group.versionPlans.push({
+                    group.resolvedVersionPlans.push({
                         absolutePath: rawVersionPlan.absolutePath,
                         relativePath: rawVersionPlan.relativePath,
                         fileName: rawVersionPlan.fileName,
@@ -104,7 +104,7 @@ function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNames
                         throw new Error(`Found a version bump for project '${key}' in '${rawVersionPlan.fileName}' but the project is not in any configured release groups.`);
                     }
                 }
-                if (!groupForProject.versionPlans) {
+                if (!groupForProject.resolvedVersionPlans) {
                     if (isDefaultGroup) {
                         throw new Error(`Found a version bump for project '${key}' in '${rawVersionPlan.fileName}' but version plans are not enabled.`);
                     }
@@ -116,12 +116,12 @@ function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNames
                     throw new Error(`Found a version bump for project '${key}' in '${rawVersionPlan.fileName}' with an invalid release type. Please specify one of ${semver_1.RELEASE_TYPES.join(', ')}.`);
                 }
                 if (groupForProject.projectsRelationship === 'independent') {
-                    const existingPlan = (groupForProject.versionPlans.find((plan) => plan.fileName === rawVersionPlan.fileName));
+                    const existingPlan = (groupForProject.resolvedVersionPlans.find((plan) => plan.fileName === rawVersionPlan.fileName));
                     if (existingPlan) {
                         existingPlan.projectVersionBumps[key] = value;
                     }
                     else {
-                        groupForProject.versionPlans.push({
+                        groupForProject.resolvedVersionPlans.push({
                             absolutePath: rawVersionPlan.absolutePath,
                             relativePath: rawVersionPlan.relativePath,
                             fileName: rawVersionPlan.fileName,
@@ -134,7 +134,7 @@ function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNames
                     }
                 }
                 else {
-                    const existingPlan = (groupForProject.versionPlans.find((plan) => plan.fileName === rawVersionPlan.fileName));
+                    const existingPlan = (groupForProject.resolvedVersionPlans.find((plan) => plan.fileName === rawVersionPlan.fileName));
                     // This can occur if the same fixed release group has multiple entries for different projects within
                     // the same version plan file. This will be the case when users are using the default release group.
                     if (existingPlan) {
@@ -151,7 +151,7 @@ function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNames
                         }
                     }
                     else {
-                        groupForProject.versionPlans.push({
+                        groupForProject.resolvedVersionPlans.push({
                             absolutePath: rawVersionPlan.absolutePath,
                             relativePath: rawVersionPlan.relativePath,
                             fileName: rawVersionPlan.fileName,
@@ -169,8 +169,8 @@ function setVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNames
     }
     // Order the plans from newest to oldest
     releaseGroups.forEach((group) => {
-        if (group.versionPlans) {
-            group.versionPlans.sort((a, b) => b.createdOnMs - a.createdOnMs);
+        if (group.resolvedVersionPlans) {
+            group.resolvedVersionPlans.sort((a, b) => b.createdOnMs - a.createdOnMs);
         }
     });
     return releaseGroups;

package/src/command-line/release/plan-check.d.ts

@@ -0,0 +1,4 @@
+import { NxReleaseConfiguration } from '../../config/nx-json';
+import { PlanCheckOptions, PlanOptions } from './command-object';
+export declare const releasePlanCheckCLIHandler: (args: PlanCheckOptions) => Promise<number>;
+export declare function createAPI(overrideReleaseConfig: NxReleaseConfiguration): (args: PlanOptions) => Promise<number>;