@nx/js 19.6.0-beta.0 → 19.6.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.6.0-beta.0",
+  "version": "19.6.0-beta.1",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -58,9 +58,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.6.0-beta.0",
-    "@nx/workspace": "19.6.0-beta.0",
-    "@nrwl/js": "19.6.0-beta.0"
+    "@nx/devkit": "19.6.0-beta.1",
+    "@nx/workspace": "19.6.0-beta.1",
+    "@nrwl/js": "19.6.0-beta.1"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/generators/release-version/release-version.js

@@ -19,6 +19,7 @@ const resolve_local_package_dependencies_1 = require("./utils/resolve-local-pack
 const sort_projects_topologically_1 = require("./utils/sort-projects-topologically");
 const update_lock_file_1 = require("./utils/update-lock-file");
 async function releaseVersionGenerator(tree, options) {
+    let logger;
     try {
         const versionData = {};
         // If the user provided a specifier, validate that it is valid semver or a relative semver keyword
@@ -67,6 +68,8 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
             ? options.specifier
             : undefined;
         const deleteVersionPlanCallbacks = [];
+        // If the user has set the logUnchangedProjects option to false, we will not print any logs for projects that have no changes.
+        const logUnchangedProjects = options.logUnchangedProjects ?? true;
         for (const project of projects) {
             const projectName = project.name;
             const packageRoot = projectNameToPackageRootMap.get(projectName);
@@ -74,18 +77,15 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
                 throw new Error(`The project "${projectName}" does not have a packageRoot available. Please report this issue on https://github.com/nrwl/nx`);
             }
             const packageJsonPath = (0, node_path_1.join)(packageRoot, 'package.json');
-            const color = getColor(projectName);
-            const log = (msg) => {
-                console.log(color.instance.bold(projectName) + ' ' + msg);
-            };
             if (!tree.exists(packageJsonPath)) {
                 throw new Error(`The project "${projectName}" does not have a package.json available at ${packageJsonPath}.
 
 To fix this you will either need to add a package.json file at that location, or configure "release" within your nx.json to exclude "${projectName}" from the current release group, or amend the packageRoot configuration to point to where the package.json should be.`);
             }
-            devkit_1.output.logSingleLine(`Running release version for project: ${color.instance.bold(project.name)}`);
+            const color = getColor(projectName);
+            logger = new ProjectLogger(projectName, color);
             const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
-            log(`🔍 Reading data for package "${packageJson.name}" from ${packageJsonPath}`);
+            logger.buffer(`🔍 Reading data for package "${packageJson.name}" from ${packageJsonPath}`);
             const { name: packageName, version: currentVersionFromDisk } = packageJson;
             switch (options.currentVersionResolver) {
                 case 'registry': {
@@ -128,12 +128,12 @@ To fix this you will either need to add a package.json file at that location, or
                                 });
                             });
                             spinner.stop();
-                            log(`📄 Resolved the current version as ${currentVersion} for tag "${tag}" from registry ${registry}`);
+                            logger.buffer(`📄 Resolved the current version as ${currentVersion} for tag "${tag}" from registry ${registry}`);
                         }
                         catch (e) {
                             spinner.stop();
                             if (options.fallbackCurrentVersionResolver === 'disk') {
-                                log(`📄 Unable to resolve the current version from the registry ${registry}. Falling back to the version on disk of ${currentVersionFromDisk}`);
+                                logger.buffer(`📄 Unable to resolve the current version from the registry ${registry}. Falling back to the version on disk of ${currentVersionFromDisk}`);
                                 currentVersion = currentVersionFromDisk;
                                 currentVersionResolvedFromFallback = true;
                             }
@@ -144,10 +144,10 @@ To fix this you will either need to add a package.json file at that location, or
                     }
                     else {
                         if (currentVersionResolvedFromFallback) {
-                            log(`📄 Using the current version ${currentVersion} already resolved from disk fallback.`);
+                            logger.buffer(`📄 Using the current version ${currentVersion} already resolved from disk fallback.`);
                         }
                         else {
-                            log(`📄 Using the current version ${currentVersion} already resolved from the registry ${registry}`);
+                            logger.buffer(`📄 Using the current version ${currentVersion} already resolved from the registry ${registry}`);
                         }
                     }
                     break;
@@ -157,7 +157,7 @@ To fix this you will either need to add a package.json file at that location, or
                     if (!currentVersion) {
                         throw new Error(`Unable to determine the current version for project "${project.name}" from ${packageJsonPath}`);
                     }
-                    log(`📄 Resolved the current version as ${currentVersion} from ${packageJsonPath}`);
+                    logger.buffer(`📄 Resolved the current version as ${currentVersion} from ${packageJsonPath}`);
                     break;
                 case 'git-tag': {
                     if (!currentVersion ||
@@ -169,7 +169,7 @@ To fix this you will either need to add a package.json file at that location, or
                         });
                         if (!latestMatchingGitTag) {
                             if (options.fallbackCurrentVersionResolver === 'disk') {
-                                log(`📄 Unable to resolve the current version from git tag using pattern "${releaseTagPattern}". Falling back to the version on disk of ${currentVersionFromDisk}`);
+                                logger.buffer(`📄 Unable to resolve the current version from git tag using pattern "${releaseTagPattern}". Falling back to the version on disk of ${currentVersionFromDisk}`);
                                 currentVersion = currentVersionFromDisk;
                                 currentVersionResolvedFromFallback = true;
                             }
@@ -179,15 +179,15 @@ To fix this you will either need to add a package.json file at that location, or
                         }
                         else {
                             currentVersion = latestMatchingGitTag.extractedVersion;
-                            log(`📄 Resolved the current version as ${currentVersion} from git tag "${latestMatchingGitTag.tag}".`);
+                            logger.buffer(`📄 Resolved the current version as ${currentVersion} from git tag "${latestMatchingGitTag.tag}".`);
                         }
                     }
                     else {
                         if (currentVersionResolvedFromFallback) {
-                            log(`📄 Using the current version ${currentVersion} already resolved from disk fallback.`);
+                            logger.buffer(`📄 Using the current version ${currentVersion} already resolved from disk fallback.`);
                         }
                         else {
-                            log(
+                            logger.buffer(
                             // In this code path we know that latestMatchingGitTag is defined, because we are not relying on the fallbackCurrentVersionResolver, so we can safely use the non-null assertion operator
                             `📄 Using the current version ${currentVersion} already resolved from git tag "${latestMatchingGitTag.tag}".`);
                         }
@@ -198,7 +198,7 @@ To fix this you will either need to add a package.json file at that location, or
                     throw new Error(`Invalid value for options.currentVersionResolver: ${options.currentVersionResolver}`);
             }
             if (options.specifier) {
-                log(`📄 Using the provided version specifier "${options.specifier}".`);
+                logger.buffer(`📄 Using the provided version specifier "${options.specifier}".`);
                 // The user is forcibly overriding whatever specifierSource they had otherwise set by imperatively providing a specifier
                 options.specifierSource = 'prompt';
             }
@@ -240,10 +240,10 @@ To fix this you will either need to add a package.json file at that location, or
                             if (projectToDependencyBumps.has(projectName)) {
                                 // No applicable changes to the project directly by the user, but one or more dependencies have been bumped and updateDependents is enabled
                                 specifier = updateDependentsBump;
-                                log(`📄 Resolved the specifier as "${specifier}" because "release.version.generatorOptions.updateDependents" is enabled`);
+                                logger.buffer(`📄 Resolved the specifier as "${specifier}" because "release.version.generatorOptions.updateDependents" is enabled`);
                                 break;
                             }
-                            log(`🚫 No changes were detected using git history and the conventional commits standard.`);
+                            logger.buffer(`🚫 No changes were detected using git history and the conventional commits standard.`);
                             break;
                         }
                         // TODO: reevaluate this prerelease logic/workflow for independent projects
@@ -252,7 +252,7 @@ To fix this you will either need to add a package.json file at that location, or
                         // Users must manually graduate from a prerelease to a release by providing an explicit specifier.
                         if ((0, semver_2.prerelease)(currentVersion ?? '')) {
                             specifier = 'prerelease';
-                            log(`📄 Resolved the specifier as "${specifier}" since the current version is a prerelease.`);
+                            logger.buffer(`📄 Resolved the specifier as "${specifier}" since the current version is a prerelease.`);
                         }
                         else {
                             let extraText = '';
@@ -260,7 +260,7 @@ To fix this you will either need to add a package.json file at that location, or
                                 specifier = `pre${specifier}`;
                                 extraText = `, combined with your given preid "${options.preid}"`;
                             }
-                            log(`📄 Resolved the specifier as "${specifier}" using git history and the conventional commits standard${extraText}.`);
+                            logger.buffer(`📄 Resolved the specifier as "${specifier}" using git history and the conventional commits standard${extraText}.`);
                         }
                         break;
                     }
@@ -321,15 +321,15 @@ To fix this you will either need to add a package.json file at that location, or
                                 projectToDependencyBumps.has(projectName)) {
                                 // No applicable changes to the project directly by the user, but one or more dependencies have been bumped and updateDependents is enabled
                                 specifier = updateDependentsBump;
-                                log(`📄 Resolved the specifier as "${specifier}" because "release.version.generatorOptions.updateDependents" is enabled`);
+                                logger.buffer(`📄 Resolved the specifier as "${specifier}" because "release.version.generatorOptions.updateDependents" is enabled`);
                             }
                             else {
                                 specifier = null;
-                                log(`🚫 No changes were detected within version plans.`);
+                                logger.buffer(`🚫 No changes were detected within version plans.`);
                             }
                         }
                         else {
-                            log(`📄 Resolved the specifier as "${specifier}" using version plans.`);
+                            logger.buffer(`📄 Resolved the specifier as "${specifier}" using version plans.`);
                         }
                         if (options.deleteVersionPlans) {
                             options.releaseGroup.versionPlans.forEach((p) => {
@@ -420,7 +420,7 @@ To fix this you will either need to add a package.json file at that location, or
                         .map((dependentProject) => `${indent}- ${dependentProject.source}`)
                         .join('\n')}`;
                     logMsg += `\n${indent}=> You can adjust this behavior by setting \`version.generatorOptions.updateDependents\` to "auto"`;
-                    log(logMsg);
+                    logger.buffer(logMsg);
                 }
             }
             if (!currentVersion) {
@@ -434,7 +434,11 @@ To fix this you will either need to add a package.json file at that location, or
                     : dependentProjectsInCurrentBatch,
             };
             if (!specifier) {
-                log(`🚫 Skipping versioning "${packageJson.name}" as no changes were detected.`);
+                logger.buffer(`🚫 Skipping versioning "${packageJson.name}" as no changes were detected.`);
+                // Print the buffered logs for this unchanged project, as long as the user has not explicitly disabled this behavior
+                if (logUnchangedProjects) {
+                    logger.flush();
+                }
                 continue;
             }
             const newVersion = (0, version_1.deriveNewSemverVersion)(currentVersion, specifier, options.preid);
@@ -443,7 +447,7 @@ To fix this you will either need to add a package.json file at that location, or
                 ...packageJson,
                 version: newVersion,
             });
-            log(`✍️  New version ${newVersion} written to ${packageJsonPath}`);
+            logger.buffer(`✍️  New version ${newVersion} written to ${packageJsonPath}`);
             if (allDependentProjects.length > 0) {
                 const totalProjectsToUpdate = updateDependents === 'auto'
                     ? allDependentProjects.length +
@@ -452,7 +456,7 @@ To fix this you will either need to add a package.json file at that location, or
                         circularDependencies.size / 2
                     : dependentProjectsInCurrentBatch.length;
                 if (totalProjectsToUpdate > 0) {
-                    log(`✍️  Applying new version ${newVersion} to ${totalProjectsToUpdate} ${totalProjectsToUpdate > 1
+                    logger.buffer(`✍️  Applying new version ${newVersion} to ${totalProjectsToUpdate} ${totalProjectsToUpdate > 1
                         ? 'packages which depend'
                         : 'package which depends'} on ${project.name}`);
                 }
@@ -555,6 +559,8 @@ To fix this you will either need to add a package.json file at that location, or
                         : updateDependentsBump,
                 });
             }
+            // Print the logs that have been buffered for this project
+            logger.flush();
         }
         /**
          * Ensure that formatting is applied so that version bump diffs are as minimal as possible
@@ -577,6 +583,8 @@ To fix this you will either need to add a package.json file at that location, or
         };
     }
     catch (e) {
+        // Flush any pending logs before printing the error to make troubleshooting easier
+        logger?.flush();
         if (process.env.NX_VERBOSE_LOGGING === 'true') {
             devkit_1.output.error({
                 title: e.message,
@@ -630,3 +638,19 @@ function getColor(projectName) {
     const colorIndex = code % colors.length;
     return colors[colorIndex];
 }
+class ProjectLogger {
+    constructor(projectName, color) {
+        this.projectName = projectName;
+        this.color = color;
+        this.logs = [];
+    }
+    buffer(msg) {
+        this.logs.push(msg);
+    }
+    flush() {
+        devkit_1.output.logSingleLine(`Running release version for project: ${this.color.instance.bold(this.projectName)}`);
+        this.logs.forEach((msg) => {
+            console.log(this.color.instance.bold(this.projectName) + ' ' + msg);
+        });
+    }
+}