[chore] Apply more lint (#2509)

packages/eas-cli/src/.eslintrc.js

@@ -14,7 +14,7 @@ module.exports = {
           },
         ],
         '@typescript-eslint/prefer-nullish-coalescing': ['warn', { ignorePrimitives: true }],
-        // '@typescript-eslint/no-confusing-void-expression': 'warn',
+        '@typescript-eslint/no-confusing-void-expression': 'warn',
         // '@typescript-eslint/await-thenable': 'error',
         // '@typescript-eslint/no-misused-promises': [
         //   'error',

packages/eas-cli/src/branch/queries.ts

@@ -84,7 +84,9 @@ export async function listAndRenderBranchesOnAppAsync(
         queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
       promptOptions: {
         title: 'Load more branches?',
-        renderListItems: branches => renderPageOfBranches(branches, paginatedQueryOptions),
+        renderListItems: branches => {
+          renderPageOfBranches(branches, paginatedQueryOptions);
+        },
       },
     });
   }

packages/eas-cli/src/build/build.ts

@@ -130,7 +130,9 @@ export async function prepareBuildRequestForPlatformAsync<
 
   await withAnalyticsAsync(
     ctx.analytics,
-    async () => await builder.syncProjectConfigurationAsync(ctx),
+    async () => {
+      await builder.syncProjectConfigurationAsync(ctx);
+    },
     {
       attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
       successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,

packages/eas-cli/src/build/queries.ts

@@ -50,8 +50,9 @@ export async function listAndRenderBuildsOnAppAsync(
         }),
       promptOptions: {
         title: 'Load more builds?',
-        renderListItems: builds =>
-          renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions }),
+        renderListItems: builds => {
+          renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions });
+        },
       },
     });
   }

packages/eas-cli/src/build/utils/printBuildInfo.ts

@@ -62,7 +62,9 @@ export function printBuildResults(builds: (BuildFragment | null)[]): void {
     assert(build, 'Build should be defined');
     printBuildResult(build);
   } else {
-    (builds.filter(i => i) as BuildFragment[]).forEach(build => printBuildResult(build));
+    (builds.filter(i => i) as BuildFragment[]).forEach(build => {
+      printBuildResult(build);
+    });
   }
 }
 
@@ -97,9 +99,9 @@ function printBuildResult(build: BuildFragment): void {
     // to the build details page and let people press the button to download there
     const qrcodeUrl =
       build.platform === AppPlatform.Ios ? getInternalDistributionInstallUrl(build) : logsUrl;
-    qrcodeTerminal.generate(qrcodeUrl, { small: true }, code =>
-      Log.log(`${indentString(code, 2)}\n`)
-    );
+    qrcodeTerminal.generate(qrcodeUrl, { small: true }, code => {
+      Log.log(`${indentString(code, 2)}\n`);
+    });
     Log.log(
       `${appPlatformEmojis[build.platform]} Open this link on your ${
         appPlatformDisplayNames[build.platform]

packages/eas-cli/src/channel/__tests__/branch-mapping-test.ts

@@ -17,7 +17,9 @@ import {
 
 describe(assertVersion, () => {
   it('throws if the branch mapping is not the correct version', () => {
-    expect(() => assertVersion(testChannelBasicInfo, 5)).toThrowError(BranchMappingValidationError);
+    expect(() => {
+      assertVersion(testChannelBasicInfo, 5);
+    }).toThrowError(BranchMappingValidationError);
   });
   it('asserts the correct version', () => {
     assertVersion(testChannelBasicInfo, 0);

packages/eas-cli/src/channel/queries.ts

@@ -89,7 +89,9 @@ export async function listAndRenderChannelsOnAppAsync(
         queryChannelsOnAppAsync(graphqlClient, { limit, offset, appId: projectId }),
       promptOptions: {
         title: 'Load more channels?',
-        renderListItems: channels => renderPageOfChannels(channels, paginatedQueryOptions),
+        renderListItems: channels => {
+          renderPageOfChannels(channels, paginatedQueryOptions);
+        },
       },
     });
   }
@@ -131,8 +133,9 @@ export async function listAndRenderBranchesAndUpdatesOnChannelAsync(
         }),
       promptOptions: {
         title: 'Load more channels?',
-        renderListItems: branches =>
-          renderPageOfBranchesOnChannel(channel, branches, paginatedQueryOptions),
+        renderListItems: branches => {
+          renderPageOfBranchesOnChannel(channel, branches, paginatedQueryOptions);
+        },
       },
     });
   }

packages/eas-cli/src/commandUtils/gating/FeatureGating.ts

@@ -63,7 +63,11 @@ export default class FeatureGating {
   }
 
   public static overrideKeyForEachInTest(key: FeatureGateKey, enabled: boolean): void {
-    beforeEach(() => FeatureGateTestOverrides.setOverride(key, enabled));
-    afterEach(() => FeatureGateTestOverrides.removeOverride(key));
+    beforeEach(() => {
+      FeatureGateTestOverrides.setOverride(key, enabled);
+    });
+    afterEach(() => {
+      FeatureGateTestOverrides.removeOverride(key);
+    });
   }
 }

packages/eas-cli/src/commands/metadata/lint.ts

@@ -60,7 +60,8 @@ export default class MetadataLint extends EasCommand {
       await loadConfigAsync({ projectDir, profile: submitProfile });
 
       if (flags.json) {
-        return printJsonOnlyOutput([]);
+        printJsonOnlyOutput([]);
+        return;
       }
 
       Log.log('✅ Store configuration is valid.');
@@ -70,7 +71,8 @@ export default class MetadataLint extends EasCommand {
       }
 
       if (flags.json) {
-        return printJsonOnlyOutput(error.errors);
+        printJsonOnlyOutput(error.errors);
+        return;
       }
 
       logMetadataValidationError(error);

packages/eas-cli/src/commands/update/__tests__/republish.test.ts

@@ -55,7 +55,9 @@ jest.mock('../../../utils/code-signing');
 jest.mock('../../../fetch');
 
 describe(UpdateRepublish.name, () => {
-  afterEach(() => vol.reset());
+  afterEach(() => {
+    vol.reset();
+  });
 
   it('errors when providing both --group and --branch', async () => {
     const flags = ['--group=1234', '--branch=main'];

packages/eas-cli/src/commands/update/__tests__/roll-back-to-embedded.test.ts

@@ -68,7 +68,9 @@ jest.mock('../../../project/publish', () => ({
 }));
 
 describe(UpdateRollBackToEmbedded.name, () => {
-  afterEach(() => vol.reset());
+  afterEach(() => {
+    vol.reset();
+  });
 
   it('errors with both --channel and --branch', async () => {
     const flags = ['--channel=channel123', '--branch=branch123'];

packages/eas-cli/src/credentials/android/api/GraphqlClient.ts

@@ -279,7 +279,7 @@ export async function deleteKeystoreAsync(
   graphqlClient: ExpoGraphqlClient,
   keystore: AndroidKeystoreFragment
 ): Promise<void> {
-  return await AndroidKeystoreMutation.deleteAndroidKeystoreAsync(graphqlClient, keystore.id);
+  await AndroidKeystoreMutation.deleteAndroidKeystoreAsync(graphqlClient, keystore.id);
 }
 
 export async function createFcmAsync(
@@ -299,7 +299,7 @@ export async function deleteFcmAsync(
   graphqlClient: ExpoGraphqlClient,
   fcm: AndroidFcmFragment
 ): Promise<void> {
-  return await AndroidFcmMutation.deleteAndroidFcmAsync(graphqlClient, fcm.id);
+  await AndroidFcmMutation.deleteAndroidFcmAsync(graphqlClient, fcm.id);
 }
 
 export async function createGoogleServiceAccountKeyAsync(
@@ -318,7 +318,7 @@ export async function deleteGoogleServiceAccountKeyAsync(
   graphqlClient: ExpoGraphqlClient,
   googleServiceAccountKey: GoogleServiceAccountKeyFragment
 ): Promise<void> {
-  return await GoogleServiceAccountKeyMutation.deleteGoogleServiceAccountKeyAsync(
+  await GoogleServiceAccountKeyMutation.deleteGoogleServiceAccountKeyAsync(
     graphqlClient,
     googleServiceAccountKey.id
   );

packages/eas-cli/src/credentials/android/utils/__tests__/keystoreNew-test.ts

@@ -39,37 +39,49 @@ describe('validateKeystore', () => {
   it('validates a correctly formatted jks keystore', async () => {
     const keystoreWithType = getKeystoreWithType(testKeystore);
     expect(keystoreWithType.type).toBe(AndroidKeystoreType.Jks);
-    expect(() => validateKeystore(keystoreWithType)).not.toThrow();
+    expect(() => {
+      validateKeystore(keystoreWithType);
+    }).not.toThrow();
   });
   it('doesnt validate a jks keystore with wrong alias', async () => {
     const keystoreWithType = getKeystoreWithType({
       ...testKeystore,
       keyAlias: 'non-existent-alias',
     });
-    expect(() => validateKeystore(keystoreWithType)).toThrow();
+    expect(() => {
+      validateKeystore(keystoreWithType);
+    }).toThrow();
   });
   it('doesnt validate a jks keystore with wrong key password', async () => {
     const keystoreWithType = getKeystoreWithType({
       ...testKeystore,
       keyPassword: 'not-the-password',
     });
-    expect(() => validateKeystore(keystoreWithType)).toThrow();
+    expect(() => {
+      validateKeystore(keystoreWithType);
+    }).toThrow();
   });
   it('validates a correctly formatted pkcs 12 keystore', async () => {
     const keystoreWithType = getKeystoreWithType(testPKCS12Keystore);
     expect(keystoreWithType.type).toBe(AndroidKeystoreType.Pkcs12);
-    expect(() => validateKeystore(keystoreWithType)).not.toThrow();
+    expect(() => {
+      validateKeystore(keystoreWithType);
+    }).not.toThrow();
   });
   it('doesnt validate a PKCS 12 keystore with wrong alias', async () => {
     const keystoreWithType = getKeystoreWithType({
       ...testPKCS12Keystore,
       keyAlias: 'non-existent-alias',
     });
-    expect(() => validateKeystore(keystoreWithType)).toThrow();
+    expect(() => {
+      validateKeystore(keystoreWithType);
+    }).toThrow();
   });
   it('validates an PKCS 12 Keystore with an empty password', async () => {
     const keystoreWithType = getKeystoreWithType(testPKCS12EmptyPasswordKeystore);
     expect(keystoreWithType.type).toBe(AndroidKeystoreType.Pkcs12);
-    expect(() => validateKeystore(keystoreWithType)).not.toThrow();
+    expect(() => {
+      validateKeystore(keystoreWithType);
+    }).not.toThrow();
   });
 });

packages/eas-cli/src/credentials/ios/api/GraphqlClient.ts

@@ -388,7 +388,7 @@ export async function deleteProvisioningProfilesAsync(
   graphqlClient: ExpoGraphqlClient,
   appleProvisioningProfileIds: string[]
 ): Promise<void> {
-  return await AppleProvisioningProfileMutation.deleteAppleProvisioningProfilesAsync(
+  await AppleProvisioningProfileMutation.deleteAppleProvisioningProfilesAsync(
     graphqlClient,
     appleProvisioningProfileIds
   );
@@ -445,7 +445,7 @@ export async function deleteDistributionCertificateAsync(
   graphqlClient: ExpoGraphqlClient,
   distributionCertificateId: string
 ): Promise<void> {
-  return await AppleDistributionCertificateMutation.deleteAppleDistributionCertificateAsync(
+  await AppleDistributionCertificateMutation.deleteAppleDistributionCertificateAsync(
     graphqlClient,
     distributionCertificateId
   );
@@ -493,7 +493,7 @@ export async function deletePushKeyAsync(
   graphqlClient: ExpoGraphqlClient,
   pushKeyId: string
 ): Promise<void> {
-  return await ApplePushKeyMutation.deleteApplePushKeyAsync(graphqlClient, pushKeyId);
+  await ApplePushKeyMutation.deleteApplePushKeyAsync(graphqlClient, pushKeyId);
 }
 
 export async function createAscApiKeyAsync(
@@ -543,10 +543,7 @@ export async function deleteAscApiKeyAsync(
   graphqlClient: ExpoGraphqlClient,
   ascApiKeyId: string
 ): Promise<void> {
-  return await AppStoreConnectApiKeyMutation.deleteAppStoreConnectApiKeyAsync(
-    graphqlClient,
-    ascApiKeyId
-  );
+  await AppStoreConnectApiKeyMutation.deleteAppStoreConnectApiKeyAsync(graphqlClient, ascApiKeyId);
 }
 
 function convertUserRoleToGraphqlType(userRole: UserRole): AppStoreConnectUserRole {

packages/eas-cli/src/credentials/ios/appstore/AppStoreApi.ts

@@ -84,7 +84,7 @@ export default class AppStoreApi {
     options?: IosCapabilitiesOptions
   ): Promise<void> {
     const ctx = await this.ensureAuthenticatedAsync();
-    return await ensureBundleIdExistsAsync(ctx, app, options);
+    await ensureBundleIdExistsAsync(ctx, app, options);
   }
 
   public async listDistributionCertificatesAsync(): Promise<DistributionCertificateStoreInfo[]> {
@@ -99,7 +99,7 @@ export default class AppStoreApi {
 
   public async revokeDistributionCertificateAsync(ids: string[]): Promise<void> {
     const ctx = await this.ensureAuthenticatedAsync();
-    return await revokeDistributionCertificateAsync(ctx, ids);
+    await revokeDistributionCertificateAsync(ctx, ids);
   }
 
   public async listPushKeysAsync(): Promise<PushKeyStoreInfo[]> {
@@ -114,7 +114,7 @@ export default class AppStoreApi {
 
   public async revokePushKeyAsync(ids: string[]): Promise<void> {
     const userCtx = await this.ensureUserAuthenticatedAsync();
-    return await revokePushKeyAsync(userCtx, ids);
+    await revokePushKeyAsync(userCtx, ids);
   }
 
   public async useExistingProvisioningProfileAsync(
@@ -164,7 +164,7 @@ export default class AppStoreApi {
     profileClass?: ProfileClass
   ): Promise<void> {
     const ctx = await this.ensureAuthenticatedAsync();
-    return await revokeProvisioningProfileAsync(ctx, bundleIdentifier, applePlatform, profileClass);
+    await revokeProvisioningProfileAsync(ctx, bundleIdentifier, applePlatform, profileClass);
   }
 
   public async createOrReuseAdhocProvisioningProfileAsync(

packages/eas-cli/src/credentials/ios/appstore/__tests__/bundleIdCapabilities-test.ts

@@ -11,9 +11,9 @@ describe(assertValidOptions, () => {
     const classifier = CapabilityMapping.find(
       ({ capabilityIdPrefix }) => capabilityIdPrefix === 'merchant.'
     )!;
-    expect(() => assertValidOptions(classifier, ['foobar'])).toThrowError(
-      /Expected an array of strings, where each string is prefixed with "merchant."/
-    );
+    expect(() => {
+      assertValidOptions(classifier, ['foobar']);
+    }).toThrowError(/Expected an array of strings, where each string is prefixed with "merchant."/);
   });
 });
 

packages/eas-cli/src/credentials/ios/appstore/ensureAppExists.ts

@@ -25,7 +25,7 @@ export async function ensureBundleIdExistsAsync(
   { accountName, projectName, bundleIdentifier }: AppLookupParams,
   options?: IosCapabilitiesOptions
 ): Promise<void> {
-  return await ensureBundleIdExistsWithNameAsync(
+  await ensureBundleIdExistsWithNameAsync(
     authCtx,
     {
       name: `@${accountName}/${projectName}`,

packages/eas-cli/src/credentials/ios/appstore/keychain.ts

@@ -27,7 +27,8 @@ export async function deletePasswordAsync({
       (error: Error) => {
         if (error) {
           if (error.message.match(NO_PASSWORD_REGEX)) {
-            return resolve(false);
+            resolve(false);
+            return;
           }
           reject(error);
         } else {
@@ -52,7 +53,8 @@ export async function getPasswordAsync({
       (error: Error, password: string) => {
         if (error) {
           if (error.message.match(NO_PASSWORD_REGEX)) {
-            return resolve(null);
+            resolve(null);
+            return;
           }
           reject(error);
         } else {

packages/eas-cli/src/credentials/manager/ManageAndroid.ts

@@ -143,7 +143,8 @@ export class ManageAndroid {
             currentActions = highLevelActions;
             continue;
           } else if (chosenAction === AndroidActionType.GoBackToCaller) {
-            return await this.callingAction.runAsync(ctx);
+            await this.callingAction.runAsync(ctx);
+            return;
           }
         }
 

packages/eas-cli/src/credentials/manager/ManageIos.ts

@@ -152,7 +152,8 @@ export class ManageIos {
             currentActions = highLevelActions;
             continue;
           } else if (chosenAction === IosActionType.GoBackToCaller) {
-            return await this.callingAction.runAsync(ctx);
+            await this.callingAction.runAsync(ctx);
+            return;
           }
         } else if (actionInfo.scope === Scope.Project) {
           assert(

packages/eas-cli/src/credentials/manager/SelectPlatform.ts

@@ -23,8 +23,9 @@ export class SelectPlatform {
     const platform = await selectPlatformAsync(this.flagPlatform);
 
     if (platform === 'ios') {
-      return await new ManageIos(this, process.cwd()).runAsync();
+      await new ManageIos(this, process.cwd()).runAsync();
+      return;
     }
-    return await new ManageAndroid(this, process.cwd()).runAsync();
+    await new ManageAndroid(this, process.cwd()).runAsync();
   }
 }