Skip to content

Commit 3fe416a

Browse files
authored
Merge pull request #58 from contentstack/feat/dx-5584
Updated branches merge revamp to handle poling timeouts
2 parents b206321 + 991d6c0 commit 3fe416a

38 files changed

Lines changed: 1235 additions & 1061 deletions

File tree

.talismanrc

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
fileignoreconfig:
22
- filename: pnpm-lock.yaml
3-
checksum: f0bc1ecd9132790009fd54318236bf3ded95d3c44132ab7b55fe37f3759cd3ea
4-
- filename: .cursor/skills/code-review/SKILL.md
5-
checksum: 29d812ac5c2ed4c55490f8d31e15eb592851601a6a141354cb458b1b9f1daa7a
6-
- filename: .cursor/rules/oclif-commands.mdc
7-
checksum: 8e269309cbfc9687e4a889c4a7983f145e77066d515dae53968d7553ae726b41
8-
- filename: .cursor/skills/code-review/references/code-review-checklist.md
9-
checksum: bdf7453f08d7209deaee411f47a1132ee872b28f0eb082563dfe20aa56eab057
10-
- filename: .cursor/commands/code-review.md
11-
checksum: a2737c43d58de842cf48c06b0471648a7c38b5fa8854d7c30f3d9258cd8b48f9
12-
- filename: .cursor/skills/testing/references/testing-patterns.md
13-
checksum: 0a6cb66f27eda46b40508517063a2f43fea1b4b8df878e7ddff404ab7fc126f8
14-
- filename: .cursor/skills/contentstack-cli/SKILL.md
15-
checksum: 45f0d0c81086eaee850311e0caae198cf6dd2a7bc73bd1340b320b15047c6dae
16-
- filename: .cursor/rules/contentstack-plugin.mdc
17-
checksum: 4d41211088c2302a533559bb1e7e80fe69e6980f23c9a2e90b8ea9d03ba3f040
18-
- filename: .cursor/skills/contentstack-cli/references/contentstack-patterns.md
19-
checksum: 9888d481b6a1ae8c7102d9efed0fdbae2b7592f582a62c8bff6deccf03fdf341
3+
checksum: b1fe20c6296f461af968fabb8ab0dbe7df896b99bb762d792ded09c12814d964
204
version: '1.0'

packages/contentstack-audit/README.md

Lines changed: 1 addition & 301 deletions
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.19.1 darwin-arm64 node-v22.13.1
22+
@contentstack/cli-audit/1.19.2 darwin-arm64 node-v24.14.0
2323
$ csdx --help [COMMAND]
2424
USAGE
2525
$ csdx COMMAND
@@ -35,16 +35,6 @@ USAGE
3535
* [`csdx cm:stacks:audit`](#csdx-cmstacksaudit)
3636
* [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix)
3737
* [`csdx help [COMMAND]`](#csdx-help-command)
38-
* [`csdx plugins`](#csdx-plugins)
39-
* [`csdx plugins:add PLUGIN`](#csdx-pluginsadd-plugin)
40-
* [`csdx plugins:inspect PLUGIN...`](#csdx-pluginsinspect-plugin)
41-
* [`csdx plugins:install PLUGIN`](#csdx-pluginsinstall-plugin)
42-
* [`csdx plugins:link PATH`](#csdx-pluginslink-path)
43-
* [`csdx plugins:remove [PLUGIN]`](#csdx-pluginsremove-plugin)
44-
* [`csdx plugins:reset`](#csdx-pluginsreset)
45-
* [`csdx plugins:uninstall [PLUGIN]`](#csdx-pluginsuninstall-plugin)
46-
* [`csdx plugins:unlink [PLUGIN]`](#csdx-pluginsunlink-plugin)
47-
* [`csdx plugins:update`](#csdx-pluginsupdate)
4838

4939
## `csdx audit`
5040

@@ -287,294 +277,4 @@ DESCRIPTION
287277
```
288278

289279
_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.37/src/commands/help.ts)_
290-
291-
## `csdx plugins`
292-
293-
List installed plugins.
294-
295-
```
296-
USAGE
297-
$ csdx plugins [--json] [--core]
298-
299-
FLAGS
300-
--core Show core plugins.
301-
302-
GLOBAL FLAGS
303-
--json Format output as json.
304-
305-
DESCRIPTION
306-
List installed plugins.
307-
308-
EXAMPLES
309-
$ csdx plugins
310-
```
311-
312-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/index.ts)_
313-
314-
## `csdx plugins:add PLUGIN`
315-
316-
Installs a plugin into csdx.
317-
318-
```
319-
USAGE
320-
$ csdx plugins:add PLUGIN... [--json] [-f] [-h] [-s | -v]
321-
322-
ARGUMENTS
323-
PLUGIN... Plugin to install.
324-
325-
FLAGS
326-
-f, --force Force npm to fetch remote resources even if a local copy exists on disk.
327-
-h, --help Show CLI help.
328-
-s, --silent Silences npm output.
329-
-v, --verbose Show verbose npm output.
330-
331-
GLOBAL FLAGS
332-
--json Format output as json.
333-
334-
DESCRIPTION
335-
Installs a plugin into csdx.
336-
337-
Uses npm to install plugins.
338-
339-
Installation of a user-installed plugin will override a core plugin.
340-
341-
Use the CSDX_NPM_LOG_LEVEL environment variable to set the npm loglevel.
342-
Use the CSDX_NPM_REGISTRY environment variable to set the npm registry.
343-
344-
ALIASES
345-
$ csdx plugins:add
346-
347-
EXAMPLES
348-
Install a plugin from npm registry.
349-
350-
$ csdx plugins:add myplugin
351-
352-
Install a plugin from a github url.
353-
354-
$ csdx plugins:add https://github.com/someuser/someplugin
355-
356-
Install a plugin from a github slug.
357-
358-
$ csdx plugins:add someuser/someplugin
359-
```
360-
361-
## `csdx plugins:inspect PLUGIN...`
362-
363-
Displays installation properties of a plugin.
364-
365-
```
366-
USAGE
367-
$ csdx plugins:inspect PLUGIN...
368-
369-
ARGUMENTS
370-
PLUGIN... [default: .] Plugin to inspect.
371-
372-
FLAGS
373-
-h, --help Show CLI help.
374-
-v, --verbose
375-
376-
GLOBAL FLAGS
377-
--json Format output as json.
378-
379-
DESCRIPTION
380-
Displays installation properties of a plugin.
381-
382-
EXAMPLES
383-
$ csdx plugins:inspect myplugin
384-
```
385-
386-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/inspect.ts)_
387-
388-
## `csdx plugins:install PLUGIN`
389-
390-
Installs a plugin into csdx.
391-
392-
```
393-
USAGE
394-
$ csdx plugins:install PLUGIN... [--json] [-f] [-h] [-s | -v]
395-
396-
ARGUMENTS
397-
PLUGIN... Plugin to install.
398-
399-
FLAGS
400-
-f, --force Force npm to fetch remote resources even if a local copy exists on disk.
401-
-h, --help Show CLI help.
402-
-s, --silent Silences npm output.
403-
-v, --verbose Show verbose npm output.
404-
405-
GLOBAL FLAGS
406-
--json Format output as json.
407-
408-
DESCRIPTION
409-
Installs a plugin into csdx.
410-
411-
Uses npm to install plugins.
412-
413-
Installation of a user-installed plugin will override a core plugin.
414-
415-
Use the CSDX_NPM_LOG_LEVEL environment variable to set the npm loglevel.
416-
Use the CSDX_NPM_REGISTRY environment variable to set the npm registry.
417-
418-
ALIASES
419-
$ csdx plugins:add
420-
421-
EXAMPLES
422-
Install a plugin from npm registry.
423-
424-
$ csdx plugins:install myplugin
425-
426-
Install a plugin from a github url.
427-
428-
$ csdx plugins:install https://github.com/someuser/someplugin
429-
430-
Install a plugin from a github slug.
431-
432-
$ csdx plugins:install someuser/someplugin
433-
```
434-
435-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/install.ts)_
436-
437-
## `csdx plugins:link PATH`
438-
439-
Links a plugin into the CLI for development.
440-
441-
```
442-
USAGE
443-
$ csdx plugins:link PATH [-h] [--install] [-v]
444-
445-
ARGUMENTS
446-
PATH [default: .] path to plugin
447-
448-
FLAGS
449-
-h, --help Show CLI help.
450-
-v, --verbose
451-
--[no-]install Install dependencies after linking the plugin.
452-
453-
DESCRIPTION
454-
Links a plugin into the CLI for development.
455-
456-
Installation of a linked plugin will override a user-installed or core plugin.
457-
458-
e.g. If you have a user-installed or core plugin that has a 'hello' command, installing a linked plugin with a 'hello'
459-
command will override the user-installed or core plugin implementation. This is useful for development work.
460-
461-
462-
EXAMPLES
463-
$ csdx plugins:link myplugin
464-
```
465-
466-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/link.ts)_
467-
468-
## `csdx plugins:remove [PLUGIN]`
469-
470-
Removes a plugin from the CLI.
471-
472-
```
473-
USAGE
474-
$ csdx plugins:remove [PLUGIN...] [-h] [-v]
475-
476-
ARGUMENTS
477-
[PLUGIN...] plugin to uninstall
478-
479-
FLAGS
480-
-h, --help Show CLI help.
481-
-v, --verbose
482-
483-
DESCRIPTION
484-
Removes a plugin from the CLI.
485-
486-
ALIASES
487-
$ csdx plugins:unlink
488-
$ csdx plugins:remove
489-
490-
EXAMPLES
491-
$ csdx plugins:remove myplugin
492-
```
493-
494-
## `csdx plugins:reset`
495-
496-
Remove all user-installed and linked plugins.
497-
498-
```
499-
USAGE
500-
$ csdx plugins:reset [--hard] [--reinstall]
501-
502-
FLAGS
503-
--hard Delete node_modules and package manager related files in addition to uninstalling plugins.
504-
--reinstall Reinstall all plugins after uninstalling.
505-
```
506-
507-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/reset.ts)_
508-
509-
## `csdx plugins:uninstall [PLUGIN]`
510-
511-
Removes a plugin from the CLI.
512-
513-
```
514-
USAGE
515-
$ csdx plugins:uninstall [PLUGIN...] [-h] [-v]
516-
517-
ARGUMENTS
518-
[PLUGIN...] plugin to uninstall
519-
520-
FLAGS
521-
-h, --help Show CLI help.
522-
-v, --verbose
523-
524-
DESCRIPTION
525-
Removes a plugin from the CLI.
526-
527-
ALIASES
528-
$ csdx plugins:unlink
529-
$ csdx plugins:remove
530-
531-
EXAMPLES
532-
$ csdx plugins:uninstall myplugin
533-
```
534-
535-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/uninstall.ts)_
536-
537-
## `csdx plugins:unlink [PLUGIN]`
538-
539-
Removes a plugin from the CLI.
540-
541-
```
542-
USAGE
543-
$ csdx plugins:unlink [PLUGIN...] [-h] [-v]
544-
545-
ARGUMENTS
546-
[PLUGIN...] plugin to uninstall
547-
548-
FLAGS
549-
-h, --help Show CLI help.
550-
-v, --verbose
551-
552-
DESCRIPTION
553-
Removes a plugin from the CLI.
554-
555-
ALIASES
556-
$ csdx plugins:unlink
557-
$ csdx plugins:remove
558-
559-
EXAMPLES
560-
$ csdx plugins:unlink myplugin
561-
```
562-
563-
## `csdx plugins:update`
564-
565-
Update installed plugins.
566-
567-
```
568-
USAGE
569-
$ csdx plugins:update [-h] [-v]
570-
571-
FLAGS
572-
-h, --help Show CLI help.
573-
-v, --verbose
574-
575-
DESCRIPTION
576-
Update installed plugins.
577-
```
578-
579-
_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/update.ts)_
580280
<!-- commandsstop -->

packages/contentstack-audit/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/cli-audit",
3-
"version": "1.19.1",
3+
"version": "1.19.2",
44
"description": "Contentstack audit plugin",
55
"author": "Contentstack CLI",
66
"homepage": "https://github.com/contentstack/cli",
@@ -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.18.1",
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-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.19.0 darwin-arm64 node-v22.13.1
18+
@contentstack/cli-cm-bootstrap/1.19.0 darwin-arm64 node-v24.14.0
1919
$ csdx --help [COMMAND]
2020
USAGE
2121
$ csdx COMMAND

0 commit comments

Comments
 (0)