Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

9 changes: 0 additions & 9 deletions .eslintrc.cjs

This file was deleted.

1 change: 1 addition & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from 'eslint-config-salesforce-typescript';
13 changes: 10 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,20 @@
"@salesforce/kit": "^4.0.0",
"@salesforce/packaging": "^5.0.4",
"@salesforce/sf-plugins-core": "^13.0.0",
"chalk": "^5.6.2",
"@salesforce/ts-types": "^3.0.1"
"@salesforce/ts-types": "^3.0.1",
"chalk": "^5.6.2"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.3.34",
"@salesforce/cli-plugins-testkit": "^5.3.62",
"@salesforce/dev-scripts": "^11.0.4",
"@salesforce/dev-scripts": "^13.0.2",
"@salesforce/plugin-command-reference": "^3.1.122",
"@types/chai": "^4.3.17",
"@types/mocha": "^10.0.10",
"@types/node": "^18",
"@types/sinon": "^10.0.20",
"eslint": "^10.4.0",
"eslint-config-salesforce-typescript": "^6.0.0",
"eslint-plugin-sf-plugin": "^1.20.32",
"minimatch": "^10.2.5",
"oclif": "^4.23.27",
Expand Down Expand Up @@ -170,6 +176,7 @@
"src/**/*.ts",
"test/**/*.ts",
"messages/**",
"**/eslint.config.*",
"**/.eslint*",
"**/tsconfig.json"
],
Expand Down
3 changes: 2 additions & 1 deletion src/commands/package/bundle/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ export class PackageBundlesInstall extends SfCommand<BundleSObjects.PkgBundleVer
this.spinner.stop();
}

// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
switch (result.InstallStatus) {
case BundleSObjects.PkgBundleVersionInstallReqStatus.error: {
const errorText =
Expand All @@ -155,7 +156,7 @@ export class PackageBundlesInstall extends SfCommand<BundleSObjects.PkgBundleVer
default:
this.log(
messages.getMessage('bundleInstallInProgress', [
camelCaseToTitleCase(result.InstallStatus as string),
camelCaseToTitleCase(result.InstallStatus),
result.Id,
targetOrg.getUsername() ?? '',
])
Expand Down
1 change: 0 additions & 1 deletion src/commands/package/bundle/install/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export class PackageBundleInstallReportCommand extends SfCommand<ReportCommandRe
loglevel,
'target-org': requiredOrgFlagWithDeprecations,
'api-version': orgApiVersionFlagWithDeprecations,
// eslint-disable-next-line sf-plugin/id-flag-suggestions
'package-install-request-id': Flags.salesforceId({
length: 'both',
char: 'i',
Expand Down
3 changes: 2 additions & 1 deletion src/commands/package/bundle/uninstall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ export class PackageBundleUninstallCommand extends SfCommand<BundleUninstallResu
this.spinner.stop();
}

// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
switch (result.UninstallStatus) {
case BundleSObjects.PkgBundleVersionUninstallReqStatus.error: {
const errorText =
Expand All @@ -129,7 +130,7 @@ export class PackageBundleUninstallCommand extends SfCommand<BundleUninstallResu
default:
this.log(
messages.getMessage('bundleUninstallInProgress', [
camelCaseToTitleCase(result.UninstallStatus as string),
camelCaseToTitleCase(result.UninstallStatus),
result.Id,
targetOrg.getUsername() ?? '',
])
Expand Down
3 changes: 2 additions & 1 deletion src/commands/package/bundle/version/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ export class PackageBundlesCreate extends SfCommand<BundleSObjects.PackageBundle
this.spinner.stop();
}

// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
switch (result.RequestStatus) {
case BundleSObjects.PkgBundleVersionCreateReqStatus.error: {
// Collect all error messages from both Error array and ValidationError
Expand All @@ -166,7 +167,7 @@ export class PackageBundlesCreate extends SfCommand<BundleSObjects.PackageBundle
break;
}
default:
this.log(messages.getMessage('InProgress', [camelCaseToTitleCase(result.RequestStatus as string), result.Id]));
this.log(messages.getMessage('InProgress', [camelCaseToTitleCase(result.RequestStatus), result.Id]));
}
return result;
}
Expand Down
1 change: 0 additions & 1 deletion src/commands/package/bundle/version/create/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export class PackageBundleVersionCreateReportCommand extends SfCommand<ReportCom
loglevel,
'target-dev-hub': requiredHubFlag,
'api-version': orgApiVersionFlagWithDeprecations,
// eslint-disable-next-line sf-plugin/id-flag-suggestions
'bundle-version-create-request-id': Flags.salesforceId({
length: 'both',
char: 'i',
Expand Down
13 changes: 7 additions & 6 deletions src/commands/package/convert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,18 @@ export class PackageConvert extends SfCommand<PackageVersionCreateRequestResult>
flags['target-dev-hub'].getConnection(flags['api-version']),
{
wait: flags.wait,
installationKey: flags['installation-key'] as string,
definitionfile: flags['definition-file'] as string,
installationKey: flags['installation-key'],
definitionfile: flags['definition-file'],
installationKeyBypass: flags['installation-key-bypass'],
buildInstance: flags['build-instance'] as string,
seedMetadata: flags['seed-metadata'] as string,
patchversion: flags['patch-version'] as string,
codecoverage: flags['code-coverage'] as boolean,
buildInstance: flags['build-instance'],
seedMetadata: flags['seed-metadata'],
patchversion: flags['patch-version'],
codecoverage: flags['code-coverage'],
},
this.project
);

// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
switch (result.Status) {
case PackagingSObjects['Package2VersionStatus'].error:
this.spinner.stop();
Expand Down
1 change: 0 additions & 1 deletion src/commands/package/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ export class PackageCreateCommand extends SfCommand<PackageCreate> {
description: messages.getMessage('flags.org-dependent.description'),
}),
'error-notification-username': Flags.string({
// eslint-disable-next-line sf-plugin/dash-o
char: 'o',
deprecateAliases: true,
aliases: ['errornotificationusername'],
Expand Down
2 changes: 1 addition & 1 deletion src/commands/package/installed/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class PackageInstalledListCommand extends SfCommand<PackageInstalledComma

// Calculate Version Settings from the data already in the result
if (r.SubscriberPackageVersion) {
const isManaged = r.SubscriberPackageVersion.IsManaged as boolean;
const isManaged = r.SubscriberPackageVersion.IsManaged;
const package2ContainerOptions = r.SubscriberPackageVersion.Package2ContainerOptions as string;

// Use namespace for 1GP managed packages. For 2GP managed packages use packageId. For anything else,
Expand Down
6 changes: 3 additions & 3 deletions src/commands/package/push-upgrade/schedule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class PackagePushScheduleCommand extends SfCommand<PackagePushScheduleRes
public async run(): Promise<PackagePushScheduleResult> {
const { flags } = await this.parse(PackagePushScheduleCommand);
const logger = await Logger.child(this.constructor.name);
let orgList: string[] = [];
let orgList: string[];

if (flags['org-file']) {
logger.debug(`Reading org list from file: ${flags['org-file']}`);
Expand Down Expand Up @@ -102,7 +102,7 @@ async function readOrgFile(filePath: string): Promise<string[]> {
const orgIds = fileContent.split(/\r?\n/).filter((id) => id.trim().length > 0);

return orgIds.filter((id: string) => /^00D[a-zA-Z0-9]{12}$/.test(id));
} catch (error) {
} catch {
throw new SfError(messages.getMessage('error.invalid-org-file'));
}
}
Expand All @@ -116,7 +116,7 @@ function getOrgListFromInput(orgInput: string): string[] {
const orgList = orgInput.split(',').map((org) => org.trim());

return orgList.filter((org) => org.length > 0);
} catch (error) {
} catch {
throw new SfError(messages.getMessage('error.invalid-org-input'));
}
}
1 change: 0 additions & 1 deletion src/commands/package/uninstall/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export class PackageUninstallReportCommand extends SfCommand<PackagingSObjects.S
loglevel,
'target-org': requiredOrgFlagWithDeprecations,
'api-version': orgApiVersionFlagWithDeprecations,
// eslint-disable-next-line sf-plugin/id-flag-suggestions
'request-id': Flags.salesforceId({
length: 'both',
deprecateAliases: true,
Expand Down
1 change: 0 additions & 1 deletion src/commands/package/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export class PackageUpdateCommand extends SfCommand<PackageSaveResult> {
summary: messages.getMessage('flags.description.summary'),
}),
'error-notification-username': Flags.string({
// eslint-disable-next-line sf-plugin/dash-o
char: 'o',
deprecateAliases: true,
aliases: ['errornotificationusername'],
Expand Down
3 changes: 2 additions & 1 deletion src/commands/package/version/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ export class PackageVersionCreateCommand extends SfCommand<PackageVersionCommand
this.spinner.stop(finalStatusMsg);
}

// eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
switch (result.Status) {
case Package2VersionStatus.error:
throw messages.createError('multipleErrors', [
Expand Down Expand Up @@ -315,7 +316,7 @@ export class PackageVersionCreateCommand extends SfCommand<PackageVersionCommand
break;
default:
this.log(
messages.getMessage('InProgress', [camelCaseToTitleCase(result.Status as string), this.config.bin, result.Id])
messages.getMessage('InProgress', [camelCaseToTitleCase(result.Status), this.config.bin, result.Id])
);
}
return result;
Expand Down
3 changes: 1 addition & 2 deletions src/commands/package/version/create/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export class PackageVersionCreateReportCommand extends SfCommand<ReportCommandRe
loglevel,
'target-dev-hub': requiredHubFlag,
'api-version': orgApiVersionFlagWithDeprecations,
// eslint-disable-next-line sf-plugin/id-flag-suggestions
'package-create-request-id': Flags.salesforceId({
length: 'both',
deprecateAliases: true,
Expand Down Expand Up @@ -129,7 +128,7 @@ export class PackageVersionCreateReportCommand extends SfCommand<ReportCommandRe
// Check if errors were truncated. If so, inform the user with
// instructions on how to retrieve the remaining errors.
if (record.Error.length > ERROR_LIMIT) {
this.warn(messages.getMessage('truncatedErrors', [this.config.bin, requestId, devOrg.getUsername() as string]));
this.warn(messages.getMessage('truncatedErrors', [this.config.bin, requestId, devOrg.getUsername()]));
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/commands/package/version/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ export class PackageVersionListCommand extends SfCommand<PackageVersionListComma
summary: messages.getMessage('flags.branch.summary'),
}),
'order-by': Flags.string({
// eslint-disable-next-line sf-plugin/dash-o
char: 'o',
deprecateAliases: true,
aliases: ['orderby'],
Expand Down
2 changes: 1 addition & 1 deletion src/commands/package/version/promote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class PackageVersionPromoteCommand extends SfCommand<PackageSaveResult> {
this.log(messages.getMessage('humanSuccess', [result.id]));
return result;
} catch (e) {
const err = SfError.wrap(e as Error);
const err = SfError.wrap(e);
if (err.name === 'DUPLICATE_VALUE' && err.message.includes('previously released')) {
err.message = messages.getMessage('previouslyReleasedMessage');
err.actions = [messages.getMessage('previouslyReleasedAction', [this.config.bin, this.config.bin])];
Expand Down
4 changes: 2 additions & 2 deletions src/commands/package/version/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ export class PackageVersionReportCommand extends SfCommand<PackageVersionReportR
},
{
key: 'Metadata File Size',
value: (record.TotalSizeOfMetadataFiles
value: record.TotalSizeOfMetadataFiles
? `${Math.ceil(record.TotalSizeOfMetadataFiles / (1024 * 1024))} MB`
: '') as unknown as string,
: '',
}
);
if (Number(connection.version) >= 67) {
Expand Down
26 changes: 0 additions & 26 deletions test/.eslintrc.cjs

This file was deleted.

2 changes: 1 addition & 1 deletion test/commands/bundle/bundleCreate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('package:bundle:create - tests', () => {

await cmd.run();

// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.calledOnce).to.be.true;
});

Expand Down
4 changes: 2 additions & 2 deletions test/commands/bundle/bundleInstallReport.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe('package:bundle:install:report - tests', () => {

expect(getInstallStatusStub.calledOnce).to.be.true;
expect(getInstallStatusStub.firstCall.args[0]).to.equal(requestId);
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.calledOnce).to.be.true;
});

Expand All @@ -89,7 +89,7 @@ describe('package:bundle:install:report - tests', () => {

expect(getInstallStatusStub.calledOnce).to.be.true;
expect(getInstallStatusStub.firstCall.args[0]).to.equal(requestId);
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.calledOnce).to.be.true;
});

Expand Down
20 changes: 10 additions & 10 deletions test/commands/bundle/bundleInstalledList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ describe('package:bundle:installed:list - tests', () => {
await cmd.run();

expect(getInstalledBundlesStub.calledOnce).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.called).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.callCount).to.equal(2); // One for bundle info, one for components
});

Expand Down Expand Up @@ -128,9 +128,9 @@ describe('package:bundle:installed:list - tests', () => {
await cmd.run();

expect(getInstalledBundlesStub.calledOnce).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.called).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.callCount).to.equal(4); // Two bundles × (info + components)
});

Expand Down Expand Up @@ -165,7 +165,7 @@ describe('package:bundle:installed:list - tests', () => {
await cmd.run();

expect(getInstalledBundlesStub.calledOnce).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.called).to.be.true;
});

Expand Down Expand Up @@ -200,7 +200,7 @@ describe('package:bundle:installed:list - tests', () => {
await cmd.run();

expect(getInstalledBundlesStub.calledOnce).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.called).to.be.true;
});

Expand All @@ -212,9 +212,9 @@ describe('package:bundle:installed:list - tests', () => {
await cmd.run();

expect(getInstalledBundlesStub.calledOnce).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.warn.calledOnce).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.warn.firstCall.args[0]).to.include('No installed package bundles found');
});

Expand Down Expand Up @@ -242,9 +242,9 @@ describe('package:bundle:installed:list - tests', () => {
await cmd.run();

expect(getInstalledBundlesStub.calledOnce).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.called).to.be.true;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.callCount).to.equal(1); // Only bundle info, no components table
});

Expand Down
2 changes: 1 addition & 1 deletion test/commands/bundle/bundleList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('package:bundle:list - tests', () => {

await cmd.run();

// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(sfCommandStubs.table.calledOnce).to.be.true;
});

Expand Down
Loading
Loading