Merge remote-tracking branch 'origin/main' into sm/crdt-config

forcedotcom · Oct 27, 2023 · 19e4679 · 19e4679
2 parents 2a3dbec + a405b49
commit 19e4679
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [5.3.14](https://github.com/forcedotcom/sfdx-core/compare/5.3.13...5.3.14) (2023-10-26)
+
+### Bug Fixes
+
+- add scopeProfiles to project type ([b130982](https://github.com/forcedotcom/sfdx-core/commit/b1309829cbcc8511e60cb6c88a5721edb3c060dd))
+- update schemas dep ([3f70e8f](https://github.com/forcedotcom/sfdx-core/commit/3f70e8fcc64aff0a0a10a864f32aa6325a2ba144))
+
+## [5.3.13](https://github.com/forcedotcom/sfdx-core/compare/5.3.12...5.3.13) (2023-10-26)
+
+### Bug Fixes
+
+- handle alias file with no `orgs` prop ([c59c7c7](https://github.com/forcedotcom/sfdx-core/commit/c59c7c7387f159537b9d352057299842f864b864))
+
 ## [5.3.12](https://github.com/forcedotcom/sfdx-core/compare/5.3.11...5.3.12) (2023-10-24)
 
 ### Bug Fixes

diff --git a/package.json b/package.json
@@ -39,8 +39,8 @@
     "messageTransformer/messageTransformer.ts"
   ],
   "dependencies": {
-    "@salesforce/kit": "^3.0.15",
-    "@salesforce/schemas": "^1.6.0",
+    "@salesforce/kit": "^3.0.14",
+    "@salesforce/schemas": "^1.6.1",
     "@salesforce/ts-types": "^2.0.9",
     "@types/semver": "^7.5.3",
     "ajv": "^8.12.0",

diff --git a/src/sfProject.ts b/src/sfProject.ts
@@ -43,6 +43,7 @@ export type PackageDir = {
   postInstallScript?: string;
   postInstallUrl?: string;
   releaseNotesUrl?: string;
+  scopeProfiles?: boolean;
   uninstallScript?: string;
   versionDescription?: string;
   versionName?: string;

diff --git a/src/stateAggregator/accessors/aliasAccessor.ts b/src/stateAggregator/accessors/aliasAccessor.ts
@@ -276,7 +276,8 @@ const fileContentsRawToAliasStore = (contents: string): Map<string, string> => {
     [DEFAULT_GROUP]: { [alias: string]: string };
   };
 
-  return new Map(Object.entries(fileContents[DEFAULT_GROUP]));
+  // handle when alias file exists but is missing the org property
+  return new Map(Object.entries(fileContents[DEFAULT_GROUP] ?? {}));
 };
 
 const aliasStoreToRawFileContents = (aliasStore: Map<string, string>): string =>

diff --git a/yarn.lock b/yarn.lock
@@ -560,7 +560,7 @@
     typescript "^4.9.5"
     wireit "^0.9.5"
 
-"@salesforce/kit@^3.0.15":
+"@salesforce/kit@^3.0.14":
   version "3.0.15"
   resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.15.tgz#713df3f5767f874c70a2e731c7cb5ba677989559"
   integrity sha512-XkA8jsuLvVnyP460dAbU3pBFP2IkmmmsVxMQVifcKKbNWaIBbZBzAfj+vdaQfnvZyflLhsrFT3q2xkb0vHouPg==
@@ -573,10 +573,10 @@
   resolved "https://registry.yarnpkg.com/@salesforce/prettier-config/-/prettier-config-0.0.3.tgz#ba648d4886bb38adabe073dbea0b3a91b3753bb0"
   integrity sha512-hYOhoPTCSYMDYn+U1rlEk16PoBeAJPkrdg4/UtAzupM1mRRJOwEPMG1d7U8DxJFKuXW3DMEYWr2MwAIBDaHmFg==
 
-"@salesforce/schemas@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.0.tgz#14505ebad2fb2d4f7b14837545d662766d293561"
-  integrity sha512-SwhDTLucj/GRbPpxlEoDZeqlX22o+G6fiebTXTu1cZKmd1oE0W2L7SlTTgJnWck8bhTeBIgQi9cpD8c2t5ISKA==
+"@salesforce/schemas@^1.6.1":
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d"
+  integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig==
 
 "@salesforce/ts-sinon@^1.4.18":
   version "1.4.18"