Merge pull request #6001 from Shopify/tm-cleanup

Simplify theme command environment paths

Author: EvilGenius13

.changeset/poor-hornets-compete.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Clean up theme command to run either single/no environment or multiple environments

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

@@ -56,22 +56,10 @@ export default abstract class ThemeCommand extends Command {
     const requiredFlags = klass.multiEnvironmentsFlags
     const {flags} = await this.parse(klass)
 
-    // No environment provided
-    if (!flags.environment?.length) {
-      const session = await this.ensureAuthenticated(flags)
-
-      await this.command(flags, session)
-
-      return
-    }
-
-    // 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]
+    const environments = (Array.isArray(flags.environment) ? flags.environment : [flags.environment]).filter(Boolean)
 
-    // If only one environment is specified, treat it as single environment mode
-    if (environments.length === 1) {
+    // Single environment or no environment
+    if (environments.length <= 1) {
       const session = await this.ensureAuthenticated(flags)
       await this.command(flags, session)
       return