Skip to content

Commit 2c1e345

Browse files
harshithad0703harshithad0703
authored
Merge pull request #1786 from contentstack/fix/merge-hotfix
Fix/merge hotfix
2 parents eacd253 + 93dc632 commit 2c1e345

File tree

11 files changed

+591
-776
lines changed

11 files changed

+591
-776
lines changed

‎package-lock.json‎

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

‎packages/contentstack-audit/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ EXAMPLES
269269
$ csdx plugins
270270
```
271271

272-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/index.ts)_
272+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/index.ts)_
273273

274274
## `csdx plugins:add PLUGIN`
275275

@@ -343,7 +343,7 @@ EXAMPLES
343343
$ csdx plugins:inspect myplugin
344344
```
345345

346-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/inspect.ts)_
346+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/inspect.ts)_
347347

348348
## `csdx plugins:install PLUGIN`
349349

@@ -392,7 +392,7 @@ EXAMPLES
392392
$ csdx plugins:install someuser/someplugin
393393
```
394394

395-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/install.ts)_
395+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/install.ts)_
396396

397397
## `csdx plugins:link PATH`
398398

@@ -423,7 +423,7 @@ EXAMPLES
423423
$ csdx plugins:link myplugin
424424
```
425425

426-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/link.ts)_
426+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/link.ts)_
427427

428428
## `csdx plugins:remove [PLUGIN]`
429429

@@ -464,7 +464,7 @@ FLAGS
464464
--reinstall Reinstall all plugins after uninstalling.
465465
```
466466

467-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/reset.ts)_
467+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/reset.ts)_
468468

469469
## `csdx plugins:uninstall [PLUGIN]`
470470

@@ -492,7 +492,7 @@ EXAMPLES
492492
$ csdx plugins:uninstall myplugin
493493
```
494494

495-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/uninstall.ts)_
495+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/uninstall.ts)_
496496

497497
## `csdx plugins:unlink [PLUGIN]`
498498

@@ -536,5 +536,5 @@ DESCRIPTION
536536
Update installed plugins.
537537
```
538538

539-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/update.ts)_
539+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/update.ts)_
540540
<!-- commandsstop -->

‎packages/contentstack-auth/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"@contentstack/cli-command": "~1.3.3",
26-
"@contentstack/cli-utilities": "~1.8.1"
26+
"@contentstack/cli-utilities": "~1.8.2"
2727
},
2828
"devDependencies": {
2929
"@fancy-test/nock": "^0.1.1",

‎packages/contentstack-export/example_config/auth_config.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
"moduleName": "content-types",
1111
"fetchConcurrency": 5,
1212
"writeConcurrency": 5,
13-
"securedAssets": false
14-
}
13+
"securedAssets": false,
14+
"maxContentLength": 100000000,
15+
"maxBodyLength": 100000000
16+
}

‎packages/contentstack-export/example_config/management_config.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
"fetchConcurrency": 5,
1111
"writeConcurrency": 5,
1212
"securedAssets": false,
13-
"createBackupDir": "./temp"
14-
}
13+
"createBackupDir": "./temp",
14+
"maxContentLength": 100000000,
15+
"maxBodyLength": 100000000
16+
}

‎packages/contentstack-import/example_config/auth_config.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
"securedAssets": false,
1515
"developerHubBaseUrl": "",
1616
"createBackupDir": "./temp",
17-
"cliLogsPath": "./tmp"
18-
}
17+
"cliLogsPath": "./tmp",
18+
"maxContentLength": 100000000,
19+
"maxBodyLength": 100000000
20+
}

‎packages/contentstack-import/example_config/management_config.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
"writeConcurrency": 5,
1313
"securedAssets": false,
1414
"developerHubBaseUrl": "",
15-
"cliLogsPath": "./tmp"
16-
}
15+
"cliLogsPath": "./tmp",
16+
"maxContentLength": 100000000,
17+
"maxBodyLength": 100000000
18+
}

‎packages/contentstack-utilities/src/contentstack-management-sdk.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class ManagementSDKInitiator {
1515
async createAPIClient(config): Promise<ContentstackClient> {
1616
const option: ContentstackConfig = {
1717
host: config.host,
18-
maxContentLength: 100000000,
19-
maxBodyLength: 1000000000,
18+
maxContentLength: config.maxContentLength || 100000000,
19+
maxBodyLength: config.maxBodyLength || 1000000000,
2020
maxRequests: 10,
2121
retryLimit: 3,
2222
timeout: 60000,

‎packages/contentstack/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version|-v)
21-
@contentstack/cli/1.35.2 darwin-arm64 node-v22.14.0
21+
@contentstack/cli/1.36.0 darwin-arm64 node-v22.14.0
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND
@@ -3897,7 +3897,7 @@ EXAMPLES
38973897
$ csdx plugins
38983898
```
38993899

3900-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/index.ts)_
3900+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/index.ts)_
39013901

39023902
## `csdx plugins:add PLUGIN`
39033903

@@ -3971,7 +3971,7 @@ EXAMPLES
39713971
$ csdx plugins:inspect myplugin
39723972
```
39733973

3974-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/inspect.ts)_
3974+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/inspect.ts)_
39753975

39763976
## `csdx plugins:install PLUGIN`
39773977

@@ -4020,7 +4020,7 @@ EXAMPLES
40204020
$ csdx plugins:install someuser/someplugin
40214021
```
40224022

4023-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/install.ts)_
4023+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/install.ts)_
40244024

40254025
## `csdx plugins:link PATH`
40264026

@@ -4051,7 +4051,7 @@ EXAMPLES
40514051
$ csdx plugins:link myplugin
40524052
```
40534053

4054-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/link.ts)_
4054+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/link.ts)_
40554055

40564056
## `csdx plugins:remove [PLUGIN]`
40574057

@@ -4092,7 +4092,7 @@ FLAGS
40924092
--reinstall Reinstall all plugins after uninstalling.
40934093
```
40944094

4095-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/reset.ts)_
4095+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/reset.ts)_
40964096

40974097
## `csdx plugins:uninstall [PLUGIN]`
40984098

@@ -4120,7 +4120,7 @@ EXAMPLES
41204120
$ csdx plugins:uninstall myplugin
41214121
```
41224122

4123-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/uninstall.ts)_
4123+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/uninstall.ts)_
41244124

41254125
## `csdx plugins:unlink [PLUGIN]`
41264126

@@ -4164,7 +4164,7 @@ DESCRIPTION
41644164
Update installed plugins.
41654165
```
41664166

4167-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.33/src/commands/plugins/update.ts)_
4167+
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.34/src/commands/plugins/update.ts)_
41684168

41694169
## `csdx tokens`
41704170

@@ -4232,7 +4232,7 @@ EXAMPLES
42324232
$ csdx tsgen -a "delivery token alias" -o "contentstack/generated.d.ts" --api-type graphql --namespace "GraphQL"
42334233
```
42344234

4235-
_See code: [contentstack-cli-tsgen](https://github.com/Contentstack-Solutions/contentstack-cli-tsgen/blob/v3.1.0/src/commands/tsgen.ts)_
4235+
_See code: [contentstack-cli-tsgen](https://github.com/Contentstack-Solutions/contentstack-cli-tsgen/blob/v3.3.0/src/commands/tsgen.ts)_
42364236

42374237
## `csdx whoami`
42384238

‎packages/contentstack/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli",
33
"description": "Command-line tool (CLI) to interact with Contentstack",
4-
"version": "1.35.2",
4+
"version": "1.36.0",
55
"author": "Contentstack",
66
"bin": {
77
"csdx": "./bin/run.js"

0 commit comments

Comments
 (0)