Merge pull request #4327 from Shopify/jmeng/moveFiles

[Refactor] Move HostThemeManager and HostThemeManager into themes app extensions utilities directory
Shopify · Aug 15, 2024 · 18fab5c · 18fab5c
2 parents badc98d + cf68d64
commit 18fab5c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/packages/app/src/cli/services/dev/processes/theme-app-extension-next.test.ts b/packages/app/src/cli/services/dev/processes/theme-app-extension-next.test.ts
@@ -1,7 +1,7 @@
 import {setupPreviewThemeAppExtensionsProcess, findOrCreateHostTheme} from './theme-app-extension-next.js'
-import {HostThemeManager} from '../../../utilities/host-theme-manager.js'
 import {ExtensionInstance} from '../../../models/extensions/extension-instance.js'
 import {DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js'
+import {HostThemeManager} from '../../../utilities/extensions/theme/host-theme-manager.js'
 import {AdminSession, ensureAuthenticatedAdmin} from '@shopify/cli-kit/node/session'
 import {fetchTheme} from '@shopify/cli-kit/node/themes/api'
 import {AbortError} from '@shopify/cli-kit/node/error'
@@ -10,7 +10,7 @@ import {vi, describe, test, expect, beforeEach} from 'vitest'
 
 vi.mock('@shopify/cli-kit/node/session')
 vi.mock('@shopify/cli-kit/node/themes/api')
-vi.mock('../../../utilities/host-theme-manager')
+vi.mock('../../../utilities/extensions/theme/host-theme-manager')
 vi.mock('@shopify/cli-kit/node/output')
 
 describe('setupPreviewThemeAppExtensionsProcess', () => {

diff --git a/packages/app/src/cli/services/dev/processes/theme-app-extension-next.ts b/packages/app/src/cli/services/dev/processes/theme-app-extension-next.ts
@@ -1,7 +1,7 @@
 import {BaseProcess, DevProcessFunction} from './types.js'
 import {ExtensionInstance} from '../../../models/extensions/extension-instance.js'
 import {DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js'
-import {HostThemeManager} from '../../../utilities/host-theme-manager.js'
+import {HostThemeManager} from '../../../utilities/extensions/theme/host-theme-manager.js'
 import {outputDebug, outputInfo} from '@shopify/cli-kit/node/output'
 import {AdminSession, ensureAuthenticatedAdmin} from '@shopify/cli-kit/node/session'
 import {fetchTheme} from '@shopify/cli-kit/node/themes/api'

diff --git a/packages/app/src/cli/services/dev/processes/theme-app-extension.ts b/packages/app/src/cli/services/dev/processes/theme-app-extension.ts
@@ -1,6 +1,6 @@
 import {BaseProcess, DevProcessFunction} from './types.js'
 import {ExtensionInstance} from '../../../models/extensions/extension-instance.js'
-import {HostThemeManager} from '../../../utilities/host-theme-manager.js'
+import {HostThemeManager} from '../../../utilities/extensions/theme/host-theme-manager.js'
 import {themeExtensionArgs} from '../theme-extension-args.js'
 import {DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js'
 import {execCLI2} from '@shopify/cli-kit/node/ruby'

diff --git a/.../cli/utilities/host-theme-manager.test.ts → ...tensions/theme/host-theme-manager.test.ts b/.../cli/utilities/host-theme-manager.test.ts → ...tensions/theme/host-theme-manager.test.ts
@@ -1,5 +1,5 @@
-import {DEFAULT_THEME_ZIP, FALLBACK_THEME_ZIP, HostThemeManager} from './host-theme-manager.js'
 import {waitForThemeToBeProcessed} from './host-theme-watcher.js'
+import {HostThemeManager, DEFAULT_THEME_ZIP, FALLBACK_THEME_ZIP} from './host-theme-manager.js'
 import {createTheme} from '@shopify/cli-kit/node/themes/api'
 import {beforeEach, describe, expect, test, vi} from 'vitest'
 import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils'

diff --git a/...p/src/cli/utilities/host-theme-manager.ts → ...es/extensions/theme/host-theme-manager.ts b/...p/src/cli/utilities/host-theme-manager.ts → ...es/extensions/theme/host-theme-manager.ts
diff --git a/.../cli/utilities/host-theme-watcher.test.ts → ...tensions/theme/host-theme-watcher.test.ts b/.../cli/utilities/host-theme-watcher.test.ts → ...tensions/theme/host-theme-watcher.test.ts
diff --git a/...p/src/cli/utilities/host-theme-watcher.ts → ...es/extensions/theme/host-theme-watcher.ts b/...p/src/cli/utilities/host-theme-watcher.ts → ...es/extensions/theme/host-theme-watcher.ts