From 150616875bdc8f329e720bbff41dee1badc58719 Mon Sep 17 00:00:00 2001
From: Shaun Stanworth <shaun.stanworth@shopify.com>
Date: Thu, 17 Oct 2024 15:49:50 +0100
Subject: [PATCH] Merge `main`

---
 .../src/cli/services/dev/processes/theme-app-extension.ts    | 1 +
 packages/theme/src/cli/utilities/cli-config.ts               | 1 +
 packages/theme/src/cli/utilities/log-request-line.ts         | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/cli/services/dev/processes/theme-app-extension.ts b/packages/app/src/cli/services/dev/processes/theme-app-extension.ts
index 5fb364051d..858e805371 100644
--- a/packages/app/src/cli/services/dev/processes/theme-app-extension.ts
+++ b/packages/app/src/cli/services/dev/processes/theme-app-extension.ts
@@ -41,6 +41,7 @@ export async function setupPreviewThemeAppExtensionsProcess(
     return
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const themeExtension = themeExtensions[0]!
   const themeExtensionDirectory = themeExtension.directory
   const themeExtensionPort = options.themeExtensionPort ?? 9293
diff --git a/packages/theme/src/cli/utilities/cli-config.ts b/packages/theme/src/cli/utilities/cli-config.ts
index f644ae4a2d..3946b3c28b 100644
--- a/packages/theme/src/cli/utilities/cli-config.ts
+++ b/packages/theme/src/cli/utilities/cli-config.ts
@@ -14,6 +14,7 @@ interface CLIConfigOptions {
  */
 export function configureCLIEnvironment(options: CLIConfigOptions): void {
   if (options.verbose) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     process.env[globalFlags.verbose.env!] = 'true'
   }
 
diff --git a/packages/theme/src/cli/utilities/log-request-line.ts b/packages/theme/src/cli/utilities/log-request-line.ts
index 149503f573..698bcb7edc 100644
--- a/packages/theme/src/cli/utilities/log-request-line.ts
+++ b/packages/theme/src/cli/utilities/log-request-line.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/unbound-method */
 import {EXTENSION_CDN_PREFIX, VANITY_CDN_PREFIX} from './theme-environment/proxy.js'
 import {timestampDateFormat} from '../constants.js'
 import {Response as CliKitResponse} from '@shopify/cli-kit/node/http'
@@ -8,7 +9,7 @@ import {extname} from '@shopify/cli-kit/node/path'
 const CHARACTER_TRUNCATION_LIMIT = 80
 
 export function logRequestLine(event: H3Event, response: CliKitResponse | Response) {
-  if (shouldLog(event) === false) return
+  if (!shouldLog(event)) return
 
   const truncatedPath =
     event.path.length > CHARACTER_TRUNCATION_LIMIT
@@ -26,7 +27,7 @@ export function logRequestLine(event: H3Event, response: CliKitResponse | Respon
     outputContent`• ${timestampDateFormat.format(new Date())} Request ${outputToken.raw(
       '»',
     )} ${eventMethodAligned} ${statusColor(String(response.status))} ${truncatedPath} ${outputToken.gray(
-      `${durationString}`,
+      durationString,
     )}`,
   )
 }