From 2a292a88f162819f31a63d35fb1afab943790a20 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Fri, 27 Sep 2024 17:44:18 +0530 Subject: [PATCH 01/11] fix: logger, custom attribute ref & error --- .../src/export/modules/marketplace-apps.ts | 12 +++++++----- .../src/export/modules/personalize.ts | 2 +- .../src/import/modules/marketplace-apps.ts | 8 +++++--- .../src/utils/entries-helper.ts | 16 +++++++++++----- .../contentstack-variants/src/import/project.ts | 2 +- .../src/import/variant-entries.ts | 4 ++-- .../src/types/variant-entry.ts | 1 - .../src/utils/attributes-helper.ts | 4 ++-- .../src/utils/error-helper.ts | 12 ++++++------ .../contentstack-variants/src/utils/logger.ts | 9 +++++---- 10 files changed, 40 insertions(+), 30 deletions(-) diff --git a/packages/contentstack-export/src/export/modules/marketplace-apps.ts b/packages/contentstack-export/src/export/modules/marketplace-apps.ts index cc2a5b4e9c..ff34d2400f 100644 --- a/packages/contentstack-export/src/export/modules/marketplace-apps.ts +++ b/packages/contentstack-export/src/export/modules/marketplace-apps.ts @@ -138,7 +138,9 @@ export default class ExportMarketplaceApps { */ async getAppConfigurations(index: number, appInstallation: any) { const appName = appInstallation?.manifest?.name; - log(this.exportConfig, `Exporting ${appName} app and it's config.`, 'info'); + const appUid = appInstallation?.manifest?.uid; + const app = appName || appUid; + log(this.exportConfig, `Exporting ${app} app and it's config.`, 'info'); await this.appSdk .marketplace(this.exportConfig.org_uid) @@ -158,17 +160,17 @@ export default class ExportMarketplaceApps { if (!isEmpty(data?.server_configuration)) { this.installedApps[index]['server_configuration'] = this.nodeCrypto.encrypt(data.server_configuration); - log(this.exportConfig, `Exported ${appName} app and it's config.`, 'success'); + log(this.exportConfig, `Exported ${app} app and it's config.`, 'success'); } else { - log(this.exportConfig, `Exported ${appName} app`, 'success'); + log(this.exportConfig, `Exported ${app} app`, 'success'); } } else if (error) { - log(this.exportConfig, `Error on exporting ${appName} app and it's config.`, 'error'); + log(this.exportConfig, `Error on exporting ${app} app and it's config.`, 'error'); log(this.exportConfig, error, 'error'); } }) .catch((error: any) => { - log(this.exportConfig, `Failed to export ${appName} app config ${formatError(error)}`, 'error'); + log(this.exportConfig, `Failed to export ${app} app config ${formatError(error)}`, 'error'); log(this.exportConfig, error, 'error'); }); } diff --git a/packages/contentstack-export/src/export/modules/personalize.ts b/packages/contentstack-export/src/export/modules/personalize.ts index 45cff20807..6fa5f89b33 100644 --- a/packages/contentstack-export/src/export/modules/personalize.ts +++ b/packages/contentstack-export/src/export/modules/personalize.ts @@ -7,7 +7,7 @@ import { AnyProperty, } from '@contentstack/cli-variants'; -import { log, formatError } from '../../utils'; +import { log } from '../../utils'; import { ModuleClassParams, ExportConfig } from '../../types'; export default class ExportPersonalize { diff --git a/packages/contentstack-import/src/import/modules/marketplace-apps.ts b/packages/contentstack-import/src/import/modules/marketplace-apps.ts index 91a0d16341..f334807e92 100644 --- a/packages/contentstack-import/src/import/modules/marketplace-apps.ts +++ b/packages/contentstack-import/src/import/modules/marketplace-apps.ts @@ -438,7 +438,7 @@ export default class ImportMarketplaceApps { ); if (installation.installation_uid) { - const appName = this.appNameMapping[app.manifest.name] ?? app.manifest.name; + const appName = this.appNameMapping[app.manifest.name] || app.manifest.name || app.manifest.uid; log(this.importConfig, `${appName} app installed successfully.!`, 'success'); await makeRedirectUrlCall(installation, appName, this.importConfig); this.installationUidMapping[app.uid] = installation.installation_uid; @@ -448,7 +448,8 @@ export default class ImportMarketplaceApps { await confirmToCloseProcess(installation, this.importConfig); } } else if (!isEmpty(configuration) || !isEmpty(server_configuration)) { - log(this.importConfig, `${app.manifest.name} is already installed`, 'success'); + const appName = app.manifest.name || app.manifest.uid; + log(this.importConfig, `${appName} is already installed`, 'success'); updateParam = await ifAppAlreadyExist(app, currentStackApp, this.importConfig); } @@ -481,7 +482,8 @@ export default class ImportMarketplaceApps { trace(data, 'error', true); log(this.importConfig, formatError(data.message), 'success'); } else { - log(this.importConfig, `${app.manifest.name} app config updated successfully.!`, 'success'); + const appName = app.manifest.name || app.manifest.uid; + log(this.importConfig, `${appName} app config updated successfully.!`, 'success'); } }) .catch((error: any) => { diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts index ac070662aa..503a540556 100644 --- a/packages/contentstack-import/src/utils/entries-helper.ts +++ b/packages/contentstack-import/src/utils/entries-helper.ts @@ -548,11 +548,17 @@ export const restoreJsonRteEntryRefs = ( }); } else { entry[element.uid] = restoreReferenceInJsonRTE(sourceStackEntry[element.uid], uidMapper); - entry[element.uid].children = entry[element.uid].children.map((child: any) => { - child = setDirtyTrue(child); - child = resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); - return child; - }); + if (entry[element.uid].children && entry[element.uid].children.length > 0) { + entry[element.uid].children = entry[element.uid].children.map((child: any) => { + child = setDirtyTrue(child); + child = resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls); + return child; + }); + } else { + entry[element.uid].children = [ + { type: 'p', attrs: { style: {}, 'redactor-attributes': {}, dir: 'ltr' } }, + ]; + } } } break; diff --git a/packages/contentstack-variants/src/import/project.ts b/packages/contentstack-variants/src/import/project.ts index 0741785e49..8a98948486 100644 --- a/packages/contentstack-variants/src/import/project.ts +++ b/packages/contentstack-variants/src/import/project.ts @@ -46,7 +46,7 @@ export default class Project extends PersonalizationAdapter { description: project.description, connectedStackApiKey: this.config.apiKey, }).catch(async (error) => { - if (error === 'personalization.PROJECTS.DUPLICATE_NAME' || error === 'personalize.PROJECTS.DUPLICATE_NAME') { + if (error.includes('personalization.PROJECTS.DUPLICATE_NAME') || error.includes('personalize.PROJECTS.DUPLICATE_NAME')) { const projectName = await askProjectName('Copy Of ' + (newName || project.name)); return await createProject(projectName); } diff --git a/packages/contentstack-variants/src/import/variant-entries.ts b/packages/contentstack-variants/src/import/variant-entries.ts index c4f4c75176..f209c146e7 100644 --- a/packages/contentstack-variants/src/import/variant-entries.ts +++ b/packages/contentstack-variants/src/import/variant-entries.ts @@ -406,6 +406,7 @@ export default class VariantEntries extends VariantAdapter[], attribut // Check if attribute reference exists in attributesUid const attributeRef = rule.attribute?.ref; const attributeType = rule.attribute['__type']; - // check if type is UserAttributeReference - if (attributeType === 'UserAttributeReference') { + // check if type is CustomAttributeReference + if (attributeType === 'CustomAttributeReference') { if (attributeRef && attributesUid.hasOwnProperty(attributeRef) && attributesUid[attributeRef]) { rule.attribute.ref = attributesUid[attributeRef]; } else { diff --git a/packages/contentstack-variants/src/utils/error-helper.ts b/packages/contentstack-variants/src/utils/error-helper.ts index 58c087fbbc..7f01a7c2f7 100644 --- a/packages/contentstack-variants/src/utils/error-helper.ts +++ b/packages/contentstack-variants/src/utils/error-helper.ts @@ -9,18 +9,18 @@ export function formatErrors(errors: any): string { for (const errorKey in errors) { const errorValue = errors[errorKey]; if (Array.isArray(errorValue)) { - errorMessages.push(...errorValue.map((error: any) => formatError(error))); + errorMessages.push(...errorValue.map((error: any) => formatError(errorKey, error))); } else { - errorMessages.push(formatError(errorValue)); + errorMessages.push(formatError(errorKey, errorValue)); } } return errorMessages.join(' '); } -function formatError(error: any): string { - if (typeof error === 'object') { - return Object.values(error).join(' '); +function formatError(errorKey: string, error: any): string { + if (typeof error === 'object' && error !== null) { + return `${errorKey}: ${Object.values(error).join(' ')}`; } - return error; + return `${errorKey}: ${error}`; } diff --git a/packages/contentstack-variants/src/utils/logger.ts b/packages/contentstack-variants/src/utils/logger.ts index c1a2801cb3..2a21b13163 100644 --- a/packages/contentstack-variants/src/utils/logger.ts +++ b/packages/contentstack-variants/src/utils/logger.ts @@ -51,9 +51,9 @@ let errorLogger: winston.Logger; let successTransport; let errorTransport; -function init(_logPath: string) { +function init(_logPath: string, module: string) { if (!logger || !errorLogger) { - const logsDir = path.resolve(sanitizePath(_logPath), 'logs', 'export'); + const logsDir = path.resolve(sanitizePath(_logPath), 'logs', module); // Create dir if doesn't already exist mkdirp.sync(logsDir); @@ -131,11 +131,12 @@ function init(_logPath: string) { export const log = (config: ExportConfig | ImportConfig, message: any, type: 'info' | 'error' | 'success') => { const logsPath = config.data; // ignoring the type argument, as we are not using it to create a logfile anymore + const module = (config as ImportConfig)['backupDir'] ? 'import' : 'export'; if (type !== 'error') { // removed type argument from init method - init(logsPath).log(message); + init(logsPath, module).log(message); } else { - init(logsPath).error(message); + init(logsPath, module).error(message); } }; From a39b631c22277bd7ed470a07c2ff08276b5929f9 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Mon, 30 Sep 2024 12:18:15 +0530 Subject: [PATCH 02/11] fix: file field not importing if its made variant field --- .../src/import/variant-entries.ts | 31 +++++++++++++------ .../src/messages/index.ts | 2 +- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/packages/contentstack-variants/src/import/variant-entries.ts b/packages/contentstack-variants/src/import/variant-entries.ts index f209c146e7..06f102d851 100644 --- a/packages/contentstack-variants/src/import/variant-entries.ts +++ b/packages/contentstack-variants/src/import/variant-entries.ts @@ -368,7 +368,7 @@ export default class VariantEntries extends VariantAdapter) => { + const setValue = (currentObj: VariantEntryStruct, keys: string[]) => { if (!currentObj || keys.length === 0) return; const [firstKey, ...restKeys] = keys; @@ -380,7 +380,17 @@ export default class VariantEntries extends VariantAdapter ref._content_type_uid === 'sys_assets') - .map((ref: any) => ref.path); + const pathsToUpdate = + variantEntry?._metadata?.references + ?.filter((ref: any) => ref._content_type_uid === 'sys_assets') + .map((ref: any) => ref.path) || []; - if (pathsToUpdate) { - pathsToUpdate.forEach((path: string) => setValue(variantEntry, path.split('.'))); - } + pathsToUpdate.forEach((path: string) => setValue(variantEntry, path.split('.'))); } /** @@ -406,7 +415,11 @@ export default class VariantEntries extends VariantAdapter Date: Mon, 30 Sep 2024 12:30:41 +0530 Subject: [PATCH 03/11] refactor: variant updateFileFields logic --- .../contentstack-variants/src/import/variant-entries.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/contentstack-variants/src/import/variant-entries.ts b/packages/contentstack-variants/src/import/variant-entries.ts index 06f102d851..554f123bc5 100644 --- a/packages/contentstack-variants/src/import/variant-entries.ts +++ b/packages/contentstack-variants/src/import/variant-entries.ts @@ -383,12 +383,9 @@ export default class VariantEntries extends VariantAdapter Date: Mon, 30 Sep 2024 23:22:37 +0530 Subject: [PATCH 04/11] feat: oauth support in variant & personalize --- package-lock.json | 36 ++--- 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 +- .../src/authentication-handler.ts | 127 ++++++++++++++++++ .../contentstack-utilities/src/helpers.ts | 15 +++ packages/contentstack-utilities/src/index.ts | 1 + packages/contentstack-variants/package.json | 2 +- .../src/export/attributes.ts | 8 +- .../src/export/audiences.ts | 3 +- .../src/export/events.ts | 3 +- .../src/export/experiences.ts | 5 +- .../src/export/projects.ts | 3 +- .../src/export/variant-entries.ts | 3 +- .../src/import/attribute.ts | 4 +- .../src/import/audiences.ts | 4 +- .../src/import/events.ts | 4 +- .../src/import/experiences.ts | 6 +- .../src/import/project.ts | 6 +- .../src/import/variant-entries.ts | 4 +- .../src/types/personalization-api-adapter.ts | 2 +- .../src/types/variant-api-adapter.ts | 4 +- .../src/utils/personalization-api-adapter.ts | 67 ++++++--- .../src/utils/variant-api-adapter.ts | 24 +++- packages/contentstack/package.json | 2 +- pnpm-lock.yaml | 34 ++--- 39 files changed, 294 insertions(+), 105 deletions(-) create mode 100644 packages/contentstack-utilities/src/authentication-handler.ts diff --git a/package-lock.json b/package-lock.json index cf8ff44246..8e72db712c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26318,7 +26318,7 @@ "@contentstack/cli-config": "~1.7.1", "@contentstack/cli-launch": "~1.2.2", "@contentstack/cli-migration": "~1.6.1", - "@contentstack/cli-utilities": "~1.7.3", + "@contentstack/cli-utilities": "~1.8.0", "@contentstack/management": "~1.17.0", "@oclif/core": "^3.26.5", "@oclif/plugin-help": "^5", @@ -26372,7 +26372,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^5.0.0", "chalk": "^4.1.2", @@ -26633,7 +26633,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.0.0", "debug": "^4.1.1", "inquirer": "8.2.4", @@ -26675,7 +26675,7 @@ "dependencies": { "@contentstack/cli-cm-seed": "~1.9.0", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.2.1 " @@ -26756,7 +26756,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "async": "^3.2.4", "big-json": "^3.2.0", @@ -26805,7 +26805,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "bluebird": "^3.7.2", "chalk": "^4.1.2", "dotenv": "^16.1.4", @@ -26846,7 +26846,7 @@ "@contentstack/cli-cm-export": "~1.13.0", "@contentstack/cli-cm-import": "~1.18.0", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", "chalk": "^4.1.0", "child_process": "^1.0.2", @@ -26952,7 +26952,7 @@ "version": "1.3.1", "license": "MIT", "dependencies": { - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "contentstack": "^3.10.1" }, "devDependencies": { @@ -27030,7 +27030,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.0.0", "debug": "^4.1.1", "inquirer": "8.2.4", @@ -27436,7 +27436,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@contentstack/cli-variants": "~1.0.0", "@oclif/core": "^3.26.5", "async": "^3.2.4", @@ -27487,7 +27487,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.1.0", "fast-csv": "^4.3.6", "inquirer": "8.2.4", @@ -28017,7 +28017,7 @@ "dependencies": { "@contentstack/cli-audit": "~1.7.0", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@contentstack/cli-variants": "~1.0.0", "@contentstack/management": "~1.17.0", "@oclif/core": "^3.26.5", @@ -28072,7 +28072,7 @@ "dependencies": { "@apollo/client": "^3.7.9", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^5.0.0", @@ -28387,7 +28387,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@contentstack/json-rte-serializer": "~2.0.4", "chalk": "^4.1.2", "collapse-whitespace": "^1.1.7", @@ -28427,7 +28427,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", "callsites": "^3.1.0", "cardinal": "^2.1.1", @@ -28461,7 +28461,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.18.0", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.1.13", @@ -28540,7 +28540,7 @@ }, "packages/contentstack-utilities": { "name": "@contentstack/cli-utilities", - "version": "1.7.3", + "version": "1.8.0", "license": "MIT", "dependencies": { "@contentstack/management": "~1.17.0", @@ -28629,7 +28629,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@contentstack/cli-utilities": "^1.5.12", + "@contentstack/cli-utilities": "^1.8.0", "lodash": "^4.17.21", "mkdirp": "^1.0.4", "winston": "^3.7.2" diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index 7acc64c735..3d7fae0a2d 100644 --- a/packages/contentstack-audit/package.json +++ b/packages/contentstack-audit/package.json @@ -19,7 +19,7 @@ ], "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^5.0.0", "chalk": "^4.1.2", diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json index 26a7500c79..dda7b301e2 100644 --- a/packages/contentstack-auth/package.json +++ b/packages/contentstack-auth/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "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 5afeb6b48a..c2cfaf537e 100644 --- a/packages/contentstack-bootstrap/package.json +++ b/packages/contentstack-bootstrap/package.json @@ -19,7 +19,7 @@ "dependencies": { "@contentstack/cli-cm-seed": "~1.9.0", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", "mkdirp": "^1.0.4", "tar": "^6.2.1 " diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json index ece3af8b45..428fb9aae0 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.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "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 b227eb1048..80482b1dfc 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.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "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 d8d5e7823e..b43211a17c 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -9,7 +9,7 @@ "@contentstack/cli-cm-export": "~1.13.0", "@contentstack/cli-cm-import": "~1.18.0", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", "chalk": "^4.1.0", "child_process": "^1.0.2", diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json index cd005b2244..1a3cac177b 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.7.2", + "@contentstack/cli-utilities": "~1.8.0", "contentstack": "^3.10.1" }, "devDependencies": { diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json index 8ad3734c78..ae5db6299a 100644 --- a/packages/contentstack-config/package.json +++ b/packages/contentstack-config/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "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 75a3fe0a9c..f9d281613e 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.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "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 1e76451286..bf8002a6f9 100644 --- a/packages/contentstack-export/package.json +++ b/packages/contentstack-export/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-command": "~1.3.0", "@contentstack/cli-variants": "~1.0.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "async": "^3.2.4", "big-json": "^3.2.0", diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index f1ec8916f9..331199cc4a 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-audit": "~1.7.0", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@contentstack/management": "~1.17.0", "@contentstack/cli-variants": "~1.0.0", "@oclif/core": "^3.26.5", diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json index 4400648155..68079cd7e8 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.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^5.0.0", diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json index 91cd0c6e20..a26536aacb 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.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "@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 501d829633..554d7ad5b6 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.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "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 e15ecdf73a..eb2852e331 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.18.0", "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-utilities": "~1.8.0", "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 7014da1864..7ebadcbf2d 100644 --- a/packages/contentstack-utilities/package.json +++ b/packages/contentstack-utilities/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/cli-utilities", - "version": "1.7.3", + "version": "1.8.0", "description": "Utilities for contentstack projects", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/contentstack-utilities/src/authentication-handler.ts b/packages/contentstack-utilities/src/authentication-handler.ts new file mode 100644 index 0000000000..5c22b62546 --- /dev/null +++ b/packages/contentstack-utilities/src/authentication-handler.ts @@ -0,0 +1,127 @@ +import { cliux as ux, authHandler, configHandler } from './index'; + +class AuthenticationHandler { + private authType: string; + private isOAuth: boolean; + private token: string | null = null; + + constructor() { + this.authType = configHandler.get('authorisationType'); + this.isOAuth = this.authType === 'OAUTH'; + } + + async getAuthDetails(): Promise { + try { + switch (this.authType) { + case 'BASIC': + this.token = configHandler.get('authtoken'); + break; + case 'OAUTH': + await authHandler.compareOAuthExpiry(); + this.token = `Bearer ${configHandler.get('oauthAccessToken')}`; + break; + default: + const authToken = configHandler.get('authtoken'); + if (authToken) { + this.token = authToken; + } else { + ux.print('Session timed out, please login to proceed', { + color: 'yellow', + }); + process.exit(1); + } + break; + } + } catch (error) { + ux.print(`Error occurred while fetching auth details: ${error.message}`, { + color: 'red', + }); + process.exit(1); + } + } + + get isOauthEnabled(): boolean { + return this.isOAuth; + } + + get accessToken(): string { + if (!this.token) { + throw new Error('Token is not available. Please authenticate first.'); + } + return this.token; + } + + async refreshAccessToken(error: any, maxRetryCount = 1): Promise { + if (error.response && error.response.status) { + // Increment the retry count only when not exceeding max retries + if (maxRetryCount >= 3) { + ux.print('Max retry count reached, please login to proceed', { + color: 'yellow', + }); + process.exit(1); + } + + maxRetryCount++; // Increment here for the next retry attempt + + switch (error.response.status) { + case 401: + // NOTE: Refresh the token if the type is OAuth. + const region: { cma: string; name: string; cda: string } = configHandler.get('region') || {}; + if (region?.cma) { + let hostName: string = ''; + if (region.cma.startsWith('http')) { + const u = new URL(region.cma); + if (u.host) hostName = u.host; + } + hostName = hostName || region.cma; + await this.refreshToken(hostName); + return this.refreshAccessToken(error, maxRetryCount); // Retry after refreshing the token + } + + case 429: + case 408: + // These cases might require a wait, consider adding a delay before retrying + await new Promise((resolve) => setTimeout(resolve, 1000)); // Example wait of 1 second + return this.refreshAccessToken(error, maxRetryCount); // Retry + + default: + return; // Handle other cases if necessary + } + } + } + + refreshToken(hostName: string): Promise { + return new Promise((resolve) => { + if (this.authType === 'BASIC') { + // NOTE Handle basic auth 401 here + resolve(false); + ux.print('Session timed out, please login to proceed', { + color: 'yellow', + }); + process.exit(); + } else if (this.authType === 'OAUTH') { + authHandler.host = hostName; + // NOTE Handle OAuth refresh token + authHandler + .compareOAuthExpiry(true) + .then(() => { + this.token = `Bearer ${configHandler.get('oauthAccessToken')}`; + resolve(true); + }) + .catch((error: any) => { + console.log(error); + resolve(false); + }); + } else { + resolve(false); + ux.print('You do not have the permissions to perform this action, please login to proceed', { + color: 'yellow', + }); + process.exit(); + } + }); + } +} + +const authenticationHandler = new AuthenticationHandler(); +export default authenticationHandler; diff --git a/packages/contentstack-utilities/src/helpers.ts b/packages/contentstack-utilities/src/helpers.ts index ec981bc80a..aaaf6851d1 100644 --- a/packages/contentstack-utilities/src/helpers.ts +++ b/packages/contentstack-utilities/src/helpers.ts @@ -80,6 +80,21 @@ export const formatError = function (error: any) { parsedError = error; } + // Check if parsedError is an empty object + if (parsedError && typeof parsedError === 'object' && Object.keys(parsedError).length === 0) { + return `An unknown error occurred. ${error}`; + } + + // Check for specific SSL error + if (parsedError?.code === 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY') { + return 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY occurred during SSL certificate verification! Please check your certificate configuration.'; + } + + // Handle self signed certificate error + if (parsedError?.code === 'SELF_SIGNED_CERT_IN_CHAIN') { + return 'Self-signed certificate in the certificate chain! Please ensure your certificate configuration is correct and the necessary CA certificates are trusted.'; + } + // Determine the error message let message = parsedError.errorMessage || parsedError.error_message || parsedError.message || parsedError; if (typeof message === 'object') { diff --git a/packages/contentstack-utilities/src/index.ts b/packages/contentstack-utilities/src/index.ts index dba474ca5c..a7e48362c7 100644 --- a/packages/contentstack-utilities/src/index.ts +++ b/packages/contentstack-utilities/src/index.ts @@ -77,3 +77,4 @@ export { FlagInput, ArgInput, FlagDefinition } from '@oclif/core/lib/interfaces/ export { default as TablePrompt } from './inquirer-table-prompt'; export { Logger }; +export { default as authenticationHandler } from './authentication-handler'; diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json index 5a723f8085..2ef3293cb2 100644 --- a/packages/contentstack-variants/package.json +++ b/packages/contentstack-variants/package.json @@ -30,7 +30,7 @@ "typescript": "^5.4.2" }, "dependencies": { - "@contentstack/cli-utilities": "^1.5.12", + "@contentstack/cli-utilities": "^1.8.0", "lodash": "^4.17.21", "mkdirp": "^1.0.4", "winston": "^3.7.2" diff --git a/packages/contentstack-variants/src/export/attributes.ts b/packages/contentstack-variants/src/export/attributes.ts index 9fa7643a74..033ee3260b 100644 --- a/packages/contentstack-variants/src/export/attributes.ts +++ b/packages/contentstack-variants/src/export/attributes.ts @@ -14,7 +14,7 @@ export default class ExportAttributes extends PersonalizationAdapter { super({ config: exportConfig, baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name], - headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id }, + headers: { 'X-Project-Uid': exportConfig.project_id }, }); this.personalizeConfig = exportConfig.modules.personalize; this.eventsConfig = exportConfig.modules.events; @@ -30,6 +30,7 @@ export default class ExportEvents extends PersonalizationAdapter { async start() { try { log(this.exportConfig, 'Starting events export', 'info'); + await this.init(); await fsUtil.makeDirectory(this.eventsFolderPath); this.events = (await this.getEvents()) as EventStruct[]; diff --git a/packages/contentstack-variants/src/export/experiences.ts b/packages/contentstack-variants/src/export/experiences.ts index 25d9a8420c..fbb8a7eb41 100644 --- a/packages/contentstack-variants/src/export/experiences.ts +++ b/packages/contentstack-variants/src/export/experiences.ts @@ -11,10 +11,10 @@ export default class ExportExperiences extends PersonalizationAdapter = (await this.getExperiences()) || []; diff --git a/packages/contentstack-variants/src/export/projects.ts b/packages/contentstack-variants/src/export/projects.ts index 4404c51738..c66f23494e 100644 --- a/packages/contentstack-variants/src/export/projects.ts +++ b/packages/contentstack-variants/src/export/projects.ts @@ -11,7 +11,7 @@ export default class ExportProjects extends PersonalizationAdapter super({ config: exportConfig, baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name], - headers: { authtoken: exportConfig.auth_token, organization_uid: exportConfig.org_uid }, + headers: { organization_uid: exportConfig.org_uid }, }); this.exportConfig = exportConfig; this.personalizeConfig = exportConfig.modules.personalize; @@ -26,6 +26,7 @@ export default class ExportProjects extends PersonalizationAdapter async start() { try { log(this.exportConfig, 'Starting projects export', 'info'); + await this.init(); await fsUtil.makeDirectory(this.projectFolderPath); const project = await this.projects({ connectedStackApiKey: this.exportConfig.apiKey }); if (!project || project?.length < 1) { diff --git a/packages/contentstack-variants/src/export/variant-entries.ts b/packages/contentstack-variants/src/export/variant-entries.ts index a872544e44..fd1c11a606 100644 --- a/packages/contentstack-variants/src/export/variant-entries.ts +++ b/packages/contentstack-variants/src/export/variant-entries.ts @@ -19,7 +19,6 @@ export default class VariantEntries extends VariantAdapter[] }) { const variantEntry = this.config.modules.variantEntry; const { entries, locale, contentTypeUid: content_type_uid } = options; - + await this.variantInstance.init(); for (let index = 0; index < entries.length; index++) { const entry = entries[index]; const variantEntryBasePath = join(sanitizePath(this.entriesDirPath), sanitizePath(content_type_uid), sanitizePath(locale), sanitizePath(variantEntry.dirName), sanitizePath(entry.uid)); diff --git a/packages/contentstack-variants/src/import/attribute.ts b/packages/contentstack-variants/src/import/attribute.ts index fd21548232..666cab8e08 100644 --- a/packages/contentstack-variants/src/import/attribute.ts +++ b/packages/contentstack-variants/src/import/attribute.ts @@ -16,7 +16,7 @@ export default class Attribute extends PersonalizationAdapter { const conf: APIConfig = { config, baseURL: config.modules.personalize.baseURL[config.region.name], - headers: { 'X-Project-Uid': config.modules.personalize.project_id, authtoken: config.auth_token }, + headers: { 'X-Project-Uid': config.modules.personalize.project_id }, }; super(Object.assign(config, conf)); this.personalizeConfig = this.config.modules.personalize; @@ -36,7 +36,7 @@ export default class Attribute extends PersonalizationAdapter { */ async import() { this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Attributes' }), 'info'); - + await this.init(); await fsUtil.makeDirectory(this.attrMapperDirPath); const { dirName, fileName } = this.attributeConfig; const attributesPath = resolve( diff --git a/packages/contentstack-variants/src/import/audiences.ts b/packages/contentstack-variants/src/import/audiences.ts index be414a8c25..e3bb2a0a98 100644 --- a/packages/contentstack-variants/src/import/audiences.ts +++ b/packages/contentstack-variants/src/import/audiences.ts @@ -18,7 +18,7 @@ export default class Audiences extends PersonalizationAdapter { const conf: APIConfig = { config, baseURL: config.modules.personalize.baseURL[config.region.name], - headers: { 'X-Project-Uid': config.modules.personalize.project_id, authtoken: config.auth_token }, + headers: { 'X-Project-Uid': config.modules.personalize.project_id }, }; super(Object.assign(config, conf)); this.personalizeConfig = this.config.modules.personalize; @@ -44,7 +44,7 @@ export default class Audiences extends PersonalizationAdapter { */ async import() { this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Audiences' }), 'info'); - + await this.init(); await fsUtil.makeDirectory(this.audienceMapperDirPath); const { dirName, fileName } = this.audienceConfig; const audiencesPath = resolve( diff --git a/packages/contentstack-variants/src/import/events.ts b/packages/contentstack-variants/src/import/events.ts index 25d7de178f..e3ecefbcc8 100644 --- a/packages/contentstack-variants/src/import/events.ts +++ b/packages/contentstack-variants/src/import/events.ts @@ -16,7 +16,7 @@ export default class Events extends PersonalizationAdapter { const conf: APIConfig = { config, baseURL: config.modules.personalize.baseURL[config.region.name], - headers: { 'X-Project-Uid': config.modules.personalize.project_id, authtoken: config.auth_token }, + headers: { 'X-Project-Uid': config.modules.personalize.project_id }, }; super(Object.assign(config, conf)); this.personalizeConfig = this.config.modules.personalize; @@ -36,7 +36,7 @@ export default class Events extends PersonalizationAdapter { */ async import() { this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Events' }), 'info'); - + await this.init(); await fsUtil.makeDirectory(this.eventMapperDirPath); const { dirName, fileName } = this.eventsConfig; const eventsPath = resolve( diff --git a/packages/contentstack-variants/src/import/experiences.ts b/packages/contentstack-variants/src/import/experiences.ts index 763c0f929d..184f3dbe1f 100644 --- a/packages/contentstack-variants/src/import/experiences.ts +++ b/packages/contentstack-variants/src/import/experiences.ts @@ -45,10 +45,10 @@ export default class Experiences extends PersonalizationAdapter { const conf: APIConfig = { config, baseURL: config.modules.personalize.baseURL[config.region.name], - headers: { 'X-Project-Uid': config.modules.personalize.project_id, authtoken: config.auth_token }, + headers: { 'X-Project-Uid': config.modules.personalize.project_id}, cmaConfig: { baseURL: config.region.cma + `/v3`, - headers: { authtoken: config.auth_token, api_key: config.apiKey }, + headers: { api_key: config.apiKey }, }, }; super(Object.assign(config, conf)); @@ -107,7 +107,7 @@ export default class Experiences extends PersonalizationAdapter { */ async import() { this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Experiences' }), 'info'); - + await this.init(); await fsUtil.makeDirectory(this.expMapperDirPath); if (existsSync(this.experiencesPath)) { diff --git a/packages/contentstack-variants/src/import/project.ts b/packages/contentstack-variants/src/import/project.ts index 8a98948486..c052492ad9 100644 --- a/packages/contentstack-variants/src/import/project.ts +++ b/packages/contentstack-variants/src/import/project.ts @@ -10,7 +10,7 @@ export default class Project extends PersonalizationAdapter { const conf: APIConfig = { config, baseURL: config.modules.personalize.baseURL[config.region.name], - headers: { organization_uid: config.org_uid, authtoken: config.auth_token }, + headers: { organization_uid: config.org_uid }, }; super(Object.assign(config, conf)); this.projectMapperFolderPath = pResolve( @@ -29,7 +29,7 @@ export default class Project extends PersonalizationAdapter { const personalize = this.config.modules.personalize; const { dirName, fileName } = personalize.projects; const projectPath = join(sanitizePath(this.config.data), sanitizePath(personalize.dirName), sanitizePath(dirName), sanitizePath(fileName)); - + if (existsSync(projectPath)) { const projects = JSON.parse(readFileSync(projectPath, 'utf8')) as CreateProjectInput[]; @@ -38,7 +38,7 @@ export default class Project extends PersonalizationAdapter { this.log(this.config, 'No project found!', 'info'); return; } - + await this.init(); for (const project of projects) { const createProject = async (newName: void | string): Promise => { return await this.createProject({ diff --git a/packages/contentstack-variants/src/import/variant-entries.ts b/packages/contentstack-variants/src/import/variant-entries.ts index 554f123bc5..7f78f572a4 100644 --- a/packages/contentstack-variants/src/import/variant-entries.ts +++ b/packages/contentstack-variants/src/import/variant-entries.ts @@ -49,7 +49,6 @@ export default class VariantEntries extends VariantAdapter; this.assetUrlMapper = (fsUtil.readFile(assetUrlMapperPath, true) || {}) as Record; this.environments = (fsUtil.readFile(envPath, true) || {}) as Record; - + // set the token + await this.variantInstance.init(); for (const entriesForVariant of entriesForVariants) { await this.importVariantEntries(entriesForVariant); } diff --git a/packages/contentstack-variants/src/types/personalization-api-adapter.ts b/packages/contentstack-variants/src/types/personalization-api-adapter.ts index baec467586..ebf3919692 100644 --- a/packages/contentstack-variants/src/types/personalization-api-adapter.ts +++ b/packages/contentstack-variants/src/types/personalization-api-adapter.ts @@ -206,5 +206,5 @@ export interface Personalization extends AdapterHelperInterface; - handleVariantAPIRes(res: any): VariantAPIRes; + handleVariantAPIRes(res: any): Promise; } diff --git a/packages/contentstack-variants/src/types/variant-api-adapter.ts b/packages/contentstack-variants/src/types/variant-api-adapter.ts index bb1ea3ba28..0df86a17d5 100644 --- a/packages/contentstack-variants/src/types/variant-api-adapter.ts +++ b/packages/contentstack-variants/src/types/variant-api-adapter.ts @@ -42,6 +42,8 @@ export type VariantOptions = VariantsOption & { }; export interface VariantInterface extends AdapterHelperInterface { + init(): Promise; + variantEntry(options: VariantOptions): Promise<{ entry: Record }>; variantEntries(options: VariantsOption): Promise<{ entries?: Record[] | unknown[] } | void>; @@ -52,5 +54,5 @@ export interface VariantInterface extends AdapterHelperInterface, ): Promise; - handleVariantAPIRes(res: APIResponse): VariantEntryStruct | { entries: VariantEntryStruct[]; count: number } | string; + handleVariantAPIRes(res: APIResponse): Promise; } diff --git a/packages/contentstack-variants/src/utils/personalization-api-adapter.ts b/packages/contentstack-variants/src/utils/personalization-api-adapter.ts index 81548955e1..799034ead9 100644 --- a/packages/contentstack-variants/src/utils/personalization-api-adapter.ts +++ b/packages/contentstack-variants/src/utils/personalization-api-adapter.ts @@ -1,5 +1,5 @@ import { AdapterHelper } from './adapter-helper'; -import { HttpClient } from '@contentstack/cli-utilities'; +import { HttpClient, authenticationHandler } from '@contentstack/cli-utilities'; import { ProjectStruct, @@ -31,10 +31,27 @@ export class PersonalizationAdapter extends AdapterHelper impl super(options); } + async init(): Promise { + await authenticationHandler.getAuthDetails(); + const token = authenticationHandler.accessToken; + if (authenticationHandler.isOauthEnabled) { + this.apiClient.headers({ authorization: token }); + if(this.adapterConfig.cmaConfig) { + this.cmaAPIClient?.headers({ authorization: token }); + } + } else { + this.apiClient.headers({ authtoken: token }); + if(this.adapterConfig.cmaConfig) { + this.cmaAPIClient?.headers({ authtoken: token }); + } + } + } + async projects(options: GetProjectsParams): Promise { + await this.init(); const getProjectEndPoint = `/projects?connectedStackApiKey=${options.connectedStackApiKey}`; const data = await this.apiClient.get(getProjectEndPoint); - return this.handleVariantAPIRes(data) as ProjectStruct[]; + return (await this.handleVariantAPIRes(data)) as ProjectStruct[]; } /** @@ -49,7 +66,7 @@ export class PersonalizationAdapter extends AdapterHelper impl */ async createProject(project: CreateProjectInput): Promise { const data = await this.apiClient.post('/projects', project); - return this.handleVariantAPIRes(data) as ProjectStruct; + return (await this.handleVariantAPIRes(data)) as ProjectStruct; } /** @@ -63,25 +80,25 @@ export class PersonalizationAdapter extends AdapterHelper impl */ async createAttribute(attribute: CreateAttributeInput): Promise { const data = await this.apiClient.post('/attributes', attribute); - return this.handleVariantAPIRes(data) as AttributeStruct; + return (await this.handleVariantAPIRes(data)) as AttributeStruct; } async getExperiences(): Promise { const getExperiencesEndPoint = `/experiences`; const data = await this.apiClient.get(getExperiencesEndPoint); - return this.handleVariantAPIRes(data) as ExperienceStruct[]; + return (await this.handleVariantAPIRes(data)) as ExperienceStruct[]; } async getExperience(experienceUid: string): Promise { const getExperiencesEndPoint = `/experiences/${experienceUid}`; const data = await this.apiClient.get(getExperiencesEndPoint); - return this.handleVariantAPIRes(data) as ExperienceStruct; + return (await this.handleVariantAPIRes(data)) as ExperienceStruct; } async getExperienceVersions(experienceUid: string): Promise { const getExperiencesVersionsEndPoint = `/experiences/${experienceUid}/versions`; const data = await this.apiClient.get(getExperiencesVersionsEndPoint); - return this.handleVariantAPIRes(data) as ExperienceStruct; + return (await this.handleVariantAPIRes(data)) as ExperienceStruct; } async createExperienceVersion( @@ -90,7 +107,7 @@ export class PersonalizationAdapter extends AdapterHelper impl ): Promise { const createExperiencesVersionsEndPoint = `/experiences/${experienceUid}/versions`; const data = await this.apiClient.post(createExperiencesVersionsEndPoint, input); - return this.handleVariantAPIRes(data) as ExperienceStruct; + return (await this.handleVariantAPIRes(data)) as ExperienceStruct; } async updateExperienceVersion( @@ -104,7 +121,7 @@ export class PersonalizationAdapter extends AdapterHelper impl } const updateExperiencesVersionsEndPoint = `/experiences/${experienceUid}/versions/${versionId}`; const data = await this.apiClient.put(updateExperiencesVersionsEndPoint, input); - return this.handleVariantAPIRes(data) as ExperienceStruct; + return (await this.handleVariantAPIRes(data)) as ExperienceStruct; } async getVariantGroup(input: GetVariantGroupInput): Promise { @@ -113,7 +130,7 @@ export class PersonalizationAdapter extends AdapterHelper impl const data = await this.cmaAPIClient .queryParams({ experience_uid: input.experienceUid }) .get(getVariantGroupEndPoint); - return this.handleVariantAPIRes(data) as VariantGroupStruct; + return (await this.handleVariantAPIRes(data)) as VariantGroupStruct; } } @@ -121,28 +138,28 @@ export class PersonalizationAdapter extends AdapterHelper impl if (this.cmaAPIClient) { const updateVariantGroupEndPoint = `/variant_groups/${input.uid}`; const data = await this.cmaAPIClient.put(updateVariantGroupEndPoint, input); - return this.handleVariantAPIRes(data) as VariantGroup; + return (await this.handleVariantAPIRes(data)) as VariantGroup; } } async getEvents(): Promise { const data = await this.apiClient.get('/events'); - return this.handleVariantAPIRes(data) as EventStruct[]; + return (await this.handleVariantAPIRes(data)) as EventStruct[]; } async createEvents(event: CreateEventInput): Promise { const data = await this.apiClient.post('/events', event); - return this.handleVariantAPIRes(data) as EventStruct; + return (await this.handleVariantAPIRes(data)) as EventStruct; } async getAudiences(): Promise { const data = await this.apiClient.get('/audiences'); - return this.handleVariantAPIRes(data) as AudienceStruct[]; + return (await this.handleVariantAPIRes(data)) as AudienceStruct[]; } async getAttributes(): Promise { const data = await this.apiClient.get('/attributes'); - return this.handleVariantAPIRes(data) as AttributeStruct[]; + return (await this.handleVariantAPIRes(data)) as AttributeStruct[]; } /** @@ -155,7 +172,7 @@ export class PersonalizationAdapter extends AdapterHelper impl */ async createAudience(audience: CreateAudienceInput): Promise { const data = await this.apiClient.post('/audiences', audience); - return this.handleVariantAPIRes(data) as AudienceStruct; + return (await this.handleVariantAPIRes(data)) as AudienceStruct; } /** @@ -168,7 +185,7 @@ export class PersonalizationAdapter extends AdapterHelper impl */ async createExperience(experience: CreateExperienceInput): Promise { const data = await this.apiClient.post('/experiences', experience); - return this.handleVariantAPIRes(data) as ExperienceStruct; + return (await this.handleVariantAPIRes(data)) as ExperienceStruct; } /** @@ -182,7 +199,7 @@ export class PersonalizationAdapter extends AdapterHelper impl ): Promise { const updateCTInExpEndPoint = `/experiences/${experienceUid}/cms-integration/variant-group`; const data = await this.apiClient.post(updateCTInExpEndPoint, experience); - return this.handleVariantAPIRes(data) as CMSExperienceStruct; + return (await this.handleVariantAPIRes(data)) as CMSExperienceStruct; } /** @@ -193,7 +210,7 @@ export class PersonalizationAdapter extends AdapterHelper impl async getCTsFromExperience(experienceUid: string): Promise { const getCTFromExpEndPoint = `/experiences/${experienceUid}/cms-integration/variant-group`; const data = await this.apiClient.get(getCTFromExpEndPoint); - return this.handleVariantAPIRes(data) as CMSExperienceStruct; + return (await this.handleVariantAPIRes(data)) as CMSExperienceStruct; } /** @@ -202,16 +219,22 @@ export class PersonalizationAdapter extends AdapterHelper impl * @returns The variant API response data. * @throws If the API response status is not within the success range, an error message is thrown. */ - handleVariantAPIRes(res: APIResponse): VariantAPIRes { + async handleVariantAPIRes(res: APIResponse): Promise { const { status, data } = res; if (status >= 200 && status < 300) { return data; } - + + // Refresh the access token if it has expired + await authenticationHandler.refreshAccessToken(res); + const errorMsg = data?.errors ? formatErrors(data.errors) - : data?.error || data?.error_message || data?.message || 'Something went wrong while processing variant entries request!'; + : data?.error || + data?.error_message || + data?.message || + 'Something went wrong while processing variant entries request!'; throw errorMsg; } diff --git a/packages/contentstack-variants/src/utils/variant-api-adapter.ts b/packages/contentstack-variants/src/utils/variant-api-adapter.ts index 9e25299576..b9e95c0e6f 100644 --- a/packages/contentstack-variants/src/utils/variant-api-adapter.ts +++ b/packages/contentstack-variants/src/utils/variant-api-adapter.ts @@ -7,6 +7,7 @@ import { ContentstackClient, ContentstackConfig, managementSDKClient, + authenticationHandler, } from '@contentstack/cli-utilities'; import { @@ -37,6 +38,16 @@ export class VariantHttpClient extends AdapterHelper implement this.apiClient.baseUrl(this.baseURL); } + async init(): Promise { + await authenticationHandler.getAuthDetails(); + const token = authenticationHandler.accessToken; + if (authenticationHandler.isOauthEnabled) { + this.apiClient.headers({ authorization: token }); + } else { + this.apiClient.headers({ authtoken: token }); + } + } + async variantEntry(options: VariantOptions) { // TODO single entry variant return { entry: {} }; @@ -124,7 +135,7 @@ export class VariantHttpClient extends AdapterHelper implement } const data = await this.apiClient.get(endpoint); - const response = this.handleVariantAPIRes(data) as { entries: VariantEntryStruct[]; count: number }; + const response = (await this.handleVariantAPIRes(data)) as { entries: VariantEntryStruct[]; count: number }; if (callback) { callback(response.entries); @@ -244,15 +255,18 @@ export class VariantHttpClient extends AdapterHelper implement * @returns The variant API response data. * @throws If the API response status is not within the success range, an error message is thrown. */ - handleVariantAPIRes( + async handleVariantAPIRes( res: APIResponse, - ): VariantEntryStruct | { entries: VariantEntryStruct[]; count: number } | string | any { + ): Promise { const { status, data } = res; if (status >= 200 && status < 300) { return data; } + // Refresh the access token if the response status is 401 + await authenticationHandler.refreshAccessToken(res); + const errorMsg = data?.errors ? formatErrors(data.errors) : data?.error_message || data?.message || 'Something went wrong while processing entry variant request!'; @@ -290,9 +304,9 @@ export class VariantManagementSDK return Promise.resolve({} as VariantEntryStruct); } - handleVariantAPIRes( + async handleVariantAPIRes( res: APIResponse, - ): VariantEntryStruct | { entries: VariantEntryStruct[]; count: number } | string { + ): Promise { return res.data; } diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 07583ae265..8e2d83bd44 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -37,7 +37,7 @@ "@contentstack/cli-config": "~1.7.1", "@contentstack/cli-launch": "~1.2.2", "@contentstack/cli-migration": "~1.6.1", - "@contentstack/cli-utilities": "~1.7.3", + "@contentstack/cli-utilities": "~1.8.0", "@contentstack/management": "~1.17.0", "@oclif/core": "^3.26.5", "@oclif/plugin-help": "^5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 798c165aae..dbe3394bea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,7 +25,7 @@ importers: '@contentstack/cli-config': ~1.7.1 '@contentstack/cli-launch': ~1.2.2 '@contentstack/cli-migration': ~1.6.1 - '@contentstack/cli-utilities': ~1.7.3 + '@contentstack/cli-utilities': ~1.8.0 '@contentstack/management': ~1.17.0 '@oclif/core': ^3.26.5 '@oclif/plugin-help': ^5 @@ -123,7 +123,7 @@ importers: specifiers: '@contentstack/cli-command': ~1.3.0 '@contentstack/cli-dev-dependencies': ^1.2.4 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/plugin-help': ^5 '@oclif/plugin-plugins': ^5.0.0 '@oclif/test': ^2.5.6 @@ -187,7 +187,7 @@ importers: packages/contentstack-auth: specifiers: '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@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.9.0 '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 '@types/inquirer': ^9.0.3 '@types/mkdirp': ^1.0.1 @@ -304,7 +304,7 @@ importers: '@contentstack/cli-command': ~1.3.0 '@contentstack/cli-config': ~1.7.0 '@contentstack/cli-dev-dependencies': ~1.2.4 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/core': ^3.26.5 '@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.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 bluebird: ^3.7.2 chai: ^4.2.0 @@ -426,7 +426,7 @@ importers: '@contentstack/cli-cm-export': ~1.13.0 '@contentstack/cli-cm-import': ~1.18.0 '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@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.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@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.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 '@types/chai': ^4.2.18 '@types/inquirer': ^9.0.3 @@ -610,7 +610,7 @@ importers: '@contentstack/cli-command': ~1.3.0 '@contentstack/cli-config': ~1.7.0 '@contentstack/cli-dev-dependencies': ~1.2.4 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@contentstack/cli-variants': ~1.0.0 '@oclif/core': ^3.26.5 '@oclif/plugin-help': ^5.1.19 @@ -690,7 +690,7 @@ importers: packages/contentstack-export-to-csv: specifiers: '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 '@types/chai': ^4.3.6 '@types/mocha': ^10.0.1 @@ -734,7 +734,7 @@ importers: specifiers: '@contentstack/cli-audit': ~1.7.0 '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@contentstack/cli-variants': ~1.0.0 '@contentstack/management': ~1.17.0 '@oclif/core': ^3.26.5 @@ -825,7 +825,7 @@ importers: specifiers: '@apollo/client': ^3.7.9 '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/core': ^3.26.5 '@oclif/plugin-help': ^5 '@oclif/plugin-plugins': ^5.0.0 @@ -901,7 +901,7 @@ importers: packages/contentstack-migrate-rte: specifiers: '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@contentstack/json-rte-serializer': ~2.0.4 '@oclif/test': ^2.5.6 chai: ^4.3.4 @@ -948,7 +948,7 @@ importers: packages/contentstack-migration: specifiers: '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 async: ^3.2.4 callsites: ^3.1.0 @@ -996,7 +996,7 @@ importers: specifiers: '@contentstack/cli-cm-import': ~1.18.0 '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-utilities': ~1.7.2 + '@contentstack/cli-utilities': ~1.8.0 '@oclif/plugin-help': ^5.1.19 '@types/inquirer': ^9.0.3 '@types/jest': ^26.0.15 @@ -1153,7 +1153,7 @@ importers: packages/contentstack-variants: specifiers: '@contentstack/cli-dev-dependencies': ^1.2.4 - '@contentstack/cli-utilities': ^1.5.12 + '@contentstack/cli-utilities': ^1.8.0 '@oclif/test': ^2.5.6 '@types/chai': ^4.3.14 '@types/node': ^20.12.7 From 024480197ae488850eba414c7b046e58d692c2b2 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Tue, 1 Oct 2024 12:37:29 +0530 Subject: [PATCH 05/11] version bump --- package-lock.json | 233 +++++++++++++++++- packages/contentstack-bootstrap/README.md | 2 +- packages/contentstack-bootstrap/package.json | 4 +- packages/contentstack-branches/package.json | 2 +- packages/contentstack-export/README.md | 2 +- packages/contentstack-export/package.json | 4 +- packages/contentstack-import/README.md | 2 +- packages/contentstack-import/package.json | 2 +- packages/contentstack-seed/package.json | 4 +- packages/contentstack/README.md | 2 +- packages/contentstack/package.json | 10 +- pnpm-lock.yaml | 239 +++++++++++++++++-- 12 files changed, 462 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e72db712c..80e3233aff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26300,22 +26300,22 @@ }, "packages/contentstack": { "name": "@contentstack/cli", - "version": "1.26.0", + "version": "1.27.0", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.7.1", "@contentstack/cli-auth": "~1.3.21", - "@contentstack/cli-cm-bootstrap": "~1.12.0", + "@contentstack/cli-cm-bootstrap": "~1.13.0", "@contentstack/cli-cm-branches": "~1.1.3", "@contentstack/cli-cm-bulk-publish": "~1.4.8", "@contentstack/cli-cm-clone": "~1.12.0", - "@contentstack/cli-cm-export": "~1.13.0", + "@contentstack/cli-cm-export": "~1.14.0", "@contentstack/cli-cm-export-to-csv": "~1.7.2", - "@contentstack/cli-cm-import": "~1.18.0", + "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-cm-migrate-rte": "~1.4.19", "@contentstack/cli-cm-seed": "~1.9.0", "@contentstack/cli-command": "~1.3.1", - "@contentstack/cli-config": "~1.7.1", + "@contentstack/cli-config": "~1.7.2", "@contentstack/cli-launch": "~1.2.2", "@contentstack/cli-migration": "~1.6.1", "@contentstack/cli-utilities": "~1.8.0", @@ -26670,10 +26670,10 @@ }, "packages/contentstack-bootstrap": { "name": "@contentstack/cli-cm-bootstrap", - "version": "1.12.0", + "version": "1.13.0", "license": "MIT", "dependencies": { - "@contentstack/cli-cm-seed": "~1.9.0", + "@contentstack/cli-cm-seed": "~1.10.0", "@contentstack/cli-command": "~1.3.0", "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", @@ -26776,7 +26776,7 @@ }, "devDependencies": { "@contentstack/cli-auth": "~1.3.19", - "@contentstack/cli-config": "~1.7.0", + "@contentstack/cli-config": "~1.7.2", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.1.19", "@oclif/test": "^2.5.6", @@ -26875,6 +26875,131 @@ "node": ">=14.0.0" } }, + "packages/contentstack-clone/node_modules/@contentstack/cli-cm-export": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-export/-/cli-cm-export-1.13.0.tgz", + "integrity": "sha512-zIx1ud4eLH2SgGHwagxyzZlQKkbiF4ObkOoU8c6sLnN6edKFldMxR5lTti4yp3T4oN0sm6IfJ3z+wKle3dBO3w==", + "license": "MIT", + "dependencies": { + "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-variants": "~1.0.0", + "@oclif/core": "^3.26.5", + "async": "^3.2.4", + "big-json": "^3.2.0", + "bluebird": "^3.7.2", + "chalk": "^4.1.2", + "is-valid-path": "^0.1.1", + "lodash": "^4.17.20", + "merge": "^2.1.1", + "mkdirp": "^1.0.4", + "path": "^0.12.7", + "progress-stream": "^2.0.0", + "promise-limit": "^2.7.0", + "proxyquire": "^2.1.3", + "tslib": "^2.4.1", + "winston": "^3.7.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "packages/contentstack-clone/node_modules/@contentstack/cli-cm-export/node_modules/@contentstack/cli-utilities": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.7.3.tgz", + "integrity": "sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==", + "license": "MIT", + "dependencies": { + "@contentstack/management": "~1.17.0", + "@contentstack/marketplace-sdk": "^1.2.1", + "@oclif/core": "^3.26.5", + "axios": "^1.7.4", + "chalk": "^4.0.0", + "cli-cursor": "^3.1.0", + "cli-table": "^0.3.11", + "conf": "^10.2.0", + "debug": "^4.1.1", + "figures": "^3.2.0", + "inquirer": "8.2.4", + "inquirer-search-checkbox": "^1.0.0", + "inquirer-search-list": "^1.2.6", + "klona": "^2.0.6", + "lodash": "^4.17.15", + "mkdirp": "^1.0.4", + "open": "^8.4.2", + "ora": "^5.4.0", + "recheck": "^4.4.5", + "rxjs": "^6.6.7", + "traverse": "^0.6.7", + "unique-string": "^2.0.0", + "uuid": "^9.0.1", + "winston": "^3.7.2", + "xdg-basedir": "^4.0.0" + } + }, + "packages/contentstack-clone/node_modules/@contentstack/cli-cm-import": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-import/-/cli-cm-import-1.18.0.tgz", + "integrity": "sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==", + "license": "MIT", + "dependencies": { + "@contentstack/cli-audit": "~1.7.0", + "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-variants": "~1.0.0", + "@contentstack/management": "~1.17.0", + "@oclif/core": "^3.26.5", + "big-json": "^3.2.0", + "bluebird": "^3.7.2", + "chalk": "^4.1.2", + "debug": "^4.1.0", + "fs-extra": "^11.1.1", + "lodash": "^4.17.20", + "marked": "^4.0.17", + "merge": "^2.1.1", + "mkdirp": "^1.0.4", + "promise-limit": "^2.7.0", + "tslib": "^2.4.1", + "uuid": "^9.0.1", + "winston": "^3.7.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "packages/contentstack-clone/node_modules/@contentstack/cli-cm-import/node_modules/@contentstack/cli-utilities": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.7.3.tgz", + "integrity": "sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==", + "license": "MIT", + "dependencies": { + "@contentstack/management": "~1.17.0", + "@contentstack/marketplace-sdk": "^1.2.1", + "@oclif/core": "^3.26.5", + "axios": "^1.7.4", + "chalk": "^4.0.0", + "cli-cursor": "^3.1.0", + "cli-table": "^0.3.11", + "conf": "^10.2.0", + "debug": "^4.1.1", + "figures": "^3.2.0", + "inquirer": "8.2.4", + "inquirer-search-checkbox": "^1.0.0", + "inquirer-search-list": "^1.2.6", + "klona": "^2.0.6", + "lodash": "^4.17.15", + "mkdirp": "^1.0.4", + "open": "^8.4.2", + "ora": "^5.4.0", + "recheck": "^4.4.5", + "rxjs": "^6.6.7", + "traverse": "^0.6.7", + "unique-string": "^2.0.0", + "uuid": "^9.0.1", + "winston": "^3.7.2", + "xdg-basedir": "^4.0.0" + } + }, "packages/contentstack-clone/node_modules/foreground-child": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", @@ -27432,7 +27557,7 @@ }, "packages/contentstack-export": { "name": "@contentstack/cli-cm-export", - "version": "1.13.0", + "version": "1.14.0", "license": "MIT", "dependencies": { "@contentstack/cli-command": "~1.3.0", @@ -27456,7 +27581,7 @@ }, "devDependencies": { "@contentstack/cli-auth": "~1.3.19", - "@contentstack/cli-config": "~1.7.0", + "@contentstack/cli-config": "~1.7.2", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.1.19", "@oclif/test": "^2.5.6", @@ -28012,7 +28137,7 @@ }, "packages/contentstack-import": { "name": "@contentstack/cli-cm-import", - "version": "1.18.0", + "version": "1.19.0", "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.7.0", @@ -28456,10 +28581,10 @@ }, "packages/contentstack-seed": { "name": "@contentstack/cli-cm-seed", - "version": "1.9.0", + "version": "1.10.0", "license": "MIT", "dependencies": { - "@contentstack/cli-cm-import": "~1.18.0", + "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-command": "~1.3.0", "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", @@ -28919,6 +29044,88 @@ "engines": { "node": ">=10" } + }, + "packages/contentstack/node_modules/@contentstack/cli-cm-seed": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-seed/-/cli-cm-seed-1.9.0.tgz", + "integrity": "sha512-KnwKOqljU3NTVzmaMqaOCt5X+0QzyPK/VGB+5Vfj7nEGy0Mz1HA8RjWnZdwKgk1tRkH9mYsj4tG32sRDPYsX/g==", + "license": "MIT", + "dependencies": { + "@contentstack/cli-cm-import": "~1.18.0", + "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-utilities": "~1.7.2", + "inquirer": "8.2.4", + "mkdirp": "^1.0.4", + "tar": "^6.1.13", + "tmp": "^0.2.2", + "tslib": "^2.4.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "packages/contentstack/node_modules/@contentstack/cli-cm-seed/node_modules/@contentstack/cli-cm-import": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-import/-/cli-cm-import-1.18.0.tgz", + "integrity": "sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==", + "license": "MIT", + "dependencies": { + "@contentstack/cli-audit": "~1.7.0", + "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-variants": "~1.0.0", + "@contentstack/management": "~1.17.0", + "@oclif/core": "^3.26.5", + "big-json": "^3.2.0", + "bluebird": "^3.7.2", + "chalk": "^4.1.2", + "debug": "^4.1.0", + "fs-extra": "^11.1.1", + "lodash": "^4.17.20", + "marked": "^4.0.17", + "merge": "^2.1.1", + "mkdirp": "^1.0.4", + "promise-limit": "^2.7.0", + "tslib": "^2.4.1", + "uuid": "^9.0.1", + "winston": "^3.7.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "packages/contentstack/node_modules/@contentstack/cli-cm-seed/node_modules/@contentstack/cli-utilities": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.7.3.tgz", + "integrity": "sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==", + "license": "MIT", + "dependencies": { + "@contentstack/management": "~1.17.0", + "@contentstack/marketplace-sdk": "^1.2.1", + "@oclif/core": "^3.26.5", + "axios": "^1.7.4", + "chalk": "^4.0.0", + "cli-cursor": "^3.1.0", + "cli-table": "^0.3.11", + "conf": "^10.2.0", + "debug": "^4.1.1", + "figures": "^3.2.0", + "inquirer": "8.2.4", + "inquirer-search-checkbox": "^1.0.0", + "inquirer-search-list": "^1.2.6", + "klona": "^2.0.6", + "lodash": "^4.17.15", + "mkdirp": "^1.0.4", + "open": "^8.4.2", + "ora": "^5.4.0", + "recheck": "^4.4.5", + "rxjs": "^6.6.7", + "traverse": "^0.6.7", + "unique-string": "^2.0.0", + "uuid": "^9.0.1", + "winston": "^3.7.2", + "xdg-basedir": "^4.0.0" + } } } } diff --git a/packages/contentstack-bootstrap/README.md b/packages/contentstack-bootstrap/README.md index 1b75d997d7..b7cbd34f9f 100644 --- a/packages/contentstack-bootstrap/README.md +++ b/packages/contentstack-bootstrap/README.md @@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bootstrap/1.12.0 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-bootstrap/1.13.0 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json index c2cfaf537e..93f06a590a 100644 --- a/packages/contentstack-bootstrap/package.json +++ b/packages/contentstack-bootstrap/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-cm-bootstrap", "description": "Bootstrap contentstack apps", - "version": "1.12.0", + "version": "1.13.0", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "scripts": { @@ -17,7 +17,7 @@ "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\"" }, "dependencies": { - "@contentstack/cli-cm-seed": "~1.9.0", + "@contentstack/cli-cm-seed": "~1.10.0", "@contentstack/cli-command": "~1.3.0", "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json index 428fb9aae0..c94ed42fbc 100644 --- a/packages/contentstack-branches/package.json +++ b/packages/contentstack-branches/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@contentstack/cli-auth": "~1.3.19", - "@contentstack/cli-config": "~1.7.0", + "@contentstack/cli-config": "~1.7.2", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.1.19", "@oclif/test": "^2.5.6", diff --git a/packages/contentstack-export/README.md b/packages/contentstack-export/README.md index 977f6c8cce..71fe5f1f73 100755 --- a/packages/contentstack-export/README.md +++ b/packages/contentstack-export/README.md @@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-export/1.13.0 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-export/1.14.0 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json index bf8002a6f9..16e6db33d3 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.13.0", + "version": "1.14.0", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { @@ -26,7 +26,7 @@ }, "devDependencies": { "@contentstack/cli-auth": "~1.3.19", - "@contentstack/cli-config": "~1.7.0", + "@contentstack/cli-config": "~1.7.2", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.1.19", "@oclif/test": "^2.5.6", diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md index 7f298bfa34..7a8b367abf 100644 --- a/packages/contentstack-import/README.md +++ b/packages/contentstack-import/README.md @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-import/1.18.0 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-import/1.19.0 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index 331199cc4a..d97fe5d0b2 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.18.0", + "version": "1.19.0", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index eb2852e331..0e59fb8faf 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -1,11 +1,11 @@ { "name": "@contentstack/cli-cm-seed", "description": "create a Stack from existing content types, entries, assets, etc.", - "version": "1.9.0", + "version": "1.10.0", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-cm-import": "~1.18.0", + "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-command": "~1.3.0", "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md index 1fcebd327f..1fd63b76c6 100644 --- a/packages/contentstack/README.md +++ b/packages/contentstack/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli/1.26.0 darwin-arm64 node-v22.2.0 +@contentstack/cli/1.27.0 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 8e2d83bd44..d1be37176c 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli", "description": "Command-line tool (CLI) to interact with Contentstack", - "version": "1.26.0", + "version": "1.27.0", "author": "Contentstack", "bin": { "csdx": "./bin/run.js" @@ -24,17 +24,17 @@ "dependencies": { "@contentstack/cli-audit": "~1.7.1", "@contentstack/cli-auth": "~1.3.21", - "@contentstack/cli-cm-bootstrap": "~1.12.0", + "@contentstack/cli-cm-bootstrap": "~1.13.0", "@contentstack/cli-cm-branches": "~1.1.3", "@contentstack/cli-cm-bulk-publish": "~1.4.8", - "@contentstack/cli-cm-export": "~1.13.0", + "@contentstack/cli-cm-export": "~1.14.0", "@contentstack/cli-cm-clone": "~1.12.0", "@contentstack/cli-cm-export-to-csv": "~1.7.2", - "@contentstack/cli-cm-import": "~1.18.0", + "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-cm-migrate-rte": "~1.4.19", "@contentstack/cli-cm-seed": "~1.9.0", "@contentstack/cli-command": "~1.3.1", - "@contentstack/cli-config": "~1.7.1", + "@contentstack/cli-config": "~1.7.2", "@contentstack/cli-launch": "~1.2.2", "@contentstack/cli-migration": "~1.6.1", "@contentstack/cli-utilities": "~1.8.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dbe3394bea..9b04d68159 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,17 +12,17 @@ importers: specifiers: '@contentstack/cli-audit': ~1.7.1 '@contentstack/cli-auth': ~1.3.21 - '@contentstack/cli-cm-bootstrap': ~1.12.0 + '@contentstack/cli-cm-bootstrap': ~1.13.0 '@contentstack/cli-cm-branches': ~1.1.3 '@contentstack/cli-cm-bulk-publish': ~1.4.8 '@contentstack/cli-cm-clone': ~1.12.0 - '@contentstack/cli-cm-export': ~1.13.0 + '@contentstack/cli-cm-export': ~1.14.0 '@contentstack/cli-cm-export-to-csv': ~1.7.2 - '@contentstack/cli-cm-import': ~1.18.0 + '@contentstack/cli-cm-import': ~1.19.0 '@contentstack/cli-cm-migrate-rte': ~1.4.19 '@contentstack/cli-cm-seed': ~1.9.0 '@contentstack/cli-command': ~1.3.1 - '@contentstack/cli-config': ~1.7.1 + '@contentstack/cli-config': ~1.7.2 '@contentstack/cli-launch': ~1.2.2 '@contentstack/cli-migration': ~1.6.1 '@contentstack/cli-utilities': ~1.8.0 @@ -74,7 +74,7 @@ importers: '@contentstack/cli-cm-export-to-csv': link:../contentstack-export-to-csv '@contentstack/cli-cm-import': link:../contentstack-import '@contentstack/cli-cm-migrate-rte': link:../contentstack-migrate-rte - '@contentstack/cli-cm-seed': link:../contentstack-seed + '@contentstack/cli-cm-seed': 1.9.0_ogreqof3k35xezedraj6pnd45y '@contentstack/cli-command': link:../contentstack-command '@contentstack/cli-config': link:../contentstack-config '@contentstack/cli-launch': link:../contentstack-launch @@ -249,7 +249,7 @@ importers: packages/contentstack-bootstrap: specifiers: - '@contentstack/cli-cm-seed': ~1.9.0 + '@contentstack/cli-cm-seed': ~1.10.0 '@contentstack/cli-command': ~1.3.0 '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 @@ -302,7 +302,7 @@ importers: specifiers: '@contentstack/cli-auth': ~1.3.19 '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-config': ~1.7.0 + '@contentstack/cli-config': ~1.7.2 '@contentstack/cli-dev-dependencies': ~1.2.4 '@contentstack/cli-utilities': ~1.8.0 '@oclif/core': ^3.26.5 @@ -450,8 +450,8 @@ importers: winston: ^3.7.2 dependencies: '@colors/colors': 1.6.0 - '@contentstack/cli-cm-export': link:../contentstack-export - '@contentstack/cli-cm-import': link:../contentstack-import + '@contentstack/cli-cm-export': 1.13.0 + '@contentstack/cli-cm-import': 1.18.0 '@contentstack/cli-command': link:../contentstack-command '@contentstack/cli-utilities': link:../contentstack-utilities async: 3.2.6 @@ -608,7 +608,7 @@ importers: specifiers: '@contentstack/cli-auth': ~1.3.19 '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-config': ~1.7.0 + '@contentstack/cli-config': ~1.7.2 '@contentstack/cli-dev-dependencies': ~1.2.4 '@contentstack/cli-utilities': ~1.8.0 '@contentstack/cli-variants': ~1.0.0 @@ -994,7 +994,7 @@ importers: packages/contentstack-seed: specifiers: - '@contentstack/cli-cm-import': ~1.18.0 + '@contentstack/cli-cm-import': ~1.19.0 '@contentstack/cli-command': ~1.3.0 '@contentstack/cli-utilities': ~1.8.0 '@oclif/plugin-help': ^5.1.19 @@ -1617,6 +1617,220 @@ packages: engines: {node: '>=0.1.90'} dev: false + /@contentstack/cli-audit/1.7.1: + resolution: {integrity: sha512-Eocn4UWuKFp46fhpA6kgfl5S13yci59VK3Vcsi6Cj4TC3OTnR4mB2yDvuFt3GtIW7zKblVA9GYzqub6JeGvt6w==} + engines: {node: '>=16'} + hasBin: true + dependencies: + '@contentstack/cli-command': 1.3.1 + '@contentstack/cli-utilities': 1.7.3 + '@oclif/plugin-help': 5.2.20 + '@oclif/plugin-plugins': 5.4.9 + chalk: 4.1.2 + fast-csv: 4.3.6 + fs-extra: 11.2.0 + lodash: 4.17.21 + uuid: 9.0.1 + winston: 3.14.2 + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - encoding + - supports-color + - typescript + dev: false + + /@contentstack/cli-audit/1.7.1_ogreqof3k35xezedraj6pnd45y: + resolution: {integrity: sha512-Eocn4UWuKFp46fhpA6kgfl5S13yci59VK3Vcsi6Cj4TC3OTnR4mB2yDvuFt3GtIW7zKblVA9GYzqub6JeGvt6w==} + engines: {node: '>=16'} + hasBin: true + dependencies: + '@contentstack/cli-command': 1.3.1 + '@contentstack/cli-utilities': 1.7.3 + '@oclif/plugin-help': 5.2.20_ogreqof3k35xezedraj6pnd45y + '@oclif/plugin-plugins': 5.4.9 + chalk: 4.1.2 + fast-csv: 4.3.6 + fs-extra: 11.2.0 + lodash: 4.17.21 + uuid: 9.0.1 + winston: 3.14.2 + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - encoding + - supports-color + - typescript + dev: false + + /@contentstack/cli-cm-export/1.13.0: + resolution: {integrity: sha512-zIx1ud4eLH2SgGHwagxyzZlQKkbiF4ObkOoU8c6sLnN6edKFldMxR5lTti4yp3T4oN0sm6IfJ3z+wKle3dBO3w==} + engines: {node: '>=14.0.0'} + dependencies: + '@contentstack/cli-command': 1.3.1 + '@contentstack/cli-utilities': 1.7.3 + '@contentstack/cli-variants': 1.0.0 + '@oclif/core': 3.27.0 + async: 3.2.6 + big-json: 3.2.0 + bluebird: 3.7.2 + chalk: 4.1.2 + is-valid-path: 0.1.1 + lodash: 4.17.21 + merge: 2.1.1 + mkdirp: 1.0.4 + path: 0.12.7 + progress-stream: 2.0.0 + promise-limit: 2.7.0 + proxyquire: 2.1.3 + tslib: 2.7.0 + winston: 3.14.2 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + + /@contentstack/cli-cm-import/1.18.0: + resolution: {integrity: sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==} + engines: {node: '>=14.0.0'} + dependencies: + '@contentstack/cli-audit': 1.7.1 + '@contentstack/cli-command': 1.3.1 + '@contentstack/cli-utilities': 1.7.3 + '@contentstack/cli-variants': 1.0.0 + '@contentstack/management': 1.17.2_debug@4.3.7 + '@oclif/core': 3.27.0 + big-json: 3.2.0 + bluebird: 3.7.2 + chalk: 4.1.2 + debug: 4.3.7 + fs-extra: 11.2.0 + lodash: 4.17.21 + marked: 4.3.0 + merge: 2.1.1 + mkdirp: 1.0.4 + promise-limit: 2.7.0 + tslib: 2.7.0 + uuid: 9.0.1 + winston: 3.14.2 + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - encoding + - supports-color + - typescript + dev: false + + /@contentstack/cli-cm-import/1.18.0_ogreqof3k35xezedraj6pnd45y: + resolution: {integrity: sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==} + engines: {node: '>=14.0.0'} + dependencies: + '@contentstack/cli-audit': 1.7.1_ogreqof3k35xezedraj6pnd45y + '@contentstack/cli-command': 1.3.1 + '@contentstack/cli-utilities': 1.7.3 + '@contentstack/cli-variants': 1.0.0 + '@contentstack/management': 1.17.2_debug@4.3.7 + '@oclif/core': 3.27.0 + big-json: 3.2.0 + bluebird: 3.7.2 + chalk: 4.1.2 + debug: 4.3.7 + fs-extra: 11.2.0 + lodash: 4.17.21 + marked: 4.3.0 + merge: 2.1.1 + mkdirp: 1.0.4 + promise-limit: 2.7.0 + tslib: 2.7.0 + uuid: 9.0.1 + winston: 3.14.2 + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - encoding + - supports-color + - typescript + dev: false + + /@contentstack/cli-cm-seed/1.9.0_ogreqof3k35xezedraj6pnd45y: + resolution: {integrity: sha512-KnwKOqljU3NTVzmaMqaOCt5X+0QzyPK/VGB+5Vfj7nEGy0Mz1HA8RjWnZdwKgk1tRkH9mYsj4tG32sRDPYsX/g==} + engines: {node: '>=14.0.0'} + dependencies: + '@contentstack/cli-cm-import': 1.18.0_ogreqof3k35xezedraj6pnd45y + '@contentstack/cli-command': 1.3.1 + '@contentstack/cli-utilities': 1.7.3 + inquirer: 8.2.4 + mkdirp: 1.0.4 + tar: 6.2.1 + tmp: 0.2.3 + tslib: 2.7.0 + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - encoding + - supports-color + - typescript + dev: false + + /@contentstack/cli-command/1.3.1: + resolution: {integrity: sha512-mIyVE9OxfqGXbjiO9gQOzJaNZfOJvlxIibdDRaVR7doRQZJ7ols13g6ToU8XneGlLLncwy95xfmcXrO2G/7Lkg==} + engines: {node: '>=14.0.0'} + dependencies: + '@contentstack/cli-utilities': 1.7.3 + contentstack: 3.21.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + + /@contentstack/cli-utilities/1.7.3: + resolution: {integrity: sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==} + dependencies: + '@contentstack/management': 1.17.2_debug@4.3.7 + '@contentstack/marketplace-sdk': 1.2.3_debug@4.3.7 + '@oclif/core': 3.27.0 + axios: 1.7.7_debug@4.3.7 + chalk: 4.1.2 + cli-cursor: 3.1.0 + cli-table: 0.3.11 + conf: 10.2.0 + debug: 4.3.7 + figures: 3.2.0 + inquirer: 8.2.4 + inquirer-search-checkbox: 1.0.0 + inquirer-search-list: 1.2.6 + klona: 2.0.6 + lodash: 4.17.21 + mkdirp: 1.0.4 + open: 8.4.2 + ora: 5.4.1 + recheck: 4.4.5 + rxjs: 6.6.7 + traverse: 0.6.10 + unique-string: 2.0.0 + uuid: 9.0.1 + winston: 3.14.2 + xdg-basedir: 4.0.0 + transitivePeerDependencies: + - supports-color + dev: false + + /@contentstack/cli-variants/1.0.0: + resolution: {integrity: sha512-Nbb4cX/Q0VTPKUJnxTArkGX/czUUwLIK+HlMtIUyNuJBxHpJMK+h46fDIl4FisFx6R5pUM/A3DnQd9sid6UpeQ==} + dependencies: + '@contentstack/cli-utilities': 1.7.3 + lodash: 4.17.21 + mkdirp: 1.0.4 + winston: 3.14.2 + transitivePeerDependencies: + - supports-color + dev: false + /@contentstack/json-rte-serializer/2.0.10: resolution: {integrity: sha512-32tzzNTaXsfJjuPe2x0xz1f1c3JKKtS7XHBo2y6C4NujKe2ROW2Fq50VjdEYbjm7oo8uOt4yOE1XZpj0KjmQXQ==} dependencies: @@ -2545,7 +2759,6 @@ packages: - '@swc/wasm' - '@types/node' - typescript - dev: true /@oclif/core/2.16.0_7fevqhz6gkqgsvgva3uhczuvcq: resolution: {integrity: sha512-dL6atBH0zCZl1A1IXCKJgLPrM/wR7K+Wi401E/IvqsK8m2iCHW+0TEOGrans/cuN3oTW+uxIyJFHJ8Im0k4qBw==} @@ -2767,7 +2980,6 @@ packages: - '@swc/wasm' - '@types/node' - typescript - dev: true /@oclif/plugin-help/5.2.20_7fevqhz6gkqgsvgva3uhczuvcq: resolution: {integrity: sha512-u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ==} @@ -13673,7 +13885,6 @@ packages: make-error: 1.3.6 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - dev: true /ts-node/10.9.2_7fevqhz6gkqgsvgva3uhczuvcq: resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} From 96cab56286933d0842646a35c1967d31a4b3ca35 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Tue, 1 Oct 2024 12:54:39 +0530 Subject: [PATCH 06/11] seed plugin version bump --- package-lock.json | 23 ++------- packages/contentstack/package.json | 2 +- pnpm-lock.yaml | 81 +----------------------------- 3 files changed, 6 insertions(+), 100 deletions(-) diff --git a/package-lock.json b/package-lock.json index 80e3233aff..784fd0bb17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26313,7 +26313,7 @@ "@contentstack/cli-cm-export-to-csv": "~1.7.2", "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-cm-migrate-rte": "~1.4.19", - "@contentstack/cli-cm-seed": "~1.9.0", + "@contentstack/cli-cm-seed": "~1.10.0", "@contentstack/cli-command": "~1.3.1", "@contentstack/cli-config": "~1.7.2", "@contentstack/cli-launch": "~1.2.2", @@ -29045,29 +29045,11 @@ "node": ">=10" } }, - "packages/contentstack/node_modules/@contentstack/cli-cm-seed": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-seed/-/cli-cm-seed-1.9.0.tgz", - "integrity": "sha512-KnwKOqljU3NTVzmaMqaOCt5X+0QzyPK/VGB+5Vfj7nEGy0Mz1HA8RjWnZdwKgk1tRkH9mYsj4tG32sRDPYsX/g==", - "license": "MIT", - "dependencies": { - "@contentstack/cli-cm-import": "~1.18.0", - "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", - "inquirer": "8.2.4", - "mkdirp": "^1.0.4", - "tar": "^6.1.13", - "tmp": "^0.2.2", - "tslib": "^2.4.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, "packages/contentstack/node_modules/@contentstack/cli-cm-seed/node_modules/@contentstack/cli-cm-import": { "version": "1.18.0", "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-import/-/cli-cm-import-1.18.0.tgz", "integrity": "sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==", + "extraneous": true, "license": "MIT", "dependencies": { "@contentstack/cli-audit": "~1.7.0", @@ -29098,6 +29080,7 @@ "version": "1.7.3", "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.7.3.tgz", "integrity": "sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==", + "extraneous": true, "license": "MIT", "dependencies": { "@contentstack/management": "~1.17.0", diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index d1be37176c..46d4c5d384 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -32,7 +32,7 @@ "@contentstack/cli-cm-export-to-csv": "~1.7.2", "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-cm-migrate-rte": "~1.4.19", - "@contentstack/cli-cm-seed": "~1.9.0", + "@contentstack/cli-cm-seed": "~1.10.0", "@contentstack/cli-command": "~1.3.1", "@contentstack/cli-config": "~1.7.2", "@contentstack/cli-launch": "~1.2.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b04d68159..1a7407ad1c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,7 +20,7 @@ importers: '@contentstack/cli-cm-export-to-csv': ~1.7.2 '@contentstack/cli-cm-import': ~1.19.0 '@contentstack/cli-cm-migrate-rte': ~1.4.19 - '@contentstack/cli-cm-seed': ~1.9.0 + '@contentstack/cli-cm-seed': ~1.10.0 '@contentstack/cli-command': ~1.3.1 '@contentstack/cli-config': ~1.7.2 '@contentstack/cli-launch': ~1.2.2 @@ -74,7 +74,7 @@ importers: '@contentstack/cli-cm-export-to-csv': link:../contentstack-export-to-csv '@contentstack/cli-cm-import': link:../contentstack-import '@contentstack/cli-cm-migrate-rte': link:../contentstack-migrate-rte - '@contentstack/cli-cm-seed': 1.9.0_ogreqof3k35xezedraj6pnd45y + '@contentstack/cli-cm-seed': link:../contentstack-seed '@contentstack/cli-command': link:../contentstack-command '@contentstack/cli-config': link:../contentstack-config '@contentstack/cli-launch': link:../contentstack-launch @@ -1641,30 +1641,6 @@ packages: - typescript dev: false - /@contentstack/cli-audit/1.7.1_ogreqof3k35xezedraj6pnd45y: - resolution: {integrity: sha512-Eocn4UWuKFp46fhpA6kgfl5S13yci59VK3Vcsi6Cj4TC3OTnR4mB2yDvuFt3GtIW7zKblVA9GYzqub6JeGvt6w==} - engines: {node: '>=16'} - hasBin: true - dependencies: - '@contentstack/cli-command': 1.3.1 - '@contentstack/cli-utilities': 1.7.3 - '@oclif/plugin-help': 5.2.20_ogreqof3k35xezedraj6pnd45y - '@oclif/plugin-plugins': 5.4.9 - chalk: 4.1.2 - fast-csv: 4.3.6 - fs-extra: 11.2.0 - lodash: 4.17.21 - uuid: 9.0.1 - winston: 3.14.2 - transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - encoding - - supports-color - - typescript - dev: false - /@contentstack/cli-cm-export/1.13.0: resolution: {integrity: sha512-zIx1ud4eLH2SgGHwagxyzZlQKkbiF4ObkOoU8c6sLnN6edKFldMxR5lTti4yp3T4oN0sm6IfJ3z+wKle3dBO3w==} engines: {node: '>=14.0.0'} @@ -1724,59 +1700,6 @@ packages: - typescript dev: false - /@contentstack/cli-cm-import/1.18.0_ogreqof3k35xezedraj6pnd45y: - resolution: {integrity: sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==} - engines: {node: '>=14.0.0'} - dependencies: - '@contentstack/cli-audit': 1.7.1_ogreqof3k35xezedraj6pnd45y - '@contentstack/cli-command': 1.3.1 - '@contentstack/cli-utilities': 1.7.3 - '@contentstack/cli-variants': 1.0.0 - '@contentstack/management': 1.17.2_debug@4.3.7 - '@oclif/core': 3.27.0 - big-json: 3.2.0 - bluebird: 3.7.2 - chalk: 4.1.2 - debug: 4.3.7 - fs-extra: 11.2.0 - lodash: 4.17.21 - marked: 4.3.0 - merge: 2.1.1 - mkdirp: 1.0.4 - promise-limit: 2.7.0 - tslib: 2.7.0 - uuid: 9.0.1 - winston: 3.14.2 - transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - encoding - - supports-color - - typescript - dev: false - - /@contentstack/cli-cm-seed/1.9.0_ogreqof3k35xezedraj6pnd45y: - resolution: {integrity: sha512-KnwKOqljU3NTVzmaMqaOCt5X+0QzyPK/VGB+5Vfj7nEGy0Mz1HA8RjWnZdwKgk1tRkH9mYsj4tG32sRDPYsX/g==} - engines: {node: '>=14.0.0'} - dependencies: - '@contentstack/cli-cm-import': 1.18.0_ogreqof3k35xezedraj6pnd45y - '@contentstack/cli-command': 1.3.1 - '@contentstack/cli-utilities': 1.7.3 - inquirer: 8.2.4 - mkdirp: 1.0.4 - tar: 6.2.1 - tmp: 0.2.3 - tslib: 2.7.0 - transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - encoding - - supports-color - - typescript - dev: false - /@contentstack/cli-command/1.3.1: resolution: {integrity: sha512-mIyVE9OxfqGXbjiO9gQOzJaNZfOJvlxIibdDRaVR7doRQZJ7ols13g6ToU8XneGlLLncwy95xfmcXrO2G/7Lkg==} engines: {node: '>=14.0.0'} From 3616fc9686d92522d10485511fa053c28b363536 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Tue, 1 Oct 2024 14:43:21 +0530 Subject: [PATCH 07/11] added dotenv in utilities plugin --- package-lock.json | 2 +- packages/contentstack-utilities/package.json | 1 + packages/contentstack-utilities/src/auth-handler.ts | 2 ++ pnpm-lock.yaml | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 784fd0bb17..a5c1cbc79d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7206,7 +7206,6 @@ "version": "16.4.5", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", - "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -28677,6 +28676,7 @@ "cli-table": "^0.3.11", "conf": "^10.2.0", "debug": "^4.1.1", + "dotenv": "^16.4.5", "figures": "^3.2.0", "inquirer": "8.2.4", "inquirer-search-checkbox": "^1.0.0", diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json index 7ebadcbf2d..888fa7c95e 100644 --- a/packages/contentstack-utilities/package.json +++ b/packages/contentstack-utilities/package.json @@ -41,6 +41,7 @@ "cli-table": "^0.3.11", "conf": "^10.2.0", "debug": "^4.1.1", + "dotenv": "^16.4.5", "figures": "^3.2.0", "inquirer": "8.2.4", "inquirer-search-checkbox": "^1.0.0", diff --git a/packages/contentstack-utilities/src/auth-handler.ts b/packages/contentstack-utilities/src/auth-handler.ts index 98dbda88f5..8ca247621a 100644 --- a/packages/contentstack-utilities/src/auth-handler.ts +++ b/packages/contentstack-utilities/src/auth-handler.ts @@ -1,6 +1,7 @@ import cliux from './cli-ux'; import HttpClient from './http-client'; import configHandler from './config-handler'; +import dotenv from 'dotenv'; import * as ContentstackManagementSDK from '@contentstack/management'; import messageHandler from './message-handler'; const http = require('http'); @@ -8,6 +9,7 @@ const url = require('url'); import open from 'open'; import {LoggerService} from './logger'; const crypto = require('crypto'); +dotenv.config(); /** * @class diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1a7407ad1c..e0724db125 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1068,6 +1068,7 @@ importers: cli-table: ^0.3.11 conf: ^10.2.0 debug: ^4.1.1 + dotenv: ^16.4.5 eslint: ^8.18.0 eslint-config-oclif: ^4.0.0 eslint-config-oclif-typescript: ^3.0.8 @@ -1108,6 +1109,7 @@ importers: cli-table: 0.3.11 conf: 10.2.0 debug: 4.3.7 + dotenv: 16.4.5 figures: 3.2.0 inquirer: 8.2.4 inquirer-search-checkbox: 1.0.0 From ccd7bda3a1228c02ccedc904a1dd544f258fefe8 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Tue, 1 Oct 2024 15:19:33 +0530 Subject: [PATCH 08/11] clone version bump --- package-lock.json | 180 +++++++++++++++-------- packages/contentstack-clone/README.md | 2 +- packages/contentstack-clone/package.json | 6 +- packages/contentstack/package.json | 2 +- pnpm-lock.yaml | 150 +------------------ 5 files changed, 130 insertions(+), 210 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5c1cbc79d..67d2517d35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26307,7 +26307,7 @@ "@contentstack/cli-cm-bootstrap": "~1.13.0", "@contentstack/cli-cm-branches": "~1.1.3", "@contentstack/cli-cm-bulk-publish": "~1.4.8", - "@contentstack/cli-cm-clone": "~1.12.0", + "@contentstack/cli-cm-clone": "~1.13.0", "@contentstack/cli-cm-export": "~1.14.0", "@contentstack/cli-cm-export-to-csv": "~1.7.2", "@contentstack/cli-cm-import": "~1.19.0", @@ -26838,12 +26838,12 @@ }, "packages/contentstack-clone": { "name": "@contentstack/cli-cm-clone", - "version": "1.12.0", + "version": "1.13.0", "license": "MIT", "dependencies": { "@colors/colors": "^1.5.0", - "@contentstack/cli-cm-export": "~1.13.0", - "@contentstack/cli-cm-import": "~1.18.0", + "@contentstack/cli-cm-export": "~1.14.0", + "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-command": "~1.3.0", "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", @@ -26874,39 +26874,11 @@ "node": ">=14.0.0" } }, - "packages/contentstack-clone/node_modules/@contentstack/cli-cm-export": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-export/-/cli-cm-export-1.13.0.tgz", - "integrity": "sha512-zIx1ud4eLH2SgGHwagxyzZlQKkbiF4ObkOoU8c6sLnN6edKFldMxR5lTti4yp3T4oN0sm6IfJ3z+wKle3dBO3w==", - "license": "MIT", - "dependencies": { - "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", - "@contentstack/cli-variants": "~1.0.0", - "@oclif/core": "^3.26.5", - "async": "^3.2.4", - "big-json": "^3.2.0", - "bluebird": "^3.7.2", - "chalk": "^4.1.2", - "is-valid-path": "^0.1.1", - "lodash": "^4.17.20", - "merge": "^2.1.1", - "mkdirp": "^1.0.4", - "path": "^0.12.7", - "progress-stream": "^2.0.0", - "promise-limit": "^2.7.0", - "proxyquire": "^2.1.3", - "tslib": "^2.4.1", - "winston": "^3.7.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, "packages/contentstack-clone/node_modules/@contentstack/cli-cm-export/node_modules/@contentstack/cli-utilities": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.7.3.tgz", "integrity": "sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==", + "extraneous": true, "license": "MIT", "dependencies": { "@contentstack/management": "~1.17.0", @@ -26936,40 +26908,11 @@ "xdg-basedir": "^4.0.0" } }, - "packages/contentstack-clone/node_modules/@contentstack/cli-cm-import": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-import/-/cli-cm-import-1.18.0.tgz", - "integrity": "sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==", - "license": "MIT", - "dependencies": { - "@contentstack/cli-audit": "~1.7.0", - "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-utilities": "~1.7.2", - "@contentstack/cli-variants": "~1.0.0", - "@contentstack/management": "~1.17.0", - "@oclif/core": "^3.26.5", - "big-json": "^3.2.0", - "bluebird": "^3.7.2", - "chalk": "^4.1.2", - "debug": "^4.1.0", - "fs-extra": "^11.1.1", - "lodash": "^4.17.20", - "marked": "^4.0.17", - "merge": "^2.1.1", - "mkdirp": "^1.0.4", - "promise-limit": "^2.7.0", - "tslib": "^2.4.1", - "uuid": "^9.0.1", - "winston": "^3.7.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, "packages/contentstack-clone/node_modules/@contentstack/cli-cm-import/node_modules/@contentstack/cli-utilities": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.7.3.tgz", "integrity": "sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==", + "extraneous": true, "license": "MIT", "dependencies": { "@contentstack/management": "~1.17.0", @@ -29045,6 +28988,117 @@ "node": ">=10" } }, + "packages/contentstack/node_modules/@contentstack/cli-cm-clone/node_modules/@contentstack/cli-cm-export": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-export/-/cli-cm-export-1.13.0.tgz", + "integrity": "sha512-zIx1ud4eLH2SgGHwagxyzZlQKkbiF4ObkOoU8c6sLnN6edKFldMxR5lTti4yp3T4oN0sm6IfJ3z+wKle3dBO3w==", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-variants": "~1.0.0", + "@oclif/core": "^3.26.5", + "async": "^3.2.4", + "big-json": "^3.2.0", + "bluebird": "^3.7.2", + "chalk": "^4.1.2", + "is-valid-path": "^0.1.1", + "lodash": "^4.17.20", + "merge": "^2.1.1", + "mkdirp": "^1.0.4", + "path": "^0.12.7", + "progress-stream": "^2.0.0", + "promise-limit": "^2.7.0", + "proxyquire": "^2.1.3", + "tslib": "^2.4.1", + "winston": "^3.7.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "packages/contentstack/node_modules/@contentstack/cli-cm-clone/node_modules/@contentstack/cli-cm-import": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-import/-/cli-cm-import-1.18.0.tgz", + "integrity": "sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@contentstack/cli-audit": "~1.7.0", + "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-utilities": "~1.7.2", + "@contentstack/cli-variants": "~1.0.0", + "@contentstack/management": "~1.17.0", + "@oclif/core": "^3.26.5", + "big-json": "^3.2.0", + "bluebird": "^3.7.2", + "chalk": "^4.1.2", + "debug": "^4.1.0", + "fs-extra": "^11.1.1", + "lodash": "^4.17.20", + "marked": "^4.0.17", + "merge": "^2.1.1", + "mkdirp": "^1.0.4", + "promise-limit": "^2.7.0", + "tslib": "^2.4.1", + "uuid": "^9.0.1", + "winston": "^3.7.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "packages/contentstack/node_modules/@contentstack/cli-cm-clone/node_modules/@contentstack/cli-utilities": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@contentstack/cli-utilities/-/cli-utilities-1.7.3.tgz", + "integrity": "sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@contentstack/management": "~1.17.0", + "@contentstack/marketplace-sdk": "^1.2.1", + "@oclif/core": "^3.26.5", + "axios": "^1.7.4", + "chalk": "^4.0.0", + "cli-cursor": "^3.1.0", + "cli-table": "^0.3.11", + "conf": "^10.2.0", + "debug": "^4.1.1", + "figures": "^3.2.0", + "inquirer": "8.2.4", + "inquirer-search-checkbox": "^1.0.0", + "inquirer-search-list": "^1.2.6", + "klona": "^2.0.6", + "lodash": "^4.17.15", + "mkdirp": "^1.0.4", + "open": "^8.4.2", + "ora": "^5.4.0", + "recheck": "^4.4.5", + "rxjs": "^6.6.7", + "traverse": "^0.6.7", + "unique-string": "^2.0.0", + "uuid": "^9.0.1", + "winston": "^3.7.2", + "xdg-basedir": "^4.0.0" + } + }, + "packages/contentstack/node_modules/@contentstack/cli-cm-clone/node_modules/rimraf": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", + "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", + "extraneous": true, + "license": "ISC", + "dependencies": { + "glob": "^10.3.7" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "packages/contentstack/node_modules/@contentstack/cli-cm-seed/node_modules/@contentstack/cli-cm-import": { "version": "1.18.0", "resolved": "https://registry.npmjs.org/@contentstack/cli-cm-import/-/cli-cm-import-1.18.0.tgz", diff --git a/packages/contentstack-clone/README.md b/packages/contentstack-clone/README.md index 63e5b864cc..dd1a9bd9d9 100644 --- a/packages/contentstack-clone/README.md +++ b/packages/contentstack-clone/README.md @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-clone/1.12.0 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-clone/1.13.0 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index b43211a17c..628e62af8d 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -1,13 +1,13 @@ { "name": "@contentstack/cli-cm-clone", "description": "Contentstack stack clone plugin", - "version": "1.12.0", + "version": "1.13.0", "author": "Contentstack", "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues", "dependencies": { "@colors/colors": "^1.5.0", - "@contentstack/cli-cm-export": "~1.13.0", - "@contentstack/cli-cm-import": "~1.18.0", + "@contentstack/cli-cm-export": "~1.14.0", + "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-command": "~1.3.0", "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 46d4c5d384..5327216ff1 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -28,7 +28,7 @@ "@contentstack/cli-cm-branches": "~1.1.3", "@contentstack/cli-cm-bulk-publish": "~1.4.8", "@contentstack/cli-cm-export": "~1.14.0", - "@contentstack/cli-cm-clone": "~1.12.0", + "@contentstack/cli-cm-clone": "~1.13.0", "@contentstack/cli-cm-export-to-csv": "~1.7.2", "@contentstack/cli-cm-import": "~1.19.0", "@contentstack/cli-cm-migrate-rte": "~1.4.19", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e0724db125..1fac89633d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,7 +15,7 @@ importers: '@contentstack/cli-cm-bootstrap': ~1.13.0 '@contentstack/cli-cm-branches': ~1.1.3 '@contentstack/cli-cm-bulk-publish': ~1.4.8 - '@contentstack/cli-cm-clone': ~1.12.0 + '@contentstack/cli-cm-clone': ~1.13.0 '@contentstack/cli-cm-export': ~1.14.0 '@contentstack/cli-cm-export-to-csv': ~1.7.2 '@contentstack/cli-cm-import': ~1.19.0 @@ -423,8 +423,8 @@ importers: packages/contentstack-clone: specifiers: '@colors/colors': ^1.5.0 - '@contentstack/cli-cm-export': ~1.13.0 - '@contentstack/cli-cm-import': ~1.18.0 + '@contentstack/cli-cm-export': ~1.14.0 + '@contentstack/cli-cm-import': ~1.19.0 '@contentstack/cli-command': ~1.3.0 '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 @@ -450,8 +450,8 @@ importers: winston: ^3.7.2 dependencies: '@colors/colors': 1.6.0 - '@contentstack/cli-cm-export': 1.13.0 - '@contentstack/cli-cm-import': 1.18.0 + '@contentstack/cli-cm-export': link:../contentstack-export + '@contentstack/cli-cm-import': link:../contentstack-import '@contentstack/cli-command': link:../contentstack-command '@contentstack/cli-utilities': link:../contentstack-utilities async: 3.2.6 @@ -1619,143 +1619,6 @@ packages: engines: {node: '>=0.1.90'} dev: false - /@contentstack/cli-audit/1.7.1: - resolution: {integrity: sha512-Eocn4UWuKFp46fhpA6kgfl5S13yci59VK3Vcsi6Cj4TC3OTnR4mB2yDvuFt3GtIW7zKblVA9GYzqub6JeGvt6w==} - engines: {node: '>=16'} - hasBin: true - dependencies: - '@contentstack/cli-command': 1.3.1 - '@contentstack/cli-utilities': 1.7.3 - '@oclif/plugin-help': 5.2.20 - '@oclif/plugin-plugins': 5.4.9 - chalk: 4.1.2 - fast-csv: 4.3.6 - fs-extra: 11.2.0 - lodash: 4.17.21 - uuid: 9.0.1 - winston: 3.14.2 - transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - encoding - - supports-color - - typescript - dev: false - - /@contentstack/cli-cm-export/1.13.0: - resolution: {integrity: sha512-zIx1ud4eLH2SgGHwagxyzZlQKkbiF4ObkOoU8c6sLnN6edKFldMxR5lTti4yp3T4oN0sm6IfJ3z+wKle3dBO3w==} - engines: {node: '>=14.0.0'} - dependencies: - '@contentstack/cli-command': 1.3.1 - '@contentstack/cli-utilities': 1.7.3 - '@contentstack/cli-variants': 1.0.0 - '@oclif/core': 3.27.0 - async: 3.2.6 - big-json: 3.2.0 - bluebird: 3.7.2 - chalk: 4.1.2 - is-valid-path: 0.1.1 - lodash: 4.17.21 - merge: 2.1.1 - mkdirp: 1.0.4 - path: 0.12.7 - progress-stream: 2.0.0 - promise-limit: 2.7.0 - proxyquire: 2.1.3 - tslib: 2.7.0 - winston: 3.14.2 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - - /@contentstack/cli-cm-import/1.18.0: - resolution: {integrity: sha512-d03LA/YHKuZSoFTKRaDmUa+fD66J8SnJVRm2553H9GGia+d85g2qDHToMdQEgtK/O4pUiEffsCUvnuulM34isA==} - engines: {node: '>=14.0.0'} - dependencies: - '@contentstack/cli-audit': 1.7.1 - '@contentstack/cli-command': 1.3.1 - '@contentstack/cli-utilities': 1.7.3 - '@contentstack/cli-variants': 1.0.0 - '@contentstack/management': 1.17.2_debug@4.3.7 - '@oclif/core': 3.27.0 - big-json: 3.2.0 - bluebird: 3.7.2 - chalk: 4.1.2 - debug: 4.3.7 - fs-extra: 11.2.0 - lodash: 4.17.21 - marked: 4.3.0 - merge: 2.1.1 - mkdirp: 1.0.4 - promise-limit: 2.7.0 - tslib: 2.7.0 - uuid: 9.0.1 - winston: 3.14.2 - transitivePeerDependencies: - - '@swc/core' - - '@swc/wasm' - - '@types/node' - - encoding - - supports-color - - typescript - dev: false - - /@contentstack/cli-command/1.3.1: - resolution: {integrity: sha512-mIyVE9OxfqGXbjiO9gQOzJaNZfOJvlxIibdDRaVR7doRQZJ7ols13g6ToU8XneGlLLncwy95xfmcXrO2G/7Lkg==} - engines: {node: '>=14.0.0'} - dependencies: - '@contentstack/cli-utilities': 1.7.3 - contentstack: 3.21.0 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - - /@contentstack/cli-utilities/1.7.3: - resolution: {integrity: sha512-xA4POMB98amZpwLUzEl/7L+LUpjau6GL7Dlvq/51RtT7HkmutBv0aQs03FK1Ls0ZdeOsGmlAzZQHXcr8orfaIg==} - dependencies: - '@contentstack/management': 1.17.2_debug@4.3.7 - '@contentstack/marketplace-sdk': 1.2.3_debug@4.3.7 - '@oclif/core': 3.27.0 - axios: 1.7.7_debug@4.3.7 - chalk: 4.1.2 - cli-cursor: 3.1.0 - cli-table: 0.3.11 - conf: 10.2.0 - debug: 4.3.7 - figures: 3.2.0 - inquirer: 8.2.4 - inquirer-search-checkbox: 1.0.0 - inquirer-search-list: 1.2.6 - klona: 2.0.6 - lodash: 4.17.21 - mkdirp: 1.0.4 - open: 8.4.2 - ora: 5.4.1 - recheck: 4.4.5 - rxjs: 6.6.7 - traverse: 0.6.10 - unique-string: 2.0.0 - uuid: 9.0.1 - winston: 3.14.2 - xdg-basedir: 4.0.0 - transitivePeerDependencies: - - supports-color - dev: false - - /@contentstack/cli-variants/1.0.0: - resolution: {integrity: sha512-Nbb4cX/Q0VTPKUJnxTArkGX/czUUwLIK+HlMtIUyNuJBxHpJMK+h46fDIl4FisFx6R5pUM/A3DnQd9sid6UpeQ==} - dependencies: - '@contentstack/cli-utilities': 1.7.3 - lodash: 4.17.21 - mkdirp: 1.0.4 - winston: 3.14.2 - transitivePeerDependencies: - - supports-color - dev: false - /@contentstack/json-rte-serializer/2.0.10: resolution: {integrity: sha512-32tzzNTaXsfJjuPe2x0xz1f1c3JKKtS7XHBo2y6C4NujKe2ROW2Fq50VjdEYbjm7oo8uOt4yOE1XZpj0KjmQXQ==} dependencies: @@ -2684,6 +2547,7 @@ packages: - '@swc/wasm' - '@types/node' - typescript + dev: true /@oclif/core/2.16.0_7fevqhz6gkqgsvgva3uhczuvcq: resolution: {integrity: sha512-dL6atBH0zCZl1A1IXCKJgLPrM/wR7K+Wi401E/IvqsK8m2iCHW+0TEOGrans/cuN3oTW+uxIyJFHJ8Im0k4qBw==} @@ -2905,6 +2769,7 @@ packages: - '@swc/wasm' - '@types/node' - typescript + dev: true /@oclif/plugin-help/5.2.20_7fevqhz6gkqgsvgva3uhczuvcq: resolution: {integrity: sha512-u+GXX/KAGL9S10LxAwNUaWdzbEBARJ92ogmM7g3gDVud2HioCmvWQCDohNRVZ9GYV9oKwZ/M8xwd6a1d95rEKQ==} @@ -13810,6 +13675,7 @@ packages: make-error: 1.3.6 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: true /ts-node/10.9.2_7fevqhz6gkqgsvgva3uhczuvcq: resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} From cba57672b64eba996c952d07c1723725fa4cf17a Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Tue, 1 Oct 2024 15:46:23 +0530 Subject: [PATCH 09/11] refactor: auth handler message --- .../contentstack-utilities/src/authentication-handler.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/contentstack-utilities/src/authentication-handler.ts b/packages/contentstack-utilities/src/authentication-handler.ts index 5c22b62546..a0ca6ee1a6 100644 --- a/packages/contentstack-utilities/src/authentication-handler.ts +++ b/packages/contentstack-utilities/src/authentication-handler.ts @@ -53,7 +53,6 @@ class AuthenticationHandler { async refreshAccessToken(error: any, maxRetryCount = 1): Promise { if (error.response && error.response.status) { - // Increment the retry count only when not exceeding max retries if (maxRetryCount >= 3) { ux.print('Max retry count reached, please login to proceed', { color: 'yellow', @@ -61,7 +60,7 @@ class AuthenticationHandler { process.exit(1); } - maxRetryCount++; // Increment here for the next retry attempt + maxRetryCount++; // Increment for the next retry attempt switch (error.response.status) { case 401: @@ -80,8 +79,8 @@ class AuthenticationHandler { case 429: case 408: - // These cases might require a wait, consider adding a delay before retrying - await new Promise((resolve) => setTimeout(resolve, 1000)); // Example wait of 1 second + // These cases require a wait, adding a delay before retrying + await new Promise((resolve) => setTimeout(resolve, 1000)); // wait for 1 second return this.refreshAccessToken(error, maxRetryCount); // Retry default: From eeabca35209a0f6cee9e63b476ca03254a7f63c9 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Tue, 1 Oct 2024 18:36:23 +0530 Subject: [PATCH 10/11] version bump --- package-lock.json | 85 ++++++++++--------- packages/contentstack-audit/README.md | 2 +- packages/contentstack-audit/package.json | 4 +- packages/contentstack-auth/README.md | 2 +- packages/contentstack-auth/package.json | 4 +- packages/contentstack-bootstrap/package.json | 2 +- packages/contentstack-branches/README.md | 2 +- packages/contentstack-branches/package.json | 8 +- packages/contentstack-bulk-publish/README.md | 2 +- .../contentstack-bulk-publish/package.json | 4 +- packages/contentstack-clone/package.json | 2 +- packages/contentstack-command/package.json | 2 +- packages/contentstack-config/README.md | 2 +- packages/contentstack-config/package.json | 4 +- .../contentstack-export-to-csv/package.json | 4 +- packages/contentstack-export/package.json | 8 +- packages/contentstack-import/package.json | 6 +- packages/contentstack-launch/README.md | 2 +- packages/contentstack-launch/package.json | 4 +- packages/contentstack-migrate-rte/README.md | 2 +- .../contentstack-migrate-rte/package.json | 4 +- packages/contentstack-migration/README.md | 2 +- packages/contentstack-migration/package.json | 4 +- packages/contentstack-seed/package.json | 2 +- packages/contentstack-variants/package.json | 2 +- packages/contentstack/package.json | 21 ++--- pnpm-lock.yaml | 64 +++++++------- 27 files changed, 127 insertions(+), 123 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67d2517d35..37c7d281f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26302,22 +26302,23 @@ "version": "1.27.0", "license": "MIT", "dependencies": { - "@contentstack/cli-audit": "~1.7.1", - "@contentstack/cli-auth": "~1.3.21", + "@contentstack/cli-audit": "~1.7.2", + "@contentstack/cli-auth": "~1.3.22", "@contentstack/cli-cm-bootstrap": "~1.13.0", - "@contentstack/cli-cm-branches": "~1.1.3", - "@contentstack/cli-cm-bulk-publish": "~1.4.8", + "@contentstack/cli-cm-branches": "~1.1.4", + "@contentstack/cli-cm-bulk-publish": "~1.4.9", "@contentstack/cli-cm-clone": "~1.13.0", "@contentstack/cli-cm-export": "~1.14.0", - "@contentstack/cli-cm-export-to-csv": "~1.7.2", + "@contentstack/cli-cm-export-to-csv": "~1.7.3", "@contentstack/cli-cm-import": "~1.19.0", - "@contentstack/cli-cm-migrate-rte": "~1.4.19", + "@contentstack/cli-cm-migrate-rte": "~1.4.20", "@contentstack/cli-cm-seed": "~1.10.0", - "@contentstack/cli-command": "~1.3.1", - "@contentstack/cli-config": "~1.7.2", - "@contentstack/cli-launch": "~1.2.2", - "@contentstack/cli-migration": "~1.6.1", + "@contentstack/cli-command": "~1.3.2", + "@contentstack/cli-config": "~1.7.3", + "@contentstack/cli-launch": "~1.2.3", + "@contentstack/cli-migration": "~1.6.2", "@contentstack/cli-utilities": "~1.8.0", + "@contentstack/cli-variants": "~1.1.0", "@contentstack/management": "~1.17.0", "@oclif/core": "^3.26.5", "@oclif/plugin-help": "^5", @@ -26367,10 +26368,10 @@ }, "packages/contentstack-audit": { "name": "@contentstack/cli-audit", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^5.0.0", @@ -26628,10 +26629,10 @@ }, "packages/contentstack-auth": { "name": "@contentstack/cli-auth", - "version": "1.3.21", + "version": "1.3.22", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.0.0", "debug": "^4.1.1", @@ -26673,7 +26674,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-cm-seed": "~1.10.0", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", "mkdirp": "^1.0.4", @@ -26751,10 +26752,10 @@ }, "packages/contentstack-branches": { "name": "@contentstack/cli-cm-branches", - "version": "1.1.3", + "version": "1.1.4", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "async": "^3.2.4", @@ -26774,8 +26775,8 @@ "winston": "^3.7.2" }, "devDependencies": { - "@contentstack/cli-auth": "~1.3.19", - "@contentstack/cli-config": "~1.7.2", + "@contentstack/cli-auth": "~1.3.22", + "@contentstack/cli-config": "~1.7.3", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.1.19", "@oclif/test": "^2.5.6", @@ -26800,10 +26801,10 @@ }, "packages/contentstack-bulk-publish": { "name": "@contentstack/cli-cm-bulk-publish", - "version": "1.4.8", + "version": "1.4.9", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "bluebird": "^3.7.2", "chalk": "^4.1.2", @@ -26844,7 +26845,7 @@ "@colors/colors": "^1.5.0", "@contentstack/cli-cm-export": "~1.14.0", "@contentstack/cli-cm-import": "~1.19.0", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", "chalk": "^4.1.0", @@ -27016,7 +27017,7 @@ }, "packages/contentstack-command": { "name": "@contentstack/cli-command", - "version": "1.3.1", + "version": "1.3.2", "license": "MIT", "dependencies": { "@contentstack/cli-utilities": "~1.8.0", @@ -27093,10 +27094,10 @@ }, "packages/contentstack-config": { "name": "@contentstack/cli-config", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.0.0", "debug": "^4.1.1", @@ -27502,9 +27503,9 @@ "version": "1.14.0", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", - "@contentstack/cli-variants": "~1.0.0", + "@contentstack/cli-variants": "~1.1.0", "@oclif/core": "^3.26.5", "async": "^3.2.4", "big-json": "^3.2.0", @@ -27522,8 +27523,8 @@ "winston": "^3.7.2" }, "devDependencies": { - "@contentstack/cli-auth": "~1.3.19", - "@contentstack/cli-config": "~1.7.2", + "@contentstack/cli-auth": "~1.3.22", + "@contentstack/cli-config": "~1.7.3", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.1.19", "@oclif/test": "^2.5.6", @@ -27550,10 +27551,10 @@ }, "packages/contentstack-export-to-csv": { "name": "@contentstack/cli-cm-export-to-csv", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.1.0", "fast-csv": "^4.3.6", @@ -28082,10 +28083,10 @@ "version": "1.19.0", "license": "MIT", "dependencies": { - "@contentstack/cli-audit": "~1.7.0", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-audit": "~1.7.2", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", - "@contentstack/cli-variants": "~1.0.0", + "@contentstack/cli-variants": "~1.1.0", "@contentstack/management": "~1.17.0", "@oclif/core": "^3.26.5", "big-json": "^3.2.0", @@ -28134,11 +28135,11 @@ }, "packages/contentstack-launch": { "name": "@contentstack/cli-launch", - "version": "1.2.2", + "version": "1.2.3", "license": "MIT", "dependencies": { "@apollo/client": "^3.7.9", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "@oclif/plugin-help": "^5", @@ -28450,10 +28451,10 @@ }, "packages/contentstack-migrate-rte": { "name": "@contentstack/cli-cm-migrate-rte", - "version": "1.4.19", + "version": "1.4.20", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@contentstack/json-rte-serializer": "~2.0.4", "chalk": "^4.1.2", @@ -28490,10 +28491,10 @@ }, "packages/contentstack-migration": { "name": "@contentstack/cli-migration", - "version": "1.6.1", + "version": "1.6.2", "license": "MIT", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", "callsites": "^3.1.0", @@ -28527,7 +28528,7 @@ "license": "MIT", "dependencies": { "@contentstack/cli-cm-import": "~1.19.0", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", "mkdirp": "^1.0.4", @@ -28694,7 +28695,7 @@ }, "packages/contentstack-variants": { "name": "@contentstack/cli-variants", - "version": "1.0.0", + "version": "1.1.0", "license": "MIT", "dependencies": { "@contentstack/cli-utilities": "^1.8.0", diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md index e08014afd3..8cd4f52d3d 100644 --- a/packages/contentstack-audit/README.md +++ b/packages/contentstack-audit/README.md @@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli-audit/1.7.1 darwin-arm64 node-v22.2.0 +@contentstack/cli-audit/1.7.2 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index 3d7fae0a2d..17fc1edbd4 100644 --- a/packages/contentstack-audit/package.json +++ b/packages/contentstack-audit/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/cli-audit", - "version": "1.7.1", + "version": "1.7.2", "description": "Contentstack audit plugin", "author": "Contentstack CLI", "homepage": "https://github.com/contentstack/cli", @@ -18,7 +18,7 @@ "/oclif.manifest.json" ], "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@oclif/plugin-help": "^5", "@oclif/plugin-plugins": "^5.0.0", diff --git a/packages/contentstack-auth/README.md b/packages/contentstack-auth/README.md index f4f077e0e9..97600ae039 100644 --- a/packages/contentstack-auth/README.md +++ b/packages/contentstack-auth/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-auth/1.3.21 darwin-arm64 node-v22.2.0 +@contentstack/cli-auth/1.3.22 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json index dda7b301e2..6f890fc6ab 100644 --- a/packages/contentstack-auth/package.json +++ b/packages/contentstack-auth/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-auth", "description": "Contentstack CLI plugin for authentication activities", - "version": "1.3.21", + "version": "1.3.22", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "scripts": { @@ -22,7 +22,7 @@ "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"" }, "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.0.0", "debug": "^4.1.1", diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json index 93f06a590a..5e816bb137 100644 --- a/packages/contentstack-bootstrap/package.json +++ b/packages/contentstack-bootstrap/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@contentstack/cli-cm-seed": "~1.10.0", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", "mkdirp": "^1.0.4", diff --git a/packages/contentstack-branches/README.md b/packages/contentstack-branches/README.md index 112e2319a9..74f0e2f782 100755 --- a/packages/contentstack-branches/README.md +++ b/packages/contentstack-branches/README.md @@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-branches/1.1.3 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-branches/1.1.4 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json index c94ed42fbc..533a3736ac 100644 --- a/packages/contentstack-branches/package.json +++ b/packages/contentstack-branches/package.json @@ -1,11 +1,11 @@ { "name": "@contentstack/cli-cm-branches", "description": "Contentstack CLI plugin to do branches operations", - "version": "1.1.3", + "version": "1.1.4", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "async": "^3.2.4", @@ -25,8 +25,8 @@ "winston": "^3.7.2" }, "devDependencies": { - "@contentstack/cli-auth": "~1.3.19", - "@contentstack/cli-config": "~1.7.2", + "@contentstack/cli-auth": "~1.3.22", + "@contentstack/cli-config": "~1.7.3", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.1.19", "@oclif/test": "^2.5.6", diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md index 7780bea08b..fb227ea3e5 100644 --- a/packages/contentstack-bulk-publish/README.md +++ b/packages/contentstack-bulk-publish/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-bulk-publish/1.4.8 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-bulk-publish/1.4.9 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json index 80482b1dfc..36bf40595a 100644 --- a/packages/contentstack-bulk-publish/package.json +++ b/packages/contentstack-bulk-publish/package.json @@ -1,11 +1,11 @@ { "name": "@contentstack/cli-cm-bulk-publish", "description": "Contentstack CLI plugin for bulk publish actions", - "version": "1.4.8", + "version": "1.4.9", "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "bluebird": "^3.7.2", "chalk": "^4.1.2", diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index 628e62af8d..b0e6a3f5b4 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -8,7 +8,7 @@ "@colors/colors": "^1.5.0", "@contentstack/cli-cm-export": "~1.14.0", "@contentstack/cli-cm-import": "~1.19.0", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", "chalk": "^4.1.0", diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json index 1a3cac177b..34e0695bd6 100644 --- a/packages/contentstack-command/package.json +++ b/packages/contentstack-command/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-command", "description": "Contentstack CLI plugin for configuration", - "version": "1.3.1", + "version": "1.3.2", "author": "Contentstack", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/contentstack-config/README.md b/packages/contentstack-config/README.md index 901a8d8256..6029836d4d 100644 --- a/packages/contentstack-config/README.md +++ b/packages/contentstack-config/README.md @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-config/1.7.2 darwin-arm64 node-v22.2.0 +@contentstack/cli-config/1.7.3 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json index ae5db6299a..c8ef75a741 100644 --- a/packages/contentstack-config/package.json +++ b/packages/contentstack-config/package.json @@ -1,7 +1,7 @@ { "name": "@contentstack/cli-config", "description": "Contentstack CLI plugin for configuration", - "version": "1.7.2", + "version": "1.7.3", "author": "Contentstack", "scripts": { "build": "npm run clean && npm run compile", @@ -21,7 +21,7 @@ "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"" }, "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.0.0", "debug": "^4.1.1", diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json index f9d281613e..c4d8e435d1 100644 --- a/packages/contentstack-export-to-csv/package.json +++ b/packages/contentstack-export-to-csv/package.json @@ -1,11 +1,11 @@ { "name": "@contentstack/cli-cm-export-to-csv", "description": "Export entities to csv", - "version": "1.7.2", + "version": "1.7.3", "author": "Abhinav Gupta @abhinav-from-contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "chalk": "^4.1.0", "fast-csv": "^4.3.6", diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json index 16e6db33d3..f2807ddbf4 100644 --- a/packages/contentstack-export/package.json +++ b/packages/contentstack-export/package.json @@ -5,8 +5,8 @@ "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-command": "~1.3.0", - "@contentstack/cli-variants": "~1.0.0", + "@contentstack/cli-command": "~1.3.2", + "@contentstack/cli-variants": "~1.1.0", "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "async": "^3.2.4", @@ -25,8 +25,8 @@ "winston": "^3.7.2" }, "devDependencies": { - "@contentstack/cli-auth": "~1.3.19", - "@contentstack/cli-config": "~1.7.2", + "@contentstack/cli-auth": "~1.3.22", + "@contentstack/cli-config": "~1.7.3", "@contentstack/cli-dev-dependencies": "~1.2.4", "@oclif/plugin-help": "^5.1.19", "@oclif/test": "^2.5.6", diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index d97fe5d0b2..9024cd8a4f 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -5,11 +5,11 @@ "author": "Contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-audit": "~1.7.0", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-audit": "~1.7.2", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@contentstack/management": "~1.17.0", - "@contentstack/cli-variants": "~1.0.0", + "@contentstack/cli-variants": "~1.1.0", "@oclif/core": "^3.26.5", "big-json": "^3.2.0", "bluebird": "^3.7.2", diff --git a/packages/contentstack-launch/README.md b/packages/contentstack-launch/README.md index 8e5aa51675..deb2e66ae1 100755 --- a/packages/contentstack-launch/README.md +++ b/packages/contentstack-launch/README.md @@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-launch $ csdx COMMAND running command... $ csdx (--version|-v) -@contentstack/cli-launch/1.2.2 darwin-arm64 node-v22.2.0 +@contentstack/cli-launch/1.2.3 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json index 68079cd7e8..61c7df8c53 100755 --- a/packages/contentstack-launch/package.json +++ b/packages/contentstack-launch/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/cli-launch", - "version": "1.2.2", + "version": "1.2.3", "description": "Launch related operations", "author": "Contentstack CLI", "bin": { @@ -18,7 +18,7 @@ ], "dependencies": { "@apollo/client": "^3.7.9", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@oclif/core": "^3.26.5", "@oclif/plugin-help": "^5", diff --git a/packages/contentstack-migrate-rte/README.md b/packages/contentstack-migrate-rte/README.md index ddf82d92df..36d4f7dec6 100644 --- a/packages/contentstack-migrate-rte/README.md +++ b/packages/contentstack-migrate-rte/README.md @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-migrate-rte $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-cm-migrate-rte/1.4.19 darwin-arm64 node-v22.2.0 +@contentstack/cli-cm-migrate-rte/1.4.20 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json index a26536aacb..067eb713d4 100644 --- a/packages/contentstack-migrate-rte/package.json +++ b/packages/contentstack-migrate-rte/package.json @@ -1,11 +1,11 @@ { "name": "@contentstack/cli-cm-migrate-rte", "description": "Contentstack CLI plugin to migrate HTML RTE to JSON RTE", - "version": "1.4.19", + "version": "1.4.20", "author": "contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "@contentstack/json-rte-serializer": "~2.0.4", "collapse-whitespace": "^1.1.7", diff --git a/packages/contentstack-migration/README.md b/packages/contentstack-migration/README.md index a5148be25b..f5ca8616ec 100644 --- a/packages/contentstack-migration/README.md +++ b/packages/contentstack-migration/README.md @@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration $ csdx COMMAND running command... $ csdx (--version) -@contentstack/cli-migration/1.6.1 darwin-arm64 node-v22.2.0 +@contentstack/cli-migration/1.6.2 darwin-arm64 node-v22.2.0 $ csdx --help [COMMAND] USAGE $ csdx COMMAND diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json index 554d7ad5b6..bdc1158ee2 100644 --- a/packages/contentstack-migration/package.json +++ b/packages/contentstack-migration/package.json @@ -1,10 +1,10 @@ { "name": "@contentstack/cli-migration", - "version": "1.6.1", + "version": "1.6.2", "author": "@contentstack", "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "async": "^3.2.4", "callsites": "^3.1.0", diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index 0e59fb8faf..6209e20c41 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-cm-import": "~1.19.0", - "@contentstack/cli-command": "~1.3.0", + "@contentstack/cli-command": "~1.3.2", "@contentstack/cli-utilities": "~1.8.0", "inquirer": "8.2.4", "mkdirp": "^1.0.4", diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json index 2ef3293cb2..f76506fa06 100644 --- a/packages/contentstack-variants/package.json +++ b/packages/contentstack-variants/package.json @@ -1,6 +1,6 @@ { "name": "@contentstack/cli-variants", - "version": "1.0.0", + "version": "1.1.0", "description": "Variants plugin", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json index 5327216ff1..d66bac56d7 100755 --- a/packages/contentstack/package.json +++ b/packages/contentstack/package.json @@ -22,23 +22,24 @@ "prepack": "pnpm compile && oclif manifest && oclif readme" }, "dependencies": { - "@contentstack/cli-audit": "~1.7.1", - "@contentstack/cli-auth": "~1.3.21", + "@contentstack/cli-audit": "~1.7.2", + "@contentstack/cli-auth": "~1.3.22", "@contentstack/cli-cm-bootstrap": "~1.13.0", - "@contentstack/cli-cm-branches": "~1.1.3", - "@contentstack/cli-cm-bulk-publish": "~1.4.8", + "@contentstack/cli-cm-branches": "~1.1.4", + "@contentstack/cli-cm-bulk-publish": "~1.4.9", "@contentstack/cli-cm-export": "~1.14.0", "@contentstack/cli-cm-clone": "~1.13.0", - "@contentstack/cli-cm-export-to-csv": "~1.7.2", + "@contentstack/cli-cm-export-to-csv": "~1.7.3", "@contentstack/cli-cm-import": "~1.19.0", - "@contentstack/cli-cm-migrate-rte": "~1.4.19", + "@contentstack/cli-cm-migrate-rte": "~1.4.20", "@contentstack/cli-cm-seed": "~1.10.0", - "@contentstack/cli-command": "~1.3.1", - "@contentstack/cli-config": "~1.7.2", - "@contentstack/cli-launch": "~1.2.2", - "@contentstack/cli-migration": "~1.6.1", + "@contentstack/cli-command": "~1.3.2", + "@contentstack/cli-config": "~1.7.3", + "@contentstack/cli-launch": "~1.2.3", + "@contentstack/cli-migration": "~1.6.2", "@contentstack/cli-utilities": "~1.8.0", "@contentstack/management": "~1.17.0", + "@contentstack/cli-variants": "~1.1.0", "@oclif/core": "^3.26.5", "@oclif/plugin-help": "^5", "@oclif/plugin-not-found": "^2.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1fac89633d..01c789f258 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,22 +10,23 @@ importers: packages/contentstack: specifiers: - '@contentstack/cli-audit': ~1.7.1 - '@contentstack/cli-auth': ~1.3.21 + '@contentstack/cli-audit': ~1.7.2 + '@contentstack/cli-auth': ~1.3.22 '@contentstack/cli-cm-bootstrap': ~1.13.0 - '@contentstack/cli-cm-branches': ~1.1.3 - '@contentstack/cli-cm-bulk-publish': ~1.4.8 + '@contentstack/cli-cm-branches': ~1.1.4 + '@contentstack/cli-cm-bulk-publish': ~1.4.9 '@contentstack/cli-cm-clone': ~1.13.0 '@contentstack/cli-cm-export': ~1.14.0 - '@contentstack/cli-cm-export-to-csv': ~1.7.2 + '@contentstack/cli-cm-export-to-csv': ~1.7.3 '@contentstack/cli-cm-import': ~1.19.0 - '@contentstack/cli-cm-migrate-rte': ~1.4.19 + '@contentstack/cli-cm-migrate-rte': ~1.4.20 '@contentstack/cli-cm-seed': ~1.10.0 - '@contentstack/cli-command': ~1.3.1 - '@contentstack/cli-config': ~1.7.2 - '@contentstack/cli-launch': ~1.2.2 - '@contentstack/cli-migration': ~1.6.1 + '@contentstack/cli-command': ~1.3.2 + '@contentstack/cli-config': ~1.7.3 + '@contentstack/cli-launch': ~1.2.3 + '@contentstack/cli-migration': ~1.6.2 '@contentstack/cli-utilities': ~1.8.0 + '@contentstack/cli-variants': ~1.1.0 '@contentstack/management': ~1.17.0 '@oclif/core': ^3.26.5 '@oclif/plugin-help': ^5 @@ -80,6 +81,7 @@ importers: '@contentstack/cli-launch': link:../contentstack-launch '@contentstack/cli-migration': link:../contentstack-migration '@contentstack/cli-utilities': link:../contentstack-utilities + '@contentstack/cli-variants': link:../contentstack-variants '@contentstack/management': 1.17.2_debug@4.3.7 '@oclif/core': 3.27.0 '@oclif/plugin-help': 5.2.20_ogreqof3k35xezedraj6pnd45y @@ -121,7 +123,7 @@ importers: packages/contentstack-audit: specifiers: - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-dev-dependencies': ^1.2.4 '@contentstack/cli-utilities': ~1.8.0 '@oclif/plugin-help': ^5 @@ -186,7 +188,7 @@ importers: packages/contentstack-auth: specifiers: - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@fancy-test/nock': ^0.1.1 '@oclif/plugin-help': ^5.1.19 @@ -250,7 +252,7 @@ importers: packages/contentstack-bootstrap: specifiers: '@contentstack/cli-cm-seed': ~1.10.0 - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 '@types/inquirer': ^9.0.3 @@ -300,9 +302,9 @@ importers: packages/contentstack-branches: specifiers: - '@contentstack/cli-auth': ~1.3.19 - '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-config': ~1.7.2 + '@contentstack/cli-auth': ~1.3.22 + '@contentstack/cli-command': ~1.3.2 + '@contentstack/cli-config': ~1.7.3 '@contentstack/cli-dev-dependencies': ~1.2.4 '@contentstack/cli-utilities': ~1.8.0 '@oclif/core': ^3.26.5 @@ -379,7 +381,7 @@ importers: packages/contentstack-bulk-publish: specifiers: - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 bluebird: ^3.7.2 @@ -425,7 +427,7 @@ importers: '@colors/colors': ^1.5.0 '@contentstack/cli-cm-export': ~1.14.0 '@contentstack/cli-cm-import': ~1.19.0 - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 async: ^3.2.4 @@ -520,7 +522,7 @@ importers: packages/contentstack-config: specifiers: - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 '@types/chai': ^4.2.18 @@ -606,12 +608,12 @@ importers: packages/contentstack-export: specifiers: - '@contentstack/cli-auth': ~1.3.19 - '@contentstack/cli-command': ~1.3.0 - '@contentstack/cli-config': ~1.7.2 + '@contentstack/cli-auth': ~1.3.22 + '@contentstack/cli-command': ~1.3.2 + '@contentstack/cli-config': ~1.7.3 '@contentstack/cli-dev-dependencies': ~1.2.4 '@contentstack/cli-utilities': ~1.8.0 - '@contentstack/cli-variants': ~1.0.0 + '@contentstack/cli-variants': ~1.1.0 '@oclif/core': ^3.26.5 '@oclif/plugin-help': ^5.1.19 '@oclif/test': ^2.5.6 @@ -689,7 +691,7 @@ importers: packages/contentstack-export-to-csv: specifiers: - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 '@types/chai': ^4.3.6 @@ -732,10 +734,10 @@ importers: packages/contentstack-import: specifiers: - '@contentstack/cli-audit': ~1.7.0 - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-audit': ~1.7.2 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 - '@contentstack/cli-variants': ~1.0.0 + '@contentstack/cli-variants': ~1.1.0 '@contentstack/management': ~1.17.0 '@oclif/core': ^3.26.5 '@oclif/test': ^2.5.6 @@ -824,7 +826,7 @@ importers: packages/contentstack-launch: specifiers: '@apollo/client': ^3.7.9 - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@oclif/core': ^3.26.5 '@oclif/plugin-help': ^5 @@ -900,7 +902,7 @@ importers: packages/contentstack-migrate-rte: specifiers: - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@contentstack/json-rte-serializer': ~2.0.4 '@oclif/test': ^2.5.6 @@ -947,7 +949,7 @@ importers: packages/contentstack-migration: specifiers: - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@oclif/test': ^2.5.6 async: ^3.2.4 @@ -995,7 +997,7 @@ importers: packages/contentstack-seed: specifiers: '@contentstack/cli-cm-import': ~1.19.0 - '@contentstack/cli-command': ~1.3.0 + '@contentstack/cli-command': ~1.3.2 '@contentstack/cli-utilities': ~1.8.0 '@oclif/plugin-help': ^5.1.19 '@types/inquirer': ^9.0.3 From 6b0318e5fa2ac969979cbacc242d747a365f96b8 Mon Sep 17 00:00:00 2001 From: Aman Kumar Date: Fri, 4 Oct 2024 11:03:49 +0530 Subject: [PATCH 11/11] fix: sre issue --- packages/contentstack-variants/src/utils/logger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contentstack-variants/src/utils/logger.ts b/packages/contentstack-variants/src/utils/logger.ts index 2a21b13163..ed71d80961 100644 --- a/packages/contentstack-variants/src/utils/logger.ts +++ b/packages/contentstack-variants/src/utils/logger.ts @@ -53,7 +53,7 @@ let errorTransport; function init(_logPath: string, module: string) { if (!logger || !errorLogger) { - const logsDir = path.resolve(sanitizePath(_logPath), 'logs', module); + const logsDir = path.resolve(sanitizePath(_logPath), 'logs', sanitizePath(module)); // Create dir if doesn't already exist mkdirp.sync(logsDir);