Merge pull request #6123 from Shopify/rz-fix-domain-for-local-dev

Use apropriate shop domain name in different environment

Author: odacrem

packages/store/src/services/store/operations/store-copy.ts

@@ -3,7 +3,6 @@ import {FlagOptions} from '../../../lib/types.js'
 import {BulkDataStoreCopyStartResponse, BulkDataOperationByIdResponse} from '../../../apis/organizations/types.js'
 import {parseResourceConfigFlags} from '../../../lib/resource-config.js'
 import {confirmCopyPrompt} from '../../../prompts/confirm_copy.js'
-import {storeFullDomain} from '../utils/store-utils.js'
 import {ApiClient} from '../api/api-client.js'
 import {ApiClientInterface} from '../types/api-client.js'
 import {BulkOperationTaskGenerator, BulkOperationContext} from '../utils/bulk-operation-task-generator.js'
@@ -12,6 +11,7 @@ import {renderCopyInfo} from '../../../prompts/copy_info.js'
 import {renderCopyResult} from '../../../prompts/copy_result.js'
 import {outputInfo} from '@shopify/cli-kit/node/output'
 import {Task, renderTasks} from '@shopify/cli-kit/node/ui'
+import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
 
 export class StoreCopyOperation implements StoreOperation {
   fromArg: string | undefined
@@ -28,8 +28,8 @@ export class StoreCopyOperation implements StoreOperation {
     this.fromArg = fromStore
     this.toArg = toStore
 
-    const sourceShopDomain = storeFullDomain(fromStore)
-    const targetShopDomain = storeFullDomain(toStore)
+    const sourceShopDomain = await normalizeStoreFqdn(fromStore)
+    const targetShopDomain = await normalizeStoreFqdn(toStore)
 
     const apiShopId = await this.validateShops(sourceShopDomain, targetShopDomain)
 

packages/store/src/services/store/operations/store-export.ts

@@ -2,7 +2,6 @@ import {StoreOperation} from '../types/operations.js'
 import {FlagOptions} from '../../../lib/types.js'
 import {BulkDataStoreExportStartResponse, BulkDataOperationByIdResponse} from '../../../apis/organizations/types.js'
 import {Organization} from '../../../apis/destinations/index.js'
-import {storeFullDomain} from '../utils/store-utils.js'
 import {ResultFileHandler} from '../utils/result-file-handler.js'
 import {ApiClient} from '../api/api-client.js'
 import {ApiClientInterface} from '../types/api-client.js'
@@ -14,6 +13,7 @@ import {confirmExportPrompt} from '../../../prompts/confirm_export.js'
 import {Task, renderTasks} from '@shopify/cli-kit/node/ui'
 import {outputInfo} from '@shopify/cli-kit/node/output'
 import {fileExistsSync} from '@shopify/cli-kit/node/fs'
+import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
 
 export class StoreExportOperation implements StoreOperation {
   fromArg: string | undefined
@@ -32,7 +32,7 @@ export class StoreExportOperation implements StoreOperation {
   async execute(fromStore: string, toFile: string, flags: FlagOptions): Promise<void> {
     this.fromArg = fromStore
 
-    const sourceShopDomain = storeFullDomain(fromStore)
+    const sourceShopDomain = await normalizeStoreFqdn(fromStore)
 
     const apiShopId = await this.validateShop(sourceShopDomain)
 

packages/store/src/services/store/operations/store-import.ts

@@ -2,7 +2,6 @@ import {StoreOperation} from '../types/operations.js'
 import {FlagOptions} from '../../../lib/types.js'
 import {BulkDataStoreImportStartResponse, BulkDataOperationByIdResponse} from '../../../apis/organizations/types.js'
 import {parseResourceConfigFlags} from '../../../lib/resource-config.js'
-import {storeFullDomain} from '../utils/store-utils.js'
 import {FileUploader} from '../utils/file-uploader.js'
 import {MockFileUploader} from '../utils/mock-file-uploader.js'
 import {ApiClient} from '../api/api-client.js'
@@ -15,6 +14,7 @@ import {confirmImportPrompt} from '../../../prompts/confirm_import.js'
 import {outputInfo} from '@shopify/cli-kit/node/output'
 import {Task, renderTasks} from '@shopify/cli-kit/node/ui'
 import {fileExists} from '@shopify/cli-kit/node/fs'
+import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
 
 export class StoreImportOperation implements StoreOperation {
   fromArg: string | undefined
@@ -39,7 +39,7 @@ export class StoreImportOperation implements StoreOperation {
 
     await this.validateInputFile(fromFile)
 
-    const targetShopDomain = storeFullDomain(toStore)
+    const targetShopDomain = await normalizeStoreFqdn(toStore)
     const apiShopId = await this.validateShop(targetShopDomain)
 
     if (!flags['no-prompt']) {