Skip to content

Commit f5af252

Browse files
committed
fix: resolve local metadata files with pseudo types
1 parent 79f1612 commit f5af252

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

src/commands/project/delete/source.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,10 @@ export class Source extends SfCommand<DeleteSourceJson> {
163163
}
164164
}
165165

166+
// eslint-disable-next-line complexity
166167
protected async delete(): Promise<void> {
167168
const sourcepaths = this.flags['source-dir'];
168-
const retrieveFromOrg = this.flags.metadata?.some(isPseudoType)
169-
? this.flags['target-org'].getUsername()
170-
: undefined;
169+
const resolveFromOrg = this.flags.metadata?.some(isPseudoType) ? this.flags['target-org'].getUsername() : undefined;
171170

172171
this.componentSet = await ComponentSetBuilder.build({
173172
apiversion: this.flags['api-version'],
@@ -180,8 +179,18 @@ export class Source extends SfCommand<DeleteSourceJson> {
180179
}
181180
: undefined,
182181
projectDir: this.project?.getPath(),
183-
...(retrieveFromOrg ? { org: { username: retrieveFromOrg, exclude: [] } } : {}),
182+
...(resolveFromOrg ? { org: { username: resolveFromOrg, exclude: [] } } : {}),
184183
});
184+
185+
// If we built a component set from an org connection, we have to resolve
186+
// components from the project.
187+
if (resolveFromOrg) {
188+
this.componentSet = ComponentSet.fromSource({
189+
fsPaths: await getPackageDirs(),
190+
include: this.componentSet,
191+
});
192+
}
193+
185194
if (this.flags['track-source'] && !this.flags['force-overwrite']) {
186195
await this.filterConflictsByComponentSet();
187196
}

0 commit comments

Comments
 (0)