Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .talismanrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
fileignoreconfig:
- filename: pnpm-lock.yaml
checksum: 2845e79bd5176da75694132383ef026ab8f1a7dc31a1e0472c3950f7d2df0a2b
- filename: package-lock.json
checksum: a227bddb54a87ad21f9d1400fb4f9f2b98a87153d8263200dd3ce3de9b29b9d9
- filename: packages/contentstack-audit/src/modules/entries.ts
checksum: 8ad10d72522433bc5ce66079248aa2dabae1758ee63335024efd8526d76dd885
- filename: packages/contentstack-config/src/utils/region-handler.ts
checksum: 7fb77272b01e48e0cde7a0b25d18a6a237bd59a8e2156aed8a8de5acd27f2465
checksum: 45100667793fc7dfaae3e24787871257e7f29e06df69ba10ec05b358d59ff15d
- filename: pnpm-lock.yaml
checksum: 87d001c32b1d7f9df30a289c277e0ea13cfd8a0e2e5fa5118956ff4183683e5c
version: '1.0'
1,319 changes: 684 additions & 635 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/contentstack-audit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"dependencies": {
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@oclif/core": "^4.3.0",
"@oclif/plugin-help": "^6.2.28",
"chalk": "^4.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-auth/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli-auth",
"description": "Contentstack CLI plugin for authentication activities",
"version": "2.0.0-beta.5",
"version": "2.0.0-beta.6",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"scripts": {
Expand All @@ -23,7 +23,7 @@
},
"dependencies": {
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@oclif/core": "^4.3.0",
"@oclif/plugin-help": "^6.2.28",
"otplib": "^12.0.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack-bootstrap/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli-cm-bootstrap",
"description": "Bootstrap contentstack apps",
"version": "2.0.0-beta.9",
"version": "2.0.0-beta.10",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"scripts": {
Expand All @@ -16,9 +16,9 @@
"test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
},
"dependencies": {
"@contentstack/cli-cm-seed": "~2.0.0-beta.8",
"@contentstack/cli-cm-seed": "~2.0.0-beta.9",
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@contentstack/cli-config": "~2.0.0-beta.2",
"@oclif/core": "^4.3.0",
"@oclif/plugin-help": "^6.2.37",
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-branches/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@contentstack/cli-cm-branches",
"description": "Contentstack CLI plugin to do branches operations",
"version": "2.0.0-beta",
"version": "2.0.0-beta.1",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~2.0.0-beta",
"@oclif/core": "^4.3.0",
"@oclif/plugin-help": "^6.2.28",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"chalk": "^4.1.2",
"just-diff": "^6.0.2",
"lodash": "^4.17.23"
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack-clone/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@contentstack/cli-cm-clone",
"description": "Contentstack stack clone plugin",
"version": "2.0.0-beta.10",
"version": "2.0.0-beta.11",
"author": "Contentstack",
"bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
"dependencies": {
"@colors/colors": "^1.6.0",
"@contentstack/cli-cm-export": "~2.0.0-beta.9",
"@contentstack/cli-cm-export": "~2.0.0-beta.10",
"@contentstack/cli-cm-import": "~2.0.0-beta.9",
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@oclif/core": "^4.3.0",
"@oclif/plugin-help": "^6.2.28",
"chalk": "^4.1.2",
Expand Down
11 changes: 9 additions & 2 deletions packages/contentstack-clone/src/commands/cm/stacks/clone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ Use this plugin to automate the process of cloning a stack in few steps.
async run(): Promise<void> {
try {
const self = this;
configHandler.set('log.progressSupportedModule', 'clone');
const { flags: cloneCommandFlags } = await self.parse(StackCloneCommand);
const {
yes,
Expand Down Expand Up @@ -227,7 +228,10 @@ Use this plugin to automate the process of cloning a stack in few steps.
config.source_stack = listOfTokens[sourceManagementTokenAlias].apiKey;
log.debug(`Using source token alias: ${sourceManagementTokenAlias}`, cloneContext);
} else if (sourceManagementTokenAlias) {
log.warn(`Provided source token alias (${sourceManagementTokenAlias}) not found in your config.!`, cloneContext);
log.warn(
`Provided source token alias (${sourceManagementTokenAlias}) not found in your config.!`,
cloneContext,
);
}
if (destinationManagementTokenAlias && listOfTokens?.[destinationManagementTokenAlias]) {
config.destination_alias = destinationManagementTokenAlias;
Expand Down Expand Up @@ -284,7 +288,10 @@ Use this plugin to automate the process of cloning a stack in few steps.
} catch (error: any) {
if (error) {
await this.cleanUp(pathdir, null, this.createCloneContext('unknown'));
log.error('Stack clone command failed', { ...this.createCloneContext('unknown'), error: error?.message || error });
log.error('Stack clone command failed', {
...this.createCloneContext('unknown'),
error: error?.message || error,
});
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-command/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@contentstack/cli-command",
"description": "Contentstack CLI plugin for configuration",
"version": "2.0.0-beta",
"version": "2.0.0-beta.1",
"author": "Contentstack",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -19,7 +19,7 @@
"test:unit": "mocha --timeout 10000 --forbid-only \"test/unit/**/*.test.ts\""
},
"dependencies": {
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"contentstack": "^3.25.3",
"@oclif/core": "^4.3.0",
"@oclif/plugin-help": "^6.2.28"
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@contentstack/utils": "~1.7.0",
"@oclif/core": "^4.8.1",
"@oclif/plugin-help": "^6.2.28",
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack-export-to-csv/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@contentstack/cli-cm-export-to-csv",
"description": "Export entries, taxonomies, terms, or organization users to CSV",
"version": "2.0.0-beta",
"version": "2.0.0-beta.1",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@oclif/core": "^4.8.0",
"@oclif/plugin-help": "^6.2.32",
"fast-csv": "^4.3.6",
Expand Down Expand Up @@ -75,4 +75,4 @@
"test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"",
"version": "oclif readme && git add README.md"
}
}
}
8 changes: 4 additions & 4 deletions packages/contentstack-export/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@contentstack/cli-cm-export",
"description": "Contentstack CLI plugin to export content from stack",
"version": "2.0.0-beta.9",
"version": "2.0.0-beta.10",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-variants": "~2.0.0-beta.6",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@contentstack/cli-variants": "~2.0.0-beta.7",
"@oclif/core": "^4.8.0",
"async": "^3.2.6",
"big-json": "^3.2.0",
Expand All @@ -21,7 +21,7 @@
"winston": "^3.17.0"
},
"devDependencies": {
"@contentstack/cli-auth": "~2.0.0-beta.5",
"@contentstack/cli-auth": "~2.0.0-beta.6",
"@contentstack/cli-config": "~2.0.0-beta.2",
"@contentstack/cli-dev-dependencies": "~1.3.1",
"@oclif/plugin-help": "^6.2.28",
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-import-setup/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@contentstack/cli-cm-import-setup",
"description": "Contentstack CLI plugin to setup the mappers and configurations for the import command",
"version": "2.0.0-beta.4",
"version": "2.0.0-beta.5",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@oclif/core": "^4.3.0",
"big-json": "^3.2.0",
"chalk": "^4.1.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack-import/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@contentstack/cli-cm-import",
"description": "Contentstack CLI plugin to import content into stack",
"version": "2.0.0-beta.9",
"version": "2.0.0-beta.10",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-audit": "~2.0.0-beta.5",
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-variants": "~2.0.0-beta.6",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@contentstack/cli-variants": "~2.0.0-beta.7",
"@oclif/core": "^4.3.0",
"big-json": "^3.2.0",
"bluebird": "^3.7.2",
Expand Down
10 changes: 9 additions & 1 deletion packages/contentstack-import/src/import/module-importer.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resolve } from 'path';
import { AuditFix } from '@contentstack/cli-audit';
import messages, { $t } from '@contentstack/cli-audit/lib/messages';
import { addLocale, cliux, ContentstackClient, log } from '@contentstack/cli-utilities';
import { addLocale, cliux, ContentstackClient, log, CLIProgressManager } from '@contentstack/cli-utilities';

import startModuleImport from './modules';
import { ImportConfig, Modules } from '../types';
Expand Down Expand Up @@ -59,6 +59,14 @@ class ModuleImporter {
if (!(await this.auditImportData())) {
return { noSuccessMsg: true };
}
// Audit overwrote the global summary with 'AUDIT'. Re-initialize for IMPORT so the final
// summary shows "IMPORT completed successfully!" and only import module stats.
const branchName = this.importConfig.branchName || '';
CLIProgressManager.initializeGlobalSummary(
branchName ? `IMPORT-${branchName}` : 'IMPORT',
branchName,
'Importing content...',
);
}

if (!this.importConfig.master_locale) {
Expand Down
4 changes: 2 additions & 2 deletions packages/contentstack-migration/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@contentstack/cli-migration",
"version": "2.0.0-beta.5",
"version": "2.0.0-beta.6",
"author": "@contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"@oclif/core": "^4.3.0",
"@oclif/plugin-help": "^6.2.28",
"async": "^3.2.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/contentstack-seed/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@contentstack/cli-cm-seed",
"description": "create a Stack from existing content types, entries, assets, etc.",
"version": "2.0.0-beta.8",
"version": "2.0.0-beta.9",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-cm-import": "~2.0.0-beta.9",
"@contentstack/cli-cm-import": "~2.0.0-beta.10",
"@contentstack/cli-command": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta",
"@contentstack/cli-utilities": "~2.0.0-beta.1",
"inquirer": "8.2.7",
"mkdirp": "^1.0.4",
"tar": "^7.5.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-utilities/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentstack/cli-utilities",
"version": "2.0.0-beta",
"version": "2.0.0-beta.1",
"description": "Utilities for contentstack projects",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-utilities/src/constants/logging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ export const levelColors = {
debug: 'blue',
};

export const PROGRESS_SUPPORTED_MODULES = ['export', 'import', 'audit', 'import-setup'] as const;
export const PROGRESS_SUPPORTED_MODULES = ['export', 'import', 'audit', 'import-setup', 'clone'] as const;
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,20 @@ export default class CLIProgressManager {
}

/**
* Print the final summary for all modules using strategies
* Print the final summary for all modules using strategies.
* When showConsoleLogs is enabled, skip the Progress Manager summary block
* so output is pure timestamped log lines (per documentation).
*/
static printGlobalSummary(): void {
if (!CLIProgressManager.globalSummary) {
return;
}

const showConsoleLogs = configHandler.get('log')?.showConsoleLogs;
if (showConsoleLogs) {
return;
}

// Apply strategy-based corrections before printing
CLIProgressManager.applyStrategyCorrections();

Expand Down Expand Up @@ -591,6 +598,11 @@ export default class CLIProgressManager {
}

private printSummary(): void {
// In console logs mode, use only timestamped log lines (no Progress Manager blocks)
if (this.showConsoleLogs) {
return;
}

if (!this.enableNestedProgress) {
// Simple summary for single progress
this.log('\n' + chalk.bold(`${this.moduleName} Summary:`));
Expand Down
Loading
Loading