nx 18.0.2 → 18.0.4

package/package.json

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

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

@@ -10,7 +10,6 @@ const tree_1 = require("../../generators/tree");
 const register_1 = require("../../plugins/js/utils/register");
 const project_graph_1 = require("../../project-graph/project-graph");
 const utils_1 = require("../../tasks-runner/utils");
-const logger_1 = require("../../utils/logger");
 const output_1 = require("../../utils/output");
 const params_1 = require("../../utils/params");
 const path_1 = require("../../utils/path");
@@ -272,9 +271,6 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
     for (const postGitTask of postGitTasks) {
         await postGitTask(latestCommit);
     }
-    if (args.dryRun) {
-        logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no changelogs were actually created.`);
-    }
     return 0;
 }
 function resolveChangelogRenderer(changelogRendererPath) {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsReleaseCommand = void 0;
 const yargs_1 = require("yargs");
 const file_utils_1 = require("../../project-graph/file-utils");
+const logger_1 = require("../../utils/logger");
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsReleaseCommand = {
     command: 'release',
@@ -83,13 +84,17 @@ const releaseCommand = {
         }
         return true;
     }),
-    handler: (args) => Promise.resolve().then(() => require('./release')).then((m) => m.releaseCLIHandler(args))
-        .then((versionDataOrExitCode) => {
-        if (typeof versionDataOrExitCode === 'number') {
-            return process.exit(versionDataOrExitCode);
+    handler: async (args) => {
+        const release = await Promise.resolve().then(() => require('./release'));
+        const result = await release.releaseCLIHandler(args);
+        if (args.dryRun) {
+            logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
+        }
+        if (typeof result === 'number') {
+            process.exit(result);
         }
         process.exit(0);
-    }),
+    },
 };
 const versionCommand = {
     command: 'version [specifier]',
@@ -109,13 +114,17 @@ const versionCommand = {
         type: 'boolean',
         describe: 'Whether or not to stage the changes made by this command. Useful when combining this command with changelog generation.',
     })),
-    handler: (args) => Promise.resolve().then(() => require('./version')).then((m) => m.releaseVersionCLIHandler(args))
-        .then((versionDataOrExitCode) => {
-        if (typeof versionDataOrExitCode === 'number') {
-            return process.exit(versionDataOrExitCode);
+    handler: async (args) => {
+        const release = await Promise.resolve().then(() => require('./version'));
+        const result = await release.releaseVersionCLIHandler(args);
+        if (args.dryRun) {
+            logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
+        }
+        if (typeof result === 'number') {
+            process.exit(result);
         }
         process.exit(0);
-    }),
+    },
 };
 const changelogCommand = {
     command: 'changelog [version]',
@@ -155,8 +164,15 @@ const changelogCommand = {
         return true;
     })),
     handler: async (args) => {
-        const status = await (await Promise.resolve().then(() => require('./changelog'))).releaseChangelogCLIHandler(args);
-        process.exit(status);
+        const release = await Promise.resolve().then(() => require('./changelog'));
+        const result = await release.releaseChangelogCLIHandler(args);
+        if (args.dryRun) {
+            logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
+        }
+        if (typeof result === 'number') {
+            process.exit(result);
+        }
+        process.exit(0);
     },
 };
 const publishCommand = {
@@ -178,6 +194,9 @@ const publishCommand = {
     }),
     handler: async (args) => {
         const status = await (await Promise.resolve().then(() => require('./publish'))).releasePublishCLIHandler(coerceParallelOption((0, shared_options_1.withOverrides)(args, 2)));
+        if (args.dryRun) {
+            logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
+        }
         process.exit(status);
     },
 };

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

@@ -6,7 +6,6 @@ const devkit_exports_1 = require("../../devkit-exports");
 const project_graph_1 = require("../../project-graph/project-graph");
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
-const logger_1 = require("../../utils/logger");
 const params_1 = require("../../utils/params");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
 const graph_1 = require("../graph/graph");
@@ -70,9 +69,6 @@ async function releasePublish(args, isCLI = false) {
             overallExitStatus = status || 1;
         }
     }
-    if (_args.dryRun) {
-        logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no projects were actually published.`);
-    }
     return overallExitStatus;
 }
 exports.releasePublish = releasePublish;
@@ -102,22 +98,23 @@ async function runPublishOnProjects(args, projectGraph, nxJson, projectNames, sh
     if (args.firstRelease) {
         overrides.firstRelease = args.firstRelease;
     }
-    const targets = ['nx-release-publish'];
+    const requiredTargetName = 'nx-release-publish';
     if (args.graph) {
         const file = (0, command_line_utils_1.readGraphFileFromGraphArg)(args);
-        const projectNames = projectsToRun.map((t) => t.name);
+        const projectNamesWithTarget = projectsToRun
+            .map((t) => t.name)
+            .filter((projectName) => (0, project_graph_utils_1.projectHasTarget)(projectGraph.nodes[projectName], requiredTargetName));
         await (0, graph_1.generateGraph)({
             watch: false,
             all: false,
             open: true,
             view: 'tasks',
-            targets,
-            projects: projectNames,
+            targets: [requiredTargetName],
+            projects: projectNamesWithTarget,
             file,
-        }, projectNames);
+        }, projectNamesWithTarget);
         return 0;
     }
-    const requiredTargetName = 'nx-release-publish';
     const projectsWithTarget = projectsToRun.filter((project) => (0, project_graph_utils_1.projectHasTarget)(project, requiredTargetName));
     if (projectsWithTarget.length === 0) {
         throw new Error(`Based on your config, the following projects were matched for publishing but do not have the "${requiredTargetName}" target specified:\n${[
@@ -130,7 +127,7 @@ async function runPublishOnProjects(args, projectGraph, nxJson, projectNames, sh
      * Run the relevant nx-release-publish executor on each of the selected projects.
      */
     const status = await (0, run_command_1.runCommand)(projectsWithTarget, projectGraph, { nxJson }, {
-        targets,
+        targets: [requiredTargetName],
         outputStyle: 'static',
         ...args,
     }, overrides, null, {}, {

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

@@ -99,13 +99,12 @@ async function release(args) {
         await (0, publish_1.releasePublish)(args);
     }
     else {
-        console.log('Skipped publishing packages.');
+        devkit_exports_1.output.logSingleLine('Skipped publishing packages.');
     }
     return versionResult;
 }
 exports.release = release;
 async function promptForPublish() {
-    console.log('\n');
     try {
         const reply = await (0, enquirer_1.prompt)([
             {
@@ -117,7 +116,6 @@ async function promptForPublish() {
         return reply.confirmation;
     }
     catch (e) {
-        console.log('\n');
         // Handle the case where the user exits the prompt with ctrl+c
         return false;
     }

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

@@ -60,39 +60,22 @@ async function createOrUpdateGithubRelease(githubRequestConfig, release, existin
                 console.error(`An unknown error occurred while trying to create a release on GitHub, please report this on https://github.com/nrwl/nx (NOTE: make sure to redact your GitHub token from the error message!)`);
             }
         }
-        const reply = await (0, enquirer_1.prompt)([
-            {
-                name: 'open',
-                message: 'Do you want to finish creating the release manually in your browser?',
-                type: 'autocomplete',
-                choices: [
-                    {
-                        name: 'Yes',
-                        hint: 'It will pre-populate the form for you',
-                    },
-                    {
-                        name: 'No',
-                    },
-                ],
-                initial: 0,
-            },
-        ]).catch(() => {
-            return { open: 'No' };
-        });
-        if (reply.open === 'Yes') {
-            const open = require('open');
-            await open(result.url)
-                .then(() => {
-                console.info(`\nFollow up in the browser to manually create the release:\n\n` +
-                    chalk.underline(chalk.cyan(result.url)) +
-                    `\n`);
-            })
-                .catch(() => {
-                console.info(`Open this link to manually create a release: \n` +
-                    chalk.underline(chalk.cyan(result.url)) +
-                    '\n');
-            });
+        const shouldContinueInGitHub = await promptForContinueInGitHub();
+        if (!shouldContinueInGitHub) {
+            return;
         }
+        const open = require('open');
+        await open(result.url)
+            .then(() => {
+            console.info(`\nFollow up in the browser to manually create the release:\n\n` +
+                chalk.underline(chalk.cyan(result.url)) +
+                `\n`);
+        })
+            .catch(() => {
+            console.info(`Open this link to manually create a release: \n` +
+                chalk.underline(chalk.cyan(result.url)) +
+                '\n');
+        });
     }
     /**
      * If something went wrong POSTing to Github we can still pre-populate the web form on github.com
@@ -116,6 +99,32 @@ async function createOrUpdateGithubRelease(githubRequestConfig, release, existin
     }
 }
 exports.createOrUpdateGithubRelease = createOrUpdateGithubRelease;
+async function promptForContinueInGitHub() {
+    try {
+        const reply = await (0, enquirer_1.prompt)([
+            {
+                name: 'open',
+                message: 'Do you want to finish creating the release manually in your browser?',
+                type: 'autocomplete',
+                choices: [
+                    {
+                        name: 'Yes',
+                        hint: 'It will pre-populate the form for you',
+                    },
+                    {
+                        name: 'No',
+                    },
+                ],
+                initial: 0,
+            },
+        ]);
+        return reply.open === 'Yes';
+    }
+    catch (e) {
+        // Handle the case where the user exits the prompt with ctrl+c
+        process.exit(1);
+    }
+}
 async function syncGithubRelease(githubRequestConfig, release, existingGithubReleaseForVersion) {
     const ghRelease = {
         tag_name: release.version,

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

@@ -144,9 +144,6 @@ async function releaseVersion(args) {
                 });
             }
         }
-        if (args.dryRun) {
-            devkit_exports_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
-        }
         return {
             // An overall workspace version cannot be relevant when filtering to independent projects
             workspaceVersion: undefined,
@@ -234,9 +231,6 @@ async function releaseVersion(args) {
             });
         }
     }
-    if (args.dryRun) {
-        devkit_exports_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
-    }
     return {
         workspaceVersion,
         projectsVersionData: versionData,