@salesforce/core 7.3.4 → 7.3.5

package/lib/org/scratchOrgInfoGenerator.d.ts

@@ -7,7 +7,7 @@ export type ScratchOrgInfoPayload = {
     package2AncestorIds: string;
     features: string | string[];
     connectedAppConsumerKey: string;
-    namespace: string;
+    namespace?: string;
     connectedAppCallbackUrl: string;
     durationDays: number;
 } & PartialScratchOrgInfo;

package/lib/org/scratchOrgInfoGenerator.js

@@ -143,12 +143,14 @@ const generateScratchOrgInfo = async ({ hubOrg, scratchOrgInfoPayload, nonamespa
     catch (e) {
         // project is not required
     }
+    const { namespace: originalNamespace, ...payload } = scratchOrgInfoPayload;
+    const namespace = originalNamespace ?? sfProject?.get('namespace');
     return {
-        ...scratchOrgInfoPayload,
+        ...payload,
         orgName: scratchOrgInfoPayload.orgName ?? 'Company',
         // we already have the info, and want to get rid of configApi, so this doesn't use that
         connectedAppCallbackUrl: `http://localhost:${await webOAuthServer_1.WebOAuthServer.determineOauthPort()}/OauthRedirect`,
-        ...(!nonamespace && sfProject?.get('namespace') ? { namespace: sfProject.get('namespace') } : {}),
+        ...(!nonamespace && namespace ? { namespace } : {}),
         // Use the Hub org's client ID value, if one wasn't provided to us, or the default
         connectedAppConsumerKey: scratchOrgInfoPayload.connectedAppConsumerKey ??
             hubOrg.getConnection().getAuthInfoFields().clientId ??

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "7.3.4",
+  "version": "7.3.5",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",