@salesforce/core 3.13.0 → 3.15.0

package/lib/org/scratchOrgSettingsGenerator.d.ts

@@ -1,5 +1,5 @@
 import { JsonMap } from '@salesforce/ts-types';
-import { ScratchOrgInfo } from './scratchOrgTypes';
+import { ScratchOrgInfo, ObjectSetting } from './scratchOrgTypes';
 import { Org } from './org';
 export declare enum RequestStatus {
     Pending = "Pending",
@@ -32,7 +32,12 @@ export default class SettingsGenerator {
     private shapeDirName;
     constructor();
     /** extract the settings from the scratch def file, if they are present. */
-    extract(scratchDef: ScratchOrgInfo): Promise<void>;
+    extract(scratchDef: ScratchOrgInfo): Promise<{
+        settings: Record<string, unknown> | undefined;
+        objectSettings: {
+            [objectName: string]: ObjectSetting;
+        } | undefined;
+    }>;
     /** True if we are currently tracking setting or object setting data. */
     hasSettings(): boolean;
     /** Create temporary deploy directory used to upload the scratch org shape.

package/lib/org/scratchOrgSettingsGenerator.js

@@ -45,6 +45,7 @@ class SettingsGenerator {
         this.settingData = scratchDef.settings;
         this.objectSettingsData = scratchDef.objectSettings;
         this.logger.debug('settings are', this.settingData);
+        return { settings: this.settingData, objectSettings: this.objectSettingsData };
     }
     /** True if we are currently tracking setting or object setting data. */
     hasSettings() {

package/lib/sfProject.js

@@ -537,7 +537,7 @@ class SfProject {
             Object.assign(this.projectConfig, configAggregator.getConfig());
             // we don't have a login url yet, so use instanceUrl from config or default
             if (!this.projectConfig.sfdcLoginUrl) {
-                this.projectConfig.sfdcLoginUrl = (_a = configAggregator.getConfig().instanceUrl) !== null && _a !== void 0 ? _a : sfdcUrl_1.SfdcUrl.PRODUCTION;
+                this.projectConfig.sfdcLoginUrl = (_a = configAggregator.getConfig()['org-instance-url']) !== null && _a !== void 0 ? _a : sfdcUrl_1.SfdcUrl.PRODUCTION;
             }
             // LEGACY - Allow override of sfdcLoginUrl via env var FORCE_SFDC_LOGIN_URL
             if (process.env.FORCE_SFDC_LOGIN_URL) {

package/lib/status/pollingClient.js

@@ -87,6 +87,7 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
             if (errorInPollingFunction) {
                 throw errorInPollingFunction;
             }
+            await lifecycleEvents_1.Lifecycle.getInstance().emit('POLLING_TIME_OUT', error);
             this.logger.debug('Polling timed out');
             throw new sfError_1.SfError('The client has timed out.', (_a = this.options.timeoutErrorName) !== null && _a !== void 0 ? _a : 'PollingClientTimeout');
         }

package/lib/testSetup.js

@@ -165,8 +165,6 @@ exports.instantiateContext = instantiateContext;
 const stubContext = (testContext) => {
     // Turn off the interoperability feature so that we don't have to mock
     // the old .sfdx config files
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
     global_1.Global.SFDX_INTEROPERABILITY = false;
     // Most core files create a child logger so stub this to return our test logger.
     (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'child').returns(Promise.resolve(testContext.TEST_LOGGER));

package/messages/org.md

@@ -28,7 +28,7 @@ The sandbox org deletion failed with a result of %s.
 
 # sandboxNotFound
 
-We can't find a SandboxProcess for the sandbox org %s.
+We can't find a SandboxProcess for the sandbox %s.
 
 # sandboxInfoCreateFailed
 
@@ -45,3 +45,11 @@ Sandbox status is %s; timed out waiting for completion.
 # NotFoundOnDevHub
 
 The scratch org does not belong to the dev hub username %s.
+
+# AuthInfoOrgIdUndefined
+
+AuthInfo orgId is undefined.
+
+# sandboxCreateNotComplete
+
+The sandbox creation has not completed.

package/messages/scratchOrgCreate.md

@@ -25,3 +25,23 @@ Expected 'retry' to be an integer number.
 # WaitValidationMaxError
 
 Expected 'wait' greater than or equal to %s but received %s.
+
+# NoScratchOrgInfoError
+
+No ScratchOrgInfo object found in the Dev Hub you specified. Check that the ID and the Dev Hub are correct.
+
+# ScratchOrgDeletedError
+
+That scratch org has been deleted, so you can't connect to it anymore.
+
+# CacheMissError
+
+The ScratchOrgInfoId %s was not found in the cache.
+
+# StillInProgressError
+
+The scratch org is not ready yet (Status = %).
+
+# action.StillInProgress
+
+Wait for a few minutes, and then try the <%= config.bin %> <%= command.id %> command again

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.13.0",
+  "version": "3.15.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -42,12 +42,12 @@
     "@types/mkdirp": "^1.0.2",
     "@types/semver": "^7.3.9",
     "archiver": "^5.3.0",
-    "js2xmlparser": "^4.0.1",
     "change-case": "^4.1.2",
     "debug": "^3.2.7",
     "faye": "^1.4.0",
     "form-data": "^4.0.0",
     "graceful-fs": "^4.2.9",
+    "js2xmlparser": "^4.0.1",
     "jsen": "0.6.6",
     "jsforce": "2.0.0-beta.7",
     "jsonwebtoken": "8.5.1",