@salesforce/core 3.30.7 → 3.30.8
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.
|
@@ -12,6 +12,7 @@ const ts_types_1 = require("@salesforce/ts-types");
|
|
|
12
12
|
const messages_1 = require("../messages");
|
|
13
13
|
const logger_1 = require("../logger");
|
|
14
14
|
const configAggregator_1 = require("../config/configAggregator");
|
|
15
|
+
const orgConfigProperties_1 = require("../org/orgConfigProperties");
|
|
15
16
|
const sfProject_1 = require("../sfProject");
|
|
16
17
|
const stateAggregator_1 = require("../stateAggregator");
|
|
17
18
|
const org_1 = require("./org");
|
|
@@ -79,13 +80,14 @@ const scratchOrgResume = async (jobId) => {
|
|
|
79
80
|
retry: 0,
|
|
80
81
|
});
|
|
81
82
|
const scratchOrg = await org_1.Org.create({ aliasOrUsername: username });
|
|
83
|
+
const configAggregator = await configAggregator_1.ConfigAggregator.create();
|
|
82
84
|
await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
|
|
83
85
|
const settingsGenerator = new scratchOrgSettingsGenerator_1.default();
|
|
84
86
|
settingsGenerator.extract({ ...soi, ...definitionjson });
|
|
85
87
|
const [authInfo] = await Promise.all([
|
|
86
88
|
(0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
|
|
87
89
|
(0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiVersion ??
|
|
88
|
-
|
|
90
|
+
configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_API_VERSION) ??
|
|
89
91
|
(await scratchOrg.retrieveMaxApiVersion())),
|
|
90
92
|
]);
|
|
91
93
|
await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
|
|
@@ -174,10 +176,11 @@ const scratchOrgCreate = async (options) => {
|
|
|
174
176
|
const username = scratchOrg.getUsername();
|
|
175
177
|
logger.debug(`scratch org username ${username}`);
|
|
176
178
|
await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
|
|
179
|
+
const configAggregator = await configAggregator_1.ConfigAggregator.create();
|
|
177
180
|
const [authInfo] = await Promise.all([
|
|
178
181
|
(0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
|
|
179
182
|
(0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiversion ??
|
|
180
|
-
|
|
183
|
+
configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_API_VERSION) ??
|
|
181
184
|
(await scratchOrg.retrieveMaxApiVersion())),
|
|
182
185
|
]);
|
|
183
186
|
await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
|