fix: match class/run typings

salesforcecli · Dec 2, 2022 · e901716 · e901716
1 parent f2fbb56
commit e901716
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "eslint-plugin-header": "^3.0.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-jsdoc": "^39.6.2",
-    "eslint-plugin-sf-plugin": "file:/Users/shane.mclaughlin/eng/eslint-plugin-sf-plugin",
+    "eslint-plugin-sf-plugin": "^1.1.5",
     "husky": "^7.0.4",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",

diff --git a/src/commands/cli/releasenotes.ts b/src/commands/cli/releasenotes.ts
@@ -44,7 +44,7 @@ function isNotEmpty(obj: Record<string, unknown>): boolean {
   return Object.keys(obj).length > 0;
 }
 
-export default class ReleaseNotes extends SfCommand<unknown> {
+export default class ReleaseNotes extends SfCommand<ChangesByPlugin> {
   public static readonly summary = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
   public static readonly flags = {

diff --git a/src/commands/cli/schemas/collect.ts b/src/commands/cli/schemas/collect.ts
@@ -51,7 +51,7 @@ export const deepEqual = (a: JsonMap, b: JsonMap): boolean => {
   }
 };
 
-export default class Collect extends SfCommand<unknown> {
+export default class Collect extends SfCommand<void> {
   public static readonly summary = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
   public static readonly flags = {};

diff --git a/src/commands/cli/schemas/compare.ts b/src/commands/cli/schemas/compare.ts
@@ -26,7 +26,7 @@ type Result = {
 };
 type Results = Record<string, Result>;
 
-export default class Compare extends SfCommand<unknown> {
+export default class Compare extends SfCommand<Results> {
   public static readonly summary = messages.getMessage('description');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);

diff --git a/src/commands/cli/tarballs/prepare.ts b/src/commands/cli/tarballs/prepare.ts
@@ -19,7 +19,7 @@ const messages = Messages.loadMessages('@salesforce/plugin-release-management',
 /**
  * The functionality of this command is taken entirely from https://github.com/salesforcecli/sfdx-cli/blob/v7.109.0/scripts/clean-for-tarballs
  */
-export default class Prepare extends SfCommand<unknown> {
+export default class Prepare extends SfCommand<void> {
   public static readonly summary = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
   public static readonly flags = {

diff --git a/src/commands/cli/tarballs/smoke.ts b/src/commands/cli/tarballs/smoke.ts
@@ -20,7 +20,7 @@ const exec = promisify(execSync);
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-release-management', 'cli.tarballs.smoke');
 
-export default class SmokeTest extends SfCommand<unknown> {
+export default class SmokeTest extends SfCommand<void> {
   public static readonly summary = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
   public static readonly flags = {

diff --git a/src/commands/cli/tarballs/verify.ts b/src/commands/cli/tarballs/verify.ts
@@ -46,7 +46,7 @@ async function fileExists(filePath: string): Promise<boolean> {
 /**
  * The functionality of this command is taken entirely from https://github.com/salesforcecli/sfdx-cli/blob/v7.109.0/scripts/verify-tarballs
  */
-export default class Verify extends SfCommand<unknown> {
+export default class Verify extends SfCommand<void> {
   public static readonly summary = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
   public static readonly flags = {

diff --git a/src/commands/cli/versions/inspect.ts b/src/commands/cli/versions/inspect.ts
@@ -137,7 +137,7 @@ const CLI_META = {
   },
 };
 
-export default class Inspect extends SfCommand<unknown> {
+export default class Inspect extends SfCommand<Info[]> {
   public static readonly summary = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
   public static readonly flags = {

diff --git a/src/commands/dependabot/consolidate.ts b/src/commands/dependabot/consolidate.ts
@@ -17,7 +17,7 @@ import { meetsVersionCriteria, maxVersionBumpFlag, getOwnerAndRepo, BumpType } f
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-release-management', 'dependabot.consolidate');
 
-export default class Consolidate extends SfCommand<unknown> {
+export default class Consolidate extends SfCommand<void> {
   public static readonly summary = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
   public static readonly flags = {

diff --git a/src/commands/npm/package/promote.ts b/src/commands/npm/package/promote.ts
@@ -24,7 +24,7 @@ interface Token {
   automation: boolean;
 }
 
-export default class Promote extends SfCommand<unknown> {
+export default class Promote extends SfCommand<void> {
   public static readonly summary = messages.getMessage('description');
   public static readonly examples = messages.getMessage('examples').split(os.EOL);
   public static readonly flags = {

diff --git a/src/commands/npm/package/release.ts b/src/commands/npm/package/release.ts
@@ -23,7 +23,7 @@ interface ReleaseResult {
   name: string;
 }
 
-export default class Release extends SfCommand<unknown> {
+export default class Release extends SfCommand<ReleaseResult> {
   public static readonly summary = messages.getMessage('description');
   public static readonly flags = {
     dryrun: Flags.boolean({

diff --git a/yarn.lock b/yarn.lock
@@ -1908,7 +1908,7 @@
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@^5.44.0":
+"@typescript-eslint/utils@^5.41.0":
   version "5.45.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.45.0.tgz#9cca2996eee1b8615485a6918a5c763629c7acf5"
   integrity sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==
@@ -3764,10 +3764,12 @@ eslint-plugin-prefer-arrow@^1.2.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz#e7fbb3fa4cd84ff1015b9c51ad86550e55041041"
   integrity sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==
 
-"eslint-plugin-sf-plugin@file:../eslint-plugin-sf-plugin":
+eslint-plugin-sf-plugin@^1.1.5:
   version "1.1.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.1.5.tgz#eee5dfaa1e7cf4e14bc6319bd1f1aae42ab223b8"
+  integrity sha512-zFmXpRud4S1qrbhops4WfjBATKIeIVJVLcZg7QnVRmnXUFoOPAebQbe1ccViYx6F3Y/s5Ui/Q0tEb8ywDz/gqQ==
   dependencies:
-    "@typescript-eslint/utils" "^5.44.0"
+    "@typescript-eslint/utils" "^5.41.0"
 
 eslint-scope@^5.1.1:
   version "5.1.1"