Skip to content

Commit 3161b7b

Browse files
committed
Reverted generate script command
1 parent a973409 commit 3161b7b

15 files changed

Lines changed: 65 additions & 445 deletions

File tree

.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: fbef3fb41830dfd725b6b546eca9b9c22a215d74ef552f1913cb6bc36f1cff58
3+
checksum: 0ea77139dfdac4925816a325b3aa717d83e113cbee1279d5aa2b948f6779157e
44
version: '1.0'

packages/contentstack-audit/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222
"@contentstack/cli-utilities": "~1.18.0",
2323
"@oclif/core": "^4.3.0",
2424
"@oclif/plugin-help": "^6.2.28",
25-
"@oclif/plugin-plugins": "^5.4.54",
2625
"chalk": "^4.1.2",
2726
"fast-csv": "^4.3.6",
2827
"fs-extra": "^11.3.0",
29-
"lodash": "^4.17.23",
28+
"lodash": "^4.18.1",
3029
"uuid": "^9.0.1",
3130
"winston": "^3.17.0"
3231
},
@@ -53,8 +52,7 @@
5352
"bin": "csdx",
5453
"commands": "./lib/commands",
5554
"plugins": [
56-
"@oclif/plugin-help",
57-
"@oclif/plugin-plugins"
55+
"@oclif/plugin-help"
5856
],
5957
"topicSeparator": ":",
6058
"additionalHelpFlags": [

packages/contentstack-branches/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@contentstack/cli-utilities": "~1.18.0",
1212
"chalk": "^4.1.2",
1313
"just-diff": "^6.0.2",
14-
"lodash": "^4.17.23"
14+
"lodash": "^4.18.1"
1515
},
1616
"devDependencies": {
1717
"@contentstack/cli-dev-dependencies": "^1.3.1",
@@ -76,7 +76,6 @@
7676
"cm:branches:diff": "BRDIF",
7777
"cm:branches:merge": "BRMRG",
7878
"cm:branches:merge-status": "BRMST",
79-
"cm:branches:generate-scripts": "BRGNS",
8079
"cm:branches": "BRLS"
8180
}
8281
},

packages/contentstack-branches/src/branch/merge-handler.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,6 @@ export default class MergeHandler {
318318
cliux.print(` csdx cm:branches:merge-status -k ${this.stackAPIKey} --merge-uid ${mergeResponse.uid}`, {
319319
color: 'cyan',
320320
});
321-
cliux.print('\nGenerate entry migration scripts (when merge completes successfully):', { color: 'grey' });
322-
cliux.print(` csdx cm:branches:generate-scripts -k ${this.stackAPIKey} --merge-uid ${mergeResponse.uid}`, {
323-
color: 'cyan',
324-
});
325321
}
326322
} catch (error) {
327323
cliux.loaderV2('', spinner);

packages/contentstack-branches/src/commands/cm/branches/generate-scripts.ts

Lines changed: 0 additions & 150 deletions
This file was deleted.

packages/contentstack-branches/src/utils/merge-helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export const fetchMergeStatus = async (
172172
stackAPIClient,
173173
mergePayload,
174174
initialDelay = 5000,
175-
maxRetries = 10
175+
maxRetries = 10000, // Temporary making infinite polling to unblock the users
176176
): Promise<any> => {
177177
let delayMs = initialDelay;
178178
const maxDelayMs = 60000; // Cap delay at 60 seconds

packages/contentstack-branches/test/unit/commands/cm/branches/generate-scripts.test.ts

Lines changed: 0 additions & 55 deletions
This file was deleted.

packages/contentstack-bulk-publish/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"chalk": "^4.1.2",
1414
"dotenv": "^16.5.0",
1515
"inquirer": "8.2.7",
16-
"lodash": "^4.17.23",
16+
"lodash": "^4.18.1",
1717
"winston": "^3.17.0"
1818
},
1919
"devDependencies": {

packages/contentstack-clone/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@oclif/plugin-help": "^6.2.28",
1515
"chalk": "^4.1.2",
1616
"inquirer": "8.2.7",
17-
"lodash": "^4.17.23",
17+
"lodash": "^4.18.1",
1818
"merge": "^2.1.1",
1919
"ora": "^5.4.1",
2020
"prompt": "^1.3.0",

packages/contentstack-export/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"big-json": "^3.2.0",
1414
"bluebird": "^3.7.2",
1515
"chalk": "^4.1.2",
16-
"lodash": "^4.17.23",
16+
"lodash": "^4.18.1",
1717
"merge": "^2.1.1",
1818
"mkdirp": "^1.0.4",
1919
"progress-stream": "^2.0.0",

0 commit comments

Comments
 (0)