Merge pull request #7112 from Shopify/03-26-chore_fix_87_eslint_warnings_across_the_codebase

chore: fix 87 eslint warnings across the codebase

Author: isaacroldan

packages/app/src/cli/commands/app/app-logs/sources.ts

@@ -26,10 +26,10 @@ export default class Sources extends AppLinkedCommand {
       userProvidedConfigName: flags.config,
     })
 
-    if (!app.errors.isEmpty()) {
-      process.exit(2)
-    } else {
+    if (app.errors.isEmpty()) {
       sources(app)
+    } else {
+      process.exit(2)
     }
     return {app}
   }

packages/app/src/cli/commands/app/function/run.ts

@@ -56,15 +56,15 @@ export default class FunctionRun extends AppUnlinkedCommand {
       if (targeting.length > 1 && isTTY({})) {
         const targets = targeting.map((target) => ({
           label: target.target,
-          value: target.export || DEFAULT_FUNCTION_EXPORT,
+          value: target.export || DEFAULT_FUNCTION_EXPORT, // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing -- empty export should use default
         }))
 
         functionExport = await renderAutocompletePrompt({
           message: `Which target would you like to execute?`,
           choices: targets,
         })
       } else {
-        functionExport = targeting?.[0]?.export || DEFAULT_FUNCTION_EXPORT
+        functionExport = targeting?.[0]?.export || DEFAULT_FUNCTION_EXPORT // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing -- empty export should use default
         outputDebug(
           `Using export '${functionExport}'. Use the --export flag or an interactive terminal to select a different export.`,
         )

packages/app/src/cli/commands/app/webhook/trigger.ts

@@ -106,7 +106,7 @@ export default class WebhookTrigger extends AppLinkedCommand {
       deliveryMethod: flags['delivery-method'],
       address: flags.address,
       clientId: flags['client-id'],
-      clientSecret: flags['client-secret'] || flags['shared-secret'],
+      clientSecret: flags['client-secret'] || flags['shared-secret'], // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing -- empty flag should try next
       path: flags.path,
       config: flags.config,
       organizationId: appContextResult.organization.id,

packages/app/src/cli/models/app/identifiers.ts

@@ -52,11 +52,9 @@ export async function updateAppIdentifiers(
 ): Promise<AppInterface> {
   let dotenvFile = app.dotenv
 
-  if (!dotenvFile) {
-    dotenvFile = {
-      path: joinPath(app.directory, getDotEnvFileName(app.configPath)),
-      variables: {},
-    }
+  dotenvFile ??= {
+    path: joinPath(app.directory, getDotEnvFileName(app.configPath)),
+    variables: {},
   }
   const updatedVariables: {[key: string]: string} = {...(app.dotenv?.variables ?? {})}
   if (!systemEnvironment[app.idEnvironmentVariableName]) {

packages/app/src/cli/prompts/generate/extension.ts

@@ -92,7 +92,7 @@ const generateExtensionPrompts = async (
 
   const extensionTemplate = extensionTemplates.find((template) => template.identifier === templateType)!
 
-  const name = options.name || (await promptName(options.directory, extensionTemplate.defaultName))
+  const name = options.name || (await promptName(options.directory, extensionTemplate.defaultName)) // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing -- empty name should prompt
   const flavor = options.extensionFlavor ?? (await promptFlavor(extensionTemplate))
   const extensionContent = {name, flavor}
 

packages/app/src/cli/prompts/init/init.ts

@@ -84,18 +84,16 @@ const init = async (options: InitOptions): Promise<InitOutput> => {
     template: templates.reactRouter.url,
   } as const
 
-  if (!template) {
-    template = await renderSelectPrompt({
-      choices: templateOptionsInOrder.map((key) => {
-        return {
-          label: templates[key].label || key,
-          value: key,
-        }
-      }),
-      message: 'Get started building your app:',
-      defaultValue: allTemplates.find((key) => templates[key].url === defaults.template),
-    })
-  }
+  template ??= await renderSelectPrompt({
+    choices: templateOptionsInOrder.map((key) => {
+      return {
+        label: templates[key].label || key, // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing -- empty label should show key
+        value: key,
+      }
+    }),
+    message: 'Get started building your app:',
+    defaultValue: allTemplates.find((key) => templates[key].url === defaults.template),
+  })
 
   const answers: InitOutput = {
     ...options,
@@ -129,7 +127,7 @@ const init = async (options: InitOptions): Promise<InitOutput> => {
     selectedUrl = `${selectedUrl}#${branch}`
   }
 
-  answers.template = selectedUrl || answers.template || defaults.template
+  answers.template = selectedUrl || answers.template || defaults.template // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing -- empty URL should fall through
 
   answers.globalCLIResult = await installGlobalCLIPrompt()
 

packages/app/src/cli/services/app-context.ts

@@ -92,9 +92,7 @@ export async function linkedAppContext({
   const effectiveClientId = clientId ?? configClientId
 
   // Fetch the remote app, using a different clientID if provided via flag.
-  if (!remoteApp) {
-    remoteApp = await appFromIdentifiers({apiKey: effectiveClientId})
-  }
+  remoteApp ??= await appFromIdentifiers({apiKey: effectiveClientId})
   const developerPlatformClient = remoteApp.developerPlatformClient
 
   const organization = await fetchOrgFromId(remoteApp.organizationId, developerPlatformClient)

packages/app/src/cli/services/app-logs/dev/poll-app-logs.ts

@@ -130,7 +130,7 @@ export const pollAppLogs = async ({
         stdout,
         appLogsFetchInput: {
           jwtToken: nextJwtToken,
-          cursor: responseCursor || cursor,
+          cursor: responseCursor ?? cursor,
         },
         developerPlatformClient,
         resubscribeCallback,

packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.test.ts

@@ -44,13 +44,13 @@ const EMPTY_FILTERS = {status: undefined, sources: undefined}
 const createMockResponse = (data: any, status = 200, statusText = 'OK') => {
   if (status !== 200 || data.errors) {
     return {
-      errors: data.errors || [`Error with status ${status}`],
+      errors: data.errors ?? [`Error with status ${status}`],
       status,
     }
   }
 
   return {
-    app_logs: data.app_logs || [],
+    app_logs: data.app_logs ?? [],
     cursor: data.cursor,
     status,
   }

packages/app/src/cli/services/app-logs/logs-command/render-json-logs.ts

@@ -87,7 +87,7 @@ export async function renderJsonLogs({
       options: {variables, developerPlatformClient},
       pollOptions: {
         jwtToken: nextJwtToken || pollOptions.jwtToken,
-        cursor: nextCursor || pollOptions.cursor,
+        cursor: nextCursor ?? pollOptions.cursor,
         filters: pollOptions.filters,
       },
       storeNameById,