Skip to content

Commit 8223fe6

Browse files
harshithad0703harshithad0703
authored
Merge pull request #1913 from contentstack/development
DX | 12-05-2025
2 parents 67b4cd0 + e2935ea commit 8223fe6

File tree

13 files changed

+27
-20
lines changed

13 files changed

+27
-20
lines changed

‎packages/contentstack-audit/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
1919
$ csdx COMMAND
2020
running command...
2121
$ csdx (--version|-v)
22-
@contentstack/cli-audit/1.12.1 darwin-arm64 node-v22.14.0
22+
@contentstack/cli-audit/1.12.0 darwin-arm64 node-v23.11.0
2323
$ csdx --help [COMMAND]
2424
USAGE
2525
$ csdx COMMAND

‎packages/contentstack-auth/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21-
@contentstack/cli-auth/1.4.0 darwin-arm64 node-v22.14.0
21+
@contentstack/cli-auth/1.4.0 darwin-arm64 node-v23.11.0
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND

‎packages/contentstack-bootstrap/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
1515
$ csdx COMMAND
1616
running command...
1717
$ csdx (--version)
18-
@contentstack/cli-cm-bootstrap/1.14.0 darwin-arm64 node-v22.14.0
18+
@contentstack/cli-cm-bootstrap/1.14.0 darwin-arm64 node-v23.11.0
1919
$ csdx --help [COMMAND]
2020
USAGE
2121
$ csdx COMMAND

‎packages/contentstack-branches/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
3737
$ csdx COMMAND
3838
running command...
3939
$ csdx (--version)
40-
@contentstack/cli-cm-branches/1.4.1 darwin-arm64 node-v22.14.0
40+
@contentstack/cli-cm-branches/1.4.1 darwin-arm64 node-v23.11.0
4141
$ csdx --help [COMMAND]
4242
USAGE
4343
$ csdx COMMAND

‎packages/contentstack-branches/src/utils/index.ts‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
import fs from 'fs';
55
import path from 'path';
6-
import forEach from 'lodash/forEach'
6+
import forEach from 'lodash/forEach';
77
import { configHandler, cliux, messageHandler, sanitizePath } from '@contentstack/cli-utilities';
88
import { MergeParams } from '../interfaces';
99

@@ -73,7 +73,7 @@ export async function getMergeQueueStatus(stackAPIClient, payload): Promise<any>
7373
.mergeQueue(mergeJobUID)
7474
.fetch()
7575
.then((data) => data)
76-
.catch((err) => handleErrorMsg(err));
76+
.catch((err) => handleErrorMsg(err, () => getMergeQueueStatus(stackAPIClient, payload)));
7777
}
7878

7979
export async function executeMergeRequest(stackAPIClient, payload): Promise<any> {
@@ -95,10 +95,18 @@ export async function executeMergeRequest(stackAPIClient, payload): Promise<any>
9595
.branch()
9696
.merge(itemMergeStrategies, queryParams)
9797
.then((data) => data)
98-
.catch((err) => handleErrorMsg(err));
98+
.catch((err) => handleErrorMsg(err, () => executeMergeRequest(stackAPIClient, payload)));
9999
}
100100

101-
export function handleErrorMsg(err) {
101+
export async function handleErrorMsg(err, retryCallback?: () => Promise<any>) {
102+
// Handle rate limit exceeded (status code 429)
103+
if (err?.status === 429 || err?.response?.status === 429) {
104+
await new Promise((resolve) => setTimeout(resolve, 1000)); // 1 sec delay
105+
if (retryCallback) {
106+
return retryCallback(); // Retry the request
107+
}
108+
}
109+
102110
if (err?.errorMessage) {
103111
cliux.print(`Error: ${err.errorMessage}`, { color: 'red' });
104112
} else if (err?.message) {
@@ -116,15 +124,15 @@ export function validateCompareData(branchCompareData) {
116124
forEach(branchCompareData.content_types, (value, key) => {
117125
if (value?.length > 0) {
118126
validCompareData = true;
119-
}
127+
}
120128
});
121129
}
122130

123131
if (branchCompareData.global_fields) {
124132
forEach(branchCompareData.global_fields, (value, key) => {
125133
if (value?.length > 0) {
126134
validCompareData = true;
127-
}
135+
}
128136
});
129137
}
130138

‎packages/contentstack-bulk-publish/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21-
@contentstack/cli-cm-bulk-publish/1.8.0 darwin-arm64 node-v22.14.0
21+
@contentstack/cli-cm-bulk-publish/1.8.0 darwin-arm64 node-v23.11.0
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND

‎packages/contentstack-clone/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
1616
$ csdx COMMAND
1717
running command...
1818
$ csdx (--version)
19-
@contentstack/cli-cm-clone/1.14.0 darwin-arm64 node-v22.14.0
19+
@contentstack/cli-cm-clone/1.14.0 darwin-arm64 node-v23.11.0
2020
$ csdx --help [COMMAND]
2121
USAGE
2222
$ csdx COMMAND

‎packages/contentstack-config/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21-
@contentstack/cli-config/1.12.0 darwin-arm64 node-v22.14.0
21+
@contentstack/cli-config/1.11.1 darwin-arm64 node-v23.11.0
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND

‎packages/contentstack-import-setup/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup
4747
$ csdx COMMAND
4848
running command...
4949
$ csdx (--version)
50-
@contentstack/cli-cm-import-setup/1.2.0 darwin-arm64 node-v22.14.0
50+
@contentstack/cli-cm-import-setup/1.2.0 darwin-arm64 node-v23.11.0
5151
$ csdx --help [COMMAND]
5252
USAGE
5353
$ csdx COMMAND

‎packages/contentstack-import/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
4747
$ csdx COMMAND
4848
running command...
4949
$ csdx (--version)
50-
@contentstack/cli-cm-import/1.21.3 darwin-arm64 node-v22.14.0
50+
@contentstack/cli-cm-import/1.21.1 darwin-arm64 node-v23.11.0
5151
$ csdx --help [COMMAND]
5252
USAGE
5353
$ csdx COMMAND

0 commit comments

Comments
 (0)