Update changeset and remove redundant code for single environment theme calls

Co-authored-by: Gray Gilmore <[email protected]>

Author: EvilGenius13

.changeset/itchy-houses-kick.md

@@ -2,4 +2,7 @@
 '@shopify/theme': patch
 ---
 
-fix the way we detect single or non environments & improve output for multienvironment commands
+Improvement and fixes when handling multi-environment commands
+
+- Fixes a bug where passing a single environment to multi-env commands would cause it to fail if the environment didn't have all of the required attributes for multi-env
+- Updates output when running multi-env commands to ensure the results from each command don't overlap one another

packages/theme/src/cli/utilities/theme-command.test.ts

@@ -4,7 +4,7 @@ import {Config, Flags} from '@oclif/core'
 import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session'
 import {loadEnvironment} from '@shopify/cli-kit/node/environments'
 import {renderConcurrent} from '@shopify/cli-kit/node/ui'
-import {Writable} from 'stream'
+import type {Writable} from 'stream'
 
 vi.mock('@shopify/cli-kit/node/session')
 vi.mock('@shopify/cli-kit/node/environments')
@@ -70,7 +70,7 @@ describe('ThemeCommand', () => {
 
     test('single environment provided', async () => {
       // Given
-      const environmentConfig = {store: 'env-store.myshopify.com', theme: '123'}
+      const environmentConfig = {store: 'env-store.myshopify.com'}
       vi.mocked(loadEnvironment).mockResolvedValue(environmentConfig)
 
       await CommandConfig.load()
@@ -88,7 +88,6 @@ describe('ThemeCommand', () => {
         flags: {
           environment: ['development'],
           store: 'env-store.myshopify.com',
-          theme: '123',
         },
         session: mockSession,
         context: undefined,
@@ -97,7 +96,7 @@ describe('ThemeCommand', () => {
 
     test('multiple environments provided - uses renderConcurrent for parallel execution', async () => {
       // Given
-      const environmentConfig = {store: 'store.myshopify.com', theme: '123'}
+      const environmentConfig = {store: 'store.myshopify.com'}
       vi.mocked(loadEnvironment).mockResolvedValue(environmentConfig)
       vi.mocked(ensureAuthenticatedThemes).mockResolvedValue(mockSession)
 

packages/theme/src/cli/utilities/theme-command.ts

@@ -7,7 +7,7 @@ import {loadEnvironment} from '@shopify/cli-kit/node/environments'
 import {renderWarning, renderConcurrent} from '@shopify/cli-kit/node/ui'
 import {AbortError} from '@shopify/cli-kit/node/error'
 import {AbortController} from '@shopify/cli-kit/node/abort'
-import {Writable} from 'stream'
+import type {Writable} from 'stream'
 
 export interface FlagValues {
   [key: string]: boolean | string | string[] | number | undefined
@@ -72,28 +72,8 @@ export default abstract class ThemeCommand extends Command {
 
     // If only one environment is specified, treat it as single environment mode
     if (environments.length === 1) {
-      const environmentName = environments[0]
-      // If the environment is the default environment, the config is already available.
-      if (environmentName === 'default') {
-        const session = await this.ensureAuthenticated(flags)
-        await this.command(flags, session)
-        return
-      }
-
-      // For non-default environments, we need to load the config
-      const environmentConfig = await loadEnvironment(environmentName, 'shopify.theme.toml', {
-        from: flags.path,
-        silent: true,
-      })
-      const environmentFlags = {
-        ...flags,
-        ...environmentConfig,
-        environment: environments,
-      }
-
-      const session = await this.ensureAuthenticated(environmentConfig as FlagValues)
-      await this.command(environmentFlags, session)
-
+      const session = await this.ensureAuthenticated(flags)
+      await this.command(flags, session)
       return
     }