@salesforce/core-bundle 7.4.0 → 7.4.1

package/lib/index.d.ts

@@ -3942,6 +3942,7 @@ declare module '@salesforce/core-bundle/org/scratchOrgInfoApi' {
    */
   export const deploySettings: (scratchOrg: Org, orgSettings: SettingsGenerator, apiVersion: string, timeout?: Duration) => Promise<void>;
   /**
+   * Makes sure the scratch org's instanceUrl is resolvable (that is, DNS is ready)
    *
    * @param scratchOrgAuthInfo an AuthInfo class from the scratch org
    * @returns AuthInfo

package/lib/index.js

@@ -12075,7 +12075,7 @@ var require_package2 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@salesforce/core-bundle",
-      version: "7.4.0",
+      version: "7.4.1",
       description: "Core libraries to interact with SFDX projects, orgs, and APIs.",
       main: "lib/index",
       types: "lib/index.d.ts",
@@ -94672,13 +94672,14 @@ var require_scratchOrgInfoApi = __commonJS({
       const logger = await logger_12.Logger.child("scratchOrgInfoApi-resolveUrl");
       const { instanceUrl } = scratchOrgAuthInfo.getFields();
       if (!instanceUrl) {
-        const sfError = new sfError_12.SfError("Org does not have instanceUrl");
-        sfError.setData({
-          orgId: scratchOrgAuthInfo.getFields().orgId,
-          username: scratchOrgAuthInfo.getFields().username,
-          instanceUrl
+        throw sfError_12.SfError.create({
+          message: "Org does not have instanceUrl",
+          data: {
+            orgId: scratchOrgAuthInfo.getFields().orgId,
+            username: scratchOrgAuthInfo.getFields().username,
+            instanceUrl
+          }
         });
-        throw sfError;
       }
       logger.debug(`processScratchOrgInfoResult - resultData.instanceUrl: ${instanceUrl}`);
       const options = {
@@ -107099,10 +107100,12 @@ var require_scratchOrgSettingsGenerator = __commonJS({
         if (status !== RequestStatus.Succeeded.toString()) {
           const componentFailures = (0, ts_types_1.ensureObject)(result.details).componentFailures;
           const failures = (Array.isArray(componentFailures) ? componentFailures : [componentFailures]).map((failure) => `[${failure.problemType}] ${failure.fullName} : ${failure.problem} `).join("\n");
-          const error = new sfError_12.SfError(`A scratch org was created with username ${username}, but the settings failed to deploy due to: 
-${failures}`, "ProblemDeployingSettings");
-          error.setData(result);
-          throw error;
+          throw sfError_12.SfError.create({
+            message: `A scratch org was created with username ${username}, but the settings failed to deploy due to: 
+${failures}`,
+            name: "ProblemDeployingSettings",
+            data: { ...result, username }
+          });
         }
       }
       async createDeployPackageContents(apiVersion) {
@@ -107426,6 +107429,7 @@ var require_scratchOrgCreate = __commonJS({
     var orgConfigProperties_12 = require_orgConfigProperties();
     var sfProject_12 = require_sfProject();
     var stateAggregator_12 = require_stateAggregator();
+    var sfError_12 = require_sfError();
     var org_12 = require_org();
     var scratchOrgInfoApi_1 = require_scratchOrgInfoApi();
     var scratchOrgSettingsGenerator_12 = __importDefault3(require_scratchOrgSettingsGenerator());
@@ -107479,6 +107483,12 @@ var require_scratchOrgCreate = __commonJS({
         signupTargetLoginUrlConfig,
         retry: 0
       });
+      await setExitCodeIfError(68)(scratchOrgAuthInfo.handleAliasAndDefaultSettings({
+        alias,
+        setDefault: setDefault ?? false,
+        setDefaultDevHub: false,
+        setTracksSource: tracksSource ?? true
+      }));
       const scratchOrg = await org_12.Org.create({ aliasOrUsername: username });
       const configAggregator = await configAggregator_12.ConfigAggregator.create();
       await (0, scratchOrgLifecycleEvents_12.emit)({ stage: "deploy settings", scratchOrgInfo: soi });
@@ -107487,16 +107497,10 @@ var require_scratchOrgCreate = __commonJS({
         capitalizeRecordTypes
       });
       await settingsGenerator.extract({ ...soi, ...definitionjson });
-      const [authInfo] = await Promise.all([
+      const [authInfo] = await setExitCodeIfError(68)(Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiVersion ?? configAggregator.getPropertyValue(orgConfigProperties_12.OrgConfigProperties.ORG_API_VERSION) ?? await scratchOrg.retrieveMaxApiVersion())
-      ]);
-      await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
-        alias,
-        setDefault: setDefault ?? false,
-        setDefaultDevHub: false,
-        setTracksSource: tracksSource ?? true
-      });
+      ]));
       cache.unset(soi.Id ?? jobId);
       const authFields = authInfo.getFields();
       await Promise.all([(0, scratchOrgLifecycleEvents_12.emit)({ stage: "done", scratchOrgInfo: soi }), cache.write(), (0, scratchOrgLifecycleEvents_12.emitPostOrgCreate)(authFields)]);
@@ -107573,14 +107577,20 @@ var require_scratchOrgCreate = __commonJS({
         signupTargetLoginUrlConfig,
         retry: retry || 0
       });
-      const scratchOrg = await org_12.Org.create({
-        aliasOrUsername: soi.Username ?? soi.SignupUsername
-      });
+      await setExitCodeIfError(68)(scratchOrgAuthInfo.handleAliasAndDefaultSettings({
+        ...{
+          alias,
+          setDefault,
+          setDefaultDevHub: false,
+          setTracksSource: tracksSource === false ? false : true
+        }
+      }));
+      const scratchOrg = await org_12.Org.create({ aliasOrUsername: soi.Username ?? soi.SignupUsername });
       const username = scratchOrg.getUsername();
       logger.debug(`scratch org username ${username}`);
       await (0, scratchOrgLifecycleEvents_12.emit)({ stage: "deploy settings", scratchOrgInfo: soi });
       const configAggregator = await configAggregator_12.ConfigAggregator.create();
-      const [authInfo] = await Promise.all([
+      const [authInfo] = await setExitCodeIfError(68)(Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(
           scratchOrg,
@@ -107589,15 +107599,7 @@ var require_scratchOrgCreate = __commonJS({
           // some of our "wait" time has already been used.  Calculate how much remains that we can spend on the deployment.
           kit_1.Duration.milliseconds(wait.milliseconds - (Date.now() - startTimestamp))
         )
-      ]);
-      await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
-        ...{
-          alias,
-          setDefault,
-          setDefaultDevHub: false,
-          setTracksSource: tracksSource === false ? false : true
-        }
-      });
+      ]));
       cache.unset(scratchOrgInfoId);
       const authFields = authInfo.getFields();
       await Promise.all([(0, scratchOrgLifecycleEvents_12.emit)({ stage: "done", scratchOrgInfo: soi }), cache.write(), (0, scratchOrgLifecycleEvents_12.emitPostOrgCreate)(authFields)]);
@@ -107621,10 +107623,17 @@ var require_scratchOrgCreate = __commonJS({
     async function getCapitalizeRecordTypesConfig() {
       const configAgg = await configAggregator_12.ConfigAggregator.create();
       const value = configAgg.getInfo("org-capitalize-record-types").value;
-      if (value !== void 0)
-        return (0, kit_1.toBoolean)(value);
-      return value;
+      return value !== void 0 ? (0, kit_1.toBoolean)(value) : void 0;
     }
+    var setExitCodeIfError = (exitCode) => async (p) => {
+      try {
+        return await p;
+      } catch (e) {
+        const sfError = sfError_12.SfError.wrap(e);
+        sfError.exitCode = exitCode;
+        throw sfError;
+      }
+    };
   }
 });
 

package/package.json

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