@nx/devkit 17.3.0-beta.3 → 17.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.4",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -34,7 +34,7 @@
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
     "semver": "7.5.3",
-    "@nrwl/devkit": "17.3.0-beta.3"
+    "@nrwl/devkit": "17.3.0-beta.4"
   },
   "peerDependencies": {
     "nx": ">= 16 <= 18"

package/src/utils/package-json.d.ts

@@ -13,9 +13,10 @@ import type { GeneratorCallback } from 'nx/src/config/misc-interfaces';
  * @param dependencies Dependencies to be added to the dependencies section of package.json
  * @param devDependencies Dependencies to be added to the devDependencies section of package.json
  * @param packageJsonPath Path to package.json
+ * @param keepExistingVersions If true, prevents existing dependencies from being bumped to newer versions
  * @returns Callback to install dependencies only if necessary, no-op otherwise
  */
-export declare function addDependenciesToPackageJson(tree: Tree, dependencies: Record<string, string>, devDependencies: Record<string, string>, packageJsonPath?: string): GeneratorCallback;
+export declare function addDependenciesToPackageJson(tree: Tree, dependencies: Record<string, string>, devDependencies: Record<string, string>, packageJsonPath?: string, keepExistingVersions?: boolean): GeneratorCallback;
 /**
  * Remove Dependencies and Dev Dependencies from package.json
  *

package/src/utils/package-json.js

@@ -86,9 +86,10 @@ function updateExistingDependenciesVersion(dependencies, existingDependencies =
  * @param dependencies Dependencies to be added to the dependencies section of package.json
  * @param devDependencies Dependencies to be added to the devDependencies section of package.json
  * @param packageJsonPath Path to package.json
+ * @param keepExistingVersions If true, prevents existing dependencies from being bumped to newer versions
  * @returns Callback to install dependencies only if necessary, no-op otherwise
  */
-function addDependenciesToPackageJson(tree, dependencies, devDependencies, packageJsonPath = 'package.json') {
+function addDependenciesToPackageJson(tree, dependencies, devDependencies, packageJsonPath = 'package.json', keepExistingVersions) {
     const currentPackageJson = readJson(tree, packageJsonPath);
     /** Dependencies to install that are not met in dev dependencies */
     let filteredDependencies = filterExistingDependencies(dependencies, currentPackageJson.devDependencies);
@@ -96,6 +97,7 @@ function addDependenciesToPackageJson(tree, dependencies, devDependencies, packa
     let filteredDevDependencies = filterExistingDependencies(devDependencies, currentPackageJson.dependencies);
     // filtered dependencies should consist of:
     // - dependencies of the same type that are not present
+    // by default, filtered dependencies also include these (unless keepExistingVersions is true):
     // - dependencies of the same type that have greater version
     // - specified dependencies of the other type that have greater version and are already installed as current type
     filteredDependencies = {
@@ -106,8 +108,14 @@ function addDependenciesToPackageJson(tree, dependencies, devDependencies, packa
         ...updateExistingDependenciesVersion(filteredDevDependencies, currentPackageJson.devDependencies),
         ...updateExistingAltDependenciesVersion(dependencies, currentPackageJson.devDependencies),
     };
-    filteredDependencies = removeLowerVersions(filteredDependencies, currentPackageJson.dependencies);
-    filteredDevDependencies = removeLowerVersions(filteredDevDependencies, currentPackageJson.devDependencies);
+    if (keepExistingVersions) {
+        filteredDependencies = removeExistingDependencies(filteredDependencies, currentPackageJson.dependencies);
+        filteredDevDependencies = removeExistingDependencies(filteredDevDependencies, currentPackageJson.devDependencies);
+    }
+    else {
+        filteredDependencies = removeLowerVersions(filteredDependencies, currentPackageJson.dependencies);
+        filteredDevDependencies = removeLowerVersions(filteredDevDependencies, currentPackageJson.devDependencies);
+    }
     if (requiresAddingOfPackages(currentPackageJson, filteredDependencies, filteredDevDependencies)) {
         updateJson(tree, packageJsonPath, (json) => {
             json.dependencies = {
@@ -134,11 +142,19 @@ exports.addDependenciesToPackageJson = addDependenciesToPackageJson;
  **/
 function removeLowerVersions(incomingDeps, existingDeps) {
     return Object.keys(incomingDeps).reduce((acc, d) => {
-        if (existingDeps?.[d] &&
-            !isIncomingVersionGreater(incomingDeps[d], existingDeps[d])) {
-            return acc;
+        if (!existingDeps?.[d] ||
+            isIncomingVersionGreater(incomingDeps[d], existingDeps[d])) {
+            acc[d] = incomingDeps[d];
+        }
+        return acc;
+    }, {});
+}
+function removeExistingDependencies(incomingDeps, existingDeps) {
+    return Object.keys(incomingDeps).reduce((acc, d) => {
+        if (!existingDeps?.[d]) {
+            acc[d] = incomingDeps[d];
         }
-        return { ...acc, [d]: incomingDeps[d] };
+        return acc;
     }, {});
 }
 /**