Fixed merge conflits

contentstack · Aug 22, 2024 · f729eea · f729eea
1 parent 3fa9152
commit f729eea
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 61 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -18,7 +18,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^5.0.0",

diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json
@@ -22,7 +22,7 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",

diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
@@ -17,8 +17,8 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~1.7.6",
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-cm-seed": "~1.7.9",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",

diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "@oclif/core": "^3.26.5",
     "async": "^3.2.4",

diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",

diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -8,7 +8,7 @@
     "@colors/colors": "^1.5.0",
     "@contentstack/cli-cm-export": "~1.11.6",
     "@contentstack/cli-cm-import": "~1.16.5",
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "async": "^3.2.4",
     "chalk": "^4.1.0",

diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-command",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.2.20",
+  "version": "1.3.0",
   "author": "Contentstack",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/packages/contentstack-config/README.md b/packages/contentstack-config/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-config
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-config/1.7.1 darwin-arm64 node-v22.2.0
+@contentstack/cli-config/1.7.0 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "1.7.1",
+  "version": "1.7.0",
   "author": "Contentstack",
   "scripts": {
     "build": "npm run clean && npm run compile",
@@ -21,7 +21,7 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "chalk": "^4.0.0",
     "debug": "^4.1.1",

diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -5,7 +5,7 @@
   "author": "Abhinav Gupta @abhinav-from-contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "chalk": "^4.1.0",
     "fast-csv": "^4.3.6",

diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "@oclif/core": "^3.26.5",
     "async": "^3.2.4",

diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-audit": "~1.6.5",
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "@contentstack/management": "~1.17.0",
     "@oclif/core": "^3.26.5",

diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "@apollo/client": "^3.7.9",
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "@oclif/core": "^3.26.5",
     "@oclif/plugin-help": "^5",

diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json
@@ -5,7 +5,7 @@
   "author": "contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "@contentstack/json-rte-serializer": "~2.0.4",
     "collapse-whitespace": "^1.1.7",

diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
@@ -4,7 +4,7 @@
   "author": "@contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "async": "^3.2.4",
     "callsites": "^3.1.0",

diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-seed",
   "description": "create a Stack from existing content types, entries, assets, etc.",
-  "version": "1.7.10",
+  "version": "1.7.9",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-cm-import": "~1.16.5",
-    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -32,9 +32,9 @@
     "@contentstack/cli-cm-export-to-csv": "~1.7.3",
     "@contentstack/cli-cm-import": "~1.16.6",
     "@contentstack/cli-cm-migrate-rte": "~1.4.19",
-    "@contentstack/cli-cm-seed": "~1.7.10",
-    "@contentstack/cli-command": "~1.2.20",
-    "@contentstack/cli-config": "~1.7.1",
+    "@contentstack/cli-cm-seed": "~1.7.9",
+    "@contentstack/cli-command": "~1.3.0",
+    "@contentstack/cli-config": "~1.7.0",
     "@contentstack/cli-launch": "~1.2.1",
     "@contentstack/cli-migration": "~1.6.2",
     "@contentstack/cli-utilities": "~1.7.2",