Skip to content

Commit aa39c28

Browse files
Merge branch 'v2-dev' into fix/dx-3878-oauth-session-expire
2 parents f9912fc + 5ee49d4 commit aa39c28

File tree

4 files changed

+406
-406
lines changed

4 files changed

+406
-406
lines changed

.talismanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fileignoreconfig:
22
- filename: pnpm-lock.yaml
3-
checksum: 9ee7fd63339f3a88cf24ced896ee36dbf2397ad5e173449699756f9ffc4db98f
3+
checksum: b8dc082b59f03873ab00adddd07df399fc74e90491f50ee96297467016fc9f20
44
version: '1.0'

packages/contentstack-utilities/src/progress-summary/cli-progress-manager.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ export default class CLIProgressManager {
103103
return;
104104
}
105105

106-
if (configHandler.get('log')?.showConsoleLogs) {
107-
return;
108-
}
109-
110106
// Apply strategy-based corrections before printing
111107
CLIProgressManager.applyStrategyCorrections();
112108

@@ -541,7 +537,11 @@ export default class CLIProgressManager {
541537
: getChalk().cyan(`${this.successCount}${this.failureCount}✗`);
542538

543539
const labelColor =
544-
totalProcessed >= this.total ? (this.failureCount === 0 ? getChalk().green : getChalk().yellow) : getChalk().cyan;
540+
totalProcessed >= this.total
541+
? this.failureCount === 0
542+
? getChalk().green
543+
: getChalk().yellow
544+
: getChalk().cyan;
545545

546546
const formattedName = this.formatModuleName(this.moduleName);
547547
const displayName = formattedName.length > 20 ? formattedName.substring(0, 17) + '...' : formattedName;
@@ -617,10 +617,10 @@ export default class CLIProgressManager {
617617
process.status === 'completed'
618618
? '✓'
619619
: process.status === 'failed'
620-
? '✗'
621-
: process.status === 'active'
622-
? '●'
623-
: '○';
620+
? '✗'
621+
: process.status === 'active'
622+
? '●'
623+
: '○';
624624

625625
this.log(
626626
` ${status} ${processName}: ${process.successCount}${process.failureCount}✗ (${process.current}/${process.total})`,

packages/contentstack/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli",
33
"description": "Command-line tool (CLI) to interact with Contentstack",
4-
"version": "2.0.0-beta.16",
4+
"version": "2.0.0-beta.18",
55
"author": "Contentstack",
66
"bin": {
77
"csdx": "./bin/run.js"
@@ -22,23 +22,23 @@
2222
"prepack": "pnpm compile && oclif manifest && oclif readme"
2323
},
2424
"dependencies": {
25-
"@contentstack/cli-audit": "~2.0.0-beta.7",
26-
"@contentstack/cli-cm-export": "~2.0.0-beta.12",
27-
"@contentstack/cli-cm-import": "~2.0.0-beta.12",
28-
"@contentstack/cli-auth": "~2.0.0-beta.8",
25+
"@contentstack/cli-audit": "~2.0.0-beta.8",
26+
"@contentstack/cli-cm-export": "~2.0.0-beta.13",
27+
"@contentstack/cli-cm-import": "~2.0.0-beta.13",
28+
"@contentstack/cli-auth": "~2.0.0-beta.9",
2929
"@contentstack/cli-bulk-operations": "^1.0.1",
30-
"@contentstack/cli-cm-bootstrap": "~2.0.0-beta.12",
31-
"@contentstack/cli-cm-branches": "~2.0.0-beta.3",
32-
"@contentstack/cli-cm-clone": "~2.0.0-beta.13",
33-
"@contentstack/cli-cm-export-to-csv": "~2.0.0-beta.3",
34-
"@contentstack/cli-cm-import-setup": "~2.0.0-beta.7",
35-
"@contentstack/cli-cm-seed": "~2.0.0-beta.11",
36-
"@contentstack/cli-command": "~2.0.0-beta.3",
37-
"@contentstack/cli-config": "~2.0.0-beta.4",
30+
"@contentstack/cli-cm-bootstrap": "~2.0.0-beta.13",
31+
"@contentstack/cli-cm-branches": "~2.0.0-beta.4",
32+
"@contentstack/cli-cm-clone": "~2.0.0-beta.14",
33+
"@contentstack/cli-cm-export-to-csv": "~2.0.0-beta.4",
34+
"@contentstack/cli-cm-import-setup": "~2.0.0-beta.8",
35+
"@contentstack/cli-cm-seed": "~2.0.0-beta.12",
36+
"@contentstack/cli-command": "~2.0.0-beta.4",
37+
"@contentstack/cli-config": "~2.0.0-beta.5",
3838
"@contentstack/cli-launch": "^1.9.6",
39-
"@contentstack/cli-migration": "~2.0.0-beta.8",
40-
"@contentstack/cli-utilities": "~2.0.0-beta.3",
41-
"@contentstack/cli-variants": "~2.0.0-beta.9",
39+
"@contentstack/cli-migration": "~2.0.0-beta.9",
40+
"@contentstack/cli-utilities": "~2.0.0-beta.4",
41+
"@contentstack/cli-variants": "~2.0.0-beta.10",
4242
"@contentstack/management": "~1.27.6",
4343
"@contentstack/utils": "~1.7.0",
4444
"@oclif/core": "^4.8.0",

0 commit comments

Comments
 (0)