From 2f976a3fbbc74e6e82930674d7b92b934cf85263 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Mon, 5 Feb 2024 15:02:23 +0530 Subject: [PATCH 1/5] added the developerhub urls and version bump --- package-lock.json | 14 +++++++------- packages/contentstack-clone/package.json | 4 ++-- packages/contentstack-export/package.json | 2 +- .../contentstack-export/src/utils/interactive.ts | 15 +-------------- .../src/utils/marketplace-app-helper.ts | 5 +++-- packages/contentstack-import/package.json | 2 +- .../contentstack-import/src/utils/interactive.ts | 11 ----------- .../src/utils/marketplace-app-helper.ts | 6 +++--- packages/contentstack-seed/package.json | 2 +- packages/contentstack/package.json | 4 ++-- pnpm-lock.yaml | 10 +++++----- 11 files changed, 26 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8af6099849..1c56942480 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23549,9 +23549,9 @@ "@contentstack/cli-cm-branches": "~1.0.22", "@contentstack/cli-cm-bulk-publish": "~1.4.0", "@contentstack/cli-cm-clone": "~1.10.0", - "@contentstack/cli-cm-export": "~1.10.4", + "@contentstack/cli-cm-export": "~1.10.5", "@contentstack/cli-cm-export-to-csv": "~1.6.2", - "@contentstack/cli-cm-import": "~1.13.3", + "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-cm-migrate-rte": "~1.4.15", "@contentstack/cli-cm-seed": "~1.7.1", "@contentstack/cli-command": "~1.2.17", @@ -24092,8 +24092,8 @@ "license": "MIT", "dependencies": { "@colors/colors": "^1.5.0", - "@contentstack/cli-cm-export": "~1.10.4", - "@contentstack/cli-cm-import": "~1.13.3", + "@contentstack/cli-cm-export": "~1.10.5", + "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.11", "async": "^3.2.4", @@ -24525,7 +24525,7 @@ }, "packages/contentstack-export": { "name": "@contentstack/cli-cm-export", - "version": "1.10.4", + "version": "1.10.5", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", @@ -24993,7 +24993,7 @@ }, "packages/contentstack-import": { "name": "@contentstack/cli-cm-import", - "version": "1.13.3", + "version": "1.13.4", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "^1.3.5", @@ -25472,7 +25472,7 @@ "version": "1.7.1", "license": "MIT", "dependencies": { - "@contentstack/cli-cm-import": "~1.13.3", + "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.11", "inquirer": "8.2.4", diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index de90d23501..fcbd24afa4 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -5,8 +5,8 @@ "author": "Contentstack", "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues", "dependencies": { - "@contentstack/cli-cm-export": "~1.10.4", - "@contentstack/cli-cm-import": "~1.13.3", + "@contentstack/cli-cm-export": "~1.10.5", + "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.11", "@colors/colors": "^1.5.0", diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json index 2b54eea5f8..a2bde1bc8a 100644 --- a/packages/contentstack-export/package.json +++ b/packages/contentstack-export/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-cm-export", "description": "Contentstack CLI plugin to export content from stack", - "version": "1.10.4", + "version": "1.10.5", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { diff --git a/packages/contentstack-export/src/utils/interactive.ts b/packages/contentstack-export/src/utils/interactive.ts index 3004901136..6b129e1476 100644 --- a/packages/contentstack-export/src/utils/interactive.ts +++ b/packages/contentstack-export/src/utils/interactive.ts @@ -63,17 +63,4 @@ export const askAPIKey = async (): Promise => { message: 'Enter the stack api key', name: 'apiKey', }); -}; - -export const askDeveloperHub = async(regionName: string): Promise =>{ - return await cliux.inquire({ - type: 'input', - name: 'name', - validate: (url: string) => { - if (!url) return "Developer-hub URL can't be empty."; - - return true; - }, - message: `Enter the developer-hub base URL for the ${regionName} region - `, - }); -} +}; \ No newline at end of file diff --git a/packages/contentstack-export/src/utils/marketplace-app-helper.ts b/packages/contentstack-export/src/utils/marketplace-app-helper.ts index b96db792ab..5dad11cb98 100644 --- a/packages/contentstack-export/src/utils/marketplace-app-helper.ts +++ b/packages/contentstack-export/src/utils/marketplace-app-helper.ts @@ -2,16 +2,17 @@ import { cliux, configHandler, NodeCrypto, managementSDKClient } from '@contents import { formatError, log } from '../utils'; import { ExportConfig } from '../types'; -import { askDeveloperHub } from './interactive'; export const getDeveloperHubUrl = async (exportConfig: ExportConfig) => { const { cma, name } = configHandler.get('region') || {}; let developerHubBaseUrl = exportConfig?.developerHubUrls[cma]; if (!developerHubBaseUrl) { - developerHubBaseUrl = await askDeveloperHub(name); + developerHubBaseUrl = exportConfig.host?.replace('api','develperhub-api'); } + developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl + return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`; }; diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index dc5c4aa3cb..66120d55d8 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-cm-import", "description": "Contentstack CLI plugin to import content into stack", - "version": "1.13.3", + "version": "1.13.4", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { diff --git a/packages/contentstack-import/src/utils/interactive.ts b/packages/contentstack-import/src/utils/interactive.ts index c949030275..42a4703964 100644 --- a/packages/contentstack-import/src/utils/interactive.ts +++ b/packages/contentstack-import/src/utils/interactive.ts @@ -20,17 +20,6 @@ export const askAPIKey = async (): Promise => { }); }; -export const askDeveloperHubUrl = async (regionName: string): Promise => { - return await cliux.inquire({ - type: 'input', - name: 'name', - validate: (url) => { - if (!url) return "Developer-hub URL can't be empty."; - return true; - }, - message: `Enter the developer-hub base URL for the ${regionName} region -`, - }); -}; export const askEncryptionKey = async(defaultValue: unknown): Promise => { return await cliux.inquire({ diff --git a/packages/contentstack-import/src/utils/marketplace-app-helper.ts b/packages/contentstack-import/src/utils/marketplace-app-helper.ts index e789633796..8186f0d349 100644 --- a/packages/contentstack-import/src/utils/marketplace-app-helper.ts +++ b/packages/contentstack-import/src/utils/marketplace-app-helper.ts @@ -15,7 +15,6 @@ import { log } from './logger'; import { trace } from '../utils/log'; import { ImportConfig, Installation } from '../types'; import { formatError } from '../utils'; -import { askDeveloperHubUrl } from './interactive'; import { getAppName, askAppName, selectConfiguration } from '../utils/interactive'; export const getAllStackSpecificApps = async ( @@ -57,10 +56,11 @@ export const getAllStackSpecificApps = async ( export const getDeveloperHubUrl = async (config: ImportConfig): Promise => { const { cma, name } = configHandler.get('region') || {}; let developerHubBaseUrl = config.developerHubUrls[cma]; - + if (!developerHubBaseUrl) { - developerHubBaseUrl = await askDeveloperHubUrl(name); + developerHubBaseUrl = config.host?.replace('api','developerhub-api'); } + developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`; }; diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index 2322efead6..c279ba12ca 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -5,7 +5,7 @@ "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-cm-import": "~1.13.3", + "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-command": "~1.2.16", "@contentstack/cli-utilities": "~1.5.11", "inquirer": "8.2.4", diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index a4dcfad222..e03f890df0 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -28,9 +28,9 @@ "@contentstack/cli-cm-branches": "~1.0.22", "@contentstack/cli-cm-bulk-publish": "~1.4.0", "@contentstack/cli-cm-clone": "~1.10.0", - "@contentstack/cli-cm-export": "~1.10.4", + "@contentstack/cli-cm-export": "~1.10.5", "@contentstack/cli-cm-export-to-csv": "~1.6.2", - "@contentstack/cli-cm-import": "~1.13.3", + "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-cm-migrate-rte": "~1.4.15", "@contentstack/cli-cm-seed": "~1.7.1", "@contentstack/cli-command": "~1.2.17", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1031c54d4a..cfbeac1257 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,9 +16,9 @@ importers: '@contentstack/cli-cm-branches': ~1.0.22 '@contentstack/cli-cm-bulk-publish': ~1.4.0 '@contentstack/cli-cm-clone': ~1.10.0 - '@contentstack/cli-cm-export': ~1.10.4 + '@contentstack/cli-cm-export': ~1.10.5 '@contentstack/cli-cm-export-to-csv': ~1.6.2 - '@contentstack/cli-cm-import': ~1.13.3 + '@contentstack/cli-cm-import': ~1.13.4 '@contentstack/cli-cm-migrate-rte': ~1.4.15 '@contentstack/cli-cm-seed': ~1.7.1 '@contentstack/cli-command': ~1.2.17 @@ -423,8 +423,8 @@ importers: packages/contentstack-clone: specifiers: '@colors/colors': ^1.5.0 - '@contentstack/cli-cm-export': ~1.10.4 - '@contentstack/cli-cm-import': ~1.13.3 + '@contentstack/cli-cm-export': ~1.10.5 + '@contentstack/cli-cm-import': ~1.13.4 '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-utilities': ~1.5.11 '@oclif/test': ^2.5.6 @@ -990,7 +990,7 @@ importers: packages/contentstack-seed: specifiers: - '@contentstack/cli-cm-import': ~1.13.3 + '@contentstack/cli-cm-import': ~1.13.4 '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-utilities': ~1.5.11 '@oclif/plugin-help': ^5.1.19 From 63d015fac46e735211eac199cfa5730182b0b608 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Mon, 5 Feb 2024 16:12:34 +0530 Subject: [PATCH 2/5] fixed type --- .../contentstack-export/src/utils/marketplace-app-helper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contentstack-export/src/utils/marketplace-app-helper.ts b/packages/contentstack-export/src/utils/marketplace-app-helper.ts index 5dad11cb98..0166780647 100644 --- a/packages/contentstack-export/src/utils/marketplace-app-helper.ts +++ b/packages/contentstack-export/src/utils/marketplace-app-helper.ts @@ -8,7 +8,7 @@ export const getDeveloperHubUrl = async (exportConfig: ExportConfig) => { let developerHubBaseUrl = exportConfig?.developerHubUrls[cma]; if (!developerHubBaseUrl) { - developerHubBaseUrl = exportConfig.host?.replace('api','develperhub-api'); + developerHubBaseUrl = exportConfig.host?.replace('api','developerhub-api'); } developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl From aea35ec9af4e2ba7752ce69f6c573eca0b93d41d Mon Sep 17 00:00:00 2001 From: raj pandey Date: Tue, 6 Feb 2024 17:09:05 +0530 Subject: [PATCH 3/5] moved the developerhuburl to utilites --- .../src/utils/marketplace-app-helper.ts | 13 ++----------- .../src/utils/marketplace-app-helper.ts | 11 ++--------- packages/contentstack-utilities/src/helpers.ts | 6 ++++++ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/packages/contentstack-export/src/utils/marketplace-app-helper.ts b/packages/contentstack-export/src/utils/marketplace-app-helper.ts index 0166780647..670adab051 100644 --- a/packages/contentstack-export/src/utils/marketplace-app-helper.ts +++ b/packages/contentstack-export/src/utils/marketplace-app-helper.ts @@ -1,19 +1,10 @@ -import { cliux, configHandler, NodeCrypto, managementSDKClient } from '@contentstack/cli-utilities'; +import { cliux, configHandler, NodeCrypto, managementSDKClient, createDeveloperHubUrl } from '@contentstack/cli-utilities'; import { formatError, log } from '../utils'; import { ExportConfig } from '../types'; export const getDeveloperHubUrl = async (exportConfig: ExportConfig) => { - const { cma, name } = configHandler.get('region') || {}; - let developerHubBaseUrl = exportConfig?.developerHubUrls[cma]; - - if (!developerHubBaseUrl) { - developerHubBaseUrl = exportConfig.host?.replace('api','developerhub-api'); - } - - developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl - - return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`; + return createDeveloperHubUrl(exportConfig.host); }; export async function getOrgUid(config: ExportConfig): Promise { diff --git a/packages/contentstack-import/src/utils/marketplace-app-helper.ts b/packages/contentstack-import/src/utils/marketplace-app-helper.ts index 8186f0d349..dca299e706 100644 --- a/packages/contentstack-import/src/utils/marketplace-app-helper.ts +++ b/packages/contentstack-import/src/utils/marketplace-app-helper.ts @@ -9,6 +9,7 @@ import { configHandler, managementSDKClient, marketplaceSDKClient, + createDeveloperHubUrl } from '@contentstack/cli-utilities'; import { log } from './logger'; @@ -54,15 +55,7 @@ export const getAllStackSpecificApps = async ( }; export const getDeveloperHubUrl = async (config: ImportConfig): Promise => { - const { cma, name } = configHandler.get('region') || {}; - let developerHubBaseUrl = config.developerHubUrls[cma]; - - if (!developerHubBaseUrl) { - developerHubBaseUrl = config.host?.replace('api','developerhub-api'); - } - developerHubBaseUrl = developerHubBaseUrl.startsWith('dev9')?developerHubBaseUrl.replace('dev9','dev'):developerHubBaseUrl - - return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`; + return createDeveloperHubUrl(config.host); }; export const getOrgUid = async (config: ImportConfig): Promise => { diff --git a/packages/contentstack-utilities/src/helpers.ts b/packages/contentstack-utilities/src/helpers.ts index 30c1b43bf0..cacf0659f2 100644 --- a/packages/contentstack-utilities/src/helpers.ts +++ b/packages/contentstack-utilities/src/helpers.ts @@ -24,4 +24,10 @@ export const isManagementTokenValid = async (stackAPIKey, managementToken) => { } catch (error) { return { valid: 'failedToCheck',message:`Failed to check the validity of the Management token. ${error}`}; } +} + +export const createDeveloperHubUrl = (developerHubBaseUrl:string) : string => { + developerHubBaseUrl = developerHubBaseUrl?.replace('api','developerhub-api'); + developerHubBaseUrl = developerHubBaseUrl.startsWith('dev11')?developerHubBaseUrl.replace('dev11','dev'):developerHubBaseUrl; + return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`; } \ No newline at end of file From 6670decde884a4956b48fe8d507608c9e3ad7987 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Wed, 7 Feb 2024 13:41:00 +0530 Subject: [PATCH 4/5] utilites version bump --- package-lock.json | 34 +++++++++---------- packages/contentstack-audit/package.json | 2 +- packages/contentstack-auth/package.json | 2 +- packages/contentstack-bootstrap/package.json | 2 +- packages/contentstack-branches/package.json | 2 +- .../contentstack-bulk-publish/package.json | 2 +- packages/contentstack-clone/package.json | 2 +- packages/contentstack-command/package.json | 2 +- packages/contentstack-config/package.json | 2 +- .../contentstack-export-to-csv/package.json | 2 +- packages/contentstack-export/package.json | 2 +- packages/contentstack-import/package.json | 2 +- packages/contentstack-launch/package.json | 2 +- .../contentstack-migrate-rte/package.json | 2 +- packages/contentstack-migration/package.json | 2 +- packages/contentstack-seed/package.json | 2 +- packages/contentstack-utilities/package.json | 2 +- packages/contentstack/package.json | 2 +- pnpm-lock.yaml | 32 ++++++++--------- 19 files changed, 50 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c56942480..289a6c70d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23558,7 +23558,7 @@ "@contentstack/cli-config": "~1.6.1", "@contentstack/cli-launch": "~1.0.16", "@contentstack/cli-migration": "~1.4.2", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@contentstack/management": "~1.13.0", "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", @@ -23612,7 +23612,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^4.1.9", "chalk": "^4.1.2", @@ -23874,7 +23874,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "chalk": "^4.0.0", "debug": "^4.1.1", "inquirer": "8.2.4", @@ -23922,7 +23922,7 @@ "dependencies": { "@contentstack/cli-cm-seed": "~1.7.0", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.1.13" @@ -24006,7 +24006,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@oclif/core": "^2.9.3", "async": "^3.2.4", "big-json": "^3.2.0", @@ -24055,7 +24055,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "bluebird": "^3.7.2", "chalk": "^4.1.2", "dotenv": "^16.1.4", @@ -24095,7 +24095,7 @@ "@contentstack/cli-cm-export": "~1.10.5", "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "async": "^3.2.4", "chalk": "^4.1.0", "child_process": "^1.0.2", @@ -24143,7 +24143,7 @@ "version": "1.2.17", "license": "MIT", "dependencies": { - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "contentstack": "^3.10.1" }, "devDependencies": { @@ -24224,7 +24224,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "chalk": "^4.0.0", "debug": "^4.1.1", "inquirer": "8.2.4", @@ -24529,7 +24529,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@oclif/core": "^2.9.3", "async": "^3.2.4", "big-json": "^3.2.0", @@ -24579,7 +24579,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "chalk": "^4.1.0", "fast-csv": "^4.3.6", "inquirer": "8.2.4", @@ -24998,7 +24998,7 @@ "dependencies": { "@contentstack/cli-audit": "^1.3.5", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@contentstack/management": "~1.13.0", "@oclif/core": "^2.9.3", "big-json": "^3.2.0", @@ -25128,7 +25128,7 @@ "dependencies": { "@apollo/client": "^3.7.9", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^4.1.9", @@ -25401,7 +25401,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@contentstack/json-rte-serializer": "~2.0.4", "chalk": "^4.1.2", "collapse-whitespace": "^1.1.7", @@ -25440,7 +25440,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "async": "^3.2.4", "callsites": "^3.1.0", "cardinal": "^2.1.1", @@ -25474,7 +25474,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.1.13", @@ -25556,7 +25556,7 @@ }, "packages/contentstack-utilities": { "name": "@contentstack/cli-utilities", - "version": "1.5.11", + "version": "1.5.12", "license": "MIT", "dependencies": { "@contentstack/management": "~1.13.0", diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index 45c759d203..9bf9209cb9 100644 --- a/packages/contentstack-audit/package.json +++ b/packages/contentstack-audit/package.json @@ -19,7 +19,7 @@ ], "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^4.1.9", "chalk": "^4.1.2", diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json index ef501312bd..448f3a0c16 100644 --- a/packages/contentstack-auth/package.json +++ b/packages/contentstack-auth/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "chalk": "^4.0.0", "debug": "^4.1.1", "inquirer": "8.2.4", diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json index 526c3517b2..361f341577 100644 --- a/packages/contentstack-bootstrap/package.json +++ b/packages/contentstack-bootstrap/package.json @@ -19,7 +19,7 @@ "dependencies": { "@contentstack/cli-cm-seed": "~1.7.0", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.1.13" diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json index 87de095bab..131f3fb134 100644 --- a/packages/contentstack-branches/package.json +++ b/packages/contentstack-branches/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@oclif/core": "^2.9.3", "async": "^3.2.4", "big-json": "^3.2.0", diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json index cf241ebbe6..2cfda05977 100644 --- a/packages/contentstack-bulk-publish/package.json +++ b/packages/contentstack-bulk-publish/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "bluebird": "^3.7.2", "chalk": "^4.1.2", "dotenv": "^16.1.4", diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index fcbd24afa4..43aa7a03b6 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -8,7 +8,7 @@ "@contentstack/cli-cm-export": "~1.10.5", "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@colors/colors": "^1.5.0", "async": "^3.2.4", "chalk": "^4.1.0", diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json index a63adfb739..91cda88e62 100644 --- a/packages/contentstack-command/package.json +++ b/packages/contentstack-command/package.json @@ -17,7 +17,7 @@ "format": "eslint src/**/*.ts --fix" }, "dependencies": { - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "contentstack": "^3.10.1" }, "devDependencies": { diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json index 17ce590482..cd4309ad39 100644 --- a/packages/contentstack-config/package.json +++ b/packages/contentstack-config/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "chalk": "^4.0.0", "debug": "^4.1.1", "inquirer": "8.2.4", diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json index c9c6430837..86bde2c529 100644 --- a/packages/contentstack-export-to-csv/package.json +++ b/packages/contentstack-export-to-csv/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "chalk": "^4.1.0", "fast-csv": "^4.3.6", "inquirer": "8.2.4", diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json index a2bde1bc8a..e70f726b5a 100644 --- a/packages/contentstack-export/package.json +++ b/packages/contentstack-export/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@oclif/core": "^2.9.3", "async": "^3.2.4", "big-json": "^3.2.0", diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index 66120d55d8..1ce0d21d54 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-audit": "^1.3.5", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@contentstack/management": "~1.13.0", "@oclif/core": "^2.9.3", "big-json": "^3.2.0", diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json index f2f7e35f20..1704922306 100755 --- a/packages/contentstack-launch/package.json +++ b/packages/contentstack-launch/package.json @@ -19,7 +19,7 @@ "dependencies": { "@apollo/client": "^3.7.9", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^4.1.9", diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json index 4be2853e31..43f16ef3f6 100644 --- a/packages/contentstack-migrate-rte/package.json +++ b/packages/contentstack-migrate-rte/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@contentstack/json-rte-serializer": "~2.0.4", "collapse-whitespace": "^1.1.7", "chalk": "^4.1.2", diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json index 1971b87df1..3f56e8e0a6 100644 --- a/packages/contentstack-migration/package.json +++ b/packages/contentstack-migration/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "async": "^3.2.4", "callsites": "^3.1.0", "cardinal": "^2.1.1", diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index c279ba12ca..22a7c5808e 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.13.4", "@contentstack/cli-command": "~1.2.16", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.1.13", diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json index 379f17ee27..5b5659b796 100644 --- a/packages/contentstack-utilities/package.json +++ b/packages/contentstack-utilities/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/cli-utilities", - "version": "1.5.11", + "version": "1.5.12", "description": "Utilities for contentstack projects", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index e03f890df0..7de2026b91 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -37,7 +37,7 @@ "@contentstack/cli-config": "~1.6.1", "@contentstack/cli-launch": "~1.0.16", "@contentstack/cli-migration": "~1.4.2", - "@contentstack/cli-utilities": "~1.5.11", + "@contentstack/cli-utilities": "~1.5.12", "@contentstack/management": "~1.13.0", "@oclif/core": "^2.9.3", "@oclif/plugin-help": "^5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cfbeac1257..ea50029dec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,7 +25,7 @@ importers: '@contentstack/cli-config': ~1.6.1 '@contentstack/cli-launch': ~1.0.16 '@contentstack/cli-migration': ~1.4.2 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@contentstack/management': ~1.13.0 '@oclif/core': ^2.9.3 '@oclif/plugin-help': ^5 @@ -123,7 +123,7 @@ importers: specifiers: '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-dev-dependencies': ^1.2.4 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/plugin-help': ^5 '@oclif/plugin-plugins': ^4.1.9 '@oclif/test': ^2.5.6 @@ -187,7 +187,7 @@ importers: packages/contentstack-auth: specifiers: '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@fancy-test/nock': ^0.1.1 '@oclif/plugin-help': ^5.1.19 '@oclif/test': ^2.5.6 @@ -251,7 +251,7 @@ importers: specifiers: '@contentstack/cli-cm-seed': ~1.7.0 '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/test': ^2.5.6 '@types/inquirer': ^9.0.3 '@types/mkdirp': ^1.0.1 @@ -304,7 +304,7 @@ importers: '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-config': ~1.6.1 '@contentstack/cli-dev-dependencies': ~1.2.4 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/core': ^2.9.3 '@oclif/plugin-help': ^5.1.19 '@oclif/test': ^2.5.6 @@ -380,7 +380,7 @@ importers: packages/contentstack-bulk-publish: specifiers: '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/test': ^2.5.6 bluebird: ^3.7.2 chai: ^4.2.0 @@ -426,7 +426,7 @@ importers: '@contentstack/cli-cm-export': ~1.10.5 '@contentstack/cli-cm-import': ~1.13.4 '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/test': ^2.5.6 async: ^3.2.4 chai: ^4.2.0 @@ -479,7 +479,7 @@ importers: packages/contentstack-command: specifiers: - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/test': ^2.5.6 '@types/chai': ^4.2.18 '@types/mkdirp': ^1.0.1 @@ -521,7 +521,7 @@ importers: packages/contentstack-config: specifiers: '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/test': ^2.5.6 '@types/chai': ^4.2.18 '@types/inquirer': ^9.0.3 @@ -610,7 +610,7 @@ importers: '@contentstack/cli-command': ~1.2.16 '@contentstack/cli-config': ~1.6.1 '@contentstack/cli-dev-dependencies': ~1.2.4 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/core': ^2.9.3 '@oclif/plugin-help': ^5.1.19 '@oclif/test': ^2.5.6 @@ -688,7 +688,7 @@ importers: packages/contentstack-export-to-csv: specifiers: '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/test': ^2.5.6 '@types/chai': ^4.3.6 '@types/mocha': ^10.0.1 @@ -732,7 +732,7 @@ importers: specifiers: '@contentstack/cli-audit': ^1.3.5 '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@contentstack/management': ~1.13.0 '@oclif/core': ^2.9.3 '@oclif/test': ^2.5.6 @@ -821,7 +821,7 @@ importers: specifiers: '@apollo/client': ^3.7.9 '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/core': ^2.9.3 '@oclif/plugin-help': ^5 '@oclif/plugin-plugins': ^4.1.9 @@ -897,7 +897,7 @@ importers: packages/contentstack-migrate-rte: specifiers: '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@contentstack/json-rte-serializer': ~2.0.4 '@oclif/test': ^2.5.6 chai: ^4.3.4 @@ -944,7 +944,7 @@ importers: packages/contentstack-migration: specifiers: '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/test': ^2.5.6 async: ^3.2.4 callsites: ^3.1.0 @@ -992,7 +992,7 @@ importers: specifiers: '@contentstack/cli-cm-import': ~1.13.4 '@contentstack/cli-command': ~1.2.16 - '@contentstack/cli-utilities': ~1.5.11 + '@contentstack/cli-utilities': ~1.5.12 '@oclif/plugin-help': ^5.1.19 '@types/inquirer': ^9.0.3 '@types/jest': ^26.0.15 From 456d67b95bcacca4de9f40f8aa4fb91e28a8a060 Mon Sep 17 00:00:00 2001 From: raj pandey Date: Fri, 9 Feb 2024 15:09:10 +0530 Subject: [PATCH 5/5] fixed for NA region developerhub --- packages/contentstack-utilities/src/helpers.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/contentstack-utilities/src/helpers.ts b/packages/contentstack-utilities/src/helpers.ts index cacf0659f2..debee61879 100644 --- a/packages/contentstack-utilities/src/helpers.ts +++ b/packages/contentstack-utilities/src/helpers.ts @@ -26,8 +26,13 @@ export const isManagementTokenValid = async (stackAPIKey, managementToken) => { } } -export const createDeveloperHubUrl = (developerHubBaseUrl:string) : string => { - developerHubBaseUrl = developerHubBaseUrl?.replace('api','developerhub-api'); - developerHubBaseUrl = developerHubBaseUrl.startsWith('dev11')?developerHubBaseUrl.replace('dev11','dev'):developerHubBaseUrl; +export const createDeveloperHubUrl = (developerHubBaseUrl: string): string => { + developerHubBaseUrl = developerHubBaseUrl?.replace('api', 'developerhub-api'); + developerHubBaseUrl = developerHubBaseUrl.startsWith('dev11') + ? developerHubBaseUrl.replace('dev11', 'dev') + : developerHubBaseUrl; + developerHubBaseUrl = developerHubBaseUrl.endsWith('io') + ? developerHubBaseUrl.replace('io', 'com') + : developerHubBaseUrl; return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`; -} \ No newline at end of file +};