feat: use StateAggregator

package.json

@@ -37,7 +37,7 @@
   "dependencies": {
     "@oclif/core": "^1.7.0",
     "@oclif/plugin-help": "^5.1.11",
-    "@salesforce/core": "^3.19.0",
+    "@salesforce/core": "^3.20.1",
     "@salesforce/kit": "^1.5.34",
     "@salesforce/ts-types": "^1.5.20",
     "chalk": "^2.4.2"

src/test/index.ts

@@ -59,13 +59,14 @@ const withOrg = (org: Partial<AuthFields> = {}, setAsDefault = true): Plugin<Dic
       // eslint-disable-next-line @typescript-eslint/require-await
       const writeOrg = async function (this: { path: string }): Promise<JsonMap> {
         const foundOrg = asJsonMap(ctx.orgs[org.username as string], {});
-        return (ensure($$.configStubs.GlobalInfo).contents = { orgs: { [org.username as string]: foundOrg } });
+        return (ensure($$.configStubs.AuthInfoConfig).contents = foundOrg);
       };
 
-      $$.configStubs.GlobalInfo = {
+      $$.configStubs.AuthInfoConfig = {
         retrieveContents: readOrg,
         updateContents: writeOrg,
       };
+
       const defaultOrg = find(ctx.orgs, (o) => !!o.default && !o.isDevHub);
       const defaultDevHubOrg = find(ctx.orgs, (o) => !!o.default && !!o.isDevHub);
       $$.configStubs.Config = {

test/unit/sfdxCommand.test.ts

@@ -10,7 +10,7 @@ import { join } from 'path';
 import { URL } from 'url';
 import * as util from 'util';
 import {
-  ConfigAggregator,
+  SfdxConfigAggregator,
   Global,
   Lifecycle,
   Logger,
@@ -131,7 +131,7 @@ describe('SfdxCommand', () => {
     process.exitCode = 0;
 
     UX_OUTPUT = cloneJson(UX_OUTPUT_BASE);
-    configAggregatorCreate = $$.SANDBOX.stub(ConfigAggregator, 'create').returns(
+    configAggregatorCreate = $$.SANDBOX.stub(SfdxConfigAggregator, 'create').returns(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       Promise.resolve(DEFAULT_INSTANCE_PROPS.configAggregator) as any
     );
@@ -765,7 +765,7 @@ describe('SfdxCommand', () => {
       getInfo: () => ({ value: apiVersion }),
     };
     configAggregatorCreate.restore();
-    configAggregatorCreate = $$.SANDBOX.stub(ConfigAggregator, 'create').returns(configAggregator);
+    configAggregatorCreate = $$.SANDBOX.stub(SfdxConfigAggregator, 'create').returns(configAggregator);
 
     // Run the command
     class TestCommand extends BaseTestCommand {}
@@ -792,7 +792,7 @@ describe('SfdxCommand', () => {
       getInfo: () => ({ value: apiVersion }),
     };
     configAggregatorCreate.restore();
-    configAggregatorCreate = $$.SANDBOX.stub(ConfigAggregator, 'create').returns(configAggregator);
+    configAggregatorCreate = $$.SANDBOX.stub(SfdxConfigAggregator, 'create').returns(configAggregator);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const fakeOrg: any = 'fake_org';
     $$.SANDBOX.stub(Org, 'create').returns(fakeOrg);