@salesforce/core 7.3.3 → 7.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,7 +7,7 @@ export type ScratchOrgInfoPayload = {
|
|
|
7
7
|
package2AncestorIds: string;
|
|
8
8
|
features: string | string[];
|
|
9
9
|
connectedAppConsumerKey: string;
|
|
10
|
-
namespace
|
|
10
|
+
namespace?: string;
|
|
11
11
|
connectedAppCallbackUrl: string;
|
|
12
12
|
durationDays: number;
|
|
13
13
|
} & PartialScratchOrgInfo;
|
|
@@ -143,12 +143,14 @@ const generateScratchOrgInfo = async ({ hubOrg, scratchOrgInfoPayload, nonamespa
|
|
|
143
143
|
catch (e) {
|
|
144
144
|
// project is not required
|
|
145
145
|
}
|
|
146
|
+
const { namespace: originalNamespace, ...payload } = scratchOrgInfoPayload;
|
|
147
|
+
const namespace = originalNamespace ?? sfProject?.get('namespace');
|
|
146
148
|
return {
|
|
147
|
-
...
|
|
149
|
+
...payload,
|
|
148
150
|
orgName: scratchOrgInfoPayload.orgName ?? 'Company',
|
|
149
151
|
// we already have the info, and want to get rid of configApi, so this doesn't use that
|
|
150
152
|
connectedAppCallbackUrl: `http://localhost:${await webOAuthServer_1.WebOAuthServer.determineOauthPort()}/OauthRedirect`,
|
|
151
|
-
...(!nonamespace &&
|
|
153
|
+
...(!nonamespace && namespace ? { namespace } : {}),
|
|
152
154
|
// Use the Hub org's client ID value, if one wasn't provided to us, or the default
|
|
153
155
|
connectedAppConsumerKey: scratchOrgInfoPayload.connectedAppConsumerKey ??
|
|
154
156
|
hubOrg.getConnection().getAuthInfoFields().clientId ??
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/core",
|
|
3
|
-
"version": "7.3.
|
|
3
|
+
"version": "7.3.5",
|
|
4
4
|
"description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
|
|
5
5
|
"main": "lib/index",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"@salesforce/kit": "^3.1.1",
|
|
57
57
|
"@salesforce/schemas": "^1.7.0",
|
|
58
58
|
"@salesforce/ts-types": "^2.0.9",
|
|
59
|
-
"ajv": "^8.
|
|
59
|
+
"ajv": "^8.13.0",
|
|
60
60
|
"change-case": "^4.1.2",
|
|
61
61
|
"faye": "^1.4.0",
|
|
62
62
|
"form-data": "^4.0.0",
|