Merge pull request #6347 from Shopify/multi-env-store-toml

Fixed store names not parsing correctly in multi-env theme commands

Author: EvilGenius13

.changeset/pretty-clocks-develop.md

@@ -0,0 +1,5 @@
+---
+'@shopify/theme': patch
+---
+
+Fixed issue with theme.toml files that have a store name without the full domain from being parsed in multi-environment mode

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

@@ -18,6 +18,7 @@ import {recordEvent, compileData} from '@shopify/cli-kit/node/analytics'
 import {addPublicMetadata, addSensitiveMetadata} from '@shopify/cli-kit/node/metadata'
 import {cwd, joinPath} from '@shopify/cli-kit/node/path'
 import {fileExistsSync} from '@shopify/cli-kit/node/fs'
+import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
 import type {Writable} from 'stream'
 
 export interface FlagValues {
@@ -150,6 +151,11 @@ export default abstract class ThemeCommand extends Command {
         silent: true,
       })
 
+      if (environmentFlags?.store && typeof environmentFlags.store === 'string') {
+        // eslint-disable-next-line no-await-in-loop
+        environmentFlags.store = await normalizeStoreFqdn(environmentFlags.store)
+      }
+
       environmentMap.set(environmentName, {
         ...flags,
         ...environmentFlags,