fix: use CSB from SDR (#430)

* fix: use CSB from SDR * chore: bump SDR Co-authored-by: Steve Hetzel <[email protected]>
salesforcecli · Mar 1, 2022 · 80e4bdd · 80e4bdd
1 parent d36840d
commit 80e4bdd
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 597 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "@oclif/config": "^1.18.2",
     "@salesforce/command": "^4.2.2",
     "@salesforce/core": "^2.35.0",
-    "@salesforce/source-deploy-retrieve": "^5.9.9",
+    "@salesforce/source-deploy-retrieve": "^5.12.2",
     "@salesforce/source-tracking": "^1.1.1",
     "chalk": "^4.1.2",
     "cli-ux": "^5.6.3",

diff --git a/src/commands/force/mdapi/beta/convert.ts b/src/commands/force/mdapi/beta/convert.ts
@@ -8,11 +8,10 @@
 import * as os from 'os';
 import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
-import { MetadataConverter, ConvertResult } from '@salesforce/source-deploy-retrieve';
+import { ComponentSetBuilder, ConvertResult, MetadataConverter } from '@salesforce/source-deploy-retrieve';
 import { Optional } from '@salesforce/ts-types';
 import { SourceCommand } from '../../../../sourceCommand';
-import { ConvertResultFormatter, ConvertCommandResult } from '../../../../formatters/mdapi/convertResultFormatter';
-import { ComponentSetBuilder } from '../../../../componentSetBuilder';
+import { ConvertCommandResult, ConvertResultFormatter } from '../../../../formatters/mdapi/convertResultFormatter';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-source', 'md.convert');

diff --git a/src/commands/force/mdapi/beta/retrieve.ts b/src/commands/force/mdapi/beta/retrieve.ts
@@ -10,14 +10,18 @@ import { extname } from 'path';
 import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages, SfdxError, SfdxProject } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
-import { MetadataApiRetrieve, RequestStatus, RetrieveResult } from '@salesforce/source-deploy-retrieve';
+import {
+  ComponentSetBuilder,
+  MetadataApiRetrieve,
+  RequestStatus,
+  RetrieveResult,
+} from '@salesforce/source-deploy-retrieve';
 import { Optional } from '@salesforce/ts-types';
 import { SourceCommand } from '../../../../sourceCommand';
 import { Stash } from '../../../../stash';
-import { ComponentSetBuilder } from '../../../../componentSetBuilder';
 import {
-  RetrieveCommandResult,
   RetrieveCommandAsyncResult,
+  RetrieveCommandResult,
   RetrieveResultFormatter,
 } from '../../../../formatters/mdapi/retrieveResultFormatter';
 

diff --git a/src/commands/force/source/convert.ts b/src/commands/force/source/convert.ts
@@ -10,11 +10,10 @@ import { join, resolve } from 'path';
 import * as fs from 'fs';
 import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
-import { MetadataConverter, ConvertResult } from '@salesforce/source-deploy-retrieve';
+import { ComponentSetBuilder, ConvertResult, MetadataConverter } from '@salesforce/source-deploy-retrieve';
 import { getString } from '@salesforce/ts-types';
 import { SourceCommand } from '../../../sourceCommand';
-import { ConvertResultFormatter, ConvertCommandResult } from '../../../formatters/convertResultFormatter';
-import { ComponentSetBuilder } from '../../../componentSetBuilder';
+import { ConvertCommandResult, ConvertResultFormatter } from '../../../formatters/convertResultFormatter';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-source', 'convert');

diff --git a/src/commands/force/source/delete.ts b/src/commands/force/source/delete.ts
@@ -12,6 +12,7 @@ import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
 import {
   ComponentSet,
+  ComponentSetBuilder,
   ComponentStatus,
   DestructiveChangesType,
   FileResponse,
@@ -22,13 +23,13 @@ import {
 import { Duration, env } from '@salesforce/kit';
 import { SourceTracking } from '@salesforce/source-tracking';
 import { DeployCommand, TestLevel } from '../../../deployCommand';
-import { ComponentSetBuilder } from '../../../componentSetBuilder';
 import { DeployCommandResult, DeployResultFormatter } from '../../../formatters/deployResultFormatter';
 import { DeleteResultFormatter } from '../../../formatters/source/deleteResultFormatter';
 import { ProgressFormatter } from '../../../formatters/progressFormatter';
 import { DeployProgressBarFormatter } from '../../../formatters/deployProgressBarFormatter';
 import { DeployProgressStatusFormatter } from '../../../formatters/deployProgressStatusFormatter';
-import { updateTracking, trackingSetup, filterConflictsByComponentSet } from '../../../trackingFunctions';
+import { filterConflictsByComponentSet, trackingSetup, updateTracking } from '../../../trackingFunctions';
+
 const fsPromises = fs.promises;
 
 Messages.importMessagesDirectory(__dirname);

diff --git a/src/commands/force/source/deploy.ts b/src/commands/force/source/deploy.ts
@@ -9,8 +9,8 @@ import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
 import { Duration, env } from '@salesforce/kit';
 import { SourceTracking } from '@salesforce/source-tracking';
+import { ComponentSetBuilder } from '@salesforce/source-deploy-retrieve';
 import { DeployCommand, getVersionMessage, TestLevel } from '../../../deployCommand';
-import { ComponentSetBuilder } from '../../../componentSetBuilder';
 import { DeployCommandResult, DeployResultFormatter } from '../../../formatters/deployResultFormatter';
 import {
   DeployAsyncResultFormatter,
@@ -19,7 +19,7 @@ import {
 import { ProgressFormatter } from '../../../formatters/progressFormatter';
 import { DeployProgressBarFormatter } from '../../../formatters/deployProgressBarFormatter';
 import { DeployProgressStatusFormatter } from '../../../formatters/deployProgressStatusFormatter';
-import { updateTracking, trackingSetup, filterConflictsByComponentSet } from '../../../trackingFunctions';
+import { filterConflictsByComponentSet, trackingSetup, updateTracking } from '../../../trackingFunctions';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-source', 'deploy');

diff --git a/src/commands/force/source/deploy/report.ts b/src/commands/force/source/deploy/report.ts
@@ -9,12 +9,12 @@ import * as os from 'os';
 import { Messages, SfdxProject } from '@salesforce/core';
 import { flags, FlagsConfig } from '@salesforce/command';
 import { Duration, env } from '@salesforce/kit';
+import { ComponentSetBuilder } from '@salesforce/source-deploy-retrieve';
 import { DeployCommand } from '../../../../deployCommand';
 import {
   DeployReportCommandResult,
   DeployReportResultFormatter,
 } from '../../../../formatters/deployReportResultFormatter';
-import { ComponentSetBuilder } from '../../../../componentSetBuilder';
 import { ProgressFormatter } from '../../../../formatters/progressFormatter';
 import { DeployProgressBarFormatter } from '../../../../formatters/deployProgressBarFormatter';
 import { DeployProgressStatusFormatter } from '../../../../formatters/deployProgressStatusFormatter';

diff --git a/src/commands/force/source/manifest/create.ts b/src/commands/force/source/manifest/create.ts
@@ -9,8 +9,8 @@ import { join } from 'path';
 import * as fs from 'fs';
 import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
+import { ComponentSetBuilder } from '@salesforce/source-deploy-retrieve';
 import { SourceCommand } from '../../../../sourceCommand';
-import { ComponentSetBuilder } from '../../../../componentSetBuilder';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-source', 'create');

diff --git a/src/commands/force/source/retrieve.ts b/src/commands/force/source/retrieve.ts
@@ -10,16 +10,15 @@ import { join } from 'path';
 import { flags, FlagsConfig } from '@salesforce/command';
 import { Messages, SfdxProject } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
-import { ComponentSet, RequestStatus, RetrieveResult } from '@salesforce/source-deploy-retrieve';
+import { ComponentSet, ComponentSetBuilder, RequestStatus, RetrieveResult } from '@salesforce/source-deploy-retrieve';
 import { SourceTracking } from '@salesforce/source-tracking';
 import { SourceCommand } from '../../../sourceCommand';
 import {
   PackageRetrieval,
   RetrieveCommandResult,
   RetrieveResultFormatter,
 } from '../../../formatters/retrieveResultFormatter';
-import { ComponentSetBuilder } from '../../../componentSetBuilder';
-import { trackingSetup, updateTracking, filterConflictsByComponentSet } from '../../../trackingFunctions';
+import { filterConflictsByComponentSet, trackingSetup, updateTracking } from '../../../trackingFunctions';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-source', 'retrieve');

diff --git a/src/componentSetBuilder.ts b/src/componentSetBuilder.ts
diff --git a/test/commands/mdapi/convert.test.ts b/test/commands/mdapi/convert.test.ts
@@ -13,10 +13,9 @@ import { fromStub, stubInterface, stubMethod } from '@salesforce/ts-sinon';
 import { IConfig } from '@oclif/config';
 import { UX } from '@salesforce/command';
 import { SfdxProject } from '@salesforce/core';
-import { MetadataConverter } from '@salesforce/source-deploy-retrieve';
+import { ComponentSetBuilder, MetadataConverter } from '@salesforce/source-deploy-retrieve';
 import { Convert } from '../../../src/commands/force/mdapi/beta/convert';
 import { FsError } from '../../../src/types';
-import { ComponentSetBuilder } from '../../../src/componentSetBuilder';
 
 const testConvertResult = {
   converted: [

diff --git a/test/commands/mdapi/retrieve.test.ts b/test/commands/mdapi/retrieve.test.ts
@@ -13,11 +13,10 @@ import { Lifecycle, Org } from '@salesforce/core';
 import { fromStub, stubInterface, stubMethod } from '@salesforce/ts-sinon';
 import { IConfig } from '@oclif/config';
 import { UX } from '@salesforce/command';
-import { RetrieveOptions } from '@salesforce/source-deploy-retrieve';
+import { ComponentSetBuilder, ComponentSetOptions, RetrieveOptions } from '@salesforce/source-deploy-retrieve';
 import { Retrieve } from '../../../src/commands/force/mdapi/beta/retrieve';
 import { Stash, StashData } from '../../../src/stash';
 import { getRetrieveResult } from '../source/retrieveResponses';
-import { ComponentSetBuilder, ComponentSetOptions } from '../../../src/componentSetBuilder';
 
 describe('force:mdapi:beta:retrieve', () => {
   const sandbox = sinon.createSandbox();