@salesforce/core 3.33.2 → 3.33.4

package/lib/org/scratchOrgCreate.js

@@ -103,6 +103,8 @@ const scratchOrgResume = async (jobId) => {
 exports.scratchOrgResume = scratchOrgResume;
 const scratchOrgCreate = async (options) => {
     const logger = await logger_1.Logger.child('scratchOrgCreate');
+    /** epoch milliseconds */
+    const startTimestamp = Date.now();
     logger.debug('scratchOrgCreate');
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'prepare request' });
     const { hubOrg, connectedAppConsumerKey, durationDays = 1, nonamespace, noancestors, wait = kit_1.Duration.minutes(exports.DEFAULT_STREAM_TIMEOUT_MINUTES), retry = 0, apiversion, definitionjson, definitionfile, orgConfig, clientSecret = undefined, alias, setDefault = false, tracksSource = true, } = options;
@@ -175,7 +177,9 @@ const scratchOrgCreate = async (options) => {
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiversion ??
             configAggregator.getPropertyValue(orgConfigProperties_1.OrgConfigProperties.ORG_API_VERSION) ??
-            (await scratchOrg.retrieveMaxApiVersion())),
+            (await scratchOrg.retrieveMaxApiVersion()), 
+        // 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({
         ...{

package/lib/org/scratchOrgInfoApi.d.ts

@@ -58,7 +58,7 @@ export declare const pollForScratchOrgInfo: (hubOrg: Org, scratchOrgInfoId: stri
  * @param orgSettings an instance of the SettingsGenerator class
  * @param apiVersion the api version (used when created the package.xml)
  */
-export declare const deploySettings: (scratchOrg: Org, orgSettings: SettingsGenerator, apiVersion: string) => Promise<void>;
+export declare const deploySettings: (scratchOrg: Org, orgSettings: SettingsGenerator, apiVersion: string, timeout?: Duration) => Promise<void>;
 /**
  *
  * @param scratchOrgAuthInfo an AuthInfo class from the scratch org

package/lib/org/scratchOrgInfoApi.js

@@ -325,14 +325,14 @@ exports.pollForScratchOrgInfo = pollForScratchOrgInfo;
  * @param orgSettings an instance of the SettingsGenerator class
  * @param apiVersion the api version (used when created the package.xml)
  */
-const deploySettings = async (scratchOrg, orgSettings, apiVersion) => {
+const deploySettings = async (scratchOrg, orgSettings, apiVersion, timeout = kit_1.Duration.minutes(10)) => {
     const logger = await logger_1.Logger.child('scratchOrgInfoApi-deploySettings');
     if (orgSettings.hasSettings()) {
         // deploy the settings to the newly created scratch org
         logger.debug(`deploying scratch org settings with apiVersion ${apiVersion}`);
         try {
             await orgSettings.createDeploy();
-            await orgSettings.deploySettingsViaFolder(scratchOrg, apiVersion);
+            await orgSettings.deploySettingsViaFolder(scratchOrg, apiVersion, timeout);
             // updating the revision num to zero during org:creation if source members are created during org:create.
             // This only happens for some specific scratch org definition file.
             await (0, exports.updateRevisionCounterToZero)(scratchOrg);

package/lib/org/scratchOrgSettingsGenerator.d.ts

@@ -1,3 +1,4 @@
+import { Duration } from '@salesforce/kit';
 import { JsonMap } from '@salesforce/ts-types';
 import { ScratchOrgInfo, ObjectSetting } from './scratchOrgTypes';
 import { Org } from './org';
@@ -65,7 +66,7 @@ export default class SettingsGenerator {
     /**
      * Deploys the settings to the org.
      */
-    deploySettingsViaFolder(scratchOrg: Org, apiVersion: string): Promise<void>;
+    deploySettingsViaFolder(scratchOrg: Org, apiVersion: string, timeout?: Duration): Promise<void>;
     createDeployPackageContents(apiVersion: string): Promise<void>;
     getShapeDirName(): string;
     /**

package/lib/org/scratchOrgSettingsGenerator.js

@@ -181,7 +181,7 @@ class SettingsGenerator {
     /**
      * Deploys the settings to the org.
      */
-    async deploySettingsViaFolder(scratchOrg, apiVersion) {
+    async deploySettingsViaFolder(scratchOrg, apiVersion, timeout = kit_1.Duration.minutes(10)) {
         const username = scratchOrg.getUsername();
         const logger = await logger_1.Logger.child('deploySettingsViaFolder');
         await this.createDeployPackageContents(apiVersion);
@@ -215,7 +215,7 @@ class SettingsGenerator {
                     };
                 }
             },
-            timeout: kit_1.Duration.minutes(10),
+            timeout,
             frequency: kit_1.Duration.seconds(1),
             timeoutErrorName: 'DeployingSettingsTimeoutError',
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.33.2",
+  "version": "3.33.4",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -37,10 +37,10 @@
   ],
   "dependencies": {
     "@salesforce/bunyan": "^2.0.0",
-    "@salesforce/kit": "^1.8.0",
+    "@salesforce/kit": "^1.9.0",
     "@salesforce/schemas": "^1.4.0",
     "@salesforce/ts-types": "^1.7.2",
-    "@types/graceful-fs": "^4.1.5",
+    "@types/graceful-fs": "^4.1.6",
     "@types/semver": "^7.3.13",
     "ajv": "^8.11.2",
     "archiver": "^5.3.0",