@nx/js 21.0.0-beta.8 → 21.0.0-beta.9

package/migrations.json

@@ -1,78 +1,6 @@
 {
-  "generators": {
-    "update-17-0-0-remove-deprecated-build-options": {
-      "cli": "nx",
-      "version": "17.0.2",
-      "description": "Remove deprecated build options",
-      "implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options"
-    }
-  },
+  "generators": {},
   "packageJsonUpdates": {
-    "17.0.0": {
-      "version": "17.0.0-rc.2",
-      "packages": {
-        "esbuild": {
-          "version": "^0.19.2",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "17.1.0": {
-      "version": "17.1.0-beta.4",
-      "x-prompt": "Do you want to update to TypeScript v5.2?",
-      "requires": {
-        "typescript": ">=5.1.0 <5.2.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.2.2"
-        }
-      }
-    },
-    "17.3.0": {
-      "version": "17.3.0-beta.3",
-      "packages": {
-        "@types/node": {
-          "version": "^18.16.9",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "17.3.0-beta.10": {
-      "version": "17.3.0-beta.10",
-      "x-prompt": "Do you want to update to TypeScript v5.3?",
-      "requires": {
-        "typescript": ">=5.2.0 <5.3.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.3.2",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "18.0.4": {
-      "version": "18.0.4-beta.0",
-      "packages": {
-        "@swc-node/register": {
-          "version": "~1.8.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "18.2.0": {
-      "version": "18.2.0-beta.0",
-      "x-prompt": "Do you want to update to TypeScript v5.4?",
-      "requires": {
-        "typescript": ">=5.3.0 <5.4.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.4.2",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "19.0.0": {
       "version": "19.0.0-beta.0",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "21.0.0-beta.8",
+  "version": "21.0.0-beta.9",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "21.0.0-beta.8",
-    "@nx/workspace": "21.0.0-beta.8",
+    "@nx/devkit": "21.0.0-beta.9",
+    "@nx/workspace": "21.0.0-beta.9",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",

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

@@ -656,7 +656,7 @@ To fix this you will either need to add a package.json file at that location, or
         // Return the version data so that it can be leveraged by the overall version command
         return {
             data: versionData,
-            callback: async (tree, opts) => {
+            callback: async (tree, { generatorOptions, ...opts }) => {
                 const changedFiles = [];
                 const deletedFiles = [];
                 for (const cb of deleteVersionPlanCallbacks) {
@@ -666,6 +666,7 @@ To fix this you will either need to add a package.json file at that location, or
                 changedFiles.push(...(await (0, update_lock_file_1.updateLockFile)(cwd, {
                     ...opts,
                     useLegacyVersioning: true,
+                    options: generatorOptions,
                 })));
                 return { changedFiles, deletedFiles };
             },

package/src/release/version-actions.d.ts

@@ -1,6 +1,6 @@
 import { ProjectGraph, Tree } from '@nx/devkit';
 import { AfterAllProjectsVersioned, VersionActions } from 'nx/release';
-import type { NxReleaseVersionV2Configuration } from 'nx/src/config/nx-json';
+import type { NxReleaseVersionConfiguration } from 'nx/src/config/nx-json';
 export declare const afterAllProjectsVersioned: AfterAllProjectsVersioned;
 export default class JsVersionActions extends VersionActions {
     validManifestFilenames: string[];
@@ -8,7 +8,7 @@ export default class JsVersionActions extends VersionActions {
         currentVersion: string;
         manifestPath: string;
     }>;
-    readCurrentVersionFromRegistry(tree: Tree, currentVersionResolverMetadata: NxReleaseVersionV2Configuration['currentVersionResolverMetadata']): Promise<{
+    readCurrentVersionFromRegistry(tree: Tree, currentVersionResolverMetadata: NxReleaseVersionConfiguration['currentVersionResolverMetadata']): Promise<{
         currentVersion: string;
         logText: string;
     }>;
@@ -16,7 +16,7 @@ export default class JsVersionActions extends VersionActions {
         currentVersion: string | null;
         dependencyCollection: string | null;
     }>;
-    isLocalDependencyProtocol(versionSpecifier: string): Promise<boolean>;
     updateProjectVersion(tree: Tree, newVersion: string): Promise<string[]>;
     updateProjectDependencies(tree: Tree, projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
+    private isLocalDependencyProtocol;
 }

package/src/release/version-actions.js

@@ -8,11 +8,12 @@ const release_1 = require("nx/release");
 const npm_config_1 = require("../utils/npm-config");
 const update_lock_file_1 = require("./utils/update-lock-file");
 const chalk = require("chalk");
-const afterAllProjectsVersioned = async (cwd, opts) => {
+const afterAllProjectsVersioned = async (cwd, { rootVersionActionsOptions, ...opts }) => {
     return {
         changedFiles: await (0, update_lock_file_1.updateLockFile)(cwd, {
             ...opts,
             useLegacyVersioning: false,
+            options: rootVersionActionsOptions,
         }),
         deletedFiles: [],
     };
@@ -104,61 +105,25 @@ class JsVersionActions extends release_1.VersionActions {
             dependencyCollection,
         };
     }
-    // NOTE: The TODOs were carried over from the original implementation, they are not yet implemented
-    async isLocalDependencyProtocol(versionSpecifier) {
-        const localPackageProtocols = [
-            'file:', // all package managers
-            'workspace:', // not npm
-            // TODO: Support portal protocol at the project graph level before enabling here
-            // 'portal:', // modern yarn only
-        ];
-        // Not using a supported local protocol
-        if (!localPackageProtocols.some((protocol) => versionSpecifier.startsWith(protocol))) {
-            return false;
-        }
-        // Supported by all package managers
-        if (versionSpecifier.startsWith('file:')) {
-            return true;
-        }
-        // Determine specific package manager in use
-        if (!pm) {
-            pm = (0, devkit_1.detectPackageManager)();
-            // pmVersion = getPackageManagerVersion(pm);
-        }
-        if (pm === 'npm' && versionSpecifier.startsWith('workspace:')) {
-            throw new Error(`The "workspace:" protocol is not yet supported by npm (https://github.com/npm/rfcs/issues/765). Please ensure you have a valid setup according to your package manager before attempting to release packages.`);
-        }
-        // TODO: Support portal protocol at the project graph level before enabling here
-        // if (
-        //   version.startsWith('portal:') &&
-        //   (pm !== 'yarn' || lt(pmVersion, '2.0.0'))
-        // ) {
-        //   throw new Error(
-        //     `The "portal:" protocol is only supported by yarn@2.0.0 and above. Please ensure you have a valid setup according to your package manager before attempting to release packages.`
-        //   );
-        // }
-        return true;
-    }
     async updateProjectVersion(tree, newVersion) {
         const logMessages = [];
-        for (const manifestPath of this.manifestsToUpdate) {
-            (0, devkit_1.updateJson)(tree, manifestPath, (json) => {
+        for (const manifestToUpdate of this.manifestsToUpdate) {
+            (0, devkit_1.updateJson)(tree, manifestToUpdate.manifestPath, (json) => {
                 json.version = newVersion;
                 return json;
             });
-            logMessages.push(`✍️  New version ${newVersion} written to manifest: ${manifestPath}`);
+            logMessages.push(`✍️  New version ${newVersion} written to manifest: ${manifestToUpdate.manifestPath}`);
         }
         return logMessages;
     }
     async updateProjectDependencies(tree, projectGraph, dependenciesToUpdate) {
-        const numDependenciesToUpdate = Object.keys(dependenciesToUpdate).length;
-        const depText = numDependenciesToUpdate === 1 ? 'dependency' : 'dependencies';
+        let numDependenciesToUpdate = Object.keys(dependenciesToUpdate).length;
         if (numDependenciesToUpdate === 0) {
             return [];
         }
         const logMessages = [];
-        for (const manifestPath of this.manifestsToUpdate) {
-            (0, devkit_1.updateJson)(tree, manifestPath, (json) => {
+        for (const manifestToUpdate of this.manifestsToUpdate) {
+            (0, devkit_1.updateJson)(tree, manifestToUpdate.manifestPath, (json) => {
                 const dependencyTypes = [
                     'dependencies',
                     'devDependencies',
@@ -173,7 +138,15 @@ class JsVersionActions extends release_1.VersionActions {
                             if (!packageName) {
                                 throw new Error(`Unable to determine the package name for project "${dep}" from the project graph metadata, please ensure that the "@nx/js" plugin is installed and the project graph has been built. If the issue persists, please report this issue on https://github.com/nrwl/nx/issues`);
                             }
-                            if (json[depType][packageName]) {
+                            const currentVersion = json[depType][packageName];
+                            if (currentVersion) {
+                                // Check if the local dependency protocol should be preserved or not
+                                if (manifestToUpdate.preserveLocalDependencyProtocols &&
+                                    this.isLocalDependencyProtocol(currentVersion)) {
+                                    // Reduce the count appropriately to avoid confusing user-facing logs
+                                    numDependenciesToUpdate--;
+                                    continue;
+                                }
                                 json[depType][packageName] = version;
                             }
                         }
@@ -181,9 +154,49 @@ class JsVersionActions extends release_1.VersionActions {
                 }
                 return json;
             });
-            logMessages.push(`✍️  Updated ${numDependenciesToUpdate} ${depText} in manifest: ${manifestPath}`);
+            // If we ignored local dependecy protocols, then we could have dynamically ended up with zero here and we should not log anything related to dependencies
+            if (numDependenciesToUpdate === 0) {
+                return [];
+            }
+            const depText = numDependenciesToUpdate === 1 ? 'dependency' : 'dependencies';
+            logMessages.push(`✍️  Updated ${numDependenciesToUpdate} ${depText} in manifest: ${manifestToUpdate.manifestPath}`);
         }
         return logMessages;
     }
+    // NOTE: The TODOs were carried over from the original implementation, they are not yet implemented
+    isLocalDependencyProtocol(versionSpecifier) {
+        const localPackageProtocols = [
+            'file:', // all package managers
+            'workspace:', // not npm
+            // TODO: Support portal protocol at the project graph level before enabling here
+            // 'portal:', // modern yarn only
+        ];
+        // Not using a supported local protocol
+        if (!localPackageProtocols.some((protocol) => versionSpecifier.startsWith(protocol))) {
+            return false;
+        }
+        // Supported by all package managers
+        if (versionSpecifier.startsWith('file:')) {
+            return true;
+        }
+        // Determine specific package manager in use
+        if (!pm) {
+            pm = (0, devkit_1.detectPackageManager)();
+            // pmVersion = getPackageManagerVersion(pm);
+        }
+        if (pm === 'npm' && versionSpecifier.startsWith('workspace:')) {
+            throw new Error(`The "workspace:" protocol is not yet supported by npm (https://github.com/npm/rfcs/issues/765). Please ensure you have a valid setup according to your package manager before attempting to release packages.`);
+        }
+        // TODO: Support portal protocol at the project graph level before enabling here
+        // if (
+        //   version.startsWith('portal:') &&
+        //   (pm !== 'yarn' || lt(pmVersion, '2.0.0'))
+        // ) {
+        //   throw new Error(
+        //     `The "portal:" protocol is only supported by yarn@2.0.0 and above. Please ensure you have a valid setup according to your package manager before attempting to release packages.`
+        //   );
+        // }
+        return true;
+    }
 }
 exports.default = JsVersionActions;

package/src/utils/add-local-registry-scripts.js

@@ -30,7 +30,7 @@ export default async () => {
     gitCommit: false,
     gitTag: false,
     firstRelease: true,
-    generatorOptionsOverrides: {
+    versionActionsOptionsOverrides: {
       skipLockFileUpdate: true
     }
   });

package/src/migrations/update-17-0-0/remove-deprecated-build-options.d.ts

@@ -1,6 +0,0 @@
-import { Tree } from '@nx/devkit';
-/**
- * Removes deprecated
- * @param tree
- */
-export default function (tree: Tree): Promise<void>;

package/src/migrations/update-17-0-0/remove-deprecated-build-options.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-/**
- * Removes deprecated
- * @param tree
- */
-async function default_1(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [projectName, projectConfig] of projects) {
-        let shouldUpdate = false;
-        if (!projectConfig.targets)
-            continue;
-        for (const target of Object.values(projectConfig.targets)) {
-            if (target.executor?.startsWith('@nx/') &&
-                target.options &&
-                ('buildableProjectDepsInPackageJsonType' in target.options ||
-                    'updateBuildableProjectDepsInPackageJson' in target.options)) {
-                delete target.options['buildableProjectDepsInPackageJsonType'];
-                delete target.options['updateBuildableProjectDepsInPackageJson'];
-                shouldUpdate = true;
-            }
-        }
-        if (shouldUpdate) {
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}