@nx/js 18.0.7 → 18.0.8

package/package.json

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

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseVersionGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const chalk = require("chalk");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
+const node_path_1 = require("node:path");
 const config_1 = require("nx/src/command-line/release/config/config");
 const git_1 = require("nx/src/command-line/release/utils/git");
 const resolve_semver_specifier_1 = require("nx/src/command-line/release/utils/resolve-semver-specifier");
@@ -11,7 +12,6 @@ const semver_1 = require("nx/src/command-line/release/utils/semver");
 const version_1 = require("nx/src/command-line/release/version");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const ora = require("ora");
-const path_1 = require("path");
 const semver_2 = require("semver");
 const resolve_local_package_dependencies_1 = require("./utils/resolve-local-package-dependencies");
 const update_lock_file_1 = require("./utils/update-lock-file");
@@ -39,36 +39,30 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
             options.fallbackCurrentVersionResolver = 'disk';
         }
         const projects = options.projects;
-        const createResolvePackageRoot = (customPackageRoot) => (projectNode) => {
-            // Default to the project root if no custom packageRoot
-            if (!customPackageRoot) {
-                return projectNode.data.root;
-            }
-            return (0, utils_1.interpolate)(customPackageRoot, {
-                workspaceRoot: '',
-                projectRoot: projectNode.data.root,
-                projectName: projectNode.name,
-            });
-        };
         const resolvePackageRoot = createResolvePackageRoot(options.packageRoot);
         // Resolve any custom package roots for each project upfront as they will need to be reused during dependency resolution
         const projectNameToPackageRootMap = new Map();
         for (const project of projects) {
             projectNameToPackageRootMap.set(project.name, resolvePackageRoot(project));
         }
-        let currentVersion;
+        let currentVersion = undefined;
         let currentVersionResolvedFromFallback = false;
         // only used for options.currentVersionResolver === 'git-tag', but
         // must be declared here in order to reuse it for additional projects
-        let latestMatchingGitTag;
+        let latestMatchingGitTag = undefined;
         // if specifier is undefined, then we haven't resolved it yet
         // if specifier is null, then it has been resolved and no changes are necessary
-        let specifier = options.specifier ? options.specifier : undefined;
+        let specifier = options.specifier
+            ? options.specifier
+            : undefined;
         for (const project of projects) {
             const projectName = project.name;
             const packageRoot = projectNameToPackageRootMap.get(projectName);
+            if (!packageRoot) {
+                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, devkit_1.joinPathFragments)(packageRoot, 'package.json');
-            const workspaceRelativePackageJsonPath = (0, path_1.relative)(devkit_1.workspaceRoot, packageJsonPath);
+            const workspaceRelativePackageJsonPath = (0, node_path_1.relative)(devkit_1.workspaceRoot, packageJsonPath);
             const color = getColor(projectName);
             const log = (msg) => {
                 console.log(color.instance.bold(projectName) + ' ' + msg);
@@ -102,7 +96,7 @@ To fix this you will either need to add a package.json file at that location, or
                         try {
                             // Must be non-blocking async to allow spinner to render
                             currentVersion = await new Promise((resolve, reject) => {
-                                (0, child_process_1.exec)(`npm view ${packageName} version --registry=${registry} --tag=${tag}`, (error, stdout, stderr) => {
+                                (0, node_child_process_1.exec)(`npm view ${packageName} version --registry=${registry} --tag=${tag}`, (error, stdout, stderr) => {
                                     if (error) {
                                         return reject(error);
                                     }
@@ -169,7 +163,9 @@ To fix this you will either need to add a package.json file at that location, or
                             log(`📄 Using the current version ${currentVersion} already resolved from disk fallback.`);
                         }
                         else {
-                            log(`📄 Using the current version ${currentVersion} already resolved from git tag "${latestMatchingGitTag.tag}".`);
+                            log(
+                            // 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}".`);
                         }
                     }
                     break;
@@ -195,7 +191,7 @@ To fix this you will either need to add a package.json file at that location, or
                     !options.specifier)) {
                 const specifierSource = options.specifierSource;
                 switch (specifierSource) {
-                    case 'conventional-commits':
+                    case 'conventional-commits': {
                         if (options.currentVersionResolver !== 'git-tag') {
                             throw new Error(`Invalid currentVersionResolver "${options.currentVersionResolver}" provided for release group "${options.releaseGroup.name}". Must be "git-tag" when "specifierSource" is "conventional-commits"`);
                         }
@@ -222,7 +218,7 @@ To fix this you will either need to add a package.json file at that location, or
                         //
                         // Always assume that if the current version is a prerelease, then the next version should be a prerelease.
                         // Users must manually graduate from a prerelease to a release by providing an explicit specifier.
-                        if ((0, semver_2.prerelease)(currentVersion)) {
+                        if ((0, semver_2.prerelease)(currentVersion ?? '')) {
                             specifier = 'prerelease';
                             log(`📄 Resolved the specifier as "${specifier}" since the current version is a prerelease.`);
                         }
@@ -230,6 +226,7 @@ To fix this you will either need to add a package.json file at that location, or
                             log(`📄 Resolved the specifier as "${specifier}" using git history and the conventional commits standard.`);
                         }
                         break;
+                    }
                     case 'prompt': {
                         // Only add the release group name to the log if it is one set by the user, otherwise it is useless noise
                         const maybeLogReleaseGroup = (log) => {
@@ -259,9 +256,13 @@ To fix this you will either need to add a package.json file at that location, or
                 .filter((localPackageDependency) => {
                 return localPackageDependency.target === project.name;
             });
+            if (!currentVersion) {
+                throw new Error(`The current version for project "${project.name}" could not be resolved. Please report this on https://github.com/nrwl/nx`);
+            }
             versionData[projectName] = {
                 currentVersion,
                 dependentProjects,
+                // @ts-ignore: The types will be updated in a future version of Nx
                 newVersion: null, // will stay as null in the final result in the case that no changes are detected
             };
             if (!specifier) {
@@ -281,7 +282,11 @@ To fix this you will either need to add a package.json file at that location, or
                     : 'package which depends'} on ${project.name}`);
             }
             for (const dependentProject of dependentProjects) {
-                (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectNameToPackageRootMap.get(dependentProject.source), 'package.json'), (json) => {
+                const dependentPackageRoot = projectNameToPackageRootMap.get(dependentProject.source);
+                if (!dependentPackageRoot) {
+                    throw new Error(`The dependent project "${dependentProject.source}" does not have a packageRoot available. Please report this issue on https://github.com/nrwl/nx`);
+                }
+                (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(dependentPackageRoot, 'package.json'), (json) => {
                     // Auto (i.e.infer existing) by default
                     let versionPrefix = options.versionPrefix ?? 'auto';
                     // For auto, we infer the prefix based on the current version of the dependent
@@ -304,7 +309,7 @@ To fix this you will either need to add a package.json file at that location, or
             }
         }
         /**
-         * Ensure that formatting is applied so that version bump diffs are as mimimal as possible
+         * Ensure that formatting is applied so that version bump diffs are as minimal as possible
          * within the context of the user's workspace.
          */
         await (0, devkit_1.formatFiles)(tree);
@@ -336,6 +341,19 @@ To fix this you will either need to add a package.json file at that location, or
 }
 exports.releaseVersionGenerator = releaseVersionGenerator;
 exports.default = releaseVersionGenerator;
+function createResolvePackageRoot(customPackageRoot) {
+    return (projectNode) => {
+        // Default to the project root if no custom packageRoot
+        if (!customPackageRoot) {
+            return projectNode.data.root;
+        }
+        return (0, utils_1.interpolate)(customPackageRoot, {
+            workspaceRoot: '',
+            projectRoot: projectNode.data.root,
+            projectName: projectNode.name,
+        });
+    };
+}
 const colors = [
     { instance: chalk.green, spinnerColor: 'green' },
     { instance: chalk.greenBright, spinnerColor: 'green' },
@@ -359,7 +377,7 @@ function getColor(projectName) {
 async function getNpmRegistry() {
     // Must be non-blocking async to allow spinner to render
     return await new Promise((resolve, reject) => {
-        (0, child_process_1.exec)('npm config get registry', (error, stdout, stderr) => {
+        (0, node_child_process_1.exec)('npm config get registry', (error, stdout, stderr) => {
             if (error) {
                 return reject(error);
             }

package/src/generators/release-version/utils/resolve-local-package-dependencies.d.ts

@@ -1,5 +1,11 @@
 import { ProjectGraph, ProjectGraphDependency, ProjectGraphProjectNode, Tree } from '@nx/devkit';
 interface LocalPackageDependency extends ProjectGraphDependency {
+    /**
+     * The rawVersionSpec contains the value of the version spec as it was defined in the package.json
+     * of the dependent project. This can be useful in cases where the version spec is a range, path or
+     * workspace reference, and it needs to be be reverted to that original value as part of the release.
+     */
+    rawVersionSpec: string;
     dependencyCollection: 'dependencies' | 'devDependencies' | 'optionalDependencies';
 }
 export declare function resolveLocalPackageDependencies(tree: Tree, projectGraph: ProjectGraph, filteredProjects: ProjectGraphProjectNode[], projectNameToPackageRootMap: Map<string, string>, resolvePackageRoot: (projectNode: ProjectGraphProjectNode) => string, includeAll?: boolean): Record<string, LocalPackageDependency[]>;

package/src/generators/release-version/utils/resolve-local-package-dependencies.js

@@ -64,6 +64,7 @@ function resolveLocalPackageDependencies(tree, projectGraph, filteredProjects, p
                     {
                         ...dep,
                         dependencyCollection: sourceNpmDependency.collection,
+                        rawVersionSpec: sourceNpmDependency.spec,
                     },
                 ];
             }