Merge branch 'main' into 1413-reset-the-sfpowerkit-on-a-different-tar…

…get-org-or-include-the-org-name-into-the-cache
dxatscale · Oct 15, 2023 · c607b3a · c607b3a
2 parents 2e91203 + 7c5d9d4
commit c607b3a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dxatscale/sfpowerscripts.core",
-    "version": "36.1.6",
+    "version": "36.1.7",
     "description": "Core Module used by sfpowerscripts",
     "main": "lib/index",
     "types": "lib/index",

diff --git a/packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts b/packages/core/src/package/deploymentCustomizers/PicklistEnabler.ts
@@ -75,7 +75,7 @@ export default class PicklistEnabler implements DeploymentCustomizer {
                     let picklistInOrg = await this.getPicklistInOrg(urlId, sfpOrg.getConnection());
 
                     //check for empty picklists on org and fix first deployment issue
-                    if (!picklistInOrg && picklistInOrg?.Metadata?.valueSetc?.valueSetDefinition) continue;
+                    if (!picklistInOrg && picklistInOrg?.Metadata?.valueSet?.valueSetDefinition) continue;
 
                     let picklistValueInOrg = [];
 

diff --git a/packages/sfpowerscripts-cli/package.json b/packages/sfpowerscripts-cli/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@dxatscale/sfpowerscripts",
     "description": "DX@Scale Toolkit",
-    "version": "25.0.4",
+    "version": "25.0.5",
     "license": "MIT",
     "author": "dxatscale",
     "release": "October 23",
@@ -13,7 +13,7 @@
     "dependencies": {
         "@dxatscale/sfdx-process-wrapper": "^1.0.2",
         "@dxatscale/sfp-logger": "^2.1.2",
-        "@dxatscale/sfpowerscripts.core": "^36.1.6",
+        "@dxatscale/sfpowerscripts.core": "36.1.7",
         "@dxatscale/sfprofiles": "^2.0.8",
         "@oclif/core": "2.11.8",
         "@oclif/plugin-help": "5.2.17",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml