diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json index d144a3093..b934b8bad 100644 --- a/packages/contentstack-audit/package.json +++ b/packages/contentstack-audit/package.json @@ -19,7 +19,7 @@ ], "dependencies": { "@contentstack/cli-command": "~1.8.1", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@oclif/core": "^4.10.5", "@oclif/plugin-help": "^6.2.28", "chalk": "^4.1.2", diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json index d4589a633..096bce30f 100644 --- a/packages/contentstack-bootstrap/package.json +++ b/packages/contentstack-bootstrap/package.json @@ -19,7 +19,7 @@ "@contentstack/cli-cm-seed": "~1.15.2", "@contentstack/cli-command": "~1.8.1", "@contentstack/cli-config": "~1.20.2", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@oclif/core": "^4.10.5", "@oclif/plugin-help": "^6.2.37", "inquirer": "8.2.7", diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json index 370df0986..185ab598d 100644 --- a/packages/contentstack-branches/package.json +++ b/packages/contentstack-branches/package.json @@ -8,7 +8,7 @@ "@contentstack/cli-command": "~1.8.1", "@oclif/core": "^4.10.5", "@oclif/plugin-help": "^6.2.28", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "chalk": "^4.1.2", "just-diff": "^6.0.2", "lodash": "^4.18.1" diff --git a/packages/contentstack-branches/src/commands/cm/branches/create.ts b/packages/contentstack-branches/src/commands/cm/branches/create.ts index 322d7a6bc..5394cd28c 100644 --- a/packages/contentstack-branches/src/commands/cm/branches/create.ts +++ b/packages/contentstack-branches/src/commands/cm/branches/create.ts @@ -1,5 +1,6 @@ import { Command } from '@contentstack/cli-command'; import { messageHandler, flags, isAuthenticated } from '@contentstack/cli-utilities'; +import path from 'path'; import { createBranch } from '../../../utils/create-branch'; import { interactive, handleErrorMsg } from '../../../utils'; @@ -27,6 +28,11 @@ export default class BranchCreateCommand extends Command { static aliases: string[] = []; // Note: alternative usage if any async run(): Promise { + if (messageHandler.isEmptyMessages()) { + messageHandler.init({ + messageFilePath: path.join(__dirname, '..', '..', '..', 'messages', 'index.json'), + }); + } const { flags: branchCreateFlags } = await this.parse(BranchCreateCommand); let apiKey = branchCreateFlags['stack-api-key']; let branch = { diff --git a/packages/contentstack-branches/src/commands/cm/branches/delete.ts b/packages/contentstack-branches/src/commands/cm/branches/delete.ts index 19eab092a..b2541a127 100644 --- a/packages/contentstack-branches/src/commands/cm/branches/delete.ts +++ b/packages/contentstack-branches/src/commands/cm/branches/delete.ts @@ -1,5 +1,6 @@ import { Command } from '@contentstack/cli-command'; import { messageHandler, flags, cliux, isAuthenticated } from '@contentstack/cli-utilities'; +import path from 'path'; import { deleteBranch } from '../../../utils/delete-branch'; import { interactive, handleErrorMsg } from '../../../utils'; @@ -30,6 +31,11 @@ export default class BranchDeleteCommand extends Command { static aliases: string[] = []; // Note: alternative usage if any async run(): Promise { + if (messageHandler.isEmptyMessages()) { + messageHandler.init({ + messageFilePath: path.join(__dirname, '..', '..', '..', 'messages', 'index.json'), + }); + } const { flags: branchDeleteFlags } = await this.parse(BranchDeleteCommand); let apiKey = branchDeleteFlags['stack-api-key']; if (!isAuthenticated()) { diff --git a/packages/contentstack-branches/src/commands/cm/branches/diff.ts b/packages/contentstack-branches/src/commands/cm/branches/diff.ts index 4502e6160..6da56e2dd 100644 --- a/packages/contentstack-branches/src/commands/cm/branches/diff.ts +++ b/packages/contentstack-branches/src/commands/cm/branches/diff.ts @@ -1,5 +1,6 @@ import { Command } from '@contentstack/cli-command'; import { messageHandler, flags, isAuthenticated } from '@contentstack/cli-utilities'; +import path from 'path'; import { BranchOptions } from '../../../interfaces/index'; import { BranchDiffHandler } from '../../../branch'; import { handleErrorMsg } from '../../../utils'; @@ -58,6 +59,11 @@ export default class BranchDiffCommand extends Command { async run(): Promise { try { + if (messageHandler.isEmptyMessages()) { + messageHandler.init({ + messageFilePath: path.join(__dirname, '..', '..', '..', 'messages', 'index.json'), + }); + } const { flags: branchDiffFlags } = await this.parse(BranchDiffCommand); let options: BranchOptions = { baseBranch: branchDiffFlags['base-branch'], diff --git a/packages/contentstack-branches/src/commands/cm/branches/index.ts b/packages/contentstack-branches/src/commands/cm/branches/index.ts index 1a399c698..3d325fed7 100644 --- a/packages/contentstack-branches/src/commands/cm/branches/index.ts +++ b/packages/contentstack-branches/src/commands/cm/branches/index.ts @@ -7,6 +7,7 @@ import { isAuthenticated, TableHeader, } from '@contentstack/cli-utilities'; +import path from 'path'; import { getbranchesList, getbranchConfig, interactive, handleErrorMsg } from '../../../utils/index'; import chalk from 'chalk'; export default class BranchListCommand extends Command { @@ -25,6 +26,11 @@ export default class BranchListCommand extends Command { async run(): Promise { try { + if (messageHandler.isEmptyMessages()) { + messageHandler.init({ + messageFilePath: path.join(__dirname, '..', '..', '..', 'messages', 'index.json'), + }); + } const managementAPIClient = await managementSDKClient({ host: this.cmaHost }); const { flags: branchListFlags } = await this.parse(BranchListCommand); let stackApiKey = branchListFlags['stack-api-key']; diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json index 705ac4d9b..f5d519806 100644 --- a/packages/contentstack-bulk-publish/package.json +++ b/packages/contentstack-bulk-publish/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-command": "~1.8.1", "@contentstack/cli-config": "~1.20.2", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@oclif/core": "^4.10.5", "@oclif/plugin-help": "^6.2.44", "chalk": "^4.1.2", diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json index 242924f8f..7397b5a85 100644 --- a/packages/contentstack-clone/package.json +++ b/packages/contentstack-clone/package.json @@ -9,7 +9,7 @@ "@contentstack/cli-cm-export": "~1.25.0", "@contentstack/cli-cm-import": "~1.33.0", "@contentstack/cli-command": "~1.8.1", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@oclif/core": "^4.10.5", "@oclif/plugin-help": "^6.2.28", "chalk": "^4.1.2", diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json index 4157fdacf..cdbe201f5 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.8.1", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@oclif/core": "^4.10.5", "@oclif/plugin-help": "^6.2.32", "fast-csv": "^4.3.6", diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json index 94e9024c2..d4fbc6b71 100644 --- a/packages/contentstack-export/package.json +++ b/packages/contentstack-export/package.json @@ -8,7 +8,7 @@ "@contentstack/cli-command": "~1.8.1", "@oclif/core": "^4.10.5", "@contentstack/cli-variants": "~1.4.2", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "async": "^3.2.6", "big-json": "^3.2.0", "bluebird": "^3.7.2", diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts index 4bd542e6d..154d28232 100644 --- a/packages/contentstack-export/src/commands/cm/stacks/export.ts +++ b/packages/contentstack-export/src/commands/cm/stacks/export.ts @@ -16,6 +16,8 @@ import { createLogContext, } from '@contentstack/cli-utilities'; +import path from 'path'; + import { ModuleExporter } from '../../../export'; import { ExportConfig } from '../../../types'; import { setupExportConfig, writeExportMetaFile } from '../../../utils'; @@ -117,6 +119,12 @@ export default class ExportCommand extends Command { static aliases: string[] = ['cm:export']; async run(): Promise { + if (messageHandler.isEmptyMessages()) { + messageHandler.init({ + messageFilePath: path.join(__dirname, '..', '..', '..', '..', 'messages', 'index.json'), + }); + } + let exportDir: string = pathValidator('logs'); try { const { flags } = await this.parse(ExportCommand); diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json index f9aee747e..d809ad8bc 100644 --- a/packages/contentstack-import-setup/package.json +++ b/packages/contentstack-import-setup/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/contentstack/cli/issues", "dependencies": { "@contentstack/cli-command": "~1.8.1", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@oclif/core": "^4.10.5", "big-json": "^3.2.0", "chalk": "^4.1.2", diff --git a/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts b/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts index 9f02c5819..6d1b1f88f 100644 --- a/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts +++ b/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts @@ -54,11 +54,11 @@ export default class ImportSetupCommand extends Command { description: "The name of the branch where you want to import your content. If you don't mention the branch name, then by default the content will be imported to the main branch.", parse: printFlagDeprecation(['-B'], ['--branch']), - exclusive: ['branch-alias'] + exclusive: ['branch-alias'], }), 'branch-alias': flags.string({ description: - "Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.", + 'Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.', exclusive: ['branch'], }), }; @@ -69,17 +69,22 @@ export default class ImportSetupCommand extends Command { async run(): Promise { try { + if (messageHandler.isEmptyMessages()) { + messageHandler.init({ + messageFilePath: path.join(__dirname, '..', '..', '..', '..', 'messages', 'index.json'), + }); + } const { flags } = await this.parse(ImportSetupCommand); let importSetupConfig = await setupImportConfig(flags); // Prepare the context object createLogContext( this.context?.info?.command || 'cm:stacks:import-setup', importSetupConfig.apiKey, - configHandler.get('authenticationMethod') + configHandler.get('authenticationMethod'), ); - + importSetupConfig.context = { module: '' }; - + // Note setting host to create cma client importSetupConfig.host = this.cmaHost; importSetupConfig.region = this.region; @@ -99,5 +104,4 @@ export default class ImportSetupCommand extends Command { handleAndLogError(error); } } - } diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json index 7d52187f6..3a29fd42d 100644 --- a/packages/contentstack-import/package.json +++ b/packages/contentstack-import/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-audit": "~1.19.2", "@contentstack/cli-command": "~1.8.1", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@contentstack/cli-variants": "~1.4.2", "@oclif/core": "^4.10.5", "big-json": "^3.2.0", diff --git a/packages/contentstack-import/src/commands/cm/stacks/import.ts b/packages/contentstack-import/src/commands/cm/stacks/import.ts index 74217cf45..315c06d52 100644 --- a/packages/contentstack-import/src/commands/cm/stacks/import.ts +++ b/packages/contentstack-import/src/commands/cm/stacks/import.ts @@ -14,6 +14,7 @@ import { createLogContext, } from '@contentstack/cli-utilities'; +import path from 'path'; import { Context, ImportConfig } from '../../../types'; import { ModuleImporter } from '../../../import'; import { setupImportConfig } from '../../../utils'; @@ -153,15 +154,20 @@ export default class ImportCommand extends Command { let backupDir: string; let importConfig: ImportConfig; try { + if (messageHandler.isEmptyMessages()) { + messageHandler.init({ + messageFilePath: path.join(__dirname, '..', '..', '..', '..', 'messages', 'index.json'), + }); + } const { flags } = await this.parse(ImportCommand); importConfig = await setupImportConfig(flags); // Prepare the context object createLogContext( - this.context?.info?.command || 'cm:stacks:export', + this.context?.info?.command || 'cm:stacks:import', importConfig.apiKey, - importConfig.authenticationMethod + importConfig.authenticationMethod, ); - + importConfig.context = { module: '' }; //log.info(`Using Cli Version: ${this.context?.cliVersion}`, importConfig.context); diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json index efc8d9688..1e7e4a29f 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.8.1", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@oclif/core": "^4.10.5", "@oclif/plugin-help": "^6.2.44", "async": "^3.2.6", diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json index 26401c0da..7c016e67c 100644 --- a/packages/contentstack-seed/package.json +++ b/packages/contentstack-seed/package.json @@ -7,7 +7,7 @@ "dependencies": { "@contentstack/cli-cm-import": "~1.33.0", "@contentstack/cli-command": "~1.8.1", - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "inquirer": "8.2.7", "mkdirp": "^1.0.4", "tar": "^7.5.11", diff --git a/packages/contentstack-variants/package.json b/packages/contentstack-variants/package.json index fe5cadb48..fb2356ad8 100644 --- a/packages/contentstack-variants/package.json +++ b/packages/contentstack-variants/package.json @@ -28,7 +28,7 @@ "typescript": "^5.8.3" }, "dependencies": { - "@contentstack/cli-utilities": "~1.18.2", + "@contentstack/cli-utilities": "~1.18.3", "@oclif/core": "^4.10.5", "@oclif/plugin-help": "^6.2.44", "lodash": "^4.18.1",