Create concurrency-friendly theme uploaders

`themeUploader` displays theme sync progress with
an Ink animation. When multiple are ran at the same
time, like in multi environment commands, it can
behave unexpectedly. This commit creates alternative
uploaders to prevent this

Author: EvilGenius13

packages/theme/src/cli/commands/theme/push.ts

@@ -1,9 +1,14 @@
 import {globFlags, themeFlags} from '../../flags.js'
 import ThemeCommand from '../../utilities/theme-command.js'
-import {push, PushFlags} from '../../services/push.js'
+import {push} from '../../services/push.js'
 import {Flags} from '@oclif/core'
 import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli'
+
 import {recordTiming} from '@shopify/cli-kit/node/analytics'
+import {OutputFlags} from '@oclif/core/interfaces'
+import {AdminSession} from '@shopify/cli-kit/node/session'
+
+type PushFlags = OutputFlags<typeof Push.flags>
 
 export default class Push extends ThemeCommand {
   static summary = 'Uploads your local theme files to the connected store, overwriting the remote version if specified.'
@@ -91,33 +96,14 @@ export default class Push extends ThemeCommand {
       description: 'Require theme check to pass without errors before pushing. Warnings are allowed.',
       env: 'SHOPIFY_FLAG_STRICT_PUSH',
     }),
+    environment: themeFlags.environment,
   }
 
-  async run(): Promise<void> {
-    const {flags} = await this.parse(Push)
-
-    const pushFlags: PushFlags = {
-      path: flags.path,
-      password: flags.password,
-      store: flags.store,
-      theme: flags.theme,
-      development: flags.development,
-      live: flags.live,
-      unpublished: flags.unpublished,
-      nodelete: flags.nodelete,
-      only: flags.only,
-      ignore: flags.ignore,
-      json: flags.json,
-      allowLive: flags['allow-live'],
-      publish: flags.publish,
-      force: flags.force,
-      noColor: flags['no-color'],
-      verbose: flags.verbose,
-      strict: flags.strict,
-    }
+  static multiEnvironmentsFlags = ['store', 'password', 'theme']
 
+  async command(flags: PushFlags, adminSession: AdminSession): Promise<void> {
     recordTiming('theme-command:push')
-    await push(pushFlags)
+    await push(flags, adminSession)
     recordTiming('theme-command:push')
   }
 }

packages/theme/src/cli/services/push.ts

@@ -1,14 +1,13 @@
 /* eslint-disable tsdoc/syntax */
 import {hasRequiredThemeDirectories, mountThemeFileSystem} from '../utilities/theme-fs.js'
-import {uploadTheme} from '../utilities/theme-uploader.js'
 import {ensureDirectoryConfirmed, themeComponent} from '../utilities/theme-ui.js'
-import {ensureThemeStore} from '../utilities/theme-store.js'
 import {DevelopmentThemeManager} from '../utilities/development-theme-manager.js'
 import {findOrSelectTheme} from '../utilities/theme-selector.js'
 import {Role} from '../utilities/theme-selector/fetch.js'
 import {configureCLIEnvironment} from '../utilities/cli-config.js'
 import {runThemeCheck} from '../commands/theme/check.js'
-import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session'
+import {uploadTheme4} from '../utilities/theme-uploader.js'
+import {AdminSession} from '@shopify/cli-kit/node/session'
 import {themeCreate, fetchChecksums, themePublish} from '@shopify/cli-kit/node/themes/api'
 import {Result, Theme} from '@shopify/cli-kit/node/themes/types'
 import {outputResult} from '@shopify/cli-kit/node/output'
@@ -33,6 +32,7 @@ interface PushOptions {
   publish?: boolean
   ignore?: string[]
   only?: string[]
+  environment?: string
 }
 
 interface JsonOutput {
@@ -99,14 +99,17 @@ export interface PushFlags {
 
   /** Require theme check to pass without errors before pushing. Warnings are allowed. */
   strict?: boolean
+
+  /** The environment to push the theme to. */
+  environment?: string
 }
 
 /**
  * Initiates the push process based on provided flags.
  *
  * @param flags - The flags for the push operation.
  */
-export async function push(flags: PushFlags): Promise<void> {
+export async function push(flags: PushFlags, adminSession?: AdminSession) {
   if (flags.strict) {
     const outputType = flags.json ? 'json' : 'text'
     const {offenses} = await runThemeCheck(flags.path ?? cwd(), outputType)
@@ -127,22 +130,20 @@ export async function push(flags: PushFlags): Promise<void> {
   })
 
   const force = flags.force ?? false
-  const store = ensureThemeStore({store: flags.store})
-  const adminSession = await ensureAuthenticatedThemes(store, flags.password)
 
   const workingDirectory = path ? resolvePath(path) : cwd()
   if (!(await hasRequiredThemeDirectories(workingDirectory)) && !(await ensureDirectoryConfirmed(force))) {
     return
   }
 
-  const selectedTheme: Theme | undefined = await createOrSelectTheme(adminSession, flags)
+  const selectedTheme: Theme | undefined = await createOrSelectTheme(adminSession as unknown as AdminSession, flags)
   if (!selectedTheme) {
     return
   }
 
   recordTiming('theme-service:push:setup')
 
-  await executePush(selectedTheme, adminSession, {
+  await executePush(selectedTheme, adminSession as unknown as AdminSession, {
     path: workingDirectory,
     nodelete: flags.nodelete ?? false,
     publish: flags.publish ?? false,
@@ -166,7 +167,7 @@ async function executePush(theme: Theme, session: AdminSession, options: PushOpt
   const themeFileSystem = mountThemeFileSystem(options.path, {filters: options})
   recordTiming('theme-service:push:file-system')
 
-  const {uploadResults, renderThemeSyncProgress} = await uploadTheme(
+  const {uploadResults, renderThemeSyncProgress} = await uploadTheme4(
     theme,
     session,
     themeChecksums,