nx 21.4.0-beta.0 → 21.4.0-beta.2

package/.eslintrc.json

@@ -138,6 +138,8 @@
               // Powerpack plugin conditionally available dynamically at runtime
               "@nx/powerpack-conformance",
               "@nx/conformance",
+              // Nx Docker plugin conditionally available dynamically at runtime
+              "@nx/docker",
               // Only used in test-utils at the time of writing
               "@ltd/j-toml"
             ]

package/bin/nx.js

@@ -68,7 +68,12 @@ async function main() {
             handleMissingLocalInstallation(workspace ? workspace.dir : null);
         }
         // this file is already in the local workspace
-        if (isLocalInstall) {
+        if (isNxCloudCommand(process.argv[2])) {
+            // nx-cloud commands can run without local Nx installation
+            process.env.NX_DAEMON = 'false';
+            require('nx/src/command-line/nx-commands').commandsObject.argv;
+        }
+        else if (isLocalInstall) {
             await (0, init_local_1.initLocal)(workspace);
         }
         else if (localNx) {
@@ -82,11 +87,6 @@ async function main() {
                 require(localNx);
             }
         }
-        else if (isNxCloudCommand(process.argv[2])) {
-            // nx-cloud commands can run without local Nx installation
-            process.env.NX_DAEMON = 'false';
-            require('nx/src/command-line/nx-commands').commandsObject.argv;
-        }
     }
 }
 function handleNoWorkspace(globalNxVersion) {

package/bin/post-install.js

@@ -1,43 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const project_graph_1 = require("../src/project-graph/project-graph");
 const workspace_root_1 = require("../src/utils/workspace-root");
 const fileutils_1 = require("../src/utils/fileutils");
 const path_1 = require("path");
-const client_1 = require("../src/daemon/client/client");
 const assert_supported_platform_1 = require("../src/native/assert-supported-platform");
 const update_manager_1 = require("../src/nx-cloud/update-manager");
 const get_cloud_options_1 = require("../src/nx-cloud/utilities/get-cloud-options");
 const nx_cloud_utils_1 = require("../src/utils/nx-cloud-utils");
 const nx_json_1 = require("../src/config/nx-json");
 const logger_1 = require("../src/utils/logger");
-const workspace_context_1 = require("../src/utils/workspace-context");
+// The post install is not critical, to avoid any chance that it may hang
+// we will kill this process after 30 seconds.
+const postinstallTimeout = setTimeout(() => {
+    logger_1.logger.verbose('Nx post-install timed out.');
+    process.exit(0);
+}, 30_000);
 (async () => {
     const start = new Date();
     try {
         if (isMainNxPackage() && (0, fileutils_1.fileExists)((0, path_1.join)(workspace_root_1.workspaceRoot, 'nx.json'))) {
             (0, assert_supported_platform_1.assertSupportedPlatform)();
-            (0, workspace_context_1.setupWorkspaceContext)(workspace_root_1.workspaceRoot);
-            if (client_1.daemonClient.enabled()) {
-                try {
-                    await client_1.daemonClient.stop();
-                }
-                catch (e) { }
-            }
-            const tasks = [
-                (0, project_graph_1.buildProjectGraphAndSourceMapsWithoutDaemon)(),
-            ];
             if ((0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())) {
-                tasks.push((0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()));
+                await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)());
             }
-            process.env.NX_DAEMON = 'false';
-            await Promise.all(tasks.map((promise) => {
-                return promise.catch((e) => {
-                    if (process.env.NX_VERBOSE_LOGGING === 'true') {
-                        console.warn(e);
-                    }
-                });
-            }));
         }
     }
     catch (e) {
@@ -46,6 +31,7 @@ const workspace_context_1 = require("../src/utils/workspace-context");
     finally {
         const end = new Date();
         logger_1.logger.verbose(`Nx postinstall steps took ${end.getTime() - start.getTime()}ms`);
+        clearTimeout(postinstallTimeout);
         process.exit(0);
     }
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.4.0-beta.0",
+  "version": "21.4.0-beta.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.4.0-beta.0",
-    "@nx/nx-darwin-x64": "21.4.0-beta.0",
-    "@nx/nx-freebsd-x64": "21.4.0-beta.0",
-    "@nx/nx-linux-arm-gnueabihf": "21.4.0-beta.0",
-    "@nx/nx-linux-arm64-gnu": "21.4.0-beta.0",
-    "@nx/nx-linux-arm64-musl": "21.4.0-beta.0",
-    "@nx/nx-linux-x64-gnu": "21.4.0-beta.0",
-    "@nx/nx-linux-x64-musl": "21.4.0-beta.0",
-    "@nx/nx-win32-arm64-msvc": "21.4.0-beta.0",
-    "@nx/nx-win32-x64-msvc": "21.4.0-beta.0"
+    "@nx/nx-darwin-arm64": "21.4.0-beta.2",
+    "@nx/nx-darwin-x64": "21.4.0-beta.2",
+    "@nx/nx-freebsd-x64": "21.4.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "21.4.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "21.4.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "21.4.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "21.4.0-beta.2",
+    "@nx/nx-linux-x64-musl": "21.4.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "21.4.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "21.4.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -129,6 +129,7 @@
       "@nx/vue",
       "@nx/web",
       "@nx/webpack",
+      "@nx/docker",
       {
         "package": "nx-cloud",
         "version": "latest"

package/schemas/nx-schema.json

@@ -224,6 +224,18 @@
                     "description": "Enables using version plans as a specifier source for versioning and to determine changes for changelog generation."
                   }
                 ]
+              },
+              "docker": {
+                "oneOf": [
+                  {
+                    "type": "boolean",
+                    "enum": [true],
+                    "description": "Enable docker configuration with default settings. Warning: Docker support is experimental. Breaking changes may occur and not adhere to semver versioning. "
+                  },
+                  {
+                    "$ref": "#/definitions/NxReleaseGroupDockerConfiguration"
+                  }
+                ]
               }
             },
             "required": ["projects"]
@@ -309,6 +321,18 @@
         },
         "releaseTagPatternStrictPreid": {
           "$ref": "#/definitions/NxReleaseReleaseTagPatternStrictPreidConfiguration"
+        },
+        "docker": {
+          "oneOf": [
+            {
+              "type": "boolean",
+              "enum": [true],
+              "description": "Enable docker configuration with default settings. Warning: Docker support is experimental. Breaking changes may occur and not adhere to semver versioning."
+            },
+            {
+              "$ref": "#/definitions/NxReleaseDockerConfiguration"
+            }
+          ]
         }
       }
     },
@@ -995,6 +1019,59 @@
           }
         }
       }
+    },
+    "NxReleaseDockerConfiguration": {
+      "type": "object",
+      "description": "Configuration for handling Docker projects during nx release.",
+      "properties": {
+        "preVersionCommand": {
+          "type": "string",
+          "description": "A command to run after validation of nx release configuration, but before docker versioning begins. Useful for preparing docker build artifacts. If --dry-run is passed, the command is still executed, but with the NX_DRY_RUN environment variable set to 'true'."
+        },
+        "skipVersionActions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "Array of projects which should use a no-op VersionActions implementation rather than any potentially inferred by default or via Inference Plugins."
+            },
+            {
+              "type": "boolean",
+              "description": "When set to true, all projects in the release setup/release group will use a no-op VersionActions implementation."
+            }
+          ],
+          "description": "Projects which should use a no-op VersionActions implementation rather than any potentially inferred by default or via Inference Plugins. Can be an array of project names (subset of projects in the release setup/release group) or a boolean (true means all projects)."
+        },
+        "versionSchemes": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Record of named version patterns to choose between when versioning docker projects. e.g. \"production\": \"{currentDate|YYMM.DD}.{shortCommitSha}\", \"hotfix\": \"{currentDate|YYMM.DD}-hotfix\""
+        },
+        "repositoryName": {
+          "type": "string",
+          "description": "Repository name for the image on the configured registry"
+        },
+        "registryUrl": {
+          "type": "string",
+          "description": "Url of the Docker Image/Container Registry to push images to. Defaults to Docker Hub."
+        }
+      },
+      "additionalProperties": false
+    },
+    "NxReleaseGroupDockerConfiguration": {
+      "type": "object",
+      "$comment": "We need to improve this configuration definition to be more precise once legacy versioning is removed. Right now it needs to be left open and runtime validation will ensure correct behavior.",
+      "properties": {
+        "groupPreVersionCommand": {
+          "type": "string",
+          "description": "A command to run after validation of nx release configuration, but before docker versioning begins. Used for preparing docker build artifacts. If --dry-run is passed, the command is still executed, but with the NX_DRY_RUN environment variable set to 'true'. It will run in addition to the global `preVersionCommand`"
+        }
+      },
+      "additionalProperties": true
     }
   }
 }

package/src/command-line/index.d.ts

@@ -0,0 +1,23 @@
+export * from './add/command-object';
+export * from './affected/command-object';
+export * from './daemon/command-object';
+export * from './exec/command-object';
+export * from './format/command-object';
+export * from './generate/command-object';
+export * from './graph/command-object';
+export * from './import/command-object';
+export * from './init/command-object';
+export * from './list/command-object';
+export * from './migrate/command-object';
+export * from './new/command-object';
+export * from './register/command-object';
+export * from './release/command-object';
+export * from './repair/command-object';
+export * from './report/command-object';
+export * from './reset/command-object';
+export * from './run-many/command-object';
+export * from './run/command-object';
+export * from './show/command-object';
+export * from './sync/command-object';
+export * from './watch/command-object';
+//# sourceMappingURL=index.d.ts.map

package/src/command-line/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/index.ts"],"names":[],"mappings":"AACA,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC"}

package/src/command-line/index.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+// CLI Commands Export File for Documentation
+tslib_1.__exportStar(require("./add/command-object"), exports);
+tslib_1.__exportStar(require("./affected/command-object"), exports);
+tslib_1.__exportStar(require("./daemon/command-object"), exports);
+tslib_1.__exportStar(require("./exec/command-object"), exports);
+tslib_1.__exportStar(require("./format/command-object"), exports);
+tslib_1.__exportStar(require("./generate/command-object"), exports);
+tslib_1.__exportStar(require("./graph/command-object"), exports);
+tslib_1.__exportStar(require("./import/command-object"), exports);
+tslib_1.__exportStar(require("./init/command-object"), exports);
+tslib_1.__exportStar(require("./list/command-object"), exports);
+tslib_1.__exportStar(require("./migrate/command-object"), exports);
+tslib_1.__exportStar(require("./new/command-object"), exports);
+tslib_1.__exportStar(require("./register/command-object"), exports);
+tslib_1.__exportStar(require("./release/command-object"), exports);
+tslib_1.__exportStar(require("./repair/command-object"), exports);
+tslib_1.__exportStar(require("./report/command-object"), exports);
+tslib_1.__exportStar(require("./reset/command-object"), exports);
+tslib_1.__exportStar(require("./run-many/command-object"), exports);
+tslib_1.__exportStar(require("./run/command-object"), exports);
+tslib_1.__exportStar(require("./show/command-object"), exports);
+tslib_1.__exportStar(require("./sync/command-object"), exports);
+tslib_1.__exportStar(require("./watch/command-object"), exports);

package/src/command-line/init/implementation/add-nx-to-monorepo.d.ts

@@ -2,6 +2,6 @@ import { InitArgs } from '../init-v1';
 type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'> & {
     legacy?: boolean;
 };
-export declare function addNxToMonorepo(options: Options): Promise<void>;
+export declare function addNxToMonorepo(options: Options, guided?: boolean): Promise<void>;
 export {};
 //# sourceMappingURL=add-nx-to-monorepo.d.ts.map

package/src/command-line/init/implementation/add-nx-to-monorepo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-nx-to-monorepo.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/add-nx-to-monorepo.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAYtC,KAAK,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC,GAAG;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,wBAAsB,eAAe,CAAC,OAAO,EAAE,OAAO,iBA4FrD"}
+{"version":3,"file":"add-nx-to-monorepo.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/add-nx-to-monorepo.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAYtC,KAAK,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC,GAAG;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAc,iBA6FvB"}

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

@@ -9,7 +9,7 @@ const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const utils_1 = require("./utils");
 const connect_to_nx_cloud_1 = require("../../nx-cloud/connect/connect-to-nx-cloud");
-async function addNxToMonorepo(options) {
+async function addNxToMonorepo(options, guided = true) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });
     const packageJsonFiles = allProjectPackageJsonFiles(repoRoot);
@@ -18,7 +18,7 @@ async function addNxToMonorepo(options) {
     let cacheableOperations;
     let scriptOutputs = {};
     let useNxCloud;
-    if (options.interactive && scripts.length > 0) {
+    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',
         });

package/src/command-line/init/implementation/add-nx-to-npm-repo.d.ts

@@ -2,6 +2,6 @@ import { InitArgs } from '../init-v1';
 type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'> & {
     legacy?: boolean;
 };
-export declare function addNxToNpmRepo(options: Options): Promise<void>;
+export declare function addNxToNpmRepo(options: Options, guided?: boolean): Promise<void>;
 export {};
 //# sourceMappingURL=add-nx-to-npm-repo.d.ts.map

package/src/command-line/init/implementation/add-nx-to-npm-repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-nx-to-npm-repo.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/add-nx-to-npm-repo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAetC,KAAK,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC,GAAG;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,iBAgFpD"}
+{"version":3,"file":"add-nx-to-npm-repo.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/add-nx-to-npm-repo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAetC,KAAK,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,GAAG,aAAa,GAAG,WAAW,CAAC,GAAG;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,OAAc,iBAgF5E"}

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

@@ -8,7 +8,7 @@ const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const utils_1 = require("./utils");
 const connect_to_nx_cloud_1 = require("../../nx-cloud/connect/connect-to-nx-cloud");
-async function addNxToNpmRepo(options) {
+async function addNxToNpmRepo(options, guided = true) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });
     let cacheableOperations;
@@ -16,7 +16,7 @@ async function addNxToNpmRepo(options) {
     let useNxCloud;
     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) {
+    if (options.interactive && scripts.length > 0 && guided) {
         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',
         });

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AAUxC,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,mBAAmB,EAAE,MAAM,EAAE,EAC7B,aAAa,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,QA0C1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC7B,mBAAmB,CA+GrB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,MAAM,EAAE,QAY9B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAqC3C;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,sBAAmD,QAOzD;AAED,wBAAsB,SAAS,CAC7B,kBAAkB,EACd,SAAS,GACT,iBAAiB,GACjB,aAAa,GACb,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,mBAAmB,iBAMxB;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,GACnB,IAAI,CAiBN;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,GAAG,EAAE,sBAAsB,QAqB5B;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,MAAM,QAQjE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,aAAa,EACb,WAAW,GACZ,EAAE;IACD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,IAAI,CAgBP;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,WASlD;AAED,wBAAgB,KAAK,CAAC,WAAW,EAAE,WAAW,WAa7C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/init/implementation/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,sBAAsB,EACvB,MAAM,gCAAgC,CAAC;AAUxC,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,EAAE,MAAM,EAAE,EAC5B,mBAAmB,EAAE,MAAM,EAAE,EAC7B,aAAa,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,QA0C1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC7B,mBAAmB,CA+GrB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,MAAM,EAAE,QAY9B;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAqC3C;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,sBAAmD,QAOzD;AAED,wBAAsB,SAAS,CAC7B,kBAAkB,EACd,SAAS,GACT,iBAAiB,GACjB,aAAa,GACb,kBAAkB,GAClB,cAAc,GACd,kBAAkB,GAClB,mBAAmB,iBAMxB;AAED,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,GACnB,IAAI,CAiBN;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EAAE,EAC1B,GAAG,EAAE,sBAAsB,QAqB5B;AAED,wBAAgB,0BAA0B,CAAC,eAAe,EAAE,MAAM,QAQjE;AAED,wBAAgB,iBAAiB,CAAC,EAChC,aAAa,EACb,WAAW,GACZ,EAAE;IACD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GAAG,IAAI,CAUP;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,WAAW,WASlD;AAED,wBAAgB,KAAK,CAAC,WAAW,EAAE,WAAW,WAa7C"}

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

@@ -24,7 +24,6 @@ const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-n
 const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
 const connect_to_nx_cloud_2 = require("../../nx-cloud/connect/connect-to-nx-cloud");
 const deduce_default_base_1 = require("./deduce-default-base");
-const child_process_2 = require("../../../utils/child-process");
 function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scriptOutputs) {
     const nxJsonPath = (0, path_2.joinPathFragments)(repoRoot, 'nx.json');
     let nxJson = {};
@@ -263,13 +262,10 @@ function markPackageJsonAsNxProject(packageJsonPath) {
     (0, fileutils_1.writeJsonFile)(packageJsonPath, json);
 }
 function printFinalMessage({ learnMoreLink, appendLines, }) {
-    const pmc = (0, package_manager_1.getPackageManagerCommand)();
     output_1.output.success({
         title: '🎉 Done!',
         bodyLines: [
-            `- Run "${(0, child_process_2.getRunNxBaseCommand)(pmc)} run-many -t build" to run the build target for every project in the workspace. Run it again to replay the cached computation. https://nx.dev/features/cache-task-results`,
-            `- Run "${(0, child_process_2.getRunNxBaseCommand)(pmc)} graph" to see the graph of projects and tasks in your workspace. https://nx.dev/core-features/explore-graph`,
-            learnMoreLink ? `- Learn more at ${learnMoreLink}.` : undefined,
+            `- Learn more about what to do next at ${learnMoreLink ?? 'https://nx.dev/getting-started/adding-to-existing'}`,
             ...(appendLines ?? []),
         ].filter(Boolean),
     });

package/src/command-line/init/init-v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AA6BvE,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA0HlE;AA2BD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,CAgID"}
+{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AA4BvE,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiJlE;AA2BD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,CAgID"}

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

@@ -34,7 +34,7 @@ async function initHandler(options) {
             integrated: !!options.integrated,
         });
         (0, utils_1.printFinalMessage)({
-            learnMoreLink: 'https://nx.dev/recipes/angular/migration/angular',
+            learnMoreLink: 'https://nx.dev/technologies/angular/migration/angular',
         });
         return;
     }
@@ -45,6 +45,18 @@ async function initHandler(options) {
     const _isTurborepo = (0, fs_1.existsSync)('turbo.json');
     const _isMonorepo = _isNonJs ? false : (0, utils_1.isMonorepo)(packageJson);
     const _isCRA = _isNonJs ? false : (0, utils_1.isCRA)(packageJson);
+    let guided = true;
+    if (options.interactive && !(_isTurborepo || _isCRA || _isNonJs)) {
+        const setupType = await (0, enquirer_1.prompt)([
+            {
+                type: 'select',
+                name: 'setupPreference',
+                message: 'Would you like a minimum or guided setup?',
+                choices: [{ name: 'Minimum' }, { name: 'Guided' }],
+            },
+        ]).then((r) => r.setupPreference);
+        guided = setupType === 'Guided';
+    }
     /**
      * Turborepo users must have set up individual scripts already, and we keep the transition as minimal as possible.
      * We log a message during the conversion process in addNxToTurborepo about how they can learn more about the power
@@ -75,7 +87,7 @@ async function initHandler(options) {
         await (0, add_nx_to_monorepo_1.addNxToMonorepo)({
             interactive: options.interactive,
             nxCloud: false,
-        });
+        }, guided);
     }
     else if (_isNonJs) {
         (0, add_nx_scripts_1.generateDotNxSetup)(version);
@@ -85,41 +97,47 @@ async function initHandler(options) {
         await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({
             interactive: options.interactive,
             nxCloud: false,
-        });
+        }, guided);
     }
-    const useNxCloud = options.nxCloud ??
-        (options.interactive ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)() : false);
     const repoRoot = process.cwd();
     (0, utils_1.createNxJsonFile)(repoRoot, [], [], {});
     (0, utils_1.updateGitIgnore)(repoRoot);
     const nxJson = (0, nx_json_1.readNxJson)(repoRoot);
-    output_1.output.log({ title: '🧐 Checking dependencies' });
-    let plugins;
-    let updatePackageScripts;
-    if (_isCRA) {
-        plugins = ['@nx/vite'];
-        updatePackageScripts = true;
+    if (guided) {
+        output_1.output.log({ title: '🧐 Checking dependencies' });
+        let plugins;
+        let updatePackageScripts;
+        if (_isCRA) {
+            plugins = ['@nx/vite'];
+            updatePackageScripts = true;
+        }
+        else {
+            const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, options.interactive);
+            plugins = _plugins;
+            updatePackageScripts = _updatePackageScripts;
+        }
+        output_1.output.log({ title: '📦 Installing Nx' });
+        (0, configure_plugins_1.installPluginPackages)(repoRoot, pmc, plugins);
+        await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, repoRoot, options.verbose);
     }
-    else {
-        const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, options.interactive);
-        plugins = _plugins;
-        updatePackageScripts = _updatePackageScripts;
+    let useNxCloud = options.nxCloud;
+    if (useNxCloud === undefined) {
+        output_1.output.log({ title: '🛠️ Setting up Self-Healing CI and Remote Caching' });
+        useNxCloud = options.interactive
+            ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+            : false;
     }
-    output_1.output.log({ title: '📦 Installing Nx' });
-    (0, configure_plugins_1.installPluginPackages)(repoRoot, pmc, plugins);
-    await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, repoRoot, options.verbose);
     if (useNxCloud) {
-        output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
         await (0, utils_1.initCloud)('nx-init');
     }
     (0, utils_1.printFinalMessage)({
+        learnMoreLink: 'https://nx.dev/getting-started/adding-to-existing',
         appendLines: _isMonorepo
             ? [
-                `- Learn how Nx helps manage your TypeScript monorepo at https://nx.dev/features/maintain-ts-monorepos.`,
+                `- Read a detailed guide about adding Nx to NPM/YARN/PNPM workspaces: https://nx.dev/recipes/adopting-nx/adding-to-monorepos`,
+                `- Learn how Nx helps manage your TypeScript monorepo: https://nx.dev/features/maintain-ts-monorepos`,
             ]
-            : [
-                `- Learn how Nx works with any type of project at https://nx.dev/recipes/adopting-nx/adding-to-existing-project.`,
-            ],
+            : [],
     });
 }
 const npmPackageToPluginMap = {

package/src/command-line/nx-cloud/connect/command-object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/connect/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAE,MAAM,OAAO,CAAC;AAK5C,eAAO,MAAM,mBAAmB,EAAE,aAiBjC,CAAC;AAUF,eAAO,MAAM,oBAAoB,EAAE,aAMlC,CAAC"}
+{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/connect/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAE,MAAM,OAAO,CAAC;AAK5C,eAAO,MAAM,mBAAmB,EAAE,aAoBjC,CAAC;AAUF,eAAO,MAAM,oBAAoB,EAAE,aAMlC,CAAC"}

package/src/command-line/nx-cloud/connect/command-object.js

@@ -10,7 +10,8 @@ exports.yargsConnectCommand = {
     describe: `Connect workspace to Nx Cloud.`,
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(withConnectOptions(yargs), 'connect-to-nx-cloud'),
     handler: async (args) => {
-        await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand(args);
+        const checkRemote = process.env.NX_SKIP_CHECK_REMOTE !== 'true';
+        await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand({ ...args, checkRemote });
         await (await Promise.resolve().then(() => require('../../../utils/ab-testing'))).recordStat({
             command: 'connect',
             nxVersion: versions_1.nxVersion,

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

@@ -7,6 +7,7 @@ export declare function connectToNxCloudIfExplicitlyAsked(opts: NxArgs): Promise
 export declare function connectWorkspaceToCloud(options: ConnectToNxCloudOptions, directory?: string): Promise<string>;
 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 connectToNxCloudWithPrompt(command: string): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"connect-to-nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/connect/connect-to-nx-cloud.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,uBAAuB,EACxB,MAAM,sEAAsE,CAAC;AAI9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EACL,UAAU,EAIX,MAAM,2BAA2B,CAAC;AAOnC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,mBAAmB,WAclE;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,uBAAuB,EAChC,SAAS,SAAgB,mBAO1B;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,EACpC,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CA+DlB;AAMD,wBAAsB,kCAAkC,CACtD,OAAO,SAAS,EAChB,GAAG,GAAE,UAA2B,GAC/B,OAAO,CAAC,OAAO,CAAC,CAWlB;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,MAAM,iBAY/D"}
+{"version":3,"file":"connect-to-nx-cloud.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/connect/connect-to-nx-cloud.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,uBAAuB,EACxB,MAAM,sEAAsE,CAAC;AAI9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EACL,UAAU,EAIX,MAAM,2BAA2B,CAAC;AAQnC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,mBAAmB,WAclE;AAED,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,uBAAuB,EAChC,SAAS,SAAgB,mBAO1B;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,EAC3D,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC,CA2ElB;AAMD,wBAAsB,kCAAkC,CACtD,OAAO,SAAS,EAChB,GAAG,GAAE,UAA2B,GAC/B,OAAO,CAAC,OAAO,CAAC,CAWlB;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,MAAM,iBAY/D"}

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

@@ -17,6 +17,7 @@ const ab_testing_1 = require("../../../utils/ab-testing");
 const versions_1 = require("../../../utils/versions");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const chalk = require("chalk");
+const git_utils_1 = require("../../../utils/git-utils");
 const ora = require('ora');
 const open = require('open');
 function onlyDefaultRunnerIsUsed(nxJson) {
@@ -59,6 +60,17 @@ async function connectToNxCloudCommand(options, command) {
     const installationSource = process.env.NX_CONSOLE
         ? 'nx-console'
         : 'nx-connect';
+    const hasRemote = !!(0, git_utils_1.getGitRemote)();
+    if (!hasRemote && options.checkRemote) {
+        output_1.output.error({
+            title: 'Missing VCS provider',
+            bodyLines: [
+                'Push this repository to a VCS provider (e.g., GitHub) and try again.',
+                'Go to https://github.com/new to create a repository on GitHub.',
+            ],
+        });
+        return false;
+    }
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
         const token = process.env.NX_CLOUD_ACCESS_TOKEN ||
             nxJson.nxCloudAccessToken ||

package/src/command-line/release/changelog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/changelog.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAmBpD,OAAO,EAEL,SAAS,EAUV,MAAM,aAAa,CAAC;AAQrB,OAAO,EACL,cAAc,EAQf,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;SACjC,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACV,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CAqrBrC"}
+{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/changelog.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAmBpD,OAAO,EAEL,SAAS,EAUV,MAAM,aAAa,CAAC;AAQrB,OAAO,EACL,cAAc,EASf,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;SACjC,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACV,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CAqrBrC"}

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

@@ -827,11 +827,15 @@ async function generateChangelogForProjects({ tree, args, changes, projectsVersi
          * no changelog entry is relevant in that case.
          */
         if (!projectsVersionData[project.name] ||
-            projectsVersionData[project.name].newVersion === null) {
+            (projectsVersionData[project.name].newVersion === null &&
+                !projectsVersionData[project.name].dockerVersion)) {
             continue;
         }
+        const preferDockerVersion = (0, shared_1.shouldPreferDockerVersionForReleaseGroup)(releaseGroup);
         const releaseVersion = new shared_1.ReleaseVersion({
-            version: projectsVersionData[project.name].newVersion,
+            version: preferDockerVersion && projectsVersionData[project.name].dockerVersion
+                ? projectsVersionData[project.name].dockerVersion
+                : projectsVersionData[project.name].newVersion,
             releaseTagPattern: releaseGroup.releaseTagPattern,
             projectName: project.name,
         });

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

@@ -33,6 +33,7 @@ export type VersionOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Firs
      */
     generatorOptionsOverrides?: Record<string, unknown>;
     versionActionsOptionsOverrides?: Record<string, unknown>;
+    dockerVersionScheme?: string;
 };
 export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & FirstReleaseArgs & {
     version?: string | null;

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

@@ -1 +1 @@
-{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/command-object.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/command-object.ts"],"names":[],"mappings":"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"}