Skip to content

Commit

Permalink
Merge pull request #1642 from contentstack/staging
Browse files Browse the repository at this point in the history
DX | 28-10-2024 | Release
  • Loading branch information
cs-raj authored Nov 8, 2024
2 parents f932a1f + 68e9e1a commit 7432dfc
Show file tree
Hide file tree
Showing 18 changed files with 2,694 additions and 1,656 deletions.
3,013 changes: 1,996 additions & 1,017 deletions package-lock.json

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions packages/contentstack-audit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@
"@contentstack/cli-command": "~1.3.2",
"@contentstack/cli-utilities": "~1.8.0",
"@oclif/plugin-help": "^5",
"@oclif/plugin-plugins": "^5.0.0",
"@oclif/plugin-plugins": "^5.4.15",
"chalk": "^4.1.2",
"fast-csv": "^4.3.6",
"fs-extra": "^11.1.1",
"fs-extra": "^11.2.0",
"lodash": "^4.17.21",
"uuid": "^9.0.1",
"winston": "^3.10.0"
"winston": "^3.15.0"
},
"devDependencies": {
"@contentstack/cli-dev-dependencies": "^1.2.4",
"@oclif/test": "^2.5.6",
"@types/chai": "^4.3.5",
"@types/fs-extra": "^11.0.2",
"@types/mocha": "^10.0.6",
"@types/node": "^20.3.1",
"@types/uuid": "^9.0.4",
"chai": "^4.3.7",
"eslint": "^8.43.0",
"@types/chai": "^4.3.20",
"@types/fs-extra": "^11.0.4",
"@types/mocha": "^10.0.9",
"@types/node": "^20.16.14",
"@types/uuid": "^9.0.8",
"chai": "^4.5.0",
"eslint": "^8.57.1",
"eslint-config-oclif": "^4.0.0",
"eslint-config-oclif-typescript": "^3.0.8",
"mocha": "^10.2.0",
"eslint-config-oclif-typescript": "^3.1.12",
"mocha": "^10.7.3",
"nyc": "^15.1.0",
"oclif": "^3",
"shx": "^0.3.4",
"sinon": "^19.0.0",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"tslib": "^2.5.3",
"typescript": "^5.1.3"
"sinon": "^19.0.2",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"tslib": "^2.8.0",
"typescript": "^5.6.3"
},
"oclif": {
"bin": "csdx",
Expand Down
38 changes: 19 additions & 19 deletions packages/contentstack-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@
"dependencies": {
"@contentstack/cli-command": "~1.3.2",
"@contentstack/cli-utilities": "~1.8.0",
"chalk": "^4.0.0",
"chalk": "^4.1.2",
"debug": "^4.1.1",
"inquirer": "8.2.4",
"winston": "^3.7.2"
"inquirer": "8.2.6",
"winston": "^3.15.0"
},
"devDependencies": {
"@fancy-test/nock": "^0.1.1",
"@oclif/plugin-help": "^5.1.19",
"@oclif/plugin-help": "^5.2.20",
"@oclif/test": "^2.5.6",
"@types/chai": "^4.2.18",
"@types/inquirer": "^9.0.3",
"@types/mkdirp": "^1.0.1",
"@types/mocha": "^8.2.2",
"@types/node": "^14.14.32",
"@types/sinon": "^10.0.2",
"chai": "^4.3.4",
"dotenv": "^16.0.3",
"eslint": "^8.18.0",
"@types/chai": "^4.3.20",
"@types/inquirer": "^9.0.7",
"@types/mkdirp": "^1.0.2",
"@types/mocha": "^8.2.3",
"@types/node": "^14.18.63",
"@types/sinon": "^10.0.20",
"chai": "^4.5.0",
"dotenv": "^16.4.5",
"eslint": "^8.57.1",
"eslint-config-oclif": "^4.0.0",
"eslint-config-oclif-typescript": "^3.0.8",
"eslint-config-oclif-typescript": "^3.1.12",
"globby": "^10.0.2",
"mocha": "10.1.0",
"mocha": "10.7.3",
"nyc": "^15.1.0",
"oclif": "^3.8.1",
"oclif": "^3.17.2",
"rimraf": "^2.7.1",
"sinon": "^19.0.0",
"sinon": "^19.0.2",
"tmp": "^0.2.2",
"ts-node": "^10.9.1",
"typescript": "^4.9.3"
"ts-node": "^10.9.2",
"typescript": "^4.9.5"
},
"engines": {
"node": ">=14.0.0"
Expand Down
24 changes: 12 additions & 12 deletions packages/contentstack-bootstrap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@
"@contentstack/cli-cm-seed": "~1.10.0",
"@contentstack/cli-command": "~1.3.2",
"@contentstack/cli-utilities": "~1.8.0",
"inquirer": "8.2.4",
"inquirer": "8.2.6",
"mkdirp": "^1.0.4",
"tar": "^6.2.1 "
},
"devDependencies": {
"@oclif/test": "^2.5.6",
"@types/inquirer": "^9.0.3",
"@types/mkdirp": "^1.0.1",
"@types/node": "^14.14.32",
"@types/tar": "^6.1.3",
"chai": "^4.3.4",
"eslint": "^8.18.0",
"@types/inquirer": "^9.0.7",
"@types/mkdirp": "^1.0.2",
"@types/node": "^14.18.63",
"@types/tar": "^6.1.13",
"chai": "^4.5.0",
"eslint": "^8.57.1",
"eslint-config-oclif": "^4.0.0",
"eslint-config-oclif-typescript": "^3.0.8",
"eslint-config-oclif-typescript": "^3.1.12",
"globby": "^10.0.2",
"mocha": "10.1.0",
"mocha": "10.7.3",
"nyc": "^15.1.0",
"oclif": "^3.8.1",
"oclif": "^3.17.2",
"rimraf": "^2.7.1",
"tmp": "^0.2.2",
"tmp": "^0.2.3",
"ts-node": "^8.10.2",
"typescript": "^4.9.3"
"typescript": "^4.9.5"
},
"engines": {
"node": ">=14.0.0"
Expand Down
30 changes: 15 additions & 15 deletions packages/contentstack-branches/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,42 @@
"@contentstack/cli-command": "~1.3.2",
"@contentstack/cli-utilities": "~1.8.0",
"@oclif/core": "^3.26.5",
"async": "^3.2.4",
"async": "^3.2.6",
"big-json": "^3.2.0",
"bluebird": "^3.7.2",
"chalk": "^4.1.2",
"is-valid-path": "^0.1.1",
"just-diff": "^6.0.2",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"merge": "^2.1.1",
"mkdirp": "^1.0.4",
"path": "^0.12.7",
"progress-stream": "^2.0.0",
"promise-limit": "^2.7.0",
"proxyquire": "^2.1.3",
"tslib": "^2.4.1",
"winston": "^3.7.2"
"tslib": "^2.8.0",
"winston": "^3.15.0"
},
"devDependencies": {
"@contentstack/cli-auth": "~1.3.22",
"@contentstack/cli-config": "~1.8.0",
"@contentstack/cli-dev-dependencies": "~1.2.4",
"@oclif/plugin-help": "^5.1.19",
"@oclif/plugin-help": "^5.2.20",
"@oclif/test": "^2.5.6",
"@types/flat": "^5.0.2",
"assert": "^2.0.0",
"chai": "^4.2.0",
"dotenv": "^16.0.1",
"@types/flat": "^5.0.5",
"assert": "^2.1.0",
"chai": "^4.5.0",
"dotenv": "^16.4.5",
"dotenv-expand": "^9.0.0",
"eslint": "^8.18.0",
"eslint": "^8.57.1",
"eslint-config-oclif": "^4.0.0",
"globby": "^10.0.2",
"mocha": "10.1.0",
"mocha": "10.7.3",
"nyc": "^15.1.0",
"oclif": "^3.1.2",
"sinon": "^19.0.0",
"ts-node": "^10.9.1",
"typescript": "^4.9.3"
"oclif": "^3.17.2",
"sinon": "^19.0.2",
"ts-node": "^10.9.2",
"typescript": "^4.9.5"
},
"scripts": {
"build": "npm run clean && npm run compile",
Expand Down
2 changes: 1 addition & 1 deletion packages/contentstack-bulk-publish/README.md
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.5.0 darwin-arm64 node-v22.2.0
@contentstack/cli-cm-bulk-publish/1.6.0 darwin-arm64 node-v22.2.0
$ csdx --help [COMMAND]
USAGE
$ csdx COMMAND
Expand Down
22 changes: 11 additions & 11 deletions packages/contentstack-bulk-publish/package.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{
"name": "@contentstack/cli-cm-bulk-publish",
"description": "Contentstack CLI plugin for bulk publish actions",
"version": "1.5.0",
"version": "1.6.0",
"author": "Contentstack",
"bugs": "https://github.com/contentstack/cli/issues",
"dependencies": {
"@contentstack/cli-command": "~1.3.2",
"@contentstack/cli-utilities": "~1.8.0",
"bluebird": "^3.7.2",
"chalk": "^4.1.2",
"dotenv": "^16.1.4",
"inquirer": "8.2.4",
"lodash": "^4.17.15",
"dotenv": "^16.4.5",
"inquirer": "8.2.6",
"lodash": "^4.17.21",
"mkdirp": "^1.0.4",
"nock": "^13.0.2",
"winston": "^3.7.2"
"nock": "^13.5.5",
"winston": "^3.15.0"
},
"devDependencies": {
"@oclif/test": "^2.5.6",
"chai": "^4.2.0",
"eslint": "^8.18.0",
"chai": "^4.5.0",
"eslint": "^8.57.1",
"eslint-config-oclif": "^4.0.0",
"globby": "^10.0.2",
"mocha": "^10.0.0",
"mocha": "^10.7.3",
"nyc": "^15.1.0",
"oclif": "^3.8.1",
"tslib": "^1.13.0"
"oclif": "^3.17.2",
"tslib": "^1.14.1"
},
"engines": {
"node": ">=14.0.0"
Expand Down
14 changes: 9 additions & 5 deletions packages/contentstack-bulk-publish/src/producer/add-fields.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const { performBulkPublish, publishEntry, initializeLogger } = require('../consu
const retryFailedLogs = require('../util/retryfailed');
const { validateFile } = require('../util/fs');
const { isEmpty } = require('../util');
const { fetchBulkPublishLimit } = require('../util/common-utility');

const queue = getQueue();
queue.consumer = performBulkPublish;
Expand Down Expand Up @@ -200,6 +201,7 @@ async function getEntries(
environments,
forceUpdate,
apiVersion,
bulkPublishLimit,
skip = 0,
) {
let queryParams = {
Expand All @@ -223,15 +225,15 @@ async function getEntries(
const flag = await updateEntry(updatedEntry, locale);
if (flag) {
if (bulkPublish) {
if (bulkPublishSet.length < 10) {
if (bulkPublishSet.length < bulkPublishLimit) {
bulkPublishSet.push({
uid: entries[index].uid,
content_type: contentType,
locale,
publish_details: entries[index].publish_details,
});
}
if (bulkPublishSet.length === 10) {
if (bulkPublishSet.length === bulkPublishLimit) {
await queue.Enqueue({
entries: bulkPublishSet,
locale,
Expand Down Expand Up @@ -260,7 +262,7 @@ async function getEntries(
console.log(`No change Observed for contentType ${contentType} with entry ${entries[index].uid}`);
}

if (index === entriesResponse.items.length - 1 && bulkPublishSet.length > 0 && bulkPublishSet.length < 10) {
if (index === entriesResponse.items.length - 1 && bulkPublishSet.length > 0 && bulkPublishSet.length < bulkPublishLimit) {
await queue.Enqueue({
entries: bulkPublishSet,
locale,
Expand All @@ -277,7 +279,7 @@ async function getEntries(
}
return setTimeout(
async () =>
getEntries(stack, config, schema, contentType, locale, bulkPublish, environments, forceUpdate, apiVersion, skip),
getEntries(stack, config, schema, contentType, locale, bulkPublish, environments, forceUpdate, apiVersion, bulkPublishLimit, skip),
2000,
);
})
Expand Down Expand Up @@ -321,6 +323,7 @@ async function start(
}
} else {
setConfig(config, bulkPublish);
const bulkPublishLimit = fetchBulkPublishLimit(stack?.org_uid);
for (let i = 0; i < contentTypes.length; i += 1) {
getContentTypeSchema(stack, contentTypes[i])
.then(async (schema) => {
Expand All @@ -335,7 +338,8 @@ async function start(
bulkPublish,
environments,
forceUpdate,
apiVersion
apiVersion,
bulkPublishLimit
);
} catch (err) {
console.log(`Failed to get Entries with contentType ${contentTypes[i]} and locale ${locales[j]}`);
Expand Down
Loading

0 comments on commit 7432dfc

Please sign in to comment.