Merge branch 'development' into feat/DX-3618

Author: naman-contentstack

.talismanrc

@@ -1,4 +1,14 @@
 fileignoreconfig:
   - filename: pnpm-lock.yaml
-    checksum: fa2b1ffabad41301ba5d336eb52c02b94ab4b4a573533f1b6e79e7c37ebeef5e
+    checksum: f614edf878dd0fb734e54c5649c8fec09ce03f454f26d166d402661528e716e7
+  - filename: packages/contentstack-branches/README.md
+    checksum: 20d649ee8af8c91a3c4ea35038f740738cdd3e2c2d7d6286d40d2ce33d4fec7d
+  - filename: packages/contentstack-branches/src/utils/create-branch.ts
+    checksum: d0613295ee26f7a77d026e40db0a4ab726fabd0a74965f729f1a66d1ef14768f
+  - filename: packages/contentstack-branches/src/commands/cm/branches/merge-status.ts
+    checksum: 6e5b959ddcc5ff68e03c066ea185fcf6c6e57b1819069730340af35aad8a93a8
+  - filename: packages/contentstack-branches/src/branch/diff-handler.ts
+    checksum: 3cd4d26a2142cab7cbf2094c9251e028467d17d6a1ed6daf22f21975133805f1
+  - filename: packages/contentstack-branches/src/branch/merge-handler.ts
+    checksum: 0b84508c013bfb50f99f5c96ae36969c3101017c4cc132ee61242ac45faeffc9
 version: '1.0'

packages/contentstack-audit/README.md

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.19.1 darwin-arm64 node-v22.13.1
+@contentstack/cli-audit/1.19.2 darwin-arm64 node-v24.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -35,16 +35,6 @@ USAGE
 * [`csdx cm:stacks:audit`](#csdx-cmstacksaudit)
 * [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix)
 * [`csdx help [COMMAND]`](#csdx-help-command)
-* [`csdx plugins`](#csdx-plugins)
-* [`csdx plugins:add PLUGIN`](#csdx-pluginsadd-plugin)
-* [`csdx plugins:inspect PLUGIN...`](#csdx-pluginsinspect-plugin)
-* [`csdx plugins:install PLUGIN`](#csdx-pluginsinstall-plugin)
-* [`csdx plugins:link PATH`](#csdx-pluginslink-path)
-* [`csdx plugins:remove [PLUGIN]`](#csdx-pluginsremove-plugin)
-* [`csdx plugins:reset`](#csdx-pluginsreset)
-* [`csdx plugins:uninstall [PLUGIN]`](#csdx-pluginsuninstall-plugin)
-* [`csdx plugins:unlink [PLUGIN]`](#csdx-pluginsunlink-plugin)
-* [`csdx plugins:update`](#csdx-pluginsupdate)
 
 ## `csdx audit`
 
@@ -287,294 +277,4 @@ DESCRIPTION
 ```
 
 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.37/src/commands/help.ts)_
-
-## `csdx plugins`
-
-List installed plugins.
-
-```
-USAGE
-  $ csdx plugins [--json] [--core]
-
-FLAGS
-  --core  Show core plugins.
-
-GLOBAL FLAGS
-  --json  Format output as json.
-
-DESCRIPTION
-  List installed plugins.
-
-EXAMPLES
-  $ csdx plugins
-```
-
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/index.ts)_
-
-## `csdx plugins:add PLUGIN`
-
-Installs a plugin into csdx.
-
-```
-USAGE
-  $ csdx plugins:add PLUGIN... [--json] [-f] [-h] [-s | -v]
-
-ARGUMENTS
-  PLUGIN...  Plugin to install.
-
-FLAGS
-  -f, --force    Force npm to fetch remote resources even if a local copy exists on disk.
-  -h, --help     Show CLI help.
-  -s, --silent   Silences npm output.
-  -v, --verbose  Show verbose npm output.
-
-GLOBAL FLAGS
-  --json  Format output as json.
-
-DESCRIPTION
-  Installs a plugin into csdx.
-
-  Uses npm to install plugins.
-
-  Installation of a user-installed plugin will override a core plugin.
-
-  Use the CSDX_NPM_LOG_LEVEL environment variable to set the npm loglevel.
-  Use the CSDX_NPM_REGISTRY environment variable to set the npm registry.
-
-ALIASES
-  $ csdx plugins:add
-
-EXAMPLES
-  Install a plugin from npm registry.
-
-    $ csdx plugins:add myplugin
-
-  Install a plugin from a github url.
-
-    $ csdx plugins:add https://github.com/someuser/someplugin
-
-  Install a plugin from a github slug.
-
-    $ csdx plugins:add someuser/someplugin
-```
-
-## `csdx plugins:inspect PLUGIN...`
-
-Displays installation properties of a plugin.
-
-```
-USAGE
-  $ csdx plugins:inspect PLUGIN...
-
-ARGUMENTS
-  PLUGIN...  [default: .] Plugin to inspect.
-
-FLAGS
-  -h, --help     Show CLI help.
-  -v, --verbose
-
-GLOBAL FLAGS
-  --json  Format output as json.
-
-DESCRIPTION
-  Displays installation properties of a plugin.
-
-EXAMPLES
-  $ csdx plugins:inspect myplugin
-```
-
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/inspect.ts)_
-
-## `csdx plugins:install PLUGIN`
-
-Installs a plugin into csdx.
-
-```
-USAGE
-  $ csdx plugins:install PLUGIN... [--json] [-f] [-h] [-s | -v]
-
-ARGUMENTS
-  PLUGIN...  Plugin to install.
-
-FLAGS
-  -f, --force    Force npm to fetch remote resources even if a local copy exists on disk.
-  -h, --help     Show CLI help.
-  -s, --silent   Silences npm output.
-  -v, --verbose  Show verbose npm output.
-
-GLOBAL FLAGS
-  --json  Format output as json.
-
-DESCRIPTION
-  Installs a plugin into csdx.
-
-  Uses npm to install plugins.
-
-  Installation of a user-installed plugin will override a core plugin.
-
-  Use the CSDX_NPM_LOG_LEVEL environment variable to set the npm loglevel.
-  Use the CSDX_NPM_REGISTRY environment variable to set the npm registry.
-
-ALIASES
-  $ csdx plugins:add
-
-EXAMPLES
-  Install a plugin from npm registry.
-
-    $ csdx plugins:install myplugin
-
-  Install a plugin from a github url.
-
-    $ csdx plugins:install https://github.com/someuser/someplugin
-
-  Install a plugin from a github slug.
-
-    $ csdx plugins:install someuser/someplugin
-```
-
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/install.ts)_
-
-## `csdx plugins:link PATH`
-
-Links a plugin into the CLI for development.
-
-```
-USAGE
-  $ csdx plugins:link PATH [-h] [--install] [-v]
-
-ARGUMENTS
-  PATH  [default: .] path to plugin
-
-FLAGS
-  -h, --help          Show CLI help.
-  -v, --verbose
-      --[no-]install  Install dependencies after linking the plugin.
-
-DESCRIPTION
-  Links a plugin into the CLI for development.
-
-  Installation of a linked plugin will override a user-installed or core plugin.
-
-  e.g. If you have a user-installed or core plugin that has a 'hello' command, installing a linked plugin with a 'hello'
-  command will override the user-installed or core plugin implementation. This is useful for development work.
-
-
-EXAMPLES
-  $ csdx plugins:link myplugin
-```
-
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/link.ts)_
-
-## `csdx plugins:remove [PLUGIN]`
-
-Removes a plugin from the CLI.
-
-```
-USAGE
-  $ csdx plugins:remove [PLUGIN...] [-h] [-v]
-
-ARGUMENTS
-  [PLUGIN...]  plugin to uninstall
-
-FLAGS
-  -h, --help     Show CLI help.
-  -v, --verbose
-
-DESCRIPTION
-  Removes a plugin from the CLI.
-
-ALIASES
-  $ csdx plugins:unlink
-  $ csdx plugins:remove
-
-EXAMPLES
-  $ csdx plugins:remove myplugin
-```
-
-## `csdx plugins:reset`
-
-Remove all user-installed and linked plugins.
-
-```
-USAGE
-  $ csdx plugins:reset [--hard] [--reinstall]
-
-FLAGS
-  --hard       Delete node_modules and package manager related files in addition to uninstalling plugins.
-  --reinstall  Reinstall all plugins after uninstalling.
-```
-
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/reset.ts)_
-
-## `csdx plugins:uninstall [PLUGIN]`
-
-Removes a plugin from the CLI.
-
-```
-USAGE
-  $ csdx plugins:uninstall [PLUGIN...] [-h] [-v]
-
-ARGUMENTS
-  [PLUGIN...]  plugin to uninstall
-
-FLAGS
-  -h, --help     Show CLI help.
-  -v, --verbose
-
-DESCRIPTION
-  Removes a plugin from the CLI.
-
-ALIASES
-  $ csdx plugins:unlink
-  $ csdx plugins:remove
-
-EXAMPLES
-  $ csdx plugins:uninstall myplugin
-```
-
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/uninstall.ts)_
-
-## `csdx plugins:unlink [PLUGIN]`
-
-Removes a plugin from the CLI.
-
-```
-USAGE
-  $ csdx plugins:unlink [PLUGIN...] [-h] [-v]
-
-ARGUMENTS
-  [PLUGIN...]  plugin to uninstall
-
-FLAGS
-  -h, --help     Show CLI help.
-  -v, --verbose
-
-DESCRIPTION
-  Removes a plugin from the CLI.
-
-ALIASES
-  $ csdx plugins:unlink
-  $ csdx plugins:remove
-
-EXAMPLES
-  $ csdx plugins:unlink myplugin
-```
-
-## `csdx plugins:update`
-
-Update installed plugins.
-
-```
-USAGE
-  $ csdx plugins:update [-h] [-v]
-
-FLAGS
-  -h, --help     Show CLI help.
-  -v, --verbose
-
-DESCRIPTION
-  Update installed plugins.
-```
-
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/update.ts)_
 <!-- commandsstop -->

packages/contentstack-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.19.1",
+  "version": "1.19.2",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -18,20 +18,19 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.8.0",
-    "@contentstack/cli-utilities": "~1.18.0",
-    "@oclif/core": "^4.3.0",
+    "@contentstack/cli-command": "~1.8.1",
+    "@contentstack/cli-utilities": "~1.18.2",
+    "@oclif/core": "^4.10.5",
     "@oclif/plugin-help": "^6.2.28",
-    "@oclif/plugin-plugins": "^5.4.54",
     "chalk": "^4.1.2",
     "fast-csv": "^4.3.6",
     "fs-extra": "^11.3.0",
-    "lodash": "4.18.1",
+    "lodash": "^4.18.1",
     "uuid": "^9.0.1",
-    "winston": "^3.17.0"
+    "winston": "^3.19.0"
   },
   "devDependencies": {
-    "@oclif/test": "^4.1.13",
+    "@oclif/test": "^4.1.18",
     "@types/chai": "^4.3.20",
     "@types/fs-extra": "^11.0.4",
     "@types/mocha": "^10.0.10",
@@ -53,8 +52,7 @@
     "bin": "csdx",
     "commands": "./lib/commands",
     "plugins": [
-      "@oclif/plugin-help",
-      "@oclif/plugin-plugins"
+      "@oclif/plugin-help"
     ],
     "topicSeparator": ":",
     "additionalHelpFlags": [
@@ -85,4 +83,4 @@
   "keywords": [
     "oclif"
   ]
-}
+}

packages/contentstack-bootstrap/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/1.19.0 darwin-arm64 node-v22.13.1
+@contentstack/cli-cm-bootstrap/1.19.0 darwin-arm64 node-v24.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND