Merge pull request #6698 from Shopify/abort-when-no-valid-env

Abort theme command when an invalid environment is provided

Author: EvilGenius13

.changeset/fifty-plants-ask.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Abort theme command when an invalid environment is passed in so it doesn't fall back to cached store data

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

@@ -191,6 +191,18 @@ describe('ThemeCommand', () => {
       })
     })
 
+    test('single environment provided but not found in TOML - throws AbortError', async () => {
+      // Given
+      vi.mocked(loadEnvironment).mockResolvedValue(undefined)
+
+      await CommandConfig.load()
+      const command = new TestThemeCommand(['--environment', 'notreal'], CommandConfig)
+
+      // When/Then
+      await expect(command.run()).rejects.toThrow(AbortError)
+      await expect(command.run()).rejects.toThrow('Please provide a valid environment.')
+    })
+
     test('multiple environments provided - uses renderConcurrent for parallel execution', async () => {
       // Given
       vi.mocked(loadEnvironment)

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

@@ -79,6 +79,10 @@ export default abstract class ThemeCommand extends Command {
 
     // Single environment or no environment
     if (environments.length <= 1) {
+      if (environments[0] && !flags.store) {
+        throw new AbortError(`Please provide a valid environment.`)
+      }
+
       const session = commandRequiresAuth ? await this.createSession(flags) : undefined
       const commandName = this.constructor.name.toLowerCase()