Merge pull request #6 from ImJohnMDaniel:release/v0.8.2

Release/v0.8.2
ImJohnMDaniel · Mar 27, 2022 · a5f79ed · a5f79ed
2 parents b5946a0 + 1835ab7
commit a5f79ed
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 140 deletions.
diff --git a/package.json b/package.json
@@ -1,37 +1,37 @@
 {
   "name": "@dx-cli-toolbox/sfdx-toolbox-package-utils",
   "description": "Utilities to better manage SalesforceDX Packages",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "author": "John M. Daniel @ImJohnMDaniel",
   "bugs": "https://github.com/ImJohnMDaniel/sfdx-toolbox-package-utils/issues",
   "dependencies": {
     "@oclif/command": "^1.8.16",
-    "@oclif/config": "^1.18.2",
+    "@oclif/config": "^1.18.3",
     "@oclif/errors": "^1.3.5",
     "@rauschma/stringio": "^1.4.0",
     "@salesforce/command": "^4.2.1",
-    "@salesforce/core": "^2.33.1",
-    "fs-extra": "^10.0.0",
-    "inquirer": "^8.2.0",
+    "@salesforce/core": "^2.35.3",
+    "fs-extra": "^10.0.1",
+    "inquirer": "^8.2.1",
     "intercept-stdout": "^0.1.2",
-    "salesforce-alm": "^53.7.2",
+    "salesforce-alm": "^54.0.2",
     "tslib": "^2.3.1"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.10",
-    "@oclif/plugin-help": "^5.1.10",
-    "@oclif/test": "^2.0.3",
-    "@salesforce/dev-config": "^3.0.0",
+    "@oclif/plugin-help": "^5.1.12",
+    "@oclif/test": "^2.1.0",
+    "@salesforce/dev-config": "^3.0.1",
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^17.0.2",
-    "chai": "^4.3.4",
+    "@types/node": "^17.0.22",
+    "chai": "^4.3.6",
     "globby": "^11.0.1",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.2",
     "nyc": "^15.1.0",
     "sinon": "^12.0.1",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.4"
+    "ts-node": "^10.7.0",
+    "typescript": "^4.6.2"
   },
   "engines": {
     "node": ">=12.0.0"

diff --git a/referencedxproject/sfdx-project.json b/referencedxproject/sfdx-project.json
@@ -1,75 +1,36 @@
 {
   "packageDirectories": [
-      {
-          "path": "sfdx-source/core",
-          "default": true,
-          "dependencies": [
-              {
-                  "package": "x103.framework-globals",
-                  "versionNumber": "0.1.0.LATEST"
-              },
-              {
-                  "package": "x103.framework",
-                  "versionNumber": "0.1.0.LATEST"
-              },
-              {
-                  "package": "referencePackageA",
-                  "versionNumber": "0.1-LATEST"
-              },
-              {
-                  "package": "referencePackageB",
-                  "versionNumber": "0.1.0.LATEST"
-              }
-          ]
-      },
-      {
-          "path": "sfdx-source/unpackaged",
-          "default": false
-      }
+    {
+      "path": "force-app",
+      "default": true,
+      "package": "Legacy",
+      "versionNumber": "1.0.0.NEXT",
+      "dependencies": [
+        {
+          "package": "[email protected]"
+        },
+        {
+          "package": "[email protected]"
+        }
+      ]
+    }
   ],
   "namespace": "",
   "sfdcLoginUrl": "https://login.salesforce.com",
-  "sourceApiVersion": "54.0",
-  "packageAliases": {
-      "referencePackageA": "0Ho1T000000GmaOSAS",
-      "referencePackageB": "0Ho1T000000GmaTSAS",
-      "x103.framework": "0Ho1T000000XZAbSAO",
-      "x103.framework-globals": "0Ho1T000000XZAgSAO"
-  },
-  "otherExamples": [
-      {
-          "dependencies": [
-              {
-                  "package": "referencePackageA",
-                  "versionNumber": "0.LATEST"
-              },
-              {
-                  "package": "x103.framework",
-                  "versionNumber": "0.1.0-LATEST"
-              },
-              {
-                  "package": "[email protected]"
-              },
-              {
-                  "package": "04t1T000000V9beQAC"
-              },
-              {
-                  "package": "referencePackageA",
-                  "versionNumber": "0.1-LATEST"
-              },
-              {
-                  "package": "0Ho1T000000GmaTSAS",
-                  "versionNumber": "0.1-LATEST"
-              },
-              {
-                  "package": "0Ho1T000000GmaTSAS",
-                  "versionNumber": "100.1-LATEST"
-              },
-              {
-                  "package": "referencePackageA",
-                  "versionNumber": "0.1.0.2"
-              }
-          ]
+  "sourceApiVersion": "53.0",
+  "plugins": {
+    "toolbox": {
+      "package": {
+        "brancheswithreleasedversions": [
+          "bluefish"
+        ]
       }
-  ]
+    }
+  },
+  "packageAliases": {
+    "[email protected]": "04t7R0000018hxeQAA",
+    "[email protected]": "04t7R0000018hyXQAQ",
+    "fflib-apex-mocks": "0Ho7R000000fxUCSAY",
+    "fflib-apex-common": "0Ho7R000000fxU7SAI"
+  }
 }
diff --git a/src/commands/toolbox/package/dependencies/manage.ts b/src/commands/toolbox/package/dependencies/manage.ts
@@ -55,8 +55,9 @@ export default class Manage extends SfdxCommand {
 
     const packageDependencyChangeMap: Map<string, ProjectDependencyChange[]> = new Map<string, ProjectDependencyChange[]>();
 
-    const projectJson = await this.project.retrieveSfdxProjectJson();
-    let dependenciesToIgnore = _.get(projectJson['contents'], 'plugins.toolbox.dependencies.ignore', false) as string[];
+    const dependenciesToIgnore = theSfdxProject.getProjectDependenciesToIgnore();
+
+    const branchNamesThatContainReleasedVersions = theSfdxProject.getBranchNamesThatContainReleasedVersions();
 
     const evaluateOptions = async () => {
       let aProjectDependencyChange: ProjectDependencyChange;
@@ -103,10 +104,12 @@ export default class Manage extends SfdxCommand {
             if ( isDependencyIgnored ) {
               dependencyPackageChoices = theDevHubDependencies.prepareSameDependencyOptionForCurrentDependency();
             } else if (isInteractiveMode) {
-              dependencyPackageChoices = theDevHubDependencies.prepareRelatedDependencyOptionsForCurrentDependency();
+              //
+              dependencyPackageChoices = theDevHubDependencies.prepareRelatedDependencyOptionsForCurrentDependency(branchNamesThatContainReleasedVersions);
             } else {
               if ( this.flags.updatetoreleased ) {
-                dependencyPackageChoices = theDevHubDependencies.prepareRelatedReleasedDependencyOptionsForCurrentDependency();
+                //
+                dependencyPackageChoices = theDevHubDependencies.prepareRelatedReleasedDependencyOptionsForCurrentDependency(branchNamesThatContainReleasedVersions);
               } else if (this.flags.updatetolatest) {
                 dependencyPackageChoices = theDevHubDependencies.prepareRelatedNonPinnedDependencyOptionsForCurrentDependency();
               }