@salesforce/core 3.15.3 → 3.15.4

package/lib/config/configAggregator.d.ts

@@ -67,7 +67,7 @@ export declare class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggre
      * @ignore
      */
     constructor(options?: ConfigAggregator.Options);
-    static create<P, T extends AsyncOptionalCreatable<P>>(this: new (options?: P) => T, options?: P): Promise<T>;
+    static create<P, T extends AsyncOptionalCreatable<P>>(this: new (options?: ConfigAggregator.Options) => T, options?: ConfigAggregator.Options): Promise<T>;
     /**
      * Get the info for a given key. If the ConfigAggregator was not asynchronously created OR
      * the {@link ConfigAggregator.reload} was not called, the config value may be encrypted.
@@ -219,7 +219,6 @@ export declare namespace ConfigAggregator {
  * @deprecated
  */
 export declare class SfdxConfigAggregator extends ConfigAggregator {
-    private static CUSTOM_CONFIG_VARS;
     constructor(options?: ConfigAggregator.Options);
     getPropertyMeta(key: string): ConfigPropertyMeta;
     getPropertyValue<T extends AnyJson>(key: string): Optional<T>;

package/lib/config/configAggregator.js

@@ -37,9 +37,6 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options || {});
-        if (options === null || options === void 0 ? void 0 : options.customConfigMeta) {
-            config_1.Config.addAllowedProperties(options.customConfigMeta);
-        }
         // Don't throw an project error with the aggregator, since it should resolve to global if
         // there is no project.
         try {
@@ -67,6 +64,9 @@ class ConfigAggregator extends kit_1.AsyncOptionalCreatable {
         if (ConfigAggregator.encrypted) {
             await config.loadProperties();
         }
+        if (options === null || options === void 0 ? void 0 : options.customConfigMeta) {
+            config_1.Config.addAllowedProperties(options.customConfigMeta);
+        }
         return ConfigAggregator.instance;
     }
     /**
@@ -315,8 +315,12 @@ ConfigAggregator.encrypted = true;
 class SfdxConfigAggregator extends ConfigAggregator {
     constructor(options = {}) {
         const customConfigMeta = options.customConfigMeta || [];
-        options.customConfigMeta = [...customConfigMeta, ...SfdxConfigAggregator.CUSTOM_CONFIG_VARS];
-        super(options || {});
+        // org-metadata-rest-deploy has been moved to plugin-deploy-retrieve but we need to have a placeholder
+        // for it here since sfdx needs to know how to set the deprecated restDeploy config var.
+        const restDeploy = config_1.SFDX_ALLOWED_PROPERTIES.find((p) => p.key === config_1.SfdxPropertyKeys.REST_DEPLOY);
+        const orgRestDeploy = Object.assign({}, restDeploy, { key: 'org-metadata-rest-deploy', deprecated: false });
+        options.customConfigMeta = [...customConfigMeta, orgRestDeploy];
+        super(options);
     }
     getPropertyMeta(key) {
         const match = this.getAllowedProperties().find((element) => key === element.key);
@@ -359,7 +363,4 @@ class SfdxConfigAggregator extends ConfigAggregator {
     }
 }
 exports.SfdxConfigAggregator = SfdxConfigAggregator;
-// org-metadata-rest-deploy has been moved to plugin-deploy-retrieve but we need to have a placeholder
-// for it here since sfdx needs to know how to set the deprecated restDeploy config var.
-SfdxConfigAggregator.CUSTOM_CONFIG_VARS = [{ key: 'org-metadata-rest-deploy', hidden: true }];
 //# sourceMappingURL=configAggregator.js.map

package/lib/config/orgUsersConfig.js

@@ -7,6 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrgUsersConfig = void 0;
+const global_1 = require("../global");
 const configFile_1 = require("./configFile");
 /**
  * A config file that stores usernames for an org.
@@ -33,6 +34,7 @@ class OrgUsersConfig extends configFile_1.ConfigFile {
             isState: true,
             filename: `${orgId}.json`,
             orgId,
+            stateFolder: global_1.Global.SFDX_STATE_FOLDER,
         };
     }
 }

package/lib/config/sandboxOrgConfig.js

@@ -7,6 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SandboxOrgConfig = void 0;
+const global_1 = require("../global");
 const configFile_1 = require("./configFile");
 /**
  * A config file that stores usernames for an org.
@@ -33,6 +34,7 @@ class SandboxOrgConfig extends configFile_1.ConfigFile {
             isState: true,
             filename: `${orgId}.sandbox.json`,
             orgId,
+            stateFolder: global_1.Global.SFDX_STATE_FOLDER,
         };
     }
 }

package/package.json

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