Skip to content

Commit 6504edf

Browse files
committed
Merge branch 'development' into fix/clone-bug
2 parents 54c3cbc + b3c158f commit 6504edf

File tree

6 files changed

+149
-18
lines changed

6 files changed

+149
-18
lines changed

.talismanrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
fileignoreconfig:
22
- filename: package-lock.json
3-
checksum: 353b5b39c9f8242902e6198b3f6c5981c813af16ce16ebbe845ebf369c1c1ff1
3+
checksum: acd0c006f11dc01dcf578cc783843c64b2e002a8f6b654a8b5513362303a3590
44
- filename: pnpm-lock.yaml
5-
checksum: 3e8de376815b1514490bcd0348e91178fa467467a3a33460300abd50edc633f9
5+
checksum: 006cd155027af9b70649f4e9295e7a158a960d7c87a74fad0710443fb3b814bc
66
- filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
77
checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
88
- filename: packages/contentstack-import-setup/test/config.json

package-lock.json

Lines changed: 110 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/contentstack-export-to-csv/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "@contentstack/cli-cm-export-to-csv",
33
"description": "Export entities to csv",
4-
"version": "1.9.1",
4+
"version": "1.9.2",
55
"author": "Abhinav Gupta @abhinav-from-contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {
88
"@contentstack/cli-command": "~1.6.1",
99
"@contentstack/cli-utilities": "~1.14.0",
1010
"@oclif/core": "^4.3.0",
11-
"@oclif/plugin-help": "^6.2.28",
11+
"@oclif/plugin-help": "^6.2.32",
1212
"fast-csv": "^4.3.6",
13-
"inquirer": "8.2.6",
13+
"inquirer": "8.2.7",
1414
"inquirer-checkbox-plus-prompt": "1.4.2",
1515
"mkdirp": "^3.0.1"
1616
},

packages/contentstack-export-to-csv/src/commands/cm/export-to-csv.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ const {
66
isAuthenticated,
77
cliux,
88
doesBranchExist,
9-
isManagementTokenValid
9+
isManagementTokenValid,
10+
log
1011
} = require('@contentstack/cli-utilities');
1112
const util = require('../../util');
1213
const config = require('../../util/config');
@@ -126,7 +127,7 @@ class ExportToCsvCommand extends Command {
126127
}
127128

128129
stackAPIClient = this.getStackClient(managementAPIClient, stack);
129-
await this.checkAndUpdateBranchDetail(branchUid, stack, stackAPIClient, managementAPIClient);
130+
stackAPIClient = await this.checkAndUpdateBranchDetail(branchUid, stack, stackAPIClient, managementAPIClient);
130131

131132
const contentTypeCount = await util.getContentTypeCount(stackAPIClient);
132133

@@ -321,6 +322,7 @@ class ExportToCsvCommand extends Command {
321322
stackAPIClient = this.getStackClient(managementAPIClient, stack);
322323
}
323324
}
325+
return stackAPIClient;
324326
}
325327

326328
/**

packages/contentstack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@contentstack/cli-cm-bulk-publish": "~1.9.1",
3030
"@contentstack/cli-cm-clone": "~1.16.0",
3131
"@contentstack/cli-cm-export": "~1.20.0",
32-
"@contentstack/cli-cm-export-to-csv": "~1.9.1",
32+
"@contentstack/cli-cm-export-to-csv": "~1.9.2",
3333
"@contentstack/cli-cm-import": "~1.27.0",
3434
"@contentstack/cli-cm-import-setup": "1.4.2",
3535
"@contentstack/cli-cm-migrate-rte": "~1.6.1",

pnpm-lock.yaml

Lines changed: 29 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)