diff --git a/bin/get-graphql-schemas.js b/bin/get-graphql-schemas.js index 70330283853..3f042282094 100755 --- a/bin/get-graphql-schemas.js +++ b/bin/get-graphql-schemas.js @@ -56,7 +56,7 @@ const schemas = [ owner: 'shop', repo: 'world', pathToFile: 'areas/core/shopify/db/graphql/admin_schema_unstable_public.graphql', - localPath: './packages/cli-kit/src/cli/api/graphql/admin/admin_schema.graphql', + localPath: './packages/cli-kit/src/admin/graphql/admin_schema.graphql', usesLfs: true, }, { diff --git a/configurations/vite.config.ts b/configurations/vite.config.ts index 09ec4ee55d3..1d3725800dc 100644 --- a/configurations/vite.config.ts +++ b/configurations/vite.config.ts @@ -72,7 +72,7 @@ export const aliases = (packagePath: string) => { { find: /@shopify\/cli-kit\/(.+)/, replacement: (importedModule: string) => { - return path.join(packagePath, `../cli-kit/src/public/${importedModule.replace('@shopify/cli-kit/', '')}`) + return path.join(packagePath, `../cli-kit/src/${importedModule.replace('@shopify/cli-kit/', '')}`) }, }, {find: '@shopify/cli-kit', replacement: path.join(packagePath, '../cli-kit/src/index')}, diff --git a/graphql.config.ts b/graphql.config.ts index 5396c4d64bc..44fc0aa9214 100644 --- a/graphql.config.ts +++ b/graphql.config.ts @@ -1,20 +1,26 @@ +function graphqlBasePath(name: string, project: string): string { + if (project === 'cli-kit') { + // cli-kit uses domain-based structure: src/admin/graphql/ + return `./packages/cli-kit/src/admin/graphql` + } + return `./packages/${project}/src/cli/api/graphql/${name}` +} + function projectFactory(name: string, schemaName: string, project: string = 'app') { + const basePath = graphqlBasePath(name, project) return { - schema: `./packages/${project}/src/cli/api/graphql/${name}/${schemaName}`, - documents: [ - `./packages/${project}/src/cli/api/graphql/${name}/queries/**/*.graphql`, - `./packages/${project}/src/cli/api/graphql/${name}/mutations/**/*.graphql`, - ], + schema: `${basePath}/${schemaName}`, + documents: [`${basePath}/queries/**/*.graphql`, `${basePath}/mutations/**/*.graphql`], extensions: { codegen: { generates: { - [`./packages/${project}/src/cli/api/graphql/${name}/generated/types.d.ts`]: { + [`${basePath}/generated/types.d.ts`]: { plugins: [ {'graphql-codegen-typescript-operation-types': {enumsAsTypes: true, useTypeImports: true}}, { add: { content: - "/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any, tsdoc/syntax, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */\nimport {JsonMapType} from '@shopify/cli-kit/node/toml'", + "/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any, tsdoc/syntax, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */\nimport {JsonMapType} from '@shopify/cli-kit/shared/node/toml'", }, }, ], @@ -29,13 +35,13 @@ function projectFactory(name: string, schemaName: string, project: string = 'app }, }, }, - [`./packages/${project}/src/cli/api/graphql/${name}/generated/`]: { + [`${basePath}/generated/`]: { preset: 'near-operation-file', plugins: [ { add: { content: - "/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */\nimport {JsonMapType} from '@shopify/cli-kit/node/toml'", + "/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */\nimport {JsonMapType} from '@shopify/cli-kit/shared/node/toml'", }, }, { diff --git a/packages/app/src/cli/api/admin-as-app.test.ts b/packages/app/src/cli/api/admin-as-app.test.ts index 0142c9e376c..f22b1b4b82c 100644 --- a/packages/app/src/cli/api/admin-as-app.test.ts +++ b/packages/app/src/cli/api/admin-as-app.test.ts @@ -1,10 +1,10 @@ import {adminAsAppRequestDoc} from './admin-as-app.js' -import {graphqlRequestDoc} from '@shopify/cli-kit/node/api/graphql' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {graphqlRequestDoc} from '@shopify/cli-kit/shared/node/api/graphql' +import {AdminSession} from '@shopify/cli-kit/identity/session' import {describe, test, expect, vi, beforeEach} from 'vitest' import {TypedDocumentNode} from '@graphql-typed-document-node/core' -vi.mock('@shopify/cli-kit/node/api/graphql') +vi.mock('@shopify/cli-kit/shared/node/api/graphql') describe('adminAsAppRequestDoc', () => { const mockSession: AdminSession = { diff --git a/packages/app/src/cli/api/admin-as-app.ts b/packages/app/src/cli/api/admin-as-app.ts index f5d57457f0c..661608fea8e 100644 --- a/packages/app/src/cli/api/admin-as-app.ts +++ b/packages/app/src/cli/api/admin-as-app.ts @@ -1,6 +1,6 @@ -import {graphqlRequestDoc} from '@shopify/cli-kit/node/api/graphql' -import {adminUrl} from '@shopify/cli-kit/node/api/admin' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {graphqlRequestDoc} from '@shopify/cli-kit/shared/node/api/graphql' +import {adminUrl} from '@shopify/cli-kit/admin/api' +import {AdminSession} from '@shopify/cli-kit/identity/session' import {Variables} from 'graphql-request' import {TypedDocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/admin/generated/types.d.ts b/packages/app/src/cli/api/graphql/admin/generated/types.d.ts index 98ff1c678d8..93ea966a69e 100644 --- a/packages/app/src/cli/api/graphql/admin/generated/types.d.ts +++ b/packages/app/src/cli/api/graphql/admin/generated/types.d.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax */ -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' export type Maybe = T | null export type InputMaybe = Maybe diff --git a/packages/app/src/cli/api/graphql/app-dev/generated/dev-session-create.ts b/packages/app/src/cli/api/graphql/app-dev/generated/dev-session-create.ts index 32ca3b645b1..1c25cef3bf2 100644 --- a/packages/app/src/cli/api/graphql/app-dev/generated/dev-session-create.ts +++ b/packages/app/src/cli/api/graphql/app-dev/generated/dev-session-create.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-dev/generated/dev-session-update.ts b/packages/app/src/cli/api/graphql/app-dev/generated/dev-session-update.ts index 243629fa441..a39a50c800f 100644 --- a/packages/app/src/cli/api/graphql/app-dev/generated/dev-session-update.ts +++ b/packages/app/src/cli/api/graphql/app-dev/generated/dev-session-update.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-dev/generated/types.d.ts b/packages/app/src/cli/api/graphql/app-dev/generated/types.d.ts index 024de4d7d71..b8f2ff3cd3c 100644 --- a/packages/app/src/cli/api/graphql/app-dev/generated/types.d.ts +++ b/packages/app/src/cli/api/graphql/app-dev/generated/types.d.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax */ -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' export type Maybe = T | null export type InputMaybe = Maybe diff --git a/packages/app/src/cli/api/graphql/app-dev/queries/dev-session-update.graphql b/packages/app/src/cli/api/graphql/app-dev/queries/dev-session-update.graphql index 6d58ddbf1c9..17db8e63795 100644 --- a/packages/app/src/cli/api/graphql/app-dev/queries/dev-session-update.graphql +++ b/packages/app/src/cli/api/graphql/app-dev/queries/dev-session-update.graphql @@ -1,5 +1,10 @@ mutation DevSessionUpdate($appId: String!, $assetsUrl: String, $manifest: JSON, $inheritedModuleUids: [String!]!) { - devSessionUpdate(appId: $appId, assetsUrl: $assetsUrl, manifest: $manifest, inheritedModuleUids: $inheritedModuleUids) { + devSessionUpdate( + appId: $appId + assetsUrl: $assetsUrl + manifest: $manifest + inheritedModuleUids: $inheritedModuleUids + ) { userErrors { message on diff --git a/packages/app/src/cli/api/graphql/app-management/generated/active-app-release-from-api-key.ts b/packages/app/src/cli/api/graphql/app-management/generated/active-app-release-from-api-key.ts index 718d629f8d3..e87ca8ddcc8 100644 --- a/packages/app/src/cli/api/graphql/app-management/generated/active-app-release-from-api-key.ts +++ b/packages/app/src/cli/api/graphql/app-management/generated/active-app-release-from-api-key.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-management/generated/active-app-release.ts b/packages/app/src/cli/api/graphql/app-management/generated/active-app-release.ts index b9c039b32cf..c5d054439ee 100644 --- a/packages/app/src/cli/api/graphql/app-management/generated/active-app-release.ts +++ b/packages/app/src/cli/api/graphql/app-management/generated/active-app-release.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-management/generated/app-version-by-id.ts b/packages/app/src/cli/api/graphql/app-management/generated/app-version-by-id.ts index 1b6a19476e0..3fe06bb6a19 100644 --- a/packages/app/src/cli/api/graphql/app-management/generated/app-version-by-id.ts +++ b/packages/app/src/cli/api/graphql/app-management/generated/app-version-by-id.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-management/generated/app-version-by-tag.ts b/packages/app/src/cli/api/graphql/app-management/generated/app-version-by-tag.ts index c704158d41a..40f08bbaee4 100644 --- a/packages/app/src/cli/api/graphql/app-management/generated/app-version-by-tag.ts +++ b/packages/app/src/cli/api/graphql/app-management/generated/app-version-by-tag.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-management/generated/create-app-version.ts b/packages/app/src/cli/api/graphql/app-management/generated/create-app-version.ts index 72d02487a97..6a7ef098a8c 100644 --- a/packages/app/src/cli/api/graphql/app-management/generated/create-app-version.ts +++ b/packages/app/src/cli/api/graphql/app-management/generated/create-app-version.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-management/generated/create-app.ts b/packages/app/src/cli/api/graphql/app-management/generated/create-app.ts index 1c409ba36fc..e1fb8414b5a 100644 --- a/packages/app/src/cli/api/graphql/app-management/generated/create-app.ts +++ b/packages/app/src/cli/api/graphql/app-management/generated/create-app.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-management/generated/release-version.ts b/packages/app/src/cli/api/graphql/app-management/generated/release-version.ts index cc5fea2e080..22a6994aef9 100644 --- a/packages/app/src/cli/api/graphql/app-management/generated/release-version.ts +++ b/packages/app/src/cli/api/graphql/app-management/generated/release-version.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import * as Types from './types.js' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/app/src/cli/api/graphql/app-management/generated/types.d.ts b/packages/app/src/cli/api/graphql/app-management/generated/types.d.ts index 91a28421212..bdc15909858 100644 --- a/packages/app/src/cli/api/graphql/app-management/generated/types.d.ts +++ b/packages/app/src/cli/api/graphql/app-management/generated/types.d.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax */ -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' export type Maybe = T | null export type InputMaybe = Maybe diff --git a/packages/app/src/cli/api/graphql/app-management/queries/app-versions.graphql b/packages/app/src/cli/api/graphql/app-management/queries/app-versions.graphql index 3917f18c2ae..a3f6651f2f1 100644 --- a/packages/app/src/cli/api/graphql/app-management/queries/app-versions.graphql +++ b/packages/app/src/cli/api/graphql/app-management/queries/app-versions.graphql @@ -15,7 +15,7 @@ query AppVersions($appId: ID!) { createdBy metadata { message - versionTag + versionTag } } } diff --git a/packages/app/src/cli/api/graphql/app-management/queries/apps.graphql b/packages/app/src/cli/api/graphql/app-management/queries/apps.graphql index 3de1881cd5a..1cda4a9fcaa 100644 --- a/packages/app/src/cli/api/graphql/app-management/queries/apps.graphql +++ b/packages/app/src/cli/api/graphql/app-management/queries/apps.graphql @@ -6,9 +6,9 @@ query listApps($query: String) { key activeRelease { id - version { - name - } + version { + name + } } } } diff --git a/packages/app/src/cli/api/graphql/bulk-operations/generated/types.d.ts b/packages/app/src/cli/api/graphql/bulk-operations/generated/types.d.ts index c68fb733477..62dfcdeb97a 100644 --- a/packages/app/src/cli/api/graphql/bulk-operations/generated/types.d.ts +++ b/packages/app/src/cli/api/graphql/bulk-operations/generated/types.d.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax */ -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' export type Maybe = T | null export type InputMaybe = Maybe diff --git a/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-cancel.graphql b/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-cancel.graphql index 2aac9022a35..96a69685d14 100644 --- a/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-cancel.graphql +++ b/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-cancel.graphql @@ -20,4 +20,3 @@ mutation BulkOperationCancel($id: ID!) { } } } - diff --git a/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-mutation.graphql b/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-mutation.graphql index 9e039700229..8f4a692956f 100644 --- a/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-mutation.graphql +++ b/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-mutation.graphql @@ -1,8 +1,4 @@ -mutation BulkOperationRunMutation( - $mutation: String! - $stagedUploadPath: String! - $clientIdentifier: String -) { +mutation BulkOperationRunMutation($mutation: String!, $stagedUploadPath: String!, $clientIdentifier: String) { bulkOperationRunMutation( mutation: $mutation stagedUploadPath: $stagedUploadPath @@ -26,4 +22,3 @@ mutation BulkOperationRunMutation( } } } - diff --git a/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-query.graphql b/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-query.graphql index 8a2101ade8e..9f70794175b 100644 --- a/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-query.graphql +++ b/packages/app/src/cli/api/graphql/bulk-operations/mutations/bulk-operation-run-query.graphql @@ -1,7 +1,5 @@ mutation BulkOperationRunQuery($query: String!) { - bulkOperationRunQuery( - query: $query - ) { + bulkOperationRunQuery(query: $query) { bulkOperation { type completedAt @@ -20,4 +18,3 @@ mutation BulkOperationRunQuery($query: String!) { } } } - diff --git a/packages/app/src/cli/api/graphql/bulk-operations/mutations/staged-uploads-create.graphql b/packages/app/src/cli/api/graphql/bulk-operations/mutations/staged-uploads-create.graphql index 7e2c51d7e6b..87aa1ea0f58 100644 --- a/packages/app/src/cli/api/graphql/bulk-operations/mutations/staged-uploads-create.graphql +++ b/packages/app/src/cli/api/graphql/bulk-operations/mutations/staged-uploads-create.graphql @@ -14,4 +14,3 @@ mutation StagedUploadsCreate($input: [StagedUploadInput!]!) { } } } - diff --git a/packages/app/src/cli/api/graphql/business-platform-destinations/queries/user-info.graphql b/packages/app/src/cli/api/graphql/business-platform-destinations/queries/user-info.graphql index 6115f8e9e10..39f011b2c54 100644 --- a/packages/app/src/cli/api/graphql/business-platform-destinations/queries/user-info.graphql +++ b/packages/app/src/cli/api/graphql/business-platform-destinations/queries/user-info.graphql @@ -2,7 +2,7 @@ query UserInfo { currentUserAccount { uuid email - organizations(first: 2){ + organizations(first: 2) { nodes { name } diff --git a/packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts b/packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts index 48f87ac5f97..cf17e749f00 100644 --- a/packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts +++ b/packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any */ -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' export type Maybe = T | null export type InputMaybe = Maybe diff --git a/packages/app/src/cli/api/graphql/business-platform-organizations/queries/provision_shop_access.graphql b/packages/app/src/cli/api/graphql/business-platform-organizations/queries/provision_shop_access.graphql index 5c80d135fc6..d2e6a75ddc2 100644 --- a/packages/app/src/cli/api/graphql/business-platform-organizations/queries/provision_shop_access.graphql +++ b/packages/app/src/cli/api/graphql/business-platform-organizations/queries/provision_shop_access.graphql @@ -1,6 +1,6 @@ mutation ProvisionShopAccess($input: OrganizationUserProvisionShopAccessInput!) { organizationUserProvisionShopAccess(organizationUserProvisionShopAccessInput: $input) { - success, + success userErrors { message } diff --git a/packages/app/src/cli/api/graphql/current_account_info.ts b/packages/app/src/cli/api/graphql/current_account_info.ts index 05a9396b486..f4d37c82911 100644 --- a/packages/app/src/cli/api/graphql/current_account_info.ts +++ b/packages/app/src/cli/api/graphql/current_account_info.ts @@ -1,7 +1,7 @@ import {CurrentAccountInfoQuery} from './partners/generated/current-account-info.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {AccountInfo} from '@shopify/cli-kit/node/session' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AccountInfo} from '@shopify/cli-kit/identity/session' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export type CurrentAccountInfoSchema = CurrentAccountInfoQuery diff --git a/packages/app/src/cli/api/graphql/partners/generated/types.d.ts b/packages/app/src/cli/api/graphql/partners/generated/types.d.ts index b9572774e7a..f9f4d1aaa90 100644 --- a/packages/app/src/cli/api/graphql/partners/generated/types.d.ts +++ b/packages/app/src/cli/api/graphql/partners/generated/types.d.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any */ -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' export type Maybe = T | null export type InputMaybe = Maybe diff --git a/packages/app/src/cli/api/graphql/partners/queries/dev-stores-by-org.graphql b/packages/app/src/cli/api/graphql/partners/queries/dev-stores-by-org.graphql index a4f0dd56a46..376ecf27643 100644 --- a/packages/app/src/cli/api/graphql/partners/queries/dev-stores-by-org.graphql +++ b/packages/app/src/cli/api/graphql/partners/queries/dev-stores-by-org.graphql @@ -1,17 +1,17 @@ query DevStoresByOrg($id: ID!) { - organizations(id: $id, first: 1) { - nodes { - id - stores(first: 500, archived: false, type: [DEVELOPMENT, MANAGED, PLUS_SANDBOX]) { - nodes { - shopId - link - shopDomain - shopName - transferDisabled - convertableToPartnerTest - } + organizations(id: $id, first: 1) { + nodes { + id + stores(first: 500, archived: false, type: [DEVELOPMENT, MANAGED, PLUS_SANDBOX]) { + nodes { + shopId + link + shopDomain + shopName + transferDisabled + convertableToPartnerTest } } } + } } diff --git a/packages/app/src/cli/api/graphql/webhooks/queries/cli-testing.graphql b/packages/app/src/cli/api/graphql/webhooks/queries/cli-testing.graphql index 06b29c75bd8..80aebb54e7f 100644 --- a/packages/app/src/cli/api/graphql/webhooks/queries/cli-testing.graphql +++ b/packages/app/src/cli/api/graphql/webhooks/queries/cli-testing.graphql @@ -1,5 +1,19 @@ -mutation CliTesting($address: String!, $apiKey: String, $apiVersion: String!, $deliveryMethod: String!, $sharedSecret: String!, $topic: String!) { - cliTesting(address: $address, apiKey: $apiKey, apiVersion: $apiVersion, deliveryMethod: $deliveryMethod, sharedSecret: $sharedSecret, topic: $topic) { +mutation CliTesting( + $address: String! + $apiKey: String + $apiVersion: String! + $deliveryMethod: String! + $sharedSecret: String! + $topic: String! +) { + cliTesting( + address: $address + apiKey: $apiKey + apiVersion: $apiVersion + deliveryMethod: $deliveryMethod + sharedSecret: $sharedSecret + topic: $topic + ) { headers samplePayload success diff --git a/packages/app/src/cli/commands/app/app-logs/sources.ts b/packages/app/src/cli/commands/app/app-logs/sources.ts index b354f7a3f3c..4462db8d8d2 100644 --- a/packages/app/src/cli/commands/app/app-logs/sources.ts +++ b/packages/app/src/cli/commands/app/app-logs/sources.ts @@ -2,7 +2,7 @@ import {appFlags} from '../../../flags.js' import {linkedAppContext} from '../../../services/app-context.js' import {sources} from '../../../services/app-logs/sources.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' export default class Sources extends AppLinkedCommand { static summary = 'Print out a list of sources that may be used with the logs command.' diff --git a/packages/app/src/cli/commands/app/build.ts b/packages/app/src/cli/commands/app/build.ts index 0cff69a8e8a..85861eb1979 100644 --- a/packages/app/src/cli/commands/app/build.ts +++ b/packages/app/src/cli/commands/app/build.ts @@ -3,8 +3,8 @@ import build from '../../services/build.js' import {localAppContext} from '../../services/app-context.js' import AppUnlinkedCommand, {AppUnlinkedCommandOutput} from '../../utilities/app-unlinked-command.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {addPublicMetadata} from '@shopify/cli-kit/node/metadata' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {addPublicMetadata} from '@shopify/cli-kit/shared/node/metadata' export default class Build extends AppUnlinkedCommand { static summary = 'Build the app, including extensions.' diff --git a/packages/app/src/cli/commands/app/bulk/cancel.ts b/packages/app/src/cli/commands/app/bulk/cancel.ts index 23f1cceb19f..65fcb90f56f 100644 --- a/packages/app/src/cli/commands/app/bulk/cancel.ts +++ b/packages/app/src/cli/commands/app/bulk/cancel.ts @@ -4,8 +4,8 @@ import {prepareAppStoreContext} from '../../../utilities/execute-command-helpers import {cancelBulkOperation} from '../../../services/bulk-operations/cancel-bulk-operation.js' import {normalizeBulkOperationId} from '../../../services/bulk-operations/bulk-operation-status.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' export default class BulkCancel extends AppLinkedCommand { static summary = 'Cancel a bulk operation.' diff --git a/packages/app/src/cli/commands/app/bulk/execute.ts b/packages/app/src/cli/commands/app/bulk/execute.ts index 8c06f1ddeea..56246922a29 100644 --- a/packages/app/src/cli/commands/app/bulk/execute.ts +++ b/packages/app/src/cli/commands/app/bulk/execute.ts @@ -2,7 +2,7 @@ import {appFlags, bulkOperationFlags} from '../../../flags.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import {executeBulkOperation} from '../../../services/bulk-operations/execute-bulk-operation.js' import {prepareExecuteContext} from '../../../utilities/execute-command-helpers.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' export default class BulkExecute extends AppLinkedCommand { static summary = 'Execute bulk operations.' diff --git a/packages/app/src/cli/commands/app/bulk/status.ts b/packages/app/src/cli/commands/app/bulk/status.ts index 73ba683c98e..6e4ab7e2cd9 100644 --- a/packages/app/src/cli/commands/app/bulk/status.ts +++ b/packages/app/src/cli/commands/app/bulk/status.ts @@ -7,8 +7,8 @@ import { normalizeBulkOperationId, } from '../../../services/bulk-operations/bulk-operation-status.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' export default class BulkStatus extends AppLinkedCommand { static summary = 'Check the status of bulk operations.' diff --git a/packages/app/src/cli/commands/app/config/link.ts b/packages/app/src/cli/commands/app/config/link.ts index 91bd549aff0..9187193ad60 100644 --- a/packages/app/src/cli/commands/app/config/link.ts +++ b/packages/app/src/cli/commands/app/config/link.ts @@ -2,7 +2,7 @@ import {appFlags} from '../../../flags.js' import {linkedAppContext} from '../../../services/app-context.js' import link, {LinkOptions} from '../../../services/app/config/link.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' export default class ConfigLink extends AppLinkedCommand { static summary = 'Fetch your app configuration from the Developer Dashboard.' diff --git a/packages/app/src/cli/commands/app/config/pull.ts b/packages/app/src/cli/commands/app/config/pull.ts index f5672c93bd7..a4c876fd377 100644 --- a/packages/app/src/cli/commands/app/config/pull.ts +++ b/packages/app/src/cli/commands/app/config/pull.ts @@ -2,9 +2,9 @@ import {appFlags} from '../../../flags.js' import {linkedAppContext} from '../../../services/app-context.js' import pull from '../../../services/app/config/pull.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {basename} from '@shopify/cli-kit/node/path' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {basename} from '@shopify/cli-kit/shared/node/path' export default class ConfigPull extends AppLinkedCommand { static summary = 'Refresh an already-linked app configuration without prompts.' diff --git a/packages/app/src/cli/commands/app/config/use.ts b/packages/app/src/cli/commands/app/config/use.ts index 7854466879c..766bcae247b 100644 --- a/packages/app/src/cli/commands/app/config/use.ts +++ b/packages/app/src/cli/commands/app/config/use.ts @@ -4,7 +4,7 @@ import {localAppContext} from '../../../services/app-context.js' import use from '../../../services/app/config/use.js' import AppUnlinkedCommand, {AppUnlinkedCommandOutput} from '../../../utilities/app-unlinked-command.js' import {Args} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' // This is one of the few commands where we don't need a // `--config` flag, because we're passing it as an argument. diff --git a/packages/app/src/cli/commands/app/demo/watcher.ts b/packages/app/src/cli/commands/app/demo/watcher.ts index 10892e8456a..2b4b9054170 100644 --- a/packages/app/src/cli/commands/app/demo/watcher.ts +++ b/packages/app/src/cli/commands/app/demo/watcher.ts @@ -2,10 +2,10 @@ import {appFlags} from '../../../flags.js' import {AppEventWatcher, EventType} from '../../../services/dev/app-events/app-event-watcher.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import {linkedAppContext} from '../../../services/app-context.js' -import colors from '@shopify/cli-kit/node/colors' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {outputInfo} from '@shopify/cli-kit/node/output' -import {endHRTimeInMs} from '@shopify/cli-kit/node/hrtime' +import colors from '@shopify/cli-kit/shared/node/colors' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' +import {endHRTimeInMs} from '@shopify/cli-kit/shared/node/hrtime' export default class DemoWatcher extends AppLinkedCommand { static summary = 'Watch and prints out changes to an app.' diff --git a/packages/app/src/cli/commands/app/deploy.ts b/packages/app/src/cli/commands/app/deploy.ts index 1f7ec37618b..892215c9ce3 100644 --- a/packages/app/src/cli/commands/app/deploy.ts +++ b/packages/app/src/cli/commands/app/deploy.ts @@ -6,8 +6,8 @@ import metadata from '../../metadata.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../utilities/app-linked-command.js' import {linkedAppContext} from '../../services/app-context.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {addPublicMetadata} from '@shopify/cli-kit/node/metadata' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {addPublicMetadata} from '@shopify/cli-kit/shared/node/metadata' export default class Deploy extends AppLinkedCommand { static summary = 'Deploy your Shopify app.' diff --git a/packages/app/src/cli/commands/app/dev.ts b/packages/app/src/cli/commands/app/dev.ts index 55c4030069e..820b3d2e713 100644 --- a/packages/app/src/cli/commands/app/dev.ts +++ b/packages/app/src/cli/commands/app/dev.ts @@ -6,9 +6,9 @@ import {linkedAppContext} from '../../services/app-context.js' import {storeContext} from '../../services/store-context.js' import {getTunnelMode} from '../../services/dev/tunnel-mode.js' import {Flags} from '@oclif/core' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {addPublicMetadata} from '@shopify/cli-kit/node/metadata' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {addPublicMetadata} from '@shopify/cli-kit/shared/node/metadata' export default class Dev extends AppLinkedCommand { static summary = 'Run the app.' diff --git a/packages/app/src/cli/commands/app/dev/clean.ts b/packages/app/src/cli/commands/app/dev/clean.ts index 847bf1e5153..d75932ae5e6 100644 --- a/packages/app/src/cli/commands/app/dev/clean.ts +++ b/packages/app/src/cli/commands/app/dev/clean.ts @@ -3,9 +3,9 @@ import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-l import {appFlags} from '../../../flags.js' import {storeContext} from '../../../services/store-context.js' import {devClean} from '../../../services/dev-clean.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' import {Flags} from '@oclif/core' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' export default class DevClean extends AppLinkedCommand { static summary = 'Cleans up the dev preview from the selected store.' diff --git a/packages/app/src/cli/commands/app/env/pull.ts b/packages/app/src/cli/commands/app/env/pull.ts index f68c42b6050..739f67901ce 100644 --- a/packages/app/src/cli/commands/app/env/pull.ts +++ b/packages/app/src/cli/commands/app/env/pull.ts @@ -4,9 +4,9 @@ import {pullEnv} from '../../../services/app/env/pull.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import {linkedAppContext} from '../../../services/app-context.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {outputResult} from '@shopify/cli-kit/node/output' -import {joinPath} from '@shopify/cli-kit/node/path' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {outputResult} from '@shopify/cli-kit/shared/node/output' +import {joinPath} from '@shopify/cli-kit/shared/node/path' export default class EnvPull extends AppLinkedCommand { static summary = 'Pull app and extensions environment variables.' diff --git a/packages/app/src/cli/commands/app/env/show.ts b/packages/app/src/cli/commands/app/env/show.ts index 2c67d50a61b..73897ddcbfd 100644 --- a/packages/app/src/cli/commands/app/env/show.ts +++ b/packages/app/src/cli/commands/app/env/show.ts @@ -2,8 +2,8 @@ import {appFlags} from '../../../flags.js' import {linkedAppContext} from '../../../services/app-context.js' import {showEnv} from '../../../services/app/env/show.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {outputResult} from '@shopify/cli-kit/node/output' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {outputResult} from '@shopify/cli-kit/shared/node/output' export default class EnvShow extends AppLinkedCommand { static summary = 'Display app and extensions environment variables.' diff --git a/packages/app/src/cli/commands/app/execute.ts b/packages/app/src/cli/commands/app/execute.ts index 656543bd40e..84072ecd96a 100644 --- a/packages/app/src/cli/commands/app/execute.ts +++ b/packages/app/src/cli/commands/app/execute.ts @@ -2,7 +2,7 @@ import {appFlags, operationFlags} from '../../flags.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../utilities/app-linked-command.js' import {executeOperation} from '../../services/execute-operation.js' import {prepareExecuteContext} from '../../utilities/execute-command-helpers.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' export default class Execute extends AppLinkedCommand { static summary = 'Execute GraphQL queries and mutations.' diff --git a/packages/app/src/cli/commands/app/function/build.ts b/packages/app/src/cli/commands/app/function/build.ts index 4b96ce1d8c0..1e28eda688c 100644 --- a/packages/app/src/cli/commands/app/function/build.ts +++ b/packages/app/src/cli/commands/app/function/build.ts @@ -3,8 +3,8 @@ import {buildFunctionExtension} from '../../../services/build/extension.js' import {appFlags} from '../../../flags.js' import AppUnlinkedCommand, {AppUnlinkedCommandOutput} from '../../../utilities/app-unlinked-command.js' import {localAppContext} from '../../../services/app-context.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {renderSuccess} from '@shopify/cli-kit/node/ui' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' export default class FunctionBuild extends AppUnlinkedCommand { static summary = 'Compile a function to wasm.' diff --git a/packages/app/src/cli/commands/app/function/info.ts b/packages/app/src/cli/commands/app/function/info.ts index 28b72502b13..f01b886cad0 100644 --- a/packages/app/src/cli/commands/app/function/info.ts +++ b/packages/app/src/cli/commands/app/function/info.ts @@ -4,9 +4,9 @@ import {functionInfo} from '../../../services/function/info.js' import {localAppContext} from '../../../services/app-context.js' import {appFlags} from '../../../flags.js' import AppUnlinkedCommand, {AppUnlinkedCommandOutput} from '../../../utilities/app-unlinked-command.js' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' -import {outputResult} from '@shopify/cli-kit/node/output' -import {AlertCustomSection, renderInfo} from '@shopify/cli-kit/node/ui' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' +import {outputResult} from '@shopify/cli-kit/shared/node/output' +import {AlertCustomSection, renderInfo} from '@shopify/cli-kit/shared/node/ui' export default class FunctionInfo extends AppUnlinkedCommand { static summary = 'Print basic information about your function.' diff --git a/packages/app/src/cli/commands/app/function/replay.ts b/packages/app/src/cli/commands/app/function/replay.ts index 5935991e48a..f6d4302a8e5 100644 --- a/packages/app/src/cli/commands/app/function/replay.ts +++ b/packages/app/src/cli/commands/app/function/replay.ts @@ -3,7 +3,7 @@ import {replay} from '../../../services/function/replay.js' import {appFlags} from '../../../flags.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import {linkedAppContext} from '../../../services/app-context.js' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' import {Flags} from '@oclif/core' export default class FunctionReplay extends AppLinkedCommand { diff --git a/packages/app/src/cli/commands/app/function/run.ts b/packages/app/src/cli/commands/app/function/run.ts index 2e5ea046c2a..da7058a89c3 100644 --- a/packages/app/src/cli/commands/app/function/run.ts +++ b/packages/app/src/cli/commands/app/function/run.ts @@ -3,10 +3,10 @@ import {runFunction} from '../../../services/function/runner.js' import {appFlags} from '../../../flags.js' import AppUnlinkedCommand, {AppUnlinkedCommandOutput} from '../../../utilities/app-unlinked-command.js' import {localAppContext} from '../../../services/app-context.js' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' import {Flags} from '@oclif/core' -import {renderAutocompletePrompt, isTTY} from '@shopify/cli-kit/node/ui' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {renderAutocompletePrompt, isTTY} from '@shopify/cli-kit/shared/node/ui' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' const DEFAULT_FUNCTION_EXPORT = '_start' diff --git a/packages/app/src/cli/commands/app/function/schema.ts b/packages/app/src/cli/commands/app/function/schema.ts index d1c5763f303..9df9edc3231 100644 --- a/packages/app/src/cli/commands/app/function/schema.ts +++ b/packages/app/src/cli/commands/app/function/schema.ts @@ -4,7 +4,7 @@ import {appFlags} from '../../../flags.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import {linkedAppContext} from '../../../services/app-context.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' export default class FetchSchema extends AppLinkedCommand { static summary = 'Fetch the latest GraphQL schema for a function.' diff --git a/packages/app/src/cli/commands/app/function/typegen.ts b/packages/app/src/cli/commands/app/function/typegen.ts index 658dda0a890..a60ac6315be 100644 --- a/packages/app/src/cli/commands/app/function/typegen.ts +++ b/packages/app/src/cli/commands/app/function/typegen.ts @@ -3,8 +3,8 @@ import {buildGraphqlTypes} from '../../../services/function/build.js' import {appFlags} from '../../../flags.js' import AppUnlinkedCommand, {AppUnlinkedCommandOutput} from '../../../utilities/app-unlinked-command.js' import {localAppContext} from '../../../services/app-context.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {renderSuccess} from '@shopify/cli-kit/node/ui' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' export default class FunctionTypegen extends AppUnlinkedCommand { static summary = 'Generate GraphQL types for a JavaScript function.' diff --git a/packages/app/src/cli/commands/app/generate/extension.ts b/packages/app/src/cli/commands/app/generate/extension.ts index 36b0ba309db..917397e8bf0 100644 --- a/packages/app/src/cli/commands/app/generate/extension.ts +++ b/packages/app/src/cli/commands/app/generate/extension.ts @@ -5,8 +5,8 @@ import {checkFolderIsValidApp} from '../../../models/app/loader.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import {linkedAppContext} from '../../../services/app-context.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' export default class AppGenerateExtension extends AppLinkedCommand { static summary = 'Generate a new app Extension.' diff --git a/packages/app/src/cli/commands/app/import-custom-data-definitions.ts b/packages/app/src/cli/commands/app/import-custom-data-definitions.ts index fcf95a8760f..9677c502a23 100644 --- a/packages/app/src/cli/commands/app/import-custom-data-definitions.ts +++ b/packages/app/src/cli/commands/app/import-custom-data-definitions.ts @@ -5,10 +5,10 @@ import {linkedAppContext} from '../../services/app-context.js' import {storeContext} from '../../services/store-context.js' import {importDeclarativeDefinitions} from '../../services/generate/shop-import/declarative-definitions.js' import {Flags} from '@oclif/core' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {renderSingleTask} from '@shopify/cli-kit/node/ui' -import {outputContent} from '@shopify/cli-kit/node/output' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {renderSingleTask} from '@shopify/cli-kit/shared/node/ui' +import {outputContent} from '@shopify/cli-kit/shared/node/output' export default class ImportCustomDataDefinitions extends AppLinkedCommand { static summary = 'Import metafield and metaobject definitions.' diff --git a/packages/app/src/cli/commands/app/import-extensions.ts b/packages/app/src/cli/commands/app/import-extensions.ts index bd7d77bf4b6..cfff938d269 100644 --- a/packages/app/src/cli/commands/app/import-extensions.ts +++ b/packages/app/src/cli/commands/app/import-extensions.ts @@ -5,8 +5,8 @@ import {linkedAppContext} from '../../services/app-context.js' import {getMigrationChoices, selectMigrationChoice} from '../../prompts/import-extensions.js' import {getExtensions} from '../../services/fetch-extensions.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {renderSuccess} from '@shopify/cli-kit/node/ui' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' export default class ImportExtensions extends AppLinkedCommand { static description = 'Import dashboard-managed extensions into your app.' diff --git a/packages/app/src/cli/commands/app/info.ts b/packages/app/src/cli/commands/app/info.ts index c25b331400f..9ce2199037a 100644 --- a/packages/app/src/cli/commands/app/info.ts +++ b/packages/app/src/cli/commands/app/info.ts @@ -3,9 +3,9 @@ import {Format, info} from '../../services/info.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../utilities/app-linked-command.js' import {linkedAppContext} from '../../services/app-context.js' import {Flags} from '@oclif/core' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' -import {outputResult} from '@shopify/cli-kit/node/output' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' +import {outputResult} from '@shopify/cli-kit/shared/node/output' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' export default class AppInfo extends AppLinkedCommand { static summary = 'Print basic information about your app and extensions.' diff --git a/packages/app/src/cli/commands/app/init.ts b/packages/app/src/cli/commands/app/init.ts index c2935186968..74c2800ecbc 100644 --- a/packages/app/src/cli/commands/app/init.ts +++ b/packages/app/src/cli/commands/app/init.ts @@ -9,14 +9,14 @@ import {appNamePrompt, createAsNewAppPrompt, selectAppPrompt} from '../../prompt import {searchForAppsByNameFactory} from '../../services/dev/prompt-helpers.js' import {isValidName} from '../../models/app/validation/common.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {resolvePath, cwd} from '@shopify/cli-kit/node/path' -import {addPublicMetadata} from '@shopify/cli-kit/node/metadata' - -import {installGlobalShopifyCLI} from '@shopify/cli-kit/node/is-global' -import {generateRandomNameForSubdirectory} from '@shopify/cli-kit/node/fs' -import {inferPackageManager} from '@shopify/cli-kit/node/node-package-manager' -import {AbortError} from '@shopify/cli-kit/node/error' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {resolvePath, cwd} from '@shopify/cli-kit/shared/node/path' +import {addPublicMetadata} from '@shopify/cli-kit/shared/node/metadata' + +import {installGlobalShopifyCLI} from '@shopify/cli-kit/shared/node/is-global' +import {generateRandomNameForSubdirectory} from '@shopify/cli-kit/shared/node/fs' +import {inferPackageManager} from '@shopify/cli-kit/shared/node/node-package-manager' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export default class Init extends AppLinkedCommand { static summary?: string | undefined = 'Create a new app project' diff --git a/packages/app/src/cli/commands/app/logs.ts b/packages/app/src/cli/commands/app/logs.ts index d9f07682e4d..176c947bd49 100644 --- a/packages/app/src/cli/commands/app/logs.ts +++ b/packages/app/src/cli/commands/app/logs.ts @@ -5,8 +5,8 @@ import AppLinkedCommand, {AppLinkedCommandOutput} from '../../utilities/app-link import {linkedAppContext} from '../../services/app-context.js' import {storeContext} from '../../services/store-context.js' import {Flags} from '@oclif/core' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' export default class Logs extends AppLinkedCommand { static summary = 'Stream detailed logs for your Shopify app.' diff --git a/packages/app/src/cli/commands/app/release.ts b/packages/app/src/cli/commands/app/release.ts index 6fe89496ed1..72f68c78d19 100644 --- a/packages/app/src/cli/commands/app/release.ts +++ b/packages/app/src/cli/commands/app/release.ts @@ -4,8 +4,8 @@ import AppLinkedCommand, {AppLinkedCommandOutput} from '../../utilities/app-link import {linkedAppContext} from '../../services/app-context.js' import {getAppConfigurationState} from '../../models/app/loader.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {addPublicMetadata} from '@shopify/cli-kit/node/metadata' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {addPublicMetadata} from '@shopify/cli-kit/shared/node/metadata' export default class Release extends AppLinkedCommand { static summary = 'Release an app version.' diff --git a/packages/app/src/cli/commands/app/scaffold/extension.ts b/packages/app/src/cli/commands/app/scaffold/extension.ts index fa2c7f1cf5a..ff59228d2ad 100644 --- a/packages/app/src/cli/commands/app/scaffold/extension.ts +++ b/packages/app/src/cli/commands/app/scaffold/extension.ts @@ -1,6 +1,6 @@ import {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import AppGenerateExtension from '../generate/extension.js' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' class AppScaffoldExtension extends AppGenerateExtension { static description = 'Scaffold an Extension.' diff --git a/packages/app/src/cli/commands/app/versions/list.ts b/packages/app/src/cli/commands/app/versions/list.ts index 07d4b9cc892..74fa81b90fa 100644 --- a/packages/app/src/cli/commands/app/versions/list.ts +++ b/packages/app/src/cli/commands/app/versions/list.ts @@ -2,7 +2,7 @@ import {appFlags} from '../../../flags.js' import versionList from '../../../services/versions-list.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import {linkedAppContext} from '../../../services/app-context.js' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' export default class VersionsList extends AppLinkedCommand { static summary = 'List deployed versions of your app.' diff --git a/packages/app/src/cli/commands/app/webhook/trigger.ts b/packages/app/src/cli/commands/app/webhook/trigger.ts index d4a4cb4bef5..fff65061cc7 100644 --- a/packages/app/src/cli/commands/app/webhook/trigger.ts +++ b/packages/app/src/cli/commands/app/webhook/trigger.ts @@ -5,7 +5,7 @@ import {appFlags} from '../../../flags.js' import AppLinkedCommand, {AppLinkedCommandOutput} from '../../../utilities/app-linked-command.js' import {linkedAppContext} from '../../../services/app-context.js' import {Flags} from '@oclif/core' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' export default class WebhookTrigger extends AppLinkedCommand { static summary = 'Trigger delivery of a sample webhook topic payload to a designated address.' diff --git a/packages/app/src/cli/commands/webhook/trigger.ts b/packages/app/src/cli/commands/webhook/trigger.ts index 1d380fa79a1..e5c4b3705ce 100644 --- a/packages/app/src/cli/commands/webhook/trigger.ts +++ b/packages/app/src/cli/commands/webhook/trigger.ts @@ -1,5 +1,5 @@ import WebhookTrigger from '../app/webhook/trigger.js' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' export default class WebhookTriggerDeprecated extends WebhookTrigger { static hidden = true diff --git a/packages/app/src/cli/flags.ts b/packages/app/src/cli/flags.ts index d9a9776380c..b669ad1444e 100644 --- a/packages/app/src/cli/flags.ts +++ b/packages/app/src/cli/flags.ts @@ -1,6 +1,6 @@ import {Flags} from '@oclif/core' -import {resolvePath, cwd} from '@shopify/cli-kit/node/path' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {resolvePath, cwd} from '@shopify/cli-kit/shared/node/path' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' /** * An object that contains the flags that diff --git a/packages/app/src/cli/hooks/clear_command_cache.ts b/packages/app/src/cli/hooks/clear_command_cache.ts index d35b229f839..33176607b89 100644 --- a/packages/app/src/cli/hooks/clear_command_cache.ts +++ b/packages/app/src/cli/hooks/clear_command_cache.ts @@ -1,5 +1,5 @@ import {clearCachedCommandInfo} from '../services/local-storage.js' -import {randomUUID} from '@shopify/cli-kit/node/crypto' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' import {Hook} from '@oclif/core' const init: Hook<'init'> = async (_options) => { diff --git a/packages/app/src/cli/hooks/public_metadata.ts b/packages/app/src/cli/hooks/public_metadata.ts index 5448a5fb40b..c90eca87ecd 100644 --- a/packages/app/src/cli/hooks/public_metadata.ts +++ b/packages/app/src/cli/hooks/public_metadata.ts @@ -1,5 +1,5 @@ import metadata from '../metadata.js' -import {FanoutHookFunction} from '@shopify/cli-kit/node/plugins' +import {FanoutHookFunction} from '@shopify/cli-kit/shared/node/plugins' const gatherPublicMetadata: FanoutHookFunction<'public_command_metadata', '@shopify/app'> = async () => { return metadata.getAllPublicMetadata() diff --git a/packages/app/src/cli/hooks/sensitive_metadata.ts b/packages/app/src/cli/hooks/sensitive_metadata.ts index 4429d2ba77a..8d2ee320fe4 100644 --- a/packages/app/src/cli/hooks/sensitive_metadata.ts +++ b/packages/app/src/cli/hooks/sensitive_metadata.ts @@ -1,5 +1,5 @@ import metadata from '../metadata.js' -import {FanoutHookFunction} from '@shopify/cli-kit/node/plugins' +import {FanoutHookFunction} from '@shopify/cli-kit/shared/node/plugins' const gatherSensitiveMetadata: FanoutHookFunction<'sensitive_command_metadata', '@shopify/app'> = async () => { return metadata.getAllSensitiveMetadata() diff --git a/packages/app/src/cli/metadata.ts b/packages/app/src/cli/metadata.ts index 79f11dbde89..76ee8777568 100644 --- a/packages/app/src/cli/metadata.ts +++ b/packages/app/src/cli/metadata.ts @@ -1,6 +1,6 @@ -import {MonorailEventPublic, MonorailEventSensitive} from '@shopify/cli-kit/node/monorail' -import {createRuntimeMetadataContainer} from '@shopify/cli-kit/node/metadata' -import type {PickByPrefix} from '@shopify/cli-kit/common/ts/pick-by-prefix' +import {MonorailEventPublic, MonorailEventSensitive} from '@shopify/cli-kit/shared/node/monorail' +import {createRuntimeMetadataContainer} from '@shopify/cli-kit/shared/node/metadata' +import type {PickByPrefix} from '@shopify/cli-kit/shared/common/ts/pick-by-prefix' type CmdFieldsFromMonorail = PickByPrefix & PickByPrefix & diff --git a/packages/app/src/cli/models/app/app.test-data.ts b/packages/app/src/cli/models/app/app.test-data.ts index d44964c7a40..ddeeb1a6a82 100644 --- a/packages/app/src/cli/models/app/app.test-data.ts +++ b/packages/app/src/cli/models/app/app.test-data.ts @@ -79,9 +79,9 @@ import {AppProxySpecIdentifier} from '../extensions/specifications/app_config_ap import {ExtensionSpecification} from '../extensions/specification.js' import {AppLogsOptions} from '../../services/app-logs/utils.js' import {AppLogsSubscribeMutationVariables} from '../../api/graphql/app-management/generated/app-logs-subscribe.js' -import {Session} from '@shopify/cli-kit/node/session' +import {Session} from '@shopify/cli-kit/identity/session' import {vi} from 'vitest' -import {joinPath} from '@shopify/cli-kit/node/path' +import {joinPath} from '@shopify/cli-kit/shared/node/path' export const DEFAULT_CONFIG = { path: '/tmp/project/shopify.app.toml', diff --git a/packages/app/src/cli/models/app/app.test.ts b/packages/app/src/cli/models/app/app.test.ts index 636a82fb113..580693b0c97 100644 --- a/packages/app/src/cli/models/app/app.test.ts +++ b/packages/app/src/cli/models/app/app.test.ts @@ -29,9 +29,9 @@ import {WebhooksConfig} from '../extensions/specifications/types/app_config_webh import {EditorExtensionCollectionType} from '../extensions/specifications/editor_extension_collection.js' import {ApplicationURLs} from '../../services/dev/urls.js' import {describe, expect, test, vi} from 'vitest' -import {inTemporaryDirectory, mkdir, readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {AbortError} from '@shopify/cli-kit/node/error' +import {inTemporaryDirectory, mkdir, readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' const CORRECT_CURRENT_APP_SCHEMA: CurrentAppConfiguration = { path: '', diff --git a/packages/app/src/cli/models/app/app.ts b/packages/app/src/cli/models/app/app.ts index ead77d10470..e18791c4e36 100644 --- a/packages/app/src/cli/models/app/app.ts +++ b/packages/app/src/cli/models/app/app.ts @@ -15,10 +15,14 @@ import {WebhookSubscriptionSchema} from '../extensions/specifications/app_config import {configurationFileNames} from '../../constants.js' import {ApplicationURLs} from '../../services/dev/urls.js' import {patchAppHiddenConfigFile} from '../../services/app/patch-app-configuration-file.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import {ZodObjectOf, zod} from '@shopify/cli-kit/node/schema' -import {DotEnvFile} from '@shopify/cli-kit/node/dot-env' -import {getDependencies, PackageManager, readAndParsePackageJson} from '@shopify/cli-kit/node/node-package-manager' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {ZodObjectOf, zod} from '@shopify/cli-kit/shared/node/schema' +import {DotEnvFile} from '@shopify/cli-kit/shared/node/dot-env' +import { + getDependencies, + PackageManager, + readAndParsePackageJson, +} from '@shopify/cli-kit/shared/node/node-package-manager' import { fileExistsSync, fileRealPath, @@ -26,12 +30,12 @@ import { readFileSync, removeFileSync, writeFileSync, -} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' -import {normalizeDelimitedString} from '@shopify/cli-kit/common/string' -import {JsonMapType} from '@shopify/cli-kit/node/toml' -import {getArrayRejectingUndefined} from '@shopify/cli-kit/common/array' -import {deepMergeObjects} from '@shopify/cli-kit/common/object' +} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {normalizeDelimitedString} from '@shopify/cli-kit/shared/common/string' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' +import {getArrayRejectingUndefined} from '@shopify/cli-kit/shared/common/array' +import {deepMergeObjects} from '@shopify/cli-kit/shared/common/object' // Schemas for loading app configuration diff --git a/packages/app/src/cli/models/app/identifiers.test.ts b/packages/app/src/cli/models/app/identifiers.test.ts index c1ddb635e06..efef3433ba9 100644 --- a/packages/app/src/cli/models/app/identifiers.test.ts +++ b/packages/app/src/cli/models/app/identifiers.test.ts @@ -1,9 +1,9 @@ import {updateAppIdentifiers, getAppIdentifiers} from './identifiers.js' import {testApp, testAppWithConfig, testDeveloperPlatformClient, testUIExtension} from './app.test-data.js' import {describe, expect, test} from 'vitest' -import {readAndParseDotEnv} from '@shopify/cli-kit/node/dot-env' -import {fileExists, inTemporaryDirectory, readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {readAndParseDotEnv} from '@shopify/cli-kit/shared/node/dot-env' +import {fileExists, inTemporaryDirectory, readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' describe('updateAppIdentifiers', () => { test('persists the ids that are not env variables when deploying, creating a new file', async () => { diff --git a/packages/app/src/cli/models/app/identifiers.ts b/packages/app/src/cli/models/app/identifiers.ts index 93f6039d6d4..0f21ad2594f 100644 --- a/packages/app/src/cli/models/app/identifiers.ts +++ b/packages/app/src/cli/models/app/identifiers.ts @@ -1,11 +1,11 @@ import {getDotEnvFileName} from './loader.js' import {ExtensionInstance} from '../extensions/extension-instance.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {patchEnvFile} from '@shopify/cli-kit/node/dot-env' -import {constantize} from '@shopify/cli-kit/common/string' -import {joinPath} from '@shopify/cli-kit/node/path' -import {fileExists, readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {deepCompare} from '@shopify/cli-kit/common/object' +import {patchEnvFile} from '@shopify/cli-kit/shared/node/dot-env' +import {constantize} from '@shopify/cli-kit/shared/common/string' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {fileExists, readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {deepCompare} from '@shopify/cli-kit/shared/common/object' import type {AppInterface} from './app.js' export interface IdentifiersExtensions { diff --git a/packages/app/src/cli/models/app/loader.test.ts b/packages/app/src/cli/models/app/loader.test.ts index 9a0e4ef87f3..c408389f925 100644 --- a/packages/app/src/cli/models/app/loader.test.ts +++ b/packages/app/src/cli/models/app/loader.test.ts @@ -31,29 +31,37 @@ import { pnpmLockfile, PackageJson, pnpmWorkspaceFile, -} from '@shopify/cli-kit/node/node-package-manager' -import {inTemporaryDirectory, moveFile, mkdir, mkTmpDir, rmdir, writeFile, readFile} from '@shopify/cli-kit/node/fs' -import {joinPath, dirname, cwd, normalizePath} from '@shopify/cli-kit/node/path' -import {platformAndArch} from '@shopify/cli-kit/node/os' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' -import {zod} from '@shopify/cli-kit/node/schema' -import colors from '@shopify/cli-kit/node/colors' -import {showMultipleCLIWarningIfNeeded} from '@shopify/cli-kit/node/multiple-installation-warning' -import {AbortError} from '@shopify/cli-kit/node/error' -import {captureOutput} from '@shopify/cli-kit/node/system' +} from '@shopify/cli-kit/shared/node/node-package-manager' +import { + inTemporaryDirectory, + moveFile, + mkdir, + mkTmpDir, + rmdir, + writeFile, + readFile, +} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, dirname, cwd, normalizePath} from '@shopify/cli-kit/shared/node/path' +import {platformAndArch} from '@shopify/cli-kit/shared/node/os' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' +import {zod} from '@shopify/cli-kit/shared/node/schema' +import colors from '@shopify/cli-kit/shared/node/colors' +import {showMultipleCLIWarningIfNeeded} from '@shopify/cli-kit/shared/node/multiple-installation-warning' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {captureOutput} from '@shopify/cli-kit/shared/node/system' vi.mock('../../services/local-storage.js') // Mock captureOutput to prevent executing `npm prefix` inside getPackageManager -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system') vi.mock('../../services/app/config/use.js') -vi.mock('@shopify/cli-kit/node/is-global') -vi.mock('@shopify/cli-kit/node/node-package-manager', async () => ({ - ...((await vi.importActual('@shopify/cli-kit/node/node-package-manager')) as any), +vi.mock('@shopify/cli-kit/shared/node/is-global') +vi.mock('@shopify/cli-kit/shared/node/node-package-manager', async () => ({ + ...((await vi.importActual('@shopify/cli-kit/shared/node/node-package-manager')) as any), localCLIVersion: vi.fn(), globalCLIVersion: vi.fn(), })) -vi.mock('@shopify/cli-kit/node/version') -vi.mock('@shopify/cli-kit/node/multiple-installation-warning') +vi.mock('@shopify/cli-kit/shared/node/version') +vi.mock('@shopify/cli-kit/shared/node/multiple-installation-warning') describe('load', () => { let specifications: ExtensionSpecification[] = [] diff --git a/packages/app/src/cli/models/app/loader.ts b/packages/app/src/cli/models/app/loader.ts index d83e575846c..c7be38b7956 100644 --- a/packages/app/src/cli/models/app/loader.ts +++ b/packages/app/src/cli/models/app/loader.ts @@ -37,25 +37,25 @@ import {loadLocalExtensionsSpecifications} from '../extensions/load-specificatio import {patchAppHiddenConfigFile} from '../../services/app/patch-app-configuration-file.js' import {getOrCreateAppConfigHiddenPath} from '../../utilities/app/config/hidden-app-config.js' import {ApplicationURLs, generateApplicationURLs} from '../../services/dev/urls.js' -import {showMultipleCLIWarningIfNeeded} from '@shopify/cli-kit/node/multiple-installation-warning' -import {fileExists, readFile, glob, findPathUp, fileExistsSync} from '@shopify/cli-kit/node/fs' -import {zod} from '@shopify/cli-kit/node/schema' -import {readAndParseDotEnv, DotEnvFile} from '@shopify/cli-kit/node/dot-env' +import {showMultipleCLIWarningIfNeeded} from '@shopify/cli-kit/shared/node/multiple-installation-warning' +import {fileExists, readFile, glob, findPathUp, fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {zod} from '@shopify/cli-kit/shared/node/schema' +import {readAndParseDotEnv, DotEnvFile} from '@shopify/cli-kit/shared/node/dot-env' import { getDependencies, getPackageManager, PackageManager, usesWorkspaces as appUsesWorkspaces, -} from '@shopify/cli-kit/node/node-package-manager' -import {resolveFramework} from '@shopify/cli-kit/node/framework' -import {hashString} from '@shopify/cli-kit/node/crypto' -import {JsonMapType, decodeToml} from '@shopify/cli-kit/node/toml' -import {joinPath, dirname, basename, relativePath, relativizePath} from '@shopify/cli-kit/node/path' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputDebug, OutputMessage, outputToken} from '@shopify/cli-kit/node/output' -import {joinWithAnd, slugify} from '@shopify/cli-kit/common/string' -import {getArrayRejectingUndefined} from '@shopify/cli-kit/common/array' -import {showNotificationsIfNeeded} from '@shopify/cli-kit/node/notifications-system' +} from '@shopify/cli-kit/shared/node/node-package-manager' +import {resolveFramework} from '@shopify/cli-kit/shared/node/framework' +import {hashString} from '@shopify/cli-kit/shared/node/crypto' +import {JsonMapType, decodeToml} from '@shopify/cli-kit/shared/node/toml' +import {joinPath, dirname, basename, relativePath, relativizePath} from '@shopify/cli-kit/shared/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputDebug, OutputMessage, outputToken} from '@shopify/cli-kit/shared/node/output' +import {joinWithAnd, slugify} from '@shopify/cli-kit/shared/common/string' +import {getArrayRejectingUndefined} from '@shopify/cli-kit/shared/common/array' +import {showNotificationsIfNeeded} from '@shopify/cli-kit/shared/node/notifications-system' import ignore from 'ignore' const defaultExtensionDirectory = 'extensions/*' diff --git a/packages/app/src/cli/models/app/validation/common.test.ts b/packages/app/src/cli/models/app/validation/common.test.ts index 4430a20df24..1d9a8789d8f 100644 --- a/packages/app/src/cli/models/app/validation/common.test.ts +++ b/packages/app/src/cli/models/app/validation/common.test.ts @@ -1,6 +1,6 @@ import {validateUrl, validateRelativeUrl} from './common.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' describe('validateUrl', () => { test('accepts valid HTTPS URLs', () => { diff --git a/packages/app/src/cli/models/app/validation/common.ts b/packages/app/src/cli/models/app/validation/common.ts index 2850caa22ea..aa61d5e6d30 100644 --- a/packages/app/src/cli/models/app/validation/common.ts +++ b/packages/app/src/cli/models/app/validation/common.ts @@ -1,4 +1,4 @@ -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export function validateUrl(zodType: zod.ZodString, {httpsOnly = false, message = 'Invalid URL'} = {}) { return zodType diff --git a/packages/app/src/cli/models/extensions/extension-instance.test.ts b/packages/app/src/cli/models/extensions/extension-instance.test.ts index 2adc27a7d1b..8e69af1b18d 100644 --- a/packages/app/src/cli/models/extensions/extension-instance.test.ts +++ b/packages/app/src/cli/models/extensions/extension-instance.test.ts @@ -16,17 +16,17 @@ import { import {FunctionConfigType} from '../extensions/specifications/function.js' import {ExtensionBuildOptions, buildUIExtension} from '../../services/build/extension.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {joinPath} from '@shopify/cli-kit/node/path' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import {describe, expect, test, vi} from 'vitest' -import {inTemporaryDirectory, readFile, mkdir, writeFile, fileExistsSync} from '@shopify/cli-kit/node/fs' -import {slugify} from '@shopify/cli-kit/common/string' -import {hashString, nonRandomUUID} from '@shopify/cli-kit/node/crypto' -import {extractImportPathsRecursively} from '@shopify/cli-kit/node/import-extractor' +import {inTemporaryDirectory, readFile, mkdir, writeFile, fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {slugify} from '@shopify/cli-kit/shared/common/string' +import {hashString, nonRandomUUID} from '@shopify/cli-kit/shared/node/crypto' +import {extractImportPathsRecursively} from '@shopify/cli-kit/shared/node/import-extractor' import {Writable} from 'stream' const developerPlatformClient: DeveloperPlatformClient = testDeveloperPlatformClient() -vi.mock('@shopify/cli-kit/node/import-extractor') +vi.mock('@shopify/cli-kit/shared/node/import-extractor') vi.mock('../../services/build/extension.js', async () => { const actual = await vi.importActual('../../services/build/extension.js') return { diff --git a/packages/app/src/cli/models/extensions/extension-instance.ts b/packages/app/src/cli/models/extensions/extension-instance.ts index c51ee23bbec..82f73732d53 100644 --- a/packages/app/src/cli/models/extensions/extension-instance.ts +++ b/packages/app/src/cli/models/extensions/extension-instance.ts @@ -25,16 +25,16 @@ import {Identifiers} from '../app/identifiers.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {AppConfigurationWithoutPath} from '../app/app.js' import {ApplicationURLs} from '../../services/dev/urls.js' -import {ok} from '@shopify/cli-kit/node/result' -import {constantize, slugify} from '@shopify/cli-kit/common/string' -import {hashString, nonRandomUUID} from '@shopify/cli-kit/node/crypto' -import {partnersFqdn} from '@shopify/cli-kit/node/context/fqdn' -import {joinPath, basename, normalizePath, resolvePath} from '@shopify/cli-kit/node/path' -import {fileExists, touchFile, moveFile, writeFile, glob, copyFile, globSync} from '@shopify/cli-kit/node/fs' -import {getPathValue} from '@shopify/cli-kit/common/object' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {extractJSImports, extractImportPathsRecursively} from '@shopify/cli-kit/node/import-extractor' -import {uniq} from '@shopify/cli-kit/common/array' +import {ok} from '@shopify/cli-kit/shared/node/result' +import {constantize, slugify} from '@shopify/cli-kit/shared/common/string' +import {hashString, nonRandomUUID} from '@shopify/cli-kit/shared/node/crypto' +import {partnersFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' +import {joinPath, basename, normalizePath, resolvePath} from '@shopify/cli-kit/shared/node/path' +import {fileExists, touchFile, moveFile, writeFile, glob, copyFile, globSync} from '@shopify/cli-kit/shared/node/fs' +import {getPathValue} from '@shopify/cli-kit/shared/common/object' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {extractJSImports, extractImportPathsRecursively} from '@shopify/cli-kit/shared/node/import-extractor' +import {uniq} from '@shopify/cli-kit/shared/common/array' export const CONFIG_EXTENSION_IDS: string[] = [ AppAccessSpecIdentifier, diff --git a/packages/app/src/cli/models/extensions/schemas.ts b/packages/app/src/cli/models/extensions/schemas.ts index fd8a4c9dcbc..1c741ce05dc 100644 --- a/packages/app/src/cli/models/extensions/schemas.ts +++ b/packages/app/src/cli/models/extensions/schemas.ts @@ -1,4 +1,4 @@ -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export const MAX_EXTENSION_HANDLE_LENGTH = 50 export const MAX_UID_LENGTH = 250 diff --git a/packages/app/src/cli/models/extensions/specification.ts b/packages/app/src/cli/models/extensions/specification.ts index d40a17dd115..255665e617f 100644 --- a/packages/app/src/cli/models/extensions/specification.ts +++ b/packages/app/src/cli/models/extensions/specification.ts @@ -7,11 +7,11 @@ import {Flag} from '../../utilities/developer-platform-client.js' import {AppConfigurationWithoutPath} from '../app/app.js' import {loadLocalesConfig} from '../../utilities/extensions/locales-configuration.js' import {ApplicationURLs} from '../../services/dev/urls.js' -import {Result} from '@shopify/cli-kit/node/result' -import {capitalize} from '@shopify/cli-kit/common/string' -import {ParseConfigurationResult, zod} from '@shopify/cli-kit/node/schema' -import {getPathValue, setPathValue} from '@shopify/cli-kit/common/object' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {Result} from '@shopify/cli-kit/shared/node/result' +import {capitalize} from '@shopify/cli-kit/shared/common/string' +import {ParseConfigurationResult, zod} from '@shopify/cli-kit/shared/node/schema' +import {getPathValue, setPathValue} from '@shopify/cli-kit/shared/common/object' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' export type ExtensionFeature = | 'ui_preview' diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_app_access.ts b/packages/app/src/cli/models/extensions/specifications/app_config_app_access.ts index b46603c58c2..3b9033dec42 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_app_access.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_app_access.ts @@ -1,8 +1,8 @@ import {validateUrl} from '../../app/validation/common.js' import {TransformationConfig, createConfigExtensionSpecification} from '../specification.js' import {BaseSchemaWithoutHandle} from '../schemas.js' -import {normalizeDelimitedString} from '@shopify/cli-kit/common/string' -import {zod} from '@shopify/cli-kit/node/schema' +import {normalizeDelimitedString} from '@shopify/cli-kit/shared/common/string' +import {zod} from '@shopify/cli-kit/shared/node/schema' const AppAccessSchema = BaseSchemaWithoutHandle.extend({ access: zod diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_app_home.ts b/packages/app/src/cli/models/extensions/specifications/app_config_app_home.ts index e796b4c0d35..e93975bf264 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_app_home.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_app_home.ts @@ -1,7 +1,7 @@ import {validateUrl} from '../../app/validation/common.js' import {BaseSchemaWithoutHandle} from '../schemas.js' import {TransformationConfig, createConfigExtensionSpecification} from '../specification.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const AppHomeSchema = BaseSchemaWithoutHandle.extend({ application_url: validateUrl(zod.string({required_error: 'Valid URL is required'})), diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_app_proxy.ts b/packages/app/src/cli/models/extensions/specifications/app_config_app_proxy.ts index b6d3d1efe9d..e5978a5b66c 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_app_proxy.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_app_proxy.ts @@ -8,7 +8,7 @@ import { } from '../specification.js' import {BaseSchemaWithoutHandle} from '../schemas.js' import {CurrentAppConfiguration} from '../../app/app.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const AppProxySchema = BaseSchemaWithoutHandle.extend({ app_proxy: zod diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_branding.ts b/packages/app/src/cli/models/extensions/specifications/app_config_branding.ts index 6b71822dd29..7d3d1ac4b50 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_branding.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_branding.ts @@ -1,6 +1,6 @@ import {TransformationConfig, createConfigExtensionSpecification} from '../specification.js' import {BaseSchemaWithoutHandle} from '../schemas.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const BrandingSchema = BaseSchemaWithoutHandle.extend({ name: zod.string({required_error: 'String is required'}).max(30, {message: 'String must be less than 30 characters'}), diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_events.ts b/packages/app/src/cli/models/extensions/specifications/app_config_events.ts index 227c2327511..7d6bb8a788f 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_events.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_events.ts @@ -1,7 +1,7 @@ import {transformToEventsConfig, transformFromEventsConfig} from './transform/app_config_events.js' import {CustomTransformationConfig, createConfigExtensionSpecification} from '../specification.js' import {BaseSchemaWithoutHandle} from '../schemas.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export const EventsSpecIdentifier = 'events' diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_point_of_sale.ts b/packages/app/src/cli/models/extensions/specifications/app_config_point_of_sale.ts index 91a6ed23911..428838c249f 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_point_of_sale.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_point_of_sale.ts @@ -1,6 +1,6 @@ import {createConfigExtensionSpecification, TransformationConfig} from '../specification.js' import {BaseSchemaWithoutHandle} from '../schemas.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const PosConfigurationSchema = BaseSchemaWithoutHandle.extend({ pos: zod diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_privacy_compliance_webhooks.test.ts b/packages/app/src/cli/models/extensions/specifications/app_config_privacy_compliance_webhooks.test.ts index c7d99cb753c..31e9f6b103d 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_privacy_compliance_webhooks.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_privacy_compliance_webhooks.test.ts @@ -1,6 +1,6 @@ import spec from './app_config_privacy_compliance_webhooks.js' import {placeholderAppConfiguration} from '../../app/app.test-data.js' -import {isEmpty} from '@shopify/cli-kit/common/object' +import {isEmpty} from '@shopify/cli-kit/shared/common/object' import {describe, expect, test} from 'vitest' describe('privacy_compliance_webhooks', () => { diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_privacy_compliance_webhooks.ts b/packages/app/src/cli/models/extensions/specifications/app_config_privacy_compliance_webhooks.ts index 0599e0ed0bd..85bbeccee63 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_privacy_compliance_webhooks.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_privacy_compliance_webhooks.ts @@ -5,7 +5,7 @@ import {mergeAllWebhooks} from './transform/app_config_webhook.js' import {removeTrailingSlash} from './validation/common.js' import {CustomTransformationConfig, createConfigExtensionSpecification} from '../specification.js' import {AppConfigurationWithoutPath, CurrentAppConfiguration} from '../../app/app.js' -import {compact, getPathValue} from '@shopify/cli-kit/common/object' +import {compact, getPathValue} from '@shopify/cli-kit/shared/common/object' const PrivacyComplianceWebhooksTransformConfig: CustomTransformationConfig = { forward: transformToPrivacyComplianceWebhooksModule, diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_webhook_schemas/webhook_subscription_schema.ts b/packages/app/src/cli/models/extensions/specifications/app_config_webhook_schemas/webhook_subscription_schema.ts index 7c22dd007d2..34a993c07b8 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_webhook_schemas/webhook_subscription_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_webhook_schemas/webhook_subscription_schema.ts @@ -1,5 +1,5 @@ import {WebhookSubscriptionUriValidation, removeTrailingSlash} from '../validation/common.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export enum ComplianceTopic { CustomersRedact = 'customers/redact', diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_webhook_schemas/webhooks_schema.ts b/packages/app/src/cli/models/extensions/specifications/app_config_webhook_schemas/webhooks_schema.ts index 98df8807a53..efcd8744b39 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_webhook_schemas/webhooks_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_webhook_schemas/webhooks_schema.ts @@ -4,7 +4,7 @@ import {WebhookSubscriptionUriValidation} from '../validation/common.js' import {SingleWebhookSubscriptionSchema} from '../app_config_webhook_subscription.js' import {mergeAllWebhooks} from '../transform/app_config_webhook.js' import {BaseSchemaWithoutHandle} from '../../schemas.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const WebhooksConfigSchema = zod.object({ api_version: zod.string({required_error: 'String is required'}), diff --git a/packages/app/src/cli/models/extensions/specifications/app_config_webhook_subscription.ts b/packages/app/src/cli/models/extensions/specifications/app_config_webhook_subscription.ts index 762c33eea86..86aa331ebdd 100644 --- a/packages/app/src/cli/models/extensions/specifications/app_config_webhook_subscription.ts +++ b/packages/app/src/cli/models/extensions/specifications/app_config_webhook_subscription.ts @@ -3,7 +3,7 @@ import {prependApplicationUrl} from './validation/url_prepender.js' import {WebhookSubscription} from './types/app_config_webhook.js' import {CustomTransformationConfig, createConfigExtensionSpecification} from '../specification.js' import {CurrentAppConfiguration} from '../../app/app.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export const WebhookSubscriptionSpecIdentifier = 'webhook_subscription' diff --git a/packages/app/src/cli/models/extensions/specifications/channel.ts b/packages/app/src/cli/models/extensions/specifications/channel.ts index 44ac2c2150d..20e83ad2fc0 100644 --- a/packages/app/src/cli/models/extensions/specifications/channel.ts +++ b/packages/app/src/cli/models/extensions/specifications/channel.ts @@ -1,5 +1,5 @@ import {createContractBasedModuleSpecification} from '../specification.js' -import {joinPath} from '@shopify/cli-kit/node/path' +import {joinPath} from '@shopify/cli-kit/shared/node/path' const SUBDIRECTORY_NAME = 'specifications' const FILE_EXTENSIONS = ['json', 'toml', 'yaml', 'yml', 'svg'] diff --git a/packages/app/src/cli/models/extensions/specifications/checkout_post_purchase.ts b/packages/app/src/cli/models/extensions/specifications/checkout_post_purchase.ts index 616adf80b73..aa4de11142d 100644 --- a/packages/app/src/cli/models/extensions/specifications/checkout_post_purchase.ts +++ b/packages/app/src/cli/models/extensions/specifications/checkout_post_purchase.ts @@ -1,6 +1,6 @@ import {BaseSchema, MetafieldSchema} from '../schemas.js' import {createExtensionSpecification} from '../specification.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const dependency = '@shopify/post-purchase-ui-extensions' diff --git a/packages/app/src/cli/models/extensions/specifications/checkout_ui_extension.ts b/packages/app/src/cli/models/extensions/specifications/checkout_ui_extension.ts index f08dfd97c40..202fd6f004e 100644 --- a/packages/app/src/cli/models/extensions/specifications/checkout_ui_extension.ts +++ b/packages/app/src/cli/models/extensions/specifications/checkout_ui_extension.ts @@ -1,7 +1,7 @@ import {createExtensionSpecification} from '../specification.js' import {BaseSchema, MetafieldSchema} from '../schemas.js' import {loadLocalesConfig} from '../../../utilities/extensions/locales-configuration.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const dependency = '@shopify/checkout-ui-extensions' diff --git a/packages/app/src/cli/models/extensions/specifications/editor_extension_collection.test.ts b/packages/app/src/cli/models/extensions/specifications/editor_extension_collection.test.ts index b17191eee34..086d49db040 100644 --- a/packages/app/src/cli/models/extensions/specifications/editor_extension_collection.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/editor_extension_collection.test.ts @@ -2,8 +2,8 @@ import * as loadLocales from '../../../utilities/extensions/locales-configuratio import {ExtensionInstance} from '../extension-instance.js' import {loadLocalExtensionsSpecifications} from '../load-specifications.js' import {placeholderAppConfiguration} from '../../app/app.test-data.js' -import {inTemporaryDirectory} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import {describe, expect, test, vi} from 'vitest' describe('editor_extension_collection', async () => { diff --git a/packages/app/src/cli/models/extensions/specifications/editor_extension_collection.ts b/packages/app/src/cli/models/extensions/specifications/editor_extension_collection.ts index 522fac3fb60..8078c416735 100644 --- a/packages/app/src/cli/models/extensions/specifications/editor_extension_collection.ts +++ b/packages/app/src/cli/models/extensions/specifications/editor_extension_collection.ts @@ -1,7 +1,7 @@ import {loadLocalesConfig} from '../../../utilities/extensions/locales-configuration.js' import {BaseSchema} from '../schemas.js' import {createExtensionSpecification} from '../specification.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' interface IncludeSchema { handle: string diff --git a/packages/app/src/cli/models/extensions/specifications/flow_action.ts b/packages/app/src/cli/models/extensions/specifications/flow_action.ts index 0df7fffb731..43f8dd0e2a6 100644 --- a/packages/app/src/cli/models/extensions/specifications/flow_action.ts +++ b/packages/app/src/cli/models/extensions/specifications/flow_action.ts @@ -8,7 +8,7 @@ import { } from '../../../services/flow/validation.js' import {serializeFields} from '../../../services/flow/serialize-fields.js' import {loadSchemaFromPath} from '../../../services/flow/utils.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const FlowActionExtensionSchema = BaseSchemaWithHandle.extend({ type: zod.literal('flow_action'), diff --git a/packages/app/src/cli/models/extensions/specifications/flow_template.ts b/packages/app/src/cli/models/extensions/specifications/flow_template.ts index 19841b9a4ad..590935accd4 100644 --- a/packages/app/src/cli/models/extensions/specifications/flow_template.ts +++ b/packages/app/src/cli/models/extensions/specifications/flow_template.ts @@ -1,10 +1,10 @@ import {BaseSchemaWithHandle} from '../schemas.js' import {createExtensionSpecification} from '../specification.js' import {loadLocalesConfig} from '../../../utilities/extensions/locales-configuration.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import {zod} from '@shopify/cli-kit/node/schema' -import {AbortError} from '@shopify/cli-kit/node/error' -import {glob} from '@shopify/cli-kit/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {zod} from '@shopify/cli-kit/shared/node/schema' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {glob} from '@shopify/cli-kit/shared/node/fs' import fs from 'fs' const VALID_CATEGORIES = [ diff --git a/packages/app/src/cli/models/extensions/specifications/flow_trigger.ts b/packages/app/src/cli/models/extensions/specifications/flow_trigger.ts index 615e5e5618c..16130f389da 100644 --- a/packages/app/src/cli/models/extensions/specifications/flow_trigger.ts +++ b/packages/app/src/cli/models/extensions/specifications/flow_trigger.ts @@ -3,7 +3,7 @@ import {BaseSchemaWithHandle, FieldSchema} from '../schemas.js' import {createExtensionSpecification} from '../specification.js' import {validateFieldShape, validateTriggerSchemaPresence} from '../../../services/flow/validation.js' import {serializeFields} from '../../../services/flow/serialize-fields.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export const FlowTriggerSettingsSchema = FieldSchema.extend({ key: zod diff --git a/packages/app/src/cli/models/extensions/specifications/function.test.ts b/packages/app/src/cli/models/extensions/specifications/function.test.ts index 8157eac4761..1f6a13b70a7 100644 --- a/packages/app/src/cli/models/extensions/specifications/function.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/function.test.ts @@ -1,11 +1,11 @@ import {FunctionConfigType} from './function.js' import {placeholderAppConfiguration, testFunctionExtension} from '../../app/app.test-data.js' import {ExtensionInstance} from '../extension-instance.js' -import {inTemporaryDirectory, mkdir, touchFile, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {AbortError} from '@shopify/cli-kit/node/error' +import {inTemporaryDirectory, mkdir, touchFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {beforeEach, describe, expect, test} from 'vitest' -import {getPathValue} from '@shopify/cli-kit/common/object' +import {getPathValue} from '@shopify/cli-kit/shared/common/object' describe('functionConfiguration', () => { let extension: ExtensionInstance diff --git a/packages/app/src/cli/models/extensions/specifications/function.ts b/packages/app/src/cli/models/extensions/specifications/function.ts index 4687dc44558..5a76ccd98ee 100644 --- a/packages/app/src/cli/models/extensions/specifications/function.ts +++ b/packages/app/src/cli/models/extensions/specifications/function.ts @@ -1,12 +1,12 @@ import {createExtensionSpecification} from '../specification.js' import {BaseSchema} from '../schemas.js' import {loadLocalesConfig} from '../../../utilities/extensions/locales-configuration.js' -import {zod} from '@shopify/cli-kit/node/schema' -import {joinPath} from '@shopify/cli-kit/node/path' -import {fileExists, readFile} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent} from '@shopify/cli-kit/node/output' -import {randomUUID} from '@shopify/cli-kit/node/crypto' +import {zod} from '@shopify/cli-kit/shared/node/schema' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {fileExists, readFile} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent} from '@shopify/cli-kit/shared/node/output' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' interface UI { app_bridge?: { diff --git a/packages/app/src/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.test.ts b/packages/app/src/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.test.ts index cddd66aaf30..ee6df0e422f 100644 --- a/packages/app/src/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.test.ts @@ -1,6 +1,6 @@ import {MarketingActivityExtensionSchema} from './marketing_activity_schema.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' describe('MarketingActivityExtensionSchema', () => { const config = { diff --git a/packages/app/src/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.ts b/packages/app/src/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.ts index 338d911630b..04103d8369a 100644 --- a/packages/app/src/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/marketing_activity_schemas/marketing_activity_schema.ts @@ -1,5 +1,5 @@ import {BaseSchema} from '../../schemas.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const BaseFieldSchema = zod.object({ ui_type: zod.string(), diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension.test.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension.test.ts index 2798e4b5b47..5daa1214fc2 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension.test.ts @@ -3,7 +3,7 @@ import {OffsitePaymentsAppExtensionConfigType} from './payments_app_extension_sc import {placeholderAppConfiguration, testPaymentsAppExtension} from '../../app/app.test-data.js' import {ExtensionInstance} from '../extension-instance.js' import {loadLocalExtensionsSpecifications} from '../load-specifications.js' -import {inTemporaryDirectory, writeFile} from '@shopify/cli-kit/node/fs' +import {inTemporaryDirectory, writeFile} from '@shopify/cli-kit/shared/node/fs' import {beforeEach, describe, expect, test} from 'vitest' describe('PaymentsAppExtension', () => { diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension.ts index 33dfeda8b2e..08309509d82 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension.ts @@ -35,7 +35,7 @@ import { cardPresentPaymentsAppExtensionDeployConfig, } from './payments_app_extension_schemas/card_present_payments_app_extension_schema.js' import {createExtensionSpecification} from '../specification.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const PaymentsAppExtensionSchema = zod.union([ OffsitePaymentsAppExtensionSchema, diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/base_payments_app_extension_schema.test.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/base_payments_app_extension_schema.test.ts index 7e0fd15ef50..0246ae985c5 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/base_payments_app_extension_schema.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/base_payments_app_extension_schema.test.ts @@ -6,7 +6,7 @@ import { SupportedBuyerContextsSchema, } from './base_payments_app_extension_schema.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' describe('BasePaymentsAppExtensionSchema', () => { const config = { diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/base_payments_app_extension_schema.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/base_payments_app_extension_schema.ts index 3394a210dd5..6789be2c051 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/base_payments_app_extension_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/base_payments_app_extension_schema.ts @@ -1,5 +1,5 @@ import {BaseSchema} from '../../schemas.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const MAX_LABEL_SIZE = 50 diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.test.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.test.ts index e722e22d3b8..a5fc6a84423 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.test.ts @@ -5,7 +5,7 @@ import { CARD_PRESENT_TARGET, } from './card_present_payments_app_extension_schema.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const config: CardPresentPaymentsAppExtensionConfigType = { name: 'test extension', diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.ts index 55751f85426..04bcae99e2d 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.ts @@ -2,7 +2,7 @@ import { BasePaymentsAppExtensionSchema, BasePaymentsAppExtensionDeployConfigType, } from './base_payments_app_extension_schema.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export type CardPresentPaymentsAppExtensionConfigType = zod.infer diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/credit_card_payments_app_extension_schema.test.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/credit_card_payments_app_extension_schema.test.ts index f4d1932a22e..7c10d5c0471 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/credit_card_payments_app_extension_schema.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/credit_card_payments_app_extension_schema.test.ts @@ -6,7 +6,7 @@ import { } from './credit_card_payments_app_extension_schema.js' import {buildCheckoutPaymentMethodFields} from './payments_app_extension_test_helper.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const config: CreditCardPaymentsAppExtensionConfigType = { name: 'test extension', diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/credit_card_payments_app_extension_schema.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/credit_card_payments_app_extension_schema.ts index c72be9f3d2f..5fb0ac18ad4 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/credit_card_payments_app_extension_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/credit_card_payments_app_extension_schema.ts @@ -8,7 +8,7 @@ import { } from './base_payments_app_extension_schema.js' import {ExtensionRegistration} from '../../../../api/graphql/all_app_extension_registrations.js' import {extensionUuidToHandle} from '../transform/extension_uuid_to_handle.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export type CreditCardPaymentsAppExtensionConfigType = zod.infer diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_credit_card_payments_app_extension_schema.test.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_credit_card_payments_app_extension_schema.test.ts index bb18e4d03eb..ac7e42a5d63 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_credit_card_payments_app_extension_schema.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_credit_card_payments_app_extension_schema.test.ts @@ -6,7 +6,7 @@ import { } from './custom_credit_card_payments_app_extension_schema.js' import {buildCheckoutPaymentMethodFields} from './payments_app_extension_test_helper.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const config: CustomCreditCardPaymentsAppExtensionConfigType = { name: 'Custom CreditCard extension', diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_credit_card_payments_app_extension_schema.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_credit_card_payments_app_extension_schema.ts index 33e4b948e8a..d009bbf9274 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_credit_card_payments_app_extension_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_credit_card_payments_app_extension_schema.ts @@ -7,7 +7,7 @@ import { } from './base_payments_app_extension_schema.js' import {ExtensionRegistration} from '../../../../api/graphql/all_app_extension_registrations.js' import {extensionUuidToHandle} from '../transform/extension_uuid_to_handle.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export type CustomCreditCardPaymentsAppExtensionConfigType = zod.infer< typeof CustomCreditCardPaymentsAppExtensionSchema diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.test.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.test.ts index e0f0a2fe8b6..59cedc3d363 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.test.ts @@ -6,7 +6,7 @@ import { } from './custom_onsite_payments_app_extension_schema.js' import {buildCheckoutPaymentMethodFields} from './payments_app_extension_test_helper.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const config: CustomOnsitePaymentsAppExtensionConfigType = { name: 'CustomOnsite extension', diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.ts index 1cbea794a74..2f7137368b8 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.ts @@ -8,7 +8,7 @@ import { } from './base_payments_app_extension_schema.js' import {ExtensionRegistration} from '../../../../api/graphql/all_app_extension_registrations.js' import {extensionUuidToHandle} from '../transform/extension_uuid_to_handle.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export type CustomOnsitePaymentsAppExtensionConfigType = zod.infer diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/offsite_payments_app_extension_schema.test.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/offsite_payments_app_extension_schema.test.ts index 204d3c7f1e1..9581193a7f4 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/offsite_payments_app_extension_schema.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/offsite_payments_app_extension_schema.test.ts @@ -4,7 +4,7 @@ import { offsitePaymentsAppExtensionDeployConfig, } from './offsite_payments_app_extension_schema.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const config: OffsitePaymentsAppExtensionConfigType = { name: 'test extension', diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/offsite_payments_app_extension_schema.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/offsite_payments_app_extension_schema.ts index 3b3ab49a300..3f095d6117b 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/offsite_payments_app_extension_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/offsite_payments_app_extension_schema.ts @@ -7,7 +7,7 @@ import { MultipleCaptureSchema, SupportedBuyerContextsSchema, } from './base_payments_app_extension_schema.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export type OffsitePaymentsAppExtensionConfigType = zod.infer diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/redeemable_payments_app_extension_schema.test.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/redeemable_payments_app_extension_schema.test.ts index 308382ded28..e3096ff3fb0 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/redeemable_payments_app_extension_schema.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/redeemable_payments_app_extension_schema.test.ts @@ -4,7 +4,7 @@ import { redeemablePaymentsAppExtensionDeployConfig, } from './redeemable_payments_app_extension_schema.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const config: RedeemablePaymentsAppExtensionConfigType = { name: 'Redeemable extension', diff --git a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/redeemable_payments_app_extension_schema.ts b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/redeemable_payments_app_extension_schema.ts index c908e0b5356..7fd824a96f0 100644 --- a/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/redeemable_payments_app_extension_schema.ts +++ b/packages/app/src/cli/models/extensions/specifications/payments_app_extension_schemas/redeemable_payments_app_extension_schema.ts @@ -6,7 +6,7 @@ import { } from './base_payments_app_extension_schema.js' import {ExtensionRegistration} from '../../../../api/graphql/all_app_extension_registrations.js' import {extensionUuidToHandle} from '../transform/extension_uuid_to_handle.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export type RedeemablePaymentsAppExtensionConfigType = zod.infer diff --git a/packages/app/src/cli/models/extensions/specifications/pos_ui_extension.ts b/packages/app/src/cli/models/extensions/specifications/pos_ui_extension.ts index 33962306a24..8bf5cf7ca73 100644 --- a/packages/app/src/cli/models/extensions/specifications/pos_ui_extension.ts +++ b/packages/app/src/cli/models/extensions/specifications/pos_ui_extension.ts @@ -1,8 +1,8 @@ import {getDependencyVersion} from '../../app/app.js' import {createExtensionSpecification} from '../specification.js' import {BaseSchema} from '../schemas.js' -import {BugError} from '@shopify/cli-kit/node/error' -import {zod} from '@shopify/cli-kit/node/schema' +import {BugError} from '@shopify/cli-kit/shared/node/error' +import {zod} from '@shopify/cli-kit/shared/node/schema' const dependency = '@shopify/retail-ui-extensions' diff --git a/packages/app/src/cli/models/extensions/specifications/product_subscription.ts b/packages/app/src/cli/models/extensions/specifications/product_subscription.ts index ba807e409f6..f9d504de1fb 100644 --- a/packages/app/src/cli/models/extensions/specifications/product_subscription.ts +++ b/packages/app/src/cli/models/extensions/specifications/product_subscription.ts @@ -1,7 +1,7 @@ import {getDependencyVersion} from '../../app/app.js' import {createExtensionSpecification} from '../specification.js' import {BaseSchema} from '../schemas.js' -import {BugError} from '@shopify/cli-kit/node/error' +import {BugError} from '@shopify/cli-kit/shared/node/error' const dependency = '@shopify/admin-ui-extensions' diff --git a/packages/app/src/cli/models/extensions/specifications/tax_calculation.ts b/packages/app/src/cli/models/extensions/specifications/tax_calculation.ts index 1e97e577bb6..b670e81dedc 100644 --- a/packages/app/src/cli/models/extensions/specifications/tax_calculation.ts +++ b/packages/app/src/cli/models/extensions/specifications/tax_calculation.ts @@ -1,6 +1,6 @@ import {createExtensionSpecification} from '../specification.js' import {BaseSchema, MetafieldSchema} from '../schemas.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const CartLinePropertySchema = zod.object({ key: zod.string(), diff --git a/packages/app/src/cli/models/extensions/specifications/theme.ts b/packages/app/src/cli/models/extensions/specifications/theme.ts index 6debcc8135e..b077547219e 100644 --- a/packages/app/src/cli/models/extensions/specifications/theme.ts +++ b/packages/app/src/cli/models/extensions/specifications/theme.ts @@ -2,10 +2,10 @@ import {createExtensionSpecification} from '../specification.js' import {BaseSchema} from '../schemas.js' import {themeExtensionFiles} from '../../../utilities/extensions/theme.js' import {ExtensionInstance} from '../extension-instance.js' -import {fileSize} from '@shopify/cli-kit/node/fs' -import {dirname, relativePath} from '@shopify/cli-kit/node/path' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {fileSize} from '@shopify/cli-kit/shared/node/fs' +import {dirname, relativePath} from '@shopify/cli-kit/shared/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' const themeSpec = createExtensionSpecification({ identifier: 'theme', diff --git a/packages/app/src/cli/models/extensions/specifications/transform/app_config_events.ts b/packages/app/src/cli/models/extensions/specifications/transform/app_config_events.ts index f3173fe6e09..6da4bad2ae4 100644 --- a/packages/app/src/cli/models/extensions/specifications/transform/app_config_events.ts +++ b/packages/app/src/cli/models/extensions/specifications/transform/app_config_events.ts @@ -1,4 +1,4 @@ -import {getPathValue} from '@shopify/cli-kit/common/object' +import {getPathValue} from '@shopify/cli-kit/shared/common/object' /** * Transforms the events config from local to remote format. diff --git a/packages/app/src/cli/models/extensions/specifications/transform/app_config_webhook.ts b/packages/app/src/cli/models/extensions/specifications/transform/app_config_webhook.ts index 22480d02c2d..2b51d8a8f1c 100644 --- a/packages/app/src/cli/models/extensions/specifications/transform/app_config_webhook.ts +++ b/packages/app/src/cli/models/extensions/specifications/transform/app_config_webhook.ts @@ -1,5 +1,5 @@ import {WebhooksConfig, WebhookSubscription} from '../types/app_config_webhook.js' -import {deepCompare, getPathValue} from '@shopify/cli-kit/common/object' +import {deepCompare, getPathValue} from '@shopify/cli-kit/shared/common/object' export function transformFromWebhookConfig(content: object) { const webhooks = getPathValue(content, 'webhooks') as WebhooksConfig diff --git a/packages/app/src/cli/models/extensions/specifications/transform/extension_uuid_to_handle.ts b/packages/app/src/cli/models/extensions/specifications/transform/extension_uuid_to_handle.ts index 9e60fa0ae63..289a2db7b92 100644 --- a/packages/app/src/cli/models/extensions/specifications/transform/extension_uuid_to_handle.ts +++ b/packages/app/src/cli/models/extensions/specifications/transform/extension_uuid_to_handle.ts @@ -3,7 +3,7 @@ import {CustomCreditCardPaymentsAppExtensionDeployConfigType} from '../payments_ import {CustomOnsitePaymentsAppExtensionDeployConfigType} from '../payments_app_extension_schemas/custom_onsite_payments_app_extension_schema.js' import {RedeemablePaymentsAppExtensionDeployConfigType} from '../payments_app_extension_schemas/redeemable_payments_app_extension_schema.js' import {ExtensionRegistration} from '../../../../api/graphql/all_app_extension_registrations.js' -import {slugify} from '@shopify/cli-kit/common/string' +import {slugify} from '@shopify/cli-kit/shared/common/string' type Config = | CreditCardPaymentsAppExtensionDeployConfigType diff --git a/packages/app/src/cli/models/extensions/specifications/type-generation.test.ts b/packages/app/src/cli/models/extensions/specifications/type-generation.test.ts index b26704b3d7c..a57a604e9a5 100644 --- a/packages/app/src/cli/models/extensions/specifications/type-generation.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/type-generation.test.ts @@ -1,5 +1,5 @@ import {createToolsTypeDefinition} from './type-generation.js' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {describe, expect, test} from 'vitest' describe('createToolsTypeDefinition', () => { diff --git a/packages/app/src/cli/models/extensions/specifications/type-generation.ts b/packages/app/src/cli/models/extensions/specifications/type-generation.ts index 2dc8b70743e..642c2a3a9dc 100644 --- a/packages/app/src/cli/models/extensions/specifications/type-generation.ts +++ b/packages/app/src/cli/models/extensions/specifications/type-generation.ts @@ -1,10 +1,10 @@ -import {fileExists, findPathUp, readFileSync} from '@shopify/cli-kit/node/fs' -import {dirname, joinPath, relativizePath, resolvePath} from '@shopify/cli-kit/node/path' -import {AbortError} from '@shopify/cli-kit/node/error' +import {fileExists, findPathUp, readFileSync} from '@shopify/cli-kit/shared/node/fs' +import {dirname, joinPath, relativizePath, resolvePath} from '@shopify/cli-kit/shared/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import ts from 'typescript' import {compile} from 'json-schema-to-typescript' -import {pascalize} from '@shopify/cli-kit/common/string' -import {zod} from '@shopify/cli-kit/node/schema' +import {pascalize} from '@shopify/cli-kit/shared/common/string' +import {zod} from '@shopify/cli-kit/shared/node/schema' import {createRequire} from 'module' const require = createRequire(import.meta.url) diff --git a/packages/app/src/cli/models/extensions/specifications/ui_extension.test.ts b/packages/app/src/cli/models/extensions/specifications/ui_extension.test.ts index 29a8fab8431..4388f296733 100644 --- a/packages/app/src/cli/models/extensions/specifications/ui_extension.test.ts +++ b/packages/app/src/cli/models/extensions/specifications/ui_extension.test.ts @@ -4,12 +4,12 @@ import {ExtensionInstance} from '../extension-instance.js' import {loadLocalExtensionsSpecifications} from '../load-specifications.js' import {placeholderAppConfiguration} from '../../app/app.test-data.js' import {AssetIdentifier} from '../specification.js' -import {inTemporaryDirectory, touchFile, writeFile, mkdir, fileExistsSync} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {err, ok} from '@shopify/cli-kit/node/result' -import {zod} from '@shopify/cli-kit/node/schema' +import {inTemporaryDirectory, touchFile, writeFile, mkdir, fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {err, ok} from '@shopify/cli-kit/shared/node/result' +import {zod} from '@shopify/cli-kit/shared/node/schema' import {describe, expect, test, vi} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' describe('ui_extension', async () => { interface GetUIExtensionProps { diff --git a/packages/app/src/cli/models/extensions/specifications/ui_extension.ts b/packages/app/src/cli/models/extensions/specifications/ui_extension.ts index f3e04cbeab9..b89b0ff875a 100644 --- a/packages/app/src/cli/models/extensions/specifications/ui_extension.ts +++ b/packages/app/src/cli/models/extensions/specifications/ui_extension.ts @@ -12,11 +12,11 @@ import {loadLocalesConfig} from '../../../utilities/extensions/locales-configura import {getExtensionPointTargetSurface} from '../../../services/dev/extension/utilities.js' import {ExtensionInstance} from '../extension-instance.js' import {formatContent} from '../../../utilities/file-formatter.js' -import {err, ok, Result} from '@shopify/cli-kit/node/result' -import {copyFile, fileExists, readFile} from '@shopify/cli-kit/node/fs' -import {joinPath, basename, dirname} from '@shopify/cli-kit/node/path' -import {outputContent, outputToken, outputWarn} from '@shopify/cli-kit/node/output' -import {zod} from '@shopify/cli-kit/node/schema' +import {err, ok, Result} from '@shopify/cli-kit/shared/node/result' +import {copyFile, fileExists, readFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, basename, dirname} from '@shopify/cli-kit/shared/node/path' +import {outputContent, outputToken, outputWarn} from '@shopify/cli-kit/shared/node/output' +import {zod} from '@shopify/cli-kit/shared/node/schema' const dependency = '@shopify/checkout-ui-extensions' diff --git a/packages/app/src/cli/models/extensions/specifications/validation/app_config_webhook.ts b/packages/app/src/cli/models/extensions/specifications/validation/app_config_webhook.ts index 247274ead77..9473c59403c 100644 --- a/packages/app/src/cli/models/extensions/specifications/validation/app_config_webhook.ts +++ b/packages/app/src/cli/models/extensions/specifications/validation/app_config_webhook.ts @@ -1,6 +1,6 @@ -import {zod} from '@shopify/cli-kit/node/schema' -import {uniq} from '@shopify/cli-kit/common/array' -import colors from '@shopify/cli-kit/node/colors' +import {zod} from '@shopify/cli-kit/shared/node/schema' +import {uniq} from '@shopify/cli-kit/shared/common/array' +import colors from '@shopify/cli-kit/shared/node/colors' import type {WebhooksConfig} from '../types/app_config_webhook.js' export function webhookValidator(schema: object, ctx: zod.RefinementCtx) { diff --git a/packages/app/src/cli/models/extensions/specifications/validation/common.ts b/packages/app/src/cli/models/extensions/specifications/validation/common.ts index 8c6faf91057..b3f8afa12a8 100644 --- a/packages/app/src/cli/models/extensions/specifications/validation/common.ts +++ b/packages/app/src/cli/models/extensions/specifications/validation/common.ts @@ -1,4 +1,4 @@ -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' const httpsRegex = /^(https:\/\/)/ // example PubSub URI - pubsub://{project}:{topic} diff --git a/packages/app/src/cli/models/extensions/specifications/web_pixel_extension.ts b/packages/app/src/cli/models/extensions/specifications/web_pixel_extension.ts index 298a18d876b..b96c23f1b0e 100644 --- a/packages/app/src/cli/models/extensions/specifications/web_pixel_extension.ts +++ b/packages/app/src/cli/models/extensions/specifications/web_pixel_extension.ts @@ -1,8 +1,8 @@ import {createExtensionSpecification} from '../specification.js' import {BaseSchema} from '../schemas.js' -import {zod} from '@shopify/cli-kit/node/schema' -import {AbortError} from '@shopify/cli-kit/node/error' -import {fileSize} from '@shopify/cli-kit/node/fs' +import {zod} from '@shopify/cli-kit/shared/node/schema' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {fileSize} from '@shopify/cli-kit/shared/node/fs' const kilobytes = 1024 const BUNDLE_SIZE_LIMIT_KB = 128 diff --git a/packages/app/src/cli/prompts/config.test.ts b/packages/app/src/cli/prompts/config.test.ts index 587c11fce52..01719538d4b 100644 --- a/packages/app/src/cli/prompts/config.test.ts +++ b/packages/app/src/cli/prompts/config.test.ts @@ -1,12 +1,12 @@ import {selectConfigFile, selectConfigName, validate} from './config.js' import {describe, expect, test, vi} from 'vitest' -import {inTemporaryDirectory, writeFileSync} from '@shopify/cli-kit/node/fs' -import {renderConfirmationPrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/node/ui' -import {joinPath} from '@shopify/cli-kit/node/path' -import {err, ok} from '@shopify/cli-kit/node/result' +import {inTemporaryDirectory, writeFileSync} from '@shopify/cli-kit/shared/node/fs' +import {renderConfirmationPrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/shared/node/ui' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {err, ok} from '@shopify/cli-kit/shared/node/result' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('selectConfigName', () => { test('returns the chosen file name when the file does not exist', async () => { diff --git a/packages/app/src/cli/prompts/config.ts b/packages/app/src/cli/prompts/config.ts index a93eaff4d15..935a1efaee9 100644 --- a/packages/app/src/cli/prompts/config.ts +++ b/packages/app/src/cli/prompts/config.ts @@ -5,12 +5,12 @@ import { renderConfirmationPrompt, renderSelectPrompt, renderTextPrompt, -} from '@shopify/cli-kit/node/ui' -import {fileExists, glob} from '@shopify/cli-kit/node/fs' -import {basename, joinPath} from '@shopify/cli-kit/node/path' -import {slugify} from '@shopify/cli-kit/common/string' -import {err, ok, Result} from '@shopify/cli-kit/node/result' -import colors from '@shopify/cli-kit/node/colors' +} from '@shopify/cli-kit/shared/node/ui' +import {fileExists, glob} from '@shopify/cli-kit/shared/node/fs' +import {basename, joinPath} from '@shopify/cli-kit/shared/node/path' +import {slugify} from '@shopify/cli-kit/shared/common/string' +import {err, ok, Result} from '@shopify/cli-kit/shared/node/result' +import colors from '@shopify/cli-kit/shared/node/colors' export async function selectConfigName(directory: string, defaultName = ''): Promise { const namePromptOptions = buildTextPromptOptions(defaultName) diff --git a/packages/app/src/cli/prompts/deploy-release.test.ts b/packages/app/src/cli/prompts/deploy-release.test.ts index e7286c555f6..6a529608ae0 100644 --- a/packages/app/src/cli/prompts/deploy-release.test.ts +++ b/packages/app/src/cli/prompts/deploy-release.test.ts @@ -7,9 +7,9 @@ import { buildExtensionBreakdownInfo, } from '../services/context/breakdown-extensions.js' import {MockInstance, beforeEach, describe, expect, test, vi} from 'vitest' -import * as ui from '@shopify/cli-kit/node/ui' +import * as ui from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/context/local') beforeEach(() => { // Mock isTTY to return true so prompts are shown instead of errors in tests diff --git a/packages/app/src/cli/prompts/deploy-release.ts b/packages/app/src/cli/prompts/deploy-release.ts index 5198b205e25..ddba11d2bce 100644 --- a/packages/app/src/cli/prompts/deploy-release.ts +++ b/packages/app/src/cli/prompts/deploy-release.ts @@ -10,8 +10,8 @@ import { renderConfirmationPrompt, renderDangerousConfirmationPrompt, isTTY, -} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' +} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' interface DeployOrReleaseConfirmationPromptOptions { extensionIdentifiersBreakdown: ExtensionIdentifiersBreakdown diff --git a/packages/app/src/cli/prompts/dev.test.ts b/packages/app/src/cli/prompts/dev.test.ts index e72baa0c7bb..cb493b5f646 100644 --- a/packages/app/src/cli/prompts/dev.test.ts +++ b/packages/app/src/cli/prompts/dev.test.ts @@ -13,10 +13,10 @@ import {getTomls} from '../utilities/app/config/getTomls.js' import {searchForAppsByNameFactory} from '../services/dev/prompt-helpers.js' import {ApplicationURLs} from '../services/dev/urls.js' import {describe, expect, vi, test, beforeEach} from 'vitest' -import {renderAutocompletePrompt, renderConfirmationPrompt, renderTextPrompt} from '@shopify/cli-kit/node/ui' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {renderAutocompletePrompt, renderConfirmationPrompt, renderTextPrompt} from '@shopify/cli-kit/shared/node/ui' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../utilities/app/config/getTomls') const ORG1: Organization = { diff --git a/packages/app/src/cli/prompts/dev.ts b/packages/app/src/cli/prompts/dev.ts index 71cc296a88e..9ee2a82fbe7 100644 --- a/packages/app/src/cli/prompts/dev.ts +++ b/packages/app/src/cli/prompts/dev.ts @@ -10,8 +10,8 @@ import { renderAutocompletePrompt, renderConfirmationPrompt, renderTextPrompt, -} from '@shopify/cli-kit/node/ui' -import {outputCompleted} from '@shopify/cli-kit/node/output' +} from '@shopify/cli-kit/shared/node/ui' +import {outputCompleted} from '@shopify/cli-kit/shared/node/output' export async function selectOrganizationPrompt(organizations: Organization[]): Promise { if (organizations.length === 1) { diff --git a/packages/app/src/cli/prompts/function/replay.test.ts b/packages/app/src/cli/prompts/function/replay.test.ts index 766d351db94..77021a09b44 100644 --- a/packages/app/src/cli/prompts/function/replay.test.ts +++ b/packages/app/src/cli/prompts/function/replay.test.ts @@ -1,9 +1,9 @@ import {selectFunctionRunPrompt} from './replay.js' import {FunctionRunData} from '../../services/function/replay.js' import {describe, expect, vi, test} from 'vitest' -import {renderAutocompletePrompt} from '@shopify/cli-kit/node/ui' +import {renderAutocompletePrompt} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') const RUN1: FunctionRunData = { shopId: 69665030382, diff --git a/packages/app/src/cli/prompts/function/replay.ts b/packages/app/src/cli/prompts/function/replay.ts index 3952ea8999c..ddd123132df 100644 --- a/packages/app/src/cli/prompts/function/replay.ts +++ b/packages/app/src/cli/prompts/function/replay.ts @@ -1,5 +1,5 @@ import {FunctionRunData} from '../../services/function/replay.js' -import {renderAutocompletePrompt} from '@shopify/cli-kit/node/ui' +import {renderAutocompletePrompt} from '@shopify/cli-kit/shared/node/ui' export async function selectFunctionRunPrompt(functionRuns: FunctionRunData[]): Promise { if (functionRuns.length === 0) return undefined diff --git a/packages/app/src/cli/prompts/generate/extension.test.ts b/packages/app/src/cli/prompts/generate/extension.test.ts index 48eeb31453a..a1781d7aa30 100644 --- a/packages/app/src/cli/prompts/generate/extension.test.ts +++ b/packages/app/src/cli/prompts/generate/extension.test.ts @@ -4,11 +4,11 @@ import {testApp, testRemoteExtensionTemplates} from '../../models/app/app.test-d import {ExtensionTemplate} from '../../models/app/template.js' import {ExtensionFlavorValue} from '../../services/generate/extension.js' import {describe, expect, vi, beforeEach, test} from 'vitest' -import {isShopify, isUnitTest} from '@shopify/cli-kit/node/context/local' -import {renderAutocompletePrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/node/ui' +import {isShopify, isUnitTest} from '@shopify/cli-kit/shared/node/context/local' +import {renderAutocompletePrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/ui') beforeEach(() => { vi.mocked(isShopify).mockResolvedValue(true) diff --git a/packages/app/src/cli/prompts/generate/extension.ts b/packages/app/src/cli/prompts/generate/extension.ts index a4d0e63a03a..cc1c23aef8c 100644 --- a/packages/app/src/cli/prompts/generate/extension.ts +++ b/packages/app/src/cli/prompts/generate/extension.ts @@ -1,11 +1,11 @@ import {AppInterface} from '../../models/app/app.js' import {ExtensionFlavorValue} from '../../services/generate/extension.js' import {ExtensionTemplate} from '../../models/app/template.js' -import {fileExistsSync} from '@shopify/cli-kit/node/fs' -import {renderAutocompletePrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' -import {joinPath} from '@shopify/cli-kit/node/path' -import {slugify} from '@shopify/cli-kit/common/string' +import {fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {renderAutocompletePrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {slugify} from '@shopify/cli-kit/shared/common/string' export interface GenerateExtensionPromptOptions { name?: string diff --git a/packages/app/src/cli/prompts/import-extensions.test.ts b/packages/app/src/cli/prompts/import-extensions.test.ts index f4e24840faa..8fa29c92f93 100644 --- a/packages/app/src/cli/prompts/import-extensions.test.ts +++ b/packages/app/src/cli/prompts/import-extensions.test.ts @@ -1,10 +1,10 @@ import {getMigrationChoices, selectMigrationChoice, allMigrationChoices, MigrationChoice} from './import-extensions.js' import {ExtensionRegistration} from '../api/graphql/all_app_extension_registrations.js' import {describe, expect, test, vi} from 'vitest' -import {renderSelectPrompt} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' +import {renderSelectPrompt} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('allMigrationChoices', () => { test('contains all expected migration choices', () => { diff --git a/packages/app/src/cli/prompts/import-extensions.ts b/packages/app/src/cli/prompts/import-extensions.ts index 051f4be1f1d..bf1eaa87c2f 100644 --- a/packages/app/src/cli/prompts/import-extensions.ts +++ b/packages/app/src/cli/prompts/import-extensions.ts @@ -5,8 +5,8 @@ import {buildTomlObject as buildMarketingActivityTomlObject} from '../services/m import {buildTomlObject as buildSubscriptionLinkTomlObject} from '../services/subscription_link/extension-to-toml.js' import {ExtensionRegistration} from '../api/graphql/all_app_extension_registrations.js' import {CurrentAppConfiguration} from '../models/app/app.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {renderSelectPrompt} from '@shopify/cli-kit/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {renderSelectPrompt} from '@shopify/cli-kit/shared/node/ui' export interface MigrationChoice { label: string diff --git a/packages/app/src/cli/prompts/init/init.test.ts b/packages/app/src/cli/prompts/init/init.test.ts index 1d7e55d3f0a..64662de0573 100644 --- a/packages/app/src/cli/prompts/init/init.test.ts +++ b/packages/app/src/cli/prompts/init/init.test.ts @@ -1,10 +1,10 @@ import init, {InitOptions} from './init.js' import {describe, expect, vi, test, beforeEach} from 'vitest' -import {renderSelectPrompt} from '@shopify/cli-kit/node/ui' -import {installGlobalCLIPrompt} from '@shopify/cli-kit/node/is-global' +import {renderSelectPrompt} from '@shopify/cli-kit/shared/node/ui' +import {installGlobalCLIPrompt} from '@shopify/cli-kit/shared/node/is-global' -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/is-global') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/shared/node/is-global') const globalCLIResult = {install: true, alreadyInstalled: false} diff --git a/packages/app/src/cli/prompts/init/init.ts b/packages/app/src/cli/prompts/init/init.ts index d0871f5e7f6..2daa236dc88 100644 --- a/packages/app/src/cli/prompts/init/init.ts +++ b/packages/app/src/cli/prompts/init/init.ts @@ -1,5 +1,5 @@ -import {InstallGlobalCLIPromptResult, installGlobalCLIPrompt} from '@shopify/cli-kit/node/is-global' -import {renderSelectPrompt} from '@shopify/cli-kit/node/ui' +import {InstallGlobalCLIPromptResult, installGlobalCLIPrompt} from '@shopify/cli-kit/shared/node/is-global' +import {renderSelectPrompt} from '@shopify/cli-kit/shared/node/ui' export interface InitOptions { template?: string diff --git a/packages/app/src/cli/prompts/uid-mapping-error.ts b/packages/app/src/cli/prompts/uid-mapping-error.ts index 71a073c98f7..4b07714ff51 100644 --- a/packages/app/src/cli/prompts/uid-mapping-error.ts +++ b/packages/app/src/cli/prompts/uid-mapping-error.ts @@ -1,4 +1,4 @@ -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export function throwUidMappingError() { const message = ['Your app has extensions which need to be assigned', {command: 'uid'}, 'identifiers.'] diff --git a/packages/app/src/cli/prompts/webhook/trigger.test.ts b/packages/app/src/cli/prompts/webhook/trigger.test.ts index 9f846a674a4..20a9a74777d 100644 --- a/packages/app/src/cli/prompts/webhook/trigger.test.ts +++ b/packages/app/src/cli/prompts/webhook/trigger.test.ts @@ -1,9 +1,9 @@ import {addressPrompt, apiVersionPrompt, deliveryMethodPrompt, topicPrompt} from './trigger.js' import {DELIVERY_METHOD} from '../../services/webhook/trigger-flags.js' import {describe, expect, vi, test} from 'vitest' -import {renderAutocompletePrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/node/ui' +import {renderAutocompletePrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('topicPrompt', () => { test('asks the user to enter a topic name', async () => { diff --git a/packages/app/src/cli/prompts/webhook/trigger.ts b/packages/app/src/cli/prompts/webhook/trigger.ts index 5aa4a237b21..7c77d912882 100644 --- a/packages/app/src/cli/prompts/webhook/trigger.ts +++ b/packages/app/src/cli/prompts/webhook/trigger.ts @@ -1,6 +1,6 @@ import {DELIVERY_METHOD, isAddressAllowedForDeliveryMethod} from '../../services/webhook/trigger-flags.js' -import {renderAutocompletePrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/node/ui' -import {stringifyMessage} from '@shopify/cli-kit/node/output' +import {renderAutocompletePrompt, renderSelectPrompt, renderTextPrompt} from '@shopify/cli-kit/shared/node/ui' +import {stringifyMessage} from '@shopify/cli-kit/shared/node/output' export async function topicPrompt(availableTopics: string[]): Promise { const choicesList = availableTopics.map((topic) => ({label: topic, value: topic})) diff --git a/packages/app/src/cli/services/admin-link/extension-to-toml.ts b/packages/app/src/cli/services/admin-link/extension-to-toml.ts index 7c0d5faa7ac..b78b1ca8ff8 100644 --- a/packages/app/src/cli/services/admin-link/extension-to-toml.ts +++ b/packages/app/src/cli/services/admin-link/extension-to-toml.ts @@ -2,8 +2,8 @@ import {contextToTarget} from './utils.js' import {ExtensionRegistration} from '../../api/graphql/all_app_extension_registrations.js' import {MAX_EXTENSION_HANDLE_LENGTH} from '../../models/extensions/schemas.js' import {CurrentAppConfiguration} from '../../models/app/app.js' -import {encodeToml} from '@shopify/cli-kit/node/toml' -import {slugify} from '@shopify/cli-kit/common/string' +import {encodeToml} from '@shopify/cli-kit/shared/node/toml' +import {slugify} from '@shopify/cli-kit/shared/common/string' interface AdminLinkConfig { text: string diff --git a/packages/app/src/cli/services/admin-link/utils.ts b/packages/app/src/cli/services/admin-link/utils.ts index 67b064f194b..2388c45862c 100644 --- a/packages/app/src/cli/services/admin-link/utils.ts +++ b/packages/app/src/cli/services/admin-link/utils.ts @@ -1,4 +1,4 @@ -import {hyphenate} from '@shopify/cli-kit/common/string' +import {hyphenate} from '@shopify/cli-kit/shared/common/string' export const contextToTarget = (context: string) => { const splitContext = context.split('#') diff --git a/packages/app/src/cli/services/app-context.test.ts b/packages/app/src/cli/services/app-context.test.ts index 37ffaf956cc..f2a5f742d11 100644 --- a/packages/app/src/cli/services/app-context.test.ts +++ b/packages/app/src/cli/services/app-context.test.ts @@ -11,9 +11,9 @@ import metadata from '../metadata.js' import * as loader from '../models/app/loader.js' import {loadLocalExtensionsSpecifications} from '../models/extensions/load-specifications.js' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {inTemporaryDirectory, writeFile, mkdir} from '@shopify/cli-kit/node/fs' -import {joinPath, normalizePath} from '@shopify/cli-kit/node/path' -import {tryParseInt} from '@shopify/cli-kit/common/string' +import {inTemporaryDirectory, writeFile, mkdir} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, normalizePath} from '@shopify/cli-kit/shared/node/path' +import {tryParseInt} from '@shopify/cli-kit/shared/common/string' vi.mock('../models/app/validation/multi-cli-warning.js') vi.mock('./generate/fetch-extension-specifications.js') diff --git a/packages/app/src/cli/services/app-context.ts b/packages/app/src/cli/services/app-context.ts index 61d4e9c923b..874b1c4925c 100644 --- a/packages/app/src/cli/services/app-context.ts +++ b/packages/app/src/cli/services/app-context.ts @@ -11,7 +11,7 @@ import {getAppConfigurationState, loadAppUsingConfigurationState, loadApp} from import {RemoteAwareExtensionSpecification} from '../models/extensions/specification.js' import {AppLinkedInterface, AppInterface} from '../models/app/app.js' import metadata from '../metadata.js' -import {tryParseInt} from '@shopify/cli-kit/common/string' +import {tryParseInt} from '@shopify/cli-kit/shared/common/string' export interface LoadedAppContextOutput { app: AppLinkedInterface diff --git a/packages/app/src/cli/services/app-logs/dev/poll-app-logs.test.ts b/packages/app/src/cli/services/app-logs/dev/poll-app-logs.test.ts index 38a5022fd0b..38805a6e382 100644 --- a/packages/app/src/cli/services/app-logs/dev/poll-app-logs.test.ts +++ b/packages/app/src/cli/services/app-logs/dev/poll-app-logs.test.ts @@ -3,16 +3,16 @@ import {writeAppLogsToFile} from './write-app-logs.js' import {FunctionRunLog} from '../types.js' import {testDeveloperPlatformClient} from '../../../models/app/app.test-data.js' import {describe, expect, test, vi, beforeEach, afterEach} from 'vitest' -import * as components from '@shopify/cli-kit/node/ui/components' -import * as output from '@shopify/cli-kit/node/output' +import * as components from '@shopify/cli-kit/shared/node/ui/components' +import * as output from '@shopify/cli-kit/shared/node/output' import camelcaseKeys from 'camelcase-keys' -import {appManagementFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {appManagementFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' const JWT_TOKEN = 'jwtToken' const TEST_LOGS_DIR = '/test/logs/dir' vi.mock('./write-app-logs.js') -vi.mock('@shopify/cli-kit/node/http') +vi.mock('@shopify/cli-kit/shared/node/http') const FQDN = await appManagementFqdn() const LOGS = '1\\n2\\n3\\n4\\n' diff --git a/packages/app/src/cli/services/app-logs/dev/poll-app-logs.ts b/packages/app/src/cli/services/app-logs/dev/poll-app-logs.ts index a74fa5be0cc..7a2a176982d 100644 --- a/packages/app/src/cli/services/app-logs/dev/poll-app-logs.ts +++ b/packages/app/src/cli/services/app-logs/dev/poll-app-logs.ts @@ -15,8 +15,8 @@ import { } from '../utils.js' import {AppLogData, FunctionRunLog} from '../types.js' import {AppLogsError, AppLogsSuccess, DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js' -import {outputContent, outputDebug, outputToken, outputWarn} from '@shopify/cli-kit/node/output' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' +import {outputContent, outputDebug, outputToken, outputWarn} from '@shopify/cli-kit/shared/node/output' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' import camelcaseKeys from 'camelcase-keys' import {Writable} from 'stream' diff --git a/packages/app/src/cli/services/app-logs/dev/write-app-logs.test.ts b/packages/app/src/cli/services/app-logs/dev/write-app-logs.test.ts index 2788df54a50..0f194b316a9 100644 --- a/packages/app/src/cli/services/app-logs/dev/write-app-logs.test.ts +++ b/packages/app/src/cli/services/app-logs/dev/write-app-logs.test.ts @@ -1,12 +1,12 @@ import {writeAppLogsToFile} from './write-app-logs.js' import {AppLogData, AppLogPayload, FunctionRunLog} from '../types.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import {writeFile} from '@shopify/cli-kit/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {writeFile} from '@shopify/cli-kit/shared/node/fs' import {describe, expect, test, vi, beforeEach} from 'vitest' import camelcaseKeys from 'camelcase-keys' -import {formatLocalDate} from '@shopify/cli-kit/common/string' +import {formatLocalDate} from '@shopify/cli-kit/shared/common/string' -vi.mock('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/fs') const APP_LOG: AppLogData = { shop_id: 1, diff --git a/packages/app/src/cli/services/app-logs/dev/write-app-logs.ts b/packages/app/src/cli/services/app-logs/dev/write-app-logs.ts index c2ca780f34f..1d539b66fb4 100644 --- a/packages/app/src/cli/services/app-logs/dev/write-app-logs.ts +++ b/packages/app/src/cli/services/app-logs/dev/write-app-logs.ts @@ -1,8 +1,8 @@ import {AppLogData} from '../types.js' import {toFormattedAppLogJson} from '../utils.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import {mkdir, writeFile} from '@shopify/cli-kit/node/fs' -import {randomUUID} from '@shopify/cli-kit/node/crypto' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {mkdir, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' import {Writable} from 'stream' interface AppLogFile { diff --git a/packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.test.ts b/packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.test.ts index 278cda28fe2..7cb2681f5d7 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.test.ts +++ b/packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.test.ts @@ -2,10 +2,10 @@ import {pollAppLogs} from './poll-app-logs.js' import {testDeveloperPlatformClient} from '../../../models/app/app.test-data.js' import {describe, test, vi, expect} from 'vitest' -vi.mock('@shopify/cli-kit/node/output') -vi.mock('@shopify/cli-kit/node/context/fqdn') -vi.mock('@shopify/cli-kit/node/http') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/output') +vi.mock('@shopify/cli-kit/shared/node/context/fqdn') +vi.mock('@shopify/cli-kit/shared/node/http') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../utils.js') const MOCKED_JWT_TOKEN = 'mockedJwtToken' diff --git a/packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.ts b/packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.ts index be3c1c2313c..9553acb29db 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.ts +++ b/packages/app/src/cli/services/app-logs/logs-command/poll-app-logs.ts @@ -1,6 +1,6 @@ import {PollOptions, AppLogData, PollResponse, PollFilters} from '../types.js' import {AppLogsError, AppLogsSuccess, DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' interface PollAppLogsOptions { pollOptions: PollOptions diff --git a/packages/app/src/cli/services/app-logs/logs-command/render-json-logs.test.ts b/packages/app/src/cli/services/app-logs/logs-command/render-json-logs.test.ts index 09ce09e04b9..47c2ceaf0f1 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/render-json-logs.test.ts +++ b/packages/app/src/cli/services/app-logs/logs-command/render-json-logs.test.ts @@ -2,9 +2,9 @@ import {renderJsonLogs} from './render-json-logs.js' import {pollAppLogs} from './poll-app-logs.js' import {handleFetchAppLogsError} from '../utils.js' import {testDeveloperPlatformClient} from '../../../models/app/app.test-data.js' -import {outputInfo, outputResult} from '@shopify/cli-kit/node/output' +import {outputInfo, outputResult} from '@shopify/cli-kit/shared/node/output' import {describe, expect, vi, test, beforeEach, afterEach} from 'vitest' -import {formatLocalDate} from '@shopify/cli-kit/common/string' +import {formatLocalDate} from '@shopify/cli-kit/shared/common/string' vi.mock('./poll-app-logs') vi.mock('../utils', async (importOriginal) => { @@ -15,7 +15,7 @@ vi.mock('../utils', async (importOriginal) => { handleFetchAppLogsError: vi.fn(), } }) -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') describe('renderJsonLogs', () => { beforeEach(() => { diff --git a/packages/app/src/cli/services/app-logs/logs-command/render-json-logs.ts b/packages/app/src/cli/services/app-logs/logs-command/render-json-logs.ts index eb2e9cf5e2a..0b12e14eba6 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/render-json-logs.ts +++ b/packages/app/src/cli/services/app-logs/logs-command/render-json-logs.ts @@ -7,7 +7,7 @@ import { toFormattedAppLogJson, parseAppLogPayload, } from '../utils.js' -import {outputInfo, outputResult} from '@shopify/cli-kit/node/output' +import {outputInfo, outputResult} from '@shopify/cli-kit/shared/node/output' export async function renderJsonLogs({ pollOptions, diff --git a/packages/app/src/cli/services/app-logs/logs-command/ui.tsx b/packages/app/src/cli/services/app-logs/logs-command/ui.tsx index 2a543a72fb9..6629be21dea 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/ui.tsx +++ b/packages/app/src/cli/services/app-logs/logs-command/ui.tsx @@ -2,7 +2,7 @@ import {Logs} from './ui/components/Logs.js' import {PollOptions, SubscribeOptions} from '../types.js' import {subscribeToAppLogs} from '../utils.js' import React from 'react' -import {render} from '@shopify/cli-kit/node/ui' +import {render} from '@shopify/cli-kit/shared/node/ui' export async function renderLogs({ pollOptions, diff --git a/packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.test.tsx b/packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.test.tsx index bdaaa07de05..e6726a3e1db 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.test.tsx +++ b/packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.test.tsx @@ -11,9 +11,9 @@ import { } from '../../../types.js' import {testDeveloperPlatformClient} from '../../../../../models/app/app.test-data.js' import {describe, test, vi, expect} from 'vitest' -import {render} from '@shopify/cli-kit/node/testing/ui' +import {render} from '@shopify/cli-kit/shared/node/testing/ui' import React from 'react' -import {unstyled} from '@shopify/cli-kit/node/output' +import {unstyled} from '@shopify/cli-kit/shared/node/output' vi.mock('./hooks/usePollAppLogs.js') diff --git a/packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.tsx b/packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.tsx index cfd3be3ada5..2aff49edb9e 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.tsx +++ b/packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.tsx @@ -14,7 +14,7 @@ import {DeveloperPlatformClient} from '../../../../../utilities/developer-platfo import React, {FunctionComponent} from 'react' -import {Box, Text} from '@shopify/cli-kit/node/ink' +import {Box, Text} from '@shopify/cli-kit/shared/node/ink' interface LogsProps { resubscribeCallback: () => Promise diff --git a/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.test.tsx b/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.test.tsx index 1ae482ccde2..a5daf71baf5 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.test.tsx +++ b/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.test.tsx @@ -16,7 +16,7 @@ import { NetworkAccessResponseFromCacheLog, } from '../../../../types.js' import {testDeveloperPlatformClient} from '../../../../../../models/app/app.test-data.js' -import {render} from '@shopify/cli-kit/node/testing/ui' +import {render} from '@shopify/cli-kit/shared/node/testing/ui' import {test, describe, vi, beforeEach, afterEach, expect} from 'vitest' import React from 'react' diff --git a/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.ts b/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.ts index cc6f4704cd6..ae5a041990b 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.ts +++ b/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.ts @@ -16,7 +16,7 @@ import {DeveloperPlatformClient} from '../../../../../../utilities/developer-pla import {ErrorResponse, SuccessResponse, AppLogOutput, PollFilters, AppLogPayload} from '../../../../types.js' import {pollAppLogs} from '../../../poll-app-logs.js' import {useState, Dispatch, SetStateAction, useRef, useCallback} from 'react' -import {formatLocalDate} from '@shopify/cli-kit/common/string' +import {formatLocalDate} from '@shopify/cli-kit/shared/common/string' interface UsePollAppLogsOptions { initialJwt: string diff --git a/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/useSelfAdjustingInterval.test.tsx b/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/useSelfAdjustingInterval.test.tsx index 1beaa1d2b29..0b1a92568cc 100644 --- a/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/useSelfAdjustingInterval.test.tsx +++ b/packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/useSelfAdjustingInterval.test.tsx @@ -1,7 +1,7 @@ import {useSelfAdjustingInterval} from './useSelfAdjustingInterval.js' import {describe, test, expect, vi, beforeEach, afterEach} from 'vitest' import React from 'react' -import {render} from '@shopify/cli-kit/node/testing/ui' +import {render} from '@shopify/cli-kit/shared/node/testing/ui' function renderHook(renderHookCallback: () => THookResult) { const result: { diff --git a/packages/app/src/cli/services/app-logs/sources.test.ts b/packages/app/src/cli/services/app-logs/sources.test.ts index 58f534e2a76..e30860ad7fd 100644 --- a/packages/app/src/cli/services/app-logs/sources.test.ts +++ b/packages/app/src/cli/services/app-logs/sources.test.ts @@ -1,10 +1,10 @@ import {sourcesForApp} from './utils.js' import {sources} from './sources.js' import {testApp} from '../../models/app/app.test-data.js' -import {outputResult, formatSection} from '@shopify/cli-kit/node/output' +import {outputResult, formatSection} from '@shopify/cli-kit/shared/node/output' import {describe, test, vi, expect} from 'vitest' -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') vi.mock('./utils.js') describe('sources', () => { diff --git a/packages/app/src/cli/services/app-logs/sources.ts b/packages/app/src/cli/services/app-logs/sources.ts index 4c38d538d17..49875ac9641 100644 --- a/packages/app/src/cli/services/app-logs/sources.ts +++ b/packages/app/src/cli/services/app-logs/sources.ts @@ -1,6 +1,6 @@ import {AppInterface} from '../../models/app/app.js' import {sourcesForApp} from '../../services/app-logs/utils.js' -import {formatSection, outputResult} from '@shopify/cli-kit/node/output' +import {formatSection, outputResult} from '@shopify/cli-kit/shared/node/output' export function sources(app: AppInterface) { const sources = sourcesForApp(app) diff --git a/packages/app/src/cli/services/app-logs/utils.ts b/packages/app/src/cli/services/app-logs/utils.ts index e80a1f37475..5aa88eafb56 100644 --- a/packages/app/src/cli/services/app-logs/utils.ts +++ b/packages/app/src/cli/services/app-logs/utils.ts @@ -10,11 +10,11 @@ import { import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {AppInterface} from '../../models/app/app.js' import {AppLogsSubscribeMutationVariables} from '../../api/graphql/app-management/generated/app-logs-subscribe.js' -import {outputDebug, outputWarn} from '@shopify/cli-kit/node/output' -import {AbortError} from '@shopify/cli-kit/node/error' +import {outputDebug, outputWarn} from '@shopify/cli-kit/shared/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import camelcaseKeys from 'camelcase-keys' -import {formatLocalDate} from '@shopify/cli-kit/common/string' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' +import {formatLocalDate} from '@shopify/cli-kit/shared/common/string' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' import {Writable} from 'stream' export const POLLING_INTERVAL_MS = 450 diff --git a/packages/app/src/cli/services/app/add-uid-to-extension-toml.test.ts b/packages/app/src/cli/services/app/add-uid-to-extension-toml.test.ts index ded45e32c73..691bbebc298 100644 --- a/packages/app/src/cli/services/app/add-uid-to-extension-toml.test.ts +++ b/packages/app/src/cli/services/app/add-uid-to-extension-toml.test.ts @@ -2,8 +2,8 @@ import {addUidToTomlsIfNecessary} from './add-uid-to-extension-toml.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {testDeveloperPlatformClient, testUIExtension} from '../../models/app/app.test-data.js' import {describe, test, expect} from 'vitest' -import {writeFile, readFile, inTemporaryDirectory} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {writeFile, readFile, inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' describe('addUidToTomlsIfNecessary', () => { test('skips if platform does not support atomic deployments', async () => { diff --git a/packages/app/src/cli/services/app/add-uid-to-extension-toml.ts b/packages/app/src/cli/services/app/add-uid-to-extension-toml.ts index 102727a1a98..6c9bbd791ad 100644 --- a/packages/app/src/cli/services/app/add-uid-to-extension-toml.ts +++ b/packages/app/src/cli/services/app/add-uid-to-extension-toml.ts @@ -1,8 +1,8 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {decodeToml} from '@shopify/cli-kit/node/toml' -import {readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {getPathValue} from '@shopify/cli-kit/common/object' +import {decodeToml} from '@shopify/cli-kit/shared/node/toml' +import {readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {getPathValue} from '@shopify/cli-kit/shared/common/object' export async function addUidToTomlsIfNecessary( extensions: ExtensionInstance[], diff --git a/packages/app/src/cli/services/app/config/link-service.test.ts b/packages/app/src/cli/services/app/config/link-service.test.ts index 361061d4233..817a0f7a1f3 100644 --- a/packages/app/src/cli/services/app/config/link-service.test.ts +++ b/packages/app/src/cli/services/app/config/link-service.test.ts @@ -4,13 +4,13 @@ import {DeveloperPlatformClient, selectDeveloperPlatformClient} from '../../../u import {OrganizationApp, OrganizationSource} from '../../../models/organization.js' import {appNamePrompt, createAsNewAppPrompt, selectOrganizationPrompt} from '../../../prompts/dev.js' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {inTemporaryDirectory, readFile, writeFileSync} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, readFile, writeFileSync} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' vi.mock('./use.js') vi.mock('../../../prompts/dev.js') vi.mock('../../local-storage') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../../dev/fetch.js') vi.mock('../../../utilities/developer-platform-client.js') vi.mock('../../../models/app/validation/multi-cli-warning.js') diff --git a/packages/app/src/cli/services/app/config/link.test.ts b/packages/app/src/cli/services/app/config/link.test.ts index e0d9ccaa684..baf2a57a587 100644 --- a/packages/app/src/cli/services/app/config/link.test.ts +++ b/packages/app/src/cli/services/app/config/link.test.ts @@ -15,11 +15,11 @@ import {fetchAppRemoteConfiguration} from '../select-app.js' import {DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js' import {MinimalAppIdentifiers, OrganizationApp} from '../../../models/organization.js' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {fileExistsSync, inTemporaryDirectory, readFile, writeFileSync} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {outputContent} from '@shopify/cli-kit/node/output' -import {setPathValue} from '@shopify/cli-kit/common/object' +import {fileExistsSync, inTemporaryDirectory, readFile, writeFileSync} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {outputContent} from '@shopify/cli-kit/shared/node/output' +import {setPathValue} from '@shopify/cli-kit/shared/common/object' vi.mock('./use.js') vi.mock('../../../prompts/config.js') @@ -33,7 +33,7 @@ vi.mock('../../../models/app/loader.js', async () => { } }) vi.mock('../../local-storage') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../../context/partner-account-info.js') vi.mock('../../context.js') vi.mock('../select-app.js') diff --git a/packages/app/src/cli/services/app/config/link.ts b/packages/app/src/cli/services/app/config/link.ts index 12997e2d39e..95c4d4502c1 100644 --- a/packages/app/src/cli/services/app/config/link.ts +++ b/packages/app/src/cli/services/app/config/link.ts @@ -32,12 +32,12 @@ import {fetchSpecifications} from '../../generate/fetch-extension-specifications import {AppConfigurationUsedByCli} from '../../../models/extensions/specifications/types/app_config.js' import {getTomls} from '../../../utilities/app/config/getTomls.js' import {loadLocalExtensionsSpecifications} from '../../../models/extensions/load-specifications.js' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {formatPackageManagerCommand} from '@shopify/cli-kit/node/output' -import {deepMergeObjects, isEmpty} from '@shopify/cli-kit/common/object' -import {joinPath} from '@shopify/cli-kit/node/path' -import {AbortError} from '@shopify/cli-kit/node/error' -import {PackageManager} from '@shopify/cli-kit/node/node-package-manager' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {formatPackageManagerCommand} from '@shopify/cli-kit/shared/node/output' +import {deepMergeObjects, isEmpty} from '@shopify/cli-kit/shared/common/object' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {PackageManager} from '@shopify/cli-kit/shared/node/node-package-manager' export interface LinkOptions { directory: string diff --git a/packages/app/src/cli/services/app/config/pull.ts b/packages/app/src/cli/services/app/config/pull.ts index e7ceefdbb03..0e8f35d6506 100644 --- a/packages/app/src/cli/services/app/config/pull.ts +++ b/packages/app/src/cli/services/app/config/pull.ts @@ -7,8 +7,8 @@ import {AppConfigurationFileName} from '../../../models/app/loader.js' import {fetchSpecifications} from '../../generate/fetch-extension-specifications.js' import {RemoteAwareExtensionSpecification} from '../../../models/extensions/specification.js' import {Flag} from '../../../utilities/developer-platform-client.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {basename} from '@shopify/cli-kit/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {basename} from '@shopify/cli-kit/shared/node/path' interface PullOptions { directory: string diff --git a/packages/app/src/cli/services/app/config/use.test.ts b/packages/app/src/cli/services/app/config/use.test.ts index 6f8418c59b0..1f67ef8544a 100644 --- a/packages/app/src/cli/services/app/config/use.test.ts +++ b/packages/app/src/cli/services/app/config/use.test.ts @@ -9,15 +9,15 @@ import {getAppConfigurationFileName, loadAppConfiguration} from '../../../models import {clearCurrentConfigFile, setCachedAppInfo} from '../../local-storage.js' import {selectConfigFile} from '../../../prompts/config.js' import {describe, expect, test, vi} from 'vitest' -import {inTemporaryDirectory, writeFileSync} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui' -import {err, ok} from '@shopify/cli-kit/node/result' +import {inTemporaryDirectory, writeFileSync} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {renderSuccess, renderWarning} from '@shopify/cli-kit/shared/node/ui' +import {err, ok} from '@shopify/cli-kit/shared/node/result' vi.mock('../../../prompts/config.js') vi.mock('../../local-storage.js') vi.mock('../../../models/app/loader.js') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../../context.js') describe('use', () => { diff --git a/packages/app/src/cli/services/app/config/use.ts b/packages/app/src/cli/services/app/config/use.ts index d99123cf58b..ec9870cabb4 100644 --- a/packages/app/src/cli/services/app/config/use.ts +++ b/packages/app/src/cli/services/app/config/use.ts @@ -3,13 +3,13 @@ import {clearCurrentConfigFile, setCachedAppInfo} from '../../local-storage.js' import {selectConfigFile} from '../../../prompts/config.js' import {AppConfiguration, CurrentAppConfiguration, isCurrentAppSchema} from '../../../models/app/app.js' import {DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {fileExists} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {RenderAlertOptions, renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui' -import {Result, err, ok} from '@shopify/cli-kit/node/result' -import {getPackageManager} from '@shopify/cli-kit/node/node-package-manager' -import {formatPackageManagerCommand} from '@shopify/cli-kit/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {fileExists} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {RenderAlertOptions, renderSuccess, renderWarning} from '@shopify/cli-kit/shared/node/ui' +import {Result, err, ok} from '@shopify/cli-kit/shared/node/result' +import {getPackageManager} from '@shopify/cli-kit/shared/node/node-package-manager' +import {formatPackageManagerCommand} from '@shopify/cli-kit/shared/node/output' export interface UseOptions { directory: string diff --git a/packages/app/src/cli/services/app/env/pull.test.ts b/packages/app/src/cli/services/app/env/pull.test.ts index c16c008aa63..51d94d8cff1 100644 --- a/packages/app/src/cli/services/app/env/pull.test.ts +++ b/packages/app/src/cli/services/app/env/pull.test.ts @@ -3,9 +3,9 @@ import {AppInterface, AppLinkedInterface} from '../../../models/app/app.js' import {testApp, testOrganizationApp} from '../../../models/app/app.test-data.js' import {Organization, OrganizationApp, OrganizationSource} from '../../../models/organization.js' import {describe, expect, vi, beforeEach, test} from 'vitest' -import * as file from '@shopify/cli-kit/node/fs' -import {resolvePath, joinPath} from '@shopify/cli-kit/node/path' -import {unstyled, stringifyMessage} from '@shopify/cli-kit/node/output' +import * as file from '@shopify/cli-kit/shared/node/fs' +import {resolvePath, joinPath} from '@shopify/cli-kit/shared/node/path' +import {unstyled, stringifyMessage} from '@shopify/cli-kit/shared/node/output' const ORG1: Organization = { id: '1', diff --git a/packages/app/src/cli/services/app/env/pull.ts b/packages/app/src/cli/services/app/env/pull.ts index 422749dd02e..8268c82fcd1 100644 --- a/packages/app/src/cli/services/app/env/pull.ts +++ b/packages/app/src/cli/services/app/env/pull.ts @@ -3,10 +3,10 @@ import {AppLinkedInterface, getAppScopes} from '../../../models/app/app.js' import {logMetadataForLoadedContext} from '../../context.js' import {Organization, OrganizationApp} from '../../../models/organization.js' -import {patchEnvFile} from '@shopify/cli-kit/node/dot-env' +import {patchEnvFile} from '@shopify/cli-kit/shared/node/dot-env' import {diffLines} from 'diff' -import {fileExists, readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {OutputMessage, outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {fileExists, readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {OutputMessage, outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' interface PullEnvOptions { app: AppLinkedInterface diff --git a/packages/app/src/cli/services/app/env/show.test.ts b/packages/app/src/cli/services/app/env/show.test.ts index e434cda300d..ed638d9a23c 100644 --- a/packages/app/src/cli/services/app/env/show.test.ts +++ b/packages/app/src/cli/services/app/env/show.test.ts @@ -5,13 +5,13 @@ import {selectOrganizationPrompt} from '../../../prompts/dev.js' import {testApp, testOrganizationApp} from '../../../models/app/app.test-data.js' import {OrganizationSource} from '../../../models/organization.js' import {describe, expect, vi, test} from 'vitest' -import * as file from '@shopify/cli-kit/node/fs' -import {stringifyMessage, unstyled} from '@shopify/cli-kit/node/output' -import {joinPath} from '@shopify/cli-kit/node/path' +import * as file from '@shopify/cli-kit/shared/node/fs' +import {stringifyMessage, unstyled} from '@shopify/cli-kit/shared/node/output' +import {joinPath} from '@shopify/cli-kit/shared/node/path' vi.mock('../../dev/fetch.js') vi.mock('../../../prompts/dev.js') -vi.mock('@shopify/cli-kit/node/node-package-manager') +vi.mock('@shopify/cli-kit/shared/node/node-package-manager') describe('env show', () => { test('outputs the new environment', async () => { diff --git a/packages/app/src/cli/services/app/env/show.ts b/packages/app/src/cli/services/app/env/show.ts index a2dbab01a07..9ccc46af032 100644 --- a/packages/app/src/cli/services/app/env/show.ts +++ b/packages/app/src/cli/services/app/env/show.ts @@ -1,7 +1,7 @@ import {AppInterface, getAppScopes} from '../../../models/app/app.js' import {Organization, OrganizationApp} from '../../../models/organization.js' import {logMetadataForLoadedContext} from '../../context.js' -import {OutputMessage, outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {OutputMessage, outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' type Format = 'json' | 'text' diff --git a/packages/app/src/cli/services/app/patch-app-configuration-file.test.ts b/packages/app/src/cli/services/app/patch-app-configuration-file.test.ts index c2f9af0a6e7..204708cbbe8 100644 --- a/packages/app/src/cli/services/app/patch-app-configuration-file.test.ts +++ b/packages/app/src/cli/services/app/patch-app-configuration-file.test.ts @@ -4,8 +4,8 @@ import { unsetAppConfigValue, setManyAppConfigValues, } from './patch-app-configuration-file.js' -import {readFile, writeFileSync, inTemporaryDirectory} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {readFile, writeFileSync, inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import {describe, expect, test} from 'vitest' const defaultToml = `# Learn more about configuring your app at https://shopify.dev/docs/apps/tools/cli/configuration diff --git a/packages/app/src/cli/services/app/patch-app-configuration-file.ts b/packages/app/src/cli/services/app/patch-app-configuration-file.ts index e62ddecb3d0..47e77792cbc 100644 --- a/packages/app/src/cli/services/app/patch-app-configuration-file.ts +++ b/packages/app/src/cli/services/app/patch-app-configuration-file.ts @@ -1,7 +1,7 @@ import {AppHiddenConfig} from '../../models/app/app.js' -import {deepMergeObjects} from '@shopify/cli-kit/common/object' -import {readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {zod} from '@shopify/cli-kit/node/schema' +import {deepMergeObjects} from '@shopify/cli-kit/shared/common/object' +import {readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {zod} from '@shopify/cli-kit/shared/node/schema' import {updateTomlValues} from '@shopify/toml-patch' export interface PatchTomlOptions { diff --git a/packages/app/src/cli/services/app/select-app.ts b/packages/app/src/cli/services/app/select-app.ts index 9340599ec4a..45c15decd90 100644 --- a/packages/app/src/cli/services/app/select-app.ts +++ b/packages/app/src/cli/services/app/select-app.ts @@ -2,7 +2,7 @@ import {MinimalOrganizationApp} from '../../models/organization.js' import {Flag, AppModuleVersion, DeveloperPlatformClient, AppVersion} from '../../utilities/developer-platform-client.js' import {ExtensionSpecification} from '../../models/extensions/specification.js' import {AppConfigurationUsedByCli} from '../../models/extensions/specifications/types/app_config.js' -import {deepMergeObjects} from '@shopify/cli-kit/common/object' +import {deepMergeObjects} from '@shopify/cli-kit/shared/common/object' export function extensionTypeStrategy(specs: ExtensionSpecification[], type?: string) { if (!type) return diff --git a/packages/app/src/cli/services/app/write-app-configuration-file.test.ts b/packages/app/src/cli/services/app/write-app-configuration-file.test.ts index 2506dc3cbd8..adaccc14fd3 100644 --- a/packages/app/src/cli/services/app/write-app-configuration-file.test.ts +++ b/packages/app/src/cli/services/app/write-app-configuration-file.test.ts @@ -1,8 +1,8 @@ import {writeAppConfigurationFile} from './write-app-configuration-file.js' import {DEFAULT_CONFIG, buildVersionedAppSchema} from '../../models/app/app.test-data.js' import {CurrentAppConfiguration} from '../../models/app/app.js' -import {inTemporaryDirectory, readFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, readFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import {describe, expect, test} from 'vitest' const FULL_CONFIGURATION = { diff --git a/packages/app/src/cli/services/app/write-app-configuration-file.ts b/packages/app/src/cli/services/app/write-app-configuration-file.ts index d4b0f3b3d41..1f7ba5ab443 100644 --- a/packages/app/src/cli/services/app/write-app-configuration-file.ts +++ b/packages/app/src/cli/services/app/write-app-configuration-file.ts @@ -1,10 +1,10 @@ import {CurrentAppConfiguration} from '../../models/app/app.js' import {reduceWebhooks} from '../../models/extensions/specifications/transform/app_config_webhook.js' import {removeTrailingSlash} from '../../models/extensions/specifications/validation/common.js' -import {writeFileSync} from '@shopify/cli-kit/node/fs' -import {JsonMapType, encodeToml} from '@shopify/cli-kit/node/toml' -import {zod} from '@shopify/cli-kit/node/schema' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {writeFileSync} from '@shopify/cli-kit/shared/node/fs' +import {JsonMapType, encodeToml} from '@shopify/cli-kit/shared/node/toml' +import {zod} from '@shopify/cli-kit/shared/node/schema' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' // toml does not support comments and there aren't currently any good/maintained libs for this, // so for now, we manually add comments diff --git a/packages/app/src/cli/services/build.ts b/packages/app/src/cli/services/build.ts index 2e172c78fac..ce06481b277 100644 --- a/packages/app/src/cli/services/build.ts +++ b/packages/app/src/cli/services/build.ts @@ -2,8 +2,8 @@ import buildWeb from './web.js' import {installAppDependencies} from './dependencies.js' import {installJavy} from './function/build.js' import {AppInterface, Web} from '../models/app/app.js' -import {renderConcurrent, renderSuccess} from '@shopify/cli-kit/node/ui' -import {AbortSignal} from '@shopify/cli-kit/node/abort' +import {renderConcurrent, renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' import {Writable} from 'stream' interface BuildOptions { diff --git a/packages/app/src/cli/services/build/extension.test.ts b/packages/app/src/cli/services/build/extension.test.ts index 4889dbd803c..1ef132af4ee 100644 --- a/packages/app/src/cli/services/build/extension.test.ts +++ b/packages/app/src/cli/services/build/extension.test.ts @@ -4,15 +4,15 @@ import {buildJSFunction, runWasmOpt, runTrampoline} from '../function/build.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {FunctionConfigType} from '../../models/extensions/specifications/function.js' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {exec} from '@shopify/cli-kit/node/system' +import {exec} from '@shopify/cli-kit/shared/node/system' import lockfile from 'proper-lockfile' -import {AbortError} from '@shopify/cli-kit/node/error' -import {fileExistsSync} from '@shopify/cli-kit/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {fileExistsSync} from '@shopify/cli-kit/shared/node/fs' -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system') vi.mock('../function/build.js') vi.mock('proper-lockfile') -vi.mock('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/fs') describe('buildFunctionExtension', () => { let extension: ExtensionInstance diff --git a/packages/app/src/cli/services/build/extension.ts b/packages/app/src/cli/services/build/extension.ts index 0e992326a25..d8dd282decf 100644 --- a/packages/app/src/cli/services/build/extension.ts +++ b/packages/app/src/cli/services/build/extension.ts @@ -4,13 +4,13 @@ import {bundleExtension} from '../extensions/bundle.js' import {buildJSFunction, runTrampoline, runWasmOpt} from '../function/build.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {FunctionConfigType} from '../../models/extensions/specifications/function.js' -import {exec} from '@shopify/cli-kit/node/system' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {AbortError, AbortSilentError} from '@shopify/cli-kit/node/error' +import {exec} from '@shopify/cli-kit/shared/node/system' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {AbortError, AbortSilentError} from '@shopify/cli-kit/shared/node/error' import lockfile from 'proper-lockfile' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {readFile, touchFile, writeFile, fileExistsSync} from '@shopify/cli-kit/node/fs' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {readFile, touchFile, writeFile, fileExistsSync} from '@shopify/cli-kit/shared/node/fs' import {Writable} from 'stream' export interface ExtensionBuildOptions { diff --git a/packages/app/src/cli/services/build/theme-check.ts b/packages/app/src/cli/services/build/theme-check.ts index 53a00faebd0..96e5f43120f 100644 --- a/packages/app/src/cli/services/build/theme-check.ts +++ b/packages/app/src/cli/services/build/theme-check.ts @@ -1,6 +1,6 @@ -import {readFileSync} from '@shopify/cli-kit/node/fs' -import {itemToString} from '@shopify/cli-kit/node/output' -import {TokenItem} from '@shopify/cli-kit/node/ui' +import {readFileSync} from '@shopify/cli-kit/shared/node/fs' +import {itemToString} from '@shopify/cli-kit/shared/node/output' +import {TokenItem} from '@shopify/cli-kit/shared/node/ui' import {Severity, type Offense, check, path as pathUtils} from '@shopify/theme-check-node' /** diff --git a/packages/app/src/cli/services/bulk-operations/bulk-operation-status.test.ts b/packages/app/src/cli/services/bulk-operations/bulk-operation-status.test.ts index fff16e7493d..59c364742ca 100644 --- a/packages/app/src/cli/services/bulk-operations/bulk-operation-status.test.ts +++ b/packages/app/src/cli/services/bulk-operations/bulk-operation-status.test.ts @@ -10,12 +10,12 @@ import {OrganizationApp, Organization, OrganizationSource} from '../../models/or import {ListBulkOperationsQuery} from '../../api/graphql/bulk-operations/generated/list-bulk-operations.js' import {resolveApiVersion} from '../graphql/common.js' import {afterEach, beforeEach, describe, expect, test, vi} from 'vitest' -import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/node/session' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/identity/session' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/api/admin') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/admin/api') vi.mock('../graphql/common.js', async () => { const actual = await vi.importActual('../graphql/common.js') return { diff --git a/packages/app/src/cli/services/bulk-operations/bulk-operation-status.ts b/packages/app/src/cli/services/bulk-operations/bulk-operation-status.ts index 6162909f37f..34e06df948f 100644 --- a/packages/app/src/cli/services/bulk-operations/bulk-operation-status.ts +++ b/packages/app/src/cli/services/bulk-operations/bulk-operation-status.ts @@ -12,13 +12,13 @@ import { ListBulkOperationsQuery, ListBulkOperationsQueryVariables, } from '../../api/graphql/bulk-operations/generated/list-bulk-operations.js' -import {renderInfo, renderSuccess, renderError, renderTable} from '@shopify/cli-kit/node/ui' -import {outputContent, outputToken, outputNewline} from '@shopify/cli-kit/node/output' -import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/node/session' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {timeAgo, formatDate} from '@shopify/cli-kit/common/string' -import {BugError} from '@shopify/cli-kit/node/error' -import colors from '@shopify/cli-kit/node/colors' +import {renderInfo, renderSuccess, renderError, renderTable} from '@shopify/cli-kit/shared/node/ui' +import {outputContent, outputToken, outputNewline} from '@shopify/cli-kit/shared/node/output' +import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/identity/session' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {timeAgo, formatDate} from '@shopify/cli-kit/shared/common/string' +import {BugError} from '@shopify/cli-kit/shared/node/error' +import colors from '@shopify/cli-kit/shared/node/colors' export function normalizeBulkOperationId(id: string): string { // If already a GID, return as-is diff --git a/packages/app/src/cli/services/bulk-operations/cancel-bulk-operation.test.ts b/packages/app/src/cli/services/bulk-operations/cancel-bulk-operation.test.ts index efee9318fe7..734cc38f239 100644 --- a/packages/app/src/cli/services/bulk-operations/cancel-bulk-operation.test.ts +++ b/packages/app/src/cli/services/bulk-operations/cancel-bulk-operation.test.ts @@ -2,13 +2,13 @@ import {cancelBulkOperation} from './cancel-bulk-operation.js' import {createAdminSessionAsApp, formatOperationInfo} from '../graphql/common.js' import {OrganizationApp, Organization, OrganizationSource} from '../../models/organization.js' import {describe, test, expect, vi, beforeEach, afterEach} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {renderInfo, renderError, renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {renderInfo, renderError, renderSuccess, renderWarning} from '@shopify/cli-kit/shared/node/ui' vi.mock('../graphql/common.js') -vi.mock('@shopify/cli-kit/node/api/admin') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/admin/api') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('cancelBulkOperation', () => { const mockOrganization: Organization = { diff --git a/packages/app/src/cli/services/bulk-operations/cancel-bulk-operation.ts b/packages/app/src/cli/services/bulk-operations/cancel-bulk-operation.ts index 6badc0d5f26..55b8600a6d5 100644 --- a/packages/app/src/cli/services/bulk-operations/cancel-bulk-operation.ts +++ b/packages/app/src/cli/services/bulk-operations/cancel-bulk-operation.ts @@ -6,9 +6,9 @@ import { } from '../../api/graphql/bulk-operations/generated/bulk-operation-cancel.js' import {formatOperationInfo, createAdminSessionAsApp} from '../graphql/common.js' import {OrganizationApp, Organization} from '../../models/organization.js' -import {renderInfo, renderError, renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' +import {renderInfo, renderError, renderSuccess, renderWarning} from '@shopify/cli-kit/shared/node/ui' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' const API_VERSION = '2026-01' diff --git a/packages/app/src/cli/services/bulk-operations/download-bulk-operation-results.test.ts b/packages/app/src/cli/services/bulk-operations/download-bulk-operation-results.test.ts index 802a7aef6bd..c97340a9e3d 100644 --- a/packages/app/src/cli/services/bulk-operations/download-bulk-operation-results.test.ts +++ b/packages/app/src/cli/services/bulk-operations/download-bulk-operation-results.test.ts @@ -1,8 +1,8 @@ import {downloadBulkOperationResults} from './download-bulk-operation-results.js' -import {fetch} from '@shopify/cli-kit/node/http' +import {fetch} from '@shopify/cli-kit/shared/node/http' import {describe, test, expect, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/http') +vi.mock('@shopify/cli-kit/shared/node/http') describe('downloadBulkOperationResults', () => { test('returns text content when fetch is successful', async () => { diff --git a/packages/app/src/cli/services/bulk-operations/download-bulk-operation-results.ts b/packages/app/src/cli/services/bulk-operations/download-bulk-operation-results.ts index 0c779cc3425..f2b1950c04f 100644 --- a/packages/app/src/cli/services/bulk-operations/download-bulk-operation-results.ts +++ b/packages/app/src/cli/services/bulk-operations/download-bulk-operation-results.ts @@ -1,5 +1,5 @@ -import {fetch} from '@shopify/cli-kit/node/http' -import {AbortError} from '@shopify/cli-kit/node/error' +import {fetch} from '@shopify/cli-kit/shared/node/http' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export async function downloadBulkOperationResults(url: string): Promise { const response = await fetch(url) diff --git a/packages/app/src/cli/services/bulk-operations/execute-bulk-operation.test.ts b/packages/app/src/cli/services/bulk-operations/execute-bulk-operation.test.ts index 815d934fd34..7f3047e3b87 100644 --- a/packages/app/src/cli/services/bulk-operations/execute-bulk-operation.test.ts +++ b/packages/app/src/cli/services/bulk-operations/execute-bulk-operation.test.ts @@ -8,11 +8,11 @@ import {resolveApiVersion, createAdminSessionAsApp} from '../graphql/common.js' import {BulkOperationRunQueryMutation} from '../../api/graphql/bulk-operations/generated/bulk-operation-run-query.js' import {BulkOperationRunMutationMutation} from '../../api/graphql/bulk-operations/generated/bulk-operation-run-mutation.js' import {OrganizationApp, OrganizationSource, OrganizationStore} from '../../models/organization.js' -import {renderSuccess, renderWarning, renderError, renderInfo} from '@shopify/cli-kit/node/ui' -import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/node/session' -import {inTemporaryDirectory, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {renderSuccess, renderWarning, renderError, renderInfo} from '@shopify/cli-kit/shared/node/ui' +import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/identity/session' +import {inTemporaryDirectory, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' import {describe, test, expect, vi, beforeEach, afterEach} from 'vitest' vi.mock('./run-query.js') @@ -28,8 +28,8 @@ vi.mock('../graphql/common.js', async () => { validateMutationStore: vi.fn(), } }) -vi.mock('@shopify/cli-kit/node/ui', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui', async () => { + const actual = await vi.importActual('@shopify/cli-kit/shared/node/ui') return { ...actual, renderSingleTask: vi.fn(async ({task}) => task()), @@ -39,9 +39,9 @@ vi.mock('@shopify/cli-kit/node/ui', async () => { renderInfo: vi.fn(), } }) -vi.mock('@shopify/cli-kit/node/fs') -vi.mock('@shopify/cli-kit/node/session', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/shared/node/fs') +vi.mock('@shopify/cli-kit/identity/session', async () => { + const actual = await vi.importActual('@shopify/cli-kit/identity/session') return { ...actual, ensureAuthenticatedAdminAsApp: vi.fn(), diff --git a/packages/app/src/cli/services/bulk-operations/execute-bulk-operation.ts b/packages/app/src/cli/services/bulk-operations/execute-bulk-operation.ts index bc7d9747e80..59f73f167bc 100644 --- a/packages/app/src/cli/services/bulk-operations/execute-bulk-operation.ts +++ b/packages/app/src/cli/services/bulk-operations/execute-bulk-operation.ts @@ -20,11 +20,11 @@ import { renderWarning, renderSingleTask, TokenItem, -} from '@shopify/cli-kit/node/ui' -import {outputContent, outputToken, outputResult} from '@shopify/cli-kit/node/output' -import {AbortError, BugError} from '@shopify/cli-kit/node/error' -import {AbortController} from '@shopify/cli-kit/node/abort' -import {readFile, writeFile, fileExists} from '@shopify/cli-kit/node/fs' +} from '@shopify/cli-kit/shared/node/ui' +import {outputContent, outputToken, outputResult} from '@shopify/cli-kit/shared/node/output' +import {AbortError, BugError} from '@shopify/cli-kit/shared/node/error' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' +import {readFile, writeFile, fileExists} from '@shopify/cli-kit/shared/node/fs' interface ExecuteBulkOperationInput { organization: Organization diff --git a/packages/app/src/cli/services/bulk-operations/format-bulk-operation-status.test.ts b/packages/app/src/cli/services/bulk-operations/format-bulk-operation-status.test.ts index 7c1a8a87369..51eb89ce82f 100644 --- a/packages/app/src/cli/services/bulk-operations/format-bulk-operation-status.test.ts +++ b/packages/app/src/cli/services/bulk-operations/format-bulk-operation-status.test.ts @@ -5,7 +5,7 @@ import { } from './format-bulk-operation-status.js' import {GetBulkOperationByIdQuery} from '../../api/graphql/bulk-operations/generated/get-bulk-operation-by-id.js' import {describe, test, expect, afterEach} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' type BulkOperation = NonNullable diff --git a/packages/app/src/cli/services/bulk-operations/format-bulk-operation-status.ts b/packages/app/src/cli/services/bulk-operations/format-bulk-operation-status.ts index 906ab76405f..7b8f89a9e15 100644 --- a/packages/app/src/cli/services/bulk-operations/format-bulk-operation-status.ts +++ b/packages/app/src/cli/services/bulk-operations/format-bulk-operation-status.ts @@ -1,7 +1,7 @@ import {extractBulkOperationId} from './bulk-operation-status.js' import {GetBulkOperationByIdQuery} from '../../api/graphql/bulk-operations/generated/get-bulk-operation-by-id.js' -import {outputContent, outputToken, TokenizedString} from '@shopify/cli-kit/node/output' -import {renderError, TokenItem} from '@shopify/cli-kit/node/ui' +import {outputContent, outputToken, TokenizedString} from '@shopify/cli-kit/shared/node/output' +import {renderError, TokenItem} from '@shopify/cli-kit/shared/node/ui' export function formatBulkOperationStatus( operation: NonNullable, diff --git a/packages/app/src/cli/services/bulk-operations/run-mutation.test.ts b/packages/app/src/cli/services/bulk-operations/run-mutation.test.ts index 20f320d286c..2d279510e9d 100644 --- a/packages/app/src/cli/services/bulk-operations/run-mutation.test.ts +++ b/packages/app/src/cli/services/bulk-operations/run-mutation.test.ts @@ -1,9 +1,9 @@ import {runBulkOperationMutation} from './run-mutation.js' import {stageFile} from './stage-file.js' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' import {describe, test, expect, vi, beforeEach} from 'vitest' -vi.mock('@shopify/cli-kit/node/api/admin') +vi.mock('@shopify/cli-kit/admin/api') vi.mock('./stage-file.js') describe('runBulkOperationMutation', () => { diff --git a/packages/app/src/cli/services/bulk-operations/run-mutation.ts b/packages/app/src/cli/services/bulk-operations/run-mutation.ts index d02cd2302f9..9ca6a9ee9c9 100644 --- a/packages/app/src/cli/services/bulk-operations/run-mutation.ts +++ b/packages/app/src/cli/services/bulk-operations/run-mutation.ts @@ -4,8 +4,8 @@ import { BulkOperationRunMutationMutation, BulkOperationRunMutationMutationVariables, } from '../../api/graphql/bulk-operations/generated/bulk-operation-run-mutation.js' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {AdminSession} from '@shopify/cli-kit/identity/session' interface BulkOperationRunMutationOptions { adminSession: AdminSession diff --git a/packages/app/src/cli/services/bulk-operations/run-query.test.ts b/packages/app/src/cli/services/bulk-operations/run-query.test.ts index cf40a9e40a5..de54fa51748 100644 --- a/packages/app/src/cli/services/bulk-operations/run-query.test.ts +++ b/packages/app/src/cli/services/bulk-operations/run-query.test.ts @@ -1,8 +1,8 @@ import {runBulkOperationQuery} from './run-query.js' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' import {describe, test, expect, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/api/admin') +vi.mock('@shopify/cli-kit/admin/api') describe('runBulkOperationQuery', () => { const mockSession = {token: 'test-token', storeFqdn: 'test-store.myshopify.com'} diff --git a/packages/app/src/cli/services/bulk-operations/run-query.ts b/packages/app/src/cli/services/bulk-operations/run-query.ts index 404361e11db..7d8ebc83d3c 100644 --- a/packages/app/src/cli/services/bulk-operations/run-query.ts +++ b/packages/app/src/cli/services/bulk-operations/run-query.ts @@ -2,8 +2,8 @@ import { BulkOperationRunQuery, BulkOperationRunQueryMutation, } from '../../api/graphql/bulk-operations/generated/bulk-operation-run-query.js' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {AdminSession} from '@shopify/cli-kit/identity/session' interface BulkOperationRunQueryOptions { adminSession: AdminSession diff --git a/packages/app/src/cli/services/bulk-operations/stage-file.test.ts b/packages/app/src/cli/services/bulk-operations/stage-file.test.ts index b342a7bf52a..55d24dde450 100644 --- a/packages/app/src/cli/services/bulk-operations/stage-file.test.ts +++ b/packages/app/src/cli/services/bulk-operations/stage-file.test.ts @@ -1,13 +1,13 @@ import {stageFile} from './stage-file.js' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {readFile, fileSize} from '@shopify/cli-kit/node/fs' -import {fetch} from '@shopify/cli-kit/node/http' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {readFile, fileSize} from '@shopify/cli-kit/shared/node/fs' +import {fetch} from '@shopify/cli-kit/shared/node/http' import {describe, test, expect, vi, beforeEach} from 'vitest' -vi.mock('@shopify/cli-kit/node/api/admin') -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/fs') -vi.mock('@shopify/cli-kit/node/http') +vi.mock('@shopify/cli-kit/admin/api') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/shared/node/fs') +vi.mock('@shopify/cli-kit/shared/node/http') describe('stageFile', () => { const mockSession = {token: 'test-token', storeFqdn: 'test-store.myshopify.com'} diff --git a/packages/app/src/cli/services/bulk-operations/stage-file.ts b/packages/app/src/cli/services/bulk-operations/stage-file.ts index ab90ef4fe95..9cb7e57543a 100644 --- a/packages/app/src/cli/services/bulk-operations/stage-file.ts +++ b/packages/app/src/cli/services/bulk-operations/stage-file.ts @@ -3,12 +3,12 @@ import { StagedUploadsCreateMutation, StagedUploadsCreateMutationVariables, } from '../../api/graphql/bulk-operations/generated/staged-uploads-create.js' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {fetch} from '@shopify/cli-kit/node/http' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent} from '@shopify/cli-kit/node/output' -import {renderSingleTask} from '@shopify/cli-kit/node/ui' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {fetch} from '@shopify/cli-kit/shared/node/http' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent} from '@shopify/cli-kit/shared/node/output' +import {renderSingleTask} from '@shopify/cli-kit/shared/node/ui' interface StageFileOptions { adminSession: AdminSession diff --git a/packages/app/src/cli/services/bulk-operations/watch-bulk-operation.test.ts b/packages/app/src/cli/services/bulk-operations/watch-bulk-operation.test.ts index 5dfb9a98c8f..2f95875e459 100644 --- a/packages/app/src/cli/services/bulk-operations/watch-bulk-operation.test.ts +++ b/packages/app/src/cli/services/bulk-operations/watch-bulk-operation.test.ts @@ -5,17 +5,17 @@ import { QUICK_WATCH_TIMEOUT_MS, } from './watch-bulk-operation.js' import {formatBulkOperationStatus} from './format-bulk-operation-status.js' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {sleep} from '@shopify/cli-kit/node/system' -import {renderSingleTask} from '@shopify/cli-kit/node/ui' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {sleep} from '@shopify/cli-kit/shared/node/system' +import {renderSingleTask} from '@shopify/cli-kit/shared/node/ui' import {describe, test, expect, vi, beforeEach} from 'vitest' -import {outputContent} from '@shopify/cli-kit/node/output' -import {AbortController} from '@shopify/cli-kit/node/abort' +import {outputContent} from '@shopify/cli-kit/shared/node/output' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' vi.mock('./format-bulk-operation-status.js') -vi.mock('@shopify/cli-kit/node/api/admin') -vi.mock('@shopify/cli-kit/node/system') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/admin/api') +vi.mock('@shopify/cli-kit/shared/node/system') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('watchBulkOperation', () => { const mockAdminSession = {token: 'test-token', storeFqdn: 'test.myshopify.com'} diff --git a/packages/app/src/cli/services/bulk-operations/watch-bulk-operation.ts b/packages/app/src/cli/services/bulk-operations/watch-bulk-operation.ts index 7bf52053a8d..c3f2c6f6221 100644 --- a/packages/app/src/cli/services/bulk-operations/watch-bulk-operation.ts +++ b/packages/app/src/cli/services/bulk-operations/watch-bulk-operation.ts @@ -4,12 +4,12 @@ import { GetBulkOperationById, GetBulkOperationByIdQuery, } from '../../api/graphql/bulk-operations/generated/get-bulk-operation-by-id.js' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' -import {sleep} from '@shopify/cli-kit/node/system' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {outputContent} from '@shopify/cli-kit/node/output' -import {renderSingleTask} from '@shopify/cli-kit/node/ui' -import {AbortSignal} from '@shopify/cli-kit/node/abort' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' +import {sleep} from '@shopify/cli-kit/shared/node/system' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {outputContent} from '@shopify/cli-kit/shared/node/output' +import {renderSingleTask} from '@shopify/cli-kit/shared/node/ui' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' const TERMINAL_STATUSES = ['COMPLETED', 'FAILED', 'CANCELED', 'EXPIRED'] const INITIAL_POLL_INTERVAL_SECONDS = 1 diff --git a/packages/app/src/cli/services/bundle.test.ts b/packages/app/src/cli/services/bundle.test.ts index 68b8a5f09da..80c1710768d 100644 --- a/packages/app/src/cli/services/bundle.test.ts +++ b/packages/app/src/cli/services/bundle.test.ts @@ -1,11 +1,11 @@ import {writeManifestToBundle, compressBundle} from './bundle.js' import {AppInterface} from '../models/app/app.js' import {describe, test, expect, vi} from 'vitest' -import {joinPath} from '@shopify/cli-kit/node/path' -import {inTemporaryDirectory, mkdir, writeFile, readFile} from '@shopify/cli-kit/node/fs' -import {brotliCompress, zip} from '@shopify/cli-kit/node/archiver' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {inTemporaryDirectory, mkdir, writeFile, readFile} from '@shopify/cli-kit/shared/node/fs' +import {brotliCompress, zip} from '@shopify/cli-kit/shared/node/archiver' -vi.mock('@shopify/cli-kit/node/archiver', () => { +vi.mock('@shopify/cli-kit/shared/node/archiver', () => { return { brotliCompress: vi.fn(), zip: vi.fn(), diff --git a/packages/app/src/cli/services/bundle.ts b/packages/app/src/cli/services/bundle.ts index c3decdbe883..f58565d432e 100644 --- a/packages/app/src/cli/services/bundle.ts +++ b/packages/app/src/cli/services/bundle.ts @@ -2,11 +2,11 @@ import {AppManifest} from '../models/app/app.js' import {AssetUrlSchema, DeveloperPlatformClient} from '../utilities/developer-platform-client.js' import {MinimalAppIdentifiers} from '../models/organization.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import {brotliCompress, zip} from '@shopify/cli-kit/node/archiver' -import {formData, fetch} from '@shopify/cli-kit/node/http' -import {readFileSync} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {brotliCompress, zip} from '@shopify/cli-kit/shared/node/archiver' +import {formData, fetch} from '@shopify/cli-kit/shared/node/http' +import {readFileSync} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {writeFile} from 'fs/promises' export async function writeManifestToBundle(appManifest: AppManifest, bundlePath: string) { diff --git a/packages/app/src/cli/services/context.test.ts b/packages/app/src/cli/services/context.test.ts index 2a0a98d0c09..e31cd4a1d2b 100644 --- a/packages/app/src/cli/services/context.test.ts +++ b/packages/app/src/cli/services/context.test.ts @@ -35,12 +35,12 @@ import { selectDeveloperPlatformClient, } from '../utilities/developer-platform-client.js' import {RemoteAwareExtensionSpecification} from '../models/extensions/specification.js' -import {isServiceAccount, isUserAccount} from '@shopify/cli-kit/node/session' +import {isServiceAccount, isUserAccount} from '@shopify/cli-kit/identity/session' import {afterEach, beforeAll, beforeEach, describe, expect, test, vi} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' -import {getPackageManager} from '@shopify/cli-kit/node/node-package-manager' -import {renderConfirmationPrompt, renderInfo, renderTasks, renderWarning, Task} from '@shopify/cli-kit/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' +import {getPackageManager} from '@shopify/cli-kit/shared/node/node-package-manager' +import {renderConfirmationPrompt, renderInfo, renderTasks, renderWarning, Task} from '@shopify/cli-kit/shared/node/ui' const APP1: OrganizationApp = testOrganizationApp({ id: '1', @@ -133,12 +133,12 @@ vi.mock('../prompts/dev') vi.mock('../models/app/identifiers') vi.mock('./context/identifiers') vi.mock('../models/app/loader.js') -vi.mock('@shopify/cli-kit/node/node-package-manager.js') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/node-package-manager.js') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('./deploy/mode.js') vi.mock('./app/config/link.js') vi.mock('./context/partner-account-info.js') -vi.mock('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/identity/session') vi.mock('./generate/fetch-extension-specifications.js') vi.mock('./app/select-app.js') vi.mock('../utilities/developer-platform-client.js') diff --git a/packages/app/src/cli/services/context.ts b/packages/app/src/cli/services/context.ts index a89a30efbca..e9069438294 100644 --- a/packages/app/src/cli/services/context.ts +++ b/packages/app/src/cli/services/context.ts @@ -25,12 +25,12 @@ import { DeveloperPlatformClient, selectDeveloperPlatformClient, } from '../utilities/developer-platform-client.js' -import {isServiceAccount, isUserAccount} from '@shopify/cli-kit/node/session' -import {tryParseInt} from '@shopify/cli-kit/common/string' -import {Token, renderConfirmationPrompt, renderInfo, renderWarning} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent} from '@shopify/cli-kit/node/output' -import {basename, sniffForJson} from '@shopify/cli-kit/node/path' +import {isServiceAccount, isUserAccount} from '@shopify/cli-kit/identity/session' +import {tryParseInt} from '@shopify/cli-kit/shared/common/string' +import {Token, renderConfirmationPrompt, renderInfo, renderWarning} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent} from '@shopify/cli-kit/shared/node/output' +import {basename, sniffForJson} from '@shopify/cli-kit/shared/node/path' export const InvalidApiKeyErrorMessage = (apiKey: string) => { return { diff --git a/packages/app/src/cli/services/context/breakdown-extensions.test.ts b/packages/app/src/cli/services/context/breakdown-extensions.test.ts index e74ab310183..4fad940db2b 100644 --- a/packages/app/src/cli/services/context/breakdown-extensions.test.ts +++ b/packages/app/src/cli/services/context/breakdown-extensions.test.ts @@ -24,7 +24,7 @@ import {versionDiffByVersion} from '../release/version-diff.js' import {AppVersion, AppModuleVersion, DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {loadLocalExtensionsSpecifications} from '../../models/extensions/load-specifications.js' import {describe, vi, test, beforeAll, expect} from 'vitest' -import {setPathValue} from '@shopify/cli-kit/common/object' +import {setPathValue} from '@shopify/cli-kit/shared/common/object' const REGISTRATION_A: RemoteSource = { uuid: 'UUID_A', @@ -319,7 +319,7 @@ let EXTENSION_A_2: ExtensionInstance let DASH_MIGRATED_EXTENSION_A: ExtensionInstance let uiExtensions: ExtensionInstance[] -vi.mock('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/identity/session') vi.mock('../dev/fetch') vi.mock('./identifiers-extensions') vi.mock('../release/version-diff') diff --git a/packages/app/src/cli/services/context/breakdown-extensions.ts b/packages/app/src/cli/services/context/breakdown-extensions.ts index e685a07cd8c..35e1d33825e 100644 --- a/packages/app/src/cli/services/context/breakdown-extensions.ts +++ b/packages/app/src/cli/services/context/breakdown-extensions.ts @@ -21,9 +21,9 @@ import {rewriteConfiguration} from '../app/write-app-configuration-file.js' import {AppConfigurationUsedByCli} from '../../models/extensions/specifications/types/app_config.js' import {removeTrailingSlash} from '../../models/extensions/specifications/validation/common.js' import {throwUidMappingError} from '../../prompts/uid-mapping-error.js' -import {deepCompare, deepDifference} from '@shopify/cli-kit/common/object' -import {encodeToml} from '@shopify/cli-kit/node/toml' -import {zod} from '@shopify/cli-kit/node/schema' +import {deepCompare, deepDifference} from '@shopify/cli-kit/shared/common/object' +import {encodeToml} from '@shopify/cli-kit/shared/node/toml' +import {zod} from '@shopify/cli-kit/shared/node/schema' export interface ConfigExtensionIdentifiersBreakdown { existingFieldNames: string[] diff --git a/packages/app/src/cli/services/context/id-manual-matching.test.ts b/packages/app/src/cli/services/context/id-manual-matching.test.ts index 830428e6914..d3e811849d7 100644 --- a/packages/app/src/cli/services/context/id-manual-matching.test.ts +++ b/packages/app/src/cli/services/context/id-manual-matching.test.ts @@ -4,9 +4,9 @@ import {ExtensionRegistration} from '../dev/create-extension.js' import {testUIExtension} from '../../models/app/app.test-data.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {describe, expect, vi, test, beforeAll} from 'vitest' -import {renderAutocompletePrompt} from '@shopify/cli-kit/node/ui' +import {renderAutocompletePrompt} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') const REGISTRATION_A: ExtensionRegistration = { uuid: 'UUID_A', diff --git a/packages/app/src/cli/services/context/id-matching.test.ts b/packages/app/src/cli/services/context/id-matching.test.ts index a8313fe5765..8a22f998e7d 100644 --- a/packages/app/src/cli/services/context/id-matching.test.ts +++ b/packages/app/src/cli/services/context/id-matching.test.ts @@ -4,11 +4,11 @@ import {RemoteSource} from './identifiers.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {testDeveloperPlatformClient, testFunctionExtension, testUIExtension} from '../../models/app/app.test-data.js' import {describe, expect, vi, test, beforeAll} from 'vitest' -import {outputInfo} from '@shopify/cli-kit/node/output' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' vi.mock('../dev/fetch') vi.mock('../dev/create-extension') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') const REGISTRATION_A: RemoteSource = { uuid: 'UUID_A', diff --git a/packages/app/src/cli/services/context/id-matching.ts b/packages/app/src/cli/services/context/id-matching.ts index f6546355e10..97733a5bb55 100644 --- a/packages/app/src/cli/services/context/id-matching.ts +++ b/packages/app/src/cli/services/context/id-matching.ts @@ -2,12 +2,12 @@ import {RemoteSource, LocalSource} from './identifiers.js' import {IdentifiersExtensions} from '../../models/app/identifiers.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' -import {groupBy, partition} from '@shopify/cli-kit/common/collection' -import {uniqBy, difference} from '@shopify/cli-kit/common/array' -import {pickBy} from '@shopify/cli-kit/common/object' -import {slugify} from '@shopify/cli-kit/common/string' -import {outputInfo} from '@shopify/cli-kit/node/output' -import colors from '@shopify/cli-kit/node/colors' +import {groupBy, partition} from '@shopify/cli-kit/shared/common/collection' +import {uniqBy, difference} from '@shopify/cli-kit/shared/common/array' +import {pickBy} from '@shopify/cli-kit/shared/common/object' +import {slugify} from '@shopify/cli-kit/shared/common/string' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' +import colors from '@shopify/cli-kit/shared/node/colors' export interface LocalRemoteSource { local: LocalSource diff --git a/packages/app/src/cli/services/context/identifiers-extensions.test.ts b/packages/app/src/cli/services/context/identifiers-extensions.test.ts index cc9a2adb30f..51fccc14414 100644 --- a/packages/app/src/cli/services/context/identifiers-extensions.test.ts +++ b/packages/app/src/cli/services/context/identifiers-extensions.test.ts @@ -32,8 +32,8 @@ import {getModulesToMigrate} from '../dev/migrate-app-module.js' import {ExtensionSpecification} from '../../models/extensions/specification.js' import {PartnersClient} from '../../utilities/developer-platform-client/partners-client.js' import {beforeEach, describe, expect, vi, test, beforeAll} from 'vitest' -import {AbortSilentError} from '@shopify/cli-kit/node/error' -import {setPathValue} from '@shopify/cli-kit/common/object' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' +import {setPathValue} from '@shopify/cli-kit/shared/common/object' interface Registration { uuid: string @@ -169,7 +169,7 @@ async function createExtensionResult(registration: Registration): Promise { const prompts: any = await vi.importActual('./prompts') diff --git a/packages/app/src/cli/services/context/identifiers-extensions.ts b/packages/app/src/cli/services/context/identifiers-extensions.ts index b1b2b639642..d75ca317699 100644 --- a/packages/app/src/cli/services/context/identifiers-extensions.ts +++ b/packages/app/src/cli/services/context/identifiers-extensions.ts @@ -22,9 +22,9 @@ import {ExtensionSpecification} from '../../models/extensions/specification.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {SingleWebhookSubscriptionType} from '../../models/extensions/specifications/app_config_webhook_schemas/webhooks_schema.js' import {PartnersClient} from '../../utilities/developer-platform-client/partners-client.js' -import {outputCompleted} from '@shopify/cli-kit/node/output' -import {AbortSilentError} from '@shopify/cli-kit/node/error' -import {groupBy} from '@shopify/cli-kit/common/collection' +import {outputCompleted} from '@shopify/cli-kit/shared/node/output' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' +import {groupBy} from '@shopify/cli-kit/shared/common/collection' interface AppWithExtensions { extensionRegistrations: RemoteSource[] diff --git a/packages/app/src/cli/services/context/identifiers.test.ts b/packages/app/src/cli/services/context/identifiers.test.ts index 97e0351c489..34832da594a 100644 --- a/packages/app/src/cli/services/context/identifiers.test.ts +++ b/packages/app/src/cli/services/context/identifiers.test.ts @@ -5,7 +5,7 @@ import {deployOrReleaseConfirmationPrompt} from '../../prompts/deploy-release.js import {testApp, testDeveloperPlatformClient, testOrganizationApp} from '../../models/app/app.test-data.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {describe, expect, test, vi} from 'vitest' -import {AbortSilentError} from '@shopify/cli-kit/node/error' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' const developerPlatformClient: DeveloperPlatformClient = testDeveloperPlatformClient() diff --git a/packages/app/src/cli/services/context/identifiers.ts b/packages/app/src/cli/services/context/identifiers.ts index 247ab71bfef..4d80b37e95e 100644 --- a/packages/app/src/cli/services/context/identifiers.ts +++ b/packages/app/src/cli/services/context/identifiers.ts @@ -5,7 +5,7 @@ import {Identifiers} from '../../models/app/identifiers.js' import {MinimalOrganizationApp} from '../../models/organization.js' import {deployOrReleaseConfirmationPrompt} from '../../prompts/deploy-release.js' import {AppVersion, DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {AbortSilentError} from '@shopify/cli-kit/node/error' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' export type PartnersAppForIdentifierMatching = MinimalOrganizationApp diff --git a/packages/app/src/cli/services/context/partner-account-info.test.ts b/packages/app/src/cli/services/context/partner-account-info.test.ts index d21cf375f8b..dc3af8c10b7 100644 --- a/packages/app/src/cli/services/context/partner-account-info.test.ts +++ b/packages/app/src/cli/services/context/partner-account-info.test.ts @@ -2,15 +2,15 @@ import {fetchCurrentAccountInformation} from './partner-account-info.js' import {testDeveloperPlatformClient} from '../../models/app/app.test-data.js' import {getCurrentAccountInfo} from '../../api/graphql/current_account_info.js' import {clearCachedAccountInfo, getCachedAccountInfo, setCachedAccountInfo} from '../../utilities/app-conf-store.js' -import {AccountInfo} from '@shopify/cli-kit/node/session' +import {AccountInfo} from '@shopify/cli-kit/identity/session' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' -vi.mock('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/identity/session') vi.mock('../../api/graphql/current_account_info.js') -vi.mock('@shopify/cli-kit/node/environment') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/environment') +vi.mock('@shopify/cli-kit/shared/node/output') const userId = '1234-5678' const accountInfo: AccountInfo = { diff --git a/packages/app/src/cli/services/context/partner-account-info.ts b/packages/app/src/cli/services/context/partner-account-info.ts index d5c61e027f6..a1213fafe39 100644 --- a/packages/app/src/cli/services/context/partner-account-info.ts +++ b/packages/app/src/cli/services/context/partner-account-info.ts @@ -1,8 +1,8 @@ import {getCurrentAccountInfo} from '../../api/graphql/current_account_info.js' import {getCachedAccountInfo, setCachedAccountInfo} from '../../utilities/app-conf-store.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {AccountInfo} from '@shopify/cli-kit/node/session' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AccountInfo} from '@shopify/cli-kit/identity/session' export async function fetchCurrentAccountInformation( developerPlatformClient: DeveloperPlatformClient, diff --git a/packages/app/src/cli/services/context/prompts.ts b/packages/app/src/cli/services/context/prompts.ts index afc88a99fea..888fc1dd897 100644 --- a/packages/app/src/cli/services/context/prompts.ts +++ b/packages/app/src/cli/services/context/prompts.ts @@ -1,6 +1,6 @@ import {LocalRemoteSource} from './id-matching.js' import {LocalSource, RemoteSource} from './identifiers.js' -import {renderAutocompletePrompt, renderConfirmationPrompt, renderInfo} from '@shopify/cli-kit/node/ui' +import {renderAutocompletePrompt, renderConfirmationPrompt, renderInfo} from '@shopify/cli-kit/shared/node/ui' export async function matchConfirmationPrompt( local: LocalSource, diff --git a/packages/app/src/cli/services/dependencies.test.ts b/packages/app/src/cli/services/dependencies.test.ts index 780ae365d14..ad8318f627e 100644 --- a/packages/app/src/cli/services/dependencies.test.ts +++ b/packages/app/src/cli/services/dependencies.test.ts @@ -2,11 +2,11 @@ import {installAppDependencies} from './dependencies.js' import {AppInterface} from '../models/app/app.js' import {testApp} from '../models/app/app.test-data.js' import {describe, expect, test, vi} from 'vitest' -import {installNPMDependenciesRecursively} from '@shopify/cli-kit/node/node-package-manager' -import {renderTasks} from '@shopify/cli-kit/node/ui' +import {installNPMDependenciesRecursively} from '@shopify/cli-kit/shared/node/node-package-manager' +import {renderTasks} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/node-package-manager') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/node-package-manager') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('installAppDependencies', () => { test('installs dependencies recursively', async () => { diff --git a/packages/app/src/cli/services/dependencies.ts b/packages/app/src/cli/services/dependencies.ts index 53253be4b37..3ffe044484b 100644 --- a/packages/app/src/cli/services/dependencies.ts +++ b/packages/app/src/cli/services/dependencies.ts @@ -1,6 +1,6 @@ import {AppInterface} from '../models/app/app.js' -import {installNPMDependenciesRecursively} from '@shopify/cli-kit/node/node-package-manager' -import {renderTasks} from '@shopify/cli-kit/node/ui' +import {installNPMDependenciesRecursively} from '@shopify/cli-kit/shared/node/node-package-manager' +import {renderTasks} from '@shopify/cli-kit/shared/node/ui' /** * Given an app, it installs its NPM dependencies by traversing diff --git a/packages/app/src/cli/services/deploy.test.ts b/packages/app/src/cli/services/deploy.test.ts index 63bc04b3ff0..34882d2d6c1 100644 --- a/packages/app/src/cli/services/deploy.test.ts +++ b/packages/app/src/cli/services/deploy.test.ts @@ -31,10 +31,10 @@ import { Task, renderConfirmationPrompt, isTTY, -} from '@shopify/cli-kit/node/ui' -import {formatPackageManagerCommand} from '@shopify/cli-kit/node/output' -import {randomUUID} from '@shopify/cli-kit/node/crypto' -import {AbortSilentError} from '@shopify/cli-kit/node/error' +} from '@shopify/cli-kit/shared/node/ui' +import {formatPackageManagerCommand} from '@shopify/cli-kit/shared/node/output' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' const versionTag = 'unique-version-tag' const developerPlatformClient: DeveloperPlatformClient = testDeveloperPlatformClient() @@ -52,9 +52,9 @@ vi.mock('./deploy/upload.js') vi.mock('./deploy/bundle.js') vi.mock('./dev/fetch.js') vi.mock('../models/app/identifiers.js') -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/crypto') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/shared/node/crypto') vi.mock('../validators/extensions.js') vi.mock('./context/prompts') vi.mock('./import-extensions.js') diff --git a/packages/app/src/cli/services/deploy.ts b/packages/app/src/cli/services/deploy.ts index 5cda1effbf9..3847db631df 100644 --- a/packages/app/src/cli/services/deploy.ts +++ b/packages/app/src/cli/services/deploy.ts @@ -11,13 +11,13 @@ import {Organization, OrganizationApp} from '../models/organization.js' import {reloadApp} from '../models/app/loader.js' import {ExtensionRegistration} from '../api/graphql/all_app_extension_registrations.js' import {getTomls} from '../utilities/app/config/getTomls.js' -import {renderInfo, renderSuccess, renderTasks, renderConfirmationPrompt, isTTY} from '@shopify/cli-kit/node/ui' -import {mkdir} from '@shopify/cli-kit/node/fs' -import {joinPath, dirname} from '@shopify/cli-kit/node/path' -import {outputNewline, outputInfo, formatPackageManagerCommand} from '@shopify/cli-kit/node/output' -import {getArrayRejectingUndefined} from '@shopify/cli-kit/common/array' -import {AbortError, AbortSilentError} from '@shopify/cli-kit/node/error' -import type {AlertCustomSection, Task, TokenItem} from '@shopify/cli-kit/node/ui' +import {renderInfo, renderSuccess, renderTasks, renderConfirmationPrompt, isTTY} from '@shopify/cli-kit/shared/node/ui' +import {mkdir} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, dirname} from '@shopify/cli-kit/shared/node/path' +import {outputNewline, outputInfo, formatPackageManagerCommand} from '@shopify/cli-kit/shared/node/output' +import {getArrayRejectingUndefined} from '@shopify/cli-kit/shared/common/array' +import {AbortError, AbortSilentError} from '@shopify/cli-kit/shared/node/error' +import type {AlertCustomSection, Task, TokenItem} from '@shopify/cli-kit/shared/node/ui' export interface DeployOptions { /** The app to be built and uploaded */ diff --git a/packages/app/src/cli/services/deploy/bundle.test.ts b/packages/app/src/cli/services/deploy/bundle.test.ts index cce9f433456..86aab57d157 100644 --- a/packages/app/src/cli/services/deploy/bundle.test.ts +++ b/packages/app/src/cli/services/deploy/bundle.test.ts @@ -4,8 +4,8 @@ import {AppInterface, AppManifest} from '../../models/app/app.js' import * as bundle from '../bundle.js' import * as functionBuild from '../function/build.js' import {describe, expect, test, vi} from 'vitest' -import * as file from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import * as file from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' vi.mock('../function/build.js') diff --git a/packages/app/src/cli/services/deploy/bundle.ts b/packages/app/src/cli/services/deploy/bundle.ts index cc18cddcf00..3084c0cc69d 100644 --- a/packages/app/src/cli/services/deploy/bundle.ts +++ b/packages/app/src/cli/services/deploy/bundle.ts @@ -2,10 +2,10 @@ import {AppInterface, AppManifest} from '../../models/app/app.js' import {Identifiers} from '../../models/app/identifiers.js' import {installJavy} from '../function/build.js' import {compressBundle, writeManifestToBundle} from '../bundle.js' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {mkdir, rmdir} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {renderConcurrent} from '@shopify/cli-kit/node/ui' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {mkdir, rmdir} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {renderConcurrent} from '@shopify/cli-kit/shared/node/ui' import {Writable} from 'stream' interface BundleOptions { diff --git a/packages/app/src/cli/services/deploy/theme-extension-config.test.ts b/packages/app/src/cli/services/deploy/theme-extension-config.test.ts index f28a8c7d595..6a34aca2666 100644 --- a/packages/app/src/cli/services/deploy/theme-extension-config.test.ts +++ b/packages/app/src/cli/services/deploy/theme-extension-config.test.ts @@ -1,8 +1,8 @@ import {themeExtensionConfig} from './theme-extension-config.js' import {loadLocalExtensionsSpecifications} from '../../models/extensions/load-specifications.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' -import {inTemporaryDirectory, writeFile, mkdir} from '@shopify/cli-kit/node/fs' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, writeFile, mkdir} from '@shopify/cli-kit/shared/node/fs' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' import {describe, expect, test} from 'vitest' describe('themeExtensionConfig', () => { diff --git a/packages/app/src/cli/services/deploy/theme-extension-config.ts b/packages/app/src/cli/services/deploy/theme-extension-config.ts index 005ba876d46..9702146fff0 100644 --- a/packages/app/src/cli/services/deploy/theme-extension-config.ts +++ b/packages/app/src/cli/services/deploy/theme-extension-config.ts @@ -1,7 +1,7 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {themeExtensionFiles} from '../../utilities/extensions/theme.js' -import {readFile} from '@shopify/cli-kit/node/fs' -import {relativePath, dirname} from '@shopify/cli-kit/node/path' +import {readFile} from '@shopify/cli-kit/shared/node/fs' +import {relativePath, dirname} from '@shopify/cli-kit/shared/node/path' interface ThemeExtensionConfig { theme_extension: { diff --git a/packages/app/src/cli/services/deploy/upload.test.ts b/packages/app/src/cli/services/deploy/upload.test.ts index 7b428edc9de..fe86dab57b1 100644 --- a/packages/app/src/cli/services/deploy/upload.test.ts +++ b/packages/app/src/cli/services/deploy/upload.test.ts @@ -2,12 +2,12 @@ import {deploymentErrorsToCustomSections, uploadExtensionsBundle} from './upload import {testApp, testDeveloperPlatformClient} from '../../models/app/app.test-data.js' import {AppDeploySchema, AppDeployVariables} from '../../api/graphql/app_deploy.js' import {describe, expect, test, vi} from 'vitest' -import {inTemporaryDirectory, writeFile} from '@shopify/cli-kit/node/fs' -import {formData} from '@shopify/cli-kit/node/http' -import {joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {formData} from '@shopify/cli-kit/shared/node/http' +import {joinPath} from '@shopify/cli-kit/shared/node/path' -vi.mock('@shopify/cli-kit/node/http') -vi.mock('@shopify/cli-kit/node/crypto') +vi.mock('@shopify/cli-kit/shared/node/http') +vi.mock('@shopify/cli-kit/shared/node/crypto') const app = testApp() const appManifest = await app.manifest(undefined) diff --git a/packages/app/src/cli/services/deploy/upload.ts b/packages/app/src/cli/services/deploy/upload.ts index 807d353c733..02fe625c495 100644 --- a/packages/app/src/cli/services/deploy/upload.ts +++ b/packages/app/src/cli/services/deploy/upload.ts @@ -4,9 +4,9 @@ import {AppDeploySchema, AppModuleSettings} from '../../api/graphql/app_deploy.j import {AppDeployOptions, DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {getUploadURL, uploadToGCS} from '../bundle.js' import {AppManifest} from '../../models/app/app.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {AlertCustomSection, ListToken, TokenItem} from '@shopify/cli-kit/node/ui' -import {partition} from '@shopify/cli-kit/common/collection' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {AlertCustomSection, ListToken, TokenItem} from '@shopify/cli-kit/shared/node/ui' +import {partition} from '@shopify/cli-kit/shared/common/collection' interface UploadExtensionsBundleOptions { appManifest: AppManifest diff --git a/packages/app/src/cli/services/dev-clean.test.ts b/packages/app/src/cli/services/dev-clean.test.ts index 258dadf48f1..816dd9792c3 100644 --- a/packages/app/src/cli/services/dev-clean.test.ts +++ b/packages/app/src/cli/services/dev-clean.test.ts @@ -1,10 +1,10 @@ import {devClean} from './dev-clean.js' import {LoadedAppContextOutput} from './app-context.js' import {testDeveloperPlatformClient, testOrganizationStore} from '../models/app/app.test-data.js' -import {renderSuccess} from '@shopify/cli-kit/node/ui' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' import {describe, expect, test, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') const shopDomain = 'test-store.myshopify.com' const mockStore = testOrganizationStore({shopDomain}) diff --git a/packages/app/src/cli/services/dev-clean.ts b/packages/app/src/cli/services/dev-clean.ts index cbd781dd1b3..92a7433770e 100644 --- a/packages/app/src/cli/services/dev-clean.ts +++ b/packages/app/src/cli/services/dev-clean.ts @@ -1,7 +1,7 @@ import {LoadedAppContextOutput} from './app-context.js' import {OrganizationStore} from '../models/organization.js' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' interface DevCleanOptions { appContextResult: LoadedAppContextOutput diff --git a/packages/app/src/cli/services/dev.test.ts b/packages/app/src/cli/services/dev.test.ts index 781ab61ee2d..5193bd553ff 100644 --- a/packages/app/src/cli/services/dev.test.ts +++ b/packages/app/src/cli/services/dev.test.ts @@ -1,10 +1,10 @@ import {warnIfScopesDifferBeforeDev, blockIfMigrationIncomplete} from './dev.js' import {testAppLinked, testDeveloperPlatformClient, testOrganizationApp} from '../models/app/app.test-data.js' import {describe, expect, test, vi} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' vi.mock('./dev/fetch.js') -vi.mock('@shopify/cli-kit/node/tcp') +vi.mock('@shopify/cli-kit/shared/node/tcp') vi.mock('../utilities/mkcert.js') describe('warnIfScopesDifferBeforeDev', () => { diff --git a/packages/app/src/cli/services/dev.ts b/packages/app/src/cli/services/dev.ts index af0af066266..1afcd6e210d 100644 --- a/packages/app/src/cli/services/dev.ts +++ b/packages/app/src/cli/services/dev.ts @@ -39,16 +39,16 @@ import {ports} from '../constants.js' import {generateCertificate} from '../utilities/mkcert.js' import {throwUidMappingError} from '../prompts/uid-mapping-error.js' import {Config} from '@oclif/core' -import {AbortController} from '@shopify/cli-kit/node/abort' -import {checkPortAvailability, getAvailableTCPPort} from '@shopify/cli-kit/node/tcp' -import {TunnelClient} from '@shopify/cli-kit/node/plugins/tunnel' -import {getBackendPort} from '@shopify/cli-kit/node/environment' -import {basename} from '@shopify/cli-kit/node/path' -import {renderWarning} from '@shopify/cli-kit/node/ui' -import {reportAnalyticsEvent} from '@shopify/cli-kit/node/analytics' -import {OutputProcess, formatPackageManagerCommand} from '@shopify/cli-kit/node/output' -import {hashString} from '@shopify/cli-kit/node/crypto' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' +import {checkPortAvailability, getAvailableTCPPort} from '@shopify/cli-kit/shared/node/tcp' +import {TunnelClient} from '@shopify/cli-kit/shared/node/plugins/tunnel' +import {getBackendPort} from '@shopify/cli-kit/shared/node/environment' +import {basename} from '@shopify/cli-kit/shared/node/path' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' +import {reportAnalyticsEvent} from '@shopify/cli-kit/shared/node/analytics' +import {OutputProcess, formatPackageManagerCommand} from '@shopify/cli-kit/shared/node/output' +import {hashString} from '@shopify/cli-kit/shared/node/crypto' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export interface DevOptions { app: AppLinkedInterface diff --git a/packages/app/src/cli/services/dev/app-events/app-event-watcher-handler.ts b/packages/app/src/cli/services/dev/app-events/app-event-watcher-handler.ts index e54a27ba937..dec99f9e809 100644 --- a/packages/app/src/cli/services/dev/app-events/app-event-watcher-handler.ts +++ b/packages/app/src/cli/services/dev/app-events/app-event-watcher-handler.ts @@ -4,9 +4,9 @@ import {appDiff} from './app-diffing.js' import {AppLinkedInterface} from '../../../models/app/app.js' import {ExtensionInstance} from '../../../models/extensions/extension-instance.js' import {reloadApp} from '../../../models/app/loader.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {endHRTimeInMs, startHRTime} from '@shopify/cli-kit/node/hrtime' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {endHRTimeInMs, startHRTime} from '@shopify/cli-kit/shared/node/hrtime' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' /** * Transforms an array of WatcherEvents from the file system into a processed AppEvent. diff --git a/packages/app/src/cli/services/dev/app-events/app-event-watcher.test.ts b/packages/app/src/cli/services/dev/app-events/app-event-watcher.test.ts index 7de43c69b3f..a2e0c20bde7 100644 --- a/packages/app/src/cli/services/dev/app-events/app-event-watcher.test.ts +++ b/packages/app/src/cli/services/dev/app-events/app-event-watcher.test.ts @@ -15,10 +15,10 @@ import {AppLinkedInterface} from '../../../models/app/app.js' import {AppAccessSpecIdentifier} from '../../../models/extensions/specifications/app_config_app_access.js' import {PosSpecIdentifier} from '../../../models/extensions/specifications/app_config_point_of_sale.js' import {afterEach, beforeEach, describe, expect, test, vi} from 'vitest' -import {AbortSignal, AbortController} from '@shopify/cli-kit/node/abort' -import {flushPromises} from '@shopify/cli-kit/node/promises' -import {inTemporaryDirectory} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {AbortSignal, AbortController} from '@shopify/cli-kit/shared/node/abort' +import {flushPromises} from '@shopify/cli-kit/shared/node/promises' +import {inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import {Writable} from 'stream' vi.mock('../../../models/app/loader.js') diff --git a/packages/app/src/cli/services/dev/app-events/app-event-watcher.ts b/packages/app/src/cli/services/dev/app-events/app-event-watcher.ts index 5a760de6332..09d22f8ee8e 100644 --- a/packages/app/src/cli/services/dev/app-events/app-event-watcher.ts +++ b/packages/app/src/cli/services/dev/app-events/app-event-watcher.ts @@ -5,14 +5,14 @@ import {handleWatcherEvents} from './app-event-watcher-handler.js' import {AppLinkedInterface} from '../../../models/app/app.js' import {ExtensionInstance} from '../../../models/extensions/extension-instance.js' import {ExtensionBuildOptions} from '../../build/extension.js' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {joinPath} from '@shopify/cli-kit/node/path' -import {fileExists, mkdir, rmdir} from '@shopify/cli-kit/node/fs' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' -import {groupBy} from '@shopify/cli-kit/common/collection' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {fileExists, mkdir, rmdir} from '@shopify/cli-kit/shared/node/fs' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' +import {groupBy} from '@shopify/cli-kit/shared/common/collection' import {formatMessagesSync, Message} from 'esbuild' -import {isUnitTest} from '@shopify/cli-kit/node/context/local' +import {isUnitTest} from '@shopify/cli-kit/shared/node/context/local' import EventEmitter from 'events' /** diff --git a/packages/app/src/cli/services/dev/app-events/app-watcher-esbuild.test.ts b/packages/app/src/cli/services/dev/app-events/app-watcher-esbuild.test.ts index 0a1a7256f02..215fb805e4e 100644 --- a/packages/app/src/cli/services/dev/app-events/app-watcher-esbuild.test.ts +++ b/packages/app/src/cli/services/dev/app-events/app-watcher-esbuild.test.ts @@ -3,8 +3,8 @@ import {AppEvent, EventType} from './app-event-watcher.js' import {testAppLinked, testUIExtension} from '../../../models/app/app.test-data.js' import {environmentVariableNames} from '../../../constants.js' import {describe, expect, test, vi} from 'vitest' -import * as fs from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import * as fs from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' vi.mock('@luckycatfactory/esbuild-graphql-loader', () => ({ default: { diff --git a/packages/app/src/cli/services/dev/app-events/app-watcher-esbuild.ts b/packages/app/src/cli/services/dev/app-events/app-watcher-esbuild.ts index edf39052082..c4daac1f700 100644 --- a/packages/app/src/cli/services/dev/app-events/app-watcher-esbuild.ts +++ b/packages/app/src/cli/services/dev/app-events/app-watcher-esbuild.ts @@ -3,11 +3,11 @@ import {ExtensionInstance} from '../../../models/extensions/extension-instance.j import {getESBuildOptions} from '../../extensions/bundle.js' import {environmentVariableNames} from '../../../constants.js' import {BuildContext, context as esContext, StdinOptions} from 'esbuild' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {copyFile} from '@shopify/cli-kit/node/fs' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' -import {isTruthy} from '@shopify/cli-kit/node/context/utilities' -import {getEnvironmentVariables} from '@shopify/cli-kit/node/environment' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {copyFile} from '@shopify/cli-kit/shared/node/fs' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' +import {isTruthy} from '@shopify/cli-kit/shared/node/context/utilities' +import {getEnvironmentVariables} from '@shopify/cli-kit/shared/node/environment' export interface DevAppWatcherOptions { dotEnvVariables: {[key: string]: string} diff --git a/packages/app/src/cli/services/dev/app-events/file-watcher.test.ts b/packages/app/src/cli/services/dev/app-events/file-watcher.test.ts index 5704a97ed6a..a88c3737c6a 100644 --- a/packages/app/src/cli/services/dev/app-events/file-watcher.test.ts +++ b/packages/app/src/cli/services/dev/app-events/file-watcher.test.ts @@ -7,25 +7,27 @@ import { testFunctionExtension, testUIExtension, } from '../../../models/app/app.test-data.js' -import {flushPromises} from '@shopify/cli-kit/node/promises' +import {flushPromises} from '@shopify/cli-kit/shared/node/promises' import {describe, expect, test, vi} from 'vitest' import chokidar from 'chokidar' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {inTemporaryDirectory, mkdir, writeFile, fileExistsSync} from '@shopify/cli-kit/node/fs' -import {joinPath, normalizePath} from '@shopify/cli-kit/node/path' -import {sleep} from '@shopify/cli-kit/node/system' -import {extractImportPathsRecursively} from '@shopify/cli-kit/node/import-extractor' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {inTemporaryDirectory, mkdir, writeFile, fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, normalizePath} from '@shopify/cli-kit/shared/node/path' +import {sleep} from '@shopify/cli-kit/shared/node/system' +import {extractImportPathsRecursively} from '@shopify/cli-kit/shared/node/import-extractor' // Mock the import extractor - will be configured per test -vi.mock('@shopify/cli-kit/node/import-extractor', () => ({ +vi.mock('@shopify/cli-kit/shared/node/import-extractor', () => ({ extractImportPaths: vi.fn(() => []), extractImportPathsRecursively: vi.fn(() => []), extractJSImports: vi.fn(() => []), })) // Mock fs module for fileExistsSync -vi.mock('@shopify/cli-kit/node/fs', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/fs', async () => { + const actual = await vi.importActual( + '@shopify/cli-kit/shared/node/fs', + ) return { ...actual, fileExistsSync: vi.fn(), @@ -33,8 +35,8 @@ vi.mock('@shopify/cli-kit/node/fs', async () => { }) // Mock resolvePath to handle path resolution in tests -vi.mock('@shopify/cli-kit/node/path', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/path') +vi.mock('@shopify/cli-kit/shared/node/path', async () => { + const actual = await vi.importActual('@shopify/cli-kit/shared/node/path') return { ...actual, resolvePath: vi.fn((path: string) => { diff --git a/packages/app/src/cli/services/dev/app-events/file-watcher.ts b/packages/app/src/cli/services/dev/app-events/file-watcher.ts index 56fca818a56..36a92b01b74 100644 --- a/packages/app/src/cli/services/dev/app-events/file-watcher.ts +++ b/packages/app/src/cli/services/dev/app-events/file-watcher.ts @@ -1,13 +1,13 @@ /* eslint-disable no-case-declarations */ import {AppLinkedInterface} from '../../../models/app/app.js' import {configurationFileNames} from '../../../constants.js' -import {dirname, joinPath, normalizePath, relativePath} from '@shopify/cli-kit/node/path' +import {dirname, joinPath, normalizePath, relativePath} from '@shopify/cli-kit/shared/node/path' import {FSWatcher} from 'chokidar' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {startHRTime, StartTime} from '@shopify/cli-kit/node/hrtime' -import {fileExistsSync, matchGlob, readFileSync} from '@shopify/cli-kit/node/fs' -import {debounce} from '@shopify/cli-kit/common/function' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {startHRTime, StartTime} from '@shopify/cli-kit/shared/node/hrtime' +import {fileExistsSync, matchGlob, readFileSync} from '@shopify/cli-kit/shared/node/fs' +import {debounce} from '@shopify/cli-kit/shared/common/function' import ignore from 'ignore' import {Writable} from 'stream' diff --git a/packages/app/src/cli/services/dev/create-extension.ts b/packages/app/src/cli/services/dev/create-extension.ts index fbedebd1b4f..f053d3868ed 100644 --- a/packages/app/src/cli/services/dev/create-extension.ts +++ b/packages/app/src/cli/services/dev/create-extension.ts @@ -1,6 +1,6 @@ import {ExtensionCreateSchema, ExtensionCreateVariables} from '../../api/graphql/extension_create.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export interface ExtensionRegistration { id: string diff --git a/packages/app/src/cli/services/dev/extension.ts b/packages/app/src/cli/services/dev/extension.ts index 301f1313c4d..ce4a0743263 100644 --- a/packages/app/src/cli/services/dev/extension.ts +++ b/packages/app/src/cli/services/dev/extension.ts @@ -9,9 +9,9 @@ import { import {AppEvent, AppEventWatcher, EventType} from './app-events/app-event-watcher.js' import {buildCartURLIfNeeded} from './extension/utilities.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {DotEnvFile} from '@shopify/cli-kit/node/dot-env' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {DotEnvFile} from '@shopify/cli-kit/shared/node/dot-env' import {Writable} from 'stream' export interface ExtensionDevOptions { diff --git a/packages/app/src/cli/services/dev/extension/localization.test.ts b/packages/app/src/cli/services/dev/extension/localization.test.ts index 583a6f4912b..2478e8d8f44 100644 --- a/packages/app/src/cli/services/dev/extension/localization.test.ts +++ b/packages/app/src/cli/services/dev/extension/localization.test.ts @@ -1,11 +1,11 @@ import {getLocalization, Localization} from './localization.js' import {ExtensionsPayloadStoreOptions} from './payload/store.js' import {testUIExtension} from '../../../models/app/app.test-data.js' -import * as output from '@shopify/cli-kit/node/output' +import * as output from '@shopify/cli-kit/shared/node/output' import {describe, expect, vi, test} from 'vitest' -import {mkdir, writeFile, inTemporaryDirectory} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {mkdir, writeFile, inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' async function testGetLocalization(tmpDir: string, currentLocalization?: Localization) { const mockOptions = {} as unknown as ExtensionsPayloadStoreOptions diff --git a/packages/app/src/cli/services/dev/extension/localization.ts b/packages/app/src/cli/services/dev/extension/localization.ts index ad0f1887e71..bd32d7c8dbc 100644 --- a/packages/app/src/cli/services/dev/extension/localization.ts +++ b/packages/app/src/cli/services/dev/extension/localization.ts @@ -1,10 +1,10 @@ import {ExtensionAssetBuildStatus} from './payload/models.js' import {GetUIExtensionPayloadOptions} from './payload.js' import {ExtensionInstance} from '../../../models/extensions/extension-instance.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import {readFile, glob} from '@shopify/cli-kit/node/fs' -import {ExtendableError} from '@shopify/cli-kit/node/error' -import {outputDebug, outputWarn} from '@shopify/cli-kit/node/output' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {readFile, glob} from '@shopify/cli-kit/shared/node/fs' +import {ExtendableError} from '@shopify/cli-kit/shared/node/error' +import {outputDebug, outputWarn} from '@shopify/cli-kit/shared/node/output' type Locale = string diff --git a/packages/app/src/cli/services/dev/extension/payload.test.ts b/packages/app/src/cli/services/dev/extension/payload.test.ts index ae905a037a2..0f69dbd3641 100644 --- a/packages/app/src/cli/services/dev/extension/payload.test.ts +++ b/packages/app/src/cli/services/dev/extension/payload.test.ts @@ -4,8 +4,8 @@ import {ExtensionsPayloadStoreOptions} from './payload/store.js' import {testUIExtension} from '../../../models/app/app.test-data.js' import * as appModel from '../../../models/app/app.js' import {describe, expect, test, vi, beforeEach} from 'vitest' -import {inTemporaryDirectory, touchFile, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, touchFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' describe('getUIExtensionPayload', () => { beforeEach(() => { diff --git a/packages/app/src/cli/services/dev/extension/payload.ts b/packages/app/src/cli/services/dev/extension/payload.ts index ed21fe7eef7..ab8180acf8d 100644 --- a/packages/app/src/cli/services/dev/extension/payload.ts +++ b/packages/app/src/cli/services/dev/extension/payload.ts @@ -8,9 +8,9 @@ import {ExtensionInstance} from '../../../models/extensions/extension-instance.j import {BuildManifest} from '../../../models/extensions/specifications/ui_extension.js' import {BuildAsset} from '../../../models/extensions/specification.js' import {NewExtensionPointSchemaType} from '../../../models/extensions/schemas.js' -import {fileLastUpdatedTimestamp} from '@shopify/cli-kit/node/fs' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' +import {fileLastUpdatedTimestamp} from '@shopify/cli-kit/shared/node/fs' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' export type GetUIExtensionPayloadOptions = Omit & { currentDevelopmentPayload?: Partial diff --git a/packages/app/src/cli/services/dev/extension/payload/store.ts b/packages/app/src/cli/services/dev/extension/payload/store.ts index ae4919485c1..a87dec878d6 100644 --- a/packages/app/src/cli/services/dev/extension/payload/store.ts +++ b/packages/app/src/cli/services/dev/extension/payload/store.ts @@ -3,8 +3,8 @@ import {ExtensionDevOptions} from '../../extension.js' import {getUIExtensionPayload, isNewExtensionPointsSchema} from '../payload.js' import {buildAppURLForMobile, buildAppURLForWeb} from '../../../../utilities/app/app-url.js' import {ExtensionInstance} from '../../../../models/extensions/extension-instance.js' -import {deepMergeObjects} from '@shopify/cli-kit/common/object' -import {outputDebug, outputContent} from '@shopify/cli-kit/node/output' +import {deepMergeObjects} from '@shopify/cli-kit/shared/common/object' +import {outputDebug, outputContent} from '@shopify/cli-kit/shared/node/output' import {EventEmitter} from 'events' export interface ExtensionsPayloadStoreOptions extends ExtensionDevOptions { diff --git a/packages/app/src/cli/services/dev/extension/server/middlewares.test.ts b/packages/app/src/cli/services/dev/extension/server/middlewares.test.ts index 2218e37cd65..2ccbe978bd5 100644 --- a/packages/app/src/cli/services/dev/extension/server/middlewares.test.ts +++ b/packages/app/src/cli/services/dev/extension/server/middlewares.test.ts @@ -15,9 +15,9 @@ import {UIExtensionPayload} from '../payload/models.js' import {testUIExtension} from '../../../../models/app/app.test-data.js' import {AppEventWatcher} from '../../app-events/app-event-watcher.js' import {describe, expect, vi, test} from 'vitest' -import {inTemporaryDirectory, mkdir, touchFile, writeFile} from '@shopify/cli-kit/node/fs' +import {inTemporaryDirectory, mkdir, touchFile, writeFile} from '@shopify/cli-kit/shared/node/fs' import * as h3 from 'h3' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' vi.mock('h3', async () => { const actual: any = await vi.importActual('h3') diff --git a/packages/app/src/cli/services/dev/extension/server/middlewares.ts b/packages/app/src/cli/services/dev/extension/server/middlewares.ts index 7bf8116bc11..f034ef78bf6 100644 --- a/packages/app/src/cli/services/dev/extension/server/middlewares.ts +++ b/packages/app/src/cli/services/dev/extension/server/middlewares.ts @@ -3,10 +3,10 @@ import {GetExtensionsMiddlewareOptions} from './models.js' import {getUIExtensionPayload} from '../payload.js' import {getHTML} from '../templates.js' import {getWebSocketUrl} from '../../extension.js' -import {fileExists, isDirectory, readFile, findPathUp} from '@shopify/cli-kit/node/fs' +import {fileExists, isDirectory, readFile, findPathUp} from '@shopify/cli-kit/shared/node/fs' import {IncomingMessage, ServerResponse, sendRedirect, send} from 'h3' -import {joinPath, extname, moduleDirectory} from '@shopify/cli-kit/node/path' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {joinPath, extname, moduleDirectory} from '@shopify/cli-kit/shared/node/path' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' export function corsMiddleware(_request: IncomingMessage, response: ServerResponse, next: (err?: Error) => unknown) { response.setHeader('Access-Control-Allow-Origin', '*') diff --git a/packages/app/src/cli/services/dev/extension/server/utilities.test.ts b/packages/app/src/cli/services/dev/extension/server/utilities.test.ts index 10b1ba23f10..eb424de1929 100644 --- a/packages/app/src/cli/services/dev/extension/server/utilities.test.ts +++ b/packages/app/src/cli/services/dev/extension/server/utilities.test.ts @@ -4,8 +4,8 @@ import {ExtensionInstance} from '../../../../models/extensions/extension-instanc import {ExtensionsPayloadStoreOptions} from '../payload/store.js' import {describe, expect, test, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/system') describe('getRedirectURL()', () => { test('returns a URL with a URL param', async () => { diff --git a/packages/app/src/cli/services/dev/extension/templates.ts b/packages/app/src/cli/services/dev/extension/templates.ts index c74f7e8587c..acdccb1c574 100644 --- a/packages/app/src/cli/services/dev/extension/templates.ts +++ b/packages/app/src/cli/services/dev/extension/templates.ts @@ -1,7 +1,7 @@ -import {renderLiquidTemplate} from '@shopify/cli-kit/node/liquid' -import {joinPath, moduleDirectory} from '@shopify/cli-kit/node/path' -import {readFile, glob, findPathUp} from '@shopify/cli-kit/node/fs' -import {BugError} from '@shopify/cli-kit/node/error' +import {renderLiquidTemplate} from '@shopify/cli-kit/shared/node/liquid' +import {joinPath, moduleDirectory} from '@shopify/cli-kit/shared/node/path' +import {readFile, glob, findPathUp} from '@shopify/cli-kit/shared/node/fs' +import {BugError} from '@shopify/cli-kit/shared/node/error' interface GetHTMLOptions { extensionSurface?: string diff --git a/packages/app/src/cli/services/dev/extension/websocket/handlers.test.ts b/packages/app/src/cli/services/dev/extension/websocket/handlers.test.ts index 373dc39c84f..cb8f4b5572d 100644 --- a/packages/app/src/cli/services/dev/extension/websocket/handlers.test.ts +++ b/packages/app/src/cli/services/dev/extension/websocket/handlers.test.ts @@ -9,14 +9,14 @@ import { import {SetupWebSocketConnectionOptions} from './models.js' import {ExtensionsEndpointPayload} from '../payload/models.js' import {vi, describe, test, expect, Mock} from 'vitest' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' import WebSocket, {RawData, WebSocketServer} from 'ws' import {IncomingMessage} from 'h3' -import colors from '@shopify/cli-kit/node/colors' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' +import colors from '@shopify/cli-kit/shared/node/colors' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' import {Duplex} from 'stream' -vi.mock('@shopify/cli-kit/node/ui/components', () => ({ +vi.mock('@shopify/cli-kit/shared/node/ui/components', () => ({ useConcurrentOutputContext: vi.fn(), })) diff --git a/packages/app/src/cli/services/dev/extension/websocket/handlers.ts b/packages/app/src/cli/services/dev/extension/websocket/handlers.ts index 6253bff394f..d044d9e8b22 100644 --- a/packages/app/src/cli/services/dev/extension/websocket/handlers.ts +++ b/packages/app/src/cli/services/dev/extension/websocket/handlers.ts @@ -7,8 +7,8 @@ import { SetupWebSocketConnectionOptions, } from './models.js' import {RawData, WebSocket, WebSocketServer} from 'ws' -import {outputDebug, outputContent, outputToken} from '@shopify/cli-kit/node/output' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' +import {outputDebug, outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' import {IncomingMessage} from 'http' import {Duplex} from 'stream' diff --git a/packages/app/src/cli/services/dev/fetch.test.ts b/packages/app/src/cli/services/dev/fetch.test.ts index 406a04dc4b3..90eae835fb6 100644 --- a/packages/app/src/cli/services/dev/fetch.test.ts +++ b/packages/app/src/cli/services/dev/fetch.test.ts @@ -9,10 +9,10 @@ import {DeveloperPlatformClient} from '../../utilities/developer-platform-client import {PartnersClient} from '../../utilities/developer-platform-client/partners-client.js' import {AppManagementClient} from '../../utilities/developer-platform-client/app-management-client.js' import {afterEach, describe, expect, test, vi} from 'vitest' -import {renderFatalError} from '@shopify/cli-kit/node/ui' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' -import {AbortError} from '@shopify/cli-kit/node/error' -import {blockPartnersAccess} from '@shopify/cli-kit/node/environment' +import {renderFatalError} from '@shopify/cli-kit/shared/node/ui' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {blockPartnersAccess} from '@shopify/cli-kit/shared/node/environment' const ORG1: Organization = { id: '1', @@ -34,10 +34,10 @@ const STORE1: OrganizationStore = { provisionable: true, } -vi.mock('@shopify/cli-kit/node/api/partners') +vi.mock('@shopify/cli-kit/partners/api') vi.mock('../../utilities/developer-platform-client/partners-client.js') vi.mock('../../utilities/developer-platform-client/app-management-client.js') -vi.mock('@shopify/cli-kit/node/environment') +vi.mock('@shopify/cli-kit/shared/node/environment') afterEach(() => { mockAndCaptureOutput().clear() diff --git a/packages/app/src/cli/services/dev/fetch.ts b/packages/app/src/cli/services/dev/fetch.ts index 7248acc98d0..ef186058c33 100644 --- a/packages/app/src/cli/services/dev/fetch.ts +++ b/packages/app/src/cli/services/dev/fetch.ts @@ -7,9 +7,9 @@ import { allDeveloperPlatformClients, selectDeveloperPlatformClient, } from '../../utilities/developer-platform-client.js' -import {AccountInfo, isServiceAccount, isUserAccount} from '@shopify/cli-kit/node/session' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {AccountInfo, isServiceAccount, isUserAccount} from '@shopify/cli-kit/identity/session' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' export class NoOrgError extends AbortError { constructor(partnersAccount: AccountInfo, organizationId?: string) { diff --git a/packages/app/src/cli/services/dev/graphiql/server.ts b/packages/app/src/cli/services/dev/graphiql/server.ts index 266d62c8347..261c2cdc735 100644 --- a/packages/app/src/cli/services/dev/graphiql/server.ts +++ b/packages/app/src/cli/services/dev/graphiql/server.ts @@ -3,13 +3,13 @@ import {unauthorizedTemplate} from './templates/unauthorized.js' import {filterCustomHeaders} from './utilities.js' import express from 'express' import bodyParser from 'body-parser' -import {performActionWithRetryAfterRecovery} from '@shopify/cli-kit/common/retry' -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' -import {AbortError} from '@shopify/cli-kit/node/error' -import {adminUrl, supportedApiVersions} from '@shopify/cli-kit/node/api/admin' -import {fetch} from '@shopify/cli-kit/node/http' -import {renderLiquidTemplate} from '@shopify/cli-kit/node/liquid' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {performActionWithRetryAfterRecovery} from '@shopify/cli-kit/shared/common/retry' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {adminUrl, supportedApiVersions} from '@shopify/cli-kit/admin/api' +import {fetch} from '@shopify/cli-kit/shared/node/http' +import {renderLiquidTemplate} from '@shopify/cli-kit/shared/node/liquid' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' import {Server} from 'http' import {Writable} from 'stream' import {createRequire} from 'module' diff --git a/packages/app/src/cli/services/dev/graphiql/templates/graphiql.tsx b/packages/app/src/cli/services/dev/graphiql/templates/graphiql.tsx index 1379e7d3a79..2d5ad10cad9 100644 --- a/packages/app/src/cli/services/dev/graphiql/templates/graphiql.tsx +++ b/packages/app/src/cli/services/dev/graphiql/templates/graphiql.tsx @@ -1,4 +1,4 @@ -import {platformAndArch} from '@shopify/cli-kit/node/os' +import {platformAndArch} from '@shopify/cli-kit/shared/node/os' import React from 'react' import {renderToStaticMarkup} from 'react-dom/server' import {AppProvider, Badge, Banner, BlockStack, Box, Grid, InlineStack, Link, Select, Text} from '@shopify/polaris' diff --git a/packages/app/src/cli/services/dev/migrate-app-module.ts b/packages/app/src/cli/services/dev/migrate-app-module.ts index 0c05f69f8b9..b1bf28112e5 100644 --- a/packages/app/src/cli/services/dev/migrate-app-module.ts +++ b/packages/app/src/cli/services/dev/migrate-app-module.ts @@ -4,8 +4,8 @@ import {getExtensionIds, LocalRemoteSource} from '../context/id-matching.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {MigrateAppModuleSchema, MigrateAppModuleVariables} from '../../api/graphql/extension_migrate_app_module.js' import {MAX_EXTENSION_HANDLE_LENGTH} from '../../models/extensions/schemas.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {slugify} from '@shopify/cli-kit/common/string' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {slugify} from '@shopify/cli-kit/shared/common/string' /** * All ***ModulesMap define the migration mapping between local and remote extension types. diff --git a/packages/app/src/cli/services/dev/migrate-flow-extension.ts b/packages/app/src/cli/services/dev/migrate-flow-extension.ts index 1b1f653ebb1..21ddb08f4d0 100644 --- a/packages/app/src/cli/services/dev/migrate-flow-extension.ts +++ b/packages/app/src/cli/services/dev/migrate-flow-extension.ts @@ -5,7 +5,7 @@ import { MigrateFlowExtensionVariables, } from '../../api/graphql/extension_migrate_flow_extension.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export async function migrateFlowExtensions(options: { extensionsToMigrate: LocalRemoteSource[] diff --git a/packages/app/src/cli/services/dev/migrate-to-ui-extension.ts b/packages/app/src/cli/services/dev/migrate-to-ui-extension.ts index 7c7d8c31b7a..0103c1d4b12 100644 --- a/packages/app/src/cli/services/dev/migrate-to-ui-extension.ts +++ b/packages/app/src/cli/services/dev/migrate-to-ui-extension.ts @@ -5,7 +5,7 @@ import { import {RemoteSource} from '../context/identifiers.js' import {LocalRemoteSource} from '../context/id-matching.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export async function migrateExtensionsToUIExtension(options: { extensionsToMigrate: LocalRemoteSource[] diff --git a/packages/app/src/cli/services/dev/port-warnings.test.ts b/packages/app/src/cli/services/dev/port-warnings.test.ts index 77e00babeef..d65238df2ba 100644 --- a/packages/app/src/cli/services/dev/port-warnings.test.ts +++ b/packages/app/src/cli/services/dev/port-warnings.test.ts @@ -1,5 +1,5 @@ import {PortDetail, renderPortWarnings} from './port-warnings.js' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' import {describe, expect, test} from 'vitest' describe('renderPortWarnings()', () => { diff --git a/packages/app/src/cli/services/dev/port-warnings.ts b/packages/app/src/cli/services/dev/port-warnings.ts index 49e997988e3..068c09a430f 100644 --- a/packages/app/src/cli/services/dev/port-warnings.ts +++ b/packages/app/src/cli/services/dev/port-warnings.ts @@ -1,5 +1,5 @@ -import {asHumanFriendlyArray} from '@shopify/cli-kit/common/array' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {asHumanFriendlyArray} from '@shopify/cli-kit/shared/common/array' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' export type PortDetail = ( | { diff --git a/packages/app/src/cli/services/dev/processes/app-logs-polling.test.ts b/packages/app/src/cli/services/dev/processes/app-logs-polling.test.ts index 0a570cb4cc9..5e6b89fa335 100644 --- a/packages/app/src/cli/services/dev/processes/app-logs-polling.test.ts +++ b/packages/app/src/cli/services/dev/processes/app-logs-polling.test.ts @@ -8,13 +8,13 @@ import {pollAppLogs} from '../../app-logs/dev/poll-app-logs.js' import {DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js' import * as appLogsUtils from '../../app-logs/utils.js' import {AppEventWatcher} from '../app-events/app-event-watcher.js' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {mkdir} from '@shopify/cli-kit/node/fs' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {mkdir} from '@shopify/cli-kit/shared/node/fs' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' import {describe, expect, vi, Mock, beforeEach, test} from 'vitest' -vi.mock('@shopify/cli-kit/node/fs') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/fs') +vi.mock('@shopify/cli-kit/shared/node/output') vi.mock('../../app-logs/dev/poll-app-logs.js') const SHOP_IDS = [1, 2] diff --git a/packages/app/src/cli/services/dev/processes/app-logs-polling.ts b/packages/app/src/cli/services/dev/processes/app-logs-polling.ts index f822f96ed7f..bd920e9319b 100644 --- a/packages/app/src/cli/services/dev/processes/app-logs-polling.ts +++ b/packages/app/src/cli/services/dev/processes/app-logs-polling.ts @@ -6,8 +6,8 @@ import {subscribeToAppLogs} from '../../app-logs/utils.js' import {AppLinkedInterface} from '../../../models/app/app.js' import {AppEventWatcher, AppEvent} from '../app-events/app-event-watcher.js' -import {mkdir} from '@shopify/cli-kit/node/fs' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {mkdir} from '@shopify/cli-kit/shared/node/fs' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' function hasFunctionExtensions(app: AppLinkedInterface): boolean { return app.allExtensions.some((extension) => extension.isFunctionExtension) diff --git a/packages/app/src/cli/services/dev/processes/dev-session/dev-session-logger.test.ts b/packages/app/src/cli/services/dev/processes/dev-session/dev-session-logger.test.ts index bbe871c54ca..58d0203bdef 100644 --- a/packages/app/src/cli/services/dev/processes/dev-session/dev-session-logger.test.ts +++ b/packages/app/src/cli/services/dev/processes/dev-session/dev-session-logger.test.ts @@ -3,7 +3,7 @@ import {UserError} from './dev-session.js' import {AppEvent, EventType} from '../../app-events/app-event-watcher.js' import {ExtensionInstance} from '../../../../models/extensions/extension-instance.js' import {describe, expect, test, vi, beforeEach} from 'vitest' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import {Writable} from 'stream' describe('DevSessionLogger', () => { diff --git a/packages/app/src/cli/services/dev/processes/dev-session/dev-session-logger.ts b/packages/app/src/cli/services/dev/processes/dev-session/dev-session-logger.ts index add75295c6d..6f719ded92e 100644 --- a/packages/app/src/cli/services/dev/processes/dev-session/dev-session-logger.ts +++ b/packages/app/src/cli/services/dev/processes/dev-session/dev-session-logger.ts @@ -1,8 +1,8 @@ import {UserError} from './dev-session.js' import {AppEvent, EventType} from '../../app-events/app-event-watcher.js' import {ExtensionInstance} from '../../../../models/extensions/extension-instance.js' -import {outputToken, outputContent, outputDebug} from '@shopify/cli-kit/node/output' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' +import {outputToken, outputContent, outputDebug} from '@shopify/cli-kit/shared/node/output' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' import {Writable} from 'stream' export class DevSessionLogger { diff --git a/packages/app/src/cli/services/dev/processes/dev-session/dev-session-process.test.ts b/packages/app/src/cli/services/dev/processes/dev-session/dev-session-process.test.ts index 895681ce275..3da367c79fb 100644 --- a/packages/app/src/cli/services/dev/processes/dev-session/dev-session-process.test.ts +++ b/packages/app/src/cli/services/dev/processes/dev-session/dev-session-process.test.ts @@ -14,22 +14,22 @@ import { testWebhookExtensions, } from '../../../../models/app/app.test-data.js' import {getUploadURL} from '../../../bundle.js' -import {formData} from '@shopify/cli-kit/node/http' +import {formData} from '@shopify/cli-kit/shared/node/http' import {describe, expect, test, vi, beforeEach, afterEach} from 'vitest' -import {AbortSignal, AbortController} from '@shopify/cli-kit/node/abort' -import {flushPromises} from '@shopify/cli-kit/node/promises' -import * as outputContext from '@shopify/cli-kit/node/ui/components' -import {readdir} from '@shopify/cli-kit/node/fs' -import {firstPartyDev} from '@shopify/cli-kit/node/context/local' - -vi.mock('@shopify/cli-kit/node/fs') -vi.mock('@shopify/cli-kit/node/archiver') -vi.mock('@shopify/cli-kit/node/http') +import {AbortSignal, AbortController} from '@shopify/cli-kit/shared/node/abort' +import {flushPromises} from '@shopify/cli-kit/shared/node/promises' +import * as outputContext from '@shopify/cli-kit/shared/node/ui/components' +import {readdir} from '@shopify/cli-kit/shared/node/fs' +import {firstPartyDev} from '@shopify/cli-kit/shared/node/context/local' + +vi.mock('@shopify/cli-kit/shared/node/fs') +vi.mock('@shopify/cli-kit/shared/node/archiver') +vi.mock('@shopify/cli-kit/shared/node/http') vi.mock('../../../../utilities/app/app-url.js') vi.mock('node-fetch') vi.mock('../../../bundle.js') -vi.mock('@shopify/cli-kit/node/context/local', async (importOriginal) => { - const original = await importOriginal() +vi.mock('@shopify/cli-kit/shared/node/context/local', async (importOriginal) => { + const original = await importOriginal() return { ...original, firstPartyDev: vi.fn().mockReturnValue(false), diff --git a/packages/app/src/cli/services/dev/processes/dev-session/dev-session-status-manager.ts b/packages/app/src/cli/services/dev/processes/dev-session/dev-session-status-manager.ts index 027caff0bcf..3b0386c725e 100644 --- a/packages/app/src/cli/services/dev/processes/dev-session/dev-session-status-manager.ts +++ b/packages/app/src/cli/services/dev/processes/dev-session/dev-session-status-manager.ts @@ -1,4 +1,4 @@ -import {deepCompare} from '@shopify/cli-kit/common/object' +import {deepCompare} from '@shopify/cli-kit/shared/common/object' import {EventEmitter} from 'events' export type DevSessionStatusMessageType = 'error' | 'success' | 'loading' diff --git a/packages/app/src/cli/services/dev/processes/dev-session/dev-session.ts b/packages/app/src/cli/services/dev/processes/dev-session/dev-session.ts index e4b3035eae4..afa177cb70c 100644 --- a/packages/app/src/cli/services/dev/processes/dev-session/dev-session.ts +++ b/packages/app/src/cli/services/dev/processes/dev-session/dev-session.ts @@ -6,14 +6,14 @@ import {compressBundle, getUploadURL, uploadToGCS, writeManifestToBundle} from ' import {DevSessionCreateOptions, DevSessionUpdateOptions} from '../../../../utilities/developer-platform-client.js' import {AppManifest} from '../../../../models/app/app.js' import {getWebSocketUrl} from '../../extension.js' -import {endHRTimeInMs, startHRTime} from '@shopify/cli-kit/node/hrtime' +import {endHRTimeInMs, startHRTime} from '@shopify/cli-kit/shared/node/hrtime' import {ClientError} from 'graphql-request' -import {JsonMapType} from '@shopify/cli-kit/node/toml' -import {AbortError} from '@shopify/cli-kit/node/error' -import {firstPartyDev, isUnitTest} from '@shopify/cli-kit/node/context/local' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' -import {readdir} from '@shopify/cli-kit/node/fs' -import {SerialBatchProcessor} from '@shopify/cli-kit/node/serial-batch-processor' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {firstPartyDev, isUnitTest} from '@shopify/cli-kit/shared/node/context/local' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' +import {readdir} from '@shopify/cli-kit/shared/node/fs' +import {SerialBatchProcessor} from '@shopify/cli-kit/shared/node/serial-batch-processor' import {Writable} from 'stream' export interface UserError { diff --git a/packages/app/src/cli/services/dev/processes/draftable-extension.ts b/packages/app/src/cli/services/dev/processes/draftable-extension.ts index a31ed3a11af..8c23206d39a 100644 --- a/packages/app/src/cli/services/dev/processes/draftable-extension.ts +++ b/packages/app/src/cli/services/dev/processes/draftable-extension.ts @@ -7,8 +7,8 @@ import {getAppIdentifiers} from '../../../models/app/identifiers.js' import {installJavy} from '../../function/build.js' import {DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js' import {AppEvent, AppEventWatcher, EventType} from '../app-events/app-event-watcher.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' interface DraftableExtensionOptions { extensions: ExtensionInstance[] diff --git a/packages/app/src/cli/services/dev/processes/previewable-extension.ts b/packages/app/src/cli/services/dev/processes/previewable-extension.ts index 387d97ebeed..43487c6fae4 100644 --- a/packages/app/src/cli/services/dev/processes/previewable-extension.ts +++ b/packages/app/src/cli/services/dev/processes/previewable-extension.ts @@ -3,8 +3,8 @@ import {devUIExtensions} from '../extension.js' import {ExtensionInstance} from '../../../models/extensions/extension-instance.js' import {buildCartURLIfNeeded} from '../extension/utilities.js' import {AppEventWatcher} from '../app-events/app-event-watcher.js' -import {DotEnvFile} from '@shopify/cli-kit/node/dot-env' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {DotEnvFile} from '@shopify/cli-kit/shared/node/dot-env' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' const MANIFEST_VERSION = '3' diff --git a/packages/app/src/cli/services/dev/processes/setup-dev-processes.test.ts b/packages/app/src/cli/services/dev/processes/setup-dev-processes.test.ts index eb1585b6a92..a69e6a8d84d 100644 --- a/packages/app/src/cli/services/dev/processes/setup-dev-processes.test.ts +++ b/packages/app/src/cli/services/dev/processes/setup-dev-processes.test.ts @@ -30,23 +30,23 @@ import {DeveloperPlatformClient} from '../../../utilities/developer-platform-cli import {AppEventWatcher} from '../app-events/app-event-watcher.js' import * as loader from '../../../models/app/loader.js' import {describe, test, expect, beforeEach, vi} from 'vitest' -import {ensureAuthenticatedAdmin, ensureAuthenticatedStorefront} from '@shopify/cli-kit/node/session' +import {ensureAuthenticatedAdmin, ensureAuthenticatedStorefront} from '@shopify/cli-kit/identity/session' import {Config} from '@oclif/core' -import {getEnvironmentVariables} from '@shopify/cli-kit/node/environment' +import {getEnvironmentVariables} from '@shopify/cli-kit/shared/node/environment' import {isStorefrontPasswordProtected} from '@shopify/theme' -import {fetchTheme} from '@shopify/cli-kit/node/themes/api' -import {firstPartyDev} from '@shopify/cli-kit/node/context/local' -import {adminFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {fetchTheme} from '@shopify/cli-kit/themes/api' +import {firstPartyDev} from '@shopify/cli-kit/shared/node/context/local' +import {adminFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' vi.mock('../../context/identifiers.js') -vi.mock('@shopify/cli-kit/node/session.js') +vi.mock('@shopify/cli-kit/identity/session.js') vi.mock('../fetch.js') -vi.mock('@shopify/cli-kit/node/environment') +vi.mock('@shopify/cli-kit/shared/node/environment') vi.mock('@shopify/theme') -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/context/fqdn', async (importOriginal) => { - const original = await importOriginal() +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/context/fqdn', async (importOriginal) => { + const original = await importOriginal() return { ...original, adminFqdn: vi.fn(), diff --git a/packages/app/src/cli/services/dev/processes/setup-dev-processes.ts b/packages/app/src/cli/services/dev/processes/setup-dev-processes.ts index 2ab5609397d..2b94c91e1b6 100644 --- a/packages/app/src/cli/services/dev/processes/setup-dev-processes.ts +++ b/packages/app/src/cli/services/dev/processes/setup-dev-processes.ts @@ -20,12 +20,12 @@ import {ApplicationURLs} from '../urls.js' import {DeveloperPlatformClient} from '../../../utilities/developer-platform-client.js' import {AppEventWatcher} from '../app-events/app-event-watcher.js' import {reloadApp} from '../../../models/app/loader.js' -import {getAvailableTCPPort} from '@shopify/cli-kit/node/tcp' -import {isTruthy} from '@shopify/cli-kit/node/context/utilities' -import {firstPartyDev} from '@shopify/cli-kit/node/context/local' -import {getEnvironmentVariables} from '@shopify/cli-kit/node/environment' -import {outputInfo} from '@shopify/cli-kit/node/output' -import {adminFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {getAvailableTCPPort} from '@shopify/cli-kit/shared/node/tcp' +import {isTruthy} from '@shopify/cli-kit/shared/node/context/utilities' +import {firstPartyDev} from '@shopify/cli-kit/shared/node/context/local' +import {getEnvironmentVariables} from '@shopify/cli-kit/shared/node/environment' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' +import {adminFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' interface ProxyServerProcess extends BaseProcess<{ diff --git a/packages/app/src/cli/services/dev/processes/theme-app-extension.test.ts b/packages/app/src/cli/services/dev/processes/theme-app-extension.test.ts index fad6a5dc1c2..203700f38f5 100644 --- a/packages/app/src/cli/services/dev/processes/theme-app-extension.test.ts +++ b/packages/app/src/cli/services/dev/processes/theme-app-extension.test.ts @@ -7,21 +7,21 @@ import { testThemeExtensions, } from '../../../models/app/app.test-data.js' import {ClientName} from '../../../utilities/developer-platform-client.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' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {AdminSession, ensureAuthenticatedAdmin} from '@shopify/cli-kit/identity/session' +import {fetchTheme} from '@shopify/cli-kit/themes/api' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {Theme} from '@shopify/cli-kit/themes/types' import {vi, describe, test, expect, beforeEach} from 'vitest' -import {renderInfo} from '@shopify/cli-kit/node/ui' -import {partnersFqdn, adminFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' +import {partnersFqdn, adminFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' vi.mock('../../../utilities/extensions/theme/host-theme-manager') -vi.mock('@shopify/cli-kit/node/output') -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/context/fqdn') -vi.mock('@shopify/cli-kit/node/ui', async (realImport) => { - const realModule = await realImport() +vi.mock('@shopify/cli-kit/shared/node/output') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/context/fqdn') +vi.mock('@shopify/cli-kit/shared/node/ui', async (realImport) => { + const realModule = await realImport() const mockModule = {renderInfo: vi.fn()} return {...realModule, ...mockModule} 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 index 6a032815e03..c0bcab563e2 100644 --- a/packages/app/src/cli/services/dev/processes/theme-app-extension.ts +++ b/packages/app/src/cli/services/dev/processes/theme-app-extension.ts @@ -3,14 +3,14 @@ import {HostThemeManager} from '../../../utilities/extensions/theme/host-theme-m import {AppInterface} from '../../../models/app/app.js' import {OrganizationApp} from '../../../models/organization.js' import {ClientName} from '../../../utilities/developer-platform-client.js' -import {outputDebug} from '@shopify/cli-kit/node/output' -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' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {renderInfo, renderTasks, Task} from '@shopify/cli-kit/node/ui' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AdminSession, ensureAuthenticatedAdmin} from '@shopify/cli-kit/identity/session' +import {fetchTheme} from '@shopify/cli-kit/themes/api' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {Theme} from '@shopify/cli-kit/themes/types' +import {renderInfo, renderTasks, Task} from '@shopify/cli-kit/shared/node/ui' import {initializeDevelopmentExtensionServer, ensureValidPassword, isStorefrontPasswordProtected} from '@shopify/theme' -import {partnersFqdn, adminFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {partnersFqdn, adminFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' interface ThemeAppExtensionServerOptions { theme: Theme diff --git a/packages/app/src/cli/services/dev/processes/types.ts b/packages/app/src/cli/services/dev/processes/types.ts index c66055bc132..f4a6b4bc74b 100644 --- a/packages/app/src/cli/services/dev/processes/types.ts +++ b/packages/app/src/cli/services/dev/processes/types.ts @@ -1,4 +1,4 @@ -import {AbortSignal} from '@shopify/cli-kit/node/abort' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' import {Writable} from 'node:stream' diff --git a/packages/app/src/cli/services/dev/processes/web.ts b/packages/app/src/cli/services/dev/processes/web.ts index ceb16ebc69a..b728027fd5d 100644 --- a/packages/app/src/cli/services/dev/processes/web.ts +++ b/packages/app/src/cli/services/dev/processes/web.ts @@ -2,10 +2,10 @@ import {BaseProcess} from './types.js' import {frontAndBackendConfig} from './utils.js' import {Web, WebType} from '../../../models/app/app.js' import {isWebType} from '../../../models/app/loader.js' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {getAvailableTCPPort} from '@shopify/cli-kit/node/tcp' -import {exec} from '@shopify/cli-kit/node/system' -import {isVerbose} from '@shopify/cli-kit/node/context/local' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {getAvailableTCPPort} from '@shopify/cli-kit/shared/node/tcp' +import {exec} from '@shopify/cli-kit/shared/node/system' +import {isVerbose} from '@shopify/cli-kit/shared/node/context/local' import {Writable} from 'stream' interface LaunchWebOptions { diff --git a/packages/app/src/cli/services/dev/select-app.ts b/packages/app/src/cli/services/dev/select-app.ts index 2a32754f131..c70a56bc858 100644 --- a/packages/app/src/cli/services/dev/select-app.ts +++ b/packages/app/src/cli/services/dev/select-app.ts @@ -4,8 +4,8 @@ import {Organization, MinimalOrganizationApp, OrganizationApp} from '../../model import {getCachedCommandInfo, setCachedCommandTomlPreference} from '../local-storage.js' import {CreateAppOptions, DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {AppConfigurationFileName} from '../../models/app/loader.js' -import {BugError} from '@shopify/cli-kit/node/error' -import {outputInfo, outputDebug} from '@shopify/cli-kit/node/output' +import {BugError} from '@shopify/cli-kit/shared/node/error' +import {outputInfo, outputDebug} from '@shopify/cli-kit/shared/node/output' const MAX_PROMPT_RETRIES = 2 diff --git a/packages/app/src/cli/services/dev/select-store.test.ts b/packages/app/src/cli/services/dev/select-store.test.ts index 2412fe27235..38329aac367 100644 --- a/packages/app/src/cli/services/dev/select-store.test.ts +++ b/packages/app/src/cli/services/dev/select-store.test.ts @@ -11,8 +11,8 @@ import {describe, expect, vi, test} from 'vitest' vi.mock('../../prompts/dev') vi.mock('./fetch') -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/system') const ORG1: Organization = { id: '1', diff --git a/packages/app/src/cli/services/dev/select-store.ts b/packages/app/src/cli/services/dev/select-store.ts index 6e8d19f4d66..ad60322fb48 100644 --- a/packages/app/src/cli/services/dev/select-store.ts +++ b/packages/app/src/cli/services/dev/select-store.ts @@ -9,11 +9,11 @@ import { ConvertDevToTransferDisabledStoreVariables, } from '../../api/graphql/convert_dev_to_transfer_disabled_store.js' import {ClientName, DeveloperPlatformClient, Paginateable} from '../../utilities/developer-platform-client.js' -import {sleep} from '@shopify/cli-kit/node/system' -import {renderInfo, renderTasks} from '@shopify/cli-kit/node/ui' -import {firstPartyDev} from '@shopify/cli-kit/node/context/local' -import {AbortError, BugError, CancelExecution} from '@shopify/cli-kit/node/error' -import {outputSuccess} from '@shopify/cli-kit/node/output' +import {sleep} from '@shopify/cli-kit/shared/node/system' +import {renderInfo, renderTasks} from '@shopify/cli-kit/shared/node/ui' +import {firstPartyDev} from '@shopify/cli-kit/shared/node/context/local' +import {AbortError, BugError, CancelExecution} from '@shopify/cli-kit/shared/node/error' +import {outputSuccess} from '@shopify/cli-kit/shared/node/output' /** * Select store from list or diff --git a/packages/app/src/cli/services/dev/tunnel-mode.test.ts b/packages/app/src/cli/services/dev/tunnel-mode.test.ts index 61be2b2dd36..1611b01a210 100644 --- a/packages/app/src/cli/services/dev/tunnel-mode.test.ts +++ b/packages/app/src/cli/services/dev/tunnel-mode.test.ts @@ -1,9 +1,9 @@ import {AutoTunnel, CustomTunnel, getTunnelMode, NoTunnel} from './tunnel-mode.js' import {ports} from '../../constants.js' -import {checkPortAvailability, getAvailableTCPPort} from '@shopify/cli-kit/node/tcp' +import {checkPortAvailability, getAvailableTCPPort} from '@shopify/cli-kit/shared/node/tcp' import {test, expect, describe, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/tcp') +vi.mock('@shopify/cli-kit/shared/node/tcp') vi.mock('../../utilities/mkcert.js') describe('getTunnelMode() if tunnelUrl is defined', () => { diff --git a/packages/app/src/cli/services/dev/tunnel-mode.ts b/packages/app/src/cli/services/dev/tunnel-mode.ts index f29563dfe2c..f42c150bffd 100644 --- a/packages/app/src/cli/services/dev/tunnel-mode.ts +++ b/packages/app/src/cli/services/dev/tunnel-mode.ts @@ -1,6 +1,6 @@ import {ports} from '../../constants.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {getAvailableTCPPort} from '@shopify/cli-kit/node/tcp' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {getAvailableTCPPort} from '@shopify/cli-kit/shared/node/tcp' export type TunnelMode = NoTunnel | AutoTunnel | CustomTunnel diff --git a/packages/app/src/cli/services/dev/ui.test.tsx b/packages/app/src/cli/services/dev/ui.test.tsx index 5be41b16166..e34aa174acf 100644 --- a/packages/app/src/cli/services/dev/ui.test.tsx +++ b/packages/app/src/cli/services/dev/ui.test.tsx @@ -4,11 +4,11 @@ import {DevSessionUI} from './ui/components/DevSessionUI.js' import {DevSessionStatusManager} from './processes/dev-session/dev-session-status-manager.js' import {testDeveloperPlatformClient} from '../../models/app/app.test-data.js' import {afterEach, describe, expect, test, vi} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' -import {AbortController} from '@shopify/cli-kit/node/abort' -import {terminalSupportsPrompting} from '@shopify/cli-kit/node/system' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' +import {terminalSupportsPrompting} from '@shopify/cli-kit/shared/node/system' -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system') vi.mock('./ui/components/Dev.js') vi.mock('../context.js') vi.mock('./ui/components/DevSessionUI.js') diff --git a/packages/app/src/cli/services/dev/ui.tsx b/packages/app/src/cli/services/dev/ui.tsx index 8477287ff48..b20177d9128 100644 --- a/packages/app/src/cli/services/dev/ui.tsx +++ b/packages/app/src/cli/services/dev/ui.tsx @@ -2,10 +2,10 @@ import {Dev, DevProps} from './ui/components/Dev.js' import {DevSessionUI} from './ui/components/DevSessionUI.js' import {DevSessionStatusManager} from './processes/dev-session/dev-session-status-manager.js' import React from 'react' -import {render} from '@shopify/cli-kit/node/ui' -import {terminalSupportsPrompting} from '@shopify/cli-kit/node/system' -import {isTruthy} from '@shopify/cli-kit/node/context/utilities' -import {isUnitTest} from '@shopify/cli-kit/node/context/local' +import {render} from '@shopify/cli-kit/shared/node/ui' +import {terminalSupportsPrompting} from '@shopify/cli-kit/shared/node/system' +import {isTruthy} from '@shopify/cli-kit/shared/node/context/utilities' +import {isUnitTest} from '@shopify/cli-kit/shared/node/context/local' export async function renderDev({ processes, diff --git a/packages/app/src/cli/services/dev/ui/components/Dev.test.tsx b/packages/app/src/cli/services/dev/ui/components/Dev.test.tsx index b4435030ee0..0965aa1e8e0 100644 --- a/packages/app/src/cli/services/dev/ui/components/Dev.test.tsx +++ b/packages/app/src/cli/services/dev/ui/components/Dev.test.tsx @@ -8,16 +8,16 @@ import { Stdin, waitForContent, waitForInputsToBeReady, -} from '@shopify/cli-kit/node/testing/ui' -import {AbortController, AbortSignal} from '@shopify/cli-kit/node/abort' +} from '@shopify/cli-kit/shared/node/testing/ui' +import {AbortController, AbortSignal} from '@shopify/cli-kit/shared/node/abort' import React from 'react' import {describe, expect, test, vi} from 'vitest' -import {unstyled} from '@shopify/cli-kit/node/output' -import {openURL, sleep} from '@shopify/cli-kit/node/system' +import {unstyled} from '@shopify/cli-kit/shared/node/output' +import {openURL, sleep} from '@shopify/cli-kit/shared/node/system' import {Writable} from 'stream' -vi.mock('@shopify/cli-kit/node/system', async () => { - const actual: any = await vi.importActual('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system', async () => { + const actual: any = await vi.importActual('@shopify/cli-kit/shared/node/system') return { ...actual, openURL: vi.fn(), diff --git a/packages/app/src/cli/services/dev/ui/components/Dev.tsx b/packages/app/src/cli/services/dev/ui/components/Dev.tsx index eb93e7f529a..c02a0ad0efc 100644 --- a/packages/app/src/cli/services/dev/ui/components/Dev.tsx +++ b/packages/app/src/cli/services/dev/ui/components/Dev.tsx @@ -1,17 +1,17 @@ import metadata from '../../../../metadata.js' import {DeveloperPlatformClient} from '../../../../utilities/developer-platform-client.js' import {ExtensionInstance} from '../../../../models/extensions/extension-instance.js' -import {OutputProcess} from '@shopify/cli-kit/node/output' -import {ConcurrentOutput, Link} from '@shopify/cli-kit/node/ui/components' -import {useAbortSignal} from '@shopify/cli-kit/node/ui/hooks' +import {OutputProcess} from '@shopify/cli-kit/shared/node/output' +import {ConcurrentOutput, Link} from '@shopify/cli-kit/shared/node/ui/components' +import {useAbortSignal} from '@shopify/cli-kit/shared/node/ui/hooks' import React, {FunctionComponent, useEffect, useMemo, useRef, useState} from 'react' -import {AbortController, AbortSignal} from '@shopify/cli-kit/node/abort' -import {Box, Text, useInput, useStdin} from '@shopify/cli-kit/node/ink' -import {handleCtrlC} from '@shopify/cli-kit/node/ui' -import {openURL} from '@shopify/cli-kit/node/system' -import figures from '@shopify/cli-kit/node/figures' -import {isUnitTest} from '@shopify/cli-kit/node/context/local' -import {treeKill} from '@shopify/cli-kit/node/tree-kill' +import {AbortController, AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {Box, Text, useInput, useStdin} from '@shopify/cli-kit/shared/node/ink' +import {handleCtrlC} from '@shopify/cli-kit/shared/node/ui' +import {openURL} from '@shopify/cli-kit/shared/node/system' +import figures from '@shopify/cli-kit/shared/node/figures' +import {isUnitTest} from '@shopify/cli-kit/shared/node/context/local' +import {treeKill} from '@shopify/cli-kit/shared/node/tree-kill' import {Writable} from 'stream' export interface DeveloperPreviewController { diff --git a/packages/app/src/cli/services/dev/ui/components/DevSessionUI.test.tsx b/packages/app/src/cli/services/dev/ui/components/DevSessionUI.test.tsx index 6a89dc34e93..481893e3d20 100644 --- a/packages/app/src/cli/services/dev/ui/components/DevSessionUI.test.tsx +++ b/packages/app/src/cli/services/dev/ui/components/DevSessionUI.test.tsx @@ -6,17 +6,17 @@ import { sendInputAndWait, waitForContent, waitForInputsToBeReady, -} from '@shopify/cli-kit/node/testing/ui' -import {AbortController} from '@shopify/cli-kit/node/abort' +} from '@shopify/cli-kit/shared/node/testing/ui' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' import React from 'react' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {unstyled} from '@shopify/cli-kit/node/output' -import {openURL} from '@shopify/cli-kit/node/system' +import {unstyled} from '@shopify/cli-kit/shared/node/output' +import {openURL} from '@shopify/cli-kit/shared/node/system' import {Writable} from 'stream' -vi.mock('@shopify/cli-kit/node/system') -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/tree-kill') +vi.mock('@shopify/cli-kit/shared/node/system') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/tree-kill') const mocks = vi.hoisted(() => { return { @@ -26,8 +26,8 @@ const mocks = vi.hoisted(() => { } }) -vi.mock('@shopify/cli-kit/node/ink', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/ink') +vi.mock('@shopify/cli-kit/shared/node/ink', async () => { + const actual = await vi.importActual('@shopify/cli-kit/shared/node/ink') return { ...actual, useStdin: mocks.useStdin, diff --git a/packages/app/src/cli/services/dev/ui/components/DevSessionUI.tsx b/packages/app/src/cli/services/dev/ui/components/DevSessionUI.tsx index 35f3cf44187..4fd38652c78 100644 --- a/packages/app/src/cli/services/dev/ui/components/DevSessionUI.tsx +++ b/packages/app/src/cli/services/dev/ui/components/DevSessionUI.tsx @@ -7,18 +7,18 @@ import { DevSessionStatusMessageType, } from '../../processes/dev-session/dev-session-status-manager.js' import {MAX_EXTENSION_HANDLE_LENGTH} from '../../../../models/extensions/schemas.js' -import {OutputProcess} from '@shopify/cli-kit/node/output' -import {Alert, ConcurrentOutput, Link, TabularData} from '@shopify/cli-kit/node/ui/components' -import {useAbortSignal} from '@shopify/cli-kit/node/ui/hooks' +import {OutputProcess} from '@shopify/cli-kit/shared/node/output' +import {Alert, ConcurrentOutput, Link, TabularData} from '@shopify/cli-kit/shared/node/ui/components' +import {useAbortSignal} from '@shopify/cli-kit/shared/node/ui/hooks' import React, {FunctionComponent, useEffect, useMemo, useState} from 'react' -import {AbortController, AbortSignal} from '@shopify/cli-kit/node/abort' -import {Box, Text, useInput, useStdin} from '@shopify/cli-kit/node/ink' -import {handleCtrlC} from '@shopify/cli-kit/node/ui' -import {openURL} from '@shopify/cli-kit/node/system' -import figures from '@shopify/cli-kit/node/figures' -import {isUnitTest} from '@shopify/cli-kit/node/context/local' -import {treeKill} from '@shopify/cli-kit/node/tree-kill' -import {postRunHookHasCompleted} from '@shopify/cli-kit/node/hooks/postrun' +import {AbortController, AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {Box, Text, useInput, useStdin} from '@shopify/cli-kit/shared/node/ink' +import {handleCtrlC} from '@shopify/cli-kit/shared/node/ui' +import {openURL} from '@shopify/cli-kit/shared/node/system' +import figures from '@shopify/cli-kit/shared/node/figures' +import {isUnitTest} from '@shopify/cli-kit/shared/node/context/local' +import {treeKill} from '@shopify/cli-kit/shared/node/tree-kill' +import {postRunHookHasCompleted} from '@shopify/cli-kit/shared/node/hooks/postrun' import {Writable} from 'stream' interface DevSesionUIProps { diff --git a/packages/app/src/cli/services/dev/ui/components/Spinner.tsx b/packages/app/src/cli/services/dev/ui/components/Spinner.tsx index 593de8c7417..04a0425c659 100644 --- a/packages/app/src/cli/services/dev/ui/components/Spinner.tsx +++ b/packages/app/src/cli/services/dev/ui/components/Spinner.tsx @@ -1,5 +1,5 @@ import React, {useEffect, useState} from 'react' -import {Text} from '@shopify/cli-kit/node/ink' +import {Text} from '@shopify/cli-kit/shared/node/ink' const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'] diff --git a/packages/app/src/cli/services/dev/ui/components/TabPanel.test.tsx b/packages/app/src/cli/services/dev/ui/components/TabPanel.test.tsx index bf14e988045..50760ec355b 100644 --- a/packages/app/src/cli/services/dev/ui/components/TabPanel.test.tsx +++ b/packages/app/src/cli/services/dev/ui/components/TabPanel.test.tsx @@ -1,9 +1,9 @@ import {TabPanel, Tab} from './TabPanel.js' -import {render, sendInputAndWait, waitForInputsToBeReady} from '@shopify/cli-kit/node/testing/ui' +import {render, sendInputAndWait, waitForInputsToBeReady} from '@shopify/cli-kit/shared/node/testing/ui' import React from 'react' import {describe, expect, test, vi} from 'vitest' -import {unstyled} from '@shopify/cli-kit/node/output' -import {Text} from '@shopify/cli-kit/node/ink' +import {unstyled} from '@shopify/cli-kit/shared/node/output' +import {Text} from '@shopify/cli-kit/shared/node/ink' const mocks = vi.hoisted(() => { return { @@ -23,8 +23,8 @@ const mocks = vi.hoisted(() => { } }) -vi.mock('@shopify/cli-kit/node/ink', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/ink') +vi.mock('@shopify/cli-kit/shared/node/ink', async () => { + const actual = await vi.importActual('@shopify/cli-kit/shared/node/ink') return { ...actual, useStdin: mocks.useStdin, diff --git a/packages/app/src/cli/services/dev/ui/components/TabPanel.tsx b/packages/app/src/cli/services/dev/ui/components/TabPanel.tsx index 0c726d9f8ab..bc79d7a6ec9 100644 --- a/packages/app/src/cli/services/dev/ui/components/TabPanel.tsx +++ b/packages/app/src/cli/services/dev/ui/components/TabPanel.tsx @@ -1,5 +1,5 @@ import React, {useState, useRef, useLayoutEffect} from 'react' -import {Box, Text, useInput, useStdin, useStdout, measureElement} from '@shopify/cli-kit/node/ink' +import {Box, Text, useInput, useStdin, useStdout, measureElement} from '@shopify/cli-kit/shared/node/ink' export interface Tab { label: string diff --git a/packages/app/src/cli/services/dev/update-extension.test.ts b/packages/app/src/cli/services/dev/update-extension.test.ts index c9cf1d11ee2..c861ecb2e28 100644 --- a/packages/app/src/cli/services/dev/update-extension.test.ts +++ b/packages/app/src/cli/services/dev/update-extension.test.ts @@ -10,15 +10,15 @@ import { import {parseConfigurationFile, parseConfigurationObjectAgainstSpecification} from '../../models/app/loader.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {ExtensionUpdateDraftMutationVariables} from '../../api/graphql/partners/generated/update-draft.js' -import {inTemporaryDirectory, mkdir, writeFile} from '@shopify/cli-kit/node/fs' -import {outputInfo} from '@shopify/cli-kit/node/output' +import {inTemporaryDirectory, mkdir, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' import {describe, expect, vi, test} from 'vitest' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' -import {platformAndArch} from '@shopify/cli-kit/node/os' -import {randomUUID} from '@shopify/cli-kit/node/crypto' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' +import {platformAndArch} from '@shopify/cli-kit/shared/node/os' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' -vi.mock('@shopify/cli-kit/node/crypto') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/crypto') +vi.mock('@shopify/cli-kit/shared/node/output') vi.mock('../../models/app/loader.js', async () => { const actual: any = await vi.importActual('../../models/app/loader.js') return { diff --git a/packages/app/src/cli/services/dev/update-extension.ts b/packages/app/src/cli/services/dev/update-extension.ts index db193d0e33b..30c5d379afc 100644 --- a/packages/app/src/cli/services/dev/update-extension.ts +++ b/packages/app/src/cli/services/dev/update-extension.ts @@ -12,11 +12,11 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {ExtensionsArraySchema, UnifiedSchema} from '../../models/extensions/schemas.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {themeExtensionConfig} from '../deploy/theme-extension-config.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {readFile} from '@shopify/cli-kit/node/fs' -import {OutputMessage, outputInfo} from '@shopify/cli-kit/node/output' -import {relativizePath} from '@shopify/cli-kit/node/path' -import {errorsToString as zodErrorsToString, zod} from '@shopify/cli-kit/node/schema' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {readFile} from '@shopify/cli-kit/shared/node/fs' +import {OutputMessage, outputInfo} from '@shopify/cli-kit/shared/node/output' +import {relativizePath} from '@shopify/cli-kit/shared/node/path' +import {errorsToString as zodErrorsToString, zod} from '@shopify/cli-kit/shared/node/schema' import {Writable} from 'stream' interface UpdateExtensionDraftOptions { diff --git a/packages/app/src/cli/services/dev/urls.test.ts b/packages/app/src/cli/services/dev/urls.test.ts index af2869706bc..fc7143f89b1 100644 --- a/packages/app/src/cli/services/dev/urls.test.ts +++ b/packages/app/src/cli/services/dev/urls.test.ts @@ -18,11 +18,16 @@ import {setCachedAppInfo} from '../local-storage.js' import {setManyAppConfigValues} from '../app/patch-app-configuration-file.js' import {AppLinkedInterface} from '../../models/app/app.js' import {beforeEach, describe, expect, vi, test} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {getAvailableTCPPort} from '@shopify/cli-kit/node/tcp' -import {codespacePortForwardingDomain, codespaceURL, gitpodURL, isUnitTest} from '@shopify/cli-kit/node/context/local' -import {renderConfirmationPrompt, renderSelectPrompt} from '@shopify/cli-kit/node/ui' -import {terminalSupportsPrompting} from '@shopify/cli-kit/node/system' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {getAvailableTCPPort} from '@shopify/cli-kit/shared/node/tcp' +import { + codespacePortForwardingDomain, + codespaceURL, + gitpodURL, + isUnitTest, +} from '@shopify/cli-kit/shared/node/context/local' +import {renderConfirmationPrompt, renderSelectPrompt} from '@shopify/cli-kit/shared/node/ui' +import {terminalSupportsPrompting} from '@shopify/cli-kit/shared/node/system' vi.mock('../local-storage.js') vi.mock('../app/patch-app-configuration-file.js', () => { @@ -30,11 +35,11 @@ vi.mock('../app/patch-app-configuration-file.js', () => { setManyAppConfigValues: vi.fn(), } }) -vi.mock('@shopify/cli-kit/node/tcp') -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/plugins') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/tcp') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/plugins') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/shared/node/system') beforeEach(() => { vi.mocked(getAvailableTCPPort).mockResolvedValue(3042) diff --git a/packages/app/src/cli/services/dev/urls.ts b/packages/app/src/cli/services/dev/urls.ts index 977ed669e0f..d1bc2fc2e2c 100644 --- a/packages/app/src/cli/services/dev/urls.ts +++ b/packages/app/src/cli/services/dev/urls.ts @@ -6,14 +6,14 @@ import {AppConfigurationUsedByCli} from '../../models/extensions/specifications/ import {prependApplicationUrl} from '../../models/extensions/specifications/validation/url_prepender.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {setManyAppConfigValues} from '../app/patch-app-configuration-file.js' -import {AbortError, BugError} from '@shopify/cli-kit/node/error' +import {AbortError, BugError} from '@shopify/cli-kit/shared/node/error' import {Config} from '@oclif/core' -import {isValidURL} from '@shopify/cli-kit/common/url' -import {codespaceURL, codespacePortForwardingDomain, gitpodURL} from '@shopify/cli-kit/node/context/local' -import {fanoutHooks} from '@shopify/cli-kit/node/plugins' -import {terminalSupportsPrompting} from '@shopify/cli-kit/node/system' -import {TunnelClient} from '@shopify/cli-kit/node/plugins/tunnel' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {isValidURL} from '@shopify/cli-kit/shared/common/url' +import {codespaceURL, codespacePortForwardingDomain, gitpodURL} from '@shopify/cli-kit/shared/node/context/local' +import {fanoutHooks} from '@shopify/cli-kit/shared/node/plugins' +import {terminalSupportsPrompting} from '@shopify/cli-kit/shared/node/system' +import {TunnelClient} from '@shopify/cli-kit/shared/node/plugins/tunnel' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' interface AppProxy { proxyUrl: string diff --git a/packages/app/src/cli/services/execute-operation.test.ts b/packages/app/src/cli/services/execute-operation.test.ts index eb503d1f82d..a547536248c 100644 --- a/packages/app/src/cli/services/execute-operation.test.ts +++ b/packages/app/src/cli/services/execute-operation.test.ts @@ -1,18 +1,18 @@ import {executeOperation} from './execute-operation.js' import {createAdminSessionAsApp, resolveApiVersion, validateMutationStore} from './graphql/common.js' import {OrganizationApp, OrganizationSource, OrganizationStore} from '../models/organization.js' -import {renderSuccess, renderError, renderSingleTask} from '@shopify/cli-kit/node/ui' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' +import {renderSuccess, renderError, renderSingleTask} from '@shopify/cli-kit/shared/node/ui' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' import {ClientError} from 'graphql-request' -import {inTemporaryDirectory, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {inTemporaryDirectory, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' import {describe, test, expect, vi, beforeEach, afterEach} from 'vitest' vi.mock('./graphql/common.js') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/api/admin') -vi.mock('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/admin/api') +vi.mock('@shopify/cli-kit/shared/node/fs') describe('executeOperation', () => { const mockOrganization = { diff --git a/packages/app/src/cli/services/execute-operation.ts b/packages/app/src/cli/services/execute-operation.ts index 00807b16071..e8fc63d16e7 100644 --- a/packages/app/src/cli/services/execute-operation.ts +++ b/packages/app/src/cli/services/execute-operation.ts @@ -5,14 +5,14 @@ import { validateMutationStore, } from './graphql/common.js' import {OrganizationApp, Organization, OrganizationStore} from '../models/organization.js' -import {renderSuccess, renderError, renderSingleTask} from '@shopify/cli-kit/node/ui' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {outputContent, outputToken, outputResult} from '@shopify/cli-kit/node/output' -import {AbortError} from '@shopify/cli-kit/node/error' -import {adminRequestDoc} from '@shopify/cli-kit/node/api/admin' +import {renderSuccess, renderError, renderSingleTask} from '@shopify/cli-kit/shared/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {outputContent, outputToken, outputResult} from '@shopify/cli-kit/shared/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {adminRequestDoc} from '@shopify/cli-kit/admin/api' import {ClientError} from 'graphql-request' import {parse} from 'graphql' -import {writeFile, readFile, fileExists} from '@shopify/cli-kit/node/fs' +import {writeFile, readFile, fileExists} from '@shopify/cli-kit/shared/node/fs' interface ExecuteOperationInput { organization: Organization diff --git a/packages/app/src/cli/services/extensions/bundle.test.ts b/packages/app/src/cli/services/extensions/bundle.test.ts index 10c62e4be56..dca42401674 100644 --- a/packages/app/src/cli/services/extensions/bundle.test.ts +++ b/packages/app/src/cli/services/extensions/bundle.test.ts @@ -4,8 +4,8 @@ import {loadLocalExtensionsSpecifications} from '../../models/extensions/load-sp import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {describe, expect, test, vi} from 'vitest' import {context as esContext} from 'esbuild' -import {glob, inTemporaryDirectory, mkdir, touchFileSync} from '@shopify/cli-kit/node/fs' -import {basename, joinPath} from '@shopify/cli-kit/node/path' +import {glob, inTemporaryDirectory, mkdir, touchFileSync} from '@shopify/cli-kit/shared/node/fs' +import {basename, joinPath} from '@shopify/cli-kit/shared/node/path' vi.mock('esbuild', async () => { const esbuild: any = await vi.importActual('esbuild') diff --git a/packages/app/src/cli/services/extensions/bundle.ts b/packages/app/src/cli/services/extensions/bundle.ts index 173d4a63550..8335a9a132e 100644 --- a/packages/app/src/cli/services/extensions/bundle.ts +++ b/packages/app/src/cli/services/extensions/bundle.ts @@ -3,12 +3,12 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {themeExtensionFiles} from '../../utilities/extensions/theme.js' import {EsbuildEnvVarRegex, environmentVariableNames} from '../../constants.js' import {context as esContext, formatMessagesSync} from 'esbuild' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {copyFile, glob} from '@shopify/cli-kit/node/fs' -import {joinPath, relativePath} from '@shopify/cli-kit/node/path' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {isTruthy} from '@shopify/cli-kit/node/context/utilities' -import {pickBy} from '@shopify/cli-kit/common/object' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {copyFile, glob} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, relativePath} from '@shopify/cli-kit/shared/node/path' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {isTruthy} from '@shopify/cli-kit/shared/node/context/utilities' +import {pickBy} from '@shopify/cli-kit/shared/common/object' import graphqlLoaderPlugin from '@luckycatfactory/esbuild-graphql-loader' import {Writable} from 'stream' import type {StdinOptions, build as esBuild, Plugin} from 'esbuild' diff --git a/packages/app/src/cli/services/extensions/common.test.ts b/packages/app/src/cli/services/extensions/common.test.ts index 54361e116cf..229aabac702 100644 --- a/packages/app/src/cli/services/extensions/common.test.ts +++ b/packages/app/src/cli/services/extensions/common.test.ts @@ -2,8 +2,8 @@ import {ensureDownloadedExtensionFlavorExists, ensureExtensionDirectoryExists} f import {AppInterface} from '../../models/app/app.js' import {ExtensionFlavor} from '../../models/app/template.js' import {describe, expect, test} from 'vitest' -import {inTemporaryDirectory, mkdir} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, mkdir} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' describe('ensureDownloadedExtensionFlavorExists()', () => { test('it returns the full path if it exists', async () => { diff --git a/packages/app/src/cli/services/extensions/common.ts b/packages/app/src/cli/services/extensions/common.ts index 6075ebbb63d..2208b9acb87 100644 --- a/packages/app/src/cli/services/extensions/common.ts +++ b/packages/app/src/cli/services/extensions/common.ts @@ -2,10 +2,10 @@ import {AppInterface} from '../../models/app/app.js' import {blocks, configurationFileNames} from '../../constants.js' import {ExtensionFlavor} from '../../models/app/template.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import {fileExists, mkdir, touchFile} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' -import {hyphenate} from '@shopify/cli-kit/common/string' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {fileExists, mkdir, touchFile} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {hyphenate} from '@shopify/cli-kit/shared/common/string' export async function ensureDownloadedExtensionFlavorExists( extensionFlavor: ExtensionFlavor | undefined, diff --git a/packages/app/src/cli/services/flow/extension-to-toml.ts b/packages/app/src/cli/services/flow/extension-to-toml.ts index 8c612637e3e..583c6684c77 100644 --- a/packages/app/src/cli/services/flow/extension-to-toml.ts +++ b/packages/app/src/cli/services/flow/extension-to-toml.ts @@ -2,8 +2,8 @@ import {configFromSerializedFields} from './serialize-partners-fields.js' import {FlowPartnersExtensionTypes} from './types.js' import {ExtensionRegistration} from '../../api/graphql/all_app_extension_registrations.js' import {MAX_EXTENSION_HANDLE_LENGTH} from '../../models/extensions/schemas.js' -import {encodeToml} from '@shopify/cli-kit/node/toml' -import {slugify} from '@shopify/cli-kit/common/string' +import {encodeToml} from '@shopify/cli-kit/shared/node/toml' +import {slugify} from '@shopify/cli-kit/shared/common/string' // Used for importing flow_action_definition and flow_trigger_definition migrating them to flow_action and flow_trigger interface FlowConfig { diff --git a/packages/app/src/cli/services/flow/serialize-fields.test.ts b/packages/app/src/cli/services/flow/serialize-fields.test.ts index 1bde811739c..29fc08659c0 100644 --- a/packages/app/src/cli/services/flow/serialize-fields.test.ts +++ b/packages/app/src/cli/services/flow/serialize-fields.test.ts @@ -1,7 +1,7 @@ import {ConfigField} from './types.js' import {serializeConfigField, serializeCommerceObjectField} from './serialize-fields.js' import {describe, expect, test} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' describe('serializeConfigField', () => { test('should serialize a field for a flow action', () => { diff --git a/packages/app/src/cli/services/flow/serialize-fields.ts b/packages/app/src/cli/services/flow/serialize-fields.ts index 1d88c43cce2..eef40c3495d 100644 --- a/packages/app/src/cli/services/flow/serialize-fields.ts +++ b/packages/app/src/cli/services/flow/serialize-fields.ts @@ -7,8 +7,8 @@ import { triggerUiTypesMap, } from './constants.js' import {isSchemaTypeReference} from './validation.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {pascalize} from '@shopify/cli-kit/common/string' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {pascalize} from '@shopify/cli-kit/shared/common/string' const actionTypesToUiTypes = new Map(actionUiTypesMap) const triggerTypesToUiTypes = new Map(triggerUiTypesMap) diff --git a/packages/app/src/cli/services/flow/serialize-partners-fields.ts b/packages/app/src/cli/services/flow/serialize-partners-fields.ts index 7a8a9c45469..28b7d431075 100644 --- a/packages/app/src/cli/services/flow/serialize-partners-fields.ts +++ b/packages/app/src/cli/services/flow/serialize-partners-fields.ts @@ -1,6 +1,6 @@ import {ConfigField, SerializedField, FlowPartnersExtensionTypes} from './types.js' import {PARTNERS_COMMERCE_OBJECTS, uiTypesMap} from './constants.js' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' const uiTypesToTypes = new Map(uiTypesMap.map((typeMapping) => [typeMapping[1], typeMapping[0]])) diff --git a/packages/app/src/cli/services/flow/utils.test.ts b/packages/app/src/cli/services/flow/utils.test.ts index d0582058c5c..fc2330c9f09 100644 --- a/packages/app/src/cli/services/flow/utils.test.ts +++ b/packages/app/src/cli/services/flow/utils.test.ts @@ -1,7 +1,7 @@ import {loadSchemaFromPath} from './utils.js' import {describe, expect, test} from 'vitest' -import {readFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {readFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' describe('loadSchemaFromPath', () => { test('loading schema from valid file path should return file contents', async () => { diff --git a/packages/app/src/cli/services/flow/utils.ts b/packages/app/src/cli/services/flow/utils.ts index cdc71c0575f..5c331d2b41d 100644 --- a/packages/app/src/cli/services/flow/utils.ts +++ b/packages/app/src/cli/services/flow/utils.ts @@ -1,5 +1,5 @@ -import {joinPath} from '@shopify/cli-kit/node/path' -import {glob, readFile} from '@shopify/cli-kit/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {glob, readFile} from '@shopify/cli-kit/shared/node/fs' /** * Loads the schema from the partner defined file. diff --git a/packages/app/src/cli/services/flow/validation.test.ts b/packages/app/src/cli/services/flow/validation.test.ts index 17bef91cf47..4269e2b1777 100644 --- a/packages/app/src/cli/services/flow/validation.test.ts +++ b/packages/app/src/cli/services/flow/validation.test.ts @@ -1,7 +1,7 @@ import {validateFieldShape, validateCustomConfigurationPageConfig, validateReturnTypeConfig} from './validation.js' import {ConfigField} from './types.js' import {describe, expect, test} from 'vitest' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' describe('validateFieldShape', () => { test('should return true when non-commerce object field has valid shape and is flow action', () => { diff --git a/packages/app/src/cli/services/flow/validation.ts b/packages/app/src/cli/services/flow/validation.ts index e69fa1be5c7..63412716ddd 100644 --- a/packages/app/src/cli/services/flow/validation.ts +++ b/packages/app/src/cli/services/flow/validation.ts @@ -1,7 +1,7 @@ import {ConfigField, FlowExtensionTypes} from './types.js' import {SUPPORTED_COMMERCE_OBJECTS} from './constants.js' import {FlowTriggerSettingsSchema} from '../../models/extensions/specifications/flow_trigger.js' -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' function fieldValidationErrorMessage(property: string, configField: ConfigField, handle: string, index: number) { const errorMessage = `'${property}' property must be a string for 'field[${index}]' ${JSON.stringify( diff --git a/packages/app/src/cli/services/format-config-info-body.test.ts b/packages/app/src/cli/services/format-config-info-body.test.ts index 60384d04379..477d9c92407 100644 --- a/packages/app/src/cli/services/format-config-info-body.test.ts +++ b/packages/app/src/cli/services/format-config-info-body.test.ts @@ -1,6 +1,6 @@ import {formatConfigInfoBody} from './format-config-info-body.js' import {describe, test, expect} from 'vitest' -import {Token} from '@shopify/cli-kit/node/ui' +import {Token} from '@shopify/cli-kit/shared/node/ui' describe('formatConfigInfoBody', () => { test('shows the app name', () => { diff --git a/packages/app/src/cli/services/format-config-info-body.ts b/packages/app/src/cli/services/format-config-info-body.ts index 61e15a1ad14..e40b7478b57 100644 --- a/packages/app/src/cli/services/format-config-info-body.ts +++ b/packages/app/src/cli/services/format-config-info-body.ts @@ -1,4 +1,4 @@ -import {Token, TokenItem} from '@shopify/cli-kit/node/ui' +import {Token, TokenItem} from '@shopify/cli-kit/shared/node/ui' interface FormatConfigInfoBodyOptions { appName: string diff --git a/packages/app/src/cli/services/function/binaries.test.ts b/packages/app/src/cli/services/function/binaries.test.ts index 690e7eab186..d33596c3209 100644 --- a/packages/app/src/cli/services/function/binaries.test.ts +++ b/packages/app/src/cli/services/function/binaries.test.ts @@ -10,8 +10,8 @@ import { V1_TRAMPOLINE_VERSION, V2_TRAMPOLINE_VERSION, } from './binaries.js' -import {fetch, Response} from '@shopify/cli-kit/node/http' -import {fileExists, removeFile} from '@shopify/cli-kit/node/fs' +import {fetch, Response} from '@shopify/cli-kit/shared/node/http' +import {fileExists, removeFile} from '@shopify/cli-kit/shared/node/fs' import {describe, expect, test, vi} from 'vitest' import {gzipSync} from 'zlib' @@ -21,8 +21,8 @@ const functionRunner = functionRunnerBinary() const oldJavy = javyBinary('6.0.0') -vi.mock('@shopify/cli-kit/node/http', async () => { - const actualImports = await vi.importActual('@shopify/cli-kit/node/http') +vi.mock('@shopify/cli-kit/shared/node/http', async () => { + const actualImports = await vi.importActual('@shopify/cli-kit/shared/node/http') return { ...actualImports, fetch: vi.fn(), diff --git a/packages/app/src/cli/services/function/binaries.ts b/packages/app/src/cli/services/function/binaries.ts index 8e539d46953..602b047c484 100644 --- a/packages/app/src/cli/services/function/binaries.ts +++ b/packages/app/src/cli/services/function/binaries.ts @@ -1,9 +1,16 @@ -import {joinPath, dirname} from '@shopify/cli-kit/node/path' -import {chmod, createFileWriteStream, fileExists, inTemporaryDirectory, mkdir, moveFile} from '@shopify/cli-kit/node/fs' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {performActionWithRetryAfterRecovery} from '@shopify/cli-kit/common/retry' -import {fetch} from '@shopify/cli-kit/node/http' -import {versionSatisfies} from '@shopify/cli-kit/node/node-package-manager' +import {joinPath, dirname} from '@shopify/cli-kit/shared/node/path' +import { + chmod, + createFileWriteStream, + fileExists, + inTemporaryDirectory, + mkdir, + moveFile, +} from '@shopify/cli-kit/shared/node/fs' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {performActionWithRetryAfterRecovery} from '@shopify/cli-kit/shared/common/retry' +import {fetch} from '@shopify/cli-kit/shared/node/http' +import {versionSatisfies} from '@shopify/cli-kit/shared/node/node-package-manager' import {PipelineSource} from 'stream' import {pipeline} from 'stream/promises' import stream from 'node:stream/promises' diff --git a/packages/app/src/cli/services/function/build.test.ts b/packages/app/src/cli/services/function/build.test.ts index f964ae821ae..1c185174030 100644 --- a/packages/app/src/cli/services/function/build.test.ts +++ b/packages/app/src/cli/services/function/build.test.ts @@ -21,13 +21,13 @@ import { } from './binaries.js' import {testApp, testFunctionExtension} from '../../models/app/app.test-data.js' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {exec} from '@shopify/cli-kit/node/system' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' -import {inTemporaryDirectory, mkdir, readFileSync, writeFile, removeFile} from '@shopify/cli-kit/node/fs' +import {exec} from '@shopify/cli-kit/shared/node/system' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' +import {inTemporaryDirectory, mkdir, readFileSync, writeFile, removeFile} from '@shopify/cli-kit/shared/node/fs' import {build as esBuild} from 'esbuild' -vi.mock('@shopify/cli-kit/node/fs') -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/fs') +vi.mock('@shopify/cli-kit/shared/node/system') vi.mock('esbuild', async () => { const esbuild: any = await vi.importActual('esbuild') diff --git a/packages/app/src/cli/services/function/build.ts b/packages/app/src/cli/services/function/build.ts index d5e0e1bb2da..25a6b6c36b6 100644 --- a/packages/app/src/cli/services/function/build.ts +++ b/packages/app/src/cli/services/function/build.ts @@ -14,17 +14,17 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {FunctionConfigType} from '../../models/extensions/specifications/function.js' import {AppInterface} from '../../models/app/app.js' import {EsbuildEnvVarRegex} from '../../constants.js' -import {hyphenate, camelize} from '@shopify/cli-kit/common/string' -import {outputContent, outputDebug, outputToken} from '@shopify/cli-kit/node/output' -import {exec} from '@shopify/cli-kit/node/system' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' +import {hyphenate, camelize} from '@shopify/cli-kit/shared/common/string' +import {outputContent, outputDebug, outputToken} from '@shopify/cli-kit/shared/node/output' +import {exec} from '@shopify/cli-kit/shared/node/system' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' import {build as esBuild, BuildResult} from 'esbuild' -import {findPathUp, inTemporaryDirectory, readFile, readFileSync, writeFile} from '@shopify/cli-kit/node/fs' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {renderTasks} from '@shopify/cli-kit/node/ui' -import {pickBy} from '@shopify/cli-kit/common/object' -import {runWithTimer} from '@shopify/cli-kit/node/metadata' -import {AbortError} from '@shopify/cli-kit/node/error' +import {findPathUp, inTemporaryDirectory, readFile, readFileSync, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {renderTasks} from '@shopify/cli-kit/shared/node/ui' +import {pickBy} from '@shopify/cli-kit/shared/common/object' +import {runWithTimer} from '@shopify/cli-kit/shared/node/metadata' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {Writable} from 'stream' export const PREFERRED_FUNCTION_NPM_PACKAGE_MAJOR_VERSION = '2' diff --git a/packages/app/src/cli/services/function/common.test.ts b/packages/app/src/cli/services/function/common.test.ts index 045c1790981..2fd70f9f4f7 100644 --- a/packages/app/src/cli/services/function/common.test.ts +++ b/packages/app/src/cli/services/function/common.test.ts @@ -13,15 +13,15 @@ import {generateSchemaService} from '../generate-schema.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {linkedAppContext} from '../app-context.js' import {describe, vi, expect, beforeEach, test} from 'vitest' -import {renderAutocompletePrompt, renderFatalError} from '@shopify/cli-kit/node/ui' -import {joinPath} from '@shopify/cli-kit/node/path' -import {isTerminalInteractive} from '@shopify/cli-kit/node/context/local' -import {fileExists} from '@shopify/cli-kit/node/fs' +import {renderAutocompletePrompt, renderFatalError} from '@shopify/cli-kit/shared/node/ui' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {isTerminalInteractive} from '@shopify/cli-kit/shared/node/context/local' +import {fileExists} from '@shopify/cli-kit/shared/node/fs' vi.mock('../app-context.js') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/fs') vi.mock('../generate-schema.js') let app: AppLinkedInterface diff --git a/packages/app/src/cli/services/function/common.ts b/packages/app/src/cli/services/function/common.ts index 07137a90988..46aca810d45 100644 --- a/packages/app/src/cli/services/function/common.ts +++ b/packages/app/src/cli/services/function/common.ts @@ -3,12 +3,12 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {FunctionConfigType} from '../../models/extensions/specifications/function.js' import {generateSchemaService} from '../generate-schema.js' import {linkedAppContext} from '../app-context.js' -import {resolvePath, cwd, joinPath} from '@shopify/cli-kit/node/path' -import {AbortError} from '@shopify/cli-kit/node/error' +import {resolvePath, cwd, joinPath} from '@shopify/cli-kit/shared/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {Flags} from '@oclif/core' -import {isTerminalInteractive} from '@shopify/cli-kit/node/context/local' -import {renderAutocompletePrompt} from '@shopify/cli-kit/node/ui' -import {fileExists} from '@shopify/cli-kit/node/fs' +import {isTerminalInteractive} from '@shopify/cli-kit/shared/node/context/local' +import {renderAutocompletePrompt} from '@shopify/cli-kit/shared/node/ui' +import {fileExists} from '@shopify/cli-kit/shared/node/fs' export const functionFlags = { path: Flags.string({ diff --git a/packages/app/src/cli/services/function/info.test.ts b/packages/app/src/cli/services/function/info.test.ts index 8c44aa96cf0..b0b09d73f4f 100644 --- a/packages/app/src/cli/services/function/info.test.ts +++ b/packages/app/src/cli/services/function/info.test.ts @@ -11,7 +11,7 @@ import { import {testFunctionExtension} from '../../models/app/app.test-data.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {describe, expect, test, beforeEach} from 'vitest' -import {AlertCustomSection} from '@shopify/cli-kit/node/ui' +import {AlertCustomSection} from '@shopify/cli-kit/shared/node/ui' describe('functionInfo', () => { let ourFunction: ExtensionInstance diff --git a/packages/app/src/cli/services/function/info.ts b/packages/app/src/cli/services/function/info.ts index 3abc7d3d5c5..c12f6bb3e91 100644 --- a/packages/app/src/cli/services/function/info.ts +++ b/packages/app/src/cli/services/function/info.ts @@ -1,6 +1,6 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' -import {InlineToken, AlertCustomSection} from '@shopify/cli-kit/node/ui' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' +import {InlineToken, AlertCustomSection} from '@shopify/cli-kit/shared/node/ui' type Format = 'json' | 'text' diff --git a/packages/app/src/cli/services/function/replay.test.ts b/packages/app/src/cli/services/function/replay.test.ts index 96a49e0cc85..ecdb217f78d 100644 --- a/packages/app/src/cli/services/function/replay.test.ts +++ b/packages/app/src/cli/services/function/replay.test.ts @@ -5,22 +5,22 @@ import {testAppLinked, testFunctionExtension} from '../../models/app/app.test-da import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {FunctionConfigType} from '../../models/extensions/specifications/function.js' import {selectFunctionRunPrompt} from '../../prompts/function/replay.js' -import {randomUUID} from '@shopify/cli-kit/node/crypto' -import {readFile} from '@shopify/cli-kit/node/fs' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' +import {readFile} from '@shopify/cli-kit/shared/node/fs' import {describe, expect, beforeAll, test, vi} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputInfo} from '@shopify/cli-kit/node/output' -import {getLogsDir} from '@shopify/cli-kit/node/logs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' +import {getLogsDir} from '@shopify/cli-kit/shared/node/logs' import {existsSync, readdirSync} from 'fs' vi.mock('fs') -vi.mock('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/fs') vi.mock('../generate-schema.js') vi.mock('../../prompts/function/replay.js') vi.mock('../dev/extension/bundler.js') -vi.mock('@shopify/cli-kit/node/output') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/output') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('./ui.js') vi.mock('./runner.js') diff --git a/packages/app/src/cli/services/function/replay.ts b/packages/app/src/cli/services/function/replay.ts index f8954feac1c..906dff118c8 100644 --- a/packages/app/src/cli/services/function/replay.ts +++ b/packages/app/src/cli/services/function/replay.ts @@ -6,10 +6,10 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {FunctionConfigType} from '../../models/extensions/specifications/function.js' import {selectFunctionRunPrompt} from '../../prompts/function/replay.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import {readFile} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' -import {AbortController} from '@shopify/cli-kit/node/abort' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {readFile} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' import {existsSync, readdirSync} from 'fs' diff --git a/packages/app/src/cli/services/function/runner.test.ts b/packages/app/src/cli/services/function/runner.test.ts index 2e78d04d545..dec8d4ab3f4 100644 --- a/packages/app/src/cli/services/function/runner.test.ts +++ b/packages/app/src/cli/services/function/runner.test.ts @@ -2,10 +2,10 @@ import {runFunction} from './runner.js' import {functionRunnerBinary, downloadBinary} from './binaries.js' import {testFunctionExtension} from '../../models/app/app.test-data.js' import {describe, test, vi, expect} from 'vitest' -import {exec} from '@shopify/cli-kit/node/system' +import {exec} from '@shopify/cli-kit/shared/node/system' import {Readable, Writable} from 'stream' -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system') vi.mock('./binaries.js', async (importOriginal) => { const original = await importOriginal() return { diff --git a/packages/app/src/cli/services/function/runner.ts b/packages/app/src/cli/services/function/runner.ts index e81fe684461..3c152c987cd 100644 --- a/packages/app/src/cli/services/function/runner.ts +++ b/packages/app/src/cli/services/function/runner.ts @@ -2,7 +2,7 @@ import {functionRunnerBinary, downloadBinary} from './binaries.js' import {validateShopifyFunctionPackageVersion} from './build.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {FunctionConfigType} from '../../models/extensions/specifications/function.js' -import {exec} from '@shopify/cli-kit/node/system' +import {exec} from '@shopify/cli-kit/shared/node/system' import {Readable, Writable} from 'stream' interface FunctionRunnerOptions { diff --git a/packages/app/src/cli/services/function/ui.tsx b/packages/app/src/cli/services/function/ui.tsx index 8ef10080c67..4ae3a473f05 100644 --- a/packages/app/src/cli/services/function/ui.tsx +++ b/packages/app/src/cli/services/function/ui.tsx @@ -1,5 +1,5 @@ import {Replay, ReplayProps} from './ui/components/Replay/Replay.js' -import {render} from '@shopify/cli-kit/node/ui' +import {render} from '@shopify/cli-kit/shared/node/ui' import React from 'react' export async function renderReplay({selectedRun, abortController, app, extension}: ReplayProps) { diff --git a/packages/app/src/cli/services/function/ui/components/Replay/Replay.test.tsx b/packages/app/src/cli/services/function/ui/components/Replay/Replay.test.tsx index 44af6642b7c..c07480845c1 100644 --- a/packages/app/src/cli/services/function/ui/components/Replay/Replay.test.tsx +++ b/packages/app/src/cli/services/function/ui/components/Replay/Replay.test.tsx @@ -5,11 +5,11 @@ import {testFunctionExtension, testAppLinked} from '../../../../../models/app/ap import {ExtensionInstance} from '../../../../../models/extensions/extension-instance.js' import {FunctionConfigType} from '../../../../../models/extensions/specifications/function.js' import {FunctionRunData} from '../../../replay.js' -import {AbortController} from '@shopify/cli-kit/node/abort' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' import React from 'react' import {beforeAll, describe, expect, test, vi} from 'vitest' -import {unstyled} from '@shopify/cli-kit/node/output' -import {render, sendInputAndWait, waitForInputsToBeReady} from '@shopify/cli-kit/node/testing/ui' +import {unstyled} from '@shopify/cli-kit/shared/node/output' +import {render, sendInputAndWait, waitForInputsToBeReady} from '@shopify/cli-kit/shared/node/testing/ui' vi.mock('./hooks/useFunctionWatcher.js') diff --git a/packages/app/src/cli/services/function/ui/components/Replay/Replay.tsx b/packages/app/src/cli/services/function/ui/components/Replay/Replay.tsx index 5963e621237..f234f36b17d 100644 --- a/packages/app/src/cli/services/function/ui/components/Replay/Replay.tsx +++ b/packages/app/src/cli/services/function/ui/components/Replay/Replay.tsx @@ -6,12 +6,12 @@ import {FunctionConfigType} from '../../../../../models/extensions/specification import {AppLinkedInterface} from '../../../../../models/app/app.js' import {prettyPrintJsonIfPossible} from '../../../../app-logs/utils.js' import {AppEventWatcher} from '../../../../dev/app-events/app-event-watcher.js' -import figures from '@shopify/cli-kit/node/figures' -import {AbortController} from '@shopify/cli-kit/node/abort' +import figures from '@shopify/cli-kit/shared/node/figures' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' import React, {FunctionComponent} from 'react' -import {Box, Text, Static, useInput, useStdin} from '@shopify/cli-kit/node/ink' -import {useAbortSignal} from '@shopify/cli-kit/node/ui/hooks' -import {handleCtrlC} from '@shopify/cli-kit/node/ui' +import {Box, Text, Static, useInput, useStdin} from '@shopify/cli-kit/shared/node/ink' +import {useAbortSignal} from '@shopify/cli-kit/shared/node/ui/hooks' +import {handleCtrlC} from '@shopify/cli-kit/shared/node/ui' export interface ReplayProps { selectedRun: FunctionRunData diff --git a/packages/app/src/cli/services/function/ui/components/Replay/hooks/useFunctionWatcher.test.tsx b/packages/app/src/cli/services/function/ui/components/Replay/hooks/useFunctionWatcher.test.tsx index 5ca209b21fe..d59a29e7b51 100644 --- a/packages/app/src/cli/services/function/ui/components/Replay/hooks/useFunctionWatcher.test.tsx +++ b/packages/app/src/cli/services/function/ui/components/Replay/hooks/useFunctionWatcher.test.tsx @@ -3,8 +3,8 @@ import {FunctionRunData} from '../../../../replay.js' import {testAppLinked, testFunctionExtension} from '../../../../../../models/app/app.test-data.js' import {runFunction} from '../../../../runner.js' import {AppEventWatcher, EventType} from '../../../../../dev/app-events/app-event-watcher.js' -import {AbortController} from '@shopify/cli-kit/node/abort' -import {render} from '@shopify/cli-kit/node/testing/ui' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' +import {render} from '@shopify/cli-kit/shared/node/testing/ui' import {test, describe, vi, beforeEach, afterEach, expect} from 'vitest' import React from 'react' import {Writable} from 'stream' diff --git a/packages/app/src/cli/services/function/ui/components/Replay/hooks/useFunctionWatcher.ts b/packages/app/src/cli/services/function/ui/components/Replay/hooks/useFunctionWatcher.ts index ca1d92859ed..7d48da2a95c 100644 --- a/packages/app/src/cli/services/function/ui/components/Replay/hooks/useFunctionWatcher.ts +++ b/packages/app/src/cli/services/function/ui/components/Replay/hooks/useFunctionWatcher.ts @@ -5,11 +5,11 @@ import {ExtensionInstance} from '../../../../../../models/extensions/extension-i import {FunctionRunFromRunner, ReplayLog} from '../types.js' import {runFunction} from '../../../../runner.js' import {AppEventWatcher, EventType} from '../../../../../dev/app-events/app-event-watcher.js' -import {AbortController} from '@shopify/cli-kit/node/abort' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' import {useEffect, useState} from 'react' -import {useAbortSignal} from '@shopify/cli-kit/node/ui/hooks' -import {isUnitTest} from '@shopify/cli-kit/node/context/local' -import {treeKill} from '@shopify/cli-kit/node/tree-kill' +import {useAbortSignal} from '@shopify/cli-kit/shared/node/ui/hooks' +import {isUnitTest} from '@shopify/cli-kit/shared/node/context/local' +import {treeKill} from '@shopify/cli-kit/shared/node/tree-kill' import {Writable} from 'stream' interface WatchFunctionForReplayOptions { diff --git a/packages/app/src/cli/services/generate-schema.test.ts b/packages/app/src/cli/services/generate-schema.test.ts index 25cee83d43b..12955923367 100644 --- a/packages/app/src/cli/services/generate-schema.test.ts +++ b/packages/app/src/cli/services/generate-schema.test.ts @@ -1,12 +1,12 @@ import {generateSchemaService} from './generate-schema.js' import {testAppLinked, testDeveloperPlatformClient, testFunctionExtension} from '../models/app/app.test-data.js' import {describe, expect, vi, test} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {inTemporaryDirectory, readFile, mkdir} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import * as output from '@shopify/cli-kit/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {inTemporaryDirectory, readFile, mkdir} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import * as output from '@shopify/cli-kit/shared/node/output' -vi.mock('@shopify/cli-kit/node/context/local') +vi.mock('@shopify/cli-kit/shared/node/context/local') vi.mock('../../../models/app/loader.ts') vi.mock('../models/app/identifiers.js', async () => { const identifiers: any = await vi.importActual('../models/app/identifiers.js') diff --git a/packages/app/src/cli/services/generate-schema.ts b/packages/app/src/cli/services/generate-schema.ts index b611831015a..939ce819043 100644 --- a/packages/app/src/cli/services/generate-schema.ts +++ b/packages/app/src/cli/services/generate-schema.ts @@ -4,10 +4,10 @@ import {SchemaDefinitionByTargetQueryVariables} from '../api/graphql/functions/g import {ExtensionInstance} from '../models/extensions/extension-instance.js' import {FunctionConfigType} from '../models/extensions/specifications/function.js' import {AppLinkedInterface} from '../models/app/app.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputInfo, outputResult} from '@shopify/cli-kit/node/output' -import {writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputInfo, outputResult} from '@shopify/cli-kit/shared/node/output' +import {writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' interface GenerateSchemaOptions { app: AppLinkedInterface diff --git a/packages/app/src/cli/services/generate.test.ts b/packages/app/src/cli/services/generate.test.ts index e00dc5849d1..30aff802b30 100644 --- a/packages/app/src/cli/services/generate.test.ts +++ b/packages/app/src/cli/services/generate.test.ts @@ -17,8 +17,8 @@ import {OrganizationApp} from '../models/organization.js' import {RemoteAwareExtensionSpecification} from '../models/extensions/specification.js' import {DeveloperPlatformClient} from '../utilities/developer-platform-client.js' import {loadLocalExtensionsSpecifications} from '../models/extensions/load-specifications.js' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' -import {joinPath} from '@shopify/cli-kit/node/path' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import {describe, expect, vi, afterEach, test, beforeEach} from 'vitest' vi.mock('../constants.js', async () => { diff --git a/packages/app/src/cli/services/generate.ts b/packages/app/src/cli/services/generate.ts index 038e7e5367d..8656255325e 100644 --- a/packages/app/src/cli/services/generate.ts +++ b/packages/app/src/cli/services/generate.ts @@ -15,13 +15,13 @@ import { import {ExtensionTemplate} from '../models/app/template.js' import {ExtensionSpecification, RemoteAwareExtensionSpecification} from '../models/extensions/specification.js' import {OrganizationApp} from '../models/organization.js' -import {PackageManager} from '@shopify/cli-kit/node/node-package-manager' -import {isShopify} from '@shopify/cli-kit/node/context/local' -import {joinPath} from '@shopify/cli-kit/node/path' -import {RenderAlertOptions, renderSuccess} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' -import {formatPackageManagerCommand} from '@shopify/cli-kit/node/output' -import {groupBy} from '@shopify/cli-kit/common/collection' +import {PackageManager} from '@shopify/cli-kit/shared/node/node-package-manager' +import {isShopify} from '@shopify/cli-kit/shared/node/context/local' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {RenderAlertOptions, renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {formatPackageManagerCommand} from '@shopify/cli-kit/shared/node/output' +import {groupBy} from '@shopify/cli-kit/shared/common/collection' interface GenerateOptions { app: AppLinkedInterface diff --git a/packages/app/src/cli/services/generate/extension.test.ts b/packages/app/src/cli/services/generate/extension.test.ts index 38becb99547..3f8bf23e8c9 100644 --- a/packages/app/src/cli/services/generate/extension.test.ts +++ b/packages/app/src/cli/services/generate/extension.test.ts @@ -19,21 +19,21 @@ import {loadLocalExtensionsSpecifications} from '../../models/extensions/load-sp import {AppLinkedInterface} from '../../models/app/app.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {describe, expect, vi, test} from 'vitest' -import * as output from '@shopify/cli-kit/node/output' +import * as output from '@shopify/cli-kit/shared/node/output' import { installNodeModules, addNPMDependenciesIfNeeded, addResolutionOrOverride, -} from '@shopify/cli-kit/node/node-package-manager' -import * as template from '@shopify/cli-kit/node/liquid' -import * as file from '@shopify/cli-kit/node/fs' -import * as git from '@shopify/cli-kit/node/git' -import {joinPath, dirname} from '@shopify/cli-kit/node/path' -import {slugify} from '@shopify/cli-kit/common/string' +} from '@shopify/cli-kit/shared/node/node-package-manager' +import * as template from '@shopify/cli-kit/shared/node/liquid' +import * as file from '@shopify/cli-kit/shared/node/fs' +import * as git from '@shopify/cli-kit/shared/node/git' +import {joinPath, dirname} from '@shopify/cli-kit/shared/node/path' +import {slugify} from '@shopify/cli-kit/shared/common/string' vi.mock('../../models/app/validation/multi-cli-warning.js') -vi.mock('@shopify/cli-kit/node/node-package-manager', async () => { - const actual: any = await vi.importActual('@shopify/cli-kit/node/node-package-manager') +vi.mock('@shopify/cli-kit/shared/node/node-package-manager', async () => { + const actual: any = await vi.importActual('@shopify/cli-kit/shared/node/node-package-manager') return { ...actual, addNPMDependenciesIfNeeded: vi.fn(), @@ -42,8 +42,8 @@ vi.mock('@shopify/cli-kit/node/node-package-manager', async () => { } }) -vi.mock('@shopify/cli-kit/node/system', async () => { - const actual: any = await vi.importActual('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system', async () => { + const actual: any = await vi.importActual('@shopify/cli-kit/shared/node/system') return { ...actual, exec: vi.fn().mockResolvedValue({stdout: '', stderr: ''}), diff --git a/packages/app/src/cli/services/generate/extension.ts b/packages/app/src/cli/services/generate/extension.ts index 3a47ee52d64..1c9ad186d41 100644 --- a/packages/app/src/cli/services/generate/extension.ts +++ b/packages/app/src/cli/services/generate/extension.ts @@ -12,14 +12,14 @@ import { DependencyVersion, installNodeModules, readAndParsePackageJson, -} from '@shopify/cli-kit/node/node-package-manager' -import {recursiveLiquidTemplateCopy} from '@shopify/cli-kit/node/liquid' -import {renderTasks} from '@shopify/cli-kit/node/ui' -import {downloadGitRepository} from '@shopify/cli-kit/node/git' -import {fileExists, inTemporaryDirectory, mkdir, moveFile, removeFile, glob} from '@shopify/cli-kit/node/fs' -import {joinPath, relativizePath} from '@shopify/cli-kit/node/path' -import {slugify} from '@shopify/cli-kit/common/string' -import {nonRandomUUID} from '@shopify/cli-kit/node/crypto' +} from '@shopify/cli-kit/shared/node/node-package-manager' +import {recursiveLiquidTemplateCopy} from '@shopify/cli-kit/shared/node/liquid' +import {renderTasks} from '@shopify/cli-kit/shared/node/ui' +import {downloadGitRepository} from '@shopify/cli-kit/shared/node/git' +import {fileExists, inTemporaryDirectory, mkdir, moveFile, removeFile, glob} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, relativizePath} from '@shopify/cli-kit/shared/node/path' +import {slugify} from '@shopify/cli-kit/shared/common/string' +import {nonRandomUUID} from '@shopify/cli-kit/shared/node/crypto' export interface GenerateExtensionTemplateOptions { app: AppLinkedInterface diff --git a/packages/app/src/cli/services/generate/fetch-extension-specifications.ts b/packages/app/src/cli/services/generate/fetch-extension-specifications.ts index 37544a1c672..9ce9072eb6c 100644 --- a/packages/app/src/cli/services/generate/fetch-extension-specifications.ts +++ b/packages/app/src/cli/services/generate/fetch-extension-specifications.ts @@ -8,9 +8,9 @@ import { import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {MinimalAppIdentifiers} from '../../models/organization.js' import {unifiedConfigurationParserFactory} from '../../utilities/json-schema.js' -import {getArrayRejectingUndefined} from '@shopify/cli-kit/common/array' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {HandleInvalidAdditionalProperties, normaliseJsonSchema} from '@shopify/cli-kit/node/json-schema' +import {getArrayRejectingUndefined} from '@shopify/cli-kit/shared/common/array' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {HandleInvalidAdditionalProperties, normaliseJsonSchema} from '@shopify/cli-kit/shared/node/json-schema' interface FetchSpecificationsOptions { developerPlatformClient: DeveloperPlatformClient diff --git a/packages/app/src/cli/services/generate/shop-import/declarative-definitions.test.ts b/packages/app/src/cli/services/generate/shop-import/declarative-definitions.test.ts index 72151743a08..ee15678c46c 100644 --- a/packages/app/src/cli/services/generate/shop-import/declarative-definitions.test.ts +++ b/packages/app/src/cli/services/generate/shop-import/declarative-definitions.test.ts @@ -17,14 +17,14 @@ import { } from '../../../api/graphql/admin/generated/metafield_definitions.js' import {adminAsAppRequestDoc} from '../../../api/admin-as-app.js' import {describe, expect, test, vi} from 'vitest' -import * as output from '@shopify/cli-kit/node/output' -import {stringifyMessage} from '@shopify/cli-kit/node/output' +import * as output from '@shopify/cli-kit/shared/node/output' +import {stringifyMessage} from '@shopify/cli-kit/shared/node/output' import {TypedDocumentNode} from '@graphql-typed-document-node/core' -import {AdminSession, ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/node/session' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {AdminSession, ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/identity/session' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' vi.mock('../../../api/admin-as-app.js') -vi.mock('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/identity/session') const defaultMetaobjectFragment = { name: 'test', diff --git a/packages/app/src/cli/services/generate/shop-import/declarative-definitions.ts b/packages/app/src/cli/services/generate/shop-import/declarative-definitions.ts index 76618c34086..c0a2d14a979 100644 --- a/packages/app/src/cli/services/generate/shop-import/declarative-definitions.ts +++ b/packages/app/src/cli/services/generate/shop-import/declarative-definitions.ts @@ -19,14 +19,14 @@ import { MetaobjectStorefrontAccess, } from '../../../api/graphql/admin/generated/types.js' import {CurrentAppConfiguration} from '../../../models/app/app.js' -import {BugError} from '@shopify/cli-kit/node/error' -import {AdminSession, ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/node/session' -import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/node/output' +import {BugError} from '@shopify/cli-kit/shared/node/error' +import {AdminSession, ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/identity/session' +import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/shared/node/output' import {TypedDocumentNode} from '@graphql-typed-document-node/core' import {Variables} from 'graphql-request' import {updateTomlValues} from '@shopify/toml-patch' -import {renderInfo, renderSingleTask, renderTasks} from '@shopify/cli-kit/node/ui' -import {isEmpty} from '@shopify/cli-kit/common/object' +import {renderInfo, renderSingleTask, renderTasks} from '@shopify/cli-kit/shared/node/ui' +import {isEmpty} from '@shopify/cli-kit/shared/common/object' interface ImportDeclarativeDefinitionsOptions { remoteApp: OrganizationApp diff --git a/packages/app/src/cli/services/graphql/common.test.ts b/packages/app/src/cli/services/graphql/common.test.ts index 9d694a94d20..4dff072357b 100644 --- a/packages/app/src/cli/services/graphql/common.test.ts +++ b/packages/app/src/cli/services/graphql/common.test.ts @@ -8,20 +8,20 @@ import { } from './common.js' import {OrganizationApp, OrganizationStore} from '../../models/organization.js' import {BULK_OPERATIONS_MIN_API_VERSION} from '../bulk-operations/constants.js' -import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/node/session' -import {fetchApiVersions} from '@shopify/cli-kit/node/api/admin' +import {ensureAuthenticatedAdminAsApp} from '@shopify/cli-kit/identity/session' +import {fetchApiVersions} from '@shopify/cli-kit/admin/api' import {describe, test, expect, vi, beforeEach} from 'vitest' -vi.mock('@shopify/cli-kit/node/session', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/identity/session', async () => { + const actual = await vi.importActual('@shopify/cli-kit/identity/session') return { ...actual, ensureAuthenticatedAdminAsApp: vi.fn(), } }) -vi.mock('@shopify/cli-kit/node/api/admin', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/api/admin') +vi.mock('@shopify/cli-kit/admin/api', async () => { + const actual = await vi.importActual('@shopify/cli-kit/admin/api') return { ...actual, fetchApiVersions: vi.fn(), diff --git a/packages/app/src/cli/services/graphql/common.ts b/packages/app/src/cli/services/graphql/common.ts index 48127580370..1320e364b54 100644 --- a/packages/app/src/cli/services/graphql/common.ts +++ b/packages/app/src/cli/services/graphql/common.ts @@ -1,8 +1,8 @@ import {OrganizationApp, OrganizationStore} from '../../models/organization.js' -import {ensureAuthenticatedAdminAsApp, AdminSession} from '@shopify/cli-kit/node/session' -import {AbortError, BugError} from '@shopify/cli-kit/node/error' -import {outputContent} from '@shopify/cli-kit/node/output' -import {fetchApiVersions} from '@shopify/cli-kit/node/api/admin' +import {ensureAuthenticatedAdminAsApp, AdminSession} from '@shopify/cli-kit/identity/session' +import {AbortError, BugError} from '@shopify/cli-kit/shared/node/error' +import {outputContent} from '@shopify/cli-kit/shared/node/output' +import {fetchApiVersions} from '@shopify/cli-kit/admin/api' import {parse} from 'graphql' /** diff --git a/packages/app/src/cli/services/import-extensions.test.ts b/packages/app/src/cli/services/import-extensions.test.ts index 060d886297b..4bd8b21f6fc 100644 --- a/packages/app/src/cli/services/import-extensions.test.ts +++ b/packages/app/src/cli/services/import-extensions.test.ts @@ -4,12 +4,12 @@ import {testAppLinked, testDeveloperPlatformClient, testUIExtension} from '../mo import {OrganizationApp} from '../models/organization.js' import {ExtensionRegistration} from '../api/graphql/all_app_extension_registrations.js' import {describe, expect, test, vi, beforeEach} from 'vitest' -import {fileExistsSync, inTemporaryDirectory, mkdir} from '@shopify/cli-kit/node/fs' -import {renderSelectPrompt, renderSuccess} from '@shopify/cli-kit/node/ui' -import {joinPath} from '@shopify/cli-kit/node/path' -import {AbortSilentError} from '@shopify/cli-kit/node/error' +import {fileExistsSync, inTemporaryDirectory, mkdir} from '@shopify/cli-kit/shared/node/fs' +import {renderSelectPrompt, renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('./context.js') vi.mock('./fetch-extensions.js') vi.mock('./context/partner-account-info.js') diff --git a/packages/app/src/cli/services/import-extensions.ts b/packages/app/src/cli/services/import-extensions.ts index 2d736b0b0c6..26ac942cb31 100644 --- a/packages/app/src/cli/services/import-extensions.ts +++ b/packages/app/src/cli/services/import-extensions.ts @@ -6,12 +6,12 @@ import {MAX_EXTENSION_HANDLE_LENGTH} from '../models/extensions/schemas.js' import {OrganizationApp} from '../models/organization.js' import {allMigrationChoices, getMigrationChoices} from '../prompts/import-extensions.js' import {configurationFileNames, blocks} from '../constants.js' -import {renderSelectPrompt, renderSuccess} from '@shopify/cli-kit/node/ui' -import {basename, joinPath} from '@shopify/cli-kit/node/path' -import {removeFile, writeFile, fileExists, mkdir, touchFile} from '@shopify/cli-kit/node/fs' -import {outputContent} from '@shopify/cli-kit/node/output' -import {slugify, hyphenate} from '@shopify/cli-kit/common/string' -import {AbortError, AbortSilentError} from '@shopify/cli-kit/node/error' +import {renderSelectPrompt, renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {basename, joinPath} from '@shopify/cli-kit/shared/node/path' +import {removeFile, writeFile, fileExists, mkdir, touchFile} from '@shopify/cli-kit/shared/node/fs' +import {outputContent} from '@shopify/cli-kit/shared/node/output' +import {slugify, hyphenate} from '@shopify/cli-kit/shared/common/string' +import {AbortError, AbortSilentError} from '@shopify/cli-kit/shared/node/error' export const allExtensionTypes = allMigrationChoices.flatMap((choice) => choice.extensionTypes) diff --git a/packages/app/src/cli/services/info.test.ts b/packages/app/src/cli/services/info.test.ts index fee68b37094..8fec261e2b9 100644 --- a/packages/app/src/cli/services/info.test.ts +++ b/packages/app/src/cli/services/info.test.ts @@ -12,13 +12,13 @@ import { import {AppErrors} from '../models/app/loader.js' import {DeveloperPlatformClient} from '../utilities/developer-platform-client.js' import {describe, expect, vi, test} from 'vitest' -import {joinPath} from '@shopify/cli-kit/node/path' -import {OutputMessage, TokenizedString, stringifyMessage, unstyled} from '@shopify/cli-kit/node/output' -import {inTemporaryDirectory, writeFileSync} from '@shopify/cli-kit/node/fs' -import {AlertCustomSection, InlineToken} from '@shopify/cli-kit/node/ui' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {OutputMessage, TokenizedString, stringifyMessage, unstyled} from '@shopify/cli-kit/shared/node/output' +import {inTemporaryDirectory, writeFileSync} from '@shopify/cli-kit/shared/node/fs' +import {AlertCustomSection, InlineToken} from '@shopify/cli-kit/shared/node/ui' vi.mock('../prompts/dev.js') -vi.mock('@shopify/cli-kit/node/node-package-manager') +vi.mock('@shopify/cli-kit/shared/node/node-package-manager') vi.mock('../utilities/developer-platform-client.js') const APP = testOrganizationApp() diff --git a/packages/app/src/cli/services/info.ts b/packages/app/src/cli/services/info.ts index c6ab37a58f3..de945533645 100644 --- a/packages/app/src/cli/services/info.ts +++ b/packages/app/src/cli/services/info.ts @@ -4,18 +4,18 @@ import {AppLinkedInterface, getAppScopes} from '../models/app/app.js' import {configurationFileNames} from '../constants.js' import {ExtensionInstance} from '../models/extensions/extension-instance.js' import {Organization, OrganizationApp} from '../models/organization.js' -import {isServiceAccount, isUserAccount} from '@shopify/cli-kit/node/session' -import {platformAndArch} from '@shopify/cli-kit/node/os' -import {basename, relativePath} from '@shopify/cli-kit/node/path' +import {isServiceAccount, isUserAccount} from '@shopify/cli-kit/identity/session' +import {platformAndArch} from '@shopify/cli-kit/shared/node/os' +import {basename, relativePath} from '@shopify/cli-kit/shared/node/path' import { OutputMessage, formatPackageManagerCommand, outputContent, shouldDisplayColors, stringifyMessage, -} from '@shopify/cli-kit/node/output' -import {AlertCustomSection, InlineToken} from '@shopify/cli-kit/node/ui' -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' +} from '@shopify/cli-kit/shared/node/output' +import {AlertCustomSection, InlineToken} from '@shopify/cli-kit/shared/node/ui' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' export type Format = 'json' | 'text' export interface InfoOptions { diff --git a/packages/app/src/cli/services/init/init.ts b/packages/app/src/cli/services/init/init.ts index 0dee2acba57..a99253d92a5 100644 --- a/packages/app/src/cli/services/init/init.ts +++ b/packages/app/src/cli/services/init/init.ts @@ -12,13 +12,13 @@ import { PackageManager, UnknownPackageManagerError, writePackageJSON, -} from '@shopify/cli-kit/node/node-package-manager' -import {renderInfo, renderSuccess, renderTasks, Task} from '@shopify/cli-kit/node/ui' -import {parseGitHubRepositoryReference} from '@shopify/cli-kit/node/github' -import {hyphenate} from '@shopify/cli-kit/common/string' -import {recursiveLiquidTemplateCopy} from '@shopify/cli-kit/node/liquid' -import {isShopify} from '@shopify/cli-kit/node/context/local' -import {downloadGitRepository, initializeGitRepository} from '@shopify/cli-kit/node/git' +} from '@shopify/cli-kit/shared/node/node-package-manager' +import {renderInfo, renderSuccess, renderTasks, Task} from '@shopify/cli-kit/shared/node/ui' +import {parseGitHubRepositoryReference} from '@shopify/cli-kit/shared/node/github' +import {hyphenate} from '@shopify/cli-kit/shared/common/string' +import {recursiveLiquidTemplateCopy} from '@shopify/cli-kit/shared/node/liquid' +import {isShopify} from '@shopify/cli-kit/shared/node/context/local' +import {downloadGitRepository, initializeGitRepository} from '@shopify/cli-kit/shared/node/git' import { appendFile, fileExists, @@ -28,12 +28,12 @@ import { moveFile, readFile, writeFile, -} from '@shopify/cli-kit/node/fs' -import {joinPath, normalizePath} from '@shopify/cli-kit/node/path' -import {username} from '@shopify/cli-kit/node/os' -import {AbortError} from '@shopify/cli-kit/node/error' -import {formatPackageManagerCommand} from '@shopify/cli-kit/node/output' -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' +} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, normalizePath} from '@shopify/cli-kit/shared/node/path' +import {username} from '@shopify/cli-kit/shared/node/os' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {formatPackageManagerCommand} from '@shopify/cli-kit/shared/node/output' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' interface InitOptions { name: string diff --git a/packages/app/src/cli/services/init/template/cleanup.test.ts b/packages/app/src/cli/services/init/template/cleanup.test.ts index 37fe613d02e..8cf6e90767d 100644 --- a/packages/app/src/cli/services/init/template/cleanup.test.ts +++ b/packages/app/src/cli/services/init/template/cleanup.test.ts @@ -1,8 +1,8 @@ import cleanup from './cleanup.js' import {describe, expect, test} from 'vitest' -import {inTemporaryDirectory, mkdir, writeFile, fileExists} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {PackageManager} from '@shopify/cli-kit/node/node-package-manager' +import {inTemporaryDirectory, mkdir, writeFile, fileExists} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {PackageManager} from '@shopify/cli-kit/shared/node/node-package-manager' describe('cleanup', () => { async function mockProjectFolder(tmpDir: string) { diff --git a/packages/app/src/cli/services/init/template/cleanup.ts b/packages/app/src/cli/services/init/template/cleanup.ts index fde535065e4..5733146c409 100644 --- a/packages/app/src/cli/services/init/template/cleanup.ts +++ b/packages/app/src/cli/services/init/template/cleanup.ts @@ -1,6 +1,6 @@ -import {rmdir, glob, fileExistsSync, unlinkFile} from '@shopify/cli-kit/node/fs' -import {Lockfile, lockfilesByManager, PackageManager} from '@shopify/cli-kit/node/node-package-manager' -import {joinPath} from '@shopify/cli-kit/node/path' +import {rmdir, glob, fileExistsSync, unlinkFile} from '@shopify/cli-kit/shared/node/fs' +import {Lockfile, lockfilesByManager, PackageManager} from '@shopify/cli-kit/shared/node/node-package-manager' +import {joinPath} from '@shopify/cli-kit/shared/node/path' export default async function cleanup(webOutputDirectory: string, packageManager: PackageManager) { const gitPaths = await glob( diff --git a/packages/app/src/cli/services/init/template/npm.test.ts b/packages/app/src/cli/services/init/template/npm.test.ts index b8eeb21770a..758a0e5ddb5 100644 --- a/packages/app/src/cli/services/init/template/npm.test.ts +++ b/packages/app/src/cli/services/init/template/npm.test.ts @@ -1,13 +1,13 @@ import {getDeepInstallNPMTasks, updateCLIDependencies} from './npm.js' import {describe, expect, vi, test} from 'vitest' -import {installNodeModules, PackageJson, PackageManager} from '@shopify/cli-kit/node/node-package-manager' -import {inTemporaryDirectory, mkdir, readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath, moduleDirectory, normalizePath} from '@shopify/cli-kit/node/path' +import {installNodeModules, PackageJson, PackageManager} from '@shopify/cli-kit/shared/node/node-package-manager' +import {inTemporaryDirectory, mkdir, readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, moduleDirectory, normalizePath} from '@shopify/cli-kit/shared/node/path' import {platform} from 'os' vi.mock('os') -vi.mock('@shopify/cli-kit/node/node-package-manager') -vi.mock('@shopify/cli-kit/common/version', () => ({CLI_KIT_VERSION: '1.2.3'})) +vi.mock('@shopify/cli-kit/shared/node/node-package-manager') +vi.mock('@shopify/cli-kit/shared/common/version', () => ({CLI_KIT_VERSION: '1.2.3'})) describe('updateCLIDependencies', () => { test('updates @shopify/cli and deletes @shopify/app if not using global CLI', async () => { diff --git a/packages/app/src/cli/services/init/template/npm.ts b/packages/app/src/cli/services/init/template/npm.ts index 123cdb1044a..0c285a2c144 100644 --- a/packages/app/src/cli/services/init/template/npm.ts +++ b/packages/app/src/cli/services/init/template/npm.ts @@ -1,7 +1,7 @@ -import {PackageManager, installNodeModules, PackageJson} from '@shopify/cli-kit/node/node-package-manager' -import {moduleDirectory, normalizePath} from '@shopify/cli-kit/node/path' -import {findPathUp} from '@shopify/cli-kit/node/fs' -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' +import {PackageManager, installNodeModules, PackageJson} from '@shopify/cli-kit/shared/node/node-package-manager' +import {moduleDirectory, normalizePath} from '@shopify/cli-kit/shared/node/path' +import {findPathUp} from '@shopify/cli-kit/shared/node/fs' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' import {platform} from 'os' interface UpdateCLIDependenciesOptions { diff --git a/packages/app/src/cli/services/init/validate.test.ts b/packages/app/src/cli/services/init/validate.test.ts index e031dc46ca2..5f62619a84a 100644 --- a/packages/app/src/cli/services/init/validate.test.ts +++ b/packages/app/src/cli/services/init/validate.test.ts @@ -1,6 +1,6 @@ import {validateTemplateValue, validateFlavorValue} from './validate.js' import {describe, expect, test} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' describe('validateTemplateValue', () => { test('should not throw an error for undefined template', () => { diff --git a/packages/app/src/cli/services/init/validate.ts b/packages/app/src/cli/services/init/validate.ts index 89d2dcee7ee..ab4b3220115 100644 --- a/packages/app/src/cli/services/init/validate.ts +++ b/packages/app/src/cli/services/init/validate.ts @@ -1,7 +1,7 @@ import {isPredefinedTemplate, templates, visibleTemplates} from '../../prompts/init/init.js' -import {safeParseURL} from '@shopify/cli-kit/common/url' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {safeParseURL} from '@shopify/cli-kit/shared/common/url' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' export function validateTemplateValue(template: string | undefined) { if (!template) { diff --git a/packages/app/src/cli/services/local-storage.test.ts b/packages/app/src/cli/services/local-storage.test.ts index a6c161d77f6..76cd3552bdf 100644 --- a/packages/app/src/cli/services/local-storage.test.ts +++ b/packages/app/src/cli/services/local-storage.test.ts @@ -6,8 +6,8 @@ import { setCachedAppInfo, } from './local-storage.js' import {describe, expect, test} from 'vitest' -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' -import {inTemporaryDirectory} from '@shopify/cli-kit/node/fs' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' +import {inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' const APP1 = {appId: 'app1', storeFqdn: 'store1', orgId: 'org1', directory: '/app1'} const APP2 = {appId: 'app2', storeFqdn: 'store2', orgId: 'org2', directory: '/app2'} diff --git a/packages/app/src/cli/services/local-storage.ts b/packages/app/src/cli/services/local-storage.ts index 111eb40d71d..cf7c6b7f6cd 100644 --- a/packages/app/src/cli/services/local-storage.ts +++ b/packages/app/src/cli/services/local-storage.ts @@ -1,7 +1,7 @@ import {AppConfigurationFileName} from '../models/app/loader.js' -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' -import {outputDebug, outputContent, outputToken} from '@shopify/cli-kit/node/output' -import {normalizePath} from '@shopify/cli-kit/node/path' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' +import {outputDebug, outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' +import {normalizePath} from '@shopify/cli-kit/shared/node/path' export interface CachedAppInfo { directory: string diff --git a/packages/app/src/cli/services/logs.test.ts b/packages/app/src/cli/services/logs.test.ts index 1ed2a08eb14..5b56d3450c1 100644 --- a/packages/app/src/cli/services/logs.test.ts +++ b/packages/app/src/cli/services/logs.test.ts @@ -11,17 +11,17 @@ import { testOrganizationStore, } from '../models/app/app.test-data.js' import {DeveloperPlatformClient} from '../utilities/developer-platform-client.js' -import {outputInfo, outputResult} from '@shopify/cli-kit/node/output' -import {AbortError} from '@shopify/cli-kit/node/error' +import {outputInfo, outputResult} from '@shopify/cli-kit/shared/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {describe, test, vi, expect, beforeEach} from 'vitest' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' vi.mock('./dev/fetch.js') vi.mock('./app-logs/logs-command/ui.js') vi.mock('./app-logs/logs-command/render-json-logs.js') vi.mock('./app-logs/utils.js') -vi.mock('@shopify/cli-kit/node/output') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/output') +vi.mock('@shopify/cli-kit/shared/node/ui') const app = testAppLinked() const remoteApp = testOrganizationApp() diff --git a/packages/app/src/cli/services/logs.ts b/packages/app/src/cli/services/logs.ts index 762f253805f..6db15058474 100644 --- a/packages/app/src/cli/services/logs.ts +++ b/packages/app/src/cli/services/logs.ts @@ -8,10 +8,10 @@ import {AppLinkedInterface} from '../models/app/app.js' import {getAppConfigurationFileName} from '../models/app/loader.js' import {DeveloperPlatformClient} from '../utilities/developer-platform-client.js' import {Organization, OrganizationApp, OrganizationStore} from '../models/organization.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputInfo, outputResult} from '@shopify/cli-kit/node/output' -import {renderInfo} from '@shopify/cli-kit/node/ui' -import {basename} from '@shopify/cli-kit/node/path' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputInfo, outputResult} from '@shopify/cli-kit/shared/node/output' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' +import {basename} from '@shopify/cli-kit/shared/node/path' export type Format = 'json' | 'text' diff --git a/packages/app/src/cli/services/marketing_activity/extension-to-toml.ts b/packages/app/src/cli/services/marketing_activity/extension-to-toml.ts index 40287ddd4fe..ff4b8048fb5 100644 --- a/packages/app/src/cli/services/marketing_activity/extension-to-toml.ts +++ b/packages/app/src/cli/services/marketing_activity/extension-to-toml.ts @@ -1,7 +1,7 @@ import {MAX_EXTENSION_HANDLE_LENGTH} from '../../models/extensions/schemas.js' import {ExtensionRegistration} from '../../api/graphql/all_app_extension_registrations.js' -import {encodeToml} from '@shopify/cli-kit/node/toml' -import {slugify} from '@shopify/cli-kit/common/string' +import {encodeToml} from '@shopify/cli-kit/shared/node/toml' +import {slugify} from '@shopify/cli-kit/shared/common/string' interface BaseField { id: string diff --git a/packages/app/src/cli/services/payments/extension-to-toml.ts b/packages/app/src/cli/services/payments/extension-to-toml.ts index ed5e8208a35..e353be50877 100644 --- a/packages/app/src/cli/services/payments/extension-to-toml.ts +++ b/packages/app/src/cli/services/payments/extension-to-toml.ts @@ -31,8 +31,8 @@ import { CARD_PRESENT_TARGET, } from '../../models/extensions/specifications/payments_app_extension_schemas/card_present_payments_app_extension_schema.js' import {MAX_EXTENSION_HANDLE_LENGTH} from '../../models/extensions/schemas.js' -import {encodeToml} from '@shopify/cli-kit/node/toml' -import {slugify} from '@shopify/cli-kit/common/string' +import {encodeToml} from '@shopify/cli-kit/shared/node/toml' +import {slugify} from '@shopify/cli-kit/shared/common/string' function typeToContext(type: string) { switch (type) { diff --git a/packages/app/src/cli/services/release.test.ts b/packages/app/src/cli/services/release.test.ts index 3f77c0c2dee..c7283e905b9 100644 --- a/packages/app/src/cli/services/release.test.ts +++ b/packages/app/src/cli/services/release.test.ts @@ -8,12 +8,12 @@ import {deployOrReleaseConfirmationPrompt} from '../prompts/deploy-release.js' import {AppLinkedInterface} from '../models/app/app.js' import {OrganizationApp} from '../models/organization.js' import {beforeEach, describe, expect, vi, test} from 'vitest' -import {renderError, renderSuccess, renderTasks, Task} from '@shopify/cli-kit/node/ui' -import {AbortSilentError} from '@shopify/cli-kit/node/error' +import {renderError, renderSuccess, renderTasks, Task} from '@shopify/cli-kit/shared/node/ui' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' vi.mock('./context.js') vi.mock('../models/app/identifiers.js') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../api/graphql/app_release.js') vi.mock('./context/breakdown-extensions.js') vi.mock('../prompts/deploy-release.js') diff --git a/packages/app/src/cli/services/release.ts b/packages/app/src/cli/services/release.ts index cd0e50d4578..a423e1c0013 100644 --- a/packages/app/src/cli/services/release.ts +++ b/packages/app/src/cli/services/release.ts @@ -7,8 +7,8 @@ import {AppReleaseSchema} from '../api/graphql/app_release.js' import {deployOrReleaseConfirmationPrompt} from '../prompts/deploy-release.js' import {OrganizationApp} from '../models/organization.js' import {DeveloperPlatformClient} from '../utilities/developer-platform-client.js' -import {renderError, renderSuccess, renderTasks, TokenItem} from '@shopify/cli-kit/node/ui' -import {AbortSilentError} from '@shopify/cli-kit/node/error' +import {renderError, renderSuccess, renderTasks, TokenItem} from '@shopify/cli-kit/shared/node/ui' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' interface ReleaseOptions { /** The app to be built and uploaded */ diff --git a/packages/app/src/cli/services/release/version-diff.test.ts b/packages/app/src/cli/services/release/version-diff.test.ts index 76608aa6354..fa94b40ae7b 100644 --- a/packages/app/src/cli/services/release/version-diff.test.ts +++ b/packages/app/src/cli/services/release/version-diff.test.ts @@ -3,8 +3,8 @@ import {testDeveloperPlatformClient, testOrganizationApp} from '../../models/app import {AppVersionWithContext} from '../../utilities/developer-platform-client.js' import {AppVersionsDiffSchema} from '../../api/graphql/app_versions_diff.js' import {describe, expect, test} from 'vitest' -import {AbortSilentError} from '@shopify/cli-kit/node/error' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' describe('versionDiffByVersion', () => { test('throws an abort silent error and display an error message when the version is not found', async () => { diff --git a/packages/app/src/cli/services/release/version-diff.ts b/packages/app/src/cli/services/release/version-diff.ts index 317da90ba64..5a5b98ce5f2 100644 --- a/packages/app/src/cli/services/release/version-diff.ts +++ b/packages/app/src/cli/services/release/version-diff.ts @@ -1,8 +1,8 @@ import {AppVersionsDiffSchema} from '../../api/graphql/app_versions_diff.js' import {AppVersionWithContext, DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {MinimalOrganizationApp} from '../../models/organization.js' -import {renderError} from '@shopify/cli-kit/node/ui' -import {AbortSilentError} from '@shopify/cli-kit/node/error' +import {renderError} from '@shopify/cli-kit/shared/node/ui' +import {AbortSilentError} from '@shopify/cli-kit/shared/node/error' export async function versionDiffByVersion( app: MinimalOrganizationApp, diff --git a/packages/app/src/cli/services/store-context.test.ts b/packages/app/src/cli/services/store-context.test.ts index e622f2dad67..362ef647d1b 100644 --- a/packages/app/src/cli/services/store-context.test.ts +++ b/packages/app/src/cli/services/store-context.test.ts @@ -12,9 +12,9 @@ import { import metadata from '../metadata.js' import {appHiddenConfigPath, AppLinkedInterface} from '../models/app/app.js' import {vi, describe, test, expect} from 'vitest' -import {hashString} from '@shopify/cli-kit/node/crypto' -import {inTemporaryDirectory, mkdir, readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {hashString} from '@shopify/cli-kit/shared/node/crypto' +import {inTemporaryDirectory, mkdir, readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' vi.mock('./dev/fetch') vi.mock('./dev/select-store') diff --git a/packages/app/src/cli/services/store-context.ts b/packages/app/src/cli/services/store-context.ts index a0df8b837eb..1f013b26b15 100644 --- a/packages/app/src/cli/services/store-context.ts +++ b/packages/app/src/cli/services/store-context.ts @@ -4,8 +4,8 @@ import {LoadedAppContextOutput} from './app-context.js' import {OrganizationStore} from '../models/organization.js' import {Store} from '../utilities/developer-platform-client.js' import metadata from '../metadata.js' -import {hashString} from '@shopify/cli-kit/node/crypto' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' +import {hashString} from '@shopify/cli-kit/shared/node/crypto' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' /** * Input options for the `storeContext` function. diff --git a/packages/app/src/cli/services/subscription_link/extension-to-toml.ts b/packages/app/src/cli/services/subscription_link/extension-to-toml.ts index 43b732400ba..f757a119f5a 100644 --- a/packages/app/src/cli/services/subscription_link/extension-to-toml.ts +++ b/packages/app/src/cli/services/subscription_link/extension-to-toml.ts @@ -1,7 +1,7 @@ import {MAX_EXTENSION_HANDLE_LENGTH} from '../../models/extensions/schemas.js' import {ExtensionRegistration} from '../../api/graphql/all_app_extension_registrations.js' -import {encodeToml} from '@shopify/cli-kit/node/toml' -import {slugify} from '@shopify/cli-kit/common/string' +import {encodeToml} from '@shopify/cli-kit/shared/node/toml' +import {slugify} from '@shopify/cli-kit/shared/common/string' export interface SubscriptionLinkDashboardConfig { pattern: string diff --git a/packages/app/src/cli/services/versions-list.test.ts b/packages/app/src/cli/services/versions-list.test.ts index c3d2440645f..b4bdea8f9d4 100644 --- a/packages/app/src/cli/services/versions-list.test.ts +++ b/packages/app/src/cli/services/versions-list.test.ts @@ -5,7 +5,7 @@ import {Organization, OrganizationSource} from '../models/organization.js' import {DeveloperPlatformClient} from '../utilities/developer-platform-client.js' import {AppVersionsQuerySchema} from '../api/graphql/get_versions_list.js' import {afterEach, describe, expect, test, vi} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' vi.mock('../models/app/identifiers.js') vi.mock('./context.js') diff --git a/packages/app/src/cli/services/versions-list.ts b/packages/app/src/cli/services/versions-list.ts index c14cd694cf3..56d4f5aa739 100644 --- a/packages/app/src/cli/services/versions-list.ts +++ b/packages/app/src/cli/services/versions-list.ts @@ -3,12 +3,12 @@ import {AppVersionsQuerySchema} from '../api/graphql/get_versions_list.js' import {AppLinkedInterface} from '../models/app/app.js' import {DeveloperPlatformClient} from '../utilities/developer-platform-client.js' import {Organization, OrganizationApp} from '../models/organization.js' -import colors from '@shopify/cli-kit/node/colors' -import {outputContent, outputInfo, outputResult, outputToken, unstyled} from '@shopify/cli-kit/node/output' -import {formatDate} from '@shopify/cli-kit/common/string' -import {AbortError} from '@shopify/cli-kit/node/error' -import {basename} from '@shopify/cli-kit/node/path' -import {renderTable} from '@shopify/cli-kit/node/ui' +import colors from '@shopify/cli-kit/shared/node/colors' +import {outputContent, outputInfo, outputResult, outputToken, unstyled} from '@shopify/cli-kit/shared/node/output' +import {formatDate} from '@shopify/cli-kit/shared/common/string' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {basename} from '@shopify/cli-kit/shared/node/path' +import {renderTable} from '@shopify/cli-kit/shared/node/ui' // eslint-disable-next-line @typescript-eslint/consistent-type-definitions type AppVersionLine = { diff --git a/packages/app/src/cli/services/web.ts b/packages/app/src/cli/services/web.ts index c4fe751b491..28b21cb0bde 100644 --- a/packages/app/src/cli/services/web.ts +++ b/packages/app/src/cli/services/web.ts @@ -1,6 +1,6 @@ import {Web, WebConfigurationCommands} from '../models/app/app.js' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {exec} from '@shopify/cli-kit/node/system' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {exec} from '@shopify/cli-kit/shared/node/system' import {Writable} from 'stream' interface WebOptions { diff --git a/packages/app/src/cli/services/webhook/send-app-uninstalled-webhook.test.ts b/packages/app/src/cli/services/webhook/send-app-uninstalled-webhook.test.ts index 025c8ac52dd..493e1e089ba 100644 --- a/packages/app/src/cli/services/webhook/send-app-uninstalled-webhook.test.ts +++ b/packages/app/src/cli/services/webhook/send-app-uninstalled-webhook.test.ts @@ -2,11 +2,11 @@ import {sendUninstallWebhookToAppServer} from './send-app-uninstalled-webhook.js import {triggerLocalWebhook} from './trigger-local-webhook.js' import {testDeveloperPlatformClient} from '../../models/app/app.test-data.js' import {describe, expect, vi, test} from 'vitest' -import {FetchError} from '@shopify/cli-kit/node/http' +import {FetchError} from '@shopify/cli-kit/shared/node/http' import {Writable} from 'stream' vi.mock('./trigger-local-webhook.js') -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system') const address = 'http://localhost:3000/test/path' const storeFqdn = 'test-store.myshopify.io' diff --git a/packages/app/src/cli/services/webhook/send-app-uninstalled-webhook.ts b/packages/app/src/cli/services/webhook/send-app-uninstalled-webhook.ts index a8581936c01..be3ad4ea6b5 100644 --- a/packages/app/src/cli/services/webhook/send-app-uninstalled-webhook.ts +++ b/packages/app/src/cli/services/webhook/send-app-uninstalled-webhook.ts @@ -3,8 +3,8 @@ import {getWebhookSample, SampleWebhook, SendSampleWebhookVariables} from './req import {triggerLocalWebhook} from './trigger-local-webhook.js' import {DELIVERY_METHOD} from './trigger-flags.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' -import {FetchError} from '@shopify/cli-kit/node/http' -import {sleep} from '@shopify/cli-kit/node/system' +import {FetchError} from '@shopify/cli-kit/shared/node/http' +import {sleep} from '@shopify/cli-kit/shared/node/system' import {Writable} from 'stream' interface SendUninstallWebhookToAppServerOptions { diff --git a/packages/app/src/cli/services/webhook/trigger-flags.test.ts b/packages/app/src/cli/services/webhook/trigger-flags.test.ts index 748b77cf72f..6a553dd2a94 100644 --- a/packages/app/src/cli/services/webhook/trigger-flags.test.ts +++ b/packages/app/src/cli/services/webhook/trigger-flags.test.ts @@ -4,7 +4,7 @@ import { isAddressAllowedForDeliveryMethod, validateAddressMethod, } from './trigger-flags.js' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {describe, expect, vi, test} from 'vitest' const eventbridgeAddress = 'arn:aws:events:us-east-1::event-source/aws.partner/shopify.com/3737297/source' diff --git a/packages/app/src/cli/services/webhook/trigger-flags.ts b/packages/app/src/cli/services/webhook/trigger-flags.ts index 0a2a6ad2338..16640144743 100644 --- a/packages/app/src/cli/services/webhook/trigger-flags.ts +++ b/packages/app/src/cli/services/webhook/trigger-flags.ts @@ -1,4 +1,4 @@ -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export const DELIVERY_METHOD = { LOCALHOST: 'localhost', diff --git a/packages/app/src/cli/services/webhook/trigger-local-webhook.test.ts b/packages/app/src/cli/services/webhook/trigger-local-webhook.test.ts index 1ed7b4f8e66..5ba4c1aa7c4 100644 --- a/packages/app/src/cli/services/webhook/trigger-local-webhook.test.ts +++ b/packages/app/src/cli/services/webhook/trigger-local-webhook.test.ts @@ -1,11 +1,11 @@ import {triggerLocalWebhook} from './trigger-local-webhook.js' import {describe, expect, vi, test} from 'vitest' -import * as http from '@shopify/cli-kit/node/http' +import * as http from '@shopify/cli-kit/shared/node/http' const samplePayload = '{ "sampleField": "SampleValue" }' const sampleHeaders = '{ "header": "Header Value" }' -vi.mock('@shopify/cli-kit/node/http') +vi.mock('@shopify/cli-kit/shared/node/http') describe('triggerLocalWebhook', () => { test('delivers to localhost port', async () => { diff --git a/packages/app/src/cli/services/webhook/trigger-local-webhook.ts b/packages/app/src/cli/services/webhook/trigger-local-webhook.ts index b34d529d5b3..8019aac3024 100644 --- a/packages/app/src/cli/services/webhook/trigger-local-webhook.ts +++ b/packages/app/src/cli/services/webhook/trigger-local-webhook.ts @@ -1,4 +1,4 @@ -import {fetch} from '@shopify/cli-kit/node/http' +import {fetch} from '@shopify/cli-kit/shared/node/http' /** * Sends a POST request to a local endpoint with a webhook payload diff --git a/packages/app/src/cli/services/webhook/trigger-options.test.ts b/packages/app/src/cli/services/webhook/trigger-options.test.ts index ab8a5afb562..168f82b84b5 100644 --- a/packages/app/src/cli/services/webhook/trigger-options.test.ts +++ b/packages/app/src/cli/services/webhook/trigger-options.test.ts @@ -5,8 +5,8 @@ import {WebhookTriggerInput} from './trigger.js' import {addressPrompt, apiVersionPrompt, deliveryMethodPrompt, topicPrompt} from '../../prompts/webhook/trigger.js' import {testAppLinked, testDeveloperPlatformClient, testOrganizationApp} from '../../models/app/app.test-data.js' import {describe, expect, vi, test, afterEach} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' vi.mock('../../prompts/webhook/trigger.js') vi.mock('./request-api-versions.js') diff --git a/packages/app/src/cli/services/webhook/trigger-options.ts b/packages/app/src/cli/services/webhook/trigger-options.ts index 26ca2da3838..ca6e5d93a91 100644 --- a/packages/app/src/cli/services/webhook/trigger-options.ts +++ b/packages/app/src/cli/services/webhook/trigger-options.ts @@ -11,7 +11,7 @@ import {WebhookTriggerInput} from './trigger.js' import {addressPrompt, apiVersionPrompt, deliveryMethodPrompt, topicPrompt} from '../../prompts/webhook/trigger.js' import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {renderCurrentlyUsedConfigInfo} from '../context.js' -import {basename} from '@shopify/cli-kit/node/path' +import {basename} from '@shopify/cli-kit/shared/node/path' interface AppCredentials { clientSecret: string diff --git a/packages/app/src/cli/services/webhook/trigger.test.ts b/packages/app/src/cli/services/webhook/trigger.test.ts index 24e82289b47..50ac23cf14e 100644 --- a/packages/app/src/cli/services/webhook/trigger.test.ts +++ b/packages/app/src/cli/services/webhook/trigger.test.ts @@ -10,7 +10,7 @@ import { testOrganizationApp, } from '../../models/app/app.test-data.js' import {loadApp} from '../../models/app/loader.js' -import {outputSuccess, outputWarn} from '@shopify/cli-kit/node/output' +import {outputSuccess, outputWarn} from '@shopify/cli-kit/shared/node/output' import {describe, expect, vi, test, beforeEach} from 'vitest' const samplePayload = '{ "sampleField": "SampleValue" }' @@ -26,8 +26,8 @@ const anEventBridgeAddress = 'arn:aws:events:us-east-3::event-source/aws.partner const anOrganizationId = 'anOrganizationId' vi.mock('@shopify/cli-kit') -vi.mock('@shopify/cli-kit/node/output') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/output') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../../prompts/webhook/options-prompt.js') vi.mock('./request-sample.js') vi.mock('./request-api-versions.js') diff --git a/packages/app/src/cli/services/webhook/trigger.ts b/packages/app/src/cli/services/webhook/trigger.ts index 45677cef1ae..da884ac7601 100644 --- a/packages/app/src/cli/services/webhook/trigger.ts +++ b/packages/app/src/cli/services/webhook/trigger.ts @@ -5,7 +5,7 @@ import {collectAddressAndMethod, collectApiVersion, collectCredentials, collectT import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js' import {AppLinkedInterface} from '../../models/app/app.js' import {OrganizationApp} from '../../models/organization.js' -import {outputWarn, outputSuccess} from '@shopify/cli-kit/node/output' +import {outputWarn, outputSuccess} from '@shopify/cli-kit/shared/node/output' export interface WebhookTriggerInput { app: AppLinkedInterface diff --git a/packages/app/src/cli/utilities/analytics.test.ts b/packages/app/src/cli/utilities/analytics.test.ts index d74e5448850..5a90272cb57 100644 --- a/packages/app/src/cli/utilities/analytics.test.ts +++ b/packages/app/src/cli/utilities/analytics.test.ts @@ -1,8 +1,8 @@ import {getAnalyticsTunnelType} from './analytics.js' import {test, expect, describe, vi} from 'vitest' -import {getListOfTunnelPlugins} from '@shopify/cli-kit/node/plugins' +import {getListOfTunnelPlugins} from '@shopify/cli-kit/shared/node/plugins' -vi.mock('@shopify/cli-kit/node/plugins') +vi.mock('@shopify/cli-kit/shared/node/plugins') describe('getAnalyticsTunnelType', () => { test('return a provider in case tunnelUrl contains its name', async () => { diff --git a/packages/app/src/cli/utilities/analytics.ts b/packages/app/src/cli/utilities/analytics.ts index d4bfa5fb257..2f3781d2245 100644 --- a/packages/app/src/cli/utilities/analytics.ts +++ b/packages/app/src/cli/utilities/analytics.ts @@ -1,5 +1,5 @@ import {Config} from '@oclif/core' -import {getListOfTunnelPlugins} from '@shopify/cli-kit/node/plugins' +import {getListOfTunnelPlugins} from '@shopify/cli-kit/shared/node/plugins' /** * Return the name of the tunnel provider used to send analytics. Returns 'localhost' or provider name if any of those diff --git a/packages/app/src/cli/utilities/app-command.ts b/packages/app/src/cli/utilities/app-command.ts index ddf87484447..7b68687a6d7 100644 --- a/packages/app/src/cli/utilities/app-command.ts +++ b/packages/app/src/cli/utilities/app-command.ts @@ -1,6 +1,6 @@ import {configurationFileNames} from '../constants.js' import {AppInterface} from '../models/app/app.js' -import BaseCommand from '@shopify/cli-kit/node/base-command' +import BaseCommand from '@shopify/cli-kit/shared/node/base-command' interface AppCommandOutput { app: AppInterface diff --git a/packages/app/src/cli/utilities/app-conf-store.test.ts b/packages/app/src/cli/utilities/app-conf-store.test.ts index 53d5c7f0a00..e1b854939f1 100644 --- a/packages/app/src/cli/utilities/app-conf-store.test.ts +++ b/packages/app/src/cli/utilities/app-conf-store.test.ts @@ -4,10 +4,10 @@ import { setCachedAccountInfo, clearCachedAccountInfo, } from './app-conf-store.js' -import {AccountInfo} from '@shopify/cli-kit/node/session' +import {AccountInfo} from '@shopify/cli-kit/identity/session' import {vi, describe, test, expect, beforeEach, afterEach} from 'vitest' -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' -import {inTemporaryDirectory} from '@shopify/cli-kit/node/fs' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' +import {inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' describe('app-conf-store', () => { beforeEach(async () => { diff --git a/packages/app/src/cli/utilities/app-conf-store.ts b/packages/app/src/cli/utilities/app-conf-store.ts index c753c54d27a..d419192e349 100644 --- a/packages/app/src/cli/utilities/app-conf-store.ts +++ b/packages/app/src/cli/utilities/app-conf-store.ts @@ -1,5 +1,5 @@ -import {AccountInfo} from '@shopify/cli-kit/node/session' -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' +import {AccountInfo} from '@shopify/cli-kit/identity/session' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' // max age is 72 hours (3 days) const MAX_AGE_FOR_ACCOUNT_INFO_STATUS_MS = 3 * 24 * 60 * 60 * 1000 diff --git a/packages/app/src/cli/utilities/app/app-url.ts b/packages/app/src/cli/utilities/app/app-url.ts index 79afa5cd860..7b139c03232 100644 --- a/packages/app/src/cli/utilities/app/app-url.ts +++ b/packages/app/src/cli/utilities/app/app-url.ts @@ -1,4 +1,4 @@ -import {normalizeStoreFqdn, storeAdminUrl} from '@shopify/cli-kit/node/context/fqdn' +import {normalizeStoreFqdn, storeAdminUrl} from '@shopify/cli-kit/shared/node/context/fqdn' export function buildAppURLForWeb(storeFqdn: string, apiKey: string) { const normalizedFQDN = normalizeStoreFqdn(storeFqdn) diff --git a/packages/app/src/cli/utilities/app/config/getTomls.ts b/packages/app/src/cli/utilities/app/config/getTomls.ts index 8d39a0ef3b6..ea9242bdc5e 100644 --- a/packages/app/src/cli/utilities/app/config/getTomls.ts +++ b/packages/app/src/cli/utilities/app/config/getTomls.ts @@ -3,8 +3,8 @@ import { isValidFormatAppConfigurationFileName, loadConfigurationFileContent, } from '../../../models/app/loader.js' -import {isDirectory} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {isDirectory} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import {readdirSync} from 'fs' export async function getTomls(appDirectory?: string): Promise<{[clientId: string]: AppConfigurationFileName}> { diff --git a/packages/app/src/cli/utilities/app/config/hidden-app-config.test.ts b/packages/app/src/cli/utilities/app/config/hidden-app-config.test.ts index b3dcae380d8..3b5b75db262 100644 --- a/packages/app/src/cli/utilities/app/config/hidden-app-config.test.ts +++ b/packages/app/src/cli/utilities/app/config/hidden-app-config.test.ts @@ -1,8 +1,8 @@ import {getOrCreateAppConfigHiddenPath} from './hidden-app-config.js' -import {joinPath} from '@shopify/cli-kit/node/path' -import * as fs from '@shopify/cli-kit/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import * as fs from '@shopify/cli-kit/shared/node/fs' import {describe, expect, test, vi} from 'vitest' -import {getOrCreateHiddenShopifyFolder} from '@shopify/cli-kit/node/hidden-folder' +import {getOrCreateHiddenShopifyFolder} from '@shopify/cli-kit/shared/node/hidden-folder' describe('getOrCreateAppConfigHiddenPath', () => { test("creates hidden config file with empty JSON object if it doesn't exist", async () => { diff --git a/packages/app/src/cli/utilities/app/config/hidden-app-config.ts b/packages/app/src/cli/utilities/app/config/hidden-app-config.ts index cc10ffd963f..a3b6741a1b8 100644 --- a/packages/app/src/cli/utilities/app/config/hidden-app-config.ts +++ b/packages/app/src/cli/utilities/app/config/hidden-app-config.ts @@ -1,6 +1,6 @@ -import {writeFile, fileExists} from '@shopify/cli-kit/node/fs' -import {getOrCreateHiddenShopifyFolder} from '@shopify/cli-kit/node/hidden-folder' -import {joinPath} from '@shopify/cli-kit/node/path' +import {writeFile, fileExists} from '@shopify/cli-kit/shared/node/fs' +import {getOrCreateHiddenShopifyFolder} from '@shopify/cli-kit/shared/node/hidden-folder' +import {joinPath} from '@shopify/cli-kit/shared/node/path' const HIDDEN_CONFIG_PATH = 'project.json' /** diff --git a/packages/app/src/cli/utilities/app/http-reverse-proxy.test.ts b/packages/app/src/cli/utilities/app/http-reverse-proxy.test.ts index 1dea9fe44c0..32f4117dc61 100644 --- a/packages/app/src/cli/utilities/app/http-reverse-proxy.test.ts +++ b/packages/app/src/cli/utilities/app/http-reverse-proxy.test.ts @@ -1,6 +1,6 @@ import {getProxyingWebServer} from './http-reverse-proxy.js' -import {AbortController} from '@shopify/cli-kit/node/abort' -import {getAvailableTCPPort} from '@shopify/cli-kit/node/tcp' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' +import {getAvailableTCPPort} from '@shopify/cli-kit/shared/node/tcp' import {describe, test, expect} from 'vitest' import fetch from 'node-fetch' import WebSocket, {WebSocketServer} from 'ws' diff --git a/packages/app/src/cli/utilities/app/http-reverse-proxy.ts b/packages/app/src/cli/utilities/app/http-reverse-proxy.ts index 9304bab8e84..af6a7d1b2bd 100644 --- a/packages/app/src/cli/utilities/app/http-reverse-proxy.ts +++ b/packages/app/src/cli/utilities/app/http-reverse-proxy.ts @@ -1,6 +1,6 @@ -import {AbortController} from '@shopify/cli-kit/node/abort' -import {outputDebug, outputContent, outputToken, outputWarn} from '@shopify/cli-kit/node/output' -import {useConcurrentOutputContext} from '@shopify/cli-kit/node/ui/components' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' +import {outputDebug, outputContent, outputToken, outputWarn} from '@shopify/cli-kit/shared/node/output' +import {useConcurrentOutputContext} from '@shopify/cli-kit/shared/node/ui/components' import * as http from 'http' import * as https from 'https' import {Writable} from 'stream' diff --git a/packages/app/src/cli/utilities/developer-platform-client.ts b/packages/app/src/cli/utilities/developer-platform-client.ts index 8b27e3b501a..5864a43ab97 100644 --- a/packages/app/src/cli/utilities/developer-platform-client.ts +++ b/packages/app/src/cli/utilities/developer-platform-client.ts @@ -57,12 +57,12 @@ import { AppLogsSubscribeMutationVariables, } from '../api/graphql/app-management/generated/app-logs-subscribe.js' import {Store} from '../api/graphql/business-platform-organizations/generated/types.js' -import {Session} from '@shopify/cli-kit/node/session' -import {TokenItem} from '@shopify/cli-kit/node/ui' -import {blockPartnersAccess} from '@shopify/cli-kit/node/environment' -import {UnauthorizedHandler} from '@shopify/cli-kit/node/api/graphql' -import {JsonMapType} from '@shopify/cli-kit/node/toml' -import {firstPartyDev} from '@shopify/cli-kit/node/context/local' +import {Session} from '@shopify/cli-kit/identity/session' +import {TokenItem} from '@shopify/cli-kit/shared/node/ui' +import {blockPartnersAccess} from '@shopify/cli-kit/shared/node/environment' +import {UnauthorizedHandler} from '@shopify/cli-kit/shared/node/api/graphql' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' +import {firstPartyDev} from '@shopify/cli-kit/shared/node/context/local' export type {Store} from '../api/graphql/business-platform-organizations/generated/types.js' diff --git a/packages/app/src/cli/utilities/developer-platform-client/app-management-client.test.ts b/packages/app/src/cli/utilities/developer-platform-client/app-management-client.test.ts index aa70c7eece5..deda0bfd9a8 100644 --- a/packages/app/src/cli/utilities/developer-platform-client/app-management-client.test.ts +++ b/packages/app/src/cli/utilities/developer-platform-client/app-management-client.test.ts @@ -33,22 +33,22 @@ import {CreateAssetUrl} from '../../api/graphql/app-management/generated/create- import {SourceExtension} from '../../api/graphql/app-management/generated/types.js' import {ListOrganizations} from '../../api/graphql/business-platform-destinations/generated/organizations.js' import {describe, expect, test, vi, beforeEach} from 'vitest' -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' -import {fetch} from '@shopify/cli-kit/node/http' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' +import {fetch} from '@shopify/cli-kit/shared/node/http' import { businessPlatformOrganizationsRequest, businessPlatformOrganizationsRequestDoc, businessPlatformRequestDoc, -} from '@shopify/cli-kit/node/api/business-platform' -import {appManagementRequestDoc} from '@shopify/cli-kit/node/api/app-management' -import {BugError} from '@shopify/cli-kit/node/error' -import {randomUUID} from '@shopify/cli-kit/node/crypto' -import {webhooksRequestDoc} from '@shopify/cli-kit/node/api/webhooks' - -vi.mock('@shopify/cli-kit/node/http') -vi.mock('@shopify/cli-kit/node/api/business-platform') -vi.mock('@shopify/cli-kit/node/api/app-management') -vi.mock('@shopify/cli-kit/node/api/webhooks') +} from '@shopify/cli-kit/business-platform/api' +import {appManagementRequestDoc} from '@shopify/cli-kit/app-management/api' +import {BugError} from '@shopify/cli-kit/shared/node/error' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' +import {webhooksRequestDoc} from '@shopify/cli-kit/webhooks/api' + +vi.mock('@shopify/cli-kit/shared/node/http') +vi.mock('@shopify/cli-kit/business-platform/api') +vi.mock('@shopify/cli-kit/app-management/api') +vi.mock('@shopify/cli-kit/webhooks/api') beforeEach(() => { // Reset the singleton instance before each test diff --git a/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts b/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts index 410c61f9028..2d43d5d8aa0 100644 --- a/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts +++ b/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts @@ -142,37 +142,37 @@ import { AppLogsSubscribeMutationVariables, } from '../../api/graphql/app-management/generated/app-logs-subscribe.js' import {SourceExtension} from '../../api/graphql/app-management/generated/types.js' -import {getPartnersToken} from '@shopify/cli-kit/node/environment' -import {ensureAuthenticatedAppManagementAndBusinessPlatform, Session} from '@shopify/cli-kit/node/session' -import {isUnitTest} from '@shopify/cli-kit/node/context/local' -import {AbortError, BugError} from '@shopify/cli-kit/node/error' -import {fetch, shopifyFetch, Response} from '@shopify/cli-kit/node/http' +import {getPartnersToken} from '@shopify/cli-kit/shared/node/environment' +import {ensureAuthenticatedAppManagementAndBusinessPlatform, Session} from '@shopify/cli-kit/identity/session' +import {isUnitTest} from '@shopify/cli-kit/shared/node/context/local' +import {AbortError, BugError} from '@shopify/cli-kit/shared/node/error' +import {fetch, shopifyFetch, Response} from '@shopify/cli-kit/shared/node/http' import { appManagementRequestDoc, appManagementAppLogsUrl, appManagementHeaders, AppManagementRequestOptions, -} from '@shopify/cli-kit/node/api/app-management' -import {appDevRequestDoc, AppDevRequestOptions} from '@shopify/cli-kit/node/api/app-dev' +} from '@shopify/cli-kit/app-management/api' +import {appDevRequestDoc, AppDevRequestOptions} from '@shopify/cli-kit/app-dev/api' import { businessPlatformOrganizationsRequest, businessPlatformOrganizationsRequestDoc, BusinessPlatformOrganizationsRequestOptions, businessPlatformRequestDoc, BusinessPlatformRequestOptions, -} from '@shopify/cli-kit/node/api/business-platform' -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' -import {versionSatisfies} from '@shopify/cli-kit/node/node-package-manager' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {developerDashboardFqdn, normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' -import {TokenItem} from '@shopify/cli-kit/node/ui' -import {functionsRequestDoc, FunctionsRequestOptions} from '@shopify/cli-kit/node/api/functions' -import {fileExists, readFile} from '@shopify/cli-kit/node/fs' -import {JsonMapType} from '@shopify/cli-kit/node/toml' -import {isPreReleaseVersion} from '@shopify/cli-kit/node/version' -import {UnauthorizedHandler} from '@shopify/cli-kit/node/api/graphql' +} from '@shopify/cli-kit/business-platform/api' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' +import {versionSatisfies} from '@shopify/cli-kit/shared/node/node-package-manager' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {developerDashboardFqdn, normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' +import {TokenItem} from '@shopify/cli-kit/shared/node/ui' +import {functionsRequestDoc, FunctionsRequestOptions} from '@shopify/cli-kit/functions/api' +import {fileExists, readFile} from '@shopify/cli-kit/shared/node/fs' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' +import {isPreReleaseVersion} from '@shopify/cli-kit/shared/node/version' +import {UnauthorizedHandler} from '@shopify/cli-kit/shared/node/api/graphql' import {Variables} from 'graphql-request' -import {webhooksRequestDoc, WebhooksRequestOptions} from '@shopify/cli-kit/node/api/webhooks' +import {webhooksRequestDoc, WebhooksRequestOptions} from '@shopify/cli-kit/webhooks/api' const TEMPLATE_JSON_URL = 'https://cdn.shopify.com/static/cli/extensions/templates.json' diff --git a/packages/app/src/cli/utilities/developer-platform-client/partners-client.test.ts b/packages/app/src/cli/utilities/developer-platform-client/partners-client.test.ts index b75607313a4..e3b5b0e6b58 100644 --- a/packages/app/src/cli/utilities/developer-platform-client/partners-client.test.ts +++ b/packages/app/src/cli/utilities/developer-platform-client/partners-client.test.ts @@ -10,11 +10,11 @@ import { } from '../../models/app/app.test-data.js' import {appNamePrompt} from '../../prompts/dev.js' import {FindOrganizationQuery} from '../../api/graphql/find_org.js' -import {partnersRequest} from '@shopify/cli-kit/node/api/partners' +import {partnersRequest} from '@shopify/cli-kit/partners/api' import {describe, expect, vi, test, beforeEach} from 'vitest' vi.mock('../../prompts/dev.js') -vi.mock('@shopify/cli-kit/node/api/partners') +vi.mock('@shopify/cli-kit/partners/api') beforeEach(() => { // Reset the singleton instance before each test diff --git a/packages/app/src/cli/utilities/developer-platform-client/partners-client.ts b/packages/app/src/cli/utilities/developer-platform-client/partners-client.ts index 7d61dcc1f1c..f5370bac03d 100644 --- a/packages/app/src/cli/utilities/developer-platform-client/partners-client.ts +++ b/packages/app/src/cli/utilities/developer-platform-client/partners-client.ts @@ -156,15 +156,15 @@ import {AppLogData} from '../../services/app-logs/types.js' import {AppLogsOptions} from '../../services/app-logs/utils.js' import {AppLogsSubscribeMutationVariables} from '../../api/graphql/app-management/generated/app-logs-subscribe.js' import {TypedDocumentNode} from '@graphql-typed-document-node/core' -import {isUnitTest} from '@shopify/cli-kit/node/context/local' -import {AbortError} from '@shopify/cli-kit/node/error' -import {generateFetchAppLogUrl, partnersRequest, partnersRequestDoc} from '@shopify/cli-kit/node/api/partners' -import {CacheOptions, GraphQLVariables, UnauthorizedHandler} from '@shopify/cli-kit/node/api/graphql' -import {ensureAuthenticatedPartners, Session} from '@shopify/cli-kit/node/session' -import {partnersFqdn} from '@shopify/cli-kit/node/context/fqdn' -import {TokenItem} from '@shopify/cli-kit/node/ui' -import {RequestModeInput, Response, shopifyFetch} from '@shopify/cli-kit/node/http' -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' +import {isUnitTest} from '@shopify/cli-kit/shared/node/context/local' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {generateFetchAppLogUrl, partnersRequest, partnersRequestDoc} from '@shopify/cli-kit/partners/api' +import {CacheOptions, GraphQLVariables, UnauthorizedHandler} from '@shopify/cli-kit/shared/node/api/graphql' +import {ensureAuthenticatedPartners, Session} from '@shopify/cli-kit/identity/session' +import {partnersFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' +import {TokenItem} from '@shopify/cli-kit/shared/node/ui' +import {RequestModeInput, Response, shopifyFetch} from '@shopify/cli-kit/shared/node/http' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' // this is a temporary solution for editions to support https://vault.shopify.io/gsd/projects/31406 // read more here: https://vault.shopify.io/gsd/projects/31406 diff --git a/packages/app/src/cli/utilities/execute-command-helpers.test.ts b/packages/app/src/cli/utilities/execute-command-helpers.test.ts index 5d31edc2378..265f59d2994 100644 --- a/packages/app/src/cli/utilities/execute-command-helpers.test.ts +++ b/packages/app/src/cli/utilities/execute-command-helpers.test.ts @@ -2,13 +2,13 @@ import {prepareAppStoreContext, prepareExecuteContext} from './execute-command-h import {linkedAppContext} from '../services/app-context.js' import {storeContext} from '../services/store-context.js' import {validateSingleOperation} from '../services/graphql/common.js' -import {readFile, fileExists} from '@shopify/cli-kit/node/fs' +import {readFile, fileExists} from '@shopify/cli-kit/shared/node/fs' import {describe, test, expect, vi, beforeEach} from 'vitest' vi.mock('../services/app-context.js') vi.mock('../services/store-context.js') -vi.mock('@shopify/cli-kit/node/fs') -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/fs') +vi.mock('@shopify/cli-kit/shared/node/system') vi.mock('../services/graphql/common.js', () => ({ validateSingleOperation: vi.fn(), })) diff --git a/packages/app/src/cli/utilities/execute-command-helpers.ts b/packages/app/src/cli/utilities/execute-command-helpers.ts index a4602022b60..72c29b0e891 100644 --- a/packages/app/src/cli/utilities/execute-command-helpers.ts +++ b/packages/app/src/cli/utilities/execute-command-helpers.ts @@ -2,9 +2,9 @@ import {linkedAppContext, LoadedAppContextOutput} from '../services/app-context. import {storeContext} from '../services/store-context.js' import {validateSingleOperation} from '../services/graphql/common.js' import {OrganizationStore} from '../models/organization.js' -import {AbortError, BugError} from '@shopify/cli-kit/node/error' -import {readFile, fileExists} from '@shopify/cli-kit/node/fs' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {AbortError, BugError} from '@shopify/cli-kit/shared/node/error' +import {readFile, fileExists} from '@shopify/cli-kit/shared/node/fs' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' interface AppStoreContextFlags { path: string diff --git a/packages/app/src/cli/utilities/extensions/fetch-product-variant.ts b/packages/app/src/cli/utilities/extensions/fetch-product-variant.ts index 74d206e78f1..d1c836fa22d 100644 --- a/packages/app/src/cli/utilities/extensions/fetch-product-variant.ts +++ b/packages/app/src/cli/utilities/extensions/fetch-product-variant.ts @@ -1,9 +1,9 @@ import {FindProductVariantQuery, FindProductVariantSchema} from '../../api/graphql/get_variant_id.js' -import {adminRequest} from '@shopify/cli-kit/node/api/admin' -import {ensureAuthenticatedAdmin} from '@shopify/cli-kit/node/session' -import {AbortError} from '@shopify/cli-kit/node/error' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {adminRequest} from '@shopify/cli-kit/admin/api' +import {ensureAuthenticatedAdmin} from '@shopify/cli-kit/identity/session' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' /** * Retrieve the first variant of the first product of the given store diff --git a/packages/app/src/cli/utilities/extensions/locales-configuration.test.ts b/packages/app/src/cli/utilities/extensions/locales-configuration.test.ts index 3966264ec5c..a7963b02306 100644 --- a/packages/app/src/cli/utilities/extensions/locales-configuration.test.ts +++ b/packages/app/src/cli/utilities/extensions/locales-configuration.test.ts @@ -1,7 +1,7 @@ import {loadLocalesConfig} from './locales-configuration.js' import {describe, expect, test} from 'vitest' -import {inTemporaryDirectory, mkdir, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, mkdir, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' describe('loadLocalesConfig', () => { test('Works if all locales are correct', async () => { diff --git a/packages/app/src/cli/utilities/extensions/locales-configuration.ts b/packages/app/src/cli/utilities/extensions/locales-configuration.ts index 715fec0d1ad..4b67fa498af 100644 --- a/packages/app/src/cli/utilities/extensions/locales-configuration.ts +++ b/packages/app/src/cli/utilities/extensions/locales-configuration.ts @@ -1,6 +1,6 @@ -import {joinPath, basename} from '@shopify/cli-kit/node/path' -import {glob} from '@shopify/cli-kit/node/fs' -import {AbortError, BugError} from '@shopify/cli-kit/node/error' +import {joinPath, basename} from '@shopify/cli-kit/shared/node/path' +import {glob} from '@shopify/cli-kit/shared/node/fs' +import {AbortError, BugError} from '@shopify/cli-kit/shared/node/error' import fs from 'fs' export async function loadLocalesConfig(extensionPath: string, extensionIdentifier: string) { diff --git a/packages/app/src/cli/utilities/extensions/theme.test.ts b/packages/app/src/cli/utilities/extensions/theme.test.ts index f83969b3f8f..2ea3da2ad68 100644 --- a/packages/app/src/cli/utilities/extensions/theme.test.ts +++ b/packages/app/src/cli/utilities/extensions/theme.test.ts @@ -1,8 +1,8 @@ import {themeExtensionFiles, parseIgnoreFile} from './theme.js' import {ExtensionInstance} from '../../models/extensions/extension-instance.js' import {loadLocalExtensionsSpecifications} from '../../models/extensions/load-specifications.js' -import {inTemporaryDirectory, writeFile, mkdir} from '@shopify/cli-kit/node/fs' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, writeFile, mkdir} from '@shopify/cli-kit/shared/node/fs' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' import {describe, expect, test} from 'vitest' describe('themeExtensionConfig', () => { diff --git a/packages/app/src/cli/utilities/extensions/theme.ts b/packages/app/src/cli/utilities/extensions/theme.ts index 82a17df9f4d..5eb9b35ee05 100644 --- a/packages/app/src/cli/utilities/extensions/theme.ts +++ b/packages/app/src/cli/utilities/extensions/theme.ts @@ -1,6 +1,6 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js' -import {glob, createFileReadStream, fileExistsSync} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {glob, createFileReadStream, fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import {createInterface} from 'readline' const ignoredFilePatterns = [ diff --git a/packages/app/src/cli/utilities/extensions/theme/host-theme-manager.test.ts b/packages/app/src/cli/utilities/extensions/theme/host-theme-manager.test.ts index 2524a1db019..1c85871a9ea 100644 --- a/packages/app/src/cli/utilities/extensions/theme/host-theme-manager.test.ts +++ b/packages/app/src/cli/utilities/extensions/theme/host-theme-manager.test.ts @@ -1,12 +1,12 @@ import {waitForThemeToBeProcessed} from './host-theme-watcher.js' import {HostThemeManager, DEFAULT_THEME_ZIP, FALLBACK_THEME_ZIP} from './host-theme-manager.js' -import {themeCreate} from '@shopify/cli-kit/node/themes/api' +import {themeCreate} from '@shopify/cli-kit/themes/api' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {ThemeManager} from '@shopify/cli-kit/node/themes/theme-manager' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {ThemeManager} from '@shopify/cli-kit/themes/theme-manager' -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('./host-theme-watcher.js') describe('HostThemeManager', () => { diff --git a/packages/app/src/cli/utilities/extensions/theme/host-theme-manager.ts b/packages/app/src/cli/utilities/extensions/theme/host-theme-manager.ts index 2122e2951fb..cf9c2af0541 100644 --- a/packages/app/src/cli/utilities/extensions/theme/host-theme-manager.ts +++ b/packages/app/src/cli/utilities/extensions/theme/host-theme-manager.ts @@ -1,12 +1,12 @@ import {waitForThemeToBeProcessed} from './host-theme-watcher.js' -import {getHostTheme, removeHostTheme, setHostTheme} from '@shopify/cli-kit/node/themes/conf' -import {ThemeManager} from '@shopify/cli-kit/node/themes/theme-manager' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {themeCreate} from '@shopify/cli-kit/node/themes/api' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {BugError} from '@shopify/cli-kit/node/error' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {getHostTheme, removeHostTheme, setHostTheme} from '@shopify/cli-kit/themes/conf' +import {ThemeManager} from '@shopify/cli-kit/themes/theme-manager' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {Theme} from '@shopify/cli-kit/themes/types' +import {themeCreate} from '@shopify/cli-kit/themes/api' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {BugError} from '@shopify/cli-kit/shared/node/error' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' export const DEFAULT_THEME_ZIP = 'https://codeload.github.com/Shopify/dawn/zip/refs/tags/v15.0.0' export const FALLBACK_THEME_ZIP = 'https://cdn.shopify.com/theme-store/uhrdefhlndzaoyrgylhto59sx2i7.jpg' diff --git a/packages/app/src/cli/utilities/extensions/theme/host-theme-watcher.test.ts b/packages/app/src/cli/utilities/extensions/theme/host-theme-watcher.test.ts index 107784d2c0a..213902f4454 100644 --- a/packages/app/src/cli/utilities/extensions/theme/host-theme-watcher.test.ts +++ b/packages/app/src/cli/utilities/extensions/theme/host-theme-watcher.test.ts @@ -1,11 +1,11 @@ import {FAILED_TO_CREATE_THEME_MESSAGE, UPDATER_TIMEOUT, waitForThemeToBeProcessed} from './host-theme-watcher.js' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {sleep} from '@shopify/cli-kit/node/system' -import {fetchTheme} from '@shopify/cli-kit/node/themes/api' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {sleep} from '@shopify/cli-kit/shared/node/system' +import {fetchTheme} from '@shopify/cli-kit/themes/api' import {describe, expect, test, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/system') describe('HostThemeWatcher', () => { const themeId = 12345 diff --git a/packages/app/src/cli/utilities/extensions/theme/host-theme-watcher.ts b/packages/app/src/cli/utilities/extensions/theme/host-theme-watcher.ts index 54747b53701..c65360da1ab 100644 --- a/packages/app/src/cli/utilities/extensions/theme/host-theme-watcher.ts +++ b/packages/app/src/cli/utilities/extensions/theme/host-theme-watcher.ts @@ -1,8 +1,8 @@ -import {AbortError} from '@shopify/cli-kit/node/error' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {sleep} from '@shopify/cli-kit/node/system' -import {fetchTheme} from '@shopify/cli-kit/node/themes/api' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {sleep} from '@shopify/cli-kit/shared/node/system' +import {fetchTheme} from '@shopify/cli-kit/themes/api' +import {Theme} from '@shopify/cli-kit/themes/types' // 5 minutes export const UPDATER_TIMEOUT = 5 * 60 * 1000 diff --git a/packages/app/src/cli/utilities/json-schema.test.ts b/packages/app/src/cli/utilities/json-schema.test.ts index 32dace36518..d2aaf8f468b 100644 --- a/packages/app/src/cli/utilities/json-schema.test.ts +++ b/packages/app/src/cli/utilities/json-schema.test.ts @@ -1,6 +1,6 @@ import {unifiedConfigurationParserFactory} from './json-schema.js' import {describe, test, expect} from 'vitest' -import {randomUUID} from '@shopify/cli-kit/node/crypto' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' describe('unifiedConfigurationParserFactory', () => { const mockParseConfigurationObject = (config: any) => { diff --git a/packages/app/src/cli/utilities/json-schema.ts b/packages/app/src/cli/utilities/json-schema.ts index 55855eddd4a..8ddb801e363 100644 --- a/packages/app/src/cli/utilities/json-schema.ts +++ b/packages/app/src/cli/utilities/json-schema.ts @@ -1,14 +1,14 @@ import {FlattenedRemoteSpecification} from '../api/graphql/extension_specifications.js' import {BaseConfigType} from '../models/extensions/schemas.js' import {RemoteAwareExtensionSpecification} from '../models/extensions/specification.js' -import {ParseConfigurationResult} from '@shopify/cli-kit/node/schema' +import {ParseConfigurationResult} from '@shopify/cli-kit/shared/node/schema' import { HandleInvalidAdditionalProperties, jsonSchemaValidate, normaliseJsonSchema, -} from '@shopify/cli-kit/node/json-schema' -import {isEmpty} from '@shopify/cli-kit/common/object' -import {JsonMapType} from '@shopify/cli-kit/node/toml' +} from '@shopify/cli-kit/shared/node/json-schema' +import {isEmpty} from '@shopify/cli-kit/shared/common/object' +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' /** * The base properties that are added to all JSON Schema contracts. diff --git a/packages/app/src/cli/utilities/mkcert.test.ts b/packages/app/src/cli/utilities/mkcert.test.ts index 79ed64b2634..19f059c8fdc 100644 --- a/packages/app/src/cli/utilities/mkcert.test.ts +++ b/packages/app/src/cli/utilities/mkcert.test.ts @@ -1,25 +1,25 @@ import {generateCertificate} from './mkcert.js' import {generateCertificatePrompt} from '../prompts/dev.js' -import * as fs from '@shopify/cli-kit/node/fs' -import {mkdir, writeFile} from '@shopify/cli-kit/node/fs' +import * as fs from '@shopify/cli-kit/shared/node/fs' +import {mkdir, writeFile} from '@shopify/cli-kit/shared/node/fs' import {describe, vi, expect, beforeEach, afterEach, MockInstance} from 'vitest' -import {exec, isWsl} from '@shopify/cli-kit/node/system' -import {joinPath} from '@shopify/cli-kit/node/path' +import {exec, isWsl} from '@shopify/cli-kit/shared/node/system' +import {joinPath} from '@shopify/cli-kit/shared/node/path' import which from 'which' -import {downloadGitHubRelease} from '@shopify/cli-kit/node/github' -import {testWithTempDir} from '@shopify/cli-kit/node/testing/test-with-temp-dir' -import {AbortError} from '@shopify/cli-kit/node/error' -import {fetch, Response} from '@shopify/cli-kit/node/http' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' -import {keypress, renderWarning} from '@shopify/cli-kit/node/ui' - -vi.mock('@shopify/cli-kit/node/system') +import {downloadGitHubRelease} from '@shopify/cli-kit/shared/node/github' +import {testWithTempDir} from '@shopify/cli-kit/shared/node/testing/test-with-temp-dir' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {fetch, Response} from '@shopify/cli-kit/shared/node/http' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' +import {keypress, renderWarning} from '@shopify/cli-kit/shared/node/ui' + +vi.mock('@shopify/cli-kit/shared/node/system') vi.mock('which') -vi.mock('@shopify/cli-kit/node/github') +vi.mock('@shopify/cli-kit/shared/node/github') vi.mock('../prompts/dev.js') -vi.mock('@shopify/cli-kit/node/http') -vi.mock('@shopify/cli-kit/node/ui', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/http') +vi.mock('@shopify/cli-kit/shared/node/ui', async () => { + const actual = await vi.importActual('@shopify/cli-kit/shared/node/ui') return { ...actual, renderWarning: vi.fn(), diff --git a/packages/app/src/cli/utilities/mkcert.ts b/packages/app/src/cli/utilities/mkcert.ts index 8f18df3e6f1..cf813a790db 100644 --- a/packages/app/src/cli/utilities/mkcert.ts +++ b/packages/app/src/cli/utilities/mkcert.ts @@ -1,14 +1,14 @@ import {environmentVariableNames} from '../constants.js' import {generateCertificatePrompt} from '../prompts/dev.js' -import {exec, isWsl} from '@shopify/cli-kit/node/system' -import {downloadGitHubRelease} from '@shopify/cli-kit/node/github' -import {fetch, Response} from '@shopify/cli-kit/node/http' -import {joinPath, relativePath} from '@shopify/cli-kit/node/path' -import {fileExists, readFile, writeFile} from '@shopify/cli-kit/node/fs' -import {outputContent, outputDebug, outputInfo, outputToken} from '@shopify/cli-kit/node/output' -import {AbortError, BugError} from '@shopify/cli-kit/node/error' +import {exec, isWsl} from '@shopify/cli-kit/shared/node/system' +import {downloadGitHubRelease} from '@shopify/cli-kit/shared/node/github' +import {fetch, Response} from '@shopify/cli-kit/shared/node/http' +import {joinPath, relativePath} from '@shopify/cli-kit/shared/node/path' +import {fileExists, readFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {outputContent, outputDebug, outputInfo, outputToken} from '@shopify/cli-kit/shared/node/output' +import {AbortError, BugError} from '@shopify/cli-kit/shared/node/error' import which from 'which' -import {RenderAlertOptions, keypress, renderInfo, renderTasks, renderWarning} from '@shopify/cli-kit/node/ui' +import {RenderAlertOptions, keypress, renderInfo, renderTasks, renderWarning} from '@shopify/cli-kit/shared/node/ui' const MKCERT_VERSION = 'v1.4.4' const MKCERT_REPO = 'FiloSottile/mkcert' diff --git a/packages/app/src/cli/utilities/types.ts b/packages/app/src/cli/utilities/types.ts index 37fd9ac655f..98716d24909 100644 --- a/packages/app/src/cli/utilities/types.ts +++ b/packages/app/src/cli/utilities/types.ts @@ -1,4 +1,4 @@ -import {zod} from '@shopify/cli-kit/node/schema' +import {zod} from '@shopify/cli-kit/shared/node/schema' export function isType(schema: T, item: unknown): item is zod.infer { return schema.safeParse(item).success diff --git a/packages/app/src/cli/validations/message.ts b/packages/app/src/cli/validations/message.ts index 15d71a17546..3269cb1a6ca 100644 --- a/packages/app/src/cli/validations/message.ts +++ b/packages/app/src/cli/validations/message.ts @@ -1,4 +1,4 @@ -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export function validateMessage(message: string | undefined) { if (typeof message === 'undefined') return diff --git a/packages/app/src/cli/validations/version-name.ts b/packages/app/src/cli/validations/version-name.ts index 1b4f1fd7b77..56959c87a67 100644 --- a/packages/app/src/cli/validations/version-name.ts +++ b/packages/app/src/cli/validations/version-name.ts @@ -1,4 +1,4 @@ -import {AbortError} from '@shopify/cli-kit/node/error' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export function validateVersion(version: string | undefined) { if (typeof version === 'undefined') return diff --git a/packages/cli-kit/bin/documentation/examples.ts b/packages/cli-kit/bin/documentation/examples.ts index 3c70e51b9ce..22cbc94e023 100644 --- a/packages/cli-kit/bin/documentation/examples.ts +++ b/packages/cli-kit/bin/documentation/examples.ts @@ -15,14 +15,14 @@ import { renderSingleTask, renderTextPrompt, renderWarning, -} from '../../src/public/node/ui.js' -import {outputContent, unstyled} from '../../src/public/node/output.js' -import {AbortError, BugError} from '../../src/public/node/error.js' -import {AbortSignal} from '../../src/public/node/abort.js' -import {Stdout} from '../../src/private/node/ui.js' -import {Stdin, waitFor} from '../../src/private/node/testing/ui.js' +} from '../../src/shared/node/ui.js' +import {outputContent, unstyled} from '../../src/shared/node/output.js' +import {AbortError, BugError} from '../../src/shared/node/error.js' +import {AbortSignal} from '../../src/shared/node/abort.js' +import {Stdout} from '../../src/shared/ui/ui.js' +import {Stdin, waitFor} from '../../src/shared/ui/testing.js' import {Writable} from 'node:stream' -import { sleep } from '../../src/public/node/system.js' +import { sleep } from '../../src/shared/node/system.js' interface Example { type: 'static' | 'async' | 'prompt' diff --git a/packages/cli-kit/bin/refresh-code-documentation.ts b/packages/cli-kit/bin/refresh-code-documentation.ts index 02693e11cc9..20f106ae397 100644 --- a/packages/cli-kit/bin/refresh-code-documentation.ts +++ b/packages/cli-kit/bin/refresh-code-documentation.ts @@ -1,5 +1,5 @@ import {examples} from './documentation/examples.js' -import {unstyled} from '../src/public/node/output.js' +import {unstyled} from '../src/shared/node/output.js' import {FunctionDeclaration, JSDocTag, Project} from 'ts-morph' import difference from 'lodash/difference.js' @@ -8,7 +8,7 @@ async function refreshDocumentation(): Promise { const project = new Project({ tsConfigFilePath: 'tsconfig.json', }) - const sourceFile = project.getSourceFileOrThrow('src/public/node/ui.tsx') + const sourceFile = project.getSourceFileOrThrow('src/shared/node/ui.tsx') const renderFunctions = sourceFile.getFunctions().filter((func) => func.getNameOrThrow().startsWith('render')) validateMissingExamples(renderFunctions, validationErrors) diff --git a/packages/cli-kit/package.json b/packages/cli-kit/package.json index 9f89b666d79..d9bec857175 100644 --- a/packages/cli-kit/package.json +++ b/packages/cli-kit/package.json @@ -24,18 +24,58 @@ "import": "./dist/index.js", "types": "./dist/index.d.ts" }, - "./*": { - "node": "./dist/public/*.js", - "types": "./dist/public/*.d.ts" + "./identity/*": { + "node": "./dist/identity/*.js", + "types": "./dist/identity/*.d.ts" + }, + "./admin/*": { + "node": "./dist/admin/*.js", + "types": "./dist/admin/*.d.ts" + }, + "./partners/*": { + "node": "./dist/partners/*.js", + "types": "./dist/partners/*.d.ts" + }, + "./app-management/*": { + "node": "./dist/app-management/*.js", + "types": "./dist/app-management/*.d.ts" + }, + "./app-dev/*": { + "node": "./dist/app-dev/*.js", + "types": "./dist/app-dev/*.d.ts" + }, + "./business-platform/*": { + "node": "./dist/business-platform/*.js", + "types": "./dist/business-platform/*.d.ts" + }, + "./functions/*": { + "node": "./dist/functions/*.js", + "types": "./dist/functions/*.d.ts" + }, + "./themes/*": { + "node": "./dist/themes/*.js", + "types": "./dist/themes/*.d.ts" + }, + "./webhooks/*": { + "node": "./dist/webhooks/*.js", + "types": "./dist/webhooks/*.d.ts" + }, + "./shared/*": { + "node": "./dist/shared/*.js", + "types": "./dist/shared/*.d.ts" }, "./assets/*": "./assets/*", - "./testing/*": { - "node": "./dist/testing/*.js", - "types": "./dist/testing/*.d.ts" + "./node/*": { + "node": "./dist/compat/node/*.js", + "types": "./dist/compat/node/*.d.ts" + }, + "./common/*": { + "node": "./dist/compat/common/*.js", + "types": "./dist/compat/common/*.d.ts" }, - "./typing/*": { - "node": "./dist/typing/*.js", - "types": "./dist/typing/*.d.ts" + "./testing/*": { + "node": "./dist/compat/testing/*.js", + "types": "./dist/compat/testing/*.d.ts" } }, "module": "dist/index.js", @@ -61,13 +101,13 @@ "../../.eslintrc.cjs" ], "ignorePatterns": [ - "**/vendor/otel-js/**/*.ts", - "**/vendor/dev_server/**/*.ts" + "**/shared/vendor/otel-js/**/*.ts", + "**/shared/vendor/dev_server/**/*.ts" ], "overrides": [ { "files": [ - "**/node/cli.ts" + "**/shared/node/cli.ts" ], "rules": { "@shopify/cli/specific-imports-in-bootstrap-code": [ @@ -76,7 +116,6 @@ "dynamic": [ "./node-package-manager.js", "./error-handler.js", - "../../public/node/context/local.js", "./context/local.js", "./custom-oclif-loader.js", "@oclif/core", @@ -87,8 +126,8 @@ "static": [ "@oclif/core", "./context/utilities.js", - "../../private/node/conf-store.js", - "../../private/node/constants.js", + "./internal/conf-store.js", + "./internal/constants.js", "url", "./cli-launcher.js" ] diff --git a/packages/cli-kit/project.json b/packages/cli-kit/project.json index 7c9df400070..7b9fcc16dd9 100644 --- a/packages/cli-kit/project.json +++ b/packages/cli-kit/project.json @@ -3,9 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "packages/cli-kit/src", "projectType": "library", - "tags": [ - "scope:foundation" - ], + "tags": ["scope:foundation"], "targets": { "clean": { "executor": "nx:run-commands", @@ -16,22 +14,16 @@ }, "build": { "executor": "nx:run-commands", - "outputs": [ - "{workspaceRoot}/dist" - ], - "inputs": [ - "{projectRoot}/src/**/*" - ], + "outputs": ["{workspaceRoot}/dist"], + "inputs": ["{projectRoot}/src/**/*"], "options": { - "command": "pnpm tsc -b ./tsconfig.build.json", + "command": "pnpm tsc -b ./tsconfig.build.json && node scripts/generate-compat.mjs", "cwd": "packages/cli-kit" } }, "build-api-docs": { "executor": "nx:run-commands", - "outputs": [ - "{workspaceRoot}/docs" - ], + "outputs": ["{workspaceRoot}/docs"], "options": { "command": "node ./scripts/build-api-docs.js", "cwd": "packages/cli-kit" @@ -39,9 +31,7 @@ }, "open-api-docs": { "executor": "nx:run-commands", - "dependsOn": [ - "build-api-docs" - ], + "dependsOn": ["build-api-docs"], "options": { "command": "open ../../docs/api/cli-kit/index.html", "cwd": "packages/cli-kit" @@ -77,62 +67,43 @@ }, "graphql-codegen": { "executor": "nx:noop", - "dependsOn": [ - "graphql-codegen:formatting" - ] + "dependsOn": ["graphql-codegen:formatting"] }, "graphql-codegen:formatting": { "executor": "nx:run-commands", - "dependsOn": [ - "graphql-codegen:postfix" - ], + "dependsOn": ["graphql-codegen:postfix"], "inputs": [ { "dependentTasksOutputFiles": "**/*.ts" } ], - "outputs": [ - "{projectRoot}/src/cli/api/graphql/admin/generated/**/*.ts" - ], + "outputs": ["{projectRoot}/src/admin/graphql/generated/**/*.ts"], "options": { - "commands": [ - "pnpm eslint 'src/cli/api/graphql/admin/generated/**/*.{ts,tsx}' --fix" - ], + "commands": ["pnpm eslint 'src/admin/graphql/generated/**/*.{ts,tsx}' --fix"], "cwd": "packages/cli-kit" } }, "graphql-codegen:generate:admin": { "executor": "nx:run-commands", - "inputs": [ - "{workspaceRoot}/graphql.config.ts", - "{projectRoot}/src/cli/api/graphql/admin/**/*.graphql" - ], - "outputs": [ - "{projectRoot}/src/cli/api/graphql/admin/generated/**/*.ts" - ], + "inputs": ["{workspaceRoot}/graphql.config.ts", "{projectRoot}/src/admin/graphql/**/*.graphql"], + "outputs": ["{projectRoot}/src/admin/graphql/generated/**/*.ts"], "options": { - "commands": [ - "pnpm exec graphql-codegen --project=admin" - ], + "commands": ["pnpm exec graphql-codegen --project=admin"], "cwd": "{workspaceRoot}" } }, "graphql-codegen:postfix": { "executor": "nx:run-commands", - "dependsOn": [ - "graphql-codegen:generate:admin" - ], + "dependsOn": ["graphql-codegen:generate:admin"], "inputs": [ { "dependentTasksOutputFiles": "**/*.ts" } ], - "outputs": [ - "{projectRoot}/src/cli/api/graphql/admin/generated/**/*.ts" - ], + "outputs": ["{projectRoot}/src/admin/graphql/generated/**/*.ts"], "options": { "commands": [ - "find ./packages/cli-kit/src/cli/api/graphql/admin/generated/ -type f -name '*.ts' -exec sh -c 'sed -i \"\" \"s|import \\* as Types from '\\''./types'\\'';|import \\* as Types from '\\''./types.js'\\'';|g; s|export const \\([A-Za-z0-9_]*\\)Document =|export const \\1 =|g\" \"$0\"' {} \\;" + "find ./packages/cli-kit/src/admin/graphql/generated/ -type f -name '*.ts' -exec sh -c 'sed -i \"\" \"s|import \\* as Types from '\\''./types'\\'';|import \\* as Types from '\\''./types.js'\\'';|g; s|export const \\([A-Za-z0-9_]*\\)Document =|export const \\1 =|g\" \"$0\"' {} \\;" ], "cwd": "{workspaceRoot}" } diff --git a/packages/cli-kit/scripts/build-api-docs.js b/packages/cli-kit/scripts/build-api-docs.js index 476823a0775..d0bfdeb0e11 100644 --- a/packages/cli-kit/scripts/build-api-docs.js +++ b/packages/cli-kit/scripts/build-api-docs.js @@ -8,8 +8,9 @@ const __dirname = path.dirname(__filename) async function main() { const cliKitRoot = path.join(__dirname, '..') - const entryPoints = (await glob('src/public/**/*.(ts|tsx)', {cwd: cliKitRoot})) - .filter((file) => !file.endsWith('.test.ts') && !file.endsWith('.test.tsx')) + const entryPoints = (await glob('src/public/**/*.(ts|tsx)', {cwd: cliKitRoot})).filter( + (file) => !file.endsWith('.test.ts') && !file.endsWith('.test.tsx'), + ) const app = await TypeDocApp.bootstrapWithPlugins({ excludeExternals: true, diff --git a/packages/cli-kit/scripts/generate-compat.mjs b/packages/cli-kit/scripts/generate-compat.mjs new file mode 100644 index 00000000000..b8e55f57ae3 --- /dev/null +++ b/packages/cli-kit/scripts/generate-compat.mjs @@ -0,0 +1,160 @@ +/** + * Generates backward-compatible re-export files at old import paths. + * These allow external consumers (e.g. @shopify/cli-hydrogen) to keep + * using @shopify/cli-kit/node/* paths while we migrate to the new structure. + * + * Run this after building to populate dist/compat/. + */ + +import {mkdirSync, writeFileSync, readFileSync, existsSync} from 'fs' +import {dirname, join} from 'path' + +const DIST = 'dist' +const COMPAT = join(DIST, 'compat') + +const mapping = { + // Identity + 'node/session': 'identity/session', + 'node/session-prompt': 'identity/session-prompt', + // Admin + 'node/api/admin': 'admin/api', + 'node/api/rest-api-throttler': 'admin/rest-api-throttler', + // Partners + 'node/api/partners': 'partners/api', + // App Management + 'node/api/app-management': 'app-management/api', + // App Dev + 'node/api/app-dev': 'app-dev/api', + // Business Platform + 'node/api/business-platform': 'business-platform/api', + // Functions + 'node/api/functions': 'functions/api', + // Webhooks + 'node/api/webhooks': 'webhooks/api', + // Themes + 'node/themes/api': 'themes/api', + 'node/themes/conf': 'themes/conf', + 'node/themes/factories': 'themes/factories', + 'node/themes/theme-manager': 'themes/theme-manager', + 'node/themes/types': 'themes/types', + 'node/themes/urls': 'themes/urls', + 'node/themes/utils': 'themes/utils', + // Shared node + 'node/abort': 'shared/node/abort', + 'node/analytics': 'shared/node/analytics', + 'node/api/graphql': 'shared/node/api/graphql', + 'node/api/utilities': 'shared/node/api/utilities', + 'node/archiver': 'shared/node/archiver', + 'node/base-command': 'shared/node/base-command', + 'node/cli': 'shared/node/cli', + 'node/cli-launcher': 'shared/node/cli-launcher', + 'node/colors': 'shared/node/colors', + 'node/context/fqdn': 'shared/node/context/fqdn', + 'node/context/local': 'shared/node/context/local', + 'node/context/utilities': 'shared/node/context/utilities', + 'node/crypto': 'shared/node/crypto', + 'node/custom-oclif-loader': 'shared/node/custom-oclif-loader', + 'node/dot-env': 'shared/node/dot-env', + 'node/environment': 'shared/node/environment', + 'node/environments': 'shared/node/environments', + 'node/error': 'shared/node/error', + 'node/error-handler': 'shared/node/error-handler', + 'node/figures': 'shared/node/figures', + 'node/framework': 'shared/node/framework', + 'node/fs': 'shared/node/fs', + 'node/git': 'shared/node/git', + 'node/github': 'shared/node/github', + 'node/global-context': 'shared/node/global-context', + 'node/hidden-folder': 'shared/node/hidden-folder', + 'node/hooks/deprecations': 'shared/node/hooks/deprecations', + 'node/hooks/postrun': 'shared/node/hooks/postrun', + 'node/hooks/prerun': 'shared/node/hooks/prerun', + 'node/hrtime': 'shared/node/hrtime', + 'node/http': 'shared/node/http', + 'node/import-extractor': 'shared/node/import-extractor', + 'node/ink': 'shared/node/ink', + 'node/is-global': 'shared/node/is-global', + 'node/json-schema': 'shared/node/json-schema', + 'node/liquid': 'shared/node/liquid', + 'node/local-storage': 'shared/node/local-storage', + 'node/logs': 'shared/node/logs', + 'node/metadata': 'shared/node/metadata', + 'node/mimes': 'shared/node/mimes', + 'node/monorail': 'shared/node/monorail', + 'node/multiple-installation-warning': 'shared/node/multiple-installation-warning', + 'node/node-package-manager': 'shared/node/node-package-manager', + 'node/notifications-system': 'shared/node/notifications-system', + 'node/os': 'shared/node/os', + 'node/output': 'shared/node/output', + 'node/path': 'shared/node/path', + 'node/plugins': 'shared/node/plugins', + 'node/plugins/tunnel': 'shared/node/plugins/tunnel', + 'node/promises': 'shared/node/promises', + 'node/result': 'shared/node/result', + 'node/schema': 'shared/node/schema', + 'node/serial-batch-processor': 'shared/node/serial-batch-processor', + 'node/system': 'shared/node/system', + 'node/tcp': 'shared/node/tcp', + 'node/testing/output': 'shared/node/testing/output', + 'node/testing/test-with-temp-dir': 'shared/node/testing/test-with-temp-dir', + 'node/testing/ui': 'shared/node/testing/ui', + 'node/toml': 'shared/node/toml', + 'node/tree-kill': 'shared/node/tree-kill', + 'node/ui': 'shared/node/ui', + 'node/ui/components': 'shared/node/ui/components', + 'node/ui/hooks': 'shared/node/ui/hooks', + 'node/upgrade': 'shared/node/upgrade', + 'node/version': 'shared/node/version', + 'node/vscode': 'shared/node/vscode', + 'node/doctor/framework': 'shared/node/doctor/framework', + 'node/doctor/reporter': 'shared/node/doctor/reporter', + 'node/doctor/types': 'shared/node/doctor/types', + // Shared common + 'common/array': 'shared/common/array', + 'common/collection': 'shared/common/collection', + 'common/function': 'shared/common/function', + 'common/json': 'shared/common/json', + 'common/lang': 'shared/common/lang', + 'common/object': 'shared/common/object', + 'common/retry': 'shared/common/retry', + 'common/string': 'shared/common/string', + 'common/url': 'shared/common/url', + 'common/version': 'shared/common/version', + 'common/ts/deep-required': 'shared/common/ts/deep-required', + 'common/ts/json-narrowing': 'shared/common/ts/json-narrowing', + 'common/ts/pick-by-prefix': 'shared/common/ts/pick-by-prefix', +} + +let count = 0 +for (const [oldPath, newPath] of Object.entries(mapping)) { + const compatFile = join(COMPAT, `${oldPath}.js`) + const compatDir = dirname(compatFile) + + // Compute relative path from compat location to actual dist location + const depth = oldPath.split('/').length + const prefix = '../'.repeat(depth) + const target = `${prefix}${newPath}.js` + + // Check if the target module has a default export + const targetFile = join(DIST, `${newPath}.js`) + let hasDefault = false + if (existsSync(targetFile)) { + const content = readFileSync(targetFile, 'utf8') + hasDefault = /export\s*\{[^}]*\bdefault\b|export\s+default\b/.test(content) + } + + mkdirSync(compatDir, {recursive: true}) + let jsContent = `export * from '${target}';\n` + let dtsContent = `export * from '${target.replace('.js', '')}';\n` + if (hasDefault) { + jsContent += `export { default } from '${target}';\n` + dtsContent += `export { default } from '${target.replace('.js', '')}';\n` + } + + writeFileSync(compatFile, jsContent) + writeFileSync(join(COMPAT, `${oldPath}.d.ts`), dtsContent) + + count++ +} + +console.log(`Generated ${count} compat re-export files in dist/compat/`) diff --git a/packages/cli-kit/src/public/node/api/admin.test.ts b/packages/cli-kit/src/admin/api.test.ts similarity index 90% rename from packages/cli-kit/src/public/node/api/admin.test.ts rename to packages/cli-kit/src/admin/api.test.ts index f63268f6671..99866f3205a 100644 --- a/packages/cli-kit/src/public/node/api/admin.test.ts +++ b/packages/cli-kit/src/admin/api.test.ts @@ -1,14 +1,14 @@ -import * as admin from './admin.js' -import {graphqlRequest, graphqlRequestDoc} from './graphql.js' -import {AdminSession} from '../session.js' -import {buildHeaders} from '../../../private/node/api/headers.js' -import * as http from '../../../public/node/http.js' -import {defaultThemeKitAccessDomain} from '../../../private/node/constants.js' +import * as admin from './api.js' +import {graphqlRequest, graphqlRequestDoc} from '../shared/node/api/graphql.js' +import {AdminSession} from '../identity/session.js' +import {buildHeaders} from '../shared/node/internal/api/headers.js' +import * as http from '../shared/node/http.js' +import {defaultThemeKitAccessDomain} from '../shared/node/internal/constants.js' import {test, vi, expect, describe} from 'vitest' -vi.mock('./graphql.js') -vi.mock('../../../private/node/api/headers.js') -vi.mock('../http.js') +vi.mock('../shared/node/api/graphql.js') +vi.mock('../shared/node/internal/api/headers.js') +vi.mock('../shared/node/http.js') const mockedResult = { publicApiVersions: [ diff --git a/packages/cli-kit/src/public/node/api/admin.ts b/packages/cli-kit/src/admin/api.ts similarity index 92% rename from packages/cli-kit/src/public/node/api/admin.ts rename to packages/cli-kit/src/admin/api.ts index 107d91686fa..72a402c5613 100644 --- a/packages/cli-kit/src/public/node/api/admin.ts +++ b/packages/cli-kit/src/admin/api.ts @@ -1,26 +1,21 @@ +import {restRequestBody, restRequestHeaders, restRequestUrl, isThemeAccessSession} from './rest.js' +import {PublicApiVersions} from './graphql/generated/public_api_versions.js' import { graphqlRequest, graphqlRequestDoc, GraphQLResponseOptions, GraphQLVariables, UnauthorizedHandler, -} from './graphql.js' -import {AdminSession} from '../session.js' -import {outputContent, outputToken} from '../../../public/node/output.js' -import {AbortError, BugError} from '../error.js' -import { - restRequestBody, - restRequestHeaders, - restRequestUrl, - isThemeAccessSession, -} from '../../../private/node/api/rest.js' -import {isNetworkError} from '../../../private/node/api.js' -import {RequestModeInput, shopifyFetch} from '../http.js' -import {PublicApiVersions} from '../../../cli/api/graphql/admin/generated/public_api_versions.js' +} from '../shared/node/api/graphql.js' +import {AdminSession} from '../identity/session.js' +import {outputContent, outputToken} from '../shared/node/output.js' +import {AbortError, BugError} from '../shared/node/error.js' +import {isNetworkError} from '../shared/node/internal/api.js' +import {RequestModeInput, shopifyFetch} from '../shared/node/http.js' -import {themeKitAccessDomain} from '../../../private/node/constants.js' -import {serviceEnvironment} from '../../../private/node/context/service.js' -import {DevServerCore} from '../vendor/dev_server/index.js' +import {themeKitAccessDomain} from '../shared/node/internal/constants.js' +import {serviceEnvironment} from '../shared/node/internal/context/service.js' +import {DevServerCore} from '../shared/vendor/dev_server/index.js' import {ClientError, Variables} from 'graphql-request' import {TypedDocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme.ts b/packages/cli-kit/src/admin/graphql/generated/get_theme.ts similarity index 87% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme.ts rename to packages/cli-kit/src/admin/graphql/generated/get_theme.ts index deeaff22b89..764ad06e345 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme.ts +++ b/packages/cli-kit/src/admin/graphql/generated/get_theme.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme_file_bodies.ts b/packages/cli-kit/src/admin/graphql/generated/get_theme_file_bodies.ts similarity index 96% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme_file_bodies.ts rename to packages/cli-kit/src/admin/graphql/generated/get_theme_file_bodies.ts index d5f382c56ee..a4cf881dafb 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme_file_bodies.ts +++ b/packages/cli-kit/src/admin/graphql/generated/get_theme_file_bodies.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme_file_checksums.ts b/packages/cli-kit/src/admin/graphql/generated/get_theme_file_checksums.ts similarity index 94% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme_file_checksums.ts rename to packages/cli-kit/src/admin/graphql/generated/get_theme_file_checksums.ts index 712229fa2e1..0c08e4f3cbd 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/get_theme_file_checksums.ts +++ b/packages/cli-kit/src/admin/graphql/generated/get_theme_file_checksums.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/get_themes.ts b/packages/cli-kit/src/admin/graphql/generated/get_themes.ts similarity index 91% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/get_themes.ts rename to packages/cli-kit/src/admin/graphql/generated/get_themes.ts index 5a6f78152f6..ef6075c56cd 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/get_themes.ts +++ b/packages/cli-kit/src/admin/graphql/generated/get_themes.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/metafield_definitions_by_owner_type.ts b/packages/cli-kit/src/admin/graphql/generated/metafield_definitions_by_owner_type.ts similarity index 92% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/metafield_definitions_by_owner_type.ts rename to packages/cli-kit/src/admin/graphql/generated/metafield_definitions_by_owner_type.ts index 339337b472e..a47a05c70e3 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/metafield_definitions_by_owner_type.ts +++ b/packages/cli-kit/src/admin/graphql/generated/metafield_definitions_by_owner_type.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/online_store_password_protection.ts b/packages/cli-kit/src/admin/graphql/generated/online_store_password_protection.ts similarity index 85% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/online_store_password_protection.ts rename to packages/cli-kit/src/admin/graphql/generated/online_store_password_protection.ts index 981e88f6f24..d39ac201c60 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/online_store_password_protection.ts +++ b/packages/cli-kit/src/admin/graphql/generated/online_store_password_protection.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/public_api_versions.ts b/packages/cli-kit/src/admin/graphql/generated/public_api_versions.ts similarity index 81% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/public_api_versions.ts rename to packages/cli-kit/src/admin/graphql/generated/public_api_versions.ts index 50fba209503..21c4d1504cc 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/public_api_versions.ts +++ b/packages/cli-kit/src/admin/graphql/generated/public_api_versions.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_create.ts b/packages/cli-kit/src/admin/graphql/generated/theme_create.ts similarity index 93% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/theme_create.ts rename to packages/cli-kit/src/admin/graphql/generated/theme_create.ts index 41cb3351298..8f930281852 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_create.ts +++ b/packages/cli-kit/src/admin/graphql/generated/theme_create.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_delete.ts b/packages/cli-kit/src/admin/graphql/generated/theme_delete.ts similarity index 89% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/theme_delete.ts rename to packages/cli-kit/src/admin/graphql/generated/theme_delete.ts index 562f2fea00c..dcc4d2dcffc 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_delete.ts +++ b/packages/cli-kit/src/admin/graphql/generated/theme_delete.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_duplicate.ts b/packages/cli-kit/src/admin/graphql/generated/theme_duplicate.ts similarity index 92% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/theme_duplicate.ts rename to packages/cli-kit/src/admin/graphql/generated/theme_duplicate.ts index 4509814bd42..1bdcc68f586 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_duplicate.ts +++ b/packages/cli-kit/src/admin/graphql/generated/theme_duplicate.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_files_delete.ts b/packages/cli-kit/src/admin/graphql/generated/theme_files_delete.ts similarity index 92% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/theme_files_delete.ts rename to packages/cli-kit/src/admin/graphql/generated/theme_files_delete.ts index f451cddab4a..9cc4448e5a1 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_files_delete.ts +++ b/packages/cli-kit/src/admin/graphql/generated/theme_files_delete.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_files_upsert.ts b/packages/cli-kit/src/admin/graphql/generated/theme_files_upsert.ts similarity index 92% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/theme_files_upsert.ts rename to packages/cli-kit/src/admin/graphql/generated/theme_files_upsert.ts index f7bd095c8f5..a46dd71a5ff 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_files_upsert.ts +++ b/packages/cli-kit/src/admin/graphql/generated/theme_files_upsert.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_publish.ts b/packages/cli-kit/src/admin/graphql/generated/theme_publish.ts similarity index 91% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/theme_publish.ts rename to packages/cli-kit/src/admin/graphql/generated/theme_publish.ts index e9c7f7ca43e..7dd180715de 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_publish.ts +++ b/packages/cli-kit/src/admin/graphql/generated/theme_publish.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_update.ts b/packages/cli-kit/src/admin/graphql/generated/theme_update.ts similarity index 92% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/theme_update.ts rename to packages/cli-kit/src/admin/graphql/generated/theme_update.ts index a85ac4d5c57..3e5a96d4672 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/theme_update.ts +++ b/packages/cli-kit/src/admin/graphql/generated/theme_update.ts @@ -1,4 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' import * as Types from './types.js' import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/cli/api/graphql/admin/generated/types.d.ts b/packages/cli-kit/src/admin/graphql/generated/types.d.ts similarity index 96% rename from packages/cli-kit/src/cli/api/graphql/admin/generated/types.d.ts rename to packages/cli-kit/src/admin/graphql/generated/types.d.ts index 3ecac10dacd..aea429ff07d 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/generated/types.d.ts +++ b/packages/cli-kit/src/admin/graphql/generated/types.d.ts @@ -1,5 +1,5 @@ -/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/no-explicit-any, tsdoc/syntax, @nx/enforce-module-boundaries */ -import {JsonMapType} from '@shopify/cli-kit/node/toml' +/* eslint-disable @typescript-eslint/consistent-type-definitions, @typescript-eslint/naming-convention, @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any, tsdoc/syntax, @typescript-eslint/no-duplicate-type-constituents, @typescript-eslint/no-redundant-type-constituents, @nx/enforce-module-boundaries */ +import {JsonMapType} from '@shopify/cli-kit/shared/node/toml' export type Maybe = T | null export type InputMaybe = Maybe diff --git a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_create.graphql b/packages/cli-kit/src/admin/graphql/mutations/theme_create.graphql similarity index 100% rename from packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_create.graphql rename to packages/cli-kit/src/admin/graphql/mutations/theme_create.graphql diff --git a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_delete.graphql b/packages/cli-kit/src/admin/graphql/mutations/theme_delete.graphql similarity index 100% rename from packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_delete.graphql rename to packages/cli-kit/src/admin/graphql/mutations/theme_delete.graphql diff --git a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_duplicate.graphql b/packages/cli-kit/src/admin/graphql/mutations/theme_duplicate.graphql similarity index 74% rename from packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_duplicate.graphql rename to packages/cli-kit/src/admin/graphql/mutations/theme_duplicate.graphql index 51a600b8b43..4c30bbf6955 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_duplicate.graphql +++ b/packages/cli-kit/src/admin/graphql/mutations/theme_duplicate.graphql @@ -1,4 +1,4 @@ - mutation themeDuplicate($id: ID!, $name: String) { +mutation themeDuplicate($id: ID!, $name: String) { themeDuplicate(id: $id, name: $name) { newTheme { id diff --git a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_files_delete.graphql b/packages/cli-kit/src/admin/graphql/mutations/theme_files_delete.graphql similarity index 100% rename from packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_files_delete.graphql rename to packages/cli-kit/src/admin/graphql/mutations/theme_files_delete.graphql diff --git a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_files_upsert.graphql b/packages/cli-kit/src/admin/graphql/mutations/theme_files_upsert.graphql similarity index 100% rename from packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_files_upsert.graphql rename to packages/cli-kit/src/admin/graphql/mutations/theme_files_upsert.graphql diff --git a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_publish.graphql b/packages/cli-kit/src/admin/graphql/mutations/theme_publish.graphql similarity index 89% rename from packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_publish.graphql rename to packages/cli-kit/src/admin/graphql/mutations/theme_publish.graphql index b6dfe274561..3c9e63764ff 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_publish.graphql +++ b/packages/cli-kit/src/admin/graphql/mutations/theme_publish.graphql @@ -5,7 +5,7 @@ mutation themePublish($id: ID!) { name role } - userErrors{ + userErrors { field message } diff --git a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_update.graphql b/packages/cli-kit/src/admin/graphql/mutations/theme_update.graphql similarity index 72% rename from packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_update.graphql rename to packages/cli-kit/src/admin/graphql/mutations/theme_update.graphql index 26f3a8204ed..55582e30503 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/mutations/theme_update.graphql +++ b/packages/cli-kit/src/admin/graphql/mutations/theme_update.graphql @@ -1,11 +1,11 @@ mutation themeUpdate($id: ID!, $input: OnlineStoreThemeInput!) { - themeUpdate(id: $id, input: $input ) { + themeUpdate(id: $id, input: $input) { theme { id name role } - userErrors{ + userErrors { field message } diff --git a/packages/cli-kit/src/cli/api/graphql/admin/queries/get_theme.graphql b/packages/cli-kit/src/admin/graphql/queries/get_theme.graphql similarity index 98% rename from packages/cli-kit/src/cli/api/graphql/admin/queries/get_theme.graphql rename to packages/cli-kit/src/admin/graphql/queries/get_theme.graphql index 10e760dce81..77d838b7fdd 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/queries/get_theme.graphql +++ b/packages/cli-kit/src/admin/graphql/queries/get_theme.graphql @@ -1,4 +1,3 @@ - query getTheme($id: ID!) { theme(id: $id) { id diff --git a/packages/cli-kit/src/cli/api/graphql/admin/queries/get_theme_file_bodies.graphql b/packages/cli-kit/src/admin/graphql/queries/get_theme_file_bodies.graphql similarity index 60% rename from packages/cli-kit/src/cli/api/graphql/admin/queries/get_theme_file_bodies.graphql rename to packages/cli-kit/src/admin/graphql/queries/get_theme_file_bodies.graphql index 5e27bc05388..d86ee2ea013 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/queries/get_theme_file_bodies.graphql +++ b/packages/cli-kit/src/admin/graphql/queries/get_theme_file_bodies.graphql @@ -2,14 +2,20 @@ query getThemeFileBodies($id: ID!, $after: String, $filenames: [String!]) { theme(id: $id) { files(first: 250, after: $after, filenames: $filenames) { nodes { - filename + filename size checksumMd5 body { __typename - ... on OnlineStoreThemeFileBodyText { content } - ... on OnlineStoreThemeFileBodyBase64 { contentBase64 } - ... on OnlineStoreThemeFileBodyUrl { url } + ... on OnlineStoreThemeFileBodyText { + content + } + ... on OnlineStoreThemeFileBodyBase64 { + contentBase64 + } + ... on OnlineStoreThemeFileBodyUrl { + url + } } } userErrors { diff --git a/packages/cli-kit/src/cli/api/graphql/admin/queries/get_theme_file_checksums.graphql b/packages/cli-kit/src/admin/graphql/queries/get_theme_file_checksums.graphql similarity index 100% rename from packages/cli-kit/src/cli/api/graphql/admin/queries/get_theme_file_checksums.graphql rename to packages/cli-kit/src/admin/graphql/queries/get_theme_file_checksums.graphql diff --git a/packages/cli-kit/src/cli/api/graphql/admin/queries/get_themes.graphql b/packages/cli-kit/src/admin/graphql/queries/get_themes.graphql similarity index 99% rename from packages/cli-kit/src/cli/api/graphql/admin/queries/get_themes.graphql rename to packages/cli-kit/src/admin/graphql/queries/get_themes.graphql index b8d15dfbea7..7bd4faa8a64 100644 --- a/packages/cli-kit/src/cli/api/graphql/admin/queries/get_themes.graphql +++ b/packages/cli-kit/src/admin/graphql/queries/get_themes.graphql @@ -1,4 +1,3 @@ - query getThemes($after: String) { themes(first: 50, after: $after) { nodes { diff --git a/packages/cli-kit/src/cli/api/graphql/admin/queries/metafield_definitions_by_owner_type.graphql b/packages/cli-kit/src/admin/graphql/queries/metafield_definitions_by_owner_type.graphql similarity index 100% rename from packages/cli-kit/src/cli/api/graphql/admin/queries/metafield_definitions_by_owner_type.graphql rename to packages/cli-kit/src/admin/graphql/queries/metafield_definitions_by_owner_type.graphql diff --git a/packages/cli-kit/src/cli/api/graphql/admin/queries/online_store_password_protection.graphql b/packages/cli-kit/src/admin/graphql/queries/online_store_password_protection.graphql similarity index 100% rename from packages/cli-kit/src/cli/api/graphql/admin/queries/online_store_password_protection.graphql rename to packages/cli-kit/src/admin/graphql/queries/online_store_password_protection.graphql diff --git a/packages/cli-kit/src/cli/api/graphql/admin/queries/public_api_versions.graphql b/packages/cli-kit/src/admin/graphql/queries/public_api_versions.graphql similarity index 100% rename from packages/cli-kit/src/cli/api/graphql/admin/queries/public_api_versions.graphql rename to packages/cli-kit/src/admin/graphql/queries/public_api_versions.graphql diff --git a/packages/cli-kit/src/public/node/api/rest-api-throttler.ts b/packages/cli-kit/src/admin/rest-api-throttler.ts similarity index 98% rename from packages/cli-kit/src/public/node/api/rest-api-throttler.ts rename to packages/cli-kit/src/admin/rest-api-throttler.ts index 0902e332dc2..184a4966e6c 100644 --- a/packages/cli-kit/src/public/node/api/rest-api-throttler.ts +++ b/packages/cli-kit/src/admin/rest-api-throttler.ts @@ -1,5 +1,5 @@ -import {RestResponse} from './admin.js' -import {tryParseInt} from '../../common/string.js' +import {RestResponse} from './api.js' +import {tryParseInt} from '../shared/common/string.js' const MAX_NUMBER_OF_PARALLEL_REQUESTS = 5 const MARGIN_TO_RATE_LIMIT = 5 diff --git a/packages/cli-kit/src/private/node/api/rest.ts b/packages/cli-kit/src/admin/rest.ts similarity index 84% rename from packages/cli-kit/src/private/node/api/rest.ts rename to packages/cli-kit/src/admin/rest.ts index c87f3131c5a..259fc12eb2c 100644 --- a/packages/cli-kit/src/private/node/api/rest.ts +++ b/packages/cli-kit/src/admin/rest.ts @@ -1,6 +1,6 @@ -import {buildHeaders} from './headers.js' -import {themeKitAccessDomain} from '../constants.js' -import {AdminSession} from '../../../public/node/session.js' +import {buildHeaders} from '../shared/node/internal/api/headers.js' +import {themeKitAccessDomain} from '../shared/node/internal/constants.js' +import {AdminSession} from '../identity/session.js' export function restRequestBody(requestBody?: T) { if (!requestBody) { diff --git a/packages/cli-kit/src/public/node/api/app-dev.test.ts b/packages/cli-kit/src/app-dev/api.test.ts similarity index 87% rename from packages/cli-kit/src/public/node/api/app-dev.test.ts rename to packages/cli-kit/src/app-dev/api.test.ts index 38210300763..083a6d4b4d0 100644 --- a/packages/cli-kit/src/public/node/api/app-dev.test.ts +++ b/packages/cli-kit/src/app-dev/api.test.ts @@ -1,16 +1,16 @@ -import {appDevRequestDoc} from './app-dev.js' -import {graphqlRequestDoc} from './graphql.js' -import {serviceEnvironment, Environment} from '../../../private/node/context/service.js' +import {appDevRequestDoc} from './api.js' +import {graphqlRequestDoc} from '../shared/node/api/graphql.js' +import {serviceEnvironment, Environment} from '../shared/node/internal/context/service.js' import {test, vi, expect, describe} from 'vitest' import {TypedDocumentNode} from '@graphql-typed-document-node/core' -vi.mock('./graphql.js') -vi.mock('../../../private/node/context/service.js') +vi.mock('../shared/node/api/graphql.js') +vi.mock('../shared/node/internal/context/service.js') const shopFqdn = 'test-shop.shop.dev' const mockedToken = 'token' -vi.mock('../vendor/dev_server/index.js', () => { +vi.mock('../shared/vendor/dev_server/index.js', () => { return { DevServerCore: class { host(serviceName: string) { diff --git a/packages/cli-kit/src/public/node/api/app-dev.ts b/packages/cli-kit/src/app-dev/api.ts similarity index 86% rename from packages/cli-kit/src/public/node/api/app-dev.ts rename to packages/cli-kit/src/app-dev/api.ts index 8243856cfb4..8fa9aa5f723 100644 --- a/packages/cli-kit/src/public/node/api/app-dev.ts +++ b/packages/cli-kit/src/app-dev/api.ts @@ -1,7 +1,7 @@ -import {graphqlRequestDoc, UnauthorizedHandler} from './graphql.js' -import {RequestOptions} from './app-management.js' -import {appDevFqdn, normalizeStoreFqdn} from '../context/fqdn.js' -import {serviceEnvironment} from '../../../private/node/context/service.js' +import {graphqlRequestDoc, UnauthorizedHandler} from '../shared/node/api/graphql.js' +import {RequestOptions} from '../app-management/api.js' +import {appDevFqdn, normalizeStoreFqdn} from '../shared/node/context/fqdn.js' +import {serviceEnvironment} from '../shared/node/internal/context/service.js' import Bottleneck from 'bottleneck' import {Variables} from 'graphql-request' import {TypedDocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/public/node/api/app-management.test.ts b/packages/cli-kit/src/app-management/api.test.ts similarity index 84% rename from packages/cli-kit/src/public/node/api/app-management.test.ts rename to packages/cli-kit/src/app-management/api.test.ts index be5a8951084..356a23c1597 100644 --- a/packages/cli-kit/src/public/node/api/app-management.test.ts +++ b/packages/cli-kit/src/app-management/api.test.ts @@ -1,13 +1,13 @@ -import {appManagementRequestDoc, handleDeprecations} from './app-management.js' -import {graphqlRequestDoc, GraphQLResponse} from './graphql.js' -import {appManagementFqdn} from '../context/fqdn.js' -import {setNextDeprecationDate} from '../../../private/node/context/deprecations-store.js' +import {appManagementRequestDoc, handleDeprecations} from './api.js' +import {graphqlRequestDoc, GraphQLResponse} from '../shared/node/api/graphql.js' +import {appManagementFqdn} from '../shared/node/context/fqdn.js' +import {setNextDeprecationDate} from '../shared/node/internal/context/deprecations-store.js' import {test, vi, expect, describe, beforeEach, beforeAll} from 'vitest' import {TypedDocumentNode} from '@graphql-typed-document-node/core' -vi.mock('./graphql.js') -vi.mock('../../../private/node/context/deprecations-store.js') -vi.mock('../context/fqdn.js') +vi.mock('../shared/node/api/graphql.js') +vi.mock('../shared/node/internal/context/deprecations-store.js') +vi.mock('../shared/node/context/fqdn.js') const mockedResult = 'OK' const appManagementFqdnValue = 'shopify.com' diff --git a/packages/cli-kit/src/public/node/api/app-management.ts b/packages/cli-kit/src/app-management/api.ts similarity index 90% rename from packages/cli-kit/src/public/node/api/app-management.ts rename to packages/cli-kit/src/app-management/api.ts index d646895a1b9..e4b31b4ba6a 100644 --- a/packages/cli-kit/src/public/node/api/app-management.ts +++ b/packages/cli-kit/src/app-management/api.ts @@ -1,9 +1,9 @@ -import {CacheOptions, GraphQLResponse, UnauthorizedHandler, graphqlRequestDoc} from './graphql.js' -import {addCursorAndFiltersToAppLogsUrl} from './utilities.js' -import {appManagementFqdn} from '../context/fqdn.js' -import {setNextDeprecationDate} from '../../../private/node/context/deprecations-store.js' -import {buildHeaders} from '../../../private/node/api/headers.js' -import {RequestModeInput} from '../http.js' +import {CacheOptions, GraphQLResponse, UnauthorizedHandler, graphqlRequestDoc} from '../shared/node/api/graphql.js' +import {addCursorAndFiltersToAppLogsUrl} from '../shared/node/api/utilities.js' +import {appManagementFqdn} from '../shared/node/context/fqdn.js' +import {setNextDeprecationDate} from '../shared/node/internal/context/deprecations-store.js' +import {buildHeaders} from '../shared/node/internal/api/headers.js' +import {RequestModeInput} from '../shared/node/http.js' import Bottleneck from 'bottleneck' import {TypedDocumentNode} from '@graphql-typed-document-node/core' import {Variables} from 'graphql-request' diff --git a/packages/cli-kit/src/public/node/api/business-platform.ts b/packages/cli-kit/src/business-platform/api.ts similarity index 94% rename from packages/cli-kit/src/public/node/api/business-platform.ts rename to packages/cli-kit/src/business-platform/api.ts index e35409f46d7..d02fa1a4312 100644 --- a/packages/cli-kit/src/public/node/api/business-platform.ts +++ b/packages/cli-kit/src/business-platform/api.ts @@ -1,6 +1,12 @@ -import {CacheOptions, GraphQLVariables, UnauthorizedHandler, graphqlRequest, graphqlRequestDoc} from './graphql.js' -import {handleDeprecations} from './partners.js' -import {businessPlatformFqdn} from '../context/fqdn.js' +import { + CacheOptions, + GraphQLVariables, + UnauthorizedHandler, + graphqlRequest, + graphqlRequestDoc, +} from '../shared/node/api/graphql.js' +import {handleDeprecations} from '../partners/api.js' +import {businessPlatformFqdn} from '../shared/node/context/fqdn.js' import {TypedDocumentNode} from '@graphql-typed-document-node/core' import {Variables} from 'graphql-request' diff --git a/packages/cli-kit/src/private/node/api/graphql/business-platform-destinations/user-email.ts b/packages/cli-kit/src/business-platform/graphql/user-email.ts similarity index 100% rename from packages/cli-kit/src/private/node/api/graphql/business-platform-destinations/user-email.ts rename to packages/cli-kit/src/business-platform/graphql/user-email.ts diff --git a/packages/cli-kit/src/public/node/api/functions.ts b/packages/cli-kit/src/functions/api.ts similarity index 91% rename from packages/cli-kit/src/public/node/api/functions.ts rename to packages/cli-kit/src/functions/api.ts index aed8c0946fd..f2f5e354f09 100644 --- a/packages/cli-kit/src/public/node/api/functions.ts +++ b/packages/cli-kit/src/functions/api.ts @@ -1,6 +1,6 @@ -import {graphqlRequestDoc, UnauthorizedHandler} from './graphql.js' -import {handleDeprecations} from './app-management.js' -import {appManagementFqdn} from '../context/fqdn.js' +import {graphqlRequestDoc, UnauthorizedHandler} from '../shared/node/api/graphql.js' +import {handleDeprecations} from '../app-management/api.js' +import {appManagementFqdn} from '../shared/node/context/fqdn.js' import {TypedDocumentNode} from '@graphql-typed-document-node/core' import {Variables} from 'graphql-request' import Bottleneck from 'bottleneck' diff --git a/packages/cli-kit/src/private/node/session/device-authorization.test.ts b/packages/cli-kit/src/identity/core/device-authorization.test.ts similarity index 93% rename from packages/cli-kit/src/private/node/session/device-authorization.test.ts rename to packages/cli-kit/src/identity/core/device-authorization.test.ts index d3c2b0f718a..9dc1330cc13 100644 --- a/packages/cli-kit/src/private/node/session/device-authorization.test.ts +++ b/packages/cli-kit/src/identity/core/device-authorization.test.ts @@ -6,21 +6,21 @@ import { import {clientId} from './identity.js' import {IdentityToken} from './schema.js' import {exchangeDeviceCodeForAccessToken} from './exchange.js' -import {identityFqdn} from '../../../public/node/context/fqdn.js' -import {shopifyFetch} from '../../../public/node/http.js' -import {isTTY} from '../../../public/node/ui.js' -import {err, ok} from '../../../public/node/result.js' -import {AbortError} from '../../../public/node/error.js' -import {isCI} from '../../../public/node/system.js' +import {identityFqdn} from '../../shared/node/context/fqdn.js' +import {shopifyFetch} from '../../shared/node/http.js' +import {isTTY} from '../../shared/node/ui.js' +import {err, ok} from '../../shared/node/result.js' +import {AbortError} from '../../shared/node/error.js' +import {isCI} from '../../shared/node/system.js' import {beforeEach, describe, expect, test, vi} from 'vitest' import {Response} from 'node-fetch' -vi.mock('../../../public/node/context/fqdn.js') -vi.mock('./identity') -vi.mock('../../../public/node/http.js') -vi.mock('../../../public/node/ui.js') +vi.mock('../../shared/node/context/fqdn.js') +vi.mock('./identity.js') +vi.mock('../../shared/node/http.js') +vi.mock('../../shared/node/ui.js') vi.mock('./exchange.js') -vi.mock('../../../public/node/system.js') +vi.mock('../../shared/node/system.js') beforeEach(() => { vi.mocked(isTTY).mockReturnValue(true) diff --git a/packages/cli-kit/src/private/node/session/device-authorization.ts b/packages/cli-kit/src/identity/core/device-authorization.ts similarity index 94% rename from packages/cli-kit/src/private/node/session/device-authorization.ts rename to packages/cli-kit/src/identity/core/device-authorization.ts index e875adf1ea8..fa63ac90d8c 100644 --- a/packages/cli-kit/src/private/node/session/device-authorization.ts +++ b/packages/cli-kit/src/identity/core/device-authorization.ts @@ -1,13 +1,13 @@ import {clientId} from './identity.js' import {exchangeDeviceCodeForAccessToken} from './exchange.js' import {IdentityToken} from './schema.js' -import {identityFqdn} from '../../../public/node/context/fqdn.js' -import {shopifyFetch} from '../../../public/node/http.js' -import {outputContent, outputDebug, outputInfo, outputToken} from '../../../public/node/output.js' -import {AbortError, BugError} from '../../../public/node/error.js' -import {isCloudEnvironment} from '../../../public/node/context/local.js' -import {isCI, openURL} from '../../../public/node/system.js' -import {isTTY, keypress} from '../../../public/node/ui.js' +import {identityFqdn} from '../../shared/node/context/fqdn.js' +import {shopifyFetch} from '../../shared/node/http.js' +import {outputContent, outputDebug, outputInfo, outputToken} from '../../shared/node/output.js' +import {AbortError, BugError} from '../../shared/node/error.js' +import {isCloudEnvironment} from '../../shared/node/context/local.js' +import {isCI, openURL} from '../../shared/node/system.js' +import {isTTY, keypress} from '../../shared/node/ui.js' import {Response} from 'node-fetch' export interface DeviceAuthorizationResponse { diff --git a/packages/cli-kit/src/private/node/session/exchange.test.ts b/packages/cli-kit/src/identity/core/exchange.test.ts similarity index 97% rename from packages/cli-kit/src/private/node/session/exchange.test.ts rename to packages/cli-kit/src/identity/core/exchange.test.ts index fd2bebebabd..e41eaa2a4f1 100644 --- a/packages/cli-kit/src/private/node/session/exchange.test.ts +++ b/packages/cli-kit/src/identity/core/exchange.test.ts @@ -10,10 +10,10 @@ import { } from './exchange.js' import {applicationId, clientId} from './identity.js' import {IdentityToken} from './schema.js' -import {shopifyFetch} from '../../../public/node/http.js' -import {identityFqdn} from '../../../public/node/context/fqdn.js' -import {getLastSeenUserIdAfterAuth, getLastSeenAuthMethod} from '../session.js' -import {AbortError} from '../../../public/node/error.js' +import {getLastSeenUserIdAfterAuth, getLastSeenAuthMethod} from './session.js' +import {shopifyFetch} from '../../shared/node/http.js' +import {identityFqdn} from '../../shared/node/context/fqdn.js' +import {AbortError} from '../../shared/node/error.js' import {describe, test, expect, vi, afterAll, beforeEach} from 'vitest' import {Response} from 'node-fetch' @@ -38,9 +38,9 @@ const identityToken: IdentityToken = { alias: '1234-5678', } -vi.mock('../../../public/node/http.js') -vi.mock('../../../public/node/context/fqdn.js') -vi.mock('./identity') +vi.mock('../../shared/node/http.js') +vi.mock('../../shared/node/context/fqdn.js') +vi.mock('./identity.js') beforeEach(() => { vi.mocked(clientId).mockReturnValue('clientId') diff --git a/packages/cli-kit/src/private/node/session/exchange.ts b/packages/cli-kit/src/identity/core/exchange.ts similarity index 96% rename from packages/cli-kit/src/private/node/session/exchange.ts rename to packages/cli-kit/src/identity/core/exchange.ts index 1fcb3024eea..9bee0e902b1 100644 --- a/packages/cli-kit/src/private/node/session/exchange.ts +++ b/packages/cli-kit/src/identity/core/exchange.ts @@ -1,13 +1,13 @@ import {ApplicationToken, IdentityToken} from './schema.js' import {applicationId, clientId as getIdentityClientId} from './identity.js' import {tokenExchangeScopes} from './scopes.js' -import {API} from '../api.js' -import {identityFqdn} from '../../../public/node/context/fqdn.js' -import {shopifyFetch} from '../../../public/node/http.js' -import {err, ok, Result} from '../../../public/node/result.js' -import {AbortError, BugError, ExtendableError} from '../../../public/node/error.js' -import {setLastSeenAuthMethod, setLastSeenUserIdAfterAuth} from '../session.js' -import {nonRandomUUID} from '../../../public/node/crypto.js' +import {setLastSeenAuthMethod, setLastSeenUserIdAfterAuth} from './session.js' +import {API} from '../../shared/node/internal/api.js' +import {identityFqdn} from '../../shared/node/context/fqdn.js' +import {shopifyFetch} from '../../shared/node/http.js' +import {err, ok, Result} from '../../shared/node/result.js' +import {AbortError, BugError, ExtendableError} from '../../shared/node/error.js' +import {nonRandomUUID} from '../../shared/node/crypto.js' import * as jose from 'jose' export class InvalidGrantError extends ExtendableError {} diff --git a/packages/cli-kit/src/private/node/session/identity.ts b/packages/cli-kit/src/identity/core/identity.ts similarity index 92% rename from packages/cli-kit/src/private/node/session/identity.ts rename to packages/cli-kit/src/identity/core/identity.ts index a155b8ff40a..c072d6245db 100644 --- a/packages/cli-kit/src/private/node/session/identity.ts +++ b/packages/cli-kit/src/identity/core/identity.ts @@ -1,6 +1,6 @@ -import {API} from '../api.js' -import {BugError} from '../../../public/node/error.js' -import {Environment, serviceEnvironment} from '../context/service.js' +import {API} from '../../shared/node/internal/api.js' +import {BugError} from '../../shared/node/error.js' +import {Environment, serviceEnvironment} from '../../shared/node/internal/context/service.js' export function clientId(): string { const environment = serviceEnvironment() diff --git a/packages/cli-kit/src/private/node/session/schema.ts b/packages/cli-kit/src/identity/core/schema.ts similarity index 97% rename from packages/cli-kit/src/private/node/session/schema.ts rename to packages/cli-kit/src/identity/core/schema.ts index e74a5a19ae2..f5334832f37 100644 --- a/packages/cli-kit/src/private/node/session/schema.ts +++ b/packages/cli-kit/src/identity/core/schema.ts @@ -1,4 +1,4 @@ -import {zod} from '../../../public/node/schema.js' +import {zod} from '../../shared/node/schema.js' const DateSchema = zod.preprocess((arg) => { if (typeof arg === 'string' || arg instanceof Date) return new Date(arg) diff --git a/packages/cli-kit/src/private/node/session/scopes.test.ts b/packages/cli-kit/src/identity/core/scopes.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/session/scopes.test.ts rename to packages/cli-kit/src/identity/core/scopes.test.ts diff --git a/packages/cli-kit/src/private/node/session/scopes.ts b/packages/cli-kit/src/identity/core/scopes.ts similarity index 96% rename from packages/cli-kit/src/private/node/session/scopes.ts rename to packages/cli-kit/src/identity/core/scopes.ts index bced5231066..186af05e08d 100644 --- a/packages/cli-kit/src/private/node/session/scopes.ts +++ b/packages/cli-kit/src/identity/core/scopes.ts @@ -1,5 +1,5 @@ -import {allAPIs, API} from '../api.js' -import {BugError} from '../../../public/node/error.js' +import {allAPIs, API} from '../../shared/node/internal/api.js' +import {BugError} from '../../shared/node/error.js' /** * Generate a flat array with all the default scopes for all the APIs plus diff --git a/packages/cli-kit/src/private/node/session.test.ts b/packages/cli-kit/src/identity/core/session.test.ts similarity index 94% rename from packages/cli-kit/src/private/node/session.test.ts rename to packages/cli-kit/src/identity/core/session.test.ts index a48945980c3..f8f719db88a 100644 --- a/packages/cli-kit/src/private/node/session.test.ts +++ b/packages/cli-kit/src/identity/core/session.test.ts @@ -12,21 +12,21 @@ import { exchangeCustomPartnerToken, refreshAccessToken, InvalidGrantError, -} from './session/exchange.js' -import {allDefaultScopes} from './session/scopes.js' -import {store as storeSessions, fetch as fetchSessions, remove as secureRemove} from './session/store.js' -import {ApplicationToken, IdentityToken, Sessions} from './session/schema.js' -import {validateSession} from './session/validate.js' -import {applicationId} from './session/identity.js' -import {pollForDeviceAuthorization, requestDeviceAuthorization} from './session/device-authorization.js' -import {getCurrentSessionId} from './conf-store.js' -import * as fqdnModule from '../../public/node/context/fqdn.js' -import {themeToken} from '../../public/node/context/local.js' -import {partnersRequest} from '../../public/node/api/partners.js' -import {businessPlatformRequest} from '../../public/node/api/business-platform.js' -import {getPartnersToken} from '../../public/node/environment.js' -import {nonRandomUUID} from '../../public/node/crypto.js' -import {terminalSupportsPrompting} from '../../public/node/system.js' +} from './exchange.js' +import {allDefaultScopes} from './scopes.js' +import {store as storeSessions, fetch as fetchSessions, remove as secureRemove} from './store.js' +import {ApplicationToken, IdentityToken, Sessions} from './schema.js' +import {validateSession} from './validate.js' +import {applicationId} from './identity.js' +import {pollForDeviceAuthorization, requestDeviceAuthorization} from './device-authorization.js' +import {getCurrentSessionId} from '../../shared/node/internal/conf-store.js' +import * as fqdnModule from '../../shared/node/context/fqdn.js' +import {themeToken} from '../../shared/node/context/local.js' +import {partnersRequest} from '../../partners/api.js' +import {businessPlatformRequest} from '../../business-platform/api.js' +import {getPartnersToken} from '../../shared/node/environment.js' +import {nonRandomUUID} from '../../shared/node/crypto.js' +import {terminalSupportsPrompting} from '../../shared/node/system.js' import {vi, describe, expect, test, beforeEach} from 'vitest' const futureDate = new Date(2022, 1, 1, 11) @@ -105,20 +105,20 @@ const invalidSessions: Sessions = { }, } -vi.mock('../../public/node/context/local.js') -vi.mock('./session/identity') +vi.mock('../../shared/node/context/local.js') +vi.mock('./identity.js') vi.mock('./session/authorize') -vi.mock('./session/exchange') -vi.mock('./session/scopes') -vi.mock('./session/store') -vi.mock('./session/validate') -vi.mock('../../public/node/api/partners.js') -vi.mock('../../public/node/api/business-platform.js') +vi.mock('./exchange.js') +vi.mock('./scopes.js') +vi.mock('./store.js') +vi.mock('./validate.js') +vi.mock('../../partners/api.js') +vi.mock('../../business-platform/api.js') vi.mock('../../store') -vi.mock('../../public/node/environment.js') -vi.mock('./session/device-authorization') -vi.mock('./conf-store') -vi.mock('../../public/node/system.js') +vi.mock('../../shared/node/environment.js') +vi.mock('./device-authorization.js') +vi.mock('../../shared/node/internal/conf-store.js') +vi.mock('../../shared/node/system.js') beforeEach(() => { vi.spyOn(fqdnModule, 'identityFqdn').mockResolvedValue(fqdn) diff --git a/packages/cli-kit/src/private/node/session.ts b/packages/cli-kit/src/identity/core/session.ts similarity index 93% rename from packages/cli-kit/src/private/node/session.ts rename to packages/cli-kit/src/identity/core/session.ts index 41409c83e69..79003240337 100644 --- a/packages/cli-kit/src/private/node/session.ts +++ b/packages/cli-kit/src/identity/core/session.ts @@ -1,6 +1,6 @@ -import {applicationId} from './session/identity.js' -import {validateSession} from './session/validate.js' -import {allDefaultScopes, apiScopes} from './session/scopes.js' +import {applicationId} from './identity.js' +import {validateSession} from './validate.js' +import {allDefaultScopes, apiScopes} from './scopes.js' import { exchangeAccessForApplicationTokens, exchangeCustomPartnerToken, @@ -8,22 +8,22 @@ import { refreshAccessToken, InvalidGrantError, InvalidRequestError, -} from './session/exchange.js' -import {IdentityToken, Session, Sessions} from './session/schema.js' -import * as sessionStore from './session/store.js' -import {pollForDeviceAuthorization, requestDeviceAuthorization} from './session/device-authorization.js' -import {isThemeAccessSession} from './api/rest.js' -import {getCurrentSessionId, setCurrentSessionId} from './conf-store.js' -import {UserEmailQueryString, UserEmailQuery} from './api/graphql/business-platform-destinations/user-email.js' -import {outputContent, outputToken, outputDebug, outputCompleted} from '../../public/node/output.js' -import {firstPartyDev, themeToken} from '../../public/node/context/local.js' -import {AbortError} from '../../public/node/error.js' -import {normalizeStoreFqdn, identityFqdn} from '../../public/node/context/fqdn.js' -import {getIdentityTokenInformation, getPartnersToken} from '../../public/node/environment.js' -import {AdminSession, logout} from '../../public/node/session.js' -import {nonRandomUUID} from '../../public/node/crypto.js' -import {isEmpty} from '../../public/common/object.js' -import {businessPlatformRequest} from '../../public/node/api/business-platform.js' +} from './exchange.js' +import {IdentityToken, Session, Sessions} from './schema.js' +import * as sessionStore from './store.js' +import {pollForDeviceAuthorization, requestDeviceAuthorization} from './device-authorization.js' +import {isThemeAccessSession} from '../../admin/rest.js' +import {getCurrentSessionId, setCurrentSessionId} from '../../shared/node/internal/conf-store.js' +import {UserEmailQueryString, UserEmailQuery} from '../../business-platform/graphql/user-email.js' +import {outputContent, outputToken, outputDebug, outputCompleted} from '../../shared/node/output.js' +import {firstPartyDev, themeToken} from '../../shared/node/context/local.js' +import {AbortError} from '../../shared/node/error.js' +import {normalizeStoreFqdn, identityFqdn} from '../../shared/node/context/fqdn.js' +import {getIdentityTokenInformation, getPartnersToken} from '../../shared/node/environment.js' +import {AdminSession, logout} from '../session.js' +import {nonRandomUUID} from '../../shared/node/crypto.js' +import {isEmpty} from '../../shared/common/object.js' +import {businessPlatformRequest} from '../../business-platform/api.js' /** * Fetches the user's email from the Business Platform API diff --git a/packages/cli-kit/src/private/node/session/store.test.ts b/packages/cli-kit/src/identity/core/store.test.ts similarity index 94% rename from packages/cli-kit/src/private/node/session/store.test.ts rename to packages/cli-kit/src/identity/core/store.test.ts index 429c2d842c5..6805846f3c5 100644 --- a/packages/cli-kit/src/private/node/session/store.test.ts +++ b/packages/cli-kit/src/identity/core/store.test.ts @@ -1,11 +1,16 @@ import {Sessions} from './schema.js' import {store, fetch, remove, getSessionAlias, findSessionByAlias} from './store.js' -import {getSessions, removeSessions, setSessions, removeCurrentSessionId} from '../conf-store.js' -import {identityFqdn} from '../../../public/node/context/fqdn.js' +import { + getSessions, + removeSessions, + setSessions, + removeCurrentSessionId, +} from '../../shared/node/internal/conf-store.js' +import {identityFqdn} from '../../shared/node/context/fqdn.js' import {describe, expect, vi, test, beforeEach} from 'vitest' -vi.mock('../conf-store.js') -vi.mock('../../../public/node/context/fqdn.js') +vi.mock('../../shared/node/internal/conf-store.js') +vi.mock('../../shared/node/context/fqdn.js') const mockSessions: Sessions = { 'identity.fqdn.com': { diff --git a/packages/cli-kit/src/private/node/session/store.ts b/packages/cli-kit/src/identity/core/store.ts similarity index 91% rename from packages/cli-kit/src/private/node/session/store.ts rename to packages/cli-kit/src/identity/core/store.ts index 6a867fdf687..152be64ed06 100644 --- a/packages/cli-kit/src/private/node/session/store.ts +++ b/packages/cli-kit/src/identity/core/store.ts @@ -1,6 +1,11 @@ import {SessionsSchema} from './schema.js' -import {getSessions, removeCurrentSessionId, removeSessions, setSessions} from '../conf-store.js' -import {identityFqdn} from '../../../public/node/context/fqdn.js' +import { + getSessions, + removeCurrentSessionId, + removeSessions, + setSessions, +} from '../../shared/node/internal/conf-store.js' +import {identityFqdn} from '../../shared/node/context/fqdn.js' import type {Sessions} from './schema.js' /** diff --git a/packages/cli-kit/src/private/node/session/validate.test.ts b/packages/cli-kit/src/identity/core/validate.test.ts similarity index 98% rename from packages/cli-kit/src/private/node/session/validate.test.ts rename to packages/cli-kit/src/identity/core/validate.test.ts index 12f8300b683..b15bb123244 100644 --- a/packages/cli-kit/src/private/node/session/validate.test.ts +++ b/packages/cli-kit/src/identity/core/validate.test.ts @@ -1,7 +1,7 @@ import {validateSession} from './validate.js' import {applicationId} from './identity.js' import {IdentityToken, validateCachedIdentityTokenStructure} from './schema.js' -import {OAuthApplications} from '../session.js' +import {OAuthApplications} from './session.js' import {expect, describe, test, vi, afterAll, beforeEach} from 'vitest' const pastDate = new Date(2022, 1, 1, 9) @@ -71,8 +71,8 @@ const defaultApps: OAuthApplications = { } vi.mock('./identity-token-validation') -vi.mock('./identity') -vi.mock('./schema') +vi.mock('./identity.js') +vi.mock('./schema.js') beforeEach(() => { vi.mocked(applicationId).mockImplementation((id: any) => id) diff --git a/packages/cli-kit/src/private/node/session/validate.ts b/packages/cli-kit/src/identity/core/validate.ts similarity index 92% rename from packages/cli-kit/src/private/node/session/validate.ts rename to packages/cli-kit/src/identity/core/validate.ts index 2dd97f2480e..d270fcbb0cc 100644 --- a/packages/cli-kit/src/private/node/session/validate.ts +++ b/packages/cli-kit/src/identity/core/validate.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import {applicationId} from './identity.js' import {ApplicationToken, IdentityToken, Session, validateCachedIdentityTokenStructure} from './schema.js' -import {sessionConstants} from '../constants.js' -import {firstPartyDev} from '../../../public/node/context/local.js' -import {OAuthApplications} from '../session.js' -import {outputDebug} from '../../../public/node/output.js' +import {OAuthApplications} from './session.js' +import {sessionConstants} from '../../shared/node/internal/constants.js' +import {firstPartyDev} from '../../shared/node/context/local.js' +import {outputDebug} from '../../shared/node/output.js' type ValidationResult = 'needs_refresh' | 'needs_full_auth' | 'ok' diff --git a/packages/cli-kit/src/public/node/session-prompt.test.ts b/packages/cli-kit/src/identity/session-prompt.test.ts similarity index 94% rename from packages/cli-kit/src/public/node/session-prompt.test.ts rename to packages/cli-kit/src/identity/session-prompt.test.ts index 6c249ca3a4e..bf39c6b66f5 100644 --- a/packages/cli-kit/src/public/node/session-prompt.test.ts +++ b/packages/cli-kit/src/identity/session-prompt.test.ts @@ -1,17 +1,17 @@ import {promptSessionSelect} from './session-prompt.js' -import {renderSelectPrompt} from './ui.js' import {ensureAuthenticatedUser} from './session.js' -import {identityFqdn} from './context/fqdn.js' -import {setCurrentSessionId} from '../../private/node/conf-store.js' -import * as sessionStore from '../../private/node/session/store.js' -import {Sessions} from '../../private/node/session/schema.js' +import * as sessionStore from './core/store.js' +import {Sessions} from './core/schema.js' +import {renderSelectPrompt} from '../shared/node/ui.js' +import {identityFqdn} from '../shared/node/context/fqdn.js' +import {setCurrentSessionId} from '../shared/node/internal/conf-store.js' import {describe, expect, vi, test, beforeEach} from 'vitest' -vi.mock('./ui.js') +vi.mock('../shared/node/ui.js') vi.mock('./session.js') -vi.mock('./context/fqdn.js') -vi.mock('../../private/node/conf-store.js') -vi.mock('../../private/node/session/store.js') +vi.mock('../shared/node/context/fqdn.js') +vi.mock('../shared/node/internal/conf-store.js') +vi.mock('./core/store.js') const mockSessions: Sessions = { 'identity.fqdn.com': { diff --git a/packages/cli-kit/src/public/node/session-prompt.ts b/packages/cli-kit/src/identity/session-prompt.ts similarity index 90% rename from packages/cli-kit/src/public/node/session-prompt.ts rename to packages/cli-kit/src/identity/session-prompt.ts index bb78d17218b..98b9fd600b7 100644 --- a/packages/cli-kit/src/public/node/session-prompt.ts +++ b/packages/cli-kit/src/identity/session-prompt.ts @@ -1,9 +1,9 @@ -import {renderSelectPrompt} from './ui.js' import {ensureAuthenticatedUser} from './session.js' -import {identityFqdn} from './context/fqdn.js' -import * as sessionStore from '../../private/node/session/store.js' -import {setCurrentSessionId} from '../../private/node/conf-store.js' -import type {Sessions} from '../../private/node/session/schema.js' +import * as sessionStore from './core/store.js' +import {renderSelectPrompt} from '../shared/node/ui.js' +import {identityFqdn} from '../shared/node/context/fqdn.js' +import {setCurrentSessionId} from '../shared/node/internal/conf-store.js' +import type {Sessions} from './core/schema.js' const NEW_LOGIN_VALUE = 'NEW_LOGIN' diff --git a/packages/cli-kit/src/public/node/session.test.ts b/packages/cli-kit/src/identity/session.test.ts similarity index 95% rename from packages/cli-kit/src/public/node/session.test.ts rename to packages/cli-kit/src/identity/session.test.ts index 13c6f0fb278..7cedad26e37 100644 --- a/packages/cli-kit/src/public/node/session.test.ts +++ b/packages/cli-kit/src/identity/session.test.ts @@ -8,15 +8,15 @@ import { ensureAuthenticatedThemes, } from './session.js' -import {getPartnersToken} from './environment.js' -import {shopifyFetch} from './http.js' -import {ApplicationToken} from '../../private/node/session/schema.js' -import {ensureAuthenticated, setLastSeenAuthMethod, setLastSeenUserIdAfterAuth} from '../../private/node/session.js' +import {ApplicationToken} from './core/schema.js' +import {ensureAuthenticated, setLastSeenAuthMethod, setLastSeenUserIdAfterAuth} from './core/session.js' import { exchangeCustomPartnerToken, exchangeCliTokenForAppManagementAccessToken, exchangeCliTokenForBusinessPlatformAccessToken, -} from '../../private/node/session/exchange.js' +} from './core/exchange.js' +import {shopifyFetch} from '../shared/node/http.js' +import {getPartnersToken} from '../shared/node/environment.js' import {vi, describe, expect, test} from 'vitest' const futureDate = new Date(2022, 1, 1, 11) @@ -27,11 +27,11 @@ const partnersToken: ApplicationToken = { scopes: ['scope2'], } -vi.mock('../../private/node/session.js') -vi.mock('../../private/node/session/exchange.js') -vi.mock('../../private/node/session/store.js') -vi.mock('./environment.js') -vi.mock('./http.js') +vi.mock('./core/session.js') +vi.mock('./core/exchange.js') +vi.mock('./core/store.js') +vi.mock('../shared/node/environment.js') +vi.mock('../shared/node/http.js') describe('ensureAuthenticatedStorefront', () => { test('returns only storefront token if success', async () => { diff --git a/packages/cli-kit/src/public/node/session.ts b/packages/cli-kit/src/identity/session.ts similarity index 95% rename from packages/cli-kit/src/public/node/session.ts rename to packages/cli-kit/src/identity/session.ts index f7550df0f58..ef49a519918 100644 --- a/packages/cli-kit/src/public/node/session.ts +++ b/packages/cli-kit/src/identity/session.ts @@ -1,14 +1,9 @@ -import {AbortError, BugError} from './error.js' -import {getPartnersToken} from './environment.js' -import {nonRandomUUID} from './crypto.js' -import {shopifyFetch} from './http.js' -import * as sessionStore from '../../private/node/session/store.js' +import * as sessionStore from './core/store.js' import { exchangeCustomPartnerToken, exchangeCliTokenForAppManagementAccessToken, exchangeCliTokenForBusinessPlatformAccessToken, -} from '../../private/node/session/exchange.js' -import {outputContent, outputToken, outputDebug} from '../../public/node/output.js' +} from './core/exchange.js' import { AdminAPIScope, AppManagementAPIScope, @@ -19,8 +14,13 @@ import { ensureAuthenticated, setLastSeenAuthMethod, setLastSeenUserIdAfterAuth, -} from '../../private/node/session.js' -import {isThemeAccessSession} from '../../private/node/api/rest.js' +} from './core/session.js' +import {AbortError, BugError} from '../shared/node/error.js' +import {getPartnersToken} from '../shared/node/environment.js' +import {nonRandomUUID} from '../shared/node/crypto.js' +import {shopifyFetch} from '../shared/node/http.js' +import {outputContent, outputToken, outputDebug} from '../shared/node/output.js' +import {isThemeAccessSession} from '../admin/rest.js' /** * Session Object to access the Admin API, includes the token and the store FQDN. diff --git a/packages/cli-kit/src/public/node/api/partners.test.ts b/packages/cli-kit/src/partners/api.test.ts similarity index 80% rename from packages/cli-kit/src/public/node/api/partners.test.ts rename to packages/cli-kit/src/partners/api.test.ts index d287b4d4539..c51516cbe2d 100644 --- a/packages/cli-kit/src/public/node/api/partners.test.ts +++ b/packages/cli-kit/src/partners/api.test.ts @@ -1,15 +1,15 @@ -import {partnersRequest, handleDeprecations} from './partners.js' -import {graphqlRequest, GraphQLResponse} from './graphql.js' -import {partnersFqdn} from '../context/fqdn.js' -import {blockPartnersAccess} from '../environment.js' -import {BugError} from '../error.js' -import {setNextDeprecationDate} from '../../../private/node/context/deprecations-store.js' +import {partnersRequest, handleDeprecations} from './api.js' +import {graphqlRequest, GraphQLResponse} from '../shared/node/api/graphql.js' +import {partnersFqdn} from '../shared/node/context/fqdn.js' +import {blockPartnersAccess} from '../shared/node/environment.js' +import {BugError} from '../shared/node/error.js' +import {setNextDeprecationDate} from '../shared/node/internal/context/deprecations-store.js' import {test, vi, expect, describe, beforeEach, beforeAll} from 'vitest' -vi.mock('./graphql.js') -vi.mock('../../../private/node/context/deprecations-store.js') -vi.mock('../context/fqdn.js') -vi.mock('../environment.js') +vi.mock('../shared/node/api/graphql.js') +vi.mock('../shared/node/internal/context/deprecations-store.js') +vi.mock('../shared/node/context/fqdn.js') +vi.mock('../shared/node/environment.js') const mockedResult = 'OK' const partnersFQDN = 'partners.shopify.com' diff --git a/packages/cli-kit/src/public/node/api/partners.ts b/packages/cli-kit/src/partners/api.ts similarity index 87% rename from packages/cli-kit/src/public/node/api/partners.ts rename to packages/cli-kit/src/partners/api.ts index 82903a392cf..277a14e6bb1 100644 --- a/packages/cli-kit/src/public/node/api/partners.ts +++ b/packages/cli-kit/src/partners/api.ts @@ -5,16 +5,16 @@ import { graphqlRequestDoc, CacheOptions, UnauthorizedHandler, -} from './graphql.js' -import {addCursorAndFiltersToAppLogsUrl} from './utilities.js' -import {partnersFqdn} from '../context/fqdn.js' -import {setNextDeprecationDate} from '../../../private/node/context/deprecations-store.js' -import {getPackageManager} from '../node-package-manager.js' -import {cwd} from '../path.js' -import {AbortError, BugError} from '../error.js' -import {formatPackageManagerCommand} from '../output.js' -import {RequestModeInput} from '../http.js' -import {blockPartnersAccess} from '../environment.js' +} from '../shared/node/api/graphql.js' +import {addCursorAndFiltersToAppLogsUrl} from '../shared/node/api/utilities.js' +import {partnersFqdn} from '../shared/node/context/fqdn.js' +import {setNextDeprecationDate} from '../shared/node/internal/context/deprecations-store.js' +import {getPackageManager} from '../shared/node/node-package-manager.js' +import {cwd} from '../shared/node/path.js' +import {AbortError, BugError} from '../shared/node/error.js' +import {formatPackageManagerCommand} from '../shared/node/output.js' +import {RequestModeInput} from '../shared/node/http.js' +import {blockPartnersAccess} from '../shared/node/environment.js' import Bottleneck from 'bottleneck' import {Variables} from 'graphql-request' import {TypedDocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/src/public/node/ui/components.ts b/packages/cli-kit/src/public/node/ui/components.ts deleted file mode 100644 index bd94ff0ff25..00000000000 --- a/packages/cli-kit/src/public/node/ui/components.ts +++ /dev/null @@ -1,8 +0,0 @@ -export { - ConcurrentOutput, - ConcurrentOutputContext, - useConcurrentOutputContext, -} from '../../../private/node/ui/components/ConcurrentOutput.js' -export {Alert} from '../../../private/node/ui/components/Alert.js' -export {Link} from '../../../private/node/ui/components/Link.js' -export {TabularData} from '../../../private/node/ui/components/TabularData.js' diff --git a/packages/cli-kit/src/public/node/ui/hooks.ts b/packages/cli-kit/src/public/node/ui/hooks.ts deleted file mode 100644 index b2a25fae055..00000000000 --- a/packages/cli-kit/src/public/node/ui/hooks.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as useAbortSignal} from '../../../private/node/ui/hooks/use-abort-signal.js' diff --git a/packages/cli-kit/src/public/common/array.test.ts b/packages/cli-kit/src/shared/common/array.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/array.test.ts rename to packages/cli-kit/src/shared/common/array.test.ts diff --git a/packages/cli-kit/src/public/common/array.ts b/packages/cli-kit/src/shared/common/array.ts similarity index 100% rename from packages/cli-kit/src/public/common/array.ts rename to packages/cli-kit/src/shared/common/array.ts diff --git a/packages/cli-kit/src/public/common/collection.test.ts b/packages/cli-kit/src/shared/common/collection.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/collection.test.ts rename to packages/cli-kit/src/shared/common/collection.test.ts diff --git a/packages/cli-kit/src/public/common/collection.ts b/packages/cli-kit/src/shared/common/collection.ts similarity index 100% rename from packages/cli-kit/src/public/common/collection.ts rename to packages/cli-kit/src/shared/common/collection.ts diff --git a/packages/cli-kit/src/public/common/function.test.ts b/packages/cli-kit/src/shared/common/function.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/function.test.ts rename to packages/cli-kit/src/shared/common/function.test.ts diff --git a/packages/cli-kit/src/public/common/function.ts b/packages/cli-kit/src/shared/common/function.ts similarity index 100% rename from packages/cli-kit/src/public/common/function.ts rename to packages/cli-kit/src/shared/common/function.ts diff --git a/packages/cli-kit/src/private/common/array.ts b/packages/cli-kit/src/shared/common/internal/array.ts similarity index 100% rename from packages/cli-kit/src/private/common/array.ts rename to packages/cli-kit/src/shared/common/internal/array.ts diff --git a/packages/cli-kit/src/private/common/json.ts b/packages/cli-kit/src/shared/common/internal/json.ts similarity index 100% rename from packages/cli-kit/src/private/common/json.ts rename to packages/cli-kit/src/shared/common/internal/json.ts diff --git a/packages/cli-kit/src/private/common/ts/overloaded-parameters.ts b/packages/cli-kit/src/shared/common/internal/ts/overloaded-parameters.ts similarity index 100% rename from packages/cli-kit/src/private/common/ts/overloaded-parameters.ts rename to packages/cli-kit/src/shared/common/internal/ts/overloaded-parameters.ts diff --git a/packages/cli-kit/src/public/common/json.test.ts b/packages/cli-kit/src/shared/common/json.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/json.test.ts rename to packages/cli-kit/src/shared/common/json.test.ts diff --git a/packages/cli-kit/src/public/common/json.ts b/packages/cli-kit/src/shared/common/json.ts similarity index 100% rename from packages/cli-kit/src/public/common/json.ts rename to packages/cli-kit/src/shared/common/json.ts diff --git a/packages/cli-kit/src/public/common/lang.test.ts b/packages/cli-kit/src/shared/common/lang.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/lang.test.ts rename to packages/cli-kit/src/shared/common/lang.test.ts diff --git a/packages/cli-kit/src/public/common/lang.ts b/packages/cli-kit/src/shared/common/lang.ts similarity index 100% rename from packages/cli-kit/src/public/common/lang.ts rename to packages/cli-kit/src/shared/common/lang.ts diff --git a/packages/cli-kit/src/public/common/object.test.ts b/packages/cli-kit/src/shared/common/object.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/object.test.ts rename to packages/cli-kit/src/shared/common/object.test.ts diff --git a/packages/cli-kit/src/public/common/object.ts b/packages/cli-kit/src/shared/common/object.ts similarity index 98% rename from packages/cli-kit/src/public/common/object.ts rename to packages/cli-kit/src/shared/common/object.ts index 23e6e122df8..92beffcbcb2 100644 --- a/packages/cli-kit/src/public/common/object.ts +++ b/packages/cli-kit/src/shared/common/object.ts @@ -1,4 +1,4 @@ -import {unionArrayStrategy} from '../../private/common/array.js' +import {unionArrayStrategy} from './internal/array.js' import deepMerge from 'deepmerge' import {Dictionary, ObjectIterator, PropertyPath, ValueKeyIteratee} from 'lodash' import lodashPickBy from 'lodash/pickBy.js' diff --git a/packages/cli-kit/src/public/common/retry.test.ts b/packages/cli-kit/src/shared/common/retry.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/retry.test.ts rename to packages/cli-kit/src/shared/common/retry.test.ts diff --git a/packages/cli-kit/src/public/common/retry.ts b/packages/cli-kit/src/shared/common/retry.ts similarity index 100% rename from packages/cli-kit/src/public/common/retry.ts rename to packages/cli-kit/src/shared/common/retry.ts diff --git a/packages/cli-kit/src/public/common/string.test.ts b/packages/cli-kit/src/shared/common/string.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/string.test.ts rename to packages/cli-kit/src/shared/common/string.test.ts diff --git a/packages/cli-kit/src/public/common/string.ts b/packages/cli-kit/src/shared/common/string.ts similarity index 98% rename from packages/cli-kit/src/public/common/string.ts rename to packages/cli-kit/src/shared/common/string.ts index 89e6bac52eb..7098ede0aaf 100644 --- a/packages/cli-kit/src/public/common/string.ts +++ b/packages/cli-kit/src/shared/common/string.ts @@ -1,6 +1,6 @@ import {takeRandomFromArray} from './array.js' -import {unstyled} from '../../public/node/output.js' -import {Token, TokenItem} from '../../private/node/ui/components/TokenizedText.js' +import {unstyled} from '../node/output.js' +import {Token, TokenItem} from '../ui/components/TokenizedText.js' import {camelCase, capitalCase, constantCase, paramCase, snakeCase, pascalCase} from 'change-case' const SAFE_RANDOM_BUSINESS_ADJECTIVES = [ diff --git a/packages/cli-kit/src/public/common/ts/deep-required.ts b/packages/cli-kit/src/shared/common/ts/deep-required.ts similarity index 100% rename from packages/cli-kit/src/public/common/ts/deep-required.ts rename to packages/cli-kit/src/shared/common/ts/deep-required.ts diff --git a/packages/cli-kit/src/public/common/ts/json-narrowing.test.ts b/packages/cli-kit/src/shared/common/ts/json-narrowing.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/ts/json-narrowing.test.ts rename to packages/cli-kit/src/shared/common/ts/json-narrowing.test.ts diff --git a/packages/cli-kit/src/public/common/ts/json-narrowing.ts b/packages/cli-kit/src/shared/common/ts/json-narrowing.ts similarity index 100% rename from packages/cli-kit/src/public/common/ts/json-narrowing.ts rename to packages/cli-kit/src/shared/common/ts/json-narrowing.ts diff --git a/packages/cli-kit/src/public/common/ts/pick-by-prefix.ts b/packages/cli-kit/src/shared/common/ts/pick-by-prefix.ts similarity index 100% rename from packages/cli-kit/src/public/common/ts/pick-by-prefix.ts rename to packages/cli-kit/src/shared/common/ts/pick-by-prefix.ts diff --git a/packages/cli-kit/src/public/common/url.test.ts b/packages/cli-kit/src/shared/common/url.test.ts similarity index 100% rename from packages/cli-kit/src/public/common/url.test.ts rename to packages/cli-kit/src/shared/common/url.test.ts diff --git a/packages/cli-kit/src/public/common/url.ts b/packages/cli-kit/src/shared/common/url.ts similarity index 100% rename from packages/cli-kit/src/public/common/url.ts rename to packages/cli-kit/src/shared/common/url.ts diff --git a/packages/cli-kit/src/public/common/version.ts b/packages/cli-kit/src/shared/common/version.ts similarity index 100% rename from packages/cli-kit/src/public/common/version.ts rename to packages/cli-kit/src/shared/common/version.ts diff --git a/packages/cli-kit/src/public/node/abort.ts b/packages/cli-kit/src/shared/node/abort.ts similarity index 100% rename from packages/cli-kit/src/public/node/abort.ts rename to packages/cli-kit/src/shared/node/abort.ts diff --git a/packages/cli-kit/src/public/node/analytics.test.ts b/packages/cli-kit/src/shared/node/analytics.test.ts similarity index 98% rename from packages/cli-kit/src/public/node/analytics.test.ts rename to packages/cli-kit/src/shared/node/analytics.test.ts index 437ee1bb93e..007e6b3c720 100644 --- a/packages/cli-kit/src/public/node/analytics.test.ts +++ b/packages/cli-kit/src/shared/node/analytics.test.ts @@ -14,18 +14,18 @@ import {joinPath, dirname} from './path.js' import {publishMonorailEvent} from './monorail.js' import {mockAndCaptureOutput} from './testing/output.js' import {addPublicMetadata} from './metadata.js' -import * as store from '../../private/node/analytics/storage.js' -import {startAnalytics} from '../../private/node/analytics.js' -import {hashString} from '../../public/node/crypto.js' +import * as store from './internal/analytics/storage.js' +import {startAnalytics} from './internal/analytics.js' +import {hashString} from './crypto.js' import {CLI_KIT_VERSION} from '../common/version.js' -import {setLastSeenAuthMethod, setLastSeenUserIdAfterAuth} from '../../private/node/session.js' +import {setLastSeenAuthMethod, setLastSeenUserIdAfterAuth} from '../../identity/core/session.js' import {test, expect, describe, vi, beforeEach, afterEach, MockedFunction} from 'vitest' vi.mock('./context/local.js') vi.mock('./os.js') vi.mock('../../store.js') -vi.mock('../../private/node/analytics/storage.js') -vi.mock('../../public/node/crypto.js') +vi.mock('./internal/analytics/storage.js') +vi.mock('./crypto.js') vi.mock('../../version.js') vi.mock('./monorail.js') vi.mock('./cli.js') diff --git a/packages/cli-kit/src/public/node/analytics.ts b/packages/cli-kit/src/shared/node/analytics.ts similarity index 94% rename from packages/cli-kit/src/public/node/analytics.ts rename to packages/cli-kit/src/shared/node/analytics.ts index 03345a195be..282cdc20e29 100644 --- a/packages/cli-kit/src/public/node/analytics.ts +++ b/packages/cli-kit/src/shared/node/analytics.ts @@ -9,15 +9,15 @@ import { recordEvent as storageRecordEvent, compileData as storageCompileData, RuntimeData, -} from '../../private/node/analytics/storage.js' -import {outputContent, outputDebug, outputToken} from '../../public/node/output.js' -import {getEnvironmentData, getSensitiveEnvironmentData} from '../../private/node/analytics.js' +} from './internal/analytics/storage.js' +import {outputContent, outputDebug, outputToken} from './output.js' +import {getEnvironmentData, getSensitiveEnvironmentData} from './internal/analytics.js' +import {recordMetrics} from './internal/otel-metrics.js' +import {runWithRateLimit} from './internal/conf-store.js' +import {reportingRateLimit} from './internal/constants.js' +import {requestIdsCollection} from './internal/request-ids.js' +import {getLastSeenUserIdAfterAuth} from '../../identity/core/session.js' import {CLI_KIT_VERSION} from '../common/version.js' -import {recordMetrics} from '../../private/node/otel-metrics.js' -import {runWithRateLimit} from '../../private/node/conf-store.js' -import {reportingRateLimit} from '../../private/node/constants.js' -import {getLastSeenUserIdAfterAuth} from '../../private/node/session.js' -import {requestIdsCollection} from '../../private/node/request-ids.js' import {Interfaces} from '@oclif/core' export type CommandExitMode = diff --git a/packages/cli-kit/src/public/node/api/graphql.test.ts b/packages/cli-kit/src/shared/node/api/graphql.test.ts similarity index 98% rename from packages/cli-kit/src/public/node/api/graphql.test.ts rename to packages/cli-kit/src/shared/node/api/graphql.test.ts index 619719a26e4..ac5286833a6 100644 --- a/packages/cli-kit/src/public/node/api/graphql.test.ts +++ b/packages/cli-kit/src/shared/node/api/graphql.test.ts @@ -1,12 +1,12 @@ import {graphqlRequest, graphqlRequestDoc} from './graphql.js' -import * as api from '../../../private/node/api.js' -import * as debugRequest from '../../../private/node/api/graphql.js' -import {requestIdsCollection} from '../../../private/node/request-ids.js' +import * as api from '../internal/api.js' +import * as debugRequest from '../internal/api/graphql.js' +import {requestIdsCollection} from '../internal/request-ids.js' import * as metadata from '../metadata.js' -import * as confStore from '../../../private/node/conf-store.js' +import * as confStore from '../internal/conf-store.js' import {inTemporaryDirectory} from '../fs.js' import {LocalStorage} from '../local-storage.js' -import {ConfSchema, GraphQLRequestKey} from '../../../private/node/conf-store.js' +import {ConfSchema, GraphQLRequestKey} from '../internal/conf-store.js' import {nonRandomUUID} from '../crypto.js' import {CLI_KIT_VERSION} from '../../common/version.js' import * as system from '../system.js' diff --git a/packages/cli-kit/src/public/node/api/graphql.ts b/packages/cli-kit/src/shared/node/api/graphql.ts similarity index 96% rename from packages/cli-kit/src/public/node/api/graphql.ts rename to packages/cli-kit/src/shared/node/api/graphql.ts index ad1ca5a28cc..ee0ec51815c 100644 --- a/packages/cli-kit/src/public/node/api/graphql.ts +++ b/packages/cli-kit/src/shared/node/api/graphql.ts @@ -1,8 +1,8 @@ -import {buildHeaders, httpsAgent} from '../../../private/node/api/headers.js' -import {debugLogRequestInfo, errorHandler} from '../../../private/node/api/graphql.js' +import {buildHeaders, httpsAgent} from '../internal/api/headers.js' +import {debugLogRequestInfo, errorHandler} from '../internal/api/graphql.js' import {addPublicMetadata, runWithTimer} from '../metadata.js' -import {retryAwareRequest} from '../../../private/node/api.js' -import {requestIdsCollection} from '../../../private/node/request-ids.js' +import {retryAwareRequest} from '../internal/api.js' +import {requestIdsCollection} from '../internal/request-ids.js' import {nonRandomUUID} from '../crypto.js' import { cacheRetrieveOrRepopulate, @@ -10,7 +10,7 @@ import { GraphQLRequestKey, TimeInterval, timeIntervalToMilliseconds, -} from '../../../private/node/conf-store.js' +} from '../internal/conf-store.js' import {LocalStorage} from '../local-storage.js' import {abortSignalFromRequestBehaviour, RequestBehaviour, requestMode, RequestModeInput} from '../http.js' import {CLI_KIT_VERSION} from '../../common/version.js' diff --git a/packages/cli-kit/src/public/node/api/utilities.ts b/packages/cli-kit/src/shared/node/api/utilities.ts similarity index 100% rename from packages/cli-kit/src/public/node/api/utilities.ts rename to packages/cli-kit/src/shared/node/api/utilities.ts diff --git a/packages/cli-kit/src/public/node/archiver.integration.test.ts b/packages/cli-kit/src/shared/node/archiver.integration.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/archiver.integration.test.ts rename to packages/cli-kit/src/shared/node/archiver.integration.test.ts diff --git a/packages/cli-kit/src/public/node/archiver.ts b/packages/cli-kit/src/shared/node/archiver.ts similarity index 98% rename from packages/cli-kit/src/public/node/archiver.ts rename to packages/cli-kit/src/shared/node/archiver.ts index dda288526aa..4ed9a2a8eec 100644 --- a/packages/cli-kit/src/public/node/archiver.ts +++ b/packages/cli-kit/src/shared/node/archiver.ts @@ -1,6 +1,6 @@ import {relativePath, joinPath, dirname} from './path.js' import {glob, removeFile} from './fs.js' -import {outputDebug, outputContent, outputToken} from '../../public/node/output.js' +import {outputDebug, outputContent, outputToken} from './output.js' import archiver from 'archiver' import {createWriteStream, readFileSync, writeFileSync} from 'fs' import {readFile} from 'fs/promises' diff --git a/packages/cli-kit/src/public/node/base-command.test.ts b/packages/cli-kit/src/shared/node/base-command.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/base-command.test.ts rename to packages/cli-kit/src/shared/node/base-command.test.ts diff --git a/packages/cli-kit/src/public/node/base-command.ts b/packages/cli-kit/src/shared/node/base-command.ts similarity index 99% rename from packages/cli-kit/src/public/node/base-command.ts rename to packages/cli-kit/src/shared/node/base-command.ts index f4236e53e94..a6279fc3183 100644 --- a/packages/cli-kit/src/public/node/base-command.ts +++ b/packages/cli-kit/src/shared/node/base-command.ts @@ -10,7 +10,7 @@ import {hashString} from './crypto.js' import {isTruthy} from './context/utilities.js' import {showNotificationsIfNeeded} from './notifications-system.js' import {setCurrentCommandId} from './global-context.js' -import {JsonMap} from '../../private/common/json.js' +import {JsonMap} from '../common/internal/json.js' import {underscore} from '../common/string.js' import {Command, Config, Errors} from '@oclif/core' import {OutputFlags, Input, ParserOutput, FlagInput, OutputArgs} from '@oclif/core/parser' @@ -82,7 +82,6 @@ abstract class BaseCommand extends Command { } } - // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types protected exitWithTimestampWhenEnvVariablePresent() { if (isTruthy(process.env.SHOPIFY_CLI_ENV_STARTUP_PERFORMANCE_RUN)) { outputResult(` diff --git a/packages/cli-kit/src/public/node/cli-launcher.test.ts b/packages/cli-kit/src/shared/node/cli-launcher.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/cli-launcher.test.ts rename to packages/cli-kit/src/shared/node/cli-launcher.test.ts diff --git a/packages/cli-kit/src/public/node/cli-launcher.ts b/packages/cli-kit/src/shared/node/cli-launcher.ts similarity index 100% rename from packages/cli-kit/src/public/node/cli-launcher.ts rename to packages/cli-kit/src/shared/node/cli-launcher.ts diff --git a/packages/cli-kit/src/public/node/cli.test.ts b/packages/cli-kit/src/shared/node/cli.test.ts similarity index 98% rename from packages/cli-kit/src/public/node/cli.test.ts rename to packages/cli-kit/src/shared/node/cli.test.ts index 7e6af517d3c..a928e8954ec 100644 --- a/packages/cli-kit/src/public/node/cli.test.ts +++ b/packages/cli-kit/src/shared/node/cli.test.ts @@ -1,7 +1,7 @@ import {clearCache, runCLI, runCreateCLI} from './cli.js' import {findUpAndReadPackageJson} from './node-package-manager.js' import {mockAndCaptureOutput} from './testing/output.js' -import * as confStore from '../../private/node/conf-store.js' +import * as confStore from './internal/conf-store.js' import {describe, expect, test, vi} from 'vitest' vi.mock('./node-package-manager.js') diff --git a/packages/cli-kit/src/public/node/cli.ts b/packages/cli-kit/src/shared/node/cli.ts similarity index 97% rename from packages/cli-kit/src/public/node/cli.ts rename to packages/cli-kit/src/shared/node/cli.ts index e047e11421e..5249fca54bd 100644 --- a/packages/cli-kit/src/public/node/cli.ts +++ b/packages/cli-kit/src/shared/node/cli.ts @@ -1,7 +1,7 @@ import {isTruthy} from './context/utilities.js' import {launchCLI as defaultLaunchCli} from './cli-launcher.js' -import {cacheClear} from '../../private/node/conf-store.js' -import {environmentVariables} from '../../private/node/constants.js' +import {cacheClear} from './internal/conf-store.js' +import {environmentVariables} from './internal/constants.js' import {Flags} from '@oclif/core' /** diff --git a/packages/cli-kit/src/public/node/colors.ts b/packages/cli-kit/src/shared/node/colors.ts similarity index 100% rename from packages/cli-kit/src/public/node/colors.ts rename to packages/cli-kit/src/shared/node/colors.ts diff --git a/packages/cli-kit/src/public/node/context/fqdn.test.ts b/packages/cli-kit/src/shared/node/context/fqdn.test.ts similarity index 96% rename from packages/cli-kit/src/public/node/context/fqdn.test.ts rename to packages/cli-kit/src/shared/node/context/fqdn.test.ts index 72f51b35dda..0bba905bbae 100644 --- a/packages/cli-kit/src/public/node/context/fqdn.test.ts +++ b/packages/cli-kit/src/shared/node/context/fqdn.test.ts @@ -7,12 +7,12 @@ import { appDevFqdn, adminFqdn, } from './fqdn.js' -import {Environment, serviceEnvironment} from '../../../private/node/context/service.js' +import {Environment, serviceEnvironment} from '../internal/context/service.js' import {expect, describe, test, vi} from 'vitest' -vi.mock('../../../private/node/context/service.js') +vi.mock('../internal/context/service.js') -vi.mock('../vendor/dev_server/index.js', () => { +vi.mock('../../vendor/dev_server/index.js', () => { return { DevServerCore: class { host(serviceName: string) { diff --git a/packages/cli-kit/src/public/node/context/fqdn.ts b/packages/cli-kit/src/shared/node/context/fqdn.ts similarity index 96% rename from packages/cli-kit/src/public/node/context/fqdn.ts rename to packages/cli-kit/src/shared/node/context/fqdn.ts index 54673e86454..b08e7d2ba8a 100644 --- a/packages/cli-kit/src/public/node/context/fqdn.ts +++ b/packages/cli-kit/src/shared/node/context/fqdn.ts @@ -1,6 +1,6 @@ import {AbortError} from '../error.js' -import {serviceEnvironment} from '../../../private/node/context/service.js' -import {DevServer, DevServerCore} from '../vendor/dev_server/index.js' +import {serviceEnvironment} from '../internal/context/service.js' +import {DevServer, DevServerCore} from '../../vendor/dev_server/index.js' export const NotProvidedStoreFQDNError = new AbortError( "Couldn't obtain the Shopify FQDN because the store FQDN was not provided.", diff --git a/packages/cli-kit/src/public/node/context/local.integration.test.ts b/packages/cli-kit/src/shared/node/context/local.integration.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/context/local.integration.test.ts rename to packages/cli-kit/src/shared/node/context/local.integration.test.ts diff --git a/packages/cli-kit/src/public/node/context/local.test.ts b/packages/cli-kit/src/shared/node/context/local.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/context/local.test.ts rename to packages/cli-kit/src/shared/node/context/local.test.ts diff --git a/packages/cli-kit/src/public/node/context/local.ts b/packages/cli-kit/src/shared/node/context/local.ts similarity index 98% rename from packages/cli-kit/src/public/node/context/local.ts rename to packages/cli-kit/src/shared/node/context/local.ts index 6ab4755a4a5..c1fc4afa479 100644 --- a/packages/cli-kit/src/public/node/context/local.ts +++ b/packages/cli-kit/src/shared/node/context/local.ts @@ -1,6 +1,6 @@ import {isTruthy} from './utilities.js' -import {getCIMetadata, isSet, Metadata} from '../../../private/node/context/utilities.js' -import {defaultThemeKitAccessDomain, environmentVariables, pathConstants} from '../../../private/node/constants.js' +import {getCIMetadata, isSet, Metadata} from '../internal/context/utilities.js' +import {defaultThemeKitAccessDomain, environmentVariables, pathConstants} from '../internal/constants.js' import {fileExists} from '../fs.js' import {exec} from '../system.js' import isInteractive from 'is-interactive' diff --git a/packages/cli-kit/src/public/node/context/utilities.ts b/packages/cli-kit/src/shared/node/context/utilities.ts similarity index 100% rename from packages/cli-kit/src/public/node/context/utilities.ts rename to packages/cli-kit/src/shared/node/context/utilities.ts diff --git a/packages/cli-kit/src/public/node/crypto.test.ts b/packages/cli-kit/src/shared/node/crypto.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/crypto.test.ts rename to packages/cli-kit/src/shared/node/crypto.test.ts diff --git a/packages/cli-kit/src/public/node/crypto.ts b/packages/cli-kit/src/shared/node/crypto.ts similarity index 100% rename from packages/cli-kit/src/public/node/crypto.ts rename to packages/cli-kit/src/shared/node/crypto.ts diff --git a/packages/cli-kit/src/public/node/custom-oclif-loader.ts b/packages/cli-kit/src/shared/node/custom-oclif-loader.ts similarity index 100% rename from packages/cli-kit/src/public/node/custom-oclif-loader.ts rename to packages/cli-kit/src/shared/node/custom-oclif-loader.ts diff --git a/packages/cli-kit/src/public/node/doctor/framework.test.ts b/packages/cli-kit/src/shared/node/doctor/framework.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/doctor/framework.test.ts rename to packages/cli-kit/src/shared/node/doctor/framework.test.ts diff --git a/packages/cli-kit/src/public/node/doctor/framework.ts b/packages/cli-kit/src/shared/node/doctor/framework.ts similarity index 100% rename from packages/cli-kit/src/public/node/doctor/framework.ts rename to packages/cli-kit/src/shared/node/doctor/framework.ts diff --git a/packages/cli-kit/src/public/node/doctor/reporter.ts b/packages/cli-kit/src/shared/node/doctor/reporter.ts similarity index 100% rename from packages/cli-kit/src/public/node/doctor/reporter.ts rename to packages/cli-kit/src/shared/node/doctor/reporter.ts diff --git a/packages/cli-kit/src/public/node/doctor/types.ts b/packages/cli-kit/src/shared/node/doctor/types.ts similarity index 100% rename from packages/cli-kit/src/public/node/doctor/types.ts rename to packages/cli-kit/src/shared/node/doctor/types.ts diff --git a/packages/cli-kit/src/public/node/dot-env.test.ts b/packages/cli-kit/src/shared/node/dot-env.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/dot-env.test.ts rename to packages/cli-kit/src/shared/node/dot-env.test.ts diff --git a/packages/cli-kit/src/public/node/dot-env.ts b/packages/cli-kit/src/shared/node/dot-env.ts similarity index 97% rename from packages/cli-kit/src/public/node/dot-env.ts rename to packages/cli-kit/src/shared/node/dot-env.ts index 9f22b17904b..23841fa71e0 100644 --- a/packages/cli-kit/src/public/node/dot-env.ts +++ b/packages/cli-kit/src/shared/node/dot-env.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import {AbortError} from './error.js' import {fileExists, readFile, writeFile} from './fs.js' -import {outputDebug, outputContent, outputToken} from '../../public/node/output.js' +import {outputDebug, outputContent, outputToken} from './output.js' import {parse} from 'dotenv' /** diff --git a/packages/cli-kit/src/public/node/environment.ts b/packages/cli-kit/src/shared/node/environment.ts similarity index 99% rename from packages/cli-kit/src/public/node/environment.ts rename to packages/cli-kit/src/shared/node/environment.ts index 653b4895d75..4321347744b 100644 --- a/packages/cli-kit/src/public/node/environment.ts +++ b/packages/cli-kit/src/shared/node/environment.ts @@ -1,7 +1,7 @@ import {nonRandomUUID} from './crypto.js' import {isTruthy} from './context/utilities.js' import {sniffForJson} from './path.js' -import {environmentVariables, systemEnvironmentVariables} from '../../private/node/constants.js' +import {environmentVariables, systemEnvironmentVariables} from './internal/constants.js' /** * It returns the environment variables of the environment diff --git a/packages/cli-kit/src/public/node/environments.test.ts b/packages/cli-kit/src/shared/node/environments.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/environments.test.ts rename to packages/cli-kit/src/shared/node/environments.test.ts diff --git a/packages/cli-kit/src/public/node/environments.ts b/packages/cli-kit/src/shared/node/environments.ts similarity index 97% rename from packages/cli-kit/src/public/node/environments.ts rename to packages/cli-kit/src/shared/node/environments.ts index 2555f7cc775..6c9bcd7a906 100644 --- a/packages/cli-kit/src/public/node/environments.ts +++ b/packages/cli-kit/src/shared/node/environments.ts @@ -3,7 +3,7 @@ import {findPathUp, readFile} from './fs.js' import {cwd} from './path.js' import * as metadata from './metadata.js' import {renderWarning} from './ui.js' -import {JsonMap} from '../../private/common/json.js' +import {JsonMap} from '../common/internal/json.js' export interface Environments { [name: string]: JsonMap diff --git a/packages/cli-kit/src/public/node/error-handler.test.ts b/packages/cli-kit/src/shared/node/error-handler.test.ts similarity index 96% rename from packages/cli-kit/src/public/node/error-handler.test.ts rename to packages/cli-kit/src/shared/node/error-handler.test.ts index 490cb631ea2..68bd2ce877c 100644 --- a/packages/cli-kit/src/public/node/error-handler.test.ts +++ b/packages/cli-kit/src/shared/node/error-handler.test.ts @@ -3,9 +3,9 @@ import * as metadata from './metadata.js' import {ciPlatform, cloudEnvironment, isUnitTest, macAddress} from './context/local.js' import {mockAndCaptureOutput} from './testing/output.js' import * as error from './error.js' -import {hashString} from '../../public/node/crypto.js' -import {isLocalEnvironment} from '../../private/node/context/service.js' -import {getLastSeenUserIdAfterAuth} from '../../private/node/session.js' +import {hashString} from './crypto.js' +import {isLocalEnvironment} from './internal/context/service.js' +import {getLastSeenUserIdAfterAuth} from '../../identity/core/session.js' import {settings} from '@oclif/core' import {beforeEach, describe, expect, test, vi} from 'vitest' @@ -38,9 +38,9 @@ vi.mock('@bugsnag/js', () => { }) vi.mock('./cli.js') vi.mock('./context/local.js') -vi.mock('../../public/node/crypto.js') -vi.mock('../../private/node/context/service.js') -vi.mock('../../private/node/session.js') +vi.mock('./crypto.js') +vi.mock('./internal/context/service.js') +vi.mock('../../identity/core/session.js') vi.mock('@oclif/core', () => ({ settings: { debug: false, diff --git a/packages/cli-kit/src/public/node/error-handler.ts b/packages/cli-kit/src/shared/node/error-handler.ts similarity index 95% rename from packages/cli-kit/src/public/node/error-handler.ts rename to packages/cli-kit/src/shared/node/error-handler.ts index 29803ec26ca..bad56cbcf3a 100644 --- a/packages/cli-kit/src/public/node/error-handler.ts +++ b/packages/cli-kit/src/shared/node/error-handler.ts @@ -10,13 +10,13 @@ import { handler, cleanSingleStackTracePath, } from './error.js' -import {isLocalEnvironment} from '../../private/node/context/service.js' -import {getEnvironmentData} from '../../private/node/analytics.js' -import {outputDebug, outputInfo} from '../../public/node/output.js' -import {bugsnagApiKey, reportingRateLimit} from '../../private/node/constants.js' +import {isLocalEnvironment} from './internal/context/service.js' +import {getEnvironmentData} from './internal/analytics.js' +import {outputDebug, outputInfo} from './output.js' +import {bugsnagApiKey, reportingRateLimit} from './internal/constants.js' +import {runWithRateLimit} from './internal/conf-store.js' import {CLI_KIT_VERSION} from '../common/version.js' -import {runWithRateLimit} from '../../private/node/conf-store.js' -import {getLastSeenUserIdAfterAuth} from '../../private/node/session.js' +import {getLastSeenUserIdAfterAuth} from '../../identity/core/session.js' import {settings, Interfaces} from '@oclif/core' import StackTracey from 'stacktracey' import Bugsnag, {Event} from '@bugsnag/js' @@ -232,7 +232,7 @@ export async function registerCleanBugsnagErrorsFromWithinPlugins(config: Interf }) } -// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any +// eslint-disable-next-line @typescript-eslint/no-explicit-any export async function addBugsnagMetadata(event: any, config: Interfaces.Config): Promise { const publicData = metadata.getAllPublicMetadata() const {commandStartOptions} = metadata.getAllSensitiveMetadata() diff --git a/packages/cli-kit/src/public/node/error.test.ts b/packages/cli-kit/src/shared/node/error.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/error.test.ts rename to packages/cli-kit/src/shared/node/error.test.ts diff --git a/packages/cli-kit/src/public/node/error.ts b/packages/cli-kit/src/shared/node/error.ts similarity index 97% rename from packages/cli-kit/src/public/node/error.ts rename to packages/cli-kit/src/shared/node/error.ts index c8ada6f48e8..ea801904f3a 100644 --- a/packages/cli-kit/src/public/node/error.ts +++ b/packages/cli-kit/src/shared/node/error.ts @@ -1,7 +1,7 @@ import {AlertCustomSection, renderFatalError} from './ui.js' -import {OutputMessage, stringifyMessage, TokenizedString} from '../../public/node/output.js' -import {normalizePath} from '../../public/node/path.js' -import {InlineToken, TokenItem, tokenItemToString} from '../../private/node/ui/components/TokenizedText.js' +import {OutputMessage, stringifyMessage, TokenizedString} from './output.js' +import {normalizePath} from './path.js' +import {InlineToken, TokenItem, tokenItemToString} from '../ui/components/TokenizedText.js' import {Errors} from '@oclif/core' export {ExtendableError} from 'ts-error' diff --git a/packages/cli-kit/src/public/node/figures.ts b/packages/cli-kit/src/shared/node/figures.ts similarity index 100% rename from packages/cli-kit/src/public/node/figures.ts rename to packages/cli-kit/src/shared/node/figures.ts diff --git a/packages/cli-kit/src/public/node/framework.test.ts b/packages/cli-kit/src/shared/node/framework.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/framework.test.ts rename to packages/cli-kit/src/shared/node/framework.test.ts diff --git a/packages/cli-kit/src/public/node/framework.ts b/packages/cli-kit/src/shared/node/framework.ts similarity index 100% rename from packages/cli-kit/src/public/node/framework.ts rename to packages/cli-kit/src/shared/node/framework.ts diff --git a/packages/cli-kit/src/public/node/fs.test.ts b/packages/cli-kit/src/shared/node/fs.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/fs.test.ts rename to packages/cli-kit/src/shared/node/fs.test.ts diff --git a/packages/cli-kit/src/public/node/fs.ts b/packages/cli-kit/src/shared/node/fs.ts similarity index 99% rename from packages/cli-kit/src/public/node/fs.ts rename to packages/cli-kit/src/shared/node/fs.ts index 09c16a4ce35..14ea5a91d0a 100644 --- a/packages/cli-kit/src/public/node/fs.ts +++ b/packages/cli-kit/src/shared/node/fs.ts @@ -1,7 +1,7 @@ import {joinPath, normalizePath} from './path.js' -import {outputContent, outputToken, outputDebug} from '../../public/node/output.js' +import {outputContent, outputToken, outputDebug} from './output.js' import {getRandomName, RandomNameFamily} from '../common/string.js' -import {OverloadParameters} from '../../private/common/ts/overloaded-parameters.js' +import {OverloadParameters} from '../common/internal/ts/overloaded-parameters.js' import { copy as fsCopy, ensureFile as fsEnsureFile, diff --git a/packages/cli-kit/src/public/node/git.test.ts b/packages/cli-kit/src/shared/node/git.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/git.test.ts rename to packages/cli-kit/src/shared/node/git.test.ts diff --git a/packages/cli-kit/src/public/node/git.ts b/packages/cli-kit/src/shared/node/git.ts similarity index 99% rename from packages/cli-kit/src/public/node/git.ts rename to packages/cli-kit/src/shared/node/git.ts index e095aa01150..22175296994 100644 --- a/packages/cli-kit/src/public/node/git.ts +++ b/packages/cli-kit/src/shared/node/git.ts @@ -13,7 +13,7 @@ import { import {AbortError} from './error.js' import {cwd, joinPath} from './path.js' import {runWithTimer} from './metadata.js' -import {outputContent, outputToken, outputDebug} from '../../public/node/output.js' +import {outputContent, outputToken, outputDebug} from './output.js' import git, {TaskOptions, SimpleGitProgressEvent, DefaultLogFields, ListLogLine, SimpleGit} from 'simple-git' import ignore from 'ignore' diff --git a/packages/cli-kit/src/public/node/github.test.ts b/packages/cli-kit/src/shared/node/github.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/github.test.ts rename to packages/cli-kit/src/shared/node/github.test.ts diff --git a/packages/cli-kit/src/public/node/github.ts b/packages/cli-kit/src/shared/node/github.ts similarity index 98% rename from packages/cli-kit/src/public/node/github.ts rename to packages/cli-kit/src/shared/node/github.ts index 9214dafd754..9052e04d517 100644 --- a/packages/cli-kit/src/public/node/github.ts +++ b/packages/cli-kit/src/shared/node/github.ts @@ -5,7 +5,7 @@ import {writeFile, mkdir, inTemporaryDirectory, moveFile, chmod} from './fs.js' import {dirname, joinPath} from './path.js' import {runWithTimer} from './metadata.js' import {AbortError} from './error.js' -import {outputContent, outputDebug, outputToken} from '../../public/node/output.js' +import {outputContent, outputDebug, outputToken} from './output.js' class GitHubClientError extends Error { // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/packages/cli-kit/src/public/node/global-context.ts b/packages/cli-kit/src/shared/node/global-context.ts similarity index 100% rename from packages/cli-kit/src/public/node/global-context.ts rename to packages/cli-kit/src/shared/node/global-context.ts diff --git a/packages/cli-kit/src/public/node/hidden-folder.test.ts b/packages/cli-kit/src/shared/node/hidden-folder.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/hidden-folder.test.ts rename to packages/cli-kit/src/shared/node/hidden-folder.test.ts diff --git a/packages/cli-kit/src/public/node/hidden-folder.ts b/packages/cli-kit/src/shared/node/hidden-folder.ts similarity index 100% rename from packages/cli-kit/src/public/node/hidden-folder.ts rename to packages/cli-kit/src/shared/node/hidden-folder.ts diff --git a/packages/cli-kit/src/public/node/hooks/deprecations.ts b/packages/cli-kit/src/shared/node/hooks/deprecations.ts similarity index 94% rename from packages/cli-kit/src/public/node/hooks/deprecations.ts rename to packages/cli-kit/src/shared/node/hooks/deprecations.ts index 16d01eca0f4..4cc1e84c194 100644 --- a/packages/cli-kit/src/public/node/hooks/deprecations.ts +++ b/packages/cli-kit/src/shared/node/hooks/deprecations.ts @@ -1,4 +1,4 @@ -import {getNextDeprecationDate} from '../../../private/node/context/deprecations-store.js' +import {getNextDeprecationDate} from '../internal/context/deprecations-store.js' import {renderWarning} from '../ui.js' import {Command} from '@oclif/core' diff --git a/packages/cli-kit/src/public/node/hooks/postrun.ts b/packages/cli-kit/src/shared/node/hooks/postrun.ts similarity index 93% rename from packages/cli-kit/src/public/node/hooks/postrun.ts rename to packages/cli-kit/src/shared/node/hooks/postrun.ts index 6c67eb858df..04af8bb9b34 100644 --- a/packages/cli-kit/src/public/node/hooks/postrun.ts +++ b/packages/cli-kit/src/shared/node/hooks/postrun.ts @@ -1,8 +1,8 @@ import {postrun as deprecationsHook} from './deprecations.js' import {reportAnalyticsEvent} from '../analytics.js' -import {outputDebug} from '../../../public/node/output.js' +import {outputDebug} from '../output.js' import BaseCommand from '../base-command.js' -import * as metadata from '../../../public/node/metadata.js' +import * as metadata from '../metadata.js' import {Command, Hook} from '@oclif/core' let postRunHookCompleted = false diff --git a/packages/cli-kit/src/public/node/hooks/prerun.test.ts b/packages/cli-kit/src/shared/node/hooks/prerun.test.ts similarity index 96% rename from packages/cli-kit/src/public/node/hooks/prerun.test.ts rename to packages/cli-kit/src/shared/node/hooks/prerun.test.ts index d242ddacfbc..b6ff8a845f3 100644 --- a/packages/cli-kit/src/public/node/hooks/prerun.test.ts +++ b/packages/cli-kit/src/shared/node/hooks/prerun.test.ts @@ -1,10 +1,10 @@ import {parseCommandContent, warnOnAvailableUpgrade} from './prerun.js' import {checkForCachedNewVersion, packageManagerFromUserAgent} from '../node-package-manager.js' -import {cacheClear} from '../../../private/node/conf-store.js' +import {cacheClear} from '../internal/conf-store.js' import {mockAndCaptureOutput} from '../testing/output.js' import {describe, expect, test, vi, afterEach, beforeEach} from 'vitest' -vi.mock('../node-package-manager') +vi.mock('../node-package-manager.js') beforeEach(() => { cacheClear() diff --git a/packages/cli-kit/src/public/node/hooks/prerun.ts b/packages/cli-kit/src/shared/node/hooks/prerun.ts similarity index 91% rename from packages/cli-kit/src/public/node/hooks/prerun.ts rename to packages/cli-kit/src/shared/node/hooks/prerun.ts index 298df53a913..f889b1e8661 100644 --- a/packages/cli-kit/src/public/node/hooks/prerun.ts +++ b/packages/cli-kit/src/shared/node/hooks/prerun.ts @@ -1,10 +1,10 @@ import {CLI_KIT_VERSION} from '../../common/version.js' import {checkForNewVersion, checkForCachedNewVersion} from '../node-package-manager.js' -import {startAnalytics} from '../../../private/node/analytics.js' -import {outputDebug, outputWarn} from '../../../public/node/output.js' -import {getOutputUpdateCLIReminder} from '../../../public/node/upgrade.js' -import Command from '../../../public/node/base-command.js' -import {runAtMinimumInterval} from '../../../private/node/conf-store.js' +import {startAnalytics} from '../internal/analytics.js' +import {outputDebug, outputWarn} from '../output.js' +import {getOutputUpdateCLIReminder} from '../upgrade.js' +import Command from '../base-command.js' +import {runAtMinimumInterval} from '../internal/conf-store.js' import {fetchNotificationsInBackground} from '../notifications-system.js' import {isPreReleaseVersion} from '../version.js' import {Hook} from '@oclif/core' diff --git a/packages/cli-kit/src/public/node/hrtime.ts b/packages/cli-kit/src/shared/node/hrtime.ts similarity index 100% rename from packages/cli-kit/src/public/node/hrtime.ts rename to packages/cli-kit/src/shared/node/hrtime.ts diff --git a/packages/cli-kit/src/public/node/http.test.ts b/packages/cli-kit/src/shared/node/http.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/http.test.ts rename to packages/cli-kit/src/shared/node/http.test.ts diff --git a/packages/cli-kit/src/public/node/http.ts b/packages/cli-kit/src/shared/node/http.ts similarity index 96% rename from packages/cli-kit/src/public/node/http.ts rename to packages/cli-kit/src/shared/node/http.ts index 12c344343e3..5b4b80d7056 100644 --- a/packages/cli-kit/src/public/node/http.ts +++ b/packages/cli-kit/src/shared/node/http.ts @@ -3,11 +3,11 @@ import {dirname} from './path.js' import {createFileWriteStream, fileExistsSync, mkdirSync, unlinkFileSync} from './fs.js' import {runWithTimer} from './metadata.js' import {maxRequestTimeForNetworkCallsMs, skipNetworkLevelRetry} from './environment.js' -import {httpsAgent, sanitizedHeadersOutput} from '../../private/node/api/headers.js' -import {sanitizeURL} from '../../private/node/api/urls.js' -import {outputContent, outputDebug, outputToken} from '../../public/node/output.js' -import {NetworkRetryBehaviour, simpleRequestWithDebugLog} from '../../private/node/api.js' -import {DEFAULT_MAX_TIME_MS} from '../../private/node/sleep-with-backoff.js' +import {httpsAgent, sanitizedHeadersOutput} from './internal/api/headers.js' +import {sanitizeURL} from './internal/api/urls.js' +import {outputContent, outputDebug, outputToken} from './output.js' +import {NetworkRetryBehaviour, simpleRequestWithDebugLog} from './internal/api.js' +import {DEFAULT_MAX_TIME_MS} from './internal/sleep-with-backoff.js' import FormData from 'form-data' import nodeFetch, {RequestInfo, RequestInit, Response} from 'node-fetch' diff --git a/packages/cli-kit/src/public/node/import-extractor.test.ts b/packages/cli-kit/src/shared/node/import-extractor.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/import-extractor.test.ts rename to packages/cli-kit/src/shared/node/import-extractor.test.ts diff --git a/packages/cli-kit/src/public/node/import-extractor.ts b/packages/cli-kit/src/shared/node/import-extractor.ts similarity index 100% rename from packages/cli-kit/src/public/node/import-extractor.ts rename to packages/cli-kit/src/shared/node/import-extractor.ts diff --git a/packages/cli-kit/src/public/node/ink.ts b/packages/cli-kit/src/shared/node/ink.ts similarity index 100% rename from packages/cli-kit/src/public/node/ink.ts rename to packages/cli-kit/src/shared/node/ink.ts diff --git a/packages/cli-kit/src/private/node/__snapshots__/otel-metrics.test.ts.snap b/packages/cli-kit/src/shared/node/internal/__snapshots__/otel-metrics.test.ts.snap similarity index 100% rename from packages/cli-kit/src/private/node/__snapshots__/otel-metrics.test.ts.snap rename to packages/cli-kit/src/shared/node/internal/__snapshots__/otel-metrics.test.ts.snap diff --git a/packages/cli-kit/src/private/node/analytics.ts b/packages/cli-kit/src/shared/node/internal/analytics.ts similarity index 84% rename from packages/cli-kit/src/private/node/analytics.ts rename to packages/cli-kit/src/shared/node/internal/analytics.ts index 67a869ee8d8..11df954587d 100644 --- a/packages/cli-kit/src/private/node/analytics.ts +++ b/packages/cli-kit/src/shared/node/internal/analytics.ts @@ -1,14 +1,14 @@ -import {getLastSeenAuthMethod} from './session.js' -import {hashString} from '../../public/node/crypto.js' -import {getPackageManager, packageManagerFromUserAgent} from '../../public/node/node-package-manager.js' -import BaseCommand from '../../public/node/base-command.js' -import {CommandContent} from '../../public/node/hooks/prerun.js' -import * as metadata from '../../public/node/metadata.js' -import {platformAndArch} from '../../public/node/os.js' -import {ciPlatform, cloudEnvironment, macAddress} from '../../public/node/context/local.js' -import {cwd} from '../../public/node/path.js' -import {currentProcessIsGlobal} from '../../public/node/is-global.js' -import {isWsl} from '../../public/node/system.js' +import {getLastSeenAuthMethod} from '../../../identity/core/session.js' +import {hashString} from '../crypto.js' +import {getPackageManager, packageManagerFromUserAgent} from '../node-package-manager.js' +import BaseCommand from '../base-command.js' +import {CommandContent} from '../hooks/prerun.js' +import * as metadata from '../metadata.js' +import {platformAndArch} from '../os.js' +import {ciPlatform, cloudEnvironment, macAddress} from '../context/local.js' +import {cwd} from '../path.js' +import {currentProcessIsGlobal} from '../is-global.js' +import {isWsl} from '../system.js' import {Command, Interfaces} from '@oclif/core' interface StartOptions { diff --git a/packages/cli-kit/src/private/node/analytics/bounded-collections.test.ts b/packages/cli-kit/src/shared/node/internal/analytics/bounded-collections.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/analytics/bounded-collections.test.ts rename to packages/cli-kit/src/shared/node/internal/analytics/bounded-collections.test.ts diff --git a/packages/cli-kit/src/private/node/analytics/bounded-collections.ts b/packages/cli-kit/src/shared/node/internal/analytics/bounded-collections.ts similarity index 100% rename from packages/cli-kit/src/private/node/analytics/bounded-collections.ts rename to packages/cli-kit/src/shared/node/internal/analytics/bounded-collections.ts diff --git a/packages/cli-kit/src/private/node/analytics/error-categorizer.test.ts b/packages/cli-kit/src/shared/node/internal/analytics/error-categorizer.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/analytics/error-categorizer.test.ts rename to packages/cli-kit/src/shared/node/internal/analytics/error-categorizer.test.ts diff --git a/packages/cli-kit/src/private/node/analytics/error-categorizer.ts b/packages/cli-kit/src/shared/node/internal/analytics/error-categorizer.ts similarity index 100% rename from packages/cli-kit/src/private/node/analytics/error-categorizer.ts rename to packages/cli-kit/src/shared/node/internal/analytics/error-categorizer.ts diff --git a/packages/cli-kit/src/private/node/analytics/storage.test.ts b/packages/cli-kit/src/shared/node/internal/analytics/storage.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/analytics/storage.test.ts rename to packages/cli-kit/src/shared/node/internal/analytics/storage.test.ts diff --git a/packages/cli-kit/src/private/node/analytics/storage.ts b/packages/cli-kit/src/shared/node/internal/analytics/storage.ts similarity index 100% rename from packages/cli-kit/src/private/node/analytics/storage.ts rename to packages/cli-kit/src/shared/node/internal/analytics/storage.ts diff --git a/packages/cli-kit/src/private/node/api.test.ts b/packages/cli-kit/src/shared/node/internal/api.test.ts similarity index 99% rename from packages/cli-kit/src/private/node/api.test.ts rename to packages/cli-kit/src/shared/node/internal/api.test.ts index 5dd325be6ca..185a8f4340e 100644 --- a/packages/cli-kit/src/private/node/api.test.ts +++ b/packages/cli-kit/src/shared/node/internal/api.test.ts @@ -1,9 +1,9 @@ import {retryAwareRequest, isNetworkError, isTransientNetworkError} from './api.js' -import {recordRetry} from '../../public/node/analytics.js' +import {recordRetry} from '../analytics.js' import {ClientError} from 'graphql-request' import {describe, test, vi, expect, beforeEach, afterEach} from 'vitest' -vi.mock('../../public/node/analytics.js', () => ({ +vi.mock('../analytics.js', () => ({ recordRetry: vi.fn(), })) diff --git a/packages/cli-kit/src/private/node/api.ts b/packages/cli-kit/src/shared/node/internal/api.ts similarity index 99% rename from packages/cli-kit/src/private/node/api.ts rename to packages/cli-kit/src/shared/node/internal/api.ts index 6a493350e23..80217f2281b 100644 --- a/packages/cli-kit/src/private/node/api.ts +++ b/packages/cli-kit/src/shared/node/internal/api.ts @@ -1,8 +1,8 @@ import {sanitizedHeadersOutput} from './api/headers.js' import {sanitizeURL} from './api/urls.js' import {sleepWithBackoffUntil} from './sleep-with-backoff.js' -import {outputDebug} from '../../public/node/output.js' -import {recordRetry} from '../../public/node/analytics.js' +import {outputDebug} from '../output.js' +import {recordRetry} from '../analytics.js' import {Headers} from 'form-data' import {ClientError} from 'graphql-request' import {performance} from 'perf_hooks' diff --git a/packages/cli-kit/src/private/node/api/graphql.ts b/packages/cli-kit/src/shared/node/internal/api/graphql.ts similarity index 96% rename from packages/cli-kit/src/private/node/api/graphql.ts rename to packages/cli-kit/src/shared/node/internal/api/graphql.ts index 9a0136db2c6..1e78b71bea6 100644 --- a/packages/cli-kit/src/private/node/api/graphql.ts +++ b/packages/cli-kit/src/shared/node/internal/api/graphql.ts @@ -1,7 +1,7 @@ import {GraphQLClientError, sanitizedHeadersOutput} from './headers.js' import {sanitizeURL} from './urls.js' -import {stringifyMessage, outputContent, outputToken, outputDebug} from '../../../public/node/output.js' -import {AbortError} from '../../../public/node/error.js' +import {stringifyMessage, outputContent, outputToken, outputDebug} from '../../output.js' +import {AbortError} from '../../error.js' import {ClientError, Variables} from 'graphql-request' export function debugLogRequestInfo( diff --git a/packages/cli-kit/src/private/node/api/headers.test.ts b/packages/cli-kit/src/shared/node/internal/api/headers.test.ts similarity index 92% rename from packages/cli-kit/src/private/node/api/headers.test.ts rename to packages/cli-kit/src/shared/node/internal/api/headers.test.ts index be8ca5ff495..8e61216fee0 100644 --- a/packages/cli-kit/src/private/node/api/headers.test.ts +++ b/packages/cli-kit/src/shared/node/internal/api/headers.test.ts @@ -1,11 +1,11 @@ import {buildHeaders, sanitizedHeadersOutput, GraphQLClientError} from './headers.js' -import {CLI_KIT_VERSION} from '../../../public/common/version.js' -import {randomUUID} from '../../../public/node/crypto.js' -import {firstPartyDev, isUnitTest} from '../../../public/node/context/local.js' +import {CLI_KIT_VERSION} from '../../../common/version.js' +import {randomUUID} from '../../crypto.js' +import {firstPartyDev, isUnitTest} from '../../context/local.js' import {test, vi, expect, describe, beforeEach} from 'vitest' -vi.mock('../../../public/node/crypto.js') -vi.mock('../../../public/node/context/local.js') +vi.mock('../../crypto.js') +vi.mock('../../context/local.js') vi.mock('../version') beforeEach(() => { diff --git a/packages/cli-kit/src/private/node/api/headers.ts b/packages/cli-kit/src/shared/node/internal/api/headers.ts similarity index 92% rename from packages/cli-kit/src/private/node/api/headers.ts rename to packages/cli-kit/src/shared/node/internal/api/headers.ts index e743b3258c2..68642babad5 100644 --- a/packages/cli-kit/src/private/node/api/headers.ts +++ b/packages/cli-kit/src/shared/node/internal/api/headers.ts @@ -1,6 +1,6 @@ -import {CLI_KIT_VERSION} from '../../../public/common/version.js' -import {firstPartyDev} from '../../../public/node/context/local.js' -import {AbortError} from '../../../public/node/error.js' +import {CLI_KIT_VERSION} from '../../../common/version.js' +import {firstPartyDev} from '../../context/local.js' +import {AbortError} from '../../error.js' import https from 'https' class RequestClientError extends AbortError { diff --git a/packages/cli-kit/src/private/node/api/urls.test.ts b/packages/cli-kit/src/shared/node/internal/api/urls.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/api/urls.test.ts rename to packages/cli-kit/src/shared/node/internal/api/urls.test.ts diff --git a/packages/cli-kit/src/private/node/api/urls.ts b/packages/cli-kit/src/shared/node/internal/api/urls.ts similarity index 100% rename from packages/cli-kit/src/private/node/api/urls.ts rename to packages/cli-kit/src/shared/node/internal/api/urls.ts diff --git a/packages/cli-kit/src/private/node/conf-store.test.ts b/packages/cli-kit/src/shared/node/internal/conf-store.test.ts similarity index 98% rename from packages/cli-kit/src/private/node/conf-store.test.ts rename to packages/cli-kit/src/shared/node/internal/conf-store.test.ts index 8e714a34062..8d1438adad2 100644 --- a/packages/cli-kit/src/private/node/conf-store.test.ts +++ b/packages/cli-kit/src/shared/node/internal/conf-store.test.ts @@ -14,8 +14,8 @@ import { setCachedPartnerAccountStatus, runWithRateLimit, } from './conf-store.js' -import {LocalStorage} from '../../public/node/local-storage.js' -import {inTemporaryDirectory} from '../../public/node/fs.js' +import {LocalStorage} from '../local-storage.js' +import {inTemporaryDirectory} from '../fs.js' import {afterEach, beforeEach, describe, expect, test, vi} from 'vitest' describe('getSession', () => { diff --git a/packages/cli-kit/src/private/node/conf-store.ts b/packages/cli-kit/src/shared/node/internal/conf-store.ts similarity index 97% rename from packages/cli-kit/src/private/node/conf-store.ts rename to packages/cli-kit/src/shared/node/internal/conf-store.ts index e5cae2306de..b3488983d40 100644 --- a/packages/cli-kit/src/private/node/conf-store.ts +++ b/packages/cli-kit/src/shared/node/internal/conf-store.ts @@ -1,6 +1,6 @@ -import {isUnitTest} from '../../public/node/context/local.js' -import {LocalStorage} from '../../public/node/local-storage.js' -import {outputContent, outputDebug} from '../../public/node/output.js' +import {isUnitTest} from '../context/local.js' +import {LocalStorage} from '../local-storage.js' +import {outputContent, outputDebug} from '../output.js' interface CacheValue { value: T diff --git a/packages/cli-kit/src/private/node/constants.ts b/packages/cli-kit/src/shared/node/internal/constants.ts similarity index 98% rename from packages/cli-kit/src/private/node/constants.ts rename to packages/cli-kit/src/shared/node/internal/constants.ts index 3672b8b4c29..f8f977c6a0a 100644 --- a/packages/cli-kit/src/private/node/constants.ts +++ b/packages/cli-kit/src/shared/node/internal/constants.ts @@ -1,4 +1,4 @@ -import {joinPath} from '../../public/node/path.js' +import {joinPath} from '../path.js' import envPaths from 'env-paths' const identifier = 'shopify-cli' diff --git a/packages/cli-kit/src/private/node/content-tokens.test.ts b/packages/cli-kit/src/shared/node/internal/content-tokens.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/content-tokens.test.ts rename to packages/cli-kit/src/shared/node/internal/content-tokens.test.ts diff --git a/packages/cli-kit/src/private/node/content-tokens.ts b/packages/cli-kit/src/shared/node/internal/content-tokens.ts similarity index 94% rename from packages/cli-kit/src/private/node/content-tokens.ts rename to packages/cli-kit/src/shared/node/internal/content-tokens.ts index 932c53389c0..b167e8d7694 100644 --- a/packages/cli-kit/src/private/node/content-tokens.ts +++ b/packages/cli-kit/src/shared/node/internal/content-tokens.ts @@ -1,6 +1,6 @@ -import colors from '../../public/node/colors.js' -import {OutputMessage, stringifyMessage} from '../../public/node/output.js' -import {relativizePath} from '../../public/node/path.js' +import colors from '../colors.js' +import {OutputMessage, stringifyMessage} from '../output.js' +import {relativizePath} from '../path.js' import terminalLink from 'terminal-link' import cjs from 'color-json' import type {Change} from 'diff' diff --git a/packages/cli-kit/src/private/node/context/deprecations-store.ts b/packages/cli-kit/src/shared/node/internal/context/deprecations-store.ts similarity index 100% rename from packages/cli-kit/src/private/node/context/deprecations-store.ts rename to packages/cli-kit/src/shared/node/internal/context/deprecations-store.ts diff --git a/packages/cli-kit/src/private/node/context/service.test.ts b/packages/cli-kit/src/shared/node/internal/context/service.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/context/service.test.ts rename to packages/cli-kit/src/shared/node/internal/context/service.test.ts diff --git a/packages/cli-kit/src/private/node/context/service.ts b/packages/cli-kit/src/shared/node/internal/context/service.ts similarity index 100% rename from packages/cli-kit/src/private/node/context/service.ts rename to packages/cli-kit/src/shared/node/internal/context/service.ts diff --git a/packages/cli-kit/src/private/node/context/utilities.ts b/packages/cli-kit/src/shared/node/internal/context/utilities.ts similarity index 100% rename from packages/cli-kit/src/private/node/context/utilities.ts rename to packages/cli-kit/src/shared/node/internal/context/utilities.ts diff --git a/packages/cli-kit/src/private/node/otel-metrics.test.ts b/packages/cli-kit/src/shared/node/internal/otel-metrics.test.ts similarity index 94% rename from packages/cli-kit/src/private/node/otel-metrics.test.ts rename to packages/cli-kit/src/shared/node/internal/otel-metrics.test.ts index 0209846d62a..17fbee06770 100644 --- a/packages/cli-kit/src/private/node/otel-metrics.test.ts +++ b/packages/cli-kit/src/shared/node/internal/otel-metrics.test.ts @@ -1,5 +1,5 @@ import {recordMetrics} from './otel-metrics.js' -import {mockAndCaptureOutput} from '../../public/node/testing/output.js' +import {mockAndCaptureOutput} from '../testing/output.js' import {describe, expect, test, vi} from 'vitest' describe('otel-metrics', () => { diff --git a/packages/cli-kit/src/private/node/otel-metrics.ts b/packages/cli-kit/src/shared/node/internal/otel-metrics.ts similarity index 93% rename from packages/cli-kit/src/private/node/otel-metrics.ts rename to packages/cli-kit/src/shared/node/internal/otel-metrics.ts index 9f0dd3a3f56..d67198e4c16 100644 --- a/packages/cli-kit/src/private/node/otel-metrics.ts +++ b/packages/cli-kit/src/shared/node/internal/otel-metrics.ts @@ -1,10 +1,10 @@ -import {MetricInstrumentType, OtelService} from '../../public/node/vendor/otel-js/service/types.js' -import {outputContent, outputDebug, outputToken} from '../../public/node/output.js' +import {MetricInstrumentType, OtelService} from '../../vendor/otel-js/service/types.js' +import {outputContent, outputDebug, outputToken} from '../output.js' import { DefaultOtelService, DefaultOtelServiceOptions, -} from '../../public/node/vendor/otel-js/service/DefaultOtelService/DefaultOtelService.js' -import {isUnitTest, opentelemetryDomain} from '../../public/node/context/local.js' +} from '../../vendor/otel-js/service/DefaultOtelService/DefaultOtelService.js' +import {isUnitTest, opentelemetryDomain} from '../context/local.js' import {ValueType} from '@opentelemetry/api' type MetricRecorder = diff --git a/packages/cli-kit/src/private/node/output.ts b/packages/cli-kit/src/shared/node/internal/output.ts similarity index 93% rename from packages/cli-kit/src/private/node/output.ts rename to packages/cli-kit/src/shared/node/internal/output.ts index db114e71e43..35dc4e28b6e 100644 --- a/packages/cli-kit/src/private/node/output.ts +++ b/packages/cli-kit/src/shared/node/internal/output.ts @@ -1,4 +1,4 @@ -import {isUnitTest} from '../../public/node/context/local.js' +import {isUnitTest} from '../context/local.js' import { OutputMessage, LogLevel, @@ -8,7 +8,7 @@ import { Logger, shouldDisplayColors, unstyled, -} from '../../public/node/output.js' +} from '../output.js' /** * Returns a colored or uncolored version of a message, depending on the environment. diff --git a/packages/cli-kit/src/private/node/request-ids.test.ts b/packages/cli-kit/src/shared/node/internal/request-ids.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/request-ids.test.ts rename to packages/cli-kit/src/shared/node/internal/request-ids.test.ts diff --git a/packages/cli-kit/src/private/node/request-ids.ts b/packages/cli-kit/src/shared/node/internal/request-ids.ts similarity index 100% rename from packages/cli-kit/src/private/node/request-ids.ts rename to packages/cli-kit/src/shared/node/internal/request-ids.ts diff --git a/packages/cli-kit/src/private/node/sleep-with-backoff.test.ts b/packages/cli-kit/src/shared/node/internal/sleep-with-backoff.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/sleep-with-backoff.test.ts rename to packages/cli-kit/src/shared/node/internal/sleep-with-backoff.test.ts diff --git a/packages/cli-kit/src/private/node/sleep-with-backoff.ts b/packages/cli-kit/src/shared/node/internal/sleep-with-backoff.ts similarity index 97% rename from packages/cli-kit/src/private/node/sleep-with-backoff.ts rename to packages/cli-kit/src/shared/node/internal/sleep-with-backoff.ts index 8d077039ea3..483dedd8c44 100644 --- a/packages/cli-kit/src/private/node/sleep-with-backoff.ts +++ b/packages/cli-kit/src/shared/node/internal/sleep-with-backoff.ts @@ -1,4 +1,4 @@ -import {sleep} from '../../public/node/system.js' +import {sleep} from '../system.js' const DEFAULT_RETRY_DELAY_MS = 300 // 10 seconds default diff --git a/packages/cli-kit/src/public/node/is-global.test.ts b/packages/cli-kit/src/shared/node/is-global.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/is-global.test.ts rename to packages/cli-kit/src/shared/node/is-global.test.ts diff --git a/packages/cli-kit/src/public/node/is-global.ts b/packages/cli-kit/src/shared/node/is-global.ts similarity index 100% rename from packages/cli-kit/src/public/node/is-global.ts rename to packages/cli-kit/src/shared/node/is-global.ts diff --git a/packages/cli-kit/src/public/node/json-schema.test.ts b/packages/cli-kit/src/shared/node/json-schema.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/json-schema.test.ts rename to packages/cli-kit/src/shared/node/json-schema.test.ts diff --git a/packages/cli-kit/src/public/node/json-schema.ts b/packages/cli-kit/src/shared/node/json-schema.ts similarity index 100% rename from packages/cli-kit/src/public/node/json-schema.ts rename to packages/cli-kit/src/shared/node/json-schema.ts diff --git a/packages/cli-kit/src/public/node/liquid.test.ts b/packages/cli-kit/src/shared/node/liquid.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/liquid.test.ts rename to packages/cli-kit/src/shared/node/liquid.test.ts diff --git a/packages/cli-kit/src/public/node/liquid.ts b/packages/cli-kit/src/shared/node/liquid.ts similarity index 97% rename from packages/cli-kit/src/public/node/liquid.ts rename to packages/cli-kit/src/shared/node/liquid.ts index 95640c0a442..47cdb18ff27 100644 --- a/packages/cli-kit/src/public/node/liquid.ts +++ b/packages/cli-kit/src/shared/node/liquid.ts @@ -11,7 +11,7 @@ import { matchGlob, } from './fs.js' import {joinPath, dirname, relativePath} from './path.js' -import {outputContent, outputToken, outputDebug} from '../../public/node/output.js' +import {outputContent, outputToken, outputDebug} from './output.js' import {Liquid} from 'liquidjs' /** diff --git a/packages/cli-kit/src/public/node/local-storage.test.ts b/packages/cli-kit/src/shared/node/local-storage.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/local-storage.test.ts rename to packages/cli-kit/src/shared/node/local-storage.test.ts diff --git a/packages/cli-kit/src/public/node/local-storage.ts b/packages/cli-kit/src/shared/node/local-storage.ts similarity index 100% rename from packages/cli-kit/src/public/node/local-storage.ts rename to packages/cli-kit/src/shared/node/local-storage.ts diff --git a/packages/cli-kit/src/public/node/logs.ts b/packages/cli-kit/src/shared/node/logs.ts similarity index 87% rename from packages/cli-kit/src/public/node/logs.ts rename to packages/cli-kit/src/shared/node/logs.ts index 64d29a3041b..ebe4f92f9be 100644 --- a/packages/cli-kit/src/public/node/logs.ts +++ b/packages/cli-kit/src/shared/node/logs.ts @@ -1,6 +1,6 @@ import {joinPath} from './path.js' import {mkdir, writeFile} from './fs.js' -import {logsFolder} from '../../private/node/constants.js' +import {logsFolder} from './internal/constants.js' export const getLogsDir = (): string => { return logsFolder() diff --git a/packages/cli-kit/src/public/node/metadata.test.ts b/packages/cli-kit/src/shared/node/metadata.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/metadata.test.ts rename to packages/cli-kit/src/shared/node/metadata.test.ts diff --git a/packages/cli-kit/src/public/node/metadata.ts b/packages/cli-kit/src/shared/node/metadata.ts similarity index 99% rename from packages/cli-kit/src/public/node/metadata.ts rename to packages/cli-kit/src/shared/node/metadata.ts index 63747f1980c..d8fb8dd420e 100644 --- a/packages/cli-kit/src/public/node/metadata.ts +++ b/packages/cli-kit/src/shared/node/metadata.ts @@ -1,7 +1,7 @@ import {isUnitTest} from './context/local.js' import {performance} from 'node:perf_hooks' import type {PickByPrefix} from '../common/ts/pick-by-prefix.js' -import type {AnyJson} from '../../private/common/json.js' +import type {AnyJson} from '../common/internal/json.js' import type {MonorailEventPublic, MonorailEventSensitive} from './monorail.js' type ProvideMetadata = () => Partial | Promise> diff --git a/packages/cli-kit/src/public/node/mimes.test.ts b/packages/cli-kit/src/shared/node/mimes.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/mimes.test.ts rename to packages/cli-kit/src/shared/node/mimes.test.ts diff --git a/packages/cli-kit/src/public/node/mimes.ts b/packages/cli-kit/src/shared/node/mimes.ts similarity index 100% rename from packages/cli-kit/src/public/node/mimes.ts rename to packages/cli-kit/src/shared/node/mimes.ts diff --git a/packages/cli-kit/src/public/node/monorail.test.ts b/packages/cli-kit/src/shared/node/monorail.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/monorail.test.ts rename to packages/cli-kit/src/shared/node/monorail.test.ts diff --git a/packages/cli-kit/src/public/node/monorail.ts b/packages/cli-kit/src/shared/node/monorail.ts similarity index 98% rename from packages/cli-kit/src/public/node/monorail.ts rename to packages/cli-kit/src/shared/node/monorail.ts index 10f1ecf1b8c..5d88713a584 100644 --- a/packages/cli-kit/src/public/node/monorail.ts +++ b/packages/cli-kit/src/shared/node/monorail.ts @@ -1,6 +1,6 @@ import {fetch} from './http.js' -import {JsonMap} from '../../private/common/json.js' -import {outputDebug, outputContent, outputToken} from '../../public/node/output.js' +import {outputDebug, outputContent, outputToken} from './output.js' +import {JsonMap} from '../common/internal/json.js' import {DeepRequired} from '../common/ts/deep-required.js' export {DeepRequired} diff --git a/packages/cli-kit/src/public/node/multiple-installation-warning.ts b/packages/cli-kit/src/shared/node/multiple-installation-warning.ts similarity index 96% rename from packages/cli-kit/src/public/node/multiple-installation-warning.ts rename to packages/cli-kit/src/shared/node/multiple-installation-warning.ts index 4e6e72e345e..2c66429d9fc 100644 --- a/packages/cli-kit/src/public/node/multiple-installation-warning.ts +++ b/packages/cli-kit/src/shared/node/multiple-installation-warning.ts @@ -2,8 +2,8 @@ import {jsonOutputEnabled} from './environment.js' import {currentProcessIsGlobal} from './is-global.js' import {renderInfo} from './ui.js' import {globalCLIVersion, localCLIVersion} from './version.js' +import {runAtMinimumInterval} from './internal/conf-store.js' import {CLI_KIT_VERSION} from '../common/version.js' -import {runAtMinimumInterval} from '../../private/node/conf-store.js' /** * Shows a warning if there are two Shopify CLI installations found (global and local). diff --git a/packages/cli-kit/src/public/node/node-package-manager.test.ts b/packages/cli-kit/src/shared/node/node-package-manager.test.ts similarity index 99% rename from packages/cli-kit/src/public/node/node-package-manager.test.ts rename to packages/cli-kit/src/shared/node/node-package-manager.test.ts index cbd5b629c96..a00ec4134fc 100644 --- a/packages/cli-kit/src/public/node/node-package-manager.test.ts +++ b/packages/cli-kit/src/shared/node/node-package-manager.test.ts @@ -25,14 +25,14 @@ import {captureOutput, exec} from './system.js' import {inTemporaryDirectory, mkdir, touchFile, writeFile} from './fs.js' import {joinPath, dirname, normalizePath} from './path.js' import {inferPackageManagerForGlobalCLI} from './is-global.js' -import {cacheClear} from '../../private/node/conf-store.js' +import {cacheClear} from './internal/conf-store.js' import latestVersion from 'latest-version' import {vi, describe, test, expect, beforeEach, afterEach} from 'vitest' vi.mock('./version.js') vi.mock('./system.js') vi.mock('latest-version') -vi.mock('./is-global') +vi.mock('./is-global.js') const mockedExec = vi.mocked(exec) const mockedCaptureOutput = vi.mocked(captureOutput) diff --git a/packages/cli-kit/src/public/node/node-package-manager.ts b/packages/cli-kit/src/shared/node/node-package-manager.ts similarity index 99% rename from packages/cli-kit/src/public/node/node-package-manager.ts rename to packages/cli-kit/src/shared/node/node-package-manager.ts index 5aa52ef72aa..4eaf9b7531c 100644 --- a/packages/cli-kit/src/public/node/node-package-manager.ts +++ b/packages/cli-kit/src/shared/node/node-package-manager.ts @@ -5,8 +5,8 @@ import {fileExists, readFile, writeFile, findPathUp, glob} from './fs.js' import {dirname, joinPath} from './path.js' import {runWithTimer} from './metadata.js' import {inferPackageManagerForGlobalCLI} from './is-global.js' -import {outputToken, outputContent, outputDebug} from '../../public/node/output.js' -import {PackageVersionKey, cacheRetrieve, cacheRetrieveOrRepopulate} from '../../private/node/conf-store.js' +import {outputToken, outputContent, outputDebug} from './output.js' +import {PackageVersionKey, cacheRetrieve, cacheRetrieveOrRepopulate} from './internal/conf-store.js' import {parseJSON} from '../common/json.js' import latestVersion from 'latest-version' import {SemVer, satisfies as semverSatisfies} from 'semver' diff --git a/packages/cli-kit/src/public/node/notifications-system.test.ts b/packages/cli-kit/src/shared/node/notifications-system.test.ts similarity index 99% rename from packages/cli-kit/src/public/node/notifications-system.test.ts rename to packages/cli-kit/src/shared/node/notifications-system.test.ts index 1eefbe57a37..6cc09e6b1c1 100644 --- a/packages/cli-kit/src/public/node/notifications-system.test.ts +++ b/packages/cli-kit/src/shared/node/notifications-system.test.ts @@ -7,11 +7,11 @@ import { import {renderError, renderInfo, renderWarning} from './ui.js' import {sniffForJson} from './path.js' import {exec} from './system.js' -import {cacheRetrieve} from '../../private/node/conf-store.js' +import {cacheRetrieve} from './internal/conf-store.js' import {afterEach, describe, expect, test, vi} from 'vitest' vi.mock('./ui.js') -vi.mock('../../private/node/conf-store.js') +vi.mock('./internal/conf-store.js') vi.mock('./path.js') vi.mock('./system.js') diff --git a/packages/cli-kit/src/public/node/notifications-system.ts b/packages/cli-kit/src/shared/node/notifications-system.ts similarity index 99% rename from packages/cli-kit/src/public/node/notifications-system.ts rename to packages/cli-kit/src/shared/node/notifications-system.ts index d9eade1f1cb..fe07b6692f7 100644 --- a/packages/cli-kit/src/public/node/notifications-system.ts +++ b/packages/cli-kit/src/shared/node/notifications-system.ts @@ -8,8 +8,8 @@ import {isTruthy} from './context/utilities.js' import {exec} from './system.js' import {jsonOutputEnabled} from './environment.js' import {fetch} from './http.js' +import {NotificationKey, NotificationsKey, cacheRetrieve, cacheStore} from './internal/conf-store.js' import {CLI_KIT_VERSION} from '../common/version.js' -import {NotificationKey, NotificationsKey, cacheRetrieve, cacheStore} from '../../private/node/conf-store.js' const URL = 'https://cdn.shopify.com/static/cli/notifications.json' const EMPTY_CACHE_MESSAGE = 'Cache is empty' diff --git a/packages/cli-kit/src/public/node/os.test.ts b/packages/cli-kit/src/shared/node/os.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/os.test.ts rename to packages/cli-kit/src/shared/node/os.test.ts diff --git a/packages/cli-kit/src/public/node/os.ts b/packages/cli-kit/src/shared/node/os.ts similarity index 97% rename from packages/cli-kit/src/public/node/os.ts rename to packages/cli-kit/src/shared/node/os.ts index a05fbf6e9e7..5c84c96964a 100644 --- a/packages/cli-kit/src/public/node/os.ts +++ b/packages/cli-kit/src/shared/node/os.ts @@ -1,4 +1,4 @@ -import {outputDebug, outputContent} from '../../public/node/output.js' +import {outputDebug, outputContent} from './output.js' import {execa} from 'execa' import {userInfo as osUserInfo} from 'os' diff --git a/packages/cli-kit/src/public/node/output.test.ts b/packages/cli-kit/src/shared/node/output.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/output.test.ts rename to packages/cli-kit/src/shared/node/output.test.ts diff --git a/packages/cli-kit/src/public/node/output.ts b/packages/cli-kit/src/shared/node/output.ts similarity index 98% rename from packages/cli-kit/src/public/node/output.ts rename to packages/cli-kit/src/shared/node/output.ts index db95c2ebd14..b81d63a14cd 100644 --- a/packages/cli-kit/src/public/node/output.ts +++ b/packages/cli-kit/src/shared/node/output.ts @@ -18,9 +18,9 @@ import { PathContentToken, RawContentToken, SubHeadingContentToken, -} from '../../private/node/content-tokens.js' -import {tokenItemToString} from '../../private/node/ui/components/TokenizedText.js' -import {consoleLog, consoleWarn, output} from '../../private/node/output.js' +} from './internal/content-tokens.js' +import {consoleLog, consoleWarn, output} from './internal/output.js' +import {tokenItemToString} from '../ui/components/TokenizedText.js' import stripAnsi from 'strip-ansi' import {Writable} from 'stream' import type {Change} from 'diff' diff --git a/packages/cli-kit/src/public/node/path.test.ts b/packages/cli-kit/src/shared/node/path.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/path.test.ts rename to packages/cli-kit/src/shared/node/path.test.ts diff --git a/packages/cli-kit/src/public/node/path.ts b/packages/cli-kit/src/shared/node/path.ts similarity index 100% rename from packages/cli-kit/src/public/node/path.ts rename to packages/cli-kit/src/shared/node/path.ts diff --git a/packages/cli-kit/src/public/node/plugins.test.ts b/packages/cli-kit/src/shared/node/plugins.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/plugins.test.ts rename to packages/cli-kit/src/shared/node/plugins.test.ts diff --git a/packages/cli-kit/src/public/node/plugins.ts b/packages/cli-kit/src/shared/node/plugins.ts similarity index 98% rename from packages/cli-kit/src/public/node/plugins.ts rename to packages/cli-kit/src/shared/node/plugins.ts index d8752d2617a..0af40d180b0 100644 --- a/packages/cli-kit/src/public/node/plugins.ts +++ b/packages/cli-kit/src/shared/node/plugins.ts @@ -2,7 +2,7 @@ import {HookReturnPerTunnelPlugin} from './plugins/tunnel.js' import {MonorailEventPublic, MonorailEventSensitive} from './monorail.js' import {getArrayContainsDuplicates, getArrayRejectingUndefined} from '../common/array.js' import {PickByPrefix} from '../common/ts/pick-by-prefix.js' -import {JsonMap} from '../../private/common/json.js' +import {JsonMap} from '../common/internal/json.js' import {Config, Interfaces} from '@oclif/core' /** diff --git a/packages/cli-kit/src/public/node/plugins/multiple-installation-warning.test.ts b/packages/cli-kit/src/shared/node/plugins/multiple-installation-warning.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/plugins/multiple-installation-warning.test.ts rename to packages/cli-kit/src/shared/node/plugins/multiple-installation-warning.test.ts diff --git a/packages/cli-kit/src/public/node/plugins/tunnel.test.ts b/packages/cli-kit/src/shared/node/plugins/tunnel.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/plugins/tunnel.test.ts rename to packages/cli-kit/src/shared/node/plugins/tunnel.test.ts diff --git a/packages/cli-kit/src/public/node/plugins/tunnel.ts b/packages/cli-kit/src/shared/node/plugins/tunnel.ts similarity index 100% rename from packages/cli-kit/src/public/node/plugins/tunnel.ts rename to packages/cli-kit/src/shared/node/plugins/tunnel.ts diff --git a/packages/cli-kit/src/public/node/promises.ts b/packages/cli-kit/src/shared/node/promises.ts similarity index 100% rename from packages/cli-kit/src/public/node/promises.ts rename to packages/cli-kit/src/shared/node/promises.ts diff --git a/packages/cli-kit/src/public/node/result.test.ts b/packages/cli-kit/src/shared/node/result.test.ts similarity index 97% rename from packages/cli-kit/src/public/node/result.test.ts rename to packages/cli-kit/src/shared/node/result.test.ts index 89428e0b749..67486603925 100644 --- a/packages/cli-kit/src/public/node/result.test.ts +++ b/packages/cli-kit/src/shared/node/result.test.ts @@ -1,6 +1,6 @@ import {err, ok} from './result.js' import {mockAndCaptureOutput} from './testing/output.js' -import {outputSuccess} from '../../public/node/output.js' +import {outputSuccess} from './output.js' import {describe, expect, test} from 'vitest' describe('ok', () => { diff --git a/packages/cli-kit/src/public/node/result.ts b/packages/cli-kit/src/shared/node/result.ts similarity index 100% rename from packages/cli-kit/src/public/node/result.ts rename to packages/cli-kit/src/shared/node/result.ts diff --git a/packages/cli-kit/src/public/node/schema.test.ts b/packages/cli-kit/src/shared/node/schema.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/schema.test.ts rename to packages/cli-kit/src/shared/node/schema.test.ts diff --git a/packages/cli-kit/src/public/node/schema.ts b/packages/cli-kit/src/shared/node/schema.ts similarity index 100% rename from packages/cli-kit/src/public/node/schema.ts rename to packages/cli-kit/src/shared/node/schema.ts diff --git a/packages/cli-kit/src/public/node/serial-batch-processor.test.ts b/packages/cli-kit/src/shared/node/serial-batch-processor.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/serial-batch-processor.test.ts rename to packages/cli-kit/src/shared/node/serial-batch-processor.test.ts diff --git a/packages/cli-kit/src/public/node/serial-batch-processor.ts b/packages/cli-kit/src/shared/node/serial-batch-processor.ts similarity index 100% rename from packages/cli-kit/src/public/node/serial-batch-processor.ts rename to packages/cli-kit/src/shared/node/serial-batch-processor.ts diff --git a/packages/cli-kit/src/public/node/system.test.ts b/packages/cli-kit/src/shared/node/system.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/system.test.ts rename to packages/cli-kit/src/shared/node/system.test.ts diff --git a/packages/cli-kit/src/public/node/system.ts b/packages/cli-kit/src/shared/node/system.ts similarity index 99% rename from packages/cli-kit/src/public/node/system.ts rename to packages/cli-kit/src/shared/node/system.ts index b4750c3b076..e8dee40bdce 100644 --- a/packages/cli-kit/src/public/node/system.ts +++ b/packages/cli-kit/src/shared/node/system.ts @@ -5,7 +5,7 @@ import {treeKill} from './tree-kill.js' import {isTruthy} from './context/utilities.js' import {renderWarning} from './ui.js' import {platformAndArch} from './os.js' -import {shouldDisplayColors, outputDebug} from '../../public/node/output.js' +import {shouldDisplayColors, outputDebug} from './output.js' import {execa, execaCommand, ExecaChildProcess} from 'execa' import which from 'which' import {delimiter} from 'pathe' diff --git a/packages/cli-kit/src/public/node/tcp.test.ts b/packages/cli-kit/src/shared/node/tcp.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/tcp.test.ts rename to packages/cli-kit/src/shared/node/tcp.test.ts diff --git a/packages/cli-kit/src/public/node/tcp.ts b/packages/cli-kit/src/shared/node/tcp.ts similarity index 97% rename from packages/cli-kit/src/public/node/tcp.ts rename to packages/cli-kit/src/shared/node/tcp.ts index 81f9f9f23e7..86d05ec552e 100644 --- a/packages/cli-kit/src/public/node/tcp.ts +++ b/packages/cli-kit/src/shared/node/tcp.ts @@ -1,6 +1,6 @@ import {sleep} from './system.js' import {AbortError} from './error.js' -import {outputDebug, outputContent, outputToken} from '../../public/node/output.js' +import {outputDebug, outputContent, outputToken} from './output.js' import * as port from 'get-port-please' interface GetTCPPortOptions { diff --git a/packages/cli-kit/src/public/node/testing/output.ts b/packages/cli-kit/src/shared/node/testing/output.ts similarity index 91% rename from packages/cli-kit/src/public/node/testing/output.ts rename to packages/cli-kit/src/shared/node/testing/output.ts index b22c4fc3eed..75fd042d41a 100644 --- a/packages/cli-kit/src/public/node/testing/output.ts +++ b/packages/cli-kit/src/shared/node/testing/output.ts @@ -1,4 +1,4 @@ -import {collectedLogs, clearCollectedLogs} from '../../../public/node/output.js' +import {collectedLogs, clearCollectedLogs} from '../output.js' interface OutputMock { output: () => string diff --git a/packages/cli-kit/src/public/node/testing/test-with-temp-dir.ts b/packages/cli-kit/src/shared/node/testing/test-with-temp-dir.ts similarity index 100% rename from packages/cli-kit/src/public/node/testing/test-with-temp-dir.ts rename to packages/cli-kit/src/shared/node/testing/test-with-temp-dir.ts diff --git a/packages/cli-kit/src/public/node/testing/ui.ts b/packages/cli-kit/src/shared/node/testing/ui.ts similarity index 79% rename from packages/cli-kit/src/public/node/testing/ui.ts rename to packages/cli-kit/src/shared/node/testing/ui.ts index f471a025755..3ce832b790b 100644 --- a/packages/cli-kit/src/public/node/testing/ui.ts +++ b/packages/cli-kit/src/shared/node/testing/ui.ts @@ -7,4 +7,4 @@ export { sendInputAndWait, sendInputAndWaitForChange, sendInputAndWaitForContent, -} from '../../../private/node/testing/ui.js' +} from '../../ui/testing.js' diff --git a/packages/cli-kit/src/public/node/toml.test.ts b/packages/cli-kit/src/shared/node/toml.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/toml.test.ts rename to packages/cli-kit/src/shared/node/toml.test.ts diff --git a/packages/cli-kit/src/public/node/toml.ts b/packages/cli-kit/src/shared/node/toml.ts similarity index 93% rename from packages/cli-kit/src/public/node/toml.ts rename to packages/cli-kit/src/shared/node/toml.ts index ecc00e9204f..a507bb1dabf 100644 --- a/packages/cli-kit/src/public/node/toml.ts +++ b/packages/cli-kit/src/shared/node/toml.ts @@ -1,4 +1,4 @@ -import {JsonMap} from '../../private/common/json.js' +import {JsonMap} from '../common/internal/json.js' import * as toml from '@iarna/toml' export type JsonMapType = JsonMap diff --git a/packages/cli-kit/src/public/node/tree-kill.ts b/packages/cli-kit/src/shared/node/tree-kill.ts similarity index 99% rename from packages/cli-kit/src/public/node/tree-kill.ts rename to packages/cli-kit/src/shared/node/tree-kill.ts index 021ffb398e7..f882af27f97 100644 --- a/packages/cli-kit/src/public/node/tree-kill.ts +++ b/packages/cli-kit/src/shared/node/tree-kill.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ /* eslint-disable @typescript-eslint/ban-ts-comment */ -/* eslint-disable jsdoc/require-throws */ + /* eslint-disable no-restricted-imports */ import {outputDebug} from './output.js' diff --git a/packages/cli-kit/src/public/node/ui.test.ts b/packages/cli-kit/src/shared/node/ui.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/ui.test.ts rename to packages/cli-kit/src/shared/node/ui.test.ts diff --git a/packages/cli-kit/src/public/node/ui.tsx b/packages/cli-kit/src/shared/node/ui.tsx similarity index 92% rename from packages/cli-kit/src/public/node/ui.tsx rename to packages/cli-kit/src/shared/node/ui.tsx index 7f234a77f9c..074e7930998 100644 --- a/packages/cli-kit/src/public/node/ui.tsx +++ b/packages/cli-kit/src/shared/node/ui.tsx @@ -5,32 +5,25 @@ import {outputContent, outputDebug, outputToken, TokenizedString} from './output import {terminalSupportsPrompting} from './system.js' import {AbortController} from './abort.js' import {runWithTimer} from './metadata.js' -import {ConcurrentOutput, ConcurrentOutputProps} from '../../private/node/ui/components/ConcurrentOutput.js' -import {handleCtrlC, render, renderOnce} from '../../private/node/ui.js' -import {alert, AlertOptions} from '../../private/node/ui/alert.js' -import {CustomSection} from '../../private/node/ui/components/Alert.js' -import {FatalError} from '../../private/node/ui/components/FatalError.js' -import ScalarDict from '../../private/node/ui/components/Table/ScalarDict.js' -import {Table, TableColumn, TableProps} from '../../private/node/ui/components/Table/Table.js' -import { - Token, - tokenItemToString, - InlineToken, - LinkToken, - ListToken, - TokenItem, -} from '../../private/node/ui/components/TokenizedText.js' +import {ConcurrentOutput, ConcurrentOutputProps} from '../ui/components/ConcurrentOutput.js' +import {handleCtrlC, render, renderOnce} from '../ui/ui.js' +import {alert, AlertOptions} from '../ui/alert.js' +import {CustomSection} from '../ui/components/Alert.js' +import {FatalError} from '../ui/components/FatalError.js' +import ScalarDict from '../ui/components/Table/ScalarDict.js' +import {Table, TableColumn, TableProps} from '../ui/components/Table/Table.js' +import {Token, tokenItemToString, InlineToken, LinkToken, ListToken, TokenItem} from '../ui/components/TokenizedText.js' import { DangerousConfirmationPrompt, DangerousConfirmationPromptProps, -} from '../../private/node/ui/components/DangerousConfirmationPrompt.js' -import {SelectPrompt, SelectPromptProps} from '../../private/node/ui/components/SelectPrompt.js' -import {Tasks, Task} from '../../private/node/ui/components/Tasks.js' -import {TextPrompt, TextPromptProps} from '../../private/node/ui/components/TextPrompt.js' -import {AutocompletePromptProps, AutocompletePrompt} from '../../private/node/ui/components/AutocompletePrompt.js' -import {InfoTableSection} from '../../private/node/ui/components/Prompts/InfoTable.js' -import {InfoMessageProps} from '../../private/node/ui/components/Prompts/InfoMessage.js' -import {SingleTask} from '../../private/node/ui/components/SingleTask.js' +} from '../ui/components/DangerousConfirmationPrompt.js' +import {SelectPrompt, SelectPromptProps} from '../ui/components/SelectPrompt.js' +import {Tasks, Task} from '../ui/components/Tasks.js' +import {TextPrompt, TextPromptProps} from '../ui/components/TextPrompt.js' +import {AutocompletePromptProps, AutocompletePrompt} from '../ui/components/AutocompletePrompt.js' +import {InfoTableSection} from '../ui/components/Prompts/InfoTable.js' +import {InfoMessageProps} from '../ui/components/Prompts/InfoMessage.js' +import {SingleTask} from '../ui/components/SingleTask.js' import React from 'react' import {Key as InkKey, RenderOptions} from 'ink' @@ -235,7 +228,7 @@ interface RenderFatalErrorOptions { * [1] https://partners.shopify.com/signup * */ -// eslint-disable-next-line max-params + export function renderFatalError(error: Fatal, {renderOptions}: RenderFatalErrorOptions = {}) { return renderOnce(, {logLevel: 'error', renderOptions}) } @@ -276,7 +269,7 @@ export interface RenderSelectPromptOptions extends Omit, * Press ↑↓ arrows to select, enter to confirm. * */ -// eslint-disable-next-line max-params + export async function renderSelectPrompt( {renderOptions, isConfirmationPrompt, ...props}: RenderSelectPromptOptions, uiDebugOptions: UIDebugOptions = defaultUIDebugOptions, @@ -406,7 +399,7 @@ export interface RenderAutocompleteOptions * Press ↑↓ arrows to select, enter to confirm. * */ -// eslint-disable-next-line max-params + export async function renderAutocompletePrompt( {renderOptions, ...props}: RenderAutocompleteOptions, uiDebugOptions: UIDebugOptions = defaultUIDebugOptions, @@ -478,12 +471,11 @@ interface RenderTasksOptions { * ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ * Installing dependencies ... */ -// eslint-disable-next-line max-params + export async function renderTasks( tasks: Task[], {renderOptions, noProgressBar}: RenderTasksOptions = {}, ) { - // eslint-disable-next-line max-params return new Promise((resolve, reject) => { render(, { ...renderOptions, @@ -518,7 +510,6 @@ export async function renderSingleTask({ onAbort, renderOptions, }: RenderSingleTaskOptions): Promise { - // eslint-disable-next-line max-params return new Promise((resolve, reject) => { render(, { ...renderOptions, @@ -539,7 +530,7 @@ export interface RenderTextPromptOptions extends Omit { throwInNonTTY({message: 'Press any key'}, uiDebugOptions) return runWithTimer('cmd_all_timing_prompts_ms')(() => { - // eslint-disable-next-line max-params return new Promise((resolve, reject) => { const handler = (buffer: Buffer) => { stdin.setRawMode(false) @@ -661,7 +651,6 @@ interface ThrowInNonTTYOptions { stdin?: NodeJS.ReadStream } -// eslint-disable-next-line max-params function throwInNonTTY({message, stdin = undefined}: ThrowInNonTTYOptions, uiDebugOptions: UIDebugOptions) { if (isTTY({stdin, uiDebugOptions})) return diff --git a/packages/cli-kit/src/shared/node/ui/components.ts b/packages/cli-kit/src/shared/node/ui/components.ts new file mode 100644 index 00000000000..d988060c070 --- /dev/null +++ b/packages/cli-kit/src/shared/node/ui/components.ts @@ -0,0 +1,8 @@ +export { + ConcurrentOutput, + ConcurrentOutputContext, + useConcurrentOutputContext, +} from '../../ui/components/ConcurrentOutput.js' +export {Alert} from '../../ui/components/Alert.js' +export {Link} from '../../ui/components/Link.js' +export {TabularData} from '../../ui/components/TabularData.js' diff --git a/packages/cli-kit/src/shared/node/ui/hooks.ts b/packages/cli-kit/src/shared/node/ui/hooks.ts new file mode 100644 index 00000000000..9cf84a130d8 --- /dev/null +++ b/packages/cli-kit/src/shared/node/ui/hooks.ts @@ -0,0 +1 @@ +export {default as useAbortSignal} from '../../ui/hooks/use-abort-signal.js' diff --git a/packages/cli-kit/src/public/node/upgrade.test.ts b/packages/cli-kit/src/shared/node/upgrade.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/upgrade.test.ts rename to packages/cli-kit/src/shared/node/upgrade.test.ts diff --git a/packages/cli-kit/src/public/node/upgrade.ts b/packages/cli-kit/src/shared/node/upgrade.ts similarity index 100% rename from packages/cli-kit/src/public/node/upgrade.ts rename to packages/cli-kit/src/shared/node/upgrade.ts diff --git a/packages/cli-kit/src/public/node/version.test.ts b/packages/cli-kit/src/shared/node/version.test.ts similarity index 95% rename from packages/cli-kit/src/public/node/version.test.ts rename to packages/cli-kit/src/shared/node/version.test.ts index 99bced0963f..ce40b36033f 100644 --- a/packages/cli-kit/src/public/node/version.test.ts +++ b/packages/cli-kit/src/shared/node/version.test.ts @@ -1,10 +1,10 @@ import {localCLIVersion, globalCLIVersion, isPreReleaseVersion} from './version.js' -import {inTemporaryDirectory} from '../node/fs.js' -import {captureOutput} from '../node/system.js' +import {inTemporaryDirectory} from './fs.js' +import {captureOutput} from './system.js' import {describe, expect, test, vi} from 'vitest' import which from 'which' -vi.mock('../node/system.js') +vi.mock('./system.js') vi.mock('which') describe('localCLIVersion', () => { diff --git a/packages/cli-kit/src/public/node/version.ts b/packages/cli-kit/src/shared/node/version.ts similarity index 97% rename from packages/cli-kit/src/public/node/version.ts rename to packages/cli-kit/src/shared/node/version.ts index 3c958889471..fa91dfe54d3 100644 --- a/packages/cli-kit/src/public/node/version.ts +++ b/packages/cli-kit/src/shared/node/version.ts @@ -1,4 +1,4 @@ -import {captureOutput} from '../node/system.js' +import {captureOutput} from './system.js' import which from 'which' import {satisfies} from 'semver' /** diff --git a/packages/cli-kit/src/public/node/vscode.test.ts b/packages/cli-kit/src/shared/node/vscode.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/vscode.test.ts rename to packages/cli-kit/src/shared/node/vscode.test.ts diff --git a/packages/cli-kit/src/public/node/vscode.ts b/packages/cli-kit/src/shared/node/vscode.ts similarity index 95% rename from packages/cli-kit/src/public/node/vscode.ts rename to packages/cli-kit/src/shared/node/vscode.ts index 1417e47defe..0962bf9c10f 100644 --- a/packages/cli-kit/src/public/node/vscode.ts +++ b/packages/cli-kit/src/shared/node/vscode.ts @@ -1,6 +1,6 @@ import {fileExists, writeFile, readFile, findPathUp} from './fs.js' import {joinPath, cwd} from './path.js' -import {outputContent, outputToken, outputDebug} from '../../public/node/output.js' +import {outputContent, outputToken, outputDebug} from './output.js' /** * Check if user editor is VS Code. diff --git a/packages/cli-kit/src/private/node/ui/alert.tsx b/packages/cli-kit/src/shared/ui/alert.tsx similarity index 91% rename from packages/cli-kit/src/private/node/ui/alert.tsx rename to packages/cli-kit/src/shared/ui/alert.tsx index 675650c6ae0..b2231c542e9 100644 --- a/packages/cli-kit/src/private/node/ui/alert.tsx +++ b/packages/cli-kit/src/shared/ui/alert.tsx @@ -1,6 +1,6 @@ import {Alert, AlertProps} from './components/Alert.js' -import {renderOnce} from '../ui.js' -import {LogLevel} from '../../../public/node/output.js' +import {renderOnce} from './ui.js' +import {LogLevel} from '../node/output.js' import React from 'react' import {RenderOptions} from 'ink' diff --git a/packages/cli-kit/src/private/node/ui/components/Alert.test.tsx b/packages/cli-kit/src/shared/ui/components/Alert.test.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/Alert.test.tsx rename to packages/cli-kit/src/shared/ui/components/Alert.test.tsx index 18589cb79bb..a8b2fe4264d 100644 --- a/packages/cli-kit/src/private/node/ui/components/Alert.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Alert.test.tsx @@ -1,6 +1,6 @@ import {Alert} from './Alert.js' -import {unstyled} from '../../../../public/node/output.js' -import {render} from '../../testing/ui.js' +import {unstyled} from '../../node/output.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Alert.tsx b/packages/cli-kit/src/shared/ui/components/Alert.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/Alert.tsx rename to packages/cli-kit/src/shared/ui/components/Alert.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/AutocompletePrompt.test.tsx b/packages/cli-kit/src/shared/ui/components/AutocompletePrompt.test.tsx similarity index 99% rename from packages/cli-kit/src/private/node/ui/components/AutocompletePrompt.test.tsx rename to packages/cli-kit/src/shared/ui/components/AutocompletePrompt.test.tsx index 44386351e15..35b8ba786a9 100644 --- a/packages/cli-kit/src/private/node/ui/components/AutocompletePrompt.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/AutocompletePrompt.test.tsx @@ -6,9 +6,9 @@ import { sendInputAndWaitForContent, waitForInputsToBeReady, render, -} from '../../testing/ui.js' -import {Stdout} from '../../ui.js' -import {AbortController} from '../../../../public/node/abort.js' +} from '../testing.js' +import {Stdout} from '../ui.js' +import {AbortController} from '../../node/abort.js' import {beforeEach, describe, expect, test, vi} from 'vitest' import React from 'react' import {useStdout} from 'ink' diff --git a/packages/cli-kit/src/private/node/ui/components/AutocompletePrompt.tsx b/packages/cli-kit/src/shared/ui/components/AutocompletePrompt.tsx similarity index 96% rename from packages/cli-kit/src/private/node/ui/components/AutocompletePrompt.tsx rename to packages/cli-kit/src/shared/ui/components/AutocompletePrompt.tsx index e44394f8aa0..38fa597cd2d 100644 --- a/packages/cli-kit/src/private/node/ui/components/AutocompletePrompt.tsx +++ b/packages/cli-kit/src/shared/ui/components/AutocompletePrompt.tsx @@ -3,8 +3,8 @@ import {InfoTableProps} from './Prompts/InfoTable.js' import {TextInput} from './TextInput.js' import {InfoMessageProps} from './Prompts/InfoMessage.js' import {Message, PromptLayout} from './Prompts/PromptLayout.js' -import {throttle} from '../../../../public/common/function.js' -import {AbortSignal} from '../../../../public/node/abort.js' +import {throttle} from '../../common/function.js' +import {AbortSignal} from '../../node/abort.js' import usePrompt, {PromptState} from '../hooks/use-prompt.js' import React, {ReactElement, useCallback, useEffect, useRef, useState} from 'react' import {Box, useApp} from 'ink' @@ -30,7 +30,6 @@ export interface AutocompletePromptProps { const MIN_NUMBER_OF_ITEMS_FOR_SEARCH = 5 -// eslint-disable-next-line react/function-component-definition function AutocompletePrompt({ message, choices, diff --git a/packages/cli-kit/src/private/node/ui/components/Banner.test.tsx b/packages/cli-kit/src/shared/ui/components/Banner.test.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/Banner.test.tsx rename to packages/cli-kit/src/shared/ui/components/Banner.test.tsx index 9aa12b6b2d0..f084270ea76 100644 --- a/packages/cli-kit/src/private/node/ui/components/Banner.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Banner.test.tsx @@ -1,7 +1,7 @@ import {Banner} from './Banner.js' import {List} from './List.js' -import {render} from '../../testing/ui.js' -import {unstyled} from '../../../../public/node/output.js' +import {render} from '../testing.js' +import {unstyled} from '../../node/output.js' import {describe, expect, test} from 'vitest' import React from 'react' import {Text} from 'ink' diff --git a/packages/cli-kit/src/private/node/ui/components/Banner.tsx b/packages/cli-kit/src/shared/ui/components/Banner.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/Banner.tsx rename to packages/cli-kit/src/shared/ui/components/Banner.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/Command.test.tsx b/packages/cli-kit/src/shared/ui/components/Command.test.tsx similarity index 88% rename from packages/cli-kit/src/private/node/ui/components/Command.test.tsx rename to packages/cli-kit/src/shared/ui/components/Command.test.tsx index c4b7e22cfb8..7e7afb048a6 100644 --- a/packages/cli-kit/src/private/node/ui/components/Command.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Command.test.tsx @@ -1,5 +1,5 @@ import {Command} from './Command.js' -import {render} from '../../testing/ui.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Command.tsx b/packages/cli-kit/src/shared/ui/components/Command.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/Command.tsx rename to packages/cli-kit/src/shared/ui/components/Command.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/ConcurrentOutput.test.tsx b/packages/cli-kit/src/shared/ui/components/ConcurrentOutput.test.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/ConcurrentOutput.test.tsx rename to packages/cli-kit/src/shared/ui/components/ConcurrentOutput.test.tsx index 719c2820dc4..61a8d1c6a63 100644 --- a/packages/cli-kit/src/private/node/ui/components/ConcurrentOutput.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/ConcurrentOutput.test.tsx @@ -1,7 +1,7 @@ import {ConcurrentOutput, useConcurrentOutputContext} from './ConcurrentOutput.js' -import {render} from '../../testing/ui.js' -import {AbortController, AbortSignal} from '../../../../public/node/abort.js' -import {unstyled} from '../../../../public/node/output.js' +import {render} from '../testing.js' +import {AbortController, AbortSignal} from '../../node/abort.js' +import {unstyled} from '../../node/output.js' import React from 'react' import {describe, expect, test} from 'vitest' import {Writable} from 'stream' @@ -104,7 +104,6 @@ describe('ConcurrentOutput', () => { { prefix: '1', action: async (stdout: Writable, _stderr: Writable, _signal: AbortSignal) => { - // eslint-disable-next-line react-hooks/rules-of-hooks useConcurrentOutputContext({stripAnsi: false}, () => { stdout.write(output) }) @@ -131,7 +130,6 @@ describe('ConcurrentOutput', () => { { prefix: '1', action: async (stdout: Writable, _stderr: Writable, _signal: AbortSignal) => { - // eslint-disable-next-line react-hooks/rules-of-hooks useConcurrentOutputContext({outputPrefix: extensionName}, () => { stdout.write('foo bar') }) diff --git a/packages/cli-kit/src/private/node/ui/components/ConcurrentOutput.tsx b/packages/cli-kit/src/shared/ui/components/ConcurrentOutput.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/ConcurrentOutput.tsx rename to packages/cli-kit/src/shared/ui/components/ConcurrentOutput.tsx index da83738b860..02a50c92fb8 100644 --- a/packages/cli-kit/src/private/node/ui/components/ConcurrentOutput.tsx +++ b/packages/cli-kit/src/shared/ui/components/ConcurrentOutput.tsx @@ -1,5 +1,5 @@ -import {OutputProcess} from '../../../../public/node/output.js' -import {AbortSignal} from '../../../../public/node/abort.js' +import {OutputProcess} from '../../node/output.js' +import {AbortSignal} from '../../node/abort.js' import React, {FunctionComponent, useCallback, useEffect, useMemo, useState} from 'react' import {Box, Static, Text, TextProps, useApp} from 'ink' import figures from 'figures' diff --git a/packages/cli-kit/src/private/node/ui/components/DangerousConfirmationPrompt.test.tsx b/packages/cli-kit/src/shared/ui/components/DangerousConfirmationPrompt.test.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/DangerousConfirmationPrompt.test.tsx rename to packages/cli-kit/src/shared/ui/components/DangerousConfirmationPrompt.test.tsx index b265086218c..c5c04bf2f6b 100644 --- a/packages/cli-kit/src/private/node/ui/components/DangerousConfirmationPrompt.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/DangerousConfirmationPrompt.test.tsx @@ -1,6 +1,6 @@ import {DangerousConfirmationPrompt} from './DangerousConfirmationPrompt.js' -import {getLastFrameAfterUnmount, sendInputAndWaitForChange, waitForInputsToBeReady, render} from '../../testing/ui.js' -import {unstyled} from '../../../../public/node/output.js' +import {getLastFrameAfterUnmount, sendInputAndWaitForChange, waitForInputsToBeReady, render} from '../testing.js' +import {unstyled} from '../../node/output.js' import React from 'react' import {describe, expect, test, vi} from 'vitest' diff --git a/packages/cli-kit/src/private/node/ui/components/DangerousConfirmationPrompt.tsx b/packages/cli-kit/src/shared/ui/components/DangerousConfirmationPrompt.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/DangerousConfirmationPrompt.tsx rename to packages/cli-kit/src/shared/ui/components/DangerousConfirmationPrompt.tsx index e09a1853e9a..6cedb066809 100644 --- a/packages/cli-kit/src/private/node/ui/components/DangerousConfirmationPrompt.tsx +++ b/packages/cli-kit/src/shared/ui/components/DangerousConfirmationPrompt.tsx @@ -1,10 +1,10 @@ import {TextInput} from './TextInput.js' import {InlineToken, TokenItem, TokenizedText} from './TokenizedText.js' import {InfoTable, InfoTableProps} from './Prompts/InfoTable.js' -import {handleCtrlC} from '../../ui.js' +import {handleCtrlC} from '../ui.js' import useLayout from '../hooks/use-layout.js' import {messageWithPunctuation} from '../utilities.js' -import {AbortSignal} from '../../../../public/node/abort.js' +import {AbortSignal} from '../../node/abort.js' import useAbortSignal from '../hooks/use-abort-signal.js' import usePrompt, {PromptState} from '../hooks/use-prompt.js' import React, {FunctionComponent, useCallback, useEffect, useState} from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/FatalError.test.tsx b/packages/cli-kit/src/shared/ui/components/FatalError.test.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/FatalError.test.tsx rename to packages/cli-kit/src/shared/ui/components/FatalError.test.tsx index af7b6755be3..eb46e4c5c79 100644 --- a/packages/cli-kit/src/private/node/ui/components/FatalError.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/FatalError.test.tsx @@ -1,7 +1,7 @@ import {FatalError} from './FatalError.js' -import {unstyled} from '../../../../public/node/output.js' -import {AbortError, BugError, ExternalError} from '../../../../public/node/error.js' -import {render} from '../../testing/ui.js' +import {unstyled} from '../../node/output.js' +import {AbortError, BugError, ExternalError} from '../../node/error.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/FatalError.tsx b/packages/cli-kit/src/shared/ui/components/FatalError.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/FatalError.tsx rename to packages/cli-kit/src/shared/ui/components/FatalError.tsx index b632ac0d177..ce550a4c050 100644 --- a/packages/cli-kit/src/private/node/ui/components/FatalError.tsx +++ b/packages/cli-kit/src/shared/ui/components/FatalError.tsx @@ -3,7 +3,7 @@ import {TokenizedText} from './TokenizedText.js' import {Command} from './Command.js' import {List} from './List.js' import {TabularData} from './TabularData.js' -import {BugError, cleanSingleStackTracePath, ExternalError, FatalError as Fatal} from '../../../../public/node/error.js' +import {BugError, cleanSingleStackTracePath, ExternalError, FatalError as Fatal} from '../../node/error.js' import {Box, Text} from 'ink' import React, {FunctionComponent} from 'react' import StackTracey from 'stacktracey' diff --git a/packages/cli-kit/src/private/node/ui/components/FilePath.test.tsx b/packages/cli-kit/src/shared/ui/components/FilePath.test.tsx similarity index 89% rename from packages/cli-kit/src/private/node/ui/components/FilePath.test.tsx rename to packages/cli-kit/src/shared/ui/components/FilePath.test.tsx index 1344ae31f84..fbb3b95d3ce 100644 --- a/packages/cli-kit/src/private/node/ui/components/FilePath.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/FilePath.test.tsx @@ -1,5 +1,5 @@ import {FilePath} from './FilePath.js' -import {render} from '../../testing/ui.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/FilePath.tsx b/packages/cli-kit/src/shared/ui/components/FilePath.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/FilePath.tsx rename to packages/cli-kit/src/shared/ui/components/FilePath.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/Link.test.tsx b/packages/cli-kit/src/shared/ui/components/Link.test.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/Link.test.tsx rename to packages/cli-kit/src/shared/ui/components/Link.test.tsx index 00fb8a8b7c0..5027626ca7d 100644 --- a/packages/cli-kit/src/private/node/ui/components/Link.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Link.test.tsx @@ -1,5 +1,5 @@ import {Link} from './Link.js' -import {render} from '../../testing/ui.js' +import {render} from '../testing.js' import {describe, expect, test, vi} from 'vitest' import React from 'react' import supportsHyperlinks from 'supports-hyperlinks' diff --git a/packages/cli-kit/src/private/node/ui/components/Link.tsx b/packages/cli-kit/src/shared/ui/components/Link.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/Link.tsx rename to packages/cli-kit/src/shared/ui/components/Link.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/List.test.tsx b/packages/cli-kit/src/shared/ui/components/List.test.tsx similarity index 96% rename from packages/cli-kit/src/private/node/ui/components/List.test.tsx rename to packages/cli-kit/src/shared/ui/components/List.test.tsx index 1b91c3950ae..cdfa0382451 100644 --- a/packages/cli-kit/src/private/node/ui/components/List.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/List.test.tsx @@ -1,6 +1,6 @@ import {List} from './List.js' -import {unstyled} from '../../../../public/node/output.js' -import {render} from '../../testing/ui.js' +import {unstyled} from '../../node/output.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/List.tsx b/packages/cli-kit/src/shared/ui/components/List.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/List.tsx rename to packages/cli-kit/src/shared/ui/components/List.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/LoadingBar.test.tsx b/packages/cli-kit/src/shared/ui/components/LoadingBar.test.tsx similarity index 96% rename from packages/cli-kit/src/private/node/ui/components/LoadingBar.test.tsx rename to packages/cli-kit/src/shared/ui/components/LoadingBar.test.tsx index 308871afbf4..ca76d4cd281 100644 --- a/packages/cli-kit/src/private/node/ui/components/LoadingBar.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/LoadingBar.test.tsx @@ -1,13 +1,13 @@ import {LoadingBar} from './LoadingBar.js' -import {render} from '../../testing/ui.js' -import {shouldDisplayColors, unstyled} from '../../../../public/node/output.js' +import {render} from '../testing.js' +import {shouldDisplayColors, unstyled} from '../../node/output.js' import useLayout from '../hooks/use-layout.js' import React from 'react' import {beforeEach, describe, expect, test, vi} from 'vitest' vi.mock('../hooks/use-layout.js') -vi.mock('../../../../public/node/output.js', async () => { - const original: any = await vi.importActual('../../../../public/node/output.js') +vi.mock('../../node/output.js', async () => { + const original: any = await vi.importActual('../../node/output.js') return { ...original, shouldDisplayColors: vi.fn(), diff --git a/packages/cli-kit/src/private/node/ui/components/LoadingBar.tsx b/packages/cli-kit/src/shared/ui/components/LoadingBar.tsx similarity index 92% rename from packages/cli-kit/src/private/node/ui/components/LoadingBar.tsx rename to packages/cli-kit/src/shared/ui/components/LoadingBar.tsx index db0aa496743..3d4f616e348 100644 --- a/packages/cli-kit/src/private/node/ui/components/LoadingBar.tsx +++ b/packages/cli-kit/src/shared/ui/components/LoadingBar.tsx @@ -1,6 +1,6 @@ import {TextAnimation} from './TextAnimation.js' import useLayout from '../hooks/use-layout.js' -import {shouldDisplayColors} from '../../../../public/node/output.js' +import {shouldDisplayColors} from '../../node/output.js' import React from 'react' import {Box, Text} from 'ink' diff --git a/packages/cli-kit/src/private/node/ui/components/Prompts/InfoMessage.test.tsx b/packages/cli-kit/src/shared/ui/components/Prompts/InfoMessage.test.tsx similarity index 93% rename from packages/cli-kit/src/private/node/ui/components/Prompts/InfoMessage.test.tsx rename to packages/cli-kit/src/shared/ui/components/Prompts/InfoMessage.test.tsx index 2363f40d328..a01c03aad63 100644 --- a/packages/cli-kit/src/private/node/ui/components/Prompts/InfoMessage.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Prompts/InfoMessage.test.tsx @@ -1,5 +1,5 @@ import {InfoMessage} from './InfoMessage.js' -import {render} from '../../../testing/ui.js' +import {render} from '../../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Prompts/InfoMessage.tsx b/packages/cli-kit/src/shared/ui/components/Prompts/InfoMessage.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/Prompts/InfoMessage.tsx rename to packages/cli-kit/src/shared/ui/components/Prompts/InfoMessage.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/Prompts/InfoTable.test.tsx b/packages/cli-kit/src/shared/ui/components/Prompts/InfoTable.test.tsx similarity index 94% rename from packages/cli-kit/src/private/node/ui/components/Prompts/InfoTable.test.tsx rename to packages/cli-kit/src/shared/ui/components/Prompts/InfoTable.test.tsx index eddaf80ecb0..7877ad5ffcf 100644 --- a/packages/cli-kit/src/private/node/ui/components/Prompts/InfoTable.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Prompts/InfoTable.test.tsx @@ -1,6 +1,6 @@ import {InfoTable} from './InfoTable.js' -import {unstyled} from '../../../../../public/node/output.js' -import {render} from '../../../testing/ui.js' +import {unstyled} from '../../../node/output.js' +import {render} from '../../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Prompts/InfoTable.tsx b/packages/cli-kit/src/shared/ui/components/Prompts/InfoTable.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/Prompts/InfoTable.tsx rename to packages/cli-kit/src/shared/ui/components/Prompts/InfoTable.tsx index 4670c8cae21..2130f5879f9 100644 --- a/packages/cli-kit/src/private/node/ui/components/Prompts/InfoTable.tsx +++ b/packages/cli-kit/src/shared/ui/components/Prompts/InfoTable.tsx @@ -1,5 +1,5 @@ import {CustomListItem, List} from '../List.js' -import {capitalize} from '../../../../../public/common/string.js' +import {capitalize} from '../../../common/string.js' import {InlineToken, TokenItem, TokenizedText} from '../TokenizedText.js' import {Box, Text, TextProps} from 'ink' import React, {FunctionComponent} from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Prompts/PromptLayout.test.tsx b/packages/cli-kit/src/shared/ui/components/Prompts/PromptLayout.test.tsx similarity index 99% rename from packages/cli-kit/src/private/node/ui/components/Prompts/PromptLayout.test.tsx rename to packages/cli-kit/src/shared/ui/components/Prompts/PromptLayout.test.tsx index 8067ce672c2..de547aef058 100644 --- a/packages/cli-kit/src/private/node/ui/components/Prompts/PromptLayout.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Prompts/PromptLayout.test.tsx @@ -1,5 +1,5 @@ import {PromptLayout} from './PromptLayout.js' -import {render} from '../../../testing/ui.js' +import {render} from '../../testing.js' import {PromptState} from '../../hooks/use-prompt.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Prompts/PromptLayout.tsx b/packages/cli-kit/src/shared/ui/components/Prompts/PromptLayout.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/Prompts/PromptLayout.tsx rename to packages/cli-kit/src/shared/ui/components/Prompts/PromptLayout.tsx index 740b4bafa6d..4f67d995726 100644 --- a/packages/cli-kit/src/private/node/ui/components/Prompts/PromptLayout.tsx +++ b/packages/cli-kit/src/shared/ui/components/Prompts/PromptLayout.tsx @@ -2,7 +2,7 @@ import {InfoMessage, InfoMessageProps} from './InfoMessage.js' import {InfoTable, InfoTableProps} from './InfoTable.js' import {InlineToken, LinkToken, TokenItem, TokenizedText} from '../TokenizedText.js' import {messageWithPunctuation} from '../../utilities.js' -import {AbortSignal} from '../../../../../public/node/abort.js' +import {AbortSignal} from '../../../node/abort.js' import useAbortSignal from '../../hooks/use-abort-signal.js' import {PromptState} from '../../hooks/use-prompt.js' import React, {ReactElement, cloneElement, useCallback, useLayoutEffect, useState} from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Scrollbar.test.tsx b/packages/cli-kit/src/shared/ui/components/Scrollbar.test.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/Scrollbar.test.tsx rename to packages/cli-kit/src/shared/ui/components/Scrollbar.test.tsx index 13f1da50885..ffc6df55ccc 100644 --- a/packages/cli-kit/src/private/node/ui/components/Scrollbar.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Scrollbar.test.tsx @@ -1,5 +1,5 @@ import {Scrollbar} from './Scrollbar.js' -import {render} from '../../testing/ui.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Scrollbar.tsx b/packages/cli-kit/src/shared/ui/components/Scrollbar.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/Scrollbar.tsx rename to packages/cli-kit/src/shared/ui/components/Scrollbar.tsx index 07a94402289..ee09c8b8087 100644 --- a/packages/cli-kit/src/private/node/ui/components/Scrollbar.tsx +++ b/packages/cli-kit/src/shared/ui/components/Scrollbar.tsx @@ -1,4 +1,4 @@ -import {shouldDisplayColors} from '../../../../public/node/output.js' +import {shouldDisplayColors} from '../../node/output.js' import {Box, Text} from 'ink' import React, {FunctionComponent} from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/SelectInput.test.tsx b/packages/cli-kit/src/shared/ui/components/SelectInput.test.tsx similarity index 99% rename from packages/cli-kit/src/private/node/ui/components/SelectInput.test.tsx rename to packages/cli-kit/src/shared/ui/components/SelectInput.test.tsx index d4966ea3ee2..f6f842ed070 100644 --- a/packages/cli-kit/src/private/node/ui/components/SelectInput.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/SelectInput.test.tsx @@ -5,8 +5,8 @@ import { waitForInputsToBeReady, render, getLastFrameAfterUnmount, -} from '../../testing/ui.js' -import {platformAndArch} from '../../../../public/node/os.js' +} from '../testing.js' +import {platformAndArch} from '../../node/os.js' import {describe, expect, test, vi} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/SelectInput.tsx b/packages/cli-kit/src/shared/ui/components/SelectInput.tsx similarity index 96% rename from packages/cli-kit/src/private/node/ui/components/SelectInput.tsx rename to packages/cli-kit/src/shared/ui/components/SelectInput.tsx index 6155d66ab43..e40f6a1c188 100644 --- a/packages/cli-kit/src/private/node/ui/components/SelectInput.tsx +++ b/packages/cli-kit/src/shared/ui/components/SelectInput.tsx @@ -1,7 +1,7 @@ import {Scrollbar} from './Scrollbar.js' import {useSelectState} from '../hooks/use-select-state.js' import useLayout from '../hooks/use-layout.js' -import {handleCtrlC} from '../../ui.js' +import {handleCtrlC} from '../ui.js' import React, {useCallback, forwardRef, useEffect} from 'react' import {Box, Key, useInput, Text, DOMElement} from 'ink' import chalk from 'chalk' @@ -9,9 +9,9 @@ import figures from 'figures' import sortBy from 'lodash/sortBy.js' declare module 'react' { - function forwardRef( - render: (props: P, ref: React.Ref) => React.ReactElement | null, - ): (props: P & React.RefAttributes) => React.ReactElement | null + function forwardRef( + render: (props: TProps, ref: React.Ref) => React.ReactElement | null, + ): (props: TProps & React.RefAttributes) => React.ReactElement | null } export interface SelectInputProps { items: Item[] @@ -80,7 +80,6 @@ interface ItemProps { index: number } -// eslint-disable-next-line react/function-component-definition function Item({ item, previousItem, @@ -132,7 +131,6 @@ function Item({ const MAX_AVAILABLE_LINES = 25 -// eslint-disable-next-line react/function-component-definition function SelectInputInner( { items: rawItems, diff --git a/packages/cli-kit/src/private/node/ui/components/SelectPrompt.test.tsx b/packages/cli-kit/src/shared/ui/components/SelectPrompt.test.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/SelectPrompt.test.tsx rename to packages/cli-kit/src/shared/ui/components/SelectPrompt.test.tsx index d553ee40e7b..567b9f005d4 100644 --- a/packages/cli-kit/src/private/node/ui/components/SelectPrompt.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/SelectPrompt.test.tsx @@ -1,8 +1,8 @@ import {SelectPrompt} from './SelectPrompt.js' -import {getLastFrameAfterUnmount, sendInputAndWaitForChange, waitForInputsToBeReady, render} from '../../testing/ui.js' -import {unstyled} from '../../../../public/node/output.js' -import {Stdout} from '../../ui.js' -import {AbortController} from '../../../../public/node/abort.js' +import {getLastFrameAfterUnmount, sendInputAndWaitForChange, waitForInputsToBeReady, render} from '../testing.js' +import {unstyled} from '../../node/output.js' +import {Stdout} from '../ui.js' +import {AbortController} from '../../node/abort.js' import {beforeEach, describe, expect, test, vi} from 'vitest' import React from 'react' import {useStdout} from 'ink' diff --git a/packages/cli-kit/src/private/node/ui/components/SelectPrompt.tsx b/packages/cli-kit/src/shared/ui/components/SelectPrompt.tsx similarity index 93% rename from packages/cli-kit/src/private/node/ui/components/SelectPrompt.tsx rename to packages/cli-kit/src/shared/ui/components/SelectPrompt.tsx index bbaf35d2ae2..b80ffda3b06 100644 --- a/packages/cli-kit/src/private/node/ui/components/SelectPrompt.tsx +++ b/packages/cli-kit/src/shared/ui/components/SelectPrompt.tsx @@ -2,7 +2,7 @@ import {SelectInput, SelectInputProps, Item as SelectItem} from './SelectInput.j import {InfoTableProps} from './Prompts/InfoTable.js' import {InfoMessageProps} from './Prompts/InfoMessage.js' import {Message, PromptLayout} from './Prompts/PromptLayout.js' -import {AbortSignal} from '../../../../public/node/abort.js' +import {AbortSignal} from '../../node/abort.js' import usePrompt, {PromptState} from '../hooks/use-prompt.js' import React, {ReactElement, useCallback, useEffect} from 'react' import {useApp} from 'ink' @@ -18,7 +18,6 @@ export interface SelectPromptProps { groupOrder?: string[] } -// eslint-disable-next-line react/function-component-definition function SelectPrompt({ message, choices, diff --git a/packages/cli-kit/src/private/node/ui/components/SingleTask.test.tsx b/packages/cli-kit/src/shared/ui/components/SingleTask.test.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/SingleTask.test.tsx rename to packages/cli-kit/src/shared/ui/components/SingleTask.test.tsx index 89c95f0c1f0..306158a20e8 100644 --- a/packages/cli-kit/src/private/node/ui/components/SingleTask.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/SingleTask.test.tsx @@ -1,6 +1,6 @@ import {SingleTask} from './SingleTask.js' -import {render} from '../../testing/ui.js' -import {TokenizedString} from '../../../../public/node/output.js' +import {render} from '../testing.js' +import {TokenizedString} from '../../node/output.js' import React from 'react' import {describe, expect, test} from 'vitest' diff --git a/packages/cli-kit/src/private/node/ui/components/SingleTask.tsx b/packages/cli-kit/src/shared/ui/components/SingleTask.tsx similarity index 92% rename from packages/cli-kit/src/private/node/ui/components/SingleTask.tsx rename to packages/cli-kit/src/shared/ui/components/SingleTask.tsx index 563f4f4001e..061f7d10a41 100644 --- a/packages/cli-kit/src/private/node/ui/components/SingleTask.tsx +++ b/packages/cli-kit/src/shared/ui/components/SingleTask.tsx @@ -1,6 +1,6 @@ import {LoadingBar} from './LoadingBar.js' -import {handleCtrlC} from '../../ui.js' -import {TokenizedString} from '../../../../public/node/output.js' +import {handleCtrlC} from '../ui.js' +import {TokenizedString} from '../../node/output.js' import React, {useEffect, useState} from 'react' import {useApp, useInput, useStdin} from 'ink' diff --git a/packages/cli-kit/src/private/node/ui/components/Subdued.test.tsx b/packages/cli-kit/src/shared/ui/components/Subdued.test.tsx similarity index 87% rename from packages/cli-kit/src/private/node/ui/components/Subdued.test.tsx rename to packages/cli-kit/src/shared/ui/components/Subdued.test.tsx index 59ff6154acd..662632f4be8 100644 --- a/packages/cli-kit/src/private/node/ui/components/Subdued.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Subdued.test.tsx @@ -1,5 +1,5 @@ import {Subdued} from './Subdued.js' -import {render} from '../../testing/ui.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Subdued.tsx b/packages/cli-kit/src/shared/ui/components/Subdued.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/Subdued.tsx rename to packages/cli-kit/src/shared/ui/components/Subdued.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/Table/Column.ts b/packages/cli-kit/src/shared/ui/components/Table/Column.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/Table/Column.ts rename to packages/cli-kit/src/shared/ui/components/Table/Column.ts diff --git a/packages/cli-kit/src/private/node/ui/components/Table/Row.tsx b/packages/cli-kit/src/shared/ui/components/Table/Row.tsx similarity index 95% rename from packages/cli-kit/src/private/node/ui/components/Table/Row.tsx rename to packages/cli-kit/src/shared/ui/components/Table/Row.tsx index 7e64b1cd253..7fb4476257a 100644 --- a/packages/cli-kit/src/private/node/ui/components/Table/Row.tsx +++ b/packages/cli-kit/src/shared/ui/components/Table/Row.tsx @@ -1,6 +1,6 @@ import ScalarDict from './ScalarDict.js' import {Column} from './Column.js' -import {unstyled} from '../../../../../public/node/output.js' +import {unstyled} from '../../../node/output.js' import {Box, Text} from 'ink' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Table/ScalarDict.ts b/packages/cli-kit/src/shared/ui/components/Table/ScalarDict.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/Table/ScalarDict.ts rename to packages/cli-kit/src/shared/ui/components/Table/ScalarDict.ts diff --git a/packages/cli-kit/src/private/node/ui/components/Table/Table.test.tsx b/packages/cli-kit/src/shared/ui/components/Table/Table.test.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/Table/Table.test.tsx rename to packages/cli-kit/src/shared/ui/components/Table/Table.test.tsx index 5ebdca30e2b..28502f74d54 100644 --- a/packages/cli-kit/src/private/node/ui/components/Table/Table.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Table/Table.test.tsx @@ -1,6 +1,6 @@ import {Table, TableColumn} from './Table.js' import ScalarDict from './ScalarDict.js' -import {render} from '../../../testing/ui.js' +import {render} from '../../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Table/Table.tsx b/packages/cli-kit/src/shared/ui/components/Table/Table.tsx similarity index 92% rename from packages/cli-kit/src/private/node/ui/components/Table/Table.tsx rename to packages/cli-kit/src/shared/ui/components/Table/Table.tsx index 175cfb4d9ad..73b6d4f0193 100644 --- a/packages/cli-kit/src/private/node/ui/components/Table/Table.tsx +++ b/packages/cli-kit/src/shared/ui/components/Table/Table.tsx @@ -1,6 +1,6 @@ import ScalarDict from './ScalarDict.js' import {Row} from './Row.js' -import {unstyled} from '../../../../../public/node/output.js' +import {unstyled} from '../../../node/output.js' import React from 'react' import {Box} from 'ink' import {ForegroundColor} from 'chalk' @@ -14,7 +14,6 @@ export interface TableProps { columns: TableColumn } -// eslint-disable-next-line react/function-component-definition function Table({rows, columns: columnsConfiguration}: TableProps) { const columns = Object.entries(columnsConfiguration).map(([key, {header, color}]) => { const headerWidth = String(header || key).length diff --git a/packages/cli-kit/src/private/node/ui/components/TabularData.tsx b/packages/cli-kit/src/shared/ui/components/TabularData.tsx similarity index 94% rename from packages/cli-kit/src/private/node/ui/components/TabularData.tsx rename to packages/cli-kit/src/shared/ui/components/TabularData.tsx index a228308af54..3e04d27630d 100644 --- a/packages/cli-kit/src/private/node/ui/components/TabularData.tsx +++ b/packages/cli-kit/src/shared/ui/components/TabularData.tsx @@ -1,5 +1,5 @@ import {InlineToken, TokenizedText, tokenItemToString} from './TokenizedText.js' -import {unstyled} from '../../../../public/node/output.js' +import {unstyled} from '../../node/output.js' import {Box} from 'ink' import React, {FunctionComponent} from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/Tasks.test.tsx b/packages/cli-kit/src/shared/ui/components/Tasks.test.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/Tasks.test.tsx rename to packages/cli-kit/src/shared/ui/components/Tasks.test.tsx index ab192ca1a45..c54e2e329a9 100644 --- a/packages/cli-kit/src/private/node/ui/components/Tasks.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/Tasks.test.tsx @@ -1,8 +1,8 @@ import {Task, Tasks} from './Tasks.js' -import {getLastFrameAfterUnmount, render} from '../../testing/ui.js' -import {unstyled, TokenizedString} from '../../../../public/node/output.js' -import {AbortController} from '../../../../public/node/abort.js' -import {Stdout} from '../../ui.js' +import {getLastFrameAfterUnmount, render} from '../testing.js' +import {unstyled, TokenizedString} from '../../node/output.js' +import {AbortController} from '../../node/abort.js' +import {Stdout} from '../ui.js' import React from 'react' import {beforeEach, describe, expect, test, vi} from 'vitest' import {useStdout} from 'ink' diff --git a/packages/cli-kit/src/private/node/ui/components/Tasks.tsx b/packages/cli-kit/src/shared/ui/components/Tasks.tsx similarity index 92% rename from packages/cli-kit/src/private/node/ui/components/Tasks.tsx rename to packages/cli-kit/src/shared/ui/components/Tasks.tsx index cb5153d1793..2dcc8b5e7ad 100644 --- a/packages/cli-kit/src/private/node/ui/components/Tasks.tsx +++ b/packages/cli-kit/src/shared/ui/components/Tasks.tsx @@ -1,10 +1,10 @@ import {LoadingBar} from './LoadingBar.js' import useAsyncAndUnmount from '../hooks/use-async-and-unmount.js' -import {isUnitTest} from '../../../../public/node/context/local.js' -import {AbortSignal} from '../../../../public/node/abort.js' +import {isUnitTest} from '../../node/context/local.js' +import {AbortSignal} from '../../node/abort.js' import useAbortSignal from '../hooks/use-abort-signal.js' import {useExitOnCtrlC} from '../hooks/use-exit-on-ctrl-c.js' -import {TokenizedString} from '../../../../public/node/output.js' +import {TokenizedString} from '../../node/output.js' import React, {useRef, useState} from 'react' export interface Task { @@ -58,7 +58,6 @@ async function runTask(task: Task, ctx: TContext) { const noop = () => {} -// eslint-disable-next-line react/function-component-definition function Tasks({ tasks, silent = isUnitTest(), diff --git a/packages/cli-kit/src/private/node/ui/components/TextAnimation.test.tsx b/packages/cli-kit/src/shared/ui/components/TextAnimation.test.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/TextAnimation.test.tsx rename to packages/cli-kit/src/shared/ui/components/TextAnimation.test.tsx index 8b2ca4ac910..a05fbc3ae4d 100644 --- a/packages/cli-kit/src/private/node/ui/components/TextAnimation.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/TextAnimation.test.tsx @@ -1,6 +1,6 @@ import {TextAnimation} from './TextAnimation.js' -import {render} from '../../testing/ui.js' -import {Stdout} from '../../ui.js' +import {render} from '../testing.js' +import {Stdout} from '../ui.js' import React from 'react' import {beforeEach, describe, expect, test, vi} from 'vitest' import {useStdout} from 'ink' diff --git a/packages/cli-kit/src/private/node/ui/components/TextAnimation.tsx b/packages/cli-kit/src/shared/ui/components/TextAnimation.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/TextAnimation.tsx rename to packages/cli-kit/src/shared/ui/components/TextAnimation.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/TextInput.test.tsx b/packages/cli-kit/src/shared/ui/components/TextInput.test.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/TextInput.test.tsx rename to packages/cli-kit/src/shared/ui/components/TextInput.test.tsx index 2f7e8a48a6d..778db79d1b6 100644 --- a/packages/cli-kit/src/private/node/ui/components/TextInput.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/TextInput.test.tsx @@ -1,11 +1,5 @@ import {TextInput} from './TextInput.js' -import { - sendInputAndWait, - sendInputAndWaitForChange, - waitForChange, - waitForInputsToBeReady, - render, -} from '../../testing/ui.js' +import {sendInputAndWait, sendInputAndWaitForChange, waitForChange, waitForInputsToBeReady, render} from '../testing.js' import React, {useState} from 'react' import {describe, test, expect, vi} from 'vitest' diff --git a/packages/cli-kit/src/private/node/ui/components/TextInput.tsx b/packages/cli-kit/src/shared/ui/components/TextInput.tsx similarity index 98% rename from packages/cli-kit/src/private/node/ui/components/TextInput.tsx rename to packages/cli-kit/src/shared/ui/components/TextInput.tsx index 95cee6c85d9..9072a8825b7 100644 --- a/packages/cli-kit/src/private/node/ui/components/TextInput.tsx +++ b/packages/cli-kit/src/shared/ui/components/TextInput.tsx @@ -1,5 +1,5 @@ /* eslint-disable no-nested-ternary */ -import {shouldDisplayColors} from '../../../../public/node/output.js' +import {shouldDisplayColors} from '../../node/output.js' import React, {useEffect, useState} from 'react' import {Text, useInput} from 'ink' import chalk from 'chalk' diff --git a/packages/cli-kit/src/private/node/ui/components/TextPrompt.test.tsx b/packages/cli-kit/src/shared/ui/components/TextPrompt.test.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/TextPrompt.test.tsx rename to packages/cli-kit/src/shared/ui/components/TextPrompt.test.tsx index da4804114e3..402da897bc5 100644 --- a/packages/cli-kit/src/private/node/ui/components/TextPrompt.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/TextPrompt.test.tsx @@ -1,8 +1,8 @@ import {TextPrompt} from './TextPrompt.js' -import {getLastFrameAfterUnmount, sendInputAndWaitForChange, waitForInputsToBeReady, render} from '../../testing/ui.js' -import {unstyled} from '../../../../public/node/output.js' -import {AbortController} from '../../../../public/node/abort.js' -import colors from '../../../../public/node/colors.js' +import {getLastFrameAfterUnmount, sendInputAndWaitForChange, waitForInputsToBeReady, render} from '../testing.js' +import {unstyled} from '../../node/output.js' +import {AbortController} from '../../node/abort.js' +import colors from '../../node/colors.js' import React from 'react' import {describe, expect, test, vi} from 'vitest' diff --git a/packages/cli-kit/src/private/node/ui/components/TextPrompt.tsx b/packages/cli-kit/src/shared/ui/components/TextPrompt.tsx similarity index 97% rename from packages/cli-kit/src/private/node/ui/components/TextPrompt.tsx rename to packages/cli-kit/src/shared/ui/components/TextPrompt.tsx index a3cb482e38b..4ec70feac5d 100644 --- a/packages/cli-kit/src/private/node/ui/components/TextPrompt.tsx +++ b/packages/cli-kit/src/shared/ui/components/TextPrompt.tsx @@ -1,9 +1,9 @@ import {TextInput} from './TextInput.js' import {InlineToken, TokenItem, TokenizedText} from './TokenizedText.js' -import {handleCtrlC} from '../../ui.js' +import {handleCtrlC} from '../ui.js' import useLayout from '../hooks/use-layout.js' import {messageWithPunctuation} from '../utilities.js' -import {AbortSignal} from '../../../../public/node/abort.js' +import {AbortSignal} from '../../node/abort.js' import useAbortSignal from '../hooks/use-abort-signal.js' import usePrompt, {PromptState} from '../hooks/use-prompt.js' import React, {FunctionComponent, useCallback, useEffect, useState} from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/TokenizedText.test.tsx b/packages/cli-kit/src/shared/ui/components/TokenizedText.test.tsx similarity index 94% rename from packages/cli-kit/src/private/node/ui/components/TokenizedText.test.tsx rename to packages/cli-kit/src/shared/ui/components/TokenizedText.test.tsx index f0dfefc46e0..31205899b0e 100644 --- a/packages/cli-kit/src/private/node/ui/components/TokenizedText.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/TokenizedText.test.tsx @@ -1,6 +1,6 @@ import {tokenItemToString, TokenizedText} from './TokenizedText.js' -import {unstyled} from '../../../../public/node/output.js' -import {render} from '../../testing/ui.js' +import {unstyled} from '../../node/output.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/TokenizedText.tsx b/packages/cli-kit/src/shared/ui/components/TokenizedText.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/TokenizedText.tsx rename to packages/cli-kit/src/shared/ui/components/TokenizedText.tsx diff --git a/packages/cli-kit/src/private/node/ui/components/UserInput.test.tsx b/packages/cli-kit/src/shared/ui/components/UserInput.test.tsx similarity index 88% rename from packages/cli-kit/src/private/node/ui/components/UserInput.test.tsx rename to packages/cli-kit/src/shared/ui/components/UserInput.test.tsx index 35144a251e4..e3b920dd7a7 100644 --- a/packages/cli-kit/src/private/node/ui/components/UserInput.test.tsx +++ b/packages/cli-kit/src/shared/ui/components/UserInput.test.tsx @@ -1,5 +1,5 @@ import {UserInput} from './UserInput.js' -import {render} from '../../testing/ui.js' +import {render} from '../testing.js' import {describe, expect, test} from 'vitest' import React from 'react' diff --git a/packages/cli-kit/src/private/node/ui/components/UserInput.tsx b/packages/cli-kit/src/shared/ui/components/UserInput.tsx similarity index 100% rename from packages/cli-kit/src/private/node/ui/components/UserInput.tsx rename to packages/cli-kit/src/shared/ui/components/UserInput.tsx diff --git a/packages/cli-kit/src/private/node/ui/contexts/LinksContext.ts b/packages/cli-kit/src/shared/ui/contexts/LinksContext.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/contexts/LinksContext.ts rename to packages/cli-kit/src/shared/ui/contexts/LinksContext.ts diff --git a/packages/cli-kit/src/private/node/ui/hooks/use-abort-signal.ts b/packages/cli-kit/src/shared/ui/hooks/use-abort-signal.ts similarity index 92% rename from packages/cli-kit/src/private/node/ui/hooks/use-abort-signal.ts rename to packages/cli-kit/src/shared/ui/hooks/use-abort-signal.ts index 64e908ef34a..2a655b51fc9 100644 --- a/packages/cli-kit/src/private/node/ui/hooks/use-abort-signal.ts +++ b/packages/cli-kit/src/shared/ui/hooks/use-abort-signal.ts @@ -1,4 +1,4 @@ -import {AbortSignal} from '../../../../public/node/abort.js' +import {AbortSignal} from '../../node/abort.js' import {useApp} from 'ink' import {useLayoutEffect, useState} from 'react' diff --git a/packages/cli-kit/src/private/node/ui/hooks/use-async-and-unmount.ts b/packages/cli-kit/src/shared/ui/hooks/use-async-and-unmount.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/hooks/use-async-and-unmount.ts rename to packages/cli-kit/src/shared/ui/hooks/use-async-and-unmount.ts diff --git a/packages/cli-kit/src/private/node/ui/hooks/use-exit-on-ctrl-c.test.ts b/packages/cli-kit/src/shared/ui/hooks/use-exit-on-ctrl-c.test.ts similarity index 97% rename from packages/cli-kit/src/private/node/ui/hooks/use-exit-on-ctrl-c.test.ts rename to packages/cli-kit/src/shared/ui/hooks/use-exit-on-ctrl-c.test.ts index bea454f7c77..ff763e3d4bf 100644 --- a/packages/cli-kit/src/private/node/ui/hooks/use-exit-on-ctrl-c.test.ts +++ b/packages/cli-kit/src/shared/ui/hooks/use-exit-on-ctrl-c.test.ts @@ -1,5 +1,5 @@ import {useExitOnCtrlC} from './use-exit-on-ctrl-c.js' -import {handleCtrlC} from '../../ui.js' +import {handleCtrlC} from '../ui.js' import {describe, expect, test, vi} from 'vitest' import {useInput, useStdin} from 'ink' @@ -8,7 +8,7 @@ vi.mock('ink', () => ({ useStdin: vi.fn(), })) -vi.mock('../../ui.js', () => ({ +vi.mock('../ui.js', () => ({ handleCtrlC: vi.fn(), })) diff --git a/packages/cli-kit/src/private/node/ui/hooks/use-exit-on-ctrl-c.ts b/packages/cli-kit/src/shared/ui/hooks/use-exit-on-ctrl-c.ts similarity index 90% rename from packages/cli-kit/src/private/node/ui/hooks/use-exit-on-ctrl-c.ts rename to packages/cli-kit/src/shared/ui/hooks/use-exit-on-ctrl-c.ts index 7bb625f1418..a5cc04ca136 100644 --- a/packages/cli-kit/src/private/node/ui/hooks/use-exit-on-ctrl-c.ts +++ b/packages/cli-kit/src/shared/ui/hooks/use-exit-on-ctrl-c.ts @@ -1,4 +1,4 @@ -import {handleCtrlC} from '../../ui.js' +import {handleCtrlC} from '../ui.js' import {useInput, useStdin} from 'ink' /** diff --git a/packages/cli-kit/src/private/node/ui/hooks/use-layout.test.ts b/packages/cli-kit/src/shared/ui/hooks/use-layout.test.ts similarity index 98% rename from packages/cli-kit/src/private/node/ui/hooks/use-layout.test.ts rename to packages/cli-kit/src/shared/ui/hooks/use-layout.test.ts index d1c212c368a..fa6c6260f60 100644 --- a/packages/cli-kit/src/private/node/ui/hooks/use-layout.test.ts +++ b/packages/cli-kit/src/shared/ui/hooks/use-layout.test.ts @@ -1,5 +1,5 @@ import {calculateLayout} from './use-layout.js' -import {Stdout} from '../../ui.js' +import {Stdout} from '../ui.js' import {describe, expect, test, vi} from 'vitest' vi.mock('ink') diff --git a/packages/cli-kit/src/private/node/ui/hooks/use-layout.ts b/packages/cli-kit/src/shared/ui/hooks/use-layout.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/hooks/use-layout.ts rename to packages/cli-kit/src/shared/ui/hooks/use-layout.ts diff --git a/packages/cli-kit/src/private/node/ui/hooks/use-prompt.ts b/packages/cli-kit/src/shared/ui/hooks/use-prompt.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/hooks/use-prompt.ts rename to packages/cli-kit/src/shared/ui/hooks/use-prompt.ts diff --git a/packages/cli-kit/src/private/node/ui/hooks/use-select-state.ts b/packages/cli-kit/src/shared/ui/hooks/use-select-state.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/hooks/use-select-state.ts rename to packages/cli-kit/src/shared/ui/hooks/use-select-state.ts diff --git a/packages/cli-kit/src/private/node/testing/ui.ts b/packages/cli-kit/src/shared/ui/testing.ts similarity index 94% rename from packages/cli-kit/src/private/node/testing/ui.ts rename to packages/cli-kit/src/shared/ui/testing.ts index 70c7fa9ffc9..e36d437975d 100644 --- a/packages/cli-kit/src/private/node/testing/ui.ts +++ b/packages/cli-kit/src/shared/ui/testing.ts @@ -1,5 +1,5 @@ -import {isTruthy} from '../../../public/node/context/utilities.js' -import {Stdout} from '../ui.js' +import {Stdout} from './ui.js' +import {isTruthy} from '../node/context/utilities.js' import {ReactElement} from 'react' import {render as inkRender} from 'ink' import {EventEmitter} from 'events' @@ -67,10 +67,11 @@ export const render = (tree: ReactElement, options: RenderOptions = {}): Instanc const stdin = new Stdin() const instance = inkRender(tree, { + // eslint-disable-next-line @typescript-eslint/no-explicit-any stdout: options.stdout ?? (stdout as any), - + // eslint-disable-next-line @typescript-eslint/no-explicit-any stderr: options.stderr ?? (stderr as any), - + // eslint-disable-next-line @typescript-eslint/no-explicit-any stdin: options.stdin ?? (stdin as any), debug: true, exitOnCtrlC: false, @@ -139,7 +140,7 @@ export function waitForContent( return waitFor( () => func(), - () => renderInstance.lastFrame()!.includes(content), + () => (renderInstance.lastFrame() ?? '').includes(content), ) } diff --git a/packages/cli-kit/src/private/node/ui.tsx b/packages/cli-kit/src/shared/ui/ui.tsx similarity index 90% rename from packages/cli-kit/src/private/node/ui.tsx rename to packages/cli-kit/src/shared/ui/ui.tsx index 7df2c5e09ee..158f88e96b0 100644 --- a/packages/cli-kit/src/private/node/ui.tsx +++ b/packages/cli-kit/src/shared/ui/ui.tsx @@ -1,7 +1,7 @@ -import {output} from './output.js' -import {Logger, LogLevel} from '../../public/node/output.js' -import {isUnitTest} from '../../public/node/context/local.js' -import {treeKill} from '../../public/node/tree-kill.js' +import {output} from '../node/internal/output.js' +import {Logger, LogLevel} from '../node/output.js' +import {isUnitTest} from '../node/context/local.js' +import {treeKill} from '../node/tree-kill.js' import {ReactElement} from 'react' import {Key, render as inkRender, RenderOptions} from 'ink' import {EventEmitter} from 'events' diff --git a/packages/cli-kit/src/private/node/ui/utilities.test.ts b/packages/cli-kit/src/shared/ui/utilities.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/utilities.test.ts rename to packages/cli-kit/src/shared/ui/utilities.test.ts diff --git a/packages/cli-kit/src/private/node/ui/utilities.ts b/packages/cli-kit/src/shared/ui/utilities.ts similarity index 100% rename from packages/cli-kit/src/private/node/ui/utilities.ts rename to packages/cli-kit/src/shared/ui/utilities.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2016.ts b/packages/cli-kit/src/shared/vendor/dev_server/dev-server-2016.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2016.ts rename to packages/cli-kit/src/shared/vendor/dev_server/dev-server-2016.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts b/packages/cli-kit/src/shared/vendor/dev_server/dev-server-2024.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts rename to packages/cli-kit/src/shared/vendor/dev_server/dev-server-2024.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/dev-server.ts b/packages/cli-kit/src/shared/vendor/dev_server/dev-server.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/dev-server.ts rename to packages/cli-kit/src/shared/vendor/dev_server/dev-server.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/env.ts b/packages/cli-kit/src/shared/vendor/dev_server/env.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/env.ts rename to packages/cli-kit/src/shared/vendor/dev_server/env.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/index.ts b/packages/cli-kit/src/shared/vendor/dev_server/index.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/index.ts rename to packages/cli-kit/src/shared/vendor/dev_server/index.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/network-interfaces.d.ts b/packages/cli-kit/src/shared/vendor/dev_server/network-interfaces.d.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/network-interfaces.d.ts rename to packages/cli-kit/src/shared/vendor/dev_server/network-interfaces.d.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/network/host.ts b/packages/cli-kit/src/shared/vendor/dev_server/network/host.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/network/host.ts rename to packages/cli-kit/src/shared/vendor/dev_server/network/host.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/network/index.ts b/packages/cli-kit/src/shared/vendor/dev_server/network/index.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/network/index.ts rename to packages/cli-kit/src/shared/vendor/dev_server/network/index.ts diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/types.ts b/packages/cli-kit/src/shared/vendor/dev_server/types.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/dev_server/types.ts rename to packages/cli-kit/src/shared/vendor/dev_server/types.ts diff --git a/packages/cli-kit/src/public/node/vendor/otel-js/export/InstantaneousMetricReader.ts b/packages/cli-kit/src/shared/vendor/otel-js/export/InstantaneousMetricReader.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/otel-js/export/InstantaneousMetricReader.ts rename to packages/cli-kit/src/shared/vendor/otel-js/export/InstantaneousMetricReader.ts diff --git a/packages/cli-kit/src/public/node/vendor/otel-js/service/BaseOtelService/BaseOtelService.ts b/packages/cli-kit/src/shared/vendor/otel-js/service/BaseOtelService/BaseOtelService.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/otel-js/service/BaseOtelService/BaseOtelService.ts rename to packages/cli-kit/src/shared/vendor/otel-js/service/BaseOtelService/BaseOtelService.ts diff --git a/packages/cli-kit/src/public/node/vendor/otel-js/service/DefaultOtelService/DefaultMeterProvider.ts b/packages/cli-kit/src/shared/vendor/otel-js/service/DefaultOtelService/DefaultMeterProvider.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/otel-js/service/DefaultOtelService/DefaultMeterProvider.ts rename to packages/cli-kit/src/shared/vendor/otel-js/service/DefaultOtelService/DefaultMeterProvider.ts diff --git a/packages/cli-kit/src/public/node/vendor/otel-js/service/DefaultOtelService/DefaultOtelService.ts b/packages/cli-kit/src/shared/vendor/otel-js/service/DefaultOtelService/DefaultOtelService.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/otel-js/service/DefaultOtelService/DefaultOtelService.ts rename to packages/cli-kit/src/shared/vendor/otel-js/service/DefaultOtelService/DefaultOtelService.ts diff --git a/packages/cli-kit/src/public/node/vendor/otel-js/service/types.ts b/packages/cli-kit/src/shared/vendor/otel-js/service/types.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/otel-js/service/types.ts rename to packages/cli-kit/src/shared/vendor/otel-js/service/types.ts diff --git a/packages/cli-kit/src/public/node/vendor/otel-js/utils/throttle.ts b/packages/cli-kit/src/shared/vendor/otel-js/utils/throttle.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/otel-js/utils/throttle.ts rename to packages/cli-kit/src/shared/vendor/otel-js/utils/throttle.ts diff --git a/packages/cli-kit/src/public/node/vendor/otel-js/utils/validators.ts b/packages/cli-kit/src/shared/vendor/otel-js/utils/validators.ts similarity index 100% rename from packages/cli-kit/src/public/node/vendor/otel-js/utils/validators.ts rename to packages/cli-kit/src/shared/vendor/otel-js/utils/validators.ts diff --git a/packages/cli-kit/src/public/node/themes/api.test.ts b/packages/cli-kit/src/themes/api.test.ts similarity index 94% rename from packages/cli-kit/src/public/node/themes/api.test.ts rename to packages/cli-kit/src/themes/api.test.ts index 819f1599338..5861a103107 100644 --- a/packages/cli-kit/src/public/node/themes/api.test.ts +++ b/packages/cli-kit/src/themes/api.test.ts @@ -14,23 +14,23 @@ import { parseThemeFileContent, } from './api.js' import {Operation} from './types.js' -import {ThemeDelete} from '../../../cli/api/graphql/admin/generated/theme_delete.js' -import {ThemeDuplicate} from '../../../cli/api/graphql/admin/generated/theme_duplicate.js' -import {ThemeUpdate} from '../../../cli/api/graphql/admin/generated/theme_update.js' -import {ThemePublish} from '../../../cli/api/graphql/admin/generated/theme_publish.js' -import {ThemeCreate} from '../../../cli/api/graphql/admin/generated/theme_create.js' -import {GetThemeFileChecksums} from '../../../cli/api/graphql/admin/generated/get_theme_file_checksums.js' -import {ThemeFilesUpsert} from '../../../cli/api/graphql/admin/generated/theme_files_upsert.js' -import {ThemeFilesDelete} from '../../../cli/api/graphql/admin/generated/theme_files_delete.js' -import {GetThemes} from '../../../cli/api/graphql/admin/generated/get_themes.js' -import {GetTheme} from '../../../cli/api/graphql/admin/generated/get_theme.js' -import {adminRequestDoc, supportedApiVersions} from '../api/admin.js' -import {AbortError} from '../error.js' +import {ThemeDelete} from '../admin/graphql/generated/theme_delete.js' +import {ThemeDuplicate} from '../admin/graphql/generated/theme_duplicate.js' +import {ThemeUpdate} from '../admin/graphql/generated/theme_update.js' +import {ThemePublish} from '../admin/graphql/generated/theme_publish.js' +import {ThemeCreate} from '../admin/graphql/generated/theme_create.js' +import {GetThemeFileChecksums} from '../admin/graphql/generated/get_theme_file_checksums.js' +import {ThemeFilesUpsert} from '../admin/graphql/generated/theme_files_upsert.js' +import {ThemeFilesDelete} from '../admin/graphql/generated/theme_files_delete.js' +import {GetThemes} from '../admin/graphql/generated/get_themes.js' +import {GetTheme} from '../admin/graphql/generated/get_theme.js' +import {adminRequestDoc, supportedApiVersions} from '../admin/api.js' +import {AbortError} from '../shared/node/error.js' import {test, vi, expect, describe, beforeEach} from 'vitest' import {ClientError} from 'graphql-request' -vi.mock('@shopify/cli-kit/node/api/admin') -vi.mock('@shopify/cli-kit/node/system') +vi.mock('../admin/api.js') +vi.mock('../shared/node/system.js') vi.stubGlobal('fetch', vi.fn()) const session = {token: 'token', storeFqdn: 'my-shop.myshopify.com', refresh: async () => {}} diff --git a/packages/cli-kit/src/public/node/themes/api.ts b/packages/cli-kit/src/themes/api.ts similarity index 91% rename from packages/cli-kit/src/public/node/themes/api.ts rename to packages/cli-kit/src/themes/api.ts index 4084c4fcebc..80492026e2a 100644 --- a/packages/cli-kit/src/public/node/themes/api.ts +++ b/packages/cli-kit/src/themes/api.ts @@ -1,34 +1,31 @@ import {composeThemeGid, parseGid, DEVELOPMENT_THEME_ROLE} from './utils.js' import {buildTheme} from './factories.js' import {Result, Checksum, Key, Theme, ThemeAsset, Operation} from './types.js' -import {ThemeUpdate} from '../../../cli/api/graphql/admin/generated/theme_update.js' -import {ThemeDelete} from '../../../cli/api/graphql/admin/generated/theme_delete.js' -import {ThemeDuplicate} from '../../../cli/api/graphql/admin/generated/theme_duplicate.js' -import {ThemePublish} from '../../../cli/api/graphql/admin/generated/theme_publish.js' -import {ThemeCreate} from '../../../cli/api/graphql/admin/generated/theme_create.js' -import {GetThemeFileBodies} from '../../../cli/api/graphql/admin/generated/get_theme_file_bodies.js' -import {GetThemeFileChecksums} from '../../../cli/api/graphql/admin/generated/get_theme_file_checksums.js' -import { - ThemeFilesUpsert, - ThemeFilesUpsertMutation, -} from '../../../cli/api/graphql/admin/generated/theme_files_upsert.js' -import {ThemeFilesDelete} from '../../../cli/api/graphql/admin/generated/theme_files_delete.js' +import {ThemeUpdate} from '../admin/graphql/generated/theme_update.js' +import {ThemeDelete} from '../admin/graphql/generated/theme_delete.js' +import {ThemeDuplicate} from '../admin/graphql/generated/theme_duplicate.js' +import {ThemePublish} from '../admin/graphql/generated/theme_publish.js' +import {ThemeCreate} from '../admin/graphql/generated/theme_create.js' +import {GetThemeFileBodies} from '../admin/graphql/generated/get_theme_file_bodies.js' +import {GetThemeFileChecksums} from '../admin/graphql/generated/get_theme_file_checksums.js' +import {ThemeFilesUpsert, ThemeFilesUpsertMutation} from '../admin/graphql/generated/theme_files_upsert.js' +import {ThemeFilesDelete} from '../admin/graphql/generated/theme_files_delete.js' import { OnlineStoreThemeFileBodyInputType, OnlineStoreThemeFilesUpsertFileInput, MetafieldOwnerType, ThemeRole, -} from '../../../cli/api/graphql/admin/generated/types.js' -import {MetafieldDefinitionsByOwnerType} from '../../../cli/api/graphql/admin/generated/metafield_definitions_by_owner_type.js' -import {GetThemes} from '../../../cli/api/graphql/admin/generated/get_themes.js' -import {GetTheme} from '../../../cli/api/graphql/admin/generated/get_theme.js' -import {OnlineStorePasswordProtection} from '../../../cli/api/graphql/admin/generated/online_store_password_protection.js' -import {RequestModeInput} from '../http.js' -import {adminRequestDoc} from '../api/admin.js' -import {AdminSession} from '../session.js' -import {AbortError} from '../error.js' -import {outputDebug} from '../output.js' -import {recordTiming, recordEvent, recordError} from '../analytics.js' +} from '../admin/graphql/generated/types.js' +import {MetafieldDefinitionsByOwnerType} from '../admin/graphql/generated/metafield_definitions_by_owner_type.js' +import {GetThemes} from '../admin/graphql/generated/get_themes.js' +import {GetTheme} from '../admin/graphql/generated/get_theme.js' +import {OnlineStorePasswordProtection} from '../admin/graphql/generated/online_store_password_protection.js' +import {RequestModeInput} from '../shared/node/http.js' +import {adminRequestDoc} from '../admin/api.js' +import {AdminSession} from '../identity/session.js' +import {AbortError} from '../shared/node/error.js' +import {outputDebug} from '../shared/node/output.js' +import {recordTiming, recordEvent, recordError} from '../shared/node/analytics.js' export type ThemeParams = Partial> export type AssetParams = Pick & Partial> diff --git a/packages/cli-kit/src/public/node/themes/conf.ts b/packages/cli-kit/src/themes/conf.ts similarity index 85% rename from packages/cli-kit/src/public/node/themes/conf.ts rename to packages/cli-kit/src/themes/conf.ts index 936aeec1805..95f3d867c95 100644 --- a/packages/cli-kit/src/public/node/themes/conf.ts +++ b/packages/cli-kit/src/themes/conf.ts @@ -1,6 +1,6 @@ -import {LocalStorage} from '../local-storage.js' -import {AdminSession} from '../session.js' -import {outputDebug, outputContent} from '../output.js' +import {LocalStorage} from '../shared/node/local-storage.js' +import {AdminSession} from '../identity/session.js' +import {outputDebug, outputContent} from '../shared/node/output.js' type HostThemeId = string type StoreFqdn = AdminSession['storeFqdn'] diff --git a/packages/cli-kit/src/public/node/themes/factories.ts b/packages/cli-kit/src/themes/factories.ts similarity index 100% rename from packages/cli-kit/src/public/node/themes/factories.ts rename to packages/cli-kit/src/themes/factories.ts diff --git a/packages/cli-kit/src/private/node/themes/generate-theme-name.test.ts b/packages/cli-kit/src/themes/generate-theme-name.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/themes/generate-theme-name.test.ts rename to packages/cli-kit/src/themes/generate-theme-name.test.ts diff --git a/packages/cli-kit/src/private/node/themes/generate-theme-name.ts b/packages/cli-kit/src/themes/generate-theme-name.ts similarity index 100% rename from packages/cli-kit/src/private/node/themes/generate-theme-name.ts rename to packages/cli-kit/src/themes/generate-theme-name.ts diff --git a/packages/cli-kit/src/private/node/themes/replace-invalid-characters.test.ts b/packages/cli-kit/src/themes/replace-invalid-characters.test.ts similarity index 100% rename from packages/cli-kit/src/private/node/themes/replace-invalid-characters.test.ts rename to packages/cli-kit/src/themes/replace-invalid-characters.test.ts diff --git a/packages/cli-kit/src/private/node/themes/replace-invalid-characters.ts b/packages/cli-kit/src/themes/replace-invalid-characters.ts similarity index 100% rename from packages/cli-kit/src/private/node/themes/replace-invalid-characters.ts rename to packages/cli-kit/src/themes/replace-invalid-characters.ts diff --git a/packages/cli-kit/src/public/node/themes/theme-manager.ts b/packages/cli-kit/src/themes/theme-manager.ts similarity index 88% rename from packages/cli-kit/src/public/node/themes/theme-manager.ts rename to packages/cli-kit/src/themes/theme-manager.ts index 2a40aa46912..1b18c6b9b96 100644 --- a/packages/cli-kit/src/public/node/themes/theme-manager.ts +++ b/packages/cli-kit/src/themes/theme-manager.ts @@ -1,9 +1,9 @@ import {fetchTheme, themeCreate} from './api.js' import {Theme} from './types.js' import {DEVELOPMENT_THEME_ROLE, Role} from './utils.js' -import {generateThemeName} from '../../../private/node/themes/generate-theme-name.js' -import {AdminSession} from '../session.js' -import {BugError} from '../error.js' +import {generateThemeName} from './generate-theme-name.js' +import {AdminSession} from '../identity/session.js' +import {BugError} from '../shared/node/error.js' export abstract class ThemeManager { protected themeId: string | undefined diff --git a/packages/cli-kit/src/public/node/themes/types.ts b/packages/cli-kit/src/themes/types.ts similarity index 99% rename from packages/cli-kit/src/public/node/themes/types.ts rename to packages/cli-kit/src/themes/types.ts index 55f4a2ffefe..c3c419a1e55 100644 --- a/packages/cli-kit/src/public/node/themes/types.ts +++ b/packages/cli-kit/src/themes/types.ts @@ -1,4 +1,4 @@ -import {AdminSession} from '../session.js' +import {AdminSession} from '../identity/session.js' /** * {@link Key} represents the unique identifier of a file in a theme. diff --git a/packages/cli-kit/src/public/node/themes/urls.test.ts b/packages/cli-kit/src/themes/urls.test.ts similarity index 100% rename from packages/cli-kit/src/public/node/themes/urls.test.ts rename to packages/cli-kit/src/themes/urls.test.ts diff --git a/packages/cli-kit/src/public/node/themes/urls.ts b/packages/cli-kit/src/themes/urls.ts similarity index 94% rename from packages/cli-kit/src/public/node/themes/urls.ts rename to packages/cli-kit/src/themes/urls.ts index d26a8eb1ca8..06b01285fbf 100644 --- a/packages/cli-kit/src/public/node/themes/urls.ts +++ b/packages/cli-kit/src/themes/urls.ts @@ -1,5 +1,5 @@ import {Theme} from './types.js' -import {AdminSession} from '../session.js' +import {AdminSession} from '../identity/session.js' export function themePreviewUrl(theme: Theme, session: AdminSession) { const store = session.storeFqdn diff --git a/packages/cli-kit/src/public/node/themes/utils.ts b/packages/cli-kit/src/themes/utils.ts similarity index 89% rename from packages/cli-kit/src/public/node/themes/utils.ts rename to packages/cli-kit/src/themes/utils.ts index bee6ad98ed8..d8c2eb91dc0 100644 --- a/packages/cli-kit/src/public/node/themes/utils.ts +++ b/packages/cli-kit/src/themes/utils.ts @@ -1,6 +1,6 @@ import {Theme} from './types.js' -import {renderTextPrompt} from '../ui.js' -import {getRandomName} from '../../common/string.js' +import {renderTextPrompt} from '../shared/node/ui.js' +import {getRandomName} from '../shared/common/string.js' const GID_REGEXP = /gid:\/\/shopify\/\w*\/(\d+)/ diff --git a/packages/cli-kit/src/public/node/api/webhooks.ts b/packages/cli-kit/src/webhooks/api.ts similarity index 90% rename from packages/cli-kit/src/public/node/api/webhooks.ts rename to packages/cli-kit/src/webhooks/api.ts index 572e551c413..5e3345715e6 100644 --- a/packages/cli-kit/src/public/node/api/webhooks.ts +++ b/packages/cli-kit/src/webhooks/api.ts @@ -1,5 +1,5 @@ -import {graphqlRequestDoc, UnauthorizedHandler} from './graphql.js' -import {appManagementFqdn} from '../context/fqdn.js' +import {graphqlRequestDoc, UnauthorizedHandler} from '../shared/node/api/graphql.js' +import {appManagementFqdn} from '../shared/node/context/fqdn.js' import Bottleneck from 'bottleneck' import {Variables} from 'graphql-request' import {TypedDocumentNode} from '@graphql-typed-document-node/core' diff --git a/packages/cli-kit/tsconfig.build.json b/packages/cli-kit/tsconfig.build.json index 40252e3e2a9..d472b2c2aa0 100644 --- a/packages/cli-kit/tsconfig.build.json +++ b/packages/cli-kit/tsconfig.build.json @@ -1,4 +1,4 @@ { - "extends": "./tsconfig.json", - "exclude": ["**/*.test.ts"], - } + "extends": "./tsconfig.json", + "exclude": ["**/*.test.ts"] +} diff --git a/packages/cli/bin/bundle.js b/packages/cli/bin/bundle.js index 78de3e4ace5..09c0688dcdb 100644 --- a/packages/cli/bin/bundle.js +++ b/packages/cli/bin/bundle.js @@ -6,7 +6,7 @@ import CliKitDedupPlugin from '../../../bin/bundling/esbuild-plugin-dedup-cli-ki import {build as esBuild} from 'esbuild' import {copy} from 'esbuild-plugin-copy' import glob from 'fast-glob' -import {joinPath, dirname} from '@shopify/cli-kit/node/path' +import {joinPath, dirname} from '@shopify/cli-kit/shared/node/path' import {createRequire} from 'module' const require = createRequire(import.meta.url) diff --git a/packages/cli/src/cli/commands/auth/login.test.ts b/packages/cli/src/cli/commands/auth/login.test.ts index 29401713c58..87eb6b0ddf8 100644 --- a/packages/cli/src/cli/commands/auth/login.test.ts +++ b/packages/cli/src/cli/commands/auth/login.test.ts @@ -1,9 +1,9 @@ import Login from './login.js' import {describe, expect, vi, test} from 'vitest' -import {promptSessionSelect} from '@shopify/cli-kit/node/session-prompt' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {promptSessionSelect} from '@shopify/cli-kit/identity/session-prompt' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' -vi.mock('@shopify/cli-kit/node/session-prompt') +vi.mock('@shopify/cli-kit/identity/session-prompt') describe('Login command', () => { test('runs login without alias flag', async () => { diff --git a/packages/cli/src/cli/commands/auth/login.ts b/packages/cli/src/cli/commands/auth/login.ts index 992b311dd26..0b70766a823 100644 --- a/packages/cli/src/cli/commands/auth/login.ts +++ b/packages/cli/src/cli/commands/auth/login.ts @@ -1,7 +1,7 @@ -import Command from '@shopify/cli-kit/node/base-command' -import {promptSessionSelect} from '@shopify/cli-kit/node/session-prompt' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {promptSessionSelect} from '@shopify/cli-kit/identity/session-prompt' import {Flags} from '@oclif/core' -import {outputCompleted} from '@shopify/cli-kit/node/output' +import {outputCompleted} from '@shopify/cli-kit/shared/node/output' export default class Login extends Command { static description = 'Logs you in to your Shopify account.' diff --git a/packages/cli/src/cli/commands/auth/logout.test.ts b/packages/cli/src/cli/commands/auth/logout.test.ts index 6894fd8fadc..93f4bb27310 100644 --- a/packages/cli/src/cli/commands/auth/logout.test.ts +++ b/packages/cli/src/cli/commands/auth/logout.test.ts @@ -1,9 +1,9 @@ import Logout from './logout.js' import {describe, expect, vi, test} from 'vitest' -import {logout} from '@shopify/cli-kit/node/session' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {logout} from '@shopify/cli-kit/identity/session' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' -vi.mock('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/identity/session') describe('logs out', () => { test('clears the session', async () => { diff --git a/packages/cli/src/cli/commands/auth/logout.ts b/packages/cli/src/cli/commands/auth/logout.ts index de1ce42c00b..5db4bcc69f8 100644 --- a/packages/cli/src/cli/commands/auth/logout.ts +++ b/packages/cli/src/cli/commands/auth/logout.ts @@ -1,6 +1,6 @@ -import Command from '@shopify/cli-kit/node/base-command' -import {outputSuccess} from '@shopify/cli-kit/node/output' -import {logout} from '@shopify/cli-kit/node/session' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {outputSuccess} from '@shopify/cli-kit/shared/node/output' +import {logout} from '@shopify/cli-kit/identity/session' export default class Logout extends Command { static description = 'Logs you out of the Shopify account or Partner account and store.' diff --git a/packages/cli/src/cli/commands/cache/clear.ts b/packages/cli/src/cli/commands/cache/clear.ts index ea901b071c8..99c729f196f 100644 --- a/packages/cli/src/cli/commands/cache/clear.ts +++ b/packages/cli/src/cli/commands/cache/clear.ts @@ -1,5 +1,5 @@ -import Command from '@shopify/cli-kit/node/base-command' -import {clearCache} from '@shopify/cli-kit/node/cli' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {clearCache} from '@shopify/cli-kit/shared/node/cli' export default class ClearCache extends Command { static description = 'Clear the CLI cache, used to store some API responses and handle notifications status' diff --git a/packages/cli/src/cli/commands/debug/command-flags.ts b/packages/cli/src/cli/commands/debug/command-flags.ts index 1f303c11585..ed13b5028aa 100644 --- a/packages/cli/src/cli/commands/debug/command-flags.ts +++ b/packages/cli/src/cli/commands/debug/command-flags.ts @@ -1,6 +1,6 @@ -import Command from '@shopify/cli-kit/node/base-command' -import {outputResult} from '@shopify/cli-kit/node/output' -import {renderTable} from '@shopify/cli-kit/node/ui' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {outputResult} from '@shopify/cli-kit/shared/node/output' +import {renderTable} from '@shopify/cli-kit/shared/node/ui' import {Flags} from '@oclif/core' export default class CommandFlags extends Command { diff --git a/packages/cli/src/cli/commands/docs/generate.test.ts b/packages/cli/src/cli/commands/docs/generate.test.ts index ea56dec56d9..d79bb3b8764 100644 --- a/packages/cli/src/cli/commands/docs/generate.test.ts +++ b/packages/cli/src/cli/commands/docs/generate.test.ts @@ -6,10 +6,10 @@ import { writeCommandFlagInterface, writeCommandUsageExampleFile, } from './generate.js' -import {writeFile} from '@shopify/cli-kit/node/fs' +import {writeFile} from '@shopify/cli-kit/shared/node/fs' import {describe, test, vi, expect} from 'vitest' -vi.mock('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/fs') const testCommand: CommandWithMarkdown = { aliases: [], diff --git a/packages/cli/src/cli/commands/docs/generate.ts b/packages/cli/src/cli/commands/docs/generate.ts index 2c5e90d8b2b..88767a47d8b 100644 --- a/packages/cli/src/cli/commands/docs/generate.ts +++ b/packages/cli/src/cli/commands/docs/generate.ts @@ -1,8 +1,8 @@ -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' import {Command as oclifCommand} from '@oclif/core' -import {mkdir, rmdir, writeFile} from '@shopify/cli-kit/node/fs' -import {cwd, joinPath} from '@shopify/cli-kit/node/path' -import {outputInfo} from '@shopify/cli-kit/node/output' +import {mkdir, rmdir, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {cwd, joinPath} from '@shopify/cli-kit/shared/node/path' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' const docsPath = joinPath(cwd(), '/docs-shopify.dev/commands') diff --git a/packages/cli/src/cli/commands/doctor-release/doctor-release.ts b/packages/cli/src/cli/commands/doctor-release/doctor-release.ts index b7e701877e7..f8d0ff08921 100644 --- a/packages/cli/src/cli/commands/doctor-release/doctor-release.ts +++ b/packages/cli/src/cli/commands/doctor-release/doctor-release.ts @@ -1,6 +1,6 @@ -import Command from '@shopify/cli-kit/node/base-command' -import {canRunDoctorRelease} from '@shopify/cli-kit/node/context/local' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {canRunDoctorRelease} from '@shopify/cli-kit/shared/node/context/local' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' export default class DoctorRelease extends Command { static description = 'Run CLI doctor-release tests' diff --git a/packages/cli/src/cli/commands/doctor-release/theme/index.ts b/packages/cli/src/cli/commands/doctor-release/theme/index.ts index 026a1f0eeab..2508e8be958 100644 --- a/packages/cli/src/cli/commands/doctor-release/theme/index.ts +++ b/packages/cli/src/cli/commands/doctor-release/theme/index.ts @@ -1,9 +1,9 @@ import {runThemeDoctor} from '../../../services/doctor-release/theme/runner.js' -import Command from '@shopify/cli-kit/node/base-command' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' import {Flags} from '@oclif/core' -import {resolvePath, cwd} from '@shopify/cli-kit/node/path' -import {canRunDoctorRelease} from '@shopify/cli-kit/node/context/local' +import {resolvePath, cwd} from '@shopify/cli-kit/shared/node/path' +import {canRunDoctorRelease} from '@shopify/cli-kit/shared/node/context/local' export default class DoctorReleaseTheme extends Command { static description = 'Run all theme command doctor-release tests' diff --git a/packages/cli/src/cli/commands/help.ts b/packages/cli/src/cli/commands/help.ts index 6590a5ce5ce..e0b4051d613 100644 --- a/packages/cli/src/cli/commands/help.ts +++ b/packages/cli/src/cli/commands/help.ts @@ -1,5 +1,5 @@ import {Args, Flags, loadHelpClass} from '@oclif/core' -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' export default class HelpCommand extends Command { static args = { diff --git a/packages/cli/src/cli/commands/kitchen-sink/async.ts b/packages/cli/src/cli/commands/kitchen-sink/async.ts index 5b20360e3b8..249a887abe0 100644 --- a/packages/cli/src/cli/commands/kitchen-sink/async.ts +++ b/packages/cli/src/cli/commands/kitchen-sink/async.ts @@ -1,5 +1,5 @@ import {asyncTasks} from '../../services/kitchen-sink/async.js' -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' /** * This command is used to output all the async UI components of the CLI. diff --git a/packages/cli/src/cli/commands/kitchen-sink/index.ts b/packages/cli/src/cli/commands/kitchen-sink/index.ts index a61e69678b8..2b19f5711a6 100644 --- a/packages/cli/src/cli/commands/kitchen-sink/index.ts +++ b/packages/cli/src/cli/commands/kitchen-sink/index.ts @@ -1,7 +1,7 @@ import {asyncTasks} from '../../services/kitchen-sink/async.js' import {staticService} from '../../services/kitchen-sink/static.js' import {prompts} from '../../services/kitchen-sink/prompts.js' -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' /** * This command is used to output all the UI components of the CLI. diff --git a/packages/cli/src/cli/commands/kitchen-sink/prompts.ts b/packages/cli/src/cli/commands/kitchen-sink/prompts.ts index 9627f999991..0438a1ffeb1 100644 --- a/packages/cli/src/cli/commands/kitchen-sink/prompts.ts +++ b/packages/cli/src/cli/commands/kitchen-sink/prompts.ts @@ -1,5 +1,5 @@ import {prompts} from '../../services/kitchen-sink/prompts.js' -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' /** * This command is used to output all the UI prompt components of the CLI. diff --git a/packages/cli/src/cli/commands/kitchen-sink/static.ts b/packages/cli/src/cli/commands/kitchen-sink/static.ts index 6b6ebec9bba..ec9423acf5f 100644 --- a/packages/cli/src/cli/commands/kitchen-sink/static.ts +++ b/packages/cli/src/cli/commands/kitchen-sink/static.ts @@ -1,5 +1,5 @@ import {staticService} from '../../services/kitchen-sink/static.js' -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' /** * This command is used to output all the banner UI components of the CLI. diff --git a/packages/cli/src/cli/commands/notifications/generate.ts b/packages/cli/src/cli/commands/notifications/generate.ts index 30637c72180..a31df510fbc 100644 --- a/packages/cli/src/cli/commands/notifications/generate.ts +++ b/packages/cli/src/cli/commands/notifications/generate.ts @@ -1,5 +1,5 @@ import {generate} from '../../services/commands/notifications.js' -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' export default class Generate extends Command { static description = diff --git a/packages/cli/src/cli/commands/notifications/list.ts b/packages/cli/src/cli/commands/notifications/list.ts index ef721cb137e..9f8be2c89d1 100644 --- a/packages/cli/src/cli/commands/notifications/list.ts +++ b/packages/cli/src/cli/commands/notifications/list.ts @@ -1,7 +1,7 @@ import {list} from '../../services/commands/notifications.js' import {Flags} from '@oclif/core' -import Command from '@shopify/cli-kit/node/base-command' -import {sendErrorToBugsnag} from '@shopify/cli-kit/node/error-handler' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {sendErrorToBugsnag} from '@shopify/cli-kit/shared/node/error-handler' export default class List extends Command { static description = 'List current notifications configured for the CLI.' diff --git a/packages/cli/src/cli/commands/search.ts b/packages/cli/src/cli/commands/search.ts index bb1346b8341..687fcad2505 100644 --- a/packages/cli/src/cli/commands/search.ts +++ b/packages/cli/src/cli/commands/search.ts @@ -1,5 +1,5 @@ import {searchService} from '../services/commands/search.js' -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' import {Args} from '@oclif/core' export default class Search extends Command { diff --git a/packages/cli/src/cli/commands/upgrade.ts b/packages/cli/src/cli/commands/upgrade.ts index 6472ea9b6dc..1be78207765 100644 --- a/packages/cli/src/cli/commands/upgrade.ts +++ b/packages/cli/src/cli/commands/upgrade.ts @@ -1,6 +1,6 @@ -import {cliInstallCommand} from '@shopify/cli-kit/node/upgrade' -import Command from '@shopify/cli-kit/node/base-command' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import {cliInstallCommand} from '@shopify/cli-kit/shared/node/upgrade' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' export default class Upgrade extends Command { static summary = 'Shows details on how to upgrade Shopify CLI.' diff --git a/packages/cli/src/cli/commands/version.ts b/packages/cli/src/cli/commands/version.ts index 482eeb7ec50..47f6febaa22 100644 --- a/packages/cli/src/cli/commands/version.ts +++ b/packages/cli/src/cli/commands/version.ts @@ -1,5 +1,5 @@ import {versionService} from '../services/commands/version.js' -import Command from '@shopify/cli-kit/node/base-command' +import Command from '@shopify/cli-kit/shared/node/base-command' export default class Version extends Command { static description = 'Shopify CLI version currently installed.' diff --git a/packages/cli/src/cli/services/commands/notifications.ts b/packages/cli/src/cli/services/commands/notifications.ts index aa712a7b466..4686efed260 100644 --- a/packages/cli/src/cli/services/commands/notifications.ts +++ b/packages/cli/src/cli/services/commands/notifications.ts @@ -1,15 +1,21 @@ -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' -import {randomUUID} from '@shopify/cli-kit/node/crypto' -import {writeFile} from '@shopify/cli-kit/node/fs' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' +import {randomUUID} from '@shopify/cli-kit/shared/node/crypto' +import {writeFile} from '@shopify/cli-kit/shared/node/fs' import { Notifications, Notification, stringifyFilters, getNotifications, fetchNotifications, -} from '@shopify/cli-kit/node/notifications-system' -import {outputInfo} from '@shopify/cli-kit/node/output' -import {renderSelectPrompt, renderTextPrompt, renderSuccess, renderTable, TableColumn} from '@shopify/cli-kit/node/ui' +} from '@shopify/cli-kit/shared/node/notifications-system' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' +import { + renderSelectPrompt, + renderTextPrompt, + renderSuccess, + renderTable, + TableColumn, +} from '@shopify/cli-kit/shared/node/ui' export async function generate() { const today = new Date() diff --git a/packages/cli/src/cli/services/commands/search.test.ts b/packages/cli/src/cli/services/commands/search.test.ts index 31c2ca30fd1..86ce7ae417e 100644 --- a/packages/cli/src/cli/services/commands/search.test.ts +++ b/packages/cli/src/cli/services/commands/search.test.ts @@ -1,8 +1,8 @@ import {searchService} from './search.js' import {describe, expect, test, vi} from 'vitest' -import {openURL} from '@shopify/cli-kit/node/system' +import {openURL} from '@shopify/cli-kit/shared/node/system' -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system') describe('searchService', () => { test('the right URL is open in the system when a query is passed', async () => { diff --git a/packages/cli/src/cli/services/commands/search.ts b/packages/cli/src/cli/services/commands/search.ts index 23109da229b..cf6484f0dd3 100644 --- a/packages/cli/src/cli/services/commands/search.ts +++ b/packages/cli/src/cli/services/commands/search.ts @@ -1,4 +1,4 @@ -import {openURL} from '@shopify/cli-kit/node/system' +import {openURL} from '@shopify/cli-kit/shared/node/system' export async function searchService(query?: string) { const searchParams = new URLSearchParams() diff --git a/packages/cli/src/cli/services/commands/version.test.ts b/packages/cli/src/cli/services/commands/version.test.ts index 4e3680b310e..e87fed98ab1 100644 --- a/packages/cli/src/cli/services/commands/version.test.ts +++ b/packages/cli/src/cli/services/commands/version.test.ts @@ -1,9 +1,9 @@ import {versionService} from './version.js' import {afterEach, describe, expect, vi, test} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' -vi.mock('@shopify/cli-kit/node/node-package-manager') -vi.mock('@shopify/cli-kit/common/version', () => ({CLI_KIT_VERSION: '2.2.2'})) +vi.mock('@shopify/cli-kit/shared/node/node-package-manager') +vi.mock('@shopify/cli-kit/shared/common/version', () => ({CLI_KIT_VERSION: '2.2.2'})) afterEach(() => { mockAndCaptureOutput().clear() diff --git a/packages/cli/src/cli/services/commands/version.ts b/packages/cli/src/cli/services/commands/version.ts index df92a13da06..28ee7147242 100644 --- a/packages/cli/src/cli/services/commands/version.ts +++ b/packages/cli/src/cli/services/commands/version.ts @@ -1,5 +1,5 @@ -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' -import {outputResult} from '@shopify/cli-kit/node/output' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' +import {outputResult} from '@shopify/cli-kit/shared/node/output' export async function versionService(): Promise { outputResult(CLI_KIT_VERSION) diff --git a/packages/cli/src/cli/services/doctor-release/context.ts b/packages/cli/src/cli/services/doctor-release/context.ts index c4c35c8e406..f5fbe955042 100644 --- a/packages/cli/src/cli/services/doctor-release/context.ts +++ b/packages/cli/src/cli/services/doctor-release/context.ts @@ -1,5 +1,5 @@ -import {cwd} from '@shopify/cli-kit/node/path' -import type {DoctorContext} from '@shopify/cli-kit/node/doctor/types' +import {cwd} from '@shopify/cli-kit/shared/node/path' +import type {DoctorContext} from '@shopify/cli-kit/shared/node/doctor/types' export interface ThemeDoctorContext extends DoctorContext { // Environment name from shopify.theme.toml (required) diff --git a/packages/cli/src/cli/services/doctor-release/theme/runner.ts b/packages/cli/src/cli/services/doctor-release/theme/runner.ts index dfaf013cf4d..30471cffe6d 100644 --- a/packages/cli/src/cli/services/doctor-release/theme/runner.ts +++ b/packages/cli/src/cli/services/doctor-release/theme/runner.ts @@ -7,10 +7,10 @@ import { reportSuiteStart, reportSummary, initReporter, -} from '@shopify/cli-kit/node/doctor/reporter' -import {DoctorSuite} from '@shopify/cli-kit/node/doctor/framework' +} from '@shopify/cli-kit/shared/node/doctor/reporter' +import {DoctorSuite} from '@shopify/cli-kit/shared/node/doctor/framework' import type {ThemeDoctorContext, ThemeDoctorOptions} from '../context.js' -import type {TestResult} from '@shopify/cli-kit/node/doctor/types' +import type {TestResult} from '@shopify/cli-kit/shared/node/doctor/types' // Test suites run in order. If a test relies on another, ensure that test runs after it's dependency. const themeSuites: (new () => DoctorSuite)[] = [ThemeInitTests, ThemePushTests] diff --git a/packages/cli/src/cli/services/doctor-release/theme/tests/init.ts b/packages/cli/src/cli/services/doctor-release/theme/tests/init.ts index b768fb97911..21e04453ffc 100644 --- a/packages/cli/src/cli/services/doctor-release/theme/tests/init.ts +++ b/packages/cli/src/cli/services/doctor-release/theme/tests/init.ts @@ -1,6 +1,6 @@ -import {DoctorSuite} from '@shopify/cli-kit/node/doctor/framework' -import {joinPath} from '@shopify/cli-kit/node/path' -import {getRandomName} from '@shopify/cli-kit/common/string' +import {DoctorSuite} from '@shopify/cli-kit/shared/node/doctor/framework' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {getRandomName} from '@shopify/cli-kit/shared/common/string' import type {ThemeDoctorContext} from '../../context.js' /** diff --git a/packages/cli/src/cli/services/doctor-release/theme/tests/push.ts b/packages/cli/src/cli/services/doctor-release/theme/tests/push.ts index 4bd4b0c806f..f11b85cfcdf 100644 --- a/packages/cli/src/cli/services/doctor-release/theme/tests/push.ts +++ b/packages/cli/src/cli/services/doctor-release/theme/tests/push.ts @@ -1,4 +1,4 @@ -import {DoctorSuite} from '@shopify/cli-kit/node/doctor/framework' +import {DoctorSuite} from '@shopify/cli-kit/shared/node/doctor/framework' import type {ThemeDoctorContext} from '../../context.js' interface PushJsonOutput { diff --git a/packages/cli/src/cli/services/kitchen-sink/async.ts b/packages/cli/src/cli/services/kitchen-sink/async.ts index 89154e4be34..be105a22ccb 100644 --- a/packages/cli/src/cli/services/kitchen-sink/async.ts +++ b/packages/cli/src/cli/services/kitchen-sink/async.ts @@ -1,6 +1,6 @@ -import {renderConcurrent, renderSingleTask, renderTasks} from '@shopify/cli-kit/node/ui' -import {AbortSignal} from '@shopify/cli-kit/node/abort' -import {outputContent, outputToken, TokenizedString} from '@shopify/cli-kit/node/output' +import {renderConcurrent, renderSingleTask, renderTasks} from '@shopify/cli-kit/shared/node/ui' +import {AbortSignal} from '@shopify/cli-kit/shared/node/abort' +import {outputContent, outputToken, TokenizedString} from '@shopify/cli-kit/shared/node/output' import {Writable} from 'stream' export async function asyncTasks() { diff --git a/packages/cli/src/cli/services/kitchen-sink/prompts.ts b/packages/cli/src/cli/services/kitchen-sink/prompts.ts index e40f5f2d846..dd4c5a31420 100644 --- a/packages/cli/src/cli/services/kitchen-sink/prompts.ts +++ b/packages/cli/src/cli/services/kitchen-sink/prompts.ts @@ -4,8 +4,8 @@ import { renderSelectPrompt, renderTextPrompt, renderDangerousConfirmationPrompt, -} from '@shopify/cli-kit/node/ui' -import figures from '@shopify/cli-kit/node/figures' +} from '@shopify/cli-kit/shared/node/ui' +import figures from '@shopify/cli-kit/shared/node/figures' export async function prompts() { // renderSelectPrompt diff --git a/packages/cli/src/cli/services/kitchen-sink/static.ts b/packages/cli/src/cli/services/kitchen-sink/static.ts index 32a01e8c1e6..58f0b793d54 100644 --- a/packages/cli/src/cli/services/kitchen-sink/static.ts +++ b/packages/cli/src/cli/services/kitchen-sink/static.ts @@ -1,4 +1,4 @@ -import {AbortError, BugError} from '@shopify/cli-kit/node/error' +import {AbortError, BugError} from '@shopify/cli-kit/shared/node/error' import { renderError, renderFatalError, @@ -6,7 +6,7 @@ import { renderSuccess, renderTable, renderWarning, -} from '@shopify/cli-kit/node/ui' +} from '@shopify/cli-kit/shared/node/ui' export async function staticService() { // Banners diff --git a/packages/cli/src/cli/services/upgrade.test.ts b/packages/cli/src/cli/services/upgrade.test.ts index 08407731792..9b51322e048 100644 --- a/packages/cli/src/cli/services/upgrade.test.ts +++ b/packages/cli/src/cli/services/upgrade.test.ts @@ -1,24 +1,24 @@ import {upgrade} from './upgrade.js' import * as upgradeService from './upgrade.js' import {afterEach, beforeEach, describe, expect, vi, test} from 'vitest' -import {platformAndArch} from '@shopify/cli-kit/node/os' -import * as nodePackageManager from '@shopify/cli-kit/node/node-package-manager' -import {exec, captureOutput} from '@shopify/cli-kit/node/system' -import {inTemporaryDirectory, touchFile, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath, normalizePath} from '@shopify/cli-kit/node/path' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' -import {AbortError} from '@shopify/cli-kit/node/error' +import {platformAndArch} from '@shopify/cli-kit/shared/node/os' +import * as nodePackageManager from '@shopify/cli-kit/shared/node/node-package-manager' +import {exec, captureOutput} from '@shopify/cli-kit/shared/node/system' +import {inTemporaryDirectory, touchFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, normalizePath} from '@shopify/cli-kit/shared/node/path' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' const oldCliVersion = '3.0.0' // just needs to be higher than oldCliVersion for these tests const currentCliVersion = '3.10.0' -vi.mock('@shopify/cli-kit/node/os', async () => { +vi.mock('@shopify/cli-kit/shared/node/os', async () => { return { platformAndArch: vi.fn(), } }) -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system') beforeEach(async () => { vi.mocked(platformAndArch).mockReturnValue({platform: 'windows', arch: 'amd64'}) diff --git a/packages/cli/src/cli/services/upgrade.ts b/packages/cli/src/cli/services/upgrade.ts index 0ae3524bd3d..414f3f7b937 100644 --- a/packages/cli/src/cli/services/upgrade.ts +++ b/packages/cli/src/cli/services/upgrade.ts @@ -7,12 +7,12 @@ import { getPackageManager, PackageJson, usesWorkspaces, -} from '@shopify/cli-kit/node/node-package-manager' -import {exec} from '@shopify/cli-kit/node/system' -import {dirname, joinPath, moduleDirectory} from '@shopify/cli-kit/node/path' -import {findPathUp, glob} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputInfo, outputSuccess, outputToken, outputWarn} from '@shopify/cli-kit/node/output' +} from '@shopify/cli-kit/shared/node/node-package-manager' +import {exec} from '@shopify/cli-kit/shared/node/system' +import {dirname, joinPath, moduleDirectory} from '@shopify/cli-kit/shared/node/path' +import {findPathUp, glob} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputInfo, outputSuccess, outputToken, outputWarn} from '@shopify/cli-kit/shared/node/output' type HomebrewPackageName = 'shopify-cli' | 'shopify-cli@3' diff --git a/packages/cli/src/hooks/postrun.ts b/packages/cli/src/hooks/postrun.ts index 9beb6f15d90..fadd41a6a72 100644 --- a/packages/cli/src/hooks/postrun.ts +++ b/packages/cli/src/hooks/postrun.ts @@ -1 +1 @@ -export {hook as default} from '@shopify/cli-kit/node/hooks/postrun' +export {hook as default} from '@shopify/cli-kit/shared/node/hooks/postrun' diff --git a/packages/cli/src/hooks/prerun.ts b/packages/cli/src/hooks/prerun.ts index c3283a474cb..62ac3afcbb5 100644 --- a/packages/cli/src/hooks/prerun.ts +++ b/packages/cli/src/hooks/prerun.ts @@ -1 +1 @@ -export {hook as default} from '@shopify/cli-kit/node/hooks/prerun' +export {hook as default} from '@shopify/cli-kit/shared/node/hooks/prerun' diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 6b361f0aeb5..b00a9a37d0e 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -23,9 +23,9 @@ import {commands as AppCommands} from '@shopify/app' import {commands as PluginCommandsCommands} from '@oclif/plugin-commands' import {commands as PluginPluginsCommands} from '@oclif/plugin-plugins' import {DidYouMeanCommands} from '@shopify/plugin-did-you-mean' -import {runCLI} from '@shopify/cli-kit/node/cli' -import {renderFatalError} from '@shopify/cli-kit/node/ui' -import {FatalError} from '@shopify/cli-kit/node/error' +import {runCLI} from '@shopify/cli-kit/shared/node/cli' +import {renderFatalError} from '@shopify/cli-kit/shared/node/ui' +import {FatalError} from '@shopify/cli-kit/shared/node/error' import fs from 'fs' export {DidYouMeanHook} from '@shopify/plugin-did-you-mean' diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json index e4ba62bb218..3e38b2e7f7c 100644 --- a/packages/cli/tsconfig.build.json +++ b/packages/cli/tsconfig.build.json @@ -1,8 +1,5 @@ { "extends": "./tsconfig.json", "exclude": ["**/*.test.ts"], - "references": [ - {"path": "../cli-kit"}, - {"path": "../plugin-did-you-mean"} - ] + "references": [{"path": "../cli-kit"}, {"path": "../plugin-did-you-mean"}] } diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index bf1343e50c8..4b3530516e6 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -7,8 +7,5 @@ "rootDir": "src", "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo" }, - "references": [ - {"path": "../cli-kit"}, - {"path": "../plugin-did-you-mean"} - ] + "references": [{"path": "../cli-kit"}, {"path": "../plugin-did-you-mean"}] } diff --git a/packages/create-app/src/hooks/postrun.ts b/packages/create-app/src/hooks/postrun.ts index 9beb6f15d90..fadd41a6a72 100644 --- a/packages/create-app/src/hooks/postrun.ts +++ b/packages/create-app/src/hooks/postrun.ts @@ -1 +1 @@ -export {hook as default} from '@shopify/cli-kit/node/hooks/postrun' +export {hook as default} from '@shopify/cli-kit/shared/node/hooks/postrun' diff --git a/packages/create-app/src/hooks/prerun.ts b/packages/create-app/src/hooks/prerun.ts index c3283a474cb..62ac3afcbb5 100644 --- a/packages/create-app/src/hooks/prerun.ts +++ b/packages/create-app/src/hooks/prerun.ts @@ -1 +1 @@ -export {hook as default} from '@shopify/cli-kit/node/hooks/prerun' +export {hook as default} from '@shopify/cli-kit/shared/node/hooks/prerun' diff --git a/packages/create-app/src/index.ts b/packages/create-app/src/index.ts index b3bdbcce8a0..fb148e638c6 100644 --- a/packages/create-app/src/index.ts +++ b/packages/create-app/src/index.ts @@ -1,5 +1,5 @@ import {commands} from '@shopify/app' -import {runCreateCLI} from '@shopify/cli-kit/node/cli' +import {runCreateCLI} from '@shopify/cli-kit/shared/node/cli' async function runCreateAppCLI(development: boolean) { await runCreateCLI({ diff --git a/packages/create-app/tsconfig.build.json b/packages/create-app/tsconfig.build.json index 16506ad61a2..9b6783c3430 100644 --- a/packages/create-app/tsconfig.build.json +++ b/packages/create-app/tsconfig.build.json @@ -1,7 +1,5 @@ { "extends": "./tsconfig.json", "exclude": ["**/*.test.ts"], - "references": [ - {"path": "../cli-kit"} - ] + "references": [{"path": "../cli-kit"}] } diff --git a/packages/create-app/tsconfig.json b/packages/create-app/tsconfig.json index ea7490fa22f..049b388e278 100644 --- a/packages/create-app/tsconfig.json +++ b/packages/create-app/tsconfig.json @@ -7,7 +7,5 @@ "rootDir": "src", "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo" }, - "references": [ - {"path": "../cli-kit"} - ] + "references": [{"path": "../cli-kit"}] } diff --git a/packages/eslint-plugin-cli/config.js b/packages/eslint-plugin-cli/config.js index c38bc7854aa..efa5328fdf9 100644 --- a/packages/eslint-plugin-cli/config.js +++ b/packages/eslint-plugin-cli/config.js @@ -86,19 +86,19 @@ module.exports = { paths: [ { name: 'path', - message: "Please use: import { joinPath } from '@shopify/cli-kit/node/path'", + message: "Please use: import { joinPath } from '@shopify/cli-kit/shared/node/path'", }, { name: 'node:path', - message: "Please use: import { joinPath } from '@shopify/cli-kit/node/path'", + message: "Please use: import { joinPath } from '@shopify/cli-kit/shared/node/path'", }, { name: 'child_process', - message: "Please use: import { exec } from '@shopify/cli-kit/node/system'", + message: "Please use: import { exec } from '@shopify/cli-kit/shared/node/system'", }, { name: 'node:child_process', - message: "Please use: import { exec } from '@shopify/cli-kit/node/system'", + message: "Please use: import { exec } from '@shopify/cli-kit/shared/node/system'", }, ], }, @@ -188,7 +188,7 @@ module.exports = { { name: 'fetch', message: - 'Please use our alternative fetch implementation in @shopify/cli-kit/node/http instead of Node.js built-in fetch. Built-in fetch does not support HTTP proxies.', + 'Please use our alternative fetch implementation in @shopify/cli-kit/shared/node/http instead of Node.js built-in fetch. Built-in fetch does not support HTTP proxies.', }, ], }, diff --git a/packages/plugin-cloudflare/src/install-cloudflared.test.ts b/packages/plugin-cloudflare/src/install-cloudflared.test.ts index 412cbcbeb5a..f989f07719c 100644 --- a/packages/plugin-cloudflare/src/install-cloudflared.test.ts +++ b/packages/plugin-cloudflare/src/install-cloudflared.test.ts @@ -1,6 +1,6 @@ import install, {CURRENT_CLOUDFLARE_VERSION, versionIsGreaterThan} from './install-cloudflared.js' -import * as fsActions from '@shopify/cli-kit/node/fs' -import * as http from '@shopify/cli-kit/node/http' +import * as fsActions from '@shopify/cli-kit/shared/node/fs' +import * as http from '@shopify/cli-kit/shared/node/http' import {beforeEach, describe, expect, test, vi} from 'vitest' import util from 'util' import {WriteStream} from 'fs' diff --git a/packages/plugin-cloudflare/src/install-cloudflared.ts b/packages/plugin-cloudflare/src/install-cloudflared.ts index d96d3ef8960..7dabdc1897e 100644 --- a/packages/plugin-cloudflare/src/install-cloudflared.ts +++ b/packages/plugin-cloudflare/src/install-cloudflared.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ // Install script for cloudflared, derived from https://github.com/JacobLinCool/node-cloudflared -import {basename, dirname, joinPath} from '@shopify/cli-kit/node/path' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {fetch} from '@shopify/cli-kit/node/http' +import {basename, dirname, joinPath} from '@shopify/cli-kit/shared/node/path' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {fetch} from '@shopify/cli-kit/shared/node/http' import { chmod, fileExistsSync, @@ -10,7 +10,7 @@ import { renameFile, unlinkFileSync, createFileWriteStream, -} from '@shopify/cli-kit/node/fs' +} from '@shopify/cli-kit/shared/node/fs' import {fileURLToPath} from 'url' import util from 'util' import {pipeline} from 'stream' diff --git a/packages/plugin-cloudflare/src/provider.ts b/packages/plugin-cloudflare/src/provider.ts index d3cd81a277b..7f20d5dc04c 100644 --- a/packages/plugin-cloudflare/src/provider.ts +++ b/packages/plugin-cloudflare/src/provider.ts @@ -1,4 +1,4 @@ -import {defineProvider} from '@shopify/cli-kit/node/plugins/tunnel' +import {defineProvider} from '@shopify/cli-kit/shared/node/plugins/tunnel' export const TUNNEL_PROVIDER = 'cloudflare' export default defineProvider({name: TUNNEL_PROVIDER}) diff --git a/packages/plugin-cloudflare/src/tunnel.test.ts b/packages/plugin-cloudflare/src/tunnel.test.ts index d7479a9526f..cf8d472c010 100644 --- a/packages/plugin-cloudflare/src/tunnel.test.ts +++ b/packages/plugin-cloudflare/src/tunnel.test.ts @@ -1,11 +1,11 @@ import {hookStart} from './tunnel.js' import install from './install-cloudflared.js' import {describe, vi, expect, test, beforeAll} from 'vitest' -import {exec} from '@shopify/cli-kit/node/system' +import {exec} from '@shopify/cli-kit/shared/node/system' import {Writable} from 'stream' const port = 1234 -vi.mock('@shopify/cli-kit/node/system') +vi.mock('@shopify/cli-kit/shared/node/system') vi.mock('./install-cloudflared.js') describe('hookStart', () => { diff --git a/packages/plugin-cloudflare/src/tunnel.ts b/packages/plugin-cloudflare/src/tunnel.ts index 73b5432e65f..472145b06a1 100644 --- a/packages/plugin-cloudflare/src/tunnel.ts +++ b/packages/plugin-cloudflare/src/tunnel.ts @@ -6,14 +6,14 @@ import { TunnelStartReturn, TunnelStatusType, TunnelClient, -} from '@shopify/cli-kit/node/plugins/tunnel' -import {err, ok} from '@shopify/cli-kit/node/result' -import {exec, sleep} from '@shopify/cli-kit/node/system' -import {AbortController} from '@shopify/cli-kit/node/abort' -import {joinPath, dirname} from '@shopify/cli-kit/node/path' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {isUnitTest} from '@shopify/cli-kit/node/context/local' -import {BugError} from '@shopify/cli-kit/node/error' +} from '@shopify/cli-kit/shared/node/plugins/tunnel' +import {err, ok} from '@shopify/cli-kit/shared/node/result' +import {exec, sleep} from '@shopify/cli-kit/shared/node/system' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' +import {joinPath, dirname} from '@shopify/cli-kit/shared/node/path' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {isUnitTest} from '@shopify/cli-kit/shared/node/context/local' +import {BugError} from '@shopify/cli-kit/shared/node/error' import {Writable} from 'stream' import {fileURLToPath} from 'url' diff --git a/packages/plugin-cloudflare/tsconfig.build.json b/packages/plugin-cloudflare/tsconfig.build.json index 16506ad61a2..9b6783c3430 100644 --- a/packages/plugin-cloudflare/tsconfig.build.json +++ b/packages/plugin-cloudflare/tsconfig.build.json @@ -1,7 +1,5 @@ { "extends": "./tsconfig.json", "exclude": ["**/*.test.ts"], - "references": [ - {"path": "../cli-kit"} - ] + "references": [{"path": "../cli-kit"}] } diff --git a/packages/plugin-cloudflare/tsconfig.json b/packages/plugin-cloudflare/tsconfig.json index 752cbc820ff..3dbb69f3b62 100644 --- a/packages/plugin-cloudflare/tsconfig.json +++ b/packages/plugin-cloudflare/tsconfig.json @@ -8,7 +8,5 @@ "rootDir": "src", "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo" }, - "references": [ - {"path": "../cli-kit"} - ] + "references": [{"path": "../cli-kit"}] } diff --git a/packages/plugin-did-you-mean/src/commands/config/autocorrect/off.test.ts b/packages/plugin-did-you-mean/src/commands/config/autocorrect/off.test.ts index f55cd877fe8..3aa6730ecf8 100644 --- a/packages/plugin-did-you-mean/src/commands/config/autocorrect/off.test.ts +++ b/packages/plugin-did-you-mean/src/commands/config/autocorrect/off.test.ts @@ -2,7 +2,7 @@ import AutocorrectOff from './off.js' import {setAutocorrect} from '../../../services/conf.js' import {Config} from '@oclif/core' import {describe, expect, vi, test} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' vi.mock('../../../services/conf.js') diff --git a/packages/plugin-did-you-mean/src/commands/config/autocorrect/off.ts b/packages/plugin-did-you-mean/src/commands/config/autocorrect/off.ts index 5cd30d4b0c4..df546a095f4 100644 --- a/packages/plugin-did-you-mean/src/commands/config/autocorrect/off.ts +++ b/packages/plugin-did-you-mean/src/commands/config/autocorrect/off.ts @@ -1,7 +1,7 @@ import {autocorrectStatus} from '../../../services/constants.js' import {setAutocorrect} from '../../../services/conf.js' -import Command from '@shopify/cli-kit/node/base-command' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' export default class AutocorrectOff extends Command { static summary = 'Disable autocorrect. Off by default.' diff --git a/packages/plugin-did-you-mean/src/commands/config/autocorrect/on.test.ts b/packages/plugin-did-you-mean/src/commands/config/autocorrect/on.test.ts index 59025187a8c..9bc05c157a3 100644 --- a/packages/plugin-did-you-mean/src/commands/config/autocorrect/on.test.ts +++ b/packages/plugin-did-you-mean/src/commands/config/autocorrect/on.test.ts @@ -2,7 +2,7 @@ import AutocorrectOn from './on.js' import {setAutocorrect} from '../../../services/conf.js' import {Config} from '@oclif/core' import {describe, expect, vi, test} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' vi.mock('../../../services/conf.js') diff --git a/packages/plugin-did-you-mean/src/commands/config/autocorrect/on.ts b/packages/plugin-did-you-mean/src/commands/config/autocorrect/on.ts index 0129817cdf5..c4fc44a9143 100644 --- a/packages/plugin-did-you-mean/src/commands/config/autocorrect/on.ts +++ b/packages/plugin-did-you-mean/src/commands/config/autocorrect/on.ts @@ -1,7 +1,7 @@ import {autocorrectStatus} from '../../../services/constants.js' import {setAutocorrect} from '../../../services/conf.js' -import Command from '@shopify/cli-kit/node/base-command' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' export default class AutocorrectOn extends Command { static summary = 'Enable autocorrect. Off by default.' diff --git a/packages/plugin-did-you-mean/src/commands/config/autocorrect/status.test.ts b/packages/plugin-did-you-mean/src/commands/config/autocorrect/status.test.ts index 59e6ea86c45..1e06a45c093 100644 --- a/packages/plugin-did-you-mean/src/commands/config/autocorrect/status.test.ts +++ b/packages/plugin-did-you-mean/src/commands/config/autocorrect/status.test.ts @@ -2,7 +2,7 @@ import AutocorrectStatus from './status.js' import {isAutocorrectEnabled} from '../../../services/conf.js' import {Config} from '@oclif/core' import {describe, expect, vi, test} from 'vitest' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' vi.mock('../../../services/conf.js') diff --git a/packages/plugin-did-you-mean/src/commands/config/autocorrect/status.ts b/packages/plugin-did-you-mean/src/commands/config/autocorrect/status.ts index 41796495c13..53ce8362f3a 100644 --- a/packages/plugin-did-you-mean/src/commands/config/autocorrect/status.ts +++ b/packages/plugin-did-you-mean/src/commands/config/autocorrect/status.ts @@ -1,7 +1,7 @@ import {autocorrectStatus} from '../../../services/constants.js' import {isAutocorrectEnabled} from '../../../services/conf.js' -import Command from '@shopify/cli-kit/node/base-command' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' export default class AutocorrectStatus extends Command { static summary = 'Check whether autocorrect is enabled or disabled. On by default.' diff --git a/packages/plugin-did-you-mean/src/index.test.ts b/packages/plugin-did-you-mean/src/index.test.ts index dfd938444d9..dfba615669b 100644 --- a/packages/plugin-did-you-mean/src/index.test.ts +++ b/packages/plugin-did-you-mean/src/index.test.ts @@ -1,7 +1,7 @@ import {findAlternativeCommand, shouldRunCommand} from './index.js' import {isAutocorrectEnabled} from './services/conf.js' import {describe, expect, vi, test} from 'vitest' -import {renderConfirmationPrompt} from '@shopify/cli-kit/node/ui' +import {renderConfirmationPrompt} from '@shopify/cli-kit/shared/node/ui' interface Config { commandIDs: string[] @@ -20,7 +20,7 @@ function buildConfig(commands: {id: string; hidden: boolean; aliases: string[]}[ } vi.mock('./services/conf.js') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('commandNotFound hook', () => { test('returns a probable match', () => { diff --git a/packages/plugin-did-you-mean/src/index.ts b/packages/plugin-did-you-mean/src/index.ts index a7472df62f1..02476223270 100644 --- a/packages/plugin-did-you-mean/src/index.ts +++ b/packages/plugin-did-you-mean/src/index.ts @@ -5,9 +5,9 @@ import AutocorrectStatus from './commands/config/autocorrect/status.js' import AutocorrectOn from './commands/config/autocorrect/on.js' import {Hook} from '@oclif/core' import {bigram} from 'n-gram' -import {renderConfirmationPrompt, renderFatalError, renderInfo} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputDebug} from '@shopify/cli-kit/node/output' +import {renderConfirmationPrompt, renderFatalError, renderInfo} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' function sanitizeCmd(cmd: string): string { return cmd.replace(/:/g, ' ') diff --git a/packages/plugin-did-you-mean/src/services/conf.test.ts b/packages/plugin-did-you-mean/src/services/conf.test.ts index 1bdae9a659c..f7ee1238761 100644 --- a/packages/plugin-did-you-mean/src/services/conf.test.ts +++ b/packages/plugin-did-you-mean/src/services/conf.test.ts @@ -1,7 +1,7 @@ import {ConfigSchema, isAutocorrectEnabled, setAutocorrect} from './conf.js' import {describe, expect, test} from 'vitest' -import {inTemporaryDirectory} from '@shopify/cli-kit/node/fs' -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' +import {inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' describe('did-you-mean config', async () => { test('isAutocorrectEnabled returns false if no cached value exists', async () => { diff --git a/packages/plugin-did-you-mean/src/services/conf.ts b/packages/plugin-did-you-mean/src/services/conf.ts index 631db7730f7..6be1b722b65 100644 --- a/packages/plugin-did-you-mean/src/services/conf.ts +++ b/packages/plugin-did-you-mean/src/services/conf.ts @@ -1,4 +1,4 @@ -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' export function isAutocorrectEnabled(conf: LocalStorage = getConfig()): boolean { return Boolean(conf.get('autocorrectEnabled')) diff --git a/packages/plugin-did-you-mean/tsconfig.build.json b/packages/plugin-did-you-mean/tsconfig.build.json index 16506ad61a2..9b6783c3430 100644 --- a/packages/plugin-did-you-mean/tsconfig.build.json +++ b/packages/plugin-did-you-mean/tsconfig.build.json @@ -1,7 +1,5 @@ { "extends": "./tsconfig.json", "exclude": ["**/*.test.ts"], - "references": [ - {"path": "../cli-kit"} - ] + "references": [{"path": "../cli-kit"}] } diff --git a/packages/plugin-did-you-mean/tsconfig.json b/packages/plugin-did-you-mean/tsconfig.json index ea7490fa22f..049b388e278 100644 --- a/packages/plugin-did-you-mean/tsconfig.json +++ b/packages/plugin-did-you-mean/tsconfig.json @@ -7,7 +7,5 @@ "rootDir": "src", "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo" }, - "references": [ - {"path": "../cli-kit"} - ] + "references": [{"path": "../cli-kit"}] } diff --git a/packages/theme/src/cli/commands/theme/check.ts b/packages/theme/src/cli/commands/theme/check.ts index 52581848e37..ca80d4a4b90 100644 --- a/packages/theme/src/cli/commands/theme/check.ts +++ b/packages/theme/src/cli/commands/theme/check.ts @@ -14,15 +14,15 @@ import { } from '../../services/check.js' import ThemeCommand, {RequiredFlags} from '../../utilities/theme-command.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {outputResult, outputDebug} from '@shopify/cli-kit/node/output' -import {renderInfo, renderSuccess} from '@shopify/cli-kit/node/ui' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {outputResult, outputDebug} from '@shopify/cli-kit/shared/node/output' +import {renderInfo, renderSuccess} from '@shopify/cli-kit/shared/node/ui' import {themeCheckRun, LegacyIdentifiers} from '@shopify/theme-check-node' -import {findPathUp} from '@shopify/cli-kit/node/fs' -import {moduleDirectory, joinPath} from '@shopify/cli-kit/node/path' -import {getPackageVersion} from '@shopify/cli-kit/node/node-package-manager' +import {findPathUp} from '@shopify/cli-kit/shared/node/fs' +import {moduleDirectory, joinPath} from '@shopify/cli-kit/shared/node/path' +import {getPackageVersion} from '@shopify/cli-kit/shared/node/node-package-manager' import {InferredFlags} from '@oclif/core/interfaces' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' type CheckFlags = InferredFlags export default class Check extends ThemeCommand { diff --git a/packages/theme/src/cli/commands/theme/console.ts b/packages/theme/src/cli/commands/theme/console.ts index ac86ac094db..c97f8a22f44 100644 --- a/packages/theme/src/cli/commands/theme/console.ts +++ b/packages/theme/src/cli/commands/theme/console.ts @@ -1,10 +1,10 @@ import {themeFlags} from '../../flags.js' import ThemeCommand, {RequiredFlags} from '../../utilities/theme-command.js' import {ensureReplEnv, initializeRepl} from '../../services/console.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {AdminSession} from '@shopify/cli-kit/identity/session' import {Flags} from '@oclif/core' -import {recordEvent} from '@shopify/cli-kit/node/analytics' +import {recordEvent} from '@shopify/cli-kit/shared/node/analytics' import {InferredFlags} from '@oclif/core/interfaces' type ConsoleFlags = InferredFlags diff --git a/packages/theme/src/cli/commands/theme/delete.ts b/packages/theme/src/cli/commands/theme/delete.ts index 09f0f8a43a9..563a4556323 100644 --- a/packages/theme/src/cli/commands/theme/delete.ts +++ b/packages/theme/src/cli/commands/theme/delete.ts @@ -2,9 +2,9 @@ import ThemeCommand from '../../utilities/theme-command.js' import {themeFlags} from '../../flags.js' import {themesDelete} from '../../services/delete.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' import {OutputFlags} from '@oclif/core/interfaces' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' type DeleteFlags = OutputFlags export default class Delete extends ThemeCommand { diff --git a/packages/theme/src/cli/commands/theme/dev.ts b/packages/theme/src/cli/commands/theme/dev.ts index dafb12d03f1..5704073e892 100644 --- a/packages/theme/src/cli/commands/theme/dev.ts +++ b/packages/theme/src/cli/commands/theme/dev.ts @@ -6,10 +6,10 @@ import {findOrSelectTheme} from '../../utilities/theme-selector.js' import {metafieldsPull} from '../../services/metafields-pull.js' import {ensureLiveThemeConfirmed} from '../../utilities/theme-ui.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {recordEvent} from '@shopify/cli-kit/node/analytics' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {Theme} from '@shopify/cli-kit/themes/types' +import {recordEvent} from '@shopify/cli-kit/shared/node/analytics' +import {AdminSession} from '@shopify/cli-kit/identity/session' import {InferredFlags} from '@oclif/core/interfaces' import type {ErrorOverlayMode, LiveReload} from '../../utilities/theme-environment/types.js' diff --git a/packages/theme/src/cli/commands/theme/duplicate.ts b/packages/theme/src/cli/commands/theme/duplicate.ts index ab39b96c6df..c4498c10522 100644 --- a/packages/theme/src/cli/commands/theme/duplicate.ts +++ b/packages/theme/src/cli/commands/theme/duplicate.ts @@ -3,8 +3,8 @@ import {themeFlags} from '../../flags.js' import ThemeCommand from '../../utilities/theme-command.js' import {duplicate} from '../../services/duplicate.js' import {Flags} from '@oclif/core' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' -import {ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' +import {ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' export default class Duplicate extends ThemeCommand { static summary = 'Duplicates a theme from your theme library.' diff --git a/packages/theme/src/cli/commands/theme/info.ts b/packages/theme/src/cli/commands/theme/info.ts index 56a36833fa3..a8d73b86997 100644 --- a/packages/theme/src/cli/commands/theme/info.ts +++ b/packages/theme/src/cli/commands/theme/info.ts @@ -2,13 +2,13 @@ import {themeFlags} from '../../flags.js' import {fetchThemeInfo, fetchDevInfo, formatThemeInfo} from '../../services/info.js' import ThemeCommand from '../../utilities/theme-command.js' import {Flags} from '@oclif/core' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {AbortError} from '@shopify/cli-kit/node/error' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' -import {outputResult} from '@shopify/cli-kit/node/output' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' +import {outputResult} from '@shopify/cli-kit/shared/node/output' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' import {OutputFlags} from '@oclif/core/interfaces' -import {recordTiming} from '@shopify/cli-kit/node/analytics' +import {recordTiming} from '@shopify/cli-kit/shared/node/analytics' type InfoFlags = OutputFlags diff --git a/packages/theme/src/cli/commands/theme/init.ts b/packages/theme/src/cli/commands/theme/init.ts index a97206bf853..e784a639ade 100644 --- a/packages/theme/src/cli/commands/theme/init.ts +++ b/packages/theme/src/cli/commands/theme/init.ts @@ -8,13 +8,13 @@ import { promptAIInstruction, } from '../../services/init.js' import {Args, Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {generateRandomNameForSubdirectory} from '@shopify/cli-kit/node/fs' -import {renderTextPrompt} from '@shopify/cli-kit/node/ui' -import {joinPath} from '@shopify/cli-kit/node/path' -import {terminalSupportsPrompting} from '@shopify/cli-kit/node/system' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {generateRandomNameForSubdirectory} from '@shopify/cli-kit/shared/node/fs' +import {renderTextPrompt} from '@shopify/cli-kit/shared/node/ui' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {terminalSupportsPrompting} from '@shopify/cli-kit/shared/node/system' import {InferredArgs, InferredFlags} from '@oclif/core/interfaces' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' type InitFlags = InferredFlags type InitArgs = InferredArgs diff --git a/packages/theme/src/cli/commands/theme/language-server.ts b/packages/theme/src/cli/commands/theme/language-server.ts index 25f644a8aa5..74dd3620164 100644 --- a/packages/theme/src/cli/commands/theme/language-server.ts +++ b/packages/theme/src/cli/commands/theme/language-server.ts @@ -1,5 +1,5 @@ import ThemeCommand, {RequiredFlags} from '../../utilities/theme-command.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' import {startServer} from '@shopify/theme-language-server-node' export default class LanguageServer extends ThemeCommand { diff --git a/packages/theme/src/cli/commands/theme/list.ts b/packages/theme/src/cli/commands/theme/list.ts index 531be086d93..b07a2befee9 100644 --- a/packages/theme/src/cli/commands/theme/list.ts +++ b/packages/theme/src/cli/commands/theme/list.ts @@ -3,9 +3,9 @@ import {themeFlags} from '../../flags.js' import ThemeCommand from '../../utilities/theme-command.js' import {list} from '../../services/list.js' import {Flags} from '@oclif/core' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' import {OutputFlags} from '@oclif/core/interfaces' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' type ListFlags = OutputFlags diff --git a/packages/theme/src/cli/commands/theme/metafields/pull.ts b/packages/theme/src/cli/commands/theme/metafields/pull.ts index 7a0f3e6d426..0ac6e0db46e 100644 --- a/packages/theme/src/cli/commands/theme/metafields/pull.ts +++ b/packages/theme/src/cli/commands/theme/metafields/pull.ts @@ -1,7 +1,7 @@ import {themeFlags} from '../../../flags.js' import {metafieldsPull, MetafieldsPullFlags} from '../../../services/metafields-pull.js' import ThemeCommand, {RequiredFlags} from '../../../utilities/theme-command.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' import {Flags} from '@oclif/core' import {InferredFlags} from '@oclif/core/interfaces' diff --git a/packages/theme/src/cli/commands/theme/open.ts b/packages/theme/src/cli/commands/theme/open.ts index 67f73bc9f4b..4d3290fed0b 100644 --- a/packages/theme/src/cli/commands/theme/open.ts +++ b/packages/theme/src/cli/commands/theme/open.ts @@ -2,8 +2,8 @@ import ThemeCommand, {RequiredFlags} from '../../utilities/theme-command.js' import {themeFlags} from '../../flags.js' import {open} from '../../services/open.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {AdminSession} from '@shopify/cli-kit/identity/session' import {InferredFlags} from '@oclif/core/interfaces' type OpenFlags = InferredFlags diff --git a/packages/theme/src/cli/commands/theme/package.ts b/packages/theme/src/cli/commands/theme/package.ts index aaf1303518e..6ea46fcac97 100644 --- a/packages/theme/src/cli/commands/theme/package.ts +++ b/packages/theme/src/cli/commands/theme/package.ts @@ -1,7 +1,7 @@ import {themeFlags} from '../../flags.js' import ThemeCommand, {RequiredFlags} from '../../utilities/theme-command.js' import {packageTheme} from '../../services/package.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' import {InferredFlags} from '@oclif/core/interfaces' type PackageFlags = InferredFlags diff --git a/packages/theme/src/cli/commands/theme/profile.ts b/packages/theme/src/cli/commands/theme/profile.ts index 182e84479e8..9e6cde36e52 100644 --- a/packages/theme/src/cli/commands/theme/profile.ts +++ b/packages/theme/src/cli/commands/theme/profile.ts @@ -4,10 +4,10 @@ import {profile} from '../../services/profile.js' import {findOrSelectTheme} from '../../utilities/theme-selector.js' import {renderTasksToStdErr} from '../../utilities/theme-ui.js' import {Flags} from '@oclif/core' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' -import {Task} from '@shopify/cli-kit/node/ui' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' +import {Task} from '@shopify/cli-kit/shared/node/ui' import {InferredFlags} from '@oclif/core/interfaces' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' type ProfileFlags = InferredFlags export default class Profile extends ThemeCommand { diff --git a/packages/theme/src/cli/commands/theme/publish.ts b/packages/theme/src/cli/commands/theme/publish.ts index c55a94725a0..ecae3eed580 100644 --- a/packages/theme/src/cli/commands/theme/publish.ts +++ b/packages/theme/src/cli/commands/theme/publish.ts @@ -2,9 +2,9 @@ import ThemeCommand from '../../utilities/theme-command.js' import {themeFlags} from '../../flags.js' import {publish} from '../../services/publish.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' import {OutputFlags} from '@oclif/core/interfaces' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' type PublishFlags = OutputFlags diff --git a/packages/theme/src/cli/commands/theme/pull.ts b/packages/theme/src/cli/commands/theme/pull.ts index 77e853ded10..215f67540a9 100644 --- a/packages/theme/src/cli/commands/theme/pull.ts +++ b/packages/theme/src/cli/commands/theme/pull.ts @@ -1,12 +1,12 @@ import {globFlags, themeFlags} from '../../flags.js' import ThemeCommand, {RequiredFlags} from '../../utilities/theme-command.js' import {pull} from '../../services/pull.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' import {Flags} from '@oclif/core' -import {recordTiming} from '@shopify/cli-kit/node/analytics' +import {recordTiming} from '@shopify/cli-kit/shared/node/analytics' import {InferredFlags} from '@oclif/core/interfaces' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {ArgOutput} from '@shopify/cli-kit/node/base-command' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {ArgOutput} from '@shopify/cli-kit/shared/node/base-command' import {Writable} from 'stream' type PullFlags = InferredFlags diff --git a/packages/theme/src/cli/commands/theme/push.ts b/packages/theme/src/cli/commands/theme/push.ts index ea275cd7a95..cfc3c3b8fe9 100644 --- a/packages/theme/src/cli/commands/theme/push.ts +++ b/packages/theme/src/cli/commands/theme/push.ts @@ -2,11 +2,11 @@ import {globFlags, themeFlags} from '../../flags.js' import ThemeCommand from '../../utilities/theme-command.js' import {push} from '../../services/push.js' import {Flags} from '@oclif/core' -import {globalFlags, jsonFlag} from '@shopify/cli-kit/node/cli' -import {recordTiming} from '@shopify/cli-kit/node/analytics' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {globalFlags, jsonFlag} from '@shopify/cli-kit/shared/node/cli' +import {recordTiming} from '@shopify/cli-kit/shared/node/analytics' +import {AdminSession} from '@shopify/cli-kit/identity/session' import {InferredFlags} from '@oclif/core/interfaces' -import {ArgOutput} from '@shopify/cli-kit/node/base-command' +import {ArgOutput} from '@shopify/cli-kit/shared/node/base-command' import {Writable} from 'stream' type PushFlags = InferredFlags diff --git a/packages/theme/src/cli/commands/theme/rename.ts b/packages/theme/src/cli/commands/theme/rename.ts index 6244d678b18..a961dc08b56 100644 --- a/packages/theme/src/cli/commands/theme/rename.ts +++ b/packages/theme/src/cli/commands/theme/rename.ts @@ -2,8 +2,8 @@ import ThemeCommand, {RequiredFlags} from '../../utilities/theme-command.js' import {themeFlags} from '../../flags.js' import {RenameOptions, renameTheme} from '../../services/rename.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {AdminSession} from '@shopify/cli-kit/identity/session' export default class Rename extends ThemeCommand { static summary = 'Renames an existing theme.' diff --git a/packages/theme/src/cli/commands/theme/serve.ts b/packages/theme/src/cli/commands/theme/serve.ts index df5b755eb81..f79761e2ba7 100644 --- a/packages/theme/src/cli/commands/theme/serve.ts +++ b/packages/theme/src/cli/commands/theme/serve.ts @@ -1,5 +1,5 @@ import Dev from './dev.js' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' export default class Serve extends Dev { static hidden = true diff --git a/packages/theme/src/cli/commands/theme/share.ts b/packages/theme/src/cli/commands/theme/share.ts index 49af1a76be0..a4d583c2bf4 100644 --- a/packages/theme/src/cli/commands/theme/share.ts +++ b/packages/theme/src/cli/commands/theme/share.ts @@ -2,12 +2,12 @@ import {themeFlags} from '../../flags.js' import ThemeCommand from '../../utilities/theme-command.js' import {push, PushFlags} from '../../services/push.js' import {Flags} from '@oclif/core' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import {getRandomName} from '@shopify/cli-kit/common/string' -import {recordTiming} from '@shopify/cli-kit/node/analytics' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import {getRandomName} from '@shopify/cli-kit/shared/common/string' +import {recordTiming} from '@shopify/cli-kit/shared/node/analytics' import {InferredFlags} from '@oclif/core/interfaces' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {ArgOutput} from '@shopify/cli-kit/node/base-command' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {ArgOutput} from '@shopify/cli-kit/shared/node/base-command' import {Writable} from 'stream' type ShareFlags = InferredFlags diff --git a/packages/theme/src/cli/flags.test.ts b/packages/theme/src/cli/flags.test.ts index fc9c1be8d86..2b48c08fcd5 100644 --- a/packages/theme/src/cli/flags.test.ts +++ b/packages/theme/src/cli/flags.test.ts @@ -1,9 +1,9 @@ import {themeFlags} from './flags.js' import {describe, expect, test} from 'vitest' -import Command from '@shopify/cli-kit/node/base-command' -import {inTemporaryDirectory} from '@shopify/cli-kit/node/fs' -import {cwd, resolvePath} from '@shopify/cli-kit/node/path' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import Command from '@shopify/cli-kit/shared/node/base-command' +import {inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' +import {cwd, resolvePath} from '@shopify/cli-kit/shared/node/path' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' class MockCommand extends Command { static flags = { diff --git a/packages/theme/src/cli/flags.ts b/packages/theme/src/cli/flags.ts index c78a406341d..4a71157de24 100644 --- a/packages/theme/src/cli/flags.ts +++ b/packages/theme/src/cli/flags.ts @@ -1,8 +1,8 @@ import {Flags} from '@oclif/core' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' -import {resolvePath, cwd} from '@shopify/cli-kit/node/path' -import {fileExistsSync} from '@shopify/cli-kit/node/fs' -import {renderError} from '@shopify/cli-kit/node/ui' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' +import {resolvePath, cwd} from '@shopify/cli-kit/shared/node/path' +import {fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {renderError} from '@shopify/cli-kit/shared/node/ui' /** * An object that contains the flags that diff --git a/packages/theme/src/cli/services/check.test.ts b/packages/theme/src/cli/services/check.test.ts index d00e36ab646..84a69916b2c 100644 --- a/packages/theme/src/cli/services/check.test.ts +++ b/packages/theme/src/cli/services/check.test.ts @@ -7,9 +7,9 @@ import { renderOffensesText, sortOffenses, } from './check.js' -import {fileExists, readFileSync, writeFile} from '@shopify/cli-kit/node/fs' -import {outputInfo, outputSuccess} from '@shopify/cli-kit/node/output' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import {fileExists, readFileSync, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {outputInfo, outputSuccess} from '@shopify/cli-kit/shared/node/output' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' import { Severity, SourceCodeType, @@ -20,13 +20,13 @@ import { } from '@shopify/theme-check-node' import {Mock, beforeEach, describe, expect, test, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/fs', async () => ({ +vi.mock('@shopify/cli-kit/shared/node/fs', async () => ({ fileExists: vi.fn(), writeFile: vi.fn(), readFileSync: vi.fn(), })) -vi.mock('@shopify/cli-kit/node/output', async () => ({ +vi.mock('@shopify/cli-kit/shared/node/output', async () => ({ outputInfo: vi.fn(), outputSuccess: vi.fn(), })) @@ -39,7 +39,7 @@ vi.mock('@shopify/theme-check-node', async () => { } }) -vi.mock('@shopify/cli-kit/node/ui', async () => ({ +vi.mock('@shopify/cli-kit/shared/node/ui', async () => ({ renderInfo: vi.fn(), })) diff --git a/packages/theme/src/cli/services/check.ts b/packages/theme/src/cli/services/check.ts index 210f5177599..fe03d17e2bb 100644 --- a/packages/theme/src/cli/services/check.ts +++ b/packages/theme/src/cli/services/check.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import {fileExists, readFileSync, writeFile} from '@shopify/cli-kit/node/fs' -import {outputResult, outputInfo, outputSuccess} from '@shopify/cli-kit/node/output' -import {joinPath} from '@shopify/cli-kit/node/path' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import {fileExists, readFileSync, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {outputResult, outputInfo, outputSuccess} from '@shopify/cli-kit/shared/node/output' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' import { Severity, applyFixToString, diff --git a/packages/theme/src/cli/services/console.test.ts b/packages/theme/src/cli/services/console.test.ts index bb341ddcaa5..cefd0edac01 100644 --- a/packages/theme/src/cli/services/console.test.ts +++ b/packages/theme/src/cli/services/console.test.ts @@ -5,8 +5,8 @@ import { } from '../utilities/theme-environment/storefront-session.js' import {ensureValidPassword} from '../utilities/theme-environment/storefront-password-prompt.js' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {AbortError} from '@shopify/cli-kit/shared/node/error' vi.mock('../utilities/theme-environment/storefront-password-prompt.js') vi.mock('../utilities/theme-environment/storefront-session.js') diff --git a/packages/theme/src/cli/services/console.ts b/packages/theme/src/cli/services/console.ts index 4ad2674ed7f..88cc235b329 100644 --- a/packages/theme/src/cli/services/console.ts +++ b/packages/theme/src/cli/services/console.ts @@ -3,9 +3,9 @@ import {REPLThemeManager} from '../utilities/repl/repl-theme-manager.js' import {ensureValidPassword} from '../utilities/theme-environment/storefront-password-prompt.js' import {replLoop} from '../utilities/repl/repl.js' import {initializeDevServerSession} from '../utilities/theme-environment/dev-server-session.js' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {outputInfo} from '@shopify/cli-kit/node/output' -import {AbortError} from '@shopify/cli-kit/node/error' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export async function ensureReplEnv(adminSession: AdminSession, storePasswordFlag?: string) { const themeId = await findOrCreateReplTheme(adminSession) diff --git a/packages/theme/src/cli/services/delete.test.ts b/packages/theme/src/cli/services/delete.test.ts index 0c17407802c..8a7d493ca61 100644 --- a/packages/theme/src/cli/services/delete.test.ts +++ b/packages/theme/src/cli/services/delete.test.ts @@ -1,12 +1,12 @@ import {themesDelete} from './delete.js' import {findOrSelectTheme, findThemes} from '../utilities/theme-selector.js' -import {themeDelete} from '@shopify/cli-kit/node/themes/api' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {themeDelete} from '@shopify/cli-kit/themes/api' +import {Theme} from '@shopify/cli-kit/themes/types' import {test, describe, expect, vi} from 'vitest' -import {renderConfirmationPrompt, renderSuccess} from '@shopify/cli-kit/node/ui' +import {renderConfirmationPrompt, renderSuccess} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('../utilities/theme-selector.js') vi.mock('../utilities/development-theme-manager.js', () => { const DevelopmentThemeManager = vi.fn() diff --git a/packages/theme/src/cli/services/delete.ts b/packages/theme/src/cli/services/delete.ts index 3bdd1287c8b..c306ee17a86 100644 --- a/packages/theme/src/cli/services/delete.ts +++ b/packages/theme/src/cli/services/delete.ts @@ -2,18 +2,18 @@ import {removeDevelopmentTheme} from './local-storage.js' import {findOrSelectTheme, findThemes} from '../utilities/theme-selector.js' import {themeComponent, themesComponent} from '../utilities/theme-ui.js' import {DevelopmentThemeManager} from '../utilities/development-theme-manager.js' -import {themeDelete} from '@shopify/cli-kit/node/themes/api' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {themeDelete} from '@shopify/cli-kit/themes/api' +import {AdminSession} from '@shopify/cli-kit/identity/session' import { renderConfirmationPrompt, RenderConfirmationPromptOptions, renderSuccess, InlineToken, LinkToken, -} from '@shopify/cli-kit/node/ui' -import {pluralize} from '@shopify/cli-kit/common/string' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {isDevelopmentTheme} from '@shopify/cli-kit/node/themes/utils' +} from '@shopify/cli-kit/shared/node/ui' +import {pluralize} from '@shopify/cli-kit/shared/common/string' +import {Theme} from '@shopify/cli-kit/themes/types' +import {isDevelopmentTheme} from '@shopify/cli-kit/themes/utils' interface DeleteOptions { selectTheme: boolean diff --git a/packages/theme/src/cli/services/dev.test.ts b/packages/theme/src/cli/services/dev.test.ts index f0ebf6f3e90..55802ff9459 100644 --- a/packages/theme/src/cli/services/dev.test.ts +++ b/packages/theme/src/cli/services/dev.test.ts @@ -1,19 +1,19 @@ import {openURLSafely, renderLinks, createKeypressHandler} from './dev.js' import {describe, expect, test, vi, beforeEach, afterEach} from 'vitest' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui' -import {openURL} from '@shopify/cli-kit/node/system' +import {buildTheme} from '@shopify/cli-kit/themes/factories' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {renderSuccess, renderWarning} from '@shopify/cli-kit/shared/node/ui' +import {openURL} from '@shopify/cli-kit/shared/node/system' -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/colors', () => ({ +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/shared/node/colors', () => ({ default: { bold: (str: string) => str, cyan: (str: string) => str, gray: (str: string) => str, }, })) -vi.mock('@shopify/cli-kit/node/system', () => ({ +vi.mock('@shopify/cli-kit/shared/node/system', () => ({ openURL: vi.fn(), })) diff --git a/packages/theme/src/cli/services/dev.ts b/packages/theme/src/cli/services/dev.ts index 36605935f35..9a6f6e1c79c 100644 --- a/packages/theme/src/cli/services/dev.ts +++ b/packages/theme/src/cli/services/dev.ts @@ -7,14 +7,14 @@ import {ensureValidPassword} from '../utilities/theme-environment/storefront-pas import {emptyThemeExtFileSystem} from '../utilities/theme-fs-empty.js' import {initializeDevServerSession} from '../utilities/theme-environment/dev-server-session.js' import {ensureListingExists} from '../utilities/theme-listing.js' -import {renderSuccess, renderWarning} from '@shopify/cli-kit/node/ui' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {checkPortAvailability, getAvailableTCPPort} from '@shopify/cli-kit/node/tcp' -import {AbortError} from '@shopify/cli-kit/node/error' -import {openURL} from '@shopify/cli-kit/node/system' -import {debounce} from '@shopify/cli-kit/common/function' -import chalk from '@shopify/cli-kit/node/colors' +import {renderSuccess, renderWarning} from '@shopify/cli-kit/shared/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {Theme} from '@shopify/cli-kit/themes/types' +import {checkPortAvailability, getAvailableTCPPort} from '@shopify/cli-kit/shared/node/tcp' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {openURL} from '@shopify/cli-kit/shared/node/system' +import {debounce} from '@shopify/cli-kit/shared/common/function' +import chalk from '@shopify/cli-kit/shared/node/colors' import readline from 'readline' const DEFAULT_HOST = '127.0.0.1' diff --git a/packages/theme/src/cli/services/duplicate.test.ts b/packages/theme/src/cli/services/duplicate.test.ts index 9072f03c757..afaad5b5aca 100644 --- a/packages/theme/src/cli/services/duplicate.test.ts +++ b/packages/theme/src/cli/services/duplicate.test.ts @@ -3,18 +3,18 @@ import {duplicate} from './duplicate.js' import {findThemeById, findOrSelectTheme} from '../utilities/theme-selector.js' import {themeComponent} from '../utilities/theme-ui.js' import {configureCLIEnvironment} from '../utilities/cli-config.js' -import {themeDuplicate} from '@shopify/cli-kit/node/themes/api' -import {renderConfirmationPrompt, renderError, renderSuccess} from '@shopify/cli-kit/node/ui' -import {outputResult} from '@shopify/cli-kit/node/output' -import {isCI} from '@shopify/cli-kit/node/system' +import {themeDuplicate} from '@shopify/cli-kit/themes/api' +import {renderConfirmationPrompt, renderError, renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {outputResult} from '@shopify/cli-kit/shared/node/output' +import {isCI} from '@shopify/cli-kit/shared/node/system' import {vi, describe, test, expect, beforeEach} from 'vitest' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {Theme} from '@shopify/cli-kit/themes/types' +import {AdminSession} from '@shopify/cli-kit/identity/session' -vi.mock('@shopify/cli-kit/node/system') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/system') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/output') vi.mock('../utilities/theme-selector.js') vi.mock('../utilities/theme-ui.js') vi.mock('../utilities/cli-config.js') diff --git a/packages/theme/src/cli/services/duplicate.ts b/packages/theme/src/cli/services/duplicate.ts index 98a786f4315..a8aec225973 100644 --- a/packages/theme/src/cli/services/duplicate.ts +++ b/packages/theme/src/cli/services/duplicate.ts @@ -1,13 +1,13 @@ import {themeComponent} from '../utilities/theme-ui.js' import {configureCLIEnvironment} from '../utilities/cli-config.js' import {findOrSelectTheme, findThemeById} from '../utilities/theme-selector.js' -import {renderConfirmationPrompt, renderError, renderSuccess} from '@shopify/cli-kit/node/ui' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {outputResult} from '@shopify/cli-kit/node/output' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {themePreviewUrl} from '@shopify/cli-kit/node/themes/urls' -import {themeDuplicate, ThemeDuplicateResult} from '@shopify/cli-kit/node/themes/api' -import {isCI} from '@shopify/cli-kit/node/system' +import {renderConfirmationPrompt, renderError, renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {outputResult} from '@shopify/cli-kit/shared/node/output' +import {Theme} from '@shopify/cli-kit/themes/types' +import {themePreviewUrl} from '@shopify/cli-kit/themes/urls' +import {themeDuplicate, ThemeDuplicateResult} from '@shopify/cli-kit/themes/api' +import {isCI} from '@shopify/cli-kit/shared/node/system' interface DuplicateFlags { /** Password generated from the Theme Access app. */ diff --git a/packages/theme/src/cli/services/info.test.ts b/packages/theme/src/cli/services/info.test.ts index f7f95b1bc6e..2a0ee0e02ce 100644 --- a/packages/theme/src/cli/services/info.test.ts +++ b/packages/theme/src/cli/services/info.test.ts @@ -1,8 +1,8 @@ import {themeInfoJSON, fetchThemeInfo} from './info.js' import {findOrSelectTheme} from '../utilities/theme-selector.js' import {DevelopmentThemeManager} from '../utilities/development-theme-manager.js' -import {themePreviewUrl, themeEditorUrl} from '@shopify/cli-kit/node/themes/urls' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {themePreviewUrl, themeEditorUrl} from '@shopify/cli-kit/themes/urls' +import {Theme} from '@shopify/cli-kit/themes/types' import {describe, vi, test, expect} from 'vitest' vi.mock('../utilities/development-theme-manager.js') diff --git a/packages/theme/src/cli/services/info.ts b/packages/theme/src/cli/services/info.ts index ab7c752cc7d..f9a867f4674 100644 --- a/packages/theme/src/cli/services/info.ts +++ b/packages/theme/src/cli/services/info.ts @@ -1,12 +1,12 @@ import {getDevelopmentTheme, getThemeStore} from './local-storage.js' import {findOrSelectTheme} from '../utilities/theme-selector.js' import {DevelopmentThemeManager} from '../utilities/development-theme-manager.js' -import {platformAndArch} from '@shopify/cli-kit/node/os' -import {themeEditorUrl, themePreviewUrl} from '@shopify/cli-kit/node/themes/urls' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {AlertCustomSection, InlineToken} from '@shopify/cli-kit/node/ui' -import {recordEvent} from '@shopify/cli-kit/node/analytics' +import {platformAndArch} from '@shopify/cli-kit/shared/node/os' +import {themeEditorUrl, themePreviewUrl} from '@shopify/cli-kit/themes/urls' +import {Theme} from '@shopify/cli-kit/themes/types' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {AlertCustomSection, InlineToken} from '@shopify/cli-kit/shared/node/ui' +import {recordEvent} from '@shopify/cli-kit/shared/node/analytics' interface ThemeInfo { theme: { diff --git a/packages/theme/src/cli/services/init.test.ts b/packages/theme/src/cli/services/init.test.ts index 41254efed68..71f7008cfb1 100644 --- a/packages/theme/src/cli/services/init.test.ts +++ b/packages/theme/src/cli/services/init.test.ts @@ -1,12 +1,12 @@ import {cloneRepoAndCheckoutLatestTag, cloneRepo, createAIInstructions, createAIInstructionFiles} from './init.js' import {describe, expect, vi, test, beforeEach} from 'vitest' -import {downloadGitRepository, removeGitRemote} from '@shopify/cli-kit/node/git' -import {rmdir, fileExists, readFile, writeFile, symlink} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {downloadGitRepository, removeGitRemote} from '@shopify/cli-kit/shared/node/git' +import {rmdir, fileExists, readFile, writeFile, symlink} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' -vi.mock('@shopify/cli-kit/node/git') -vi.mock('@shopify/cli-kit/node/fs', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/git') +vi.mock('@shopify/cli-kit/shared/node/fs', async () => { + const actual = await vi.importActual('@shopify/cli-kit/shared/node/fs') return { ...actual, fileExists: vi.fn(), @@ -20,10 +20,10 @@ vi.mock('@shopify/cli-kit/node/fs', async () => { }), } }) -vi.mock('@shopify/cli-kit/node/http') -vi.mock('@shopify/cli-kit/node/path') -vi.mock('@shopify/cli-kit/node/ui', async () => { - const actual = await vi.importActual('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/http') +vi.mock('@shopify/cli-kit/shared/node/path') +vi.mock('@shopify/cli-kit/shared/node/ui', async () => { + const actual = await vi.importActual('@shopify/cli-kit/shared/node/ui') return { ...actual, renderSelectPrompt: vi.fn(), diff --git a/packages/theme/src/cli/services/init.ts b/packages/theme/src/cli/services/init.ts index 42e554827e2..16f5b83894e 100644 --- a/packages/theme/src/cli/services/init.ts +++ b/packages/theme/src/cli/services/init.ts @@ -1,8 +1,8 @@ -import {renderSelectPrompt, renderWarning, renderTasks} from '@shopify/cli-kit/node/ui' -import {downloadGitRepository, removeGitRemote} from '@shopify/cli-kit/node/git' -import {joinPath} from '@shopify/cli-kit/node/path' -import {rmdir, fileExists, inTemporaryDirectory, readFile, writeFile, symlink} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' +import {renderSelectPrompt, renderWarning, renderTasks} from '@shopify/cli-kit/shared/node/ui' +import {downloadGitRepository, removeGitRemote} from '@shopify/cli-kit/shared/node/git' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {rmdir, fileExists, inTemporaryDirectory, readFile, writeFile, symlink} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export const SKELETON_THEME_URL = 'https://github.com/Shopify/skeleton-theme.git' const AI_INSTRUCTIONS_REPO_URL = 'https://github.com/Shopify/theme-liquid-docs.git' diff --git a/packages/theme/src/cli/services/list.test.ts b/packages/theme/src/cli/services/list.test.ts index 87ba5b4fa33..9a7aed621e2 100644 --- a/packages/theme/src/cli/services/list.test.ts +++ b/packages/theme/src/cli/services/list.test.ts @@ -1,15 +1,15 @@ import {list} from './list.js' import {getDevelopmentTheme} from './local-storage.js' import {fetchStoreThemes} from '../utilities/theme-selector/fetch.js' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import {Theme} from '@shopify/cli-kit/themes/types' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' import {describe, expect, vi, test} from 'vitest' -import {getHostTheme} from '@shopify/cli-kit/node/themes/conf' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' +import {getHostTheme} from '@shopify/cli-kit/themes/conf' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' vi.mock('../utilities/theme-selector/fetch.js') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/themes/conf') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/themes/conf') vi.mock('./local-storage.js') const session = { diff --git a/packages/theme/src/cli/services/list.ts b/packages/theme/src/cli/services/list.ts index bd9809ec7d3..f593f5d9d57 100644 --- a/packages/theme/src/cli/services/list.ts +++ b/packages/theme/src/cli/services/list.ts @@ -1,10 +1,10 @@ import {getDevelopmentTheme} from './local-storage.js' import {ALLOWED_ROLES, fetchStoreThemes, Role} from '../utilities/theme-selector/fetch.js' import {Filter, FilterProps, filterThemes} from '../utilities/theme-selector/filter.js' -import {InlineToken, renderInfo} from '@shopify/cli-kit/node/ui' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {getHostTheme} from '@shopify/cli-kit/node/themes/conf' -import {outputResult} from '@shopify/cli-kit/node/output' +import {InlineToken, renderInfo} from '@shopify/cli-kit/shared/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {getHostTheme} from '@shopify/cli-kit/themes/conf' +import {outputResult} from '@shopify/cli-kit/shared/node/output' interface Options { role?: Role diff --git a/packages/theme/src/cli/services/local-storage.test.ts b/packages/theme/src/cli/services/local-storage.test.ts index 63f06938187..d02da845816 100644 --- a/packages/theme/src/cli/services/local-storage.test.ts +++ b/packages/theme/src/cli/services/local-storage.test.ts @@ -13,8 +13,8 @@ import { getThemeStore, useThemeStoreContext, } from './local-storage.js' -import {inTemporaryDirectory} from '@shopify/cli-kit/node/fs' -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' +import {inTemporaryDirectory} from '@shopify/cli-kit/shared/node/fs' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' import {describe, expect, test} from 'vitest' describe('local-storage', () => { diff --git a/packages/theme/src/cli/services/local-storage.ts b/packages/theme/src/cli/services/local-storage.ts index 6ad8824a9ef..5e54a94da60 100644 --- a/packages/theme/src/cli/services/local-storage.ts +++ b/packages/theme/src/cli/services/local-storage.ts @@ -1,6 +1,6 @@ -import {BugError} from '@shopify/cli-kit/node/error' -import {LocalStorage} from '@shopify/cli-kit/node/local-storage' -import {outputDebug, outputContent} from '@shopify/cli-kit/node/output' +import {BugError} from '@shopify/cli-kit/shared/node/error' +import {LocalStorage} from '@shopify/cli-kit/shared/node/local-storage' +import {outputDebug, outputContent} from '@shopify/cli-kit/shared/node/output' import {AsyncLocalStorage} from 'node:async_hooks' type DevelopmentThemeId = string diff --git a/packages/theme/src/cli/services/metafields-pull.test.ts b/packages/theme/src/cli/services/metafields-pull.test.ts index d0d9aefbecf..daa7ab11798 100644 --- a/packages/theme/src/cli/services/metafields-pull.test.ts +++ b/packages/theme/src/cli/services/metafields-pull.test.ts @@ -3,17 +3,17 @@ import {metafieldsPull} from './metafields-pull.js' import {ensureThemeStore} from '../utilities/theme-store.js' import {hasRequiredThemeDirectories} from '../utilities/theme-fs.js' import {ensureDirectoryConfirmed} from '../utilities/theme-ui.js' -import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output' -import {metafieldDefinitionsByOwnerType} from '@shopify/cli-kit/node/themes/api' +import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {mockAndCaptureOutput} from '@shopify/cli-kit/shared/node/testing/output' +import {metafieldDefinitionsByOwnerType} from '@shopify/cli-kit/themes/api' import {describe, test, vi, beforeEach, expect, afterEach} from 'vitest' -import {fileExists, inTemporaryDirectory, readFile} from '@shopify/cli-kit/node/fs' +import {fileExists, inTemporaryDirectory, readFile} from '@shopify/cli-kit/shared/node/fs' vi.mock('../utilities/theme-store.js') vi.mock('../utilities/theme-fs.js') vi.mock('../utilities/theme-ui.js') -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/themes/api') const metafieldDefinitionPath = (path: string) => `${path}/.shopify/metafields.json` diff --git a/packages/theme/src/cli/services/metafields-pull.ts b/packages/theme/src/cli/services/metafields-pull.ts index d6e296fe512..d8f2b38ef78 100644 --- a/packages/theme/src/cli/services/metafields-pull.ts +++ b/packages/theme/src/cli/services/metafields-pull.ts @@ -2,13 +2,13 @@ import {hasRequiredThemeDirectories} from '../utilities/theme-fs.js' import {ensureDirectoryConfirmed} from '../utilities/theme-ui.js' import {ensureThemeStore} from '../utilities/theme-store.js' import {configureCLIEnvironment} from '../utilities/cli-config.js' -import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {cwd, joinPath} from '@shopify/cli-kit/node/path' -import {metafieldDefinitionsByOwnerType} from '@shopify/cli-kit/node/themes/api' -import {renderError, renderSuccess} from '@shopify/cli-kit/node/ui' -import {writeFileSync} from '@shopify/cli-kit/node/fs' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {getOrCreateHiddenShopifyFolder} from '@shopify/cli-kit/node/hidden-folder' +import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {cwd, joinPath} from '@shopify/cli-kit/shared/node/path' +import {metafieldDefinitionsByOwnerType} from '@shopify/cli-kit/themes/api' +import {renderError, renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {writeFileSync} from '@shopify/cli-kit/shared/node/fs' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {getOrCreateHiddenShopifyFolder} from '@shopify/cli-kit/shared/node/hidden-folder' interface MetafieldsPullOptions { path: string diff --git a/packages/theme/src/cli/services/open.test.ts b/packages/theme/src/cli/services/open.test.ts index a6867503dc0..a8b16922a6b 100644 --- a/packages/theme/src/cli/services/open.test.ts +++ b/packages/theme/src/cli/services/open.test.ts @@ -1,15 +1,15 @@ import {open} from './open.js' import {findOrSelectTheme} from '../utilities/theme-selector.js' import {DevelopmentThemeManager} from '../utilities/development-theme-manager.js' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {Theme} from '@shopify/cli-kit/themes/types' import {test, describe, expect, vi, beforeEach} from 'vitest' -import {openURL} from '@shopify/cli-kit/node/system' -import {renderInfo} from '@shopify/cli-kit/node/ui' +import {openURL} from '@shopify/cli-kit/shared/node/system' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/system', () => { +vi.mock('@shopify/cli-kit/shared/node/system', () => { return {openURL: vi.fn()} }) -vi.mock('@shopify/cli-kit/node/ui', () => { +vi.mock('@shopify/cli-kit/shared/node/ui', () => { return {renderInfo: vi.fn()} }) vi.mock('../utilities/development-theme-manager.js') diff --git a/packages/theme/src/cli/services/open.ts b/packages/theme/src/cli/services/open.ts index 741315c85d9..5f7b9100340 100644 --- a/packages/theme/src/cli/services/open.ts +++ b/packages/theme/src/cli/services/open.ts @@ -1,10 +1,10 @@ import {findOrSelectTheme} from '../utilities/theme-selector.js' import {themeComponent} from '../utilities/theme-ui.js' import {DevelopmentThemeManager} from '../utilities/development-theme-manager.js' -import {themeEditorUrl, themePreviewUrl} from '@shopify/cli-kit/node/themes/urls' -import {openURL} from '@shopify/cli-kit/node/system' -import {renderInfo} from '@shopify/cli-kit/node/ui' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {themeEditorUrl, themePreviewUrl} from '@shopify/cli-kit/themes/urls' +import {openURL} from '@shopify/cli-kit/shared/node/system' +import {renderInfo} from '@shopify/cli-kit/shared/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' export async function open( adminSession: AdminSession, diff --git a/packages/theme/src/cli/services/package.test.ts b/packages/theme/src/cli/services/package.test.ts index b2250a256b6..778cb1367c6 100644 --- a/packages/theme/src/cli/services/package.test.ts +++ b/packages/theme/src/cli/services/package.test.ts @@ -1,12 +1,12 @@ import {packageTheme} from './package.js' import {describe, expect, vi, test} from 'vitest' -import {joinPath, dirname} from '@shopify/cli-kit/node/path' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {mkdir, writeFile, inTemporaryDirectory, touchFile, fileExists} from '@shopify/cli-kit/node/fs' +import {joinPath, dirname} from '@shopify/cli-kit/shared/node/path' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {mkdir, writeFile, inTemporaryDirectory, touchFile, fileExists} from '@shopify/cli-kit/shared/node/fs' const StreamZip = require('node-stream-zip') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('packageTheme', () => { test('creates zip file from theme', async () => { diff --git a/packages/theme/src/cli/services/package.ts b/packages/theme/src/cli/services/package.ts index b0188516dd1..162587f70ba 100644 --- a/packages/theme/src/cli/services/package.ts +++ b/packages/theme/src/cli/services/package.ts @@ -1,8 +1,8 @@ -import {zip} from '@shopify/cli-kit/node/archiver' -import {fileExists, readFile} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {resolvePath, relativizePath} from '@shopify/cli-kit/node/path' +import {zip} from '@shopify/cli-kit/shared/node/archiver' +import {fileExists, readFile} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {resolvePath, relativizePath} from '@shopify/cli-kit/shared/node/path' import {parseJSON} from '@shopify/theme-check-node' const themeFilesPattern = [ diff --git a/packages/theme/src/cli/services/profile.test.ts b/packages/theme/src/cli/services/profile.test.ts index fdf86ce1af1..a797c1bf870 100644 --- a/packages/theme/src/cli/services/profile.test.ts +++ b/packages/theme/src/cli/services/profile.test.ts @@ -1,15 +1,15 @@ import {profile} from './profile.js' import {render} from '../utilities/theme-environment/storefront-renderer.js' -import {ensureAuthenticatedStorefront} from '@shopify/cli-kit/node/session' -import {openURL} from '@shopify/cli-kit/node/system' +import {ensureAuthenticatedStorefront} from '@shopify/cli-kit/identity/session' +import {openURL} from '@shopify/cli-kit/shared/node/system' import {vi, describe, expect, beforeEach, test} from 'vitest' -import {outputResult} from '@shopify/cli-kit/node/output' -import {AbortError} from '@shopify/cli-kit/node/error' +import {outputResult} from '@shopify/cli-kit/shared/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {readFile} from 'fs/promises' -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/system') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/shared/node/system') +vi.mock('@shopify/cli-kit/shared/node/output') vi.mock('../utilities/theme-environment/storefront-password-prompt.js') vi.mock('../utilities/theme-environment/storefront-session.js') vi.mock('../utilities/theme-environment/storefront-renderer.js') diff --git a/packages/theme/src/cli/services/profile.ts b/packages/theme/src/cli/services/profile.ts index 5aa13179c8a..9953bf6769e 100644 --- a/packages/theme/src/cli/services/profile.ts +++ b/packages/theme/src/cli/services/profile.ts @@ -3,12 +3,12 @@ import {ensureValidPassword} from '../utilities/theme-environment/storefront-pas import {fetchDevServerSession} from '../utilities/theme-environment/dev-server-session.js' import {render} from '../utilities/theme-environment/storefront-renderer.js' import {resolveAssetPath} from '../utilities/asset-path.js' -import {openURL} from '@shopify/cli-kit/node/system' -import {joinPath} from '@shopify/cli-kit/node/path' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {writeFile, tempDirectory} from '@shopify/cli-kit/node/fs' -import {outputResult, outputDebug} from '@shopify/cli-kit/node/output' -import {AbortError} from '@shopify/cli-kit/node/error' +import {openURL} from '@shopify/cli-kit/shared/node/system' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {writeFile, tempDirectory} from '@shopify/cli-kit/shared/node/fs' +import {outputResult, outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export async function profile( adminSession: AdminSession, diff --git a/packages/theme/src/cli/services/publish.test.ts b/packages/theme/src/cli/services/publish.test.ts index fe2af71f2e0..72cc3ab17bb 100644 --- a/packages/theme/src/cli/services/publish.test.ts +++ b/packages/theme/src/cli/services/publish.test.ts @@ -1,13 +1,13 @@ import {publish} from './publish.js' import {findOrSelectTheme} from '../utilities/theme-selector.js' -import {renderSuccess, renderConfirmationPrompt} from '@shopify/cli-kit/node/ui' +import {renderSuccess, renderConfirmationPrompt} from '@shopify/cli-kit/shared/node/ui' import {test, describe, expect, vi} from 'vitest' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {themePublish} from '@shopify/cli-kit/node/themes/api' +import {Theme} from '@shopify/cli-kit/themes/types' +import {themePublish} from '@shopify/cli-kit/themes/api' -vi.mock('@shopify/cli-kit/node/system') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/shared/node/system') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('../utilities/theme-selector.js') const session = { diff --git a/packages/theme/src/cli/services/publish.ts b/packages/theme/src/cli/services/publish.ts index 7e2da4c1118..b8066be2c1c 100644 --- a/packages/theme/src/cli/services/publish.ts +++ b/packages/theme/src/cli/services/publish.ts @@ -1,10 +1,10 @@ import {findOrSelectTheme} from '../utilities/theme-selector.js' import {themeComponent} from '../utilities/theme-ui.js' -import {themePublish} from '@shopify/cli-kit/node/themes/api' -import {themePreviewUrl} from '@shopify/cli-kit/node/themes/urls' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {renderConfirmationPrompt, renderSuccess} from '@shopify/cli-kit/node/ui' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {themePublish} from '@shopify/cli-kit/themes/api' +import {themePreviewUrl} from '@shopify/cli-kit/themes/urls' +import {Theme} from '@shopify/cli-kit/themes/types' +import {renderConfirmationPrompt, renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' interface PublishServiceOptions { theme: string | undefined diff --git a/packages/theme/src/cli/services/pull.test.ts b/packages/theme/src/cli/services/pull.test.ts index 24fec497628..17ba0e33994 100644 --- a/packages/theme/src/cli/services/pull.test.ts +++ b/packages/theme/src/cli/services/pull.test.ts @@ -7,13 +7,13 @@ import {hasRequiredThemeDirectories, mountThemeFileSystem} from '../utilities/th import {fakeThemeFileSystem} from '../utilities/theme-fs/theme-fs-mock-factory.js' import {downloadTheme} from '../utilities/theme-downloader.js' import {themeComponent, ensureDirectoryConfirmed} from '../utilities/theme-ui.js' -import {mkTmpDir, rmdir} from '@shopify/cli-kit/node/fs' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' -import {ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {fetchChecksums} from '@shopify/cli-kit/node/themes/api' -import {insideGitDirectory, isClean} from '@shopify/cli-kit/node/git' +import {mkTmpDir, rmdir} from '@shopify/cli-kit/shared/node/fs' +import {buildTheme} from '@shopify/cli-kit/themes/factories' +import {ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {fetchChecksums} from '@shopify/cli-kit/themes/api' +import {insideGitDirectory, isClean} from '@shopify/cli-kit/shared/node/git' import {test, describe, expect, vi, beforeEach} from 'vitest' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' import {fileURLToPath} from 'node:url' vi.mock('../utilities/theme-selector.js') @@ -21,11 +21,11 @@ vi.mock('../utilities/theme-store.js') vi.mock('../utilities/theme-fs.js') vi.mock('../utilities/theme-downloader.js') vi.mock('../utilities/theme-ui.js') -vi.mock('@shopify/cli-kit/node/context/local') -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/git') +vi.mock('@shopify/cli-kit/shared/node/context/local') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/shared/node/git') const adminSession = {token: '', storeFqdn: ''} const path = '/my-theme' diff --git a/packages/theme/src/cli/services/pull.ts b/packages/theme/src/cli/services/pull.ts index 677fbb5355e..dc4a439d95c 100644 --- a/packages/theme/src/cli/services/pull.ts +++ b/packages/theme/src/cli/services/pull.ts @@ -6,14 +6,14 @@ import {ensureThemeStore} from '../utilities/theme-store.js' import {DevelopmentThemeManager} from '../utilities/development-theme-manager.js' import {findOrSelectTheme} from '../utilities/theme-selector.js' import {configureCLIEnvironment} from '../utilities/cli-config.js' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {fetchChecksums} from '@shopify/cli-kit/node/themes/api' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {glob} from '@shopify/cli-kit/node/fs' -import {cwd} from '@shopify/cli-kit/node/path' -import {insideGitDirectory, isClean} from '@shopify/cli-kit/node/git' -import {recordTiming} from '@shopify/cli-kit/node/analytics' +import {Theme} from '@shopify/cli-kit/themes/types' +import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {fetchChecksums} from '@shopify/cli-kit/themes/api' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {glob} from '@shopify/cli-kit/shared/node/fs' +import {cwd} from '@shopify/cli-kit/shared/node/path' +import {insideGitDirectory, isClean} from '@shopify/cli-kit/shared/node/git' +import {recordTiming} from '@shopify/cli-kit/shared/node/analytics' import {Writable} from 'stream' interface PullOptions { diff --git a/packages/theme/src/cli/services/push.test.ts b/packages/theme/src/cli/services/push.test.ts index 2d3d4b27068..e0ae1a62b17 100644 --- a/packages/theme/src/cli/services/push.test.ts +++ b/packages/theme/src/cli/services/push.test.ts @@ -6,32 +6,32 @@ import {ensureThemeStore} from '../utilities/theme-store.js' import {findOrSelectTheme} from '../utilities/theme-selector.js' import {runThemeCheck} from '../commands/theme/check.js' import {mountThemeFileSystem} from '../utilities/theme-fs.js' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' +import {buildTheme} from '@shopify/cli-kit/themes/factories' import {test, describe, vi, expect, beforeEach} from 'vitest' -import {themeCreate, fetchTheme, themePublish} from '@shopify/cli-kit/node/themes/api' -import {ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' +import {themeCreate, fetchTheme, themePublish} from '@shopify/cli-kit/themes/api' +import {ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' import { DEVELOPMENT_THEME_ROLE, LIVE_THEME_ROLE, UNPUBLISHED_THEME_ROLE, promptThemeName, -} from '@shopify/cli-kit/node/themes/utils' -import {renderConfirmationPrompt, renderError} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' +} from '@shopify/cli-kit/themes/utils' +import {renderConfirmationPrompt, renderError} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {Severity, SourceCodeType} from '@shopify/theme-check-node' -import {outputResult} from '@shopify/cli-kit/node/output' +import {outputResult} from '@shopify/cli-kit/shared/node/output' vi.mock('../utilities/theme-uploader.js') vi.mock('../utilities/theme-store.js') vi.mock('../utilities/theme-selector.js') vi.mock('./local-storage.js') vi.mock('../utilities/theme-listing.js') -vi.mock('@shopify/cli-kit/node/themes/utils') -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/themes/utils') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../commands/theme/check.js') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') vi.mock('../utilities/theme-fs.js') const path = '/my-theme' diff --git a/packages/theme/src/cli/services/push.ts b/packages/theme/src/cli/services/push.ts index fde42ac60cd..79c7bebb10c 100644 --- a/packages/theme/src/cli/services/push.ts +++ b/packages/theme/src/cli/services/push.ts @@ -9,23 +9,23 @@ import {configureCLIEnvironment} from '../utilities/cli-config.js' import {runThemeCheck} from '../commands/theme/check.js' import {ensureThemeStore} from '../utilities/theme-store.js' import {ensureListingExists} from '../utilities/theme-listing.js' -import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {themeCreate, fetchChecksums, themePublish} from '@shopify/cli-kit/node/themes/api' -import {Result, Theme} from '@shopify/cli-kit/node/themes/types' -import {outputResult} from '@shopify/cli-kit/node/output' +import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {themeCreate, fetchChecksums, themePublish} from '@shopify/cli-kit/themes/api' +import {Result, Theme} from '@shopify/cli-kit/themes/types' +import {outputResult} from '@shopify/cli-kit/shared/node/output' import { renderConfirmationPrompt, RenderConfirmationPromptOptions, renderError, renderSuccess, renderWarning, -} from '@shopify/cli-kit/node/ui' -import {themeEditorUrl, themePreviewUrl} from '@shopify/cli-kit/node/themes/urls' -import {cwd, resolvePath} from '@shopify/cli-kit/node/path' -import {LIVE_THEME_ROLE, promptThemeName, UNPUBLISHED_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {AbortError} from '@shopify/cli-kit/node/error' +} from '@shopify/cli-kit/shared/node/ui' +import {themeEditorUrl, themePreviewUrl} from '@shopify/cli-kit/themes/urls' +import {cwd, resolvePath} from '@shopify/cli-kit/shared/node/path' +import {LIVE_THEME_ROLE, promptThemeName, UNPUBLISHED_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {Severity} from '@shopify/theme-check-node' -import {recordError, recordTiming} from '@shopify/cli-kit/node/analytics' +import {recordError, recordTiming} from '@shopify/cli-kit/shared/node/analytics' import {Writable} from 'stream' interface PushOptions { diff --git a/packages/theme/src/cli/services/rename.test.ts b/packages/theme/src/cli/services/rename.test.ts index 48ee84ba80f..51f9d86b819 100644 --- a/packages/theme/src/cli/services/rename.test.ts +++ b/packages/theme/src/cli/services/rename.test.ts @@ -1,12 +1,12 @@ import {RenameOptions, renameTheme} from './rename.js' import {findOrSelectTheme} from '../utilities/theme-selector.js' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {Theme} from '@shopify/cli-kit/themes/types' import {test, describe, expect, vi} from 'vitest' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {themeUpdate} from '@shopify/cli-kit/node/themes/api' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {themeUpdate} from '@shopify/cli-kit/themes/api' -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('../utilities/theme-selector.js', () => { return {findOrSelectTheme: vi.fn()} }) diff --git a/packages/theme/src/cli/services/rename.ts b/packages/theme/src/cli/services/rename.ts index c45cc4ce16c..cb32f23f119 100644 --- a/packages/theme/src/cli/services/rename.ts +++ b/packages/theme/src/cli/services/rename.ts @@ -1,9 +1,9 @@ import {findOrSelectTheme} from '../utilities/theme-selector.js' import {themeComponent} from '../utilities/theme-ui.js' -import {themeUpdate} from '@shopify/cli-kit/node/themes/api' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {renderSuccess} from '@shopify/cli-kit/node/ui' -import {promptThemeName} from '@shopify/cli-kit/node/themes/utils' +import {themeUpdate} from '@shopify/cli-kit/themes/api' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {renderSuccess} from '@shopify/cli-kit/shared/node/ui' +import {promptThemeName} from '@shopify/cli-kit/themes/utils' export interface RenameOptions { name?: string diff --git a/packages/theme/src/cli/utilities/asset-checksum.test.ts b/packages/theme/src/cli/utilities/asset-checksum.test.ts index a6fc14791b0..15869dcc181 100644 --- a/packages/theme/src/cli/utilities/asset-checksum.test.ts +++ b/packages/theme/src/cli/utilities/asset-checksum.test.ts @@ -1,7 +1,7 @@ import {calculateChecksum, rejectGeneratedStaticAssets} from './asset-checksum.js' import {readThemeFile} from './theme-fs.js' import {describe, expect, test} from 'vitest' -import {joinPath, dirname} from '@shopify/cli-kit/node/path' +import {joinPath, dirname} from '@shopify/cli-kit/shared/node/path' import {fileURLToPath} from 'node:url' describe('asset-checksum', () => { diff --git a/packages/theme/src/cli/utilities/asset-checksum.ts b/packages/theme/src/cli/utilities/asset-checksum.ts index e80a5f86257..761e3cf2113 100644 --- a/packages/theme/src/cli/utilities/asset-checksum.ts +++ b/packages/theme/src/cli/utilities/asset-checksum.ts @@ -1,6 +1,6 @@ import {isTextFile} from './theme-fs.js' -import {Checksum} from '@shopify/cli-kit/node/themes/types' -import {fileHash} from '@shopify/cli-kit/node/crypto' +import {Checksum} from '@shopify/cli-kit/themes/types' +import {fileHash} from '@shopify/cli-kit/shared/node/crypto' export function calculateChecksum(fileKey: string, fileContent: string | Buffer | undefined) { if (!fileContent) { diff --git a/packages/theme/src/cli/utilities/asset-ignore.test.ts b/packages/theme/src/cli/utilities/asset-ignore.test.ts index c3940e28001..4068cab59f2 100644 --- a/packages/theme/src/cli/utilities/asset-ignore.test.ts +++ b/packages/theme/src/cli/utilities/asset-ignore.test.ts @@ -1,10 +1,10 @@ import {applyIgnoreFilters, getPatternsFromShopifyIgnore} from './asset-ignore.js' -import {ReadOptions, fileExists, readFile} from '@shopify/cli-kit/node/fs' +import {ReadOptions, fileExists, readFile} from '@shopify/cli-kit/shared/node/fs' import {test, describe, beforeEach, vi, expect} from 'vitest' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/fs', async () => { - const originalFs: any = await vi.importActual('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/fs', async () => { + const originalFs: any = await vi.importActual('@shopify/cli-kit/shared/node/fs') return { ...originalFs, matchGlob: originalFs.matchGlob, @@ -13,11 +13,11 @@ vi.mock('@shopify/cli-kit/node/fs', async () => { } }) -vi.mock('@shopify/cli-kit/node/ui', () => ({ +vi.mock('@shopify/cli-kit/shared/node/ui', () => ({ renderWarning: vi.fn(), })) -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') describe('asset-ignore', () => { const checksums = [ diff --git a/packages/theme/src/cli/utilities/asset-ignore.ts b/packages/theme/src/cli/utilities/asset-ignore.ts index 1dd557ab387..85edcf2299d 100644 --- a/packages/theme/src/cli/utilities/asset-ignore.ts +++ b/packages/theme/src/cli/utilities/asset-ignore.ts @@ -1,8 +1,8 @@ -import {uniqBy} from '@shopify/cli-kit/common/array' -import {fileExists, readFile, matchGlob as originalMatchGlob} from '@shopify/cli-kit/node/fs' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {joinPath} from '@shopify/cli-kit/node/path' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {uniqBy} from '@shopify/cli-kit/shared/common/array' +import {fileExists, readFile, matchGlob as originalMatchGlob} from '@shopify/cli-kit/shared/node/fs' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' const SHOPIFY_IGNORE = '.shopifyignore' const templatesRegex = /templates\/\*(\.(json|liquid))?$/ diff --git a/packages/theme/src/cli/utilities/asset-path.ts b/packages/theme/src/cli/utilities/asset-path.ts index 5f2137f738c..3acc5be14d2 100644 --- a/packages/theme/src/cli/utilities/asset-path.ts +++ b/packages/theme/src/cli/utilities/asset-path.ts @@ -1,5 +1,5 @@ -import {findPathUp} from '@shopify/cli-kit/node/fs' -import {joinPath, dirname} from '@shopify/cli-kit/node/path' +import {findPathUp} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, dirname} from '@shopify/cli-kit/shared/node/path' import {fileURLToPath} from 'node:url' export async function resolveAssetPath(...subpaths: string[]) { diff --git a/packages/theme/src/cli/utilities/cli-config.test.ts b/packages/theme/src/cli/utilities/cli-config.test.ts index cc08f0d1c3f..c6fd433edfc 100644 --- a/packages/theme/src/cli/utilities/cli-config.test.ts +++ b/packages/theme/src/cli/utilities/cli-config.test.ts @@ -1,6 +1,6 @@ import {configureCLIEnvironment} from './cli-config.js' -import {globalFlags} from '@shopify/cli-kit/node/cli' -import colors from '@shopify/cli-kit/node/colors' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import colors from '@shopify/cli-kit/shared/node/colors' import {describe, expect, beforeEach, afterAll, test} from 'vitest' describe('configureCLIEnvironment', () => { diff --git a/packages/theme/src/cli/utilities/cli-config.ts b/packages/theme/src/cli/utilities/cli-config.ts index a803eb6617d..4f7422bd70f 100644 --- a/packages/theme/src/cli/utilities/cli-config.ts +++ b/packages/theme/src/cli/utilities/cli-config.ts @@ -1,5 +1,5 @@ -import {globalFlags} from '@shopify/cli-kit/node/cli' -import colors from '@shopify/cli-kit/node/colors' +import {globalFlags} from '@shopify/cli-kit/shared/node/cli' +import colors from '@shopify/cli-kit/shared/node/colors' interface CLIConfigOptions { verbose?: boolean diff --git a/packages/theme/src/cli/utilities/development-theme-manager.test.ts b/packages/theme/src/cli/utilities/development-theme-manager.test.ts index 3914b350491..b5fdd046995 100644 --- a/packages/theme/src/cli/utilities/development-theme-manager.test.ts +++ b/packages/theme/src/cli/utilities/development-theme-manager.test.ts @@ -4,13 +4,13 @@ import { DEVELOPMENT_THEME_NOT_FOUND, } from './development-theme-manager.js' import {getDevelopmentTheme, setDevelopmentTheme, removeDevelopmentTheme} from '../services/local-storage.js' -import {themeCreate, fetchTheme} from '@shopify/cli-kit/node/themes/api' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' +import {themeCreate, fetchTheme} from '@shopify/cli-kit/themes/api' +import {buildTheme} from '@shopify/cli-kit/themes/factories' import {beforeEach, describe, expect, vi, test} from 'vitest' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' +import {Theme} from '@shopify/cli-kit/themes/types' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('../services/local-storage.js') describe('DevelopmentThemeManager', () => { diff --git a/packages/theme/src/cli/utilities/development-theme-manager.ts b/packages/theme/src/cli/utilities/development-theme-manager.ts index 092e0066100..9e1dd3d6519 100644 --- a/packages/theme/src/cli/utilities/development-theme-manager.ts +++ b/packages/theme/src/cli/utilities/development-theme-manager.ts @@ -1,8 +1,8 @@ import {getDevelopmentTheme, setDevelopmentTheme, removeDevelopmentTheme} from '../services/local-storage.js' -import {ThemeManager} from '@shopify/cli-kit/node/themes/theme-manager' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {AbortError} from '@shopify/cli-kit/node/error' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {ThemeManager} from '@shopify/cli-kit/themes/theme-manager' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {Theme} from '@shopify/cli-kit/themes/types' export const DEVELOPMENT_THEME_NOT_FOUND = (themeId: string) => `Development theme #${themeId} could not be found. Please create a new development theme.` diff --git a/packages/theme/src/cli/utilities/errors.test.ts b/packages/theme/src/cli/utilities/errors.test.ts index 7bf42be2b28..bf278f88424 100644 --- a/packages/theme/src/cli/utilities/errors.test.ts +++ b/packages/theme/src/cli/utilities/errors.test.ts @@ -6,11 +6,11 @@ import { extractFetchErrorInfo, } from './errors.js' import {describe, test, expect, vi, beforeEach, afterEach} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {renderError, renderFatalError} from '@shopify/cli-kit/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {renderError, renderFatalError} from '@shopify/cli-kit/shared/node/ui' -vi.mock('@shopify/cli-kit/node/output') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/output') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('errors', () => { describe('renderThrownError', () => { diff --git a/packages/theme/src/cli/utilities/errors.ts b/packages/theme/src/cli/utilities/errors.ts index 7fef4661b07..40052ded44a 100644 --- a/packages/theme/src/cli/utilities/errors.ts +++ b/packages/theme/src/cli/utilities/errors.ts @@ -1,7 +1,7 @@ -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {recordError} from '@shopify/cli-kit/node/analytics' -import {renderError, renderFatalError} from '@shopify/cli-kit/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {recordError} from '@shopify/cli-kit/shared/node/analytics' +import {renderError, renderFatalError} from '@shopify/cli-kit/shared/node/ui' import {createError as createH3Error, type H3Error} from 'h3' /** diff --git a/packages/theme/src/cli/utilities/log-request-line.ts b/packages/theme/src/cli/utilities/log-request-line.ts index 4c0f35d6e96..da146825522 100644 --- a/packages/theme/src/cli/utilities/log-request-line.ts +++ b/packages/theme/src/cli/utilities/log-request-line.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/unbound-method */ import {EXTENSION_CDN_PREFIX, VANITY_CDN_PREFIX} from './theme-environment/proxy.js' import {timestampDateFormat} from '../constants.js' -import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/node/output' +import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/shared/node/output' import {H3Event} from 'h3' -import {extname} from '@shopify/cli-kit/node/path' +import {extname} from '@shopify/cli-kit/shared/node/path' import type {DevServerContext} from './theme-environment/types.js' const CHARACTER_TRUNCATION_LIMIT = 80 diff --git a/packages/theme/src/cli/utilities/notifier.test.ts b/packages/theme/src/cli/utilities/notifier.test.ts index a055e450da1..3b4eec6c61c 100644 --- a/packages/theme/src/cli/utilities/notifier.test.ts +++ b/packages/theme/src/cli/utilities/notifier.test.ts @@ -1,10 +1,10 @@ import {Notifier} from './notifier.js' import {vi, describe, expect, test} from 'vitest' -import {outputWarn} from '@shopify/cli-kit/node/output' +import {outputWarn} from '@shopify/cli-kit/shared/node/output' import fs from 'fs/promises' vi.mock('fs/promises') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') describe('Notifier', () => { let notifier: Notifier diff --git a/packages/theme/src/cli/utilities/notifier.ts b/packages/theme/src/cli/utilities/notifier.ts index c47736eefa4..9267511016f 100644 --- a/packages/theme/src/cli/utilities/notifier.ts +++ b/packages/theme/src/cli/utilities/notifier.ts @@ -1,5 +1,5 @@ -import {recordError} from '@shopify/cli-kit/node/analytics' -import {outputDebug, outputWarn} from '@shopify/cli-kit/node/output' +import {recordError} from '@shopify/cli-kit/shared/node/analytics' +import {outputDebug, outputWarn} from '@shopify/cli-kit/shared/node/output' import fs from 'fs/promises' // A valid NotifyPath can be: diff --git a/packages/theme/src/cli/utilities/repl/evaluator.test.ts b/packages/theme/src/cli/utilities/repl/evaluator.test.ts index d0e745348fc..cf7aebc8c66 100644 --- a/packages/theme/src/cli/utilities/repl/evaluator.test.ts +++ b/packages/theme/src/cli/utilities/repl/evaluator.test.ts @@ -2,11 +2,11 @@ import {evaluate, EvaluationConfig} from './evaluator.js' import {DevServerSession} from '../theme-environment/types.js' import {render} from '../theme-environment/storefront-renderer.js' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/node/output' -import {AbortError} from '@shopify/cli-kit/node/error' +import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/shared/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' vi.mock('../theme-environment/storefront-renderer') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') describe('evaluate', () => { let mockConfig: EvaluationConfig diff --git a/packages/theme/src/cli/utilities/repl/evaluator.ts b/packages/theme/src/cli/utilities/repl/evaluator.ts index 1624750715e..d006b06df78 100644 --- a/packages/theme/src/cli/utilities/repl/evaluator.ts +++ b/packages/theme/src/cli/utilities/repl/evaluator.ts @@ -1,7 +1,7 @@ import {render} from '../theme-environment/storefront-renderer.js' import {DevServerSession} from '../theme-environment/types.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputDebug, outputInfo, outputToken} from '@shopify/cli-kit/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputDebug, outputInfo, outputToken} from '@shopify/cli-kit/shared/node/output' export interface SessionItem { type: string diff --git a/packages/theme/src/cli/utilities/repl/presenter.test.ts b/packages/theme/src/cli/utilities/repl/presenter.test.ts index f9234a061dd..7588eb9dde6 100644 --- a/packages/theme/src/cli/utilities/repl/presenter.test.ts +++ b/packages/theme/src/cli/utilities/repl/presenter.test.ts @@ -1,8 +1,8 @@ import {presentValue} from './presenter.js' -import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/node/output' +import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/shared/node/output' import {describe, expect, test, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') describe('presentValue', () => { const cantBePrintedMessage = diff --git a/packages/theme/src/cli/utilities/repl/presenter.ts b/packages/theme/src/cli/utilities/repl/presenter.ts index 72bae9827e4..b4fcd176fa5 100644 --- a/packages/theme/src/cli/utilities/repl/presenter.ts +++ b/packages/theme/src/cli/utilities/repl/presenter.ts @@ -1,4 +1,4 @@ -import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/node/output' +import {outputContent, outputInfo, outputToken} from '@shopify/cli-kit/shared/node/output' export function presentValue(value?: unknown) { if (hasJsonError(value)) { diff --git a/packages/theme/src/cli/utilities/repl/repl-theme-manager.test.ts b/packages/theme/src/cli/utilities/repl/repl-theme-manager.test.ts index 8c9b2594b38..ff19465b73f 100644 --- a/packages/theme/src/cli/utilities/repl/repl-theme-manager.test.ts +++ b/packages/theme/src/cli/utilities/repl/repl-theme-manager.test.ts @@ -1,11 +1,11 @@ import {REPLThemeManager} from './repl-theme-manager.js' import {setREPLTheme, removeREPLTheme, getREPLTheme, getDevelopmentTheme} from '../../services/local-storage.js' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {bulkUploadThemeAssets, themeCreate, fetchTheme} from '@shopify/cli-kit/node/themes/api' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {bulkUploadThemeAssets, themeCreate, fetchTheme} from '@shopify/cli-kit/themes/api' -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('../../services/local-storage') describe('REPLThemeManager', () => { diff --git a/packages/theme/src/cli/utilities/repl/repl-theme-manager.ts b/packages/theme/src/cli/utilities/repl/repl-theme-manager.ts index 555e7eaeb3c..33b9adde99b 100644 --- a/packages/theme/src/cli/utilities/repl/repl-theme-manager.ts +++ b/packages/theme/src/cli/utilities/repl/repl-theme-manager.ts @@ -1,10 +1,10 @@ import {getREPLTheme, setREPLTheme, removeREPLTheme} from '../../services/local-storage.js' -import {ThemeManager} from '@shopify/cli-kit/node/themes/theme-manager' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {DEVELOPMENT_THEME_ROLE, Role} from '@shopify/cli-kit/node/themes/utils' -import {bulkUploadThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' +import {ThemeManager} from '@shopify/cli-kit/themes/theme-manager' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {DEVELOPMENT_THEME_ROLE, Role} from '@shopify/cli-kit/themes/utils' +import {bulkUploadThemeAssets} from '@shopify/cli-kit/themes/api' +import {Theme} from '@shopify/cli-kit/themes/types' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' export class REPLThemeManager extends ThemeManager { protected context = 'REPL' diff --git a/packages/theme/src/cli/utilities/repl/repl.test.ts b/packages/theme/src/cli/utilities/repl/repl.test.ts index ebe605ce990..60a51dd7bf1 100644 --- a/packages/theme/src/cli/utilities/repl/repl.test.ts +++ b/packages/theme/src/cli/utilities/repl/repl.test.ts @@ -3,10 +3,10 @@ import {evaluate} from './evaluator.js' import {presentValue} from './presenter.js' import {DevServerSession} from '../theme-environment/types.js' import {describe, expect, test, vi} from 'vitest' -import {outputInfo} from '@shopify/cli-kit/node/output' +import {outputInfo} from '@shopify/cli-kit/shared/node/output' import {createInterface} from 'readline' -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/shared/node/output') vi.mock('./evaluator.js') vi.mock('./presenter.js') diff --git a/packages/theme/src/cli/utilities/repl/repl.ts b/packages/theme/src/cli/utilities/repl/repl.ts index d8ab76a370b..0bcf7ac4e49 100644 --- a/packages/theme/src/cli/utilities/repl/repl.ts +++ b/packages/theme/src/cli/utilities/repl/repl.ts @@ -1,8 +1,8 @@ import {evaluate, SessionItem} from './evaluator.js' import {presentValue} from './presenter.js' import {DevServerSession} from '../theme-environment/types.js' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputDebug, outputInfo} from '@shopify/cli-kit/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputDebug, outputInfo} from '@shopify/cli-kit/shared/node/output' import {createInterface, Interface} from 'readline' export const DELIMITER_WARNING = diff --git a/packages/theme/src/cli/utilities/theme-command.test.ts b/packages/theme/src/cli/utilities/theme-command.test.ts index 60bbb828e46..8533f43ef57 100644 --- a/packages/theme/src/cli/utilities/theme-command.test.ts +++ b/packages/theme/src/cli/utilities/theme-command.test.ts @@ -2,19 +2,19 @@ import ThemeCommand, {RequiredFlags} from './theme-command.js' import {ensureThemeStore} from './theme-store.js' import {describe, vi, expect, test, beforeEach} from 'vitest' import {Config, Flags} from '@oclif/core' -import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {loadEnvironment} from '@shopify/cli-kit/node/environments' -import {fileExistsSync} from '@shopify/cli-kit/node/fs' -import {AbortError} from '@shopify/cli-kit/node/error' -import {resolvePath} from '@shopify/cli-kit/node/path' -import {renderConcurrent, renderConfirmationPrompt, renderError, renderWarning} from '@shopify/cli-kit/node/ui' +import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {loadEnvironment} from '@shopify/cli-kit/shared/node/environments' +import {fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {resolvePath} from '@shopify/cli-kit/shared/node/path' +import {renderConcurrent, renderConfirmationPrompt, renderError, renderWarning} from '@shopify/cli-kit/shared/node/ui' import type {Writable} from 'stream' -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/environments') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/shared/node/environments') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('./theme-store.js') -vi.mock('@shopify/cli-kit/node/fs') +vi.mock('@shopify/cli-kit/shared/node/fs') const CommandConfig = new Config({root: __dirname}) diff --git a/packages/theme/src/cli/utilities/theme-command.ts b/packages/theme/src/cli/utilities/theme-command.ts index 930b8585817..b62ad9c6128 100644 --- a/packages/theme/src/cli/utilities/theme-command.ts +++ b/packages/theme/src/cli/utilities/theme-command.ts @@ -1,25 +1,25 @@ import {ensureThemeStore} from './theme-store.js' import {configurationFileName} from '../constants.js' import {useThemeStoreContext} from '../services/local-storage.js' -import {hashString} from '@shopify/cli-kit/node/crypto' +import {hashString} from '@shopify/cli-kit/shared/node/crypto' import {Input} from '@oclif/core/interfaces' -import Command, {ArgOutput, FlagOutput, noDefaultsOptions} from '@shopify/cli-kit/node/base-command' -import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {loadEnvironment} from '@shopify/cli-kit/node/environments' +import Command, {ArgOutput, FlagOutput, noDefaultsOptions} from '@shopify/cli-kit/shared/node/base-command' +import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {loadEnvironment} from '@shopify/cli-kit/shared/node/environments' import { renderWarning, renderConcurrent, renderConfirmationPrompt, RenderConfirmationPromptOptions, renderError, -} from '@shopify/cli-kit/node/ui' -import {AbortController} from '@shopify/cli-kit/node/abort' -import {AbortError} from '@shopify/cli-kit/node/error' -import {recordEvent, compileData} from '@shopify/cli-kit/node/analytics' -import {addPublicMetadata, addSensitiveMetadata} from '@shopify/cli-kit/node/metadata' -import {cwd, joinPath, resolvePath} from '@shopify/cli-kit/node/path' -import {fileExistsSync} from '@shopify/cli-kit/node/fs' -import {normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn' +} from '@shopify/cli-kit/shared/node/ui' +import {AbortController} from '@shopify/cli-kit/shared/node/abort' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {recordEvent, compileData} from '@shopify/cli-kit/shared/node/analytics' +import {addPublicMetadata, addSensitiveMetadata} from '@shopify/cli-kit/shared/node/metadata' +import {cwd, joinPath, resolvePath} from '@shopify/cli-kit/shared/node/path' +import {fileExistsSync} from '@shopify/cli-kit/shared/node/fs' +import {normalizeStoreFqdn} from '@shopify/cli-kit/shared/node/context/fqdn' import type {Writable} from 'stream' interface FlagValues { diff --git a/packages/theme/src/cli/utilities/theme-downloader.test.ts b/packages/theme/src/cli/utilities/theme-downloader.test.ts index bde58d971d6..94055061bf4 100644 --- a/packages/theme/src/cli/utilities/theme-downloader.test.ts +++ b/packages/theme/src/cli/utilities/theme-downloader.test.ts @@ -1,11 +1,11 @@ import {downloadTheme} from './theme-downloader.js' import {fakeThemeFileSystem} from './theme-fs/theme-fs-mock-factory.js' -import {fetchThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {Checksum, ThemeAsset} from '@shopify/cli-kit/node/themes/types' +import {fetchThemeAssets} from '@shopify/cli-kit/themes/api' +import {Checksum, ThemeAsset} from '@shopify/cli-kit/themes/types' import {test, describe, expect, vi} from 'vitest' vi.mock('./theme-fs.js') -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/themes/api') describe('theme-downloader', () => { describe('downloadTheme', () => { diff --git a/packages/theme/src/cli/utilities/theme-downloader.ts b/packages/theme/src/cli/utilities/theme-downloader.ts index fae80deb311..1f1b7cbd492 100644 --- a/packages/theme/src/cli/utilities/theme-downloader.ts +++ b/packages/theme/src/cli/utilities/theme-downloader.ts @@ -1,9 +1,9 @@ import {batchedTasks, Task} from './batching.js' import {MAX_GRAPHQL_THEME_FILES} from '../constants.js' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {fetchThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {ThemeFileSystem, Theme, Checksum, ThemeAsset} from '@shopify/cli-kit/node/themes/types' -import {renderTasks} from '@shopify/cli-kit/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {fetchThemeAssets} from '@shopify/cli-kit/themes/api' +import {ThemeFileSystem, Theme, Checksum, ThemeAsset} from '@shopify/cli-kit/themes/types' +import {renderTasks} from '@shopify/cli-kit/shared/node/ui' import {Writable} from 'stream' interface DownloadOptions { diff --git a/packages/theme/src/cli/utilities/theme-environment/dev-server-session.test.ts b/packages/theme/src/cli/utilities/theme-environment/dev-server-session.test.ts index ed40429c3df..e7dc5b02abc 100644 --- a/packages/theme/src/cli/utilities/theme-environment/dev-server-session.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/dev-server-session.test.ts @@ -5,14 +5,14 @@ import { fetchDevServerSession, } from './dev-server-session.js' import {getStorefrontSessionCookies, ShopifyEssentialError} from './storefront-session.js' -import {ensureAuthenticatedStorefront, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {fetchThemeAssets, themeDelete} from '@shopify/cli-kit/node/themes/api' +import {ensureAuthenticatedStorefront, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {fetchThemeAssets, themeDelete} from '@shopify/cli-kit/themes/api' import {describe, expect, test, vi, beforeEach} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' -vi.mock('@shopify/cli-kit/node/session') -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/identity/session') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('./storefront-session.js') const storeFqdn = 'my-shop.myshopify.com' diff --git a/packages/theme/src/cli/utilities/theme-environment/dev-server-session.ts b/packages/theme/src/cli/utilities/theme-environment/dev-server-session.ts index 39911f23eb3..7768163d554 100644 --- a/packages/theme/src/cli/utilities/theme-environment/dev-server-session.ts +++ b/packages/theme/src/cli/utilities/theme-environment/dev-server-session.ts @@ -1,11 +1,11 @@ import {buildBaseStorefrontUrl} from './storefront-renderer.js' import {getStorefrontSessionCookies, ShopifyEssentialError} from './storefront-session.js' import {DevServerSession} from './types.js' -import {fetchThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputDebug, outputContent, outputToken} from '@shopify/cli-kit/node/output' -import {AdminSession, ensureAuthenticatedStorefront, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {recordError, recordEvent} from '@shopify/cli-kit/node/analytics' +import {fetchThemeAssets} from '@shopify/cli-kit/themes/api' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputDebug, outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' +import {AdminSession, ensureAuthenticatedStorefront, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {recordError, recordEvent} from '@shopify/cli-kit/shared/node/analytics' // 30 minutes in miliseconds. const SESSION_TIMEOUT_IN_MS = 30 * 60 * 1000 diff --git a/packages/theme/src/cli/utilities/theme-environment/hot-reload/server.test.ts b/packages/theme/src/cli/utilities/theme-environment/hot-reload/server.test.ts index 441e46408d6..a7432f5701d 100644 --- a/packages/theme/src/cli/utilities/theme-environment/hot-reload/server.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/hot-reload/server.test.ts @@ -14,11 +14,11 @@ import {render} from '../storefront-renderer.js' import {emptyThemeExtFileSystem} from '../../theme-fs-empty.js' import {describe, test, expect, vi, beforeEach} from 'vitest' import {createEvent} from 'h3' -import * as output from '@shopify/cli-kit/node/output' +import * as output from '@shopify/cli-kit/shared/node/output' import {IncomingMessage, ServerResponse} from 'node:http' import {Socket} from 'node:net' import type {DevServerContext} from '../types.js' -import type {Theme, ThemeFSEventName, ThemeAsset} from '@shopify/cli-kit/node/themes/types' +import type {Theme, ThemeFSEventName, ThemeAsset} from '@shopify/cli-kit/themes/types' vi.mock('../storefront-renderer.js') vi.spyOn(output, 'outputDebug') diff --git a/packages/theme/src/cli/utilities/theme-environment/hot-reload/server.ts b/packages/theme/src/cli/utilities/theme-environment/hot-reload/server.ts index 60173e5eb7f..55011ec2a4a 100644 --- a/packages/theme/src/cli/utilities/theme-environment/hot-reload/server.ts +++ b/packages/theme/src/cli/utilities/theme-environment/hot-reload/server.ts @@ -14,11 +14,11 @@ import { sendError, type EventHandler, } from 'h3' -import {renderError, renderInfo, renderWarning} from '@shopify/cli-kit/node/ui' -import {extname, joinPath} from '@shopify/cli-kit/node/path' +import {renderError, renderInfo, renderWarning} from '@shopify/cli-kit/shared/node/ui' +import {extname, joinPath} from '@shopify/cli-kit/shared/node/path' import {parseJSON} from '@shopify/theme-check-node' -import {readFile} from '@shopify/cli-kit/node/fs' -import {recordError, recordEvent} from '@shopify/cli-kit/node/analytics' +import {readFile} from '@shopify/cli-kit/shared/node/fs' +import {recordError, recordEvent} from '@shopify/cli-kit/shared/node/analytics' import EventEmitter from 'node:events' import type { HotReloadEvent, @@ -26,7 +26,7 @@ import type { HotReloadOpenEvent, HotReloadFullEvent, } from '@shopify/theme-hot-reload' -import type {Theme, ThemeAsset, ThemeFSEventPayload} from '@shopify/cli-kit/node/themes/types' +import type {Theme, ThemeAsset, ThemeFSEventPayload} from '@shopify/cli-kit/themes/types' import type {DevServerContext} from '../types.js' // --- Section tag content cache --- diff --git a/packages/theme/src/cli/utilities/theme-environment/html.test.ts b/packages/theme/src/cli/utilities/theme-environment/html.test.ts index fdfedf958c4..6a72b22db58 100644 --- a/packages/theme/src/cli/utilities/theme-environment/html.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/html.test.ts @@ -4,7 +4,7 @@ import {DevServerContext} from './types.js' import {emptyThemeExtFileSystem, emptyThemeFileSystem} from '../theme-fs-empty.js' import {createEvent} from 'h3' import {describe, expect, test, vi} from 'vitest' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {Theme} from '@shopify/cli-kit/themes/types' import {IncomingMessage, ServerResponse} from 'node:http' import {Socket} from 'node:net' diff --git a/packages/theme/src/cli/utilities/theme-environment/html.ts b/packages/theme/src/cli/utilities/theme-environment/html.ts index 6bb2f056096..1b9d51f6f8c 100644 --- a/packages/theme/src/cli/utilities/theme-environment/html.ts +++ b/packages/theme/src/cli/utilities/theme-environment/html.ts @@ -6,11 +6,11 @@ import {getExtensionInMemoryTemplates} from '../theme-ext-environment/theme-ext- import {logRequestLine} from '../log-request-line.js' import {extractFetchErrorInfo} from '../errors.js' import {defineEventHandler, getCookie, type H3Event, type EventHandler} from 'h3' -import {renderError, renderFatalError} from '@shopify/cli-kit/node/ui' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {AbortError} from '@shopify/cli-kit/node/error' -import {recordEvent} from '@shopify/cli-kit/node/analytics' -import type {Theme} from '@shopify/cli-kit/node/themes/types' +import {renderError, renderFatalError} from '@shopify/cli-kit/shared/node/ui' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {recordEvent} from '@shopify/cli-kit/shared/node/analytics' +import type {Theme} from '@shopify/cli-kit/themes/types' import type {DevServerContext} from './types.js' /** Tracks the number of consecutive theme ID mismatch redirects */ diff --git a/packages/theme/src/cli/utilities/theme-environment/local-assets.ts b/packages/theme/src/cli/utilities/theme-environment/local-assets.ts index 2c3f676fdc3..635a156dafd 100644 --- a/packages/theme/src/cli/utilities/theme-environment/local-assets.ts +++ b/packages/theme/src/cli/utilities/theme-environment/local-assets.ts @@ -1,10 +1,10 @@ import {injectCdnProxy} from './proxy.js' import {parseServerEvent} from './server-utils.js' import {getLiquidTagContent} from './liquid-tag-content.js' -import {lookupMimeType} from '@shopify/cli-kit/node/mimes' +import {lookupMimeType} from '@shopify/cli-kit/shared/node/mimes' import {defineEventHandler, H3Event, serveStatic, setResponseHeader, sendError, createError} from 'h3' -import {joinPath} from '@shopify/cli-kit/node/path' -import type {Theme, ThemeAsset, VirtualFileSystem} from '@shopify/cli-kit/node/themes/types' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import type {Theme, ThemeAsset, VirtualFileSystem} from '@shopify/cli-kit/themes/types' import type {DevServerContext} from './types.js' const tagContentCache = { diff --git a/packages/theme/src/cli/utilities/theme-environment/proxy.ts b/packages/theme/src/cli/utilities/theme-environment/proxy.ts index a2d2e81b6bd..25e3fee3f00 100644 --- a/packages/theme/src/cli/utilities/theme-environment/proxy.ts +++ b/packages/theme/src/cli/utilities/theme-environment/proxy.ts @@ -3,12 +3,12 @@ import {buildCookies} from './storefront-renderer.js' import {cleanHeader, defaultHeaders} from './storefront-utils.js' import {logRequestLine} from '../log-request-line.js' import {createFetchError, extractFetchErrorInfo} from '../errors.js' -import {renderWarning} from '@shopify/cli-kit/node/ui' +import {renderWarning} from '@shopify/cli-kit/shared/node/ui' import {defineEventHandler, getRequestHeaders, getRequestWebStream, getRequestIP, type H3Event} from 'h3' -import {extname} from '@shopify/cli-kit/node/path' -import {lookupMimeType} from '@shopify/cli-kit/node/mimes' -import {recordError} from '@shopify/cli-kit/node/analytics' -import type {Theme} from '@shopify/cli-kit/node/themes/types' +import {extname} from '@shopify/cli-kit/shared/node/path' +import {lookupMimeType} from '@shopify/cli-kit/shared/node/mimes' +import {recordError} from '@shopify/cli-kit/shared/node/analytics' +import type {Theme} from '@shopify/cli-kit/themes/types' import type {DevServerContext} from './types.js' export const VANITY_CDN_PREFIX = '/cdn/' diff --git a/packages/theme/src/cli/utilities/theme-environment/remote-theme-watcher.test.ts b/packages/theme/src/cli/utilities/theme-environment/remote-theme-watcher.test.ts index a37cbeb83c5..d324171d203 100644 --- a/packages/theme/src/cli/utilities/theme-environment/remote-theme-watcher.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/remote-theme-watcher.test.ts @@ -2,13 +2,13 @@ import {reconcileJsonFiles} from './theme-reconciliation.js' import {reconcileAndPollThemeEditorChanges} from './remote-theme-watcher.js' import {pollThemeEditorChanges} from './theme-polling.js' import {fakeThemeFileSystem} from '../theme-fs/theme-fs-mock-factory.js' -import {fetchChecksums} from '@shopify/cli-kit/node/themes/api' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' -import {ThemeAsset} from '@shopify/cli-kit/node/themes/types' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' +import {fetchChecksums} from '@shopify/cli-kit/themes/api' +import {buildTheme} from '@shopify/cli-kit/themes/factories' +import {ThemeAsset} from '@shopify/cli-kit/themes/types' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' import {beforeEach, describe, expect, test, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('./theme-reconciliation.js') vi.mock('./theme-polling.js') vi.mock('../theme-fs.js') diff --git a/packages/theme/src/cli/utilities/theme-environment/remote-theme-watcher.ts b/packages/theme/src/cli/utilities/theme-environment/remote-theme-watcher.ts index 7e129d20348..b7c5fcd05f8 100644 --- a/packages/theme/src/cli/utilities/theme-environment/remote-theme-watcher.ts +++ b/packages/theme/src/cli/utilities/theme-environment/remote-theme-watcher.ts @@ -1,9 +1,9 @@ import {pollThemeEditorChanges} from './theme-polling.js' import {reconcileJsonFiles} from './theme-reconciliation.js' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {Checksum, Theme, ThemeFileSystem} from '@shopify/cli-kit/node/themes/types' -import {fetchChecksums} from '@shopify/cli-kit/node/themes/api' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {Checksum, Theme, ThemeFileSystem} from '@shopify/cli-kit/themes/types' +import {fetchChecksums} from '@shopify/cli-kit/themes/api' export const LOCAL_STRATEGY = 'local' export const REMOTE_STRATEGY = 'remote' diff --git a/packages/theme/src/cli/utilities/theme-environment/storefront-password-prompt.test.ts b/packages/theme/src/cli/utilities/theme-environment/storefront-password-prompt.test.ts index d451cfcb55c..57a718e87ca 100644 --- a/packages/theme/src/cli/utilities/theme-environment/storefront-password-prompt.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/storefront-password-prompt.test.ts @@ -7,10 +7,10 @@ import { setStorefrontPassword, } from '../../services/local-storage.js' import {ensureThemeStore} from '../theme-store.js' -import {renderTextPrompt} from '@shopify/cli-kit/node/ui' +import {renderTextPrompt} from '@shopify/cli-kit/shared/node/ui' import {describe, beforeEach, vi, test, expect} from 'vitest' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('../theme-environment/storefront-session.js') vi.mock('../../services/local-storage.js') vi.mock('../theme-store.js') diff --git a/packages/theme/src/cli/utilities/theme-environment/storefront-password-prompt.ts b/packages/theme/src/cli/utilities/theme-environment/storefront-password-prompt.ts index 29e8af5ad35..510eb9afc04 100644 --- a/packages/theme/src/cli/utilities/theme-environment/storefront-password-prompt.ts +++ b/packages/theme/src/cli/utilities/theme-environment/storefront-password-prompt.ts @@ -6,8 +6,8 @@ import { setStorefrontPassword, } from '../../services/local-storage.js' import {ensureThemeStore} from '../theme-store.js' -import {renderTextPrompt, TokenItem} from '@shopify/cli-kit/node/ui' -import {storePasswordPage} from '@shopify/cli-kit/node/themes/urls' +import {renderTextPrompt, TokenItem} from '@shopify/cli-kit/shared/node/ui' +import {storePasswordPage} from '@shopify/cli-kit/themes/urls' export async function ensureValidPassword(password: string | undefined, store: string) { /* diff --git a/packages/theme/src/cli/utilities/theme-environment/storefront-renderer.test.ts b/packages/theme/src/cli/utilities/theme-environment/storefront-renderer.test.ts index 87e32234bea..733317a6263 100644 --- a/packages/theme/src/cli/utilities/theme-environment/storefront-renderer.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/storefront-renderer.test.ts @@ -2,7 +2,7 @@ import {render} from './storefront-renderer.js' import {DevServerRenderContext, DevServerSession} from './types.js' import {describe, expect, test, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/identity/session') vi.stubGlobal('fetch', vi.fn()) const session: DevServerSession = { diff --git a/packages/theme/src/cli/utilities/theme-environment/storefront-renderer.ts b/packages/theme/src/cli/utilities/theme-environment/storefront-renderer.ts index ed66b4e8ae0..a1f5aeb301f 100644 --- a/packages/theme/src/cli/utilities/theme-environment/storefront-renderer.ts +++ b/packages/theme/src/cli/utilities/theme-environment/storefront-renderer.ts @@ -2,10 +2,10 @@ import {parseCookies, serializeCookies} from './cookies.js' import {cleanHeader, defaultHeaders, storefrontReplaceTemplatesParams} from './storefront-utils.js' import {DevServerSession, DevServerRenderContext} from './types.js' import {createFetchError} from '../errors.js' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {getThemeKitAccessDomain} from '@shopify/cli-kit/node/context/local' -import {recordError} from '@shopify/cli-kit/node/analytics' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {getThemeKitAccessDomain} from '@shopify/cli-kit/shared/node/context/local' +import {recordError} from '@shopify/cli-kit/shared/node/analytics' export async function render(session: DevServerSession, context: DevServerRenderContext): Promise { const url = buildStorefrontUrl(session, context) diff --git a/packages/theme/src/cli/utilities/theme-environment/storefront-session.test.ts b/packages/theme/src/cli/utilities/theme-environment/storefront-session.test.ts index 89284f28ee0..630f8d783f9 100644 --- a/packages/theme/src/cli/utilities/theme-environment/storefront-session.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/storefront-session.test.ts @@ -5,15 +5,15 @@ import { ShopifyEssentialError, } from './storefront-session.js' import {describe, expect, test, vi} from 'vitest' -import {shopifyFetch} from '@shopify/cli-kit/node/http' -import {AbortError} from '@shopify/cli-kit/node/error' -import {passwordProtected} from '@shopify/cli-kit/node/themes/api' -import {type AdminSession} from '@shopify/cli-kit/node/session' -import {getThemeKitAccessDomain} from '@shopify/cli-kit/node/context/local' - -vi.mock('@shopify/cli-kit/node/http') -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/system') +import {shopifyFetch} from '@shopify/cli-kit/shared/node/http' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {passwordProtected} from '@shopify/cli-kit/themes/api' +import {type AdminSession} from '@shopify/cli-kit/identity/session' +import {getThemeKitAccessDomain} from '@shopify/cli-kit/shared/node/context/local' + +vi.mock('@shopify/cli-kit/shared/node/http') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/system') describe('Storefront API', () => { describe('isStorefrontPasswordProtected', () => { diff --git a/packages/theme/src/cli/utilities/theme-environment/storefront-session.ts b/packages/theme/src/cli/utilities/theme-environment/storefront-session.ts index ad7aafea2b2..cf4db534ba6 100644 --- a/packages/theme/src/cli/utilities/theme-environment/storefront-session.ts +++ b/packages/theme/src/cli/utilities/theme-environment/storefront-session.ts @@ -1,12 +1,12 @@ import {parseCookies, serializeCookies} from './cookies.js' import {defaultHeaders} from './storefront-utils.js' -import {shopifyFetch, Response} from '@shopify/cli-kit/node/http' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {type AdminSession} from '@shopify/cli-kit/node/session' -import {passwordProtected} from '@shopify/cli-kit/node/themes/api' -import {sleep} from '@shopify/cli-kit/node/system' -import {recordError, recordEvent} from '@shopify/cli-kit/node/analytics' +import {shopifyFetch, Response} from '@shopify/cli-kit/shared/node/http' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {type AdminSession} from '@shopify/cli-kit/identity/session' +import {passwordProtected} from '@shopify/cli-kit/themes/api' +import {sleep} from '@shopify/cli-kit/shared/node/system' +import {recordError, recordEvent} from '@shopify/cli-kit/shared/node/analytics' export class ShopifyEssentialError extends AbortError {} diff --git a/packages/theme/src/cli/utilities/theme-environment/storefront-utils.ts b/packages/theme/src/cli/utilities/theme-environment/storefront-utils.ts index c18b30a9be2..1c3dce7dd7f 100644 --- a/packages/theme/src/cli/utilities/theme-environment/storefront-utils.ts +++ b/packages/theme/src/cli/utilities/theme-environment/storefront-utils.ts @@ -1,5 +1,5 @@ import {DevServerRenderContext} from './types.js' -import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version' +import {CLI_KIT_VERSION} from '@shopify/cli-kit/shared/common/version' export function storefrontReplaceTemplatesParams(context: DevServerRenderContext): URLSearchParams { /** diff --git a/packages/theme/src/cli/utilities/theme-environment/theme-environment.test.ts b/packages/theme/src/cli/utilities/theme-environment/theme-environment.test.ts index 02508a5ee67..60ab04efa98 100644 --- a/packages/theme/src/cli/utilities/theme-environment/theme-environment.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/theme-environment.test.ts @@ -6,16 +6,16 @@ import {hotReloadScriptId} from './hot-reload/server.js' import {uploadTheme} from '../theme-uploader.js' import {fakeThemeFileSystem} from '../theme-fs/theme-fs-mock-factory.js' import {emptyThemeExtFileSystem} from '../theme-fs-empty.js' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' import {describe, expect, test, vi, beforeEach, afterEach} from 'vitest' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' +import {buildTheme} from '@shopify/cli-kit/themes/factories' import {createEvent} from 'h3' -import * as output from '@shopify/cli-kit/node/output' -import {fetchChecksums} from '@shopify/cli-kit/node/themes/api' +import * as output from '@shopify/cli-kit/shared/node/output' +import {fetchChecksums} from '@shopify/cli-kit/themes/api' import {IncomingMessage, ServerResponse} from 'node:http' import {Socket} from 'node:net' -vi.mock('@shopify/cli-kit/node/themes/api', () => ({fetchChecksums: vi.fn(() => Promise.resolve([]))})) +vi.mock('@shopify/cli-kit/themes/api', () => ({fetchChecksums: vi.fn(() => Promise.resolve([]))})) vi.mock('./remote-theme-watcher.js') vi.mock('./storefront-renderer.js') vi.spyOn(output, 'outputDebug') diff --git a/packages/theme/src/cli/utilities/theme-environment/theme-environment.ts b/packages/theme/src/cli/utilities/theme-environment/theme-environment.ts index 34bbd14d710..60fc221c762 100644 --- a/packages/theme/src/cli/utilities/theme-environment/theme-environment.ts +++ b/packages/theme/src/cli/utilities/theme-environment/theme-environment.ts @@ -8,9 +8,9 @@ import {renderTasksToStdErr} from '../theme-ui.js' import {renderThrownError} from '../errors.js' import {promiseWithResolvers} from '../../polyfills/promiseWithResolvers.js' import {createApp, defineEventHandler, defineLazyEventHandler, toNodeListener, handleCors} from 'h3' -import {fetchChecksums} from '@shopify/cli-kit/node/themes/api' +import {fetchChecksums} from '@shopify/cli-kit/themes/api' import {createServer} from 'node:http' -import type {Checksum, Theme} from '@shopify/cli-kit/node/themes/types' +import type {Checksum, Theme} from '@shopify/cli-kit/themes/types' import type {DevServerContext} from './types.js' export function setupDevServer(theme: Theme, ctx: DevServerContext) { diff --git a/packages/theme/src/cli/utilities/theme-environment/theme-polling.test.ts b/packages/theme/src/cli/utilities/theme-environment/theme-polling.test.ts index 4576fba4a98..e4bc279cab1 100644 --- a/packages/theme/src/cli/utilities/theme-environment/theme-polling.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/theme-polling.test.ts @@ -1,12 +1,12 @@ import {PollingOptions, pollRemoteJsonChanges, deleteRemovedAssets} from './theme-polling.js' import {fakeThemeFileSystem} from '../theme-fs/theme-fs-mock-factory.js' -import {fetchChecksums, fetchThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {Checksum, ThemeAsset} from '@shopify/cli-kit/node/themes/types' +import {fetchChecksums, fetchThemeAssets} from '@shopify/cli-kit/themes/api' +import {Checksum, ThemeAsset} from '@shopify/cli-kit/themes/types' import {describe, expect, test, vi, afterEach} from 'vitest' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' +import {buildTheme} from '@shopify/cli-kit/themes/factories' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('../theme-fs.js') describe('pollRemoteJsonChanges', async () => { diff --git a/packages/theme/src/cli/utilities/theme-environment/theme-polling.ts b/packages/theme/src/cli/utilities/theme-environment/theme-polling.ts index c8de4126687..72b81917c8f 100644 --- a/packages/theme/src/cli/utilities/theme-environment/theme-polling.ts +++ b/packages/theme/src/cli/utilities/theme-environment/theme-polling.ts @@ -1,12 +1,12 @@ import {MAX_GRAPHQL_THEME_FILES, timestampDateFormat} from '../../constants.js' import {batchedRequests} from '../batching.js' import {renderThrownError} from '../errors.js' -import {Checksum, Theme, ThemeFileSystem} from '@shopify/cli-kit/node/themes/types' -import {fetchChecksums, fetchThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {outputDebug, outputInfo, outputContent, outputToken} from '@shopify/cli-kit/node/output' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {renderFatalError} from '@shopify/cli-kit/node/ui' -import {AbortError} from '@shopify/cli-kit/node/error' +import {Checksum, Theme, ThemeFileSystem} from '@shopify/cli-kit/themes/types' +import {fetchChecksums, fetchThemeAssets} from '@shopify/cli-kit/themes/api' +import {outputDebug, outputInfo, outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {renderFatalError} from '@shopify/cli-kit/shared/node/ui' +import {AbortError} from '@shopify/cli-kit/shared/node/error' const POLLING_INTERVAL = 3000 class PollingError extends Error {} diff --git a/packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.test.ts b/packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.test.ts index 0083c373b40..caf2824e482 100644 --- a/packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.test.ts +++ b/packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.test.ts @@ -1,15 +1,15 @@ import {reconcileJsonFiles} from './theme-reconciliation.js' import {REMOTE_STRATEGY, LOCAL_STRATEGY} from './remote-theme-watcher.js' import {fakeThemeFileSystem} from '../theme-fs/theme-fs-mock-factory.js' -import {deleteThemeAssets, fetchThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' -import {Checksum, ThemeAsset, ThemeFileSystem} from '@shopify/cli-kit/node/themes/types' -import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {renderSelectPrompt} from '@shopify/cli-kit/node/ui' +import {deleteThemeAssets, fetchThemeAssets} from '@shopify/cli-kit/themes/api' +import {buildTheme} from '@shopify/cli-kit/themes/factories' +import {Checksum, ThemeAsset, ThemeFileSystem} from '@shopify/cli-kit/themes/types' +import {DEVELOPMENT_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {renderSelectPrompt} from '@shopify/cli-kit/shared/node/ui' import {beforeEach, describe, expect, test, vi} from 'vitest' -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/themes/api') vi.mock('./theme-fs.js') vi.mock('./theme-downloader.js') vi.mock('./theme-uploader.js') diff --git a/packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.ts b/packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.ts index 2d5079938b3..2a0fe6d095b 100644 --- a/packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.ts +++ b/packages/theme/src/cli/utilities/theme-environment/theme-reconciliation.ts @@ -1,12 +1,12 @@ import {REMOTE_STRATEGY, LOCAL_STRATEGY} from './remote-theme-watcher.js' import {batchedRequests} from '../batching.js' import {MAX_GRAPHQL_THEME_FILES} from '../../constants.js' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {deleteThemeAssets, fetchThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {Checksum, ThemeFileSystem, ThemeAsset, Theme} from '@shopify/cli-kit/node/themes/types' -import {renderInfo, renderSelectPrompt} from '@shopify/cli-kit/node/ui' -import {recordEvent} from '@shopify/cli-kit/node/analytics' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {deleteThemeAssets, fetchThemeAssets} from '@shopify/cli-kit/themes/api' +import {Checksum, ThemeFileSystem, ThemeAsset, Theme} from '@shopify/cli-kit/themes/types' +import {renderInfo, renderSelectPrompt} from '@shopify/cli-kit/shared/node/ui' +import {recordEvent} from '@shopify/cli-kit/shared/node/analytics' type ReconciliationStrategy = typeof LOCAL_STRATEGY | typeof REMOTE_STRATEGY | undefined diff --git a/packages/theme/src/cli/utilities/theme-environment/types.ts b/packages/theme/src/cli/utilities/theme-environment/types.ts index 39d4bdee5e1..08d7783bcd9 100644 --- a/packages/theme/src/cli/utilities/theme-environment/types.ts +++ b/packages/theme/src/cli/utilities/theme-environment/types.ts @@ -1,5 +1,5 @@ -import {AdminSession} from '@shopify/cli-kit/node/session' -import {ThemeExtensionFileSystem, ThemeFileSystem} from '@shopify/cli-kit/node/themes/types' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {ThemeExtensionFileSystem, ThemeFileSystem} from '@shopify/cli-kit/themes/types' /** * Defines an authentication session for the theme development server. diff --git a/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-fs.test.ts b/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-fs.test.ts index b41ac516f54..10b73b9d2d0 100644 --- a/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-fs.test.ts +++ b/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-fs.test.ts @@ -1,8 +1,8 @@ import {mountThemeExtensionFileSystem} from './theme-ext-fs.js' import {test, describe, expect} from 'vitest' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' import {fileURLToPath} from 'node:url' -import type {Checksum, ThemeAsset} from '@shopify/cli-kit/node/themes/types' +import type {Checksum, ThemeAsset} from '@shopify/cli-kit/themes/types' describe('theme-ext-fs', () => { const locationOfThisFile = dirname(fileURLToPath(import.meta.url)) diff --git a/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-fs.ts b/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-fs.ts index 4f21a324ab4..1841b62637f 100644 --- a/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-fs.ts +++ b/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-fs.ts @@ -1,17 +1,17 @@ import {readThemeFile} from '../theme-fs.js' import {calculateChecksum} from '../asset-checksum.js' import {DEFAULT_IGNORE_PATTERNS} from '../../constants.js' -import {glob} from '@shopify/cli-kit/node/fs' -import {joinPath, relativePath} from '@shopify/cli-kit/node/path' -import {sleep} from '@shopify/cli-kit/node/system' -import {buildThemeAsset} from '@shopify/cli-kit/node/themes/factories' +import {glob} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, relativePath} from '@shopify/cli-kit/shared/node/path' +import {sleep} from '@shopify/cli-kit/shared/node/system' +import {buildThemeAsset} from '@shopify/cli-kit/themes/factories' import EventEmitter from 'node:events' import type { ThemeAsset, ThemeExtensionFileSystem, ThemeFSEventName, ThemeFSEventPayload, -} from '@shopify/cli-kit/node/themes/types' +} from '@shopify/cli-kit/themes/types' const THEME_EXT_DIRECTORY_PATTERNS = [ 'assets/**/*.*', diff --git a/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-server.ts b/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-server.ts index 5ed6a0d420f..c64db820b73 100644 --- a/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-server.ts +++ b/packages/theme/src/cli/utilities/theme-ext-environment/theme-ext-server.ts @@ -7,9 +7,9 @@ import {getHotReloadHandler, triggerHotReload} from '../theme-environment/hot-re import {emptyThemeFileSystem} from '../theme-fs-empty.js' import {initializeDevServerSession} from '../theme-environment/dev-server-session.js' import {createApp, toNodeListener} from 'h3' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' import {createServer} from 'node:http' -import type {Theme, ThemeFSEventPayload} from '@shopify/cli-kit/node/themes/types' +import type {Theme, ThemeFSEventPayload} from '@shopify/cli-kit/themes/types' interface DevelopmentServerInstance { close: () => Promise diff --git a/packages/theme/src/cli/utilities/theme-fs-empty.ts b/packages/theme/src/cli/utilities/theme-fs-empty.ts index 126170fb0b3..ad188647a25 100644 --- a/packages/theme/src/cli/utilities/theme-fs-empty.ts +++ b/packages/theme/src/cli/utilities/theme-fs-empty.ts @@ -1,4 +1,4 @@ -import {ThemeAsset, ThemeExtensionFileSystem, ThemeFileSystem} from '@shopify/cli-kit/node/themes/types' +import {ThemeAsset, ThemeExtensionFileSystem, ThemeFileSystem} from '@shopify/cli-kit/themes/types' export function emptyThemeFileSystem(): ThemeFileSystem { return emptyFileSystem() diff --git a/packages/theme/src/cli/utilities/theme-fs.test.ts b/packages/theme/src/cli/utilities/theme-fs.test.ts index 3c498383acf..1666589d0b8 100644 --- a/packages/theme/src/cli/utilities/theme-fs.test.ts +++ b/packages/theme/src/cli/utilities/theme-fs.test.ts @@ -10,28 +10,28 @@ import { } from './theme-fs.js' import {getPatternsFromShopifyIgnore, applyIgnoreFilters} from './asset-ignore.js' import {triggerBrowserFullReload} from './theme-environment/hot-reload/server.js' -import {removeFile, writeFile} from '@shopify/cli-kit/node/fs' -import * as fsKit from '@shopify/cli-kit/node/fs' +import {removeFile, writeFile} from '@shopify/cli-kit/shared/node/fs' +import * as fsKit from '@shopify/cli-kit/shared/node/fs' import {test, describe, expect, vi, beforeEach} from 'vitest' import chokidar from 'chokidar' -import {bulkUploadThemeAssets, deleteThemeAssets, fetchThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {renderError} from '@shopify/cli-kit/node/ui' -import {Operation, type Checksum, type ThemeAsset} from '@shopify/cli-kit/node/themes/types' -import {dirname, joinPath} from '@shopify/cli-kit/node/path' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {bulkUploadThemeAssets, deleteThemeAssets, fetchThemeAssets} from '@shopify/cli-kit/themes/api' +import {renderError} from '@shopify/cli-kit/shared/node/ui' +import {Operation, type Checksum, type ThemeAsset} from '@shopify/cli-kit/themes/types' +import {dirname, joinPath} from '@shopify/cli-kit/shared/node/path' +import {AdminSession} from '@shopify/cli-kit/identity/session' import EventEmitter from 'events' import {fileURLToPath} from 'node:url' -vi.mock('@shopify/cli-kit/node/fs', async (realImport) => { - const realModule = await realImport() +vi.mock('@shopify/cli-kit/shared/node/fs', async (realImport) => { + const realModule = await realImport() const mockModule = {removeFile: vi.fn(), writeFile: vi.fn()} return {...realModule, ...mockModule} }) vi.mock('./asset-ignore.js') -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/output') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/shared/node/output') vi.mock('./theme-environment/hot-reload/server.js') beforeEach(async () => { diff --git a/packages/theme/src/cli/utilities/theme-fs.ts b/packages/theme/src/cli/utilities/theme-fs.ts index 967856e61e0..61a89ca768b 100644 --- a/packages/theme/src/cli/utilities/theme-fs.ts +++ b/packages/theme/src/cli/utilities/theme-fs.ts @@ -5,13 +5,13 @@ import {createSyncingCatchError} from './errors.js' import {triggerBrowserFullReload} from './theme-environment/hot-reload/server.js' import {getListingFilePath, updateSettingsDataForListing} from './theme-listing.js' import {DEFAULT_IGNORE_PATTERNS, timestampDateFormat} from '../constants.js' -import {glob, readFile, ReadOptions, fileExists, mkdir, writeFile, removeFile} from '@shopify/cli-kit/node/fs' -import {joinPath, basename, relativePath} from '@shopify/cli-kit/node/path' -import {lookupMimeType, setMimeTypes} from '@shopify/cli-kit/node/mimes' -import {outputContent, outputDebug, outputInfo, outputToken, outputWarn} from '@shopify/cli-kit/node/output' -import {buildThemeAsset} from '@shopify/cli-kit/node/themes/factories' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {bulkUploadThemeAssets, deleteThemeAssets} from '@shopify/cli-kit/node/themes/api' +import {glob, readFile, ReadOptions, fileExists, mkdir, writeFile, removeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath, basename, relativePath} from '@shopify/cli-kit/shared/node/path' +import {lookupMimeType, setMimeTypes} from '@shopify/cli-kit/shared/node/mimes' +import {outputContent, outputDebug, outputInfo, outputToken, outputWarn} from '@shopify/cli-kit/shared/node/output' +import {buildThemeAsset} from '@shopify/cli-kit/themes/factories' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {bulkUploadThemeAssets, deleteThemeAssets} from '@shopify/cli-kit/themes/api' import EventEmitter from 'node:events' import {fileURLToPath} from 'node:url' import type { @@ -21,7 +21,7 @@ import type { ThemeAsset, ThemeFSEventName, ThemeFSEventPayload, -} from '@shopify/cli-kit/node/themes/types' +} from '@shopify/cli-kit/themes/types' const THEME_DIRECTORY_PATTERNS = [ 'assets/**/*.*', diff --git a/packages/theme/src/cli/utilities/theme-fs/theme-fs-mock-factory.ts b/packages/theme/src/cli/utilities/theme-fs/theme-fs-mock-factory.ts index e870c8d190c..c3fe8ba328c 100644 --- a/packages/theme/src/cli/utilities/theme-fs/theme-fs-mock-factory.ts +++ b/packages/theme/src/cli/utilities/theme-fs/theme-fs-mock-factory.ts @@ -1,5 +1,5 @@ import {applyIgnoreFilters} from '../asset-ignore.js' -import type {ThemeAsset, ThemeFileSystem, ThemeFileSystemOptions} from '@shopify/cli-kit/node/themes/types' +import type {ThemeAsset, ThemeFileSystem, ThemeFileSystemOptions} from '@shopify/cli-kit/themes/types' export function fakeThemeFileSystem( root: string, diff --git a/packages/theme/src/cli/utilities/theme-listing.test.ts b/packages/theme/src/cli/utilities/theme-listing.test.ts index c19b7d94d71..260dbf58a55 100644 --- a/packages/theme/src/cli/utilities/theme-listing.test.ts +++ b/packages/theme/src/cli/utilities/theme-listing.test.ts @@ -1,7 +1,7 @@ import {getListingFilePath, updateSettingsDataForListing, ensureListingExists} from './theme-listing.js' import {test, describe, expect} from 'vitest' -import {inTemporaryDirectory, mkdir, writeFile} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' +import {inTemporaryDirectory, mkdir, writeFile} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' describe('theme-listing', () => { describe('getListingFilePath', () => { diff --git a/packages/theme/src/cli/utilities/theme-listing.ts b/packages/theme/src/cli/utilities/theme-listing.ts index 72da5ce2951..d063cf45d38 100644 --- a/packages/theme/src/cli/utilities/theme-listing.ts +++ b/packages/theme/src/cli/utilities/theme-listing.ts @@ -1,7 +1,7 @@ -import {fileExists, readFile, glob} from '@shopify/cli-kit/node/fs' -import {joinPath} from '@shopify/cli-kit/node/path' -import {capitalizeWords} from '@shopify/cli-kit/common/string' -import {AbortError} from '@shopify/cli-kit/node/error' +import {fileExists, readFile, glob} from '@shopify/cli-kit/shared/node/fs' +import {joinPath} from '@shopify/cli-kit/shared/node/path' +import {capitalizeWords} from '@shopify/cli-kit/shared/common/string' +import {AbortError} from '@shopify/cli-kit/shared/node/error' import {parseJSON} from '@shopify/theme-check-node' function isListingFile(fileKey: string): boolean { diff --git a/packages/theme/src/cli/utilities/theme-selector.test.ts b/packages/theme/src/cli/utilities/theme-selector.test.ts index 4acb517e603..8315d3f1a14 100644 --- a/packages/theme/src/cli/utilities/theme-selector.test.ts +++ b/packages/theme/src/cli/utilities/theme-selector.test.ts @@ -2,16 +2,16 @@ import {fetchStoreThemes} from './theme-selector/fetch.js' import {findOrSelectTheme, findThemeById, findThemes, newThemeOption} from './theme-selector.js' import {getDevelopmentTheme} from '../services/local-storage.js' import {test, describe, vi, expect} from 'vitest' -import {renderAutocompletePrompt} from '@shopify/cli-kit/node/ui' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {promptThemeName} from '@shopify/cli-kit/node/themes/utils' -import {themeCreate} from '@shopify/cli-kit/node/themes/api' +import {renderAutocompletePrompt} from '@shopify/cli-kit/shared/node/ui' +import {Theme} from '@shopify/cli-kit/themes/types' +import {promptThemeName} from '@shopify/cli-kit/themes/utils' +import {themeCreate} from '@shopify/cli-kit/themes/api' vi.mock('./theme-selector/fetch.js') vi.mock('../services/local-storage.js') -vi.mock('@shopify/cli-kit/node/ui') -vi.mock('@shopify/cli-kit/node/themes/utils') -vi.mock('@shopify/cli-kit/node/themes/api') +vi.mock('@shopify/cli-kit/shared/node/ui') +vi.mock('@shopify/cli-kit/themes/utils') +vi.mock('@shopify/cli-kit/themes/api') const session = { token: 'token', diff --git a/packages/theme/src/cli/utilities/theme-selector.ts b/packages/theme/src/cli/utilities/theme-selector.ts index feefa366110..74221fb2db2 100644 --- a/packages/theme/src/cli/utilities/theme-selector.ts +++ b/packages/theme/src/cli/utilities/theme-selector.ts @@ -1,13 +1,13 @@ import {fetchStoreThemes} from './theme-selector/fetch.js' import {Filter, FilterProps, filterThemes} from './theme-selector/filter.js' import {getDevelopmentTheme} from '../services/local-storage.js' -import {renderAutocompletePrompt} from '@shopify/cli-kit/node/ui' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {capitalize} from '@shopify/cli-kit/common/string' -import {themeCreate} from '@shopify/cli-kit/node/themes/api' -import {promptThemeName, UNPUBLISHED_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {AbortError} from '@shopify/cli-kit/node/error' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {renderAutocompletePrompt} from '@shopify/cli-kit/shared/node/ui' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {capitalize} from '@shopify/cli-kit/shared/common/string' +import {themeCreate} from '@shopify/cli-kit/themes/api' +import {promptThemeName, UNPUBLISHED_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {Theme} from '@shopify/cli-kit/themes/types' /** * Options to find or select a theme. diff --git a/packages/theme/src/cli/utilities/theme-selector/fetch.test.ts b/packages/theme/src/cli/utilities/theme-selector/fetch.test.ts index 30c3b5a831b..fdd4990b1fc 100644 --- a/packages/theme/src/cli/utilities/theme-selector/fetch.test.ts +++ b/packages/theme/src/cli/utilities/theme-selector/fetch.test.ts @@ -1,14 +1,14 @@ import {fetchStoreThemes, publicFetchStoreThemes} from './fetch.js' -import {fetchThemes} from '@shopify/cli-kit/node/themes/api' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {fetchThemes} from '@shopify/cli-kit/themes/api' +import {Theme} from '@shopify/cli-kit/themes/types' import {test, vi, describe, expect} from 'vitest' -import {AbortError} from '@shopify/cli-kit/node/error' -import {ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' const session = {token: 'token', storeFqdn: 'my-shop.myshopify.com'} -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/session') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/identity/session') // This function serves as a wrapper around fetchStoreThemes // which allows library users to pass a password to authenticate with the Theme API. diff --git a/packages/theme/src/cli/utilities/theme-selector/fetch.ts b/packages/theme/src/cli/utilities/theme-selector/fetch.ts index 0ec4dbee22d..add3abe8318 100644 --- a/packages/theme/src/cli/utilities/theme-selector/fetch.ts +++ b/packages/theme/src/cli/utilities/theme-selector/fetch.ts @@ -1,7 +1,7 @@ -import {fetchThemes} from '@shopify/cli-kit/node/themes/api' -import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/node/session' -import {AbortError} from '@shopify/cli-kit/node/error' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {fetchThemes} from '@shopify/cli-kit/themes/api' +import {AdminSession, ensureAuthenticatedThemes} from '@shopify/cli-kit/identity/session' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {Theme} from '@shopify/cli-kit/themes/types' export type Role = 'live' | 'development' | 'unpublished' export const ALLOWED_ROLES: Role[] = ['live', 'unpublished', 'development'] diff --git a/packages/theme/src/cli/utilities/theme-selector/filter.test.ts b/packages/theme/src/cli/utilities/theme-selector/filter.test.ts index 80c6dbff769..20065237d7b 100644 --- a/packages/theme/src/cli/utilities/theme-selector/filter.test.ts +++ b/packages/theme/src/cli/utilities/theme-selector/filter.test.ts @@ -1,5 +1,5 @@ import {Filter, filterThemes} from './filter.js' -import {Theme} from '@shopify/cli-kit/node/themes/types' +import {Theme} from '@shopify/cli-kit/themes/types' import {test, describe, expect} from 'vitest' const store = 'my-shop.myshopify.com' diff --git a/packages/theme/src/cli/utilities/theme-selector/filter.ts b/packages/theme/src/cli/utilities/theme-selector/filter.ts index 7300f610977..4e3e9161aa7 100644 --- a/packages/theme/src/cli/utilities/theme-selector/filter.ts +++ b/packages/theme/src/cli/utilities/theme-selector/filter.ts @@ -1,6 +1,6 @@ import {ALLOWED_ROLES} from './fetch.js' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {AbortError} from '@shopify/cli-kit/node/error' +import {Theme} from '@shopify/cli-kit/themes/types' +import {AbortError} from '@shopify/cli-kit/shared/node/error' export function filterThemes(store: string, themes: Theme[], filter: Filter): Theme[] { return filterByRole(store, themes, filter) || filterByTheme(store, themes, filter) diff --git a/packages/theme/src/cli/utilities/theme-store.ts b/packages/theme/src/cli/utilities/theme-store.ts index b3cbc905bdd..69c3216db40 100644 --- a/packages/theme/src/cli/utilities/theme-store.ts +++ b/packages/theme/src/cli/utilities/theme-store.ts @@ -1,8 +1,8 @@ import {themeFlags} from '../flags.js' import {getThemeStore, setThemeStore} from '../services/local-storage.js' -import {recordError} from '@shopify/cli-kit/node/analytics' -import {AbortError} from '@shopify/cli-kit/node/error' -import {outputContent, outputToken} from '@shopify/cli-kit/node/output' +import {recordError} from '@shopify/cli-kit/shared/node/analytics' +import {AbortError} from '@shopify/cli-kit/shared/node/error' +import {outputContent, outputToken} from '@shopify/cli-kit/shared/node/output' export function ensureThemeStore(flags: {store: string | undefined}): string { const store = flags.store ?? getThemeStore() diff --git a/packages/theme/src/cli/utilities/theme-ui.test.ts b/packages/theme/src/cli/utilities/theme-ui.test.ts index 9797540c8c3..d2f703b5613 100644 --- a/packages/theme/src/cli/utilities/theme-ui.test.ts +++ b/packages/theme/src/cli/utilities/theme-ui.test.ts @@ -1,11 +1,11 @@ import {themeComponent, themesComponent, ensureDirectoryConfirmed, ensureLiveThemeConfirmed} from './theme-ui.js' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {renderConfirmationPrompt, renderError, renderWarning} from '@shopify/cli-kit/node/ui' +import {Theme} from '@shopify/cli-kit/themes/types' +import {renderConfirmationPrompt, renderError, renderWarning} from '@shopify/cli-kit/shared/node/ui' import {test, describe, expect, vi, beforeEach} from 'vitest' -import {DEVELOPMENT_THEME_ROLE, LIVE_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {buildTheme} from '@shopify/cli-kit/node/themes/factories' +import {DEVELOPMENT_THEME_ROLE, LIVE_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {buildTheme} from '@shopify/cli-kit/themes/factories' -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/shared/node/ui') describe('themeComponent', () => { test('returns the ui for a theme', async () => { diff --git a/packages/theme/src/cli/utilities/theme-ui.ts b/packages/theme/src/cli/utilities/theme-ui.ts index 3782a550327..fed8792f2ab 100644 --- a/packages/theme/src/cli/utilities/theme-ui.ts +++ b/packages/theme/src/cli/utilities/theme-ui.ts @@ -1,7 +1,7 @@ -import {recordEvent} from '@shopify/cli-kit/node/analytics' -import {Theme} from '@shopify/cli-kit/node/themes/types' -import {LIVE_THEME_ROLE} from '@shopify/cli-kit/node/themes/utils' -import {Task, renderConfirmationPrompt, renderError, renderTasks, renderWarning} from '@shopify/cli-kit/node/ui' +import {recordEvent} from '@shopify/cli-kit/shared/node/analytics' +import {Theme} from '@shopify/cli-kit/themes/types' +import {LIVE_THEME_ROLE} from '@shopify/cli-kit/themes/utils' +import {Task, renderConfirmationPrompt, renderError, renderTasks, renderWarning} from '@shopify/cli-kit/shared/node/ui' import {Writable} from 'stream' export function themeComponent(theme: Theme) { diff --git a/packages/theme/src/cli/utilities/theme-uploader.test.ts b/packages/theme/src/cli/utilities/theme-uploader.test.ts index 5b5b3fae062..8a13d4d5b4e 100644 --- a/packages/theme/src/cli/utilities/theme-uploader.test.ts +++ b/packages/theme/src/cli/utilities/theme-uploader.test.ts @@ -8,13 +8,13 @@ import { } from './theme-uploader.js' import {fakeThemeFileSystem} from './theme-fs/theme-fs-mock-factory.js' import {renderTasksToStdErr} from './theme-ui.js' -import {bulkUploadThemeAssets, deleteThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {Result, Checksum, Key, ThemeAsset, Operation} from '@shopify/cli-kit/node/themes/types' +import {bulkUploadThemeAssets, deleteThemeAssets} from '@shopify/cli-kit/themes/api' +import {Result, Checksum, Key, ThemeAsset, Operation} from '@shopify/cli-kit/themes/types' import {beforeEach, describe, expect, test, vi} from 'vitest' -import {AdminSession} from '@shopify/cli-kit/node/session' +import {AdminSession} from '@shopify/cli-kit/identity/session' -vi.mock('@shopify/cli-kit/node/themes/api') -vi.mock('@shopify/cli-kit/node/ui') +vi.mock('@shopify/cli-kit/themes/api') +vi.mock('@shopify/cli-kit/shared/node/ui') vi.mock('./theme-ui.js') beforeEach(() => { diff --git a/packages/theme/src/cli/utilities/theme-uploader.ts b/packages/theme/src/cli/utilities/theme-uploader.ts index aa860ef5c3e..2412b7ed750 100644 --- a/packages/theme/src/cli/utilities/theme-uploader.ts +++ b/packages/theme/src/cli/utilities/theme-uploader.ts @@ -3,12 +3,12 @@ import {rejectGeneratedStaticAssets} from './asset-checksum.js' import {createSyncingCatchError, renderThrownError} from './errors.js' import {triggerBrowserFullReload} from './theme-environment/hot-reload/server.js' import {renderTasksToStdErr} from './theme-ui.js' -import {AdminSession} from '@shopify/cli-kit/node/session' -import {Result, Checksum, Theme, ThemeFileSystem} from '@shopify/cli-kit/node/themes/types' -import {AssetParams, bulkUploadThemeAssets, deleteThemeAssets} from '@shopify/cli-kit/node/themes/api' -import {Task} from '@shopify/cli-kit/node/ui' -import {outputDebug} from '@shopify/cli-kit/node/output' -import {recordEvent} from '@shopify/cli-kit/node/analytics' +import {AdminSession} from '@shopify/cli-kit/identity/session' +import {Result, Checksum, Theme, ThemeFileSystem} from '@shopify/cli-kit/themes/types' +import {AssetParams, bulkUploadThemeAssets, deleteThemeAssets} from '@shopify/cli-kit/themes/api' +import {Task} from '@shopify/cli-kit/shared/node/ui' +import {outputDebug} from '@shopify/cli-kit/shared/node/output' +import {recordEvent} from '@shopify/cli-kit/shared/node/analytics' import {Writable} from 'stream' interface UploadOptions {