Merge pull request #5599 from Shopify/fix-shopify-flag-environment

Fixed issue with Shopify flag not being set correctly in the environm…

Author: EvilGenius13

Diff for: .changeset/rude-bottles-jog.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Fixed an issue where CLI would not apply the SHOPIFY_FLAG_ENVIRONMENT flag

Diff for: packages/cli-kit/src/public/node/base-command.test.ts

@@ -202,6 +202,30 @@ describe('applying environments', async () => {
     `)
   })
 
+  runTestInTmpDir(
+    'base Command does not apply environment specified via environment variable',
+    async (tmpDir: string) => {
+      // Given
+      const environmentName = 'validEnvironmentWithPassword'
+      const flagName = 'SHOPIFY_FLAG_ENVIRONMENT'
+      vi.stubEnv(flagName, environmentName)
+
+      const outputMock = mockAndCaptureOutput()
+      outputMock.clear()
+
+      // When
+      await MockCommand.run(['--path', tmpDir])
+
+      // Then
+      expect(testResult.environment).toEqual([])
+      expect(testResult.password).toBeUndefined()
+      expect(testResult.someString).toBeUndefined()
+      expect(testResult.path).toEqual(resolvePath(tmpDir))
+      expect(testResult.someStringWithDefault).toEqual('default stringy')
+      expect(outputMock.info()).toEqual('')
+    },
+  )
+
   runTestInTmpDir('searches up recursively from path by default', async (tmpDir: string) => {
     // Given
     const subdir = joinPath(tmpDir, 'somedir', '--environment', 'validEnvironment')

Diff for: packages/theme/src/cli/utilities/theme-command.ts

@@ -51,15 +51,18 @@ export default abstract class ThemeCommand extends Command {
     const {flags} = await this.parse(klass)
 
     // Single environment
-    if (!Array.isArray(flags.environment)) {
+    if (!flags.environment) {
       const session = await this.ensureAuthenticated(flags)
       await this.command(flags, session)
       return
     }
 
     // Synchronously authenticate all environments
     const sessions: {[storeFqdn: string]: AdminSession} = {}
-    const environments = flags.environment
+    // OCLIF parses flags.environment as an array when using the --environment & -e flag but
+    // as a string when using the direct environment variable SHOPIFY_FLAG_ENVIRONMENT
+    // This handles both cases
+    const environments = Array.isArray(flags.environment) ? flags.environment : [flags.environment]
 
     // Authenticate on all environments sequentially to avoid race conditions,
     // with authentication happening in parallel.