Skip to content

DX | 12-05-2025 #1913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harshithad0703 merged 9 commits into from
May 7, 2025
Merged

DX | 12-05-2025 #1913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ff7b50f
Handling rate limit exceeded error
sunil-lakshman Apr 16, 2025
e9fc482
Merge branch 'development' into feat/dx-2394
sunil-lakshman Apr 16, 2025
9a90e20
Added version
sunil-lakshman Apr 16, 2025
1273bad
Merge branch 'development' into feat/dx-2394
sunil-lakshman Apr 16, 2025
f6a3424
Merge branch 'development' into feat/dx-2394
sunil-lakshman Apr 30, 2025
ae60cfc
Merge branch 'development' into feat/dx-2394
sunil-lakshman May 6, 2025
473fcaf
Merge pull request #1870 from contentstack/feat/dx-2394
sunil-lakshman May 6, 2025
aede79f
Merge branch 'staging' into fix/staging1
harshithad0703 May 7, 2025
e2935ea
Merge pull request #1912 from contentstack/fix/staging1
cs-raj May 7, 2025
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
2 changes: 1 addition & 1 deletion packages/contentstack-audit/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
$ csdx COMMAND
running command...
$ csdx (--version|-v)
@contentstack/cli-audit/1.12.1 darwin-arm64 node-v22.14.0
@contentstack/cli-audit/1.12.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-auth/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-auth/1.4.0 darwin-arm64 node-v22.14.0
@contentstack/cli-auth/1.4.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-bootstrap/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-bootstrap/1.14.0 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-bootstrap/1.14.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-branches/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-branches/1.4.1 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-branches/1.4.1 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
20 changes: 14 additions & 6 deletions packages/contentstack-branches/src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import fs from 'fs';
import path from 'path';
import forEach from 'lodash/forEach'
import forEach from 'lodash/forEach';
import { configHandler, cliux, messageHandler, sanitizePath } from '@contentstack/cli-utilities';
import { MergeParams } from '../interfaces';

Expand Down Expand Up @@ -73,7 +73,7 @@ export async function getMergeQueueStatus(stackAPIClient, payload): Promise<any>
.mergeQueue(mergeJobUID)
.fetch()
.then((data) => data)
.catch((err) => handleErrorMsg(err));
.catch((err) => handleErrorMsg(err, () => getMergeQueueStatus(stackAPIClient, payload)));
}

export async function executeMergeRequest(stackAPIClient, payload): Promise<any> {
Expand All @@ -95,10 +95,18 @@ export async function executeMergeRequest(stackAPIClient, payload): Promise<any>
.branch()
.merge(itemMergeStrategies, queryParams)
.then((data) => data)
.catch((err) => handleErrorMsg(err));
.catch((err) => handleErrorMsg(err, () => executeMergeRequest(stackAPIClient, payload)));
}

export function handleErrorMsg(err) {
export async function handleErrorMsg(err, retryCallback?: () => Promise<any>) {
// Handle rate limit exceeded (status code 429)
if (err?.status === 429 || err?.response?.status === 429) {
await new Promise((resolve) => setTimeout(resolve, 1000)); // 1 sec delay
if (retryCallback) {
return retryCallback(); // Retry the request
}
}

if (err?.errorMessage) {
cliux.print(`Error: ${err.errorMessage}`, { color: 'red' });
} else if (err?.message) {
Expand All @@ -116,15 +124,15 @@ export function validateCompareData(branchCompareData) {
forEach(branchCompareData.content_types, (value, key) => {
if (value?.length > 0) {
validCompareData = true;
}
}
});
}

if (branchCompareData.global_fields) {
forEach(branchCompareData.global_fields, (value, key) => {
if (value?.length > 0) {
validCompareData = true;
}
}
});
}

Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-bulk-publish/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-bulk-publish/1.8.0 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-bulk-publish/1.8.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-clone/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-clone/1.14.0 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-clone/1.14.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-config/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-config/1.12.0 darwin-arm64 node-v22.14.0
@contentstack/cli-config/1.11.1 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import-setup/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-import-setup/1.2.0 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-import-setup/1.2.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-import/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-import/1.21.3 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-import/1.21.1 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-migrate-rte/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-migrate-rte
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-cm-migrate-rte/1.5.1 darwin-arm64 node-v22.14.0
@contentstack/cli-cm-migrate-rte/1.5.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-migration/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration
$ csdx COMMAND
running command...
$ csdx (--version)
@contentstack/cli-migration/1.7.1 darwin-arm64 node-v22.14.0
@contentstack/cli-migration/1.7.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
5 changes: 2 additions & 3 deletions packages/contentstack/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
$ csdx COMMAND
running command...
$ csdx (--version|-v)
@contentstack/cli/1.40.2 darwin-arm64 node-v22.14.0
@contentstack/cli/1.40.0 darwin-arm64 node-v23.11.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down Expand Up @@ -3776,8 +3776,7 @@ USAGE
$ csdx launch:functions [-p <value>] [-d <value>]

FLAGS
-d, --data-dir=<value> [default: /Users/aman.kumar/Documents/datasync-repo/cli/packages/contentstack] Current working
directory
-d, --data-dir=<value> [default: /Users/sunil.lakshman/Documents/cli/packages/contentstack] Current working directory
-p, --port=<value> [default: 3000] Port number

DESCRIPTION
Expand Down
Loading