Merge pull request #1044 from contentstack/staging

netrajpatel · web-flow · commit 8326f1217136 · 2023-09-25T14:09:52.000+05:30
Staging -&gt; Main
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-auth/README.md b/packages/contentstack-auth/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-auth
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-auth/1.3.13 darwin-arm64 node-v20.3.1
+@contentstack/cli-auth/1.3.13 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-bootstrap/README.md b/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.4.15 darwin-arm64 node-v20.3.1
+@contentstack/cli-cm-bootstrap/1.4.16 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "1.4.15",
+  "version": "1.4.16",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -17,7 +17,7 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~1.4.15",
+    "@contentstack/cli-cm-seed": "~1.4.16",
     "@contentstack/cli-command": "~1.2.12",
     "@contentstack/cli-utilities": "~1.5.2",
     "inquirer": "8.2.4",
diff --git a/packages/contentstack-branches/README.md b/packages/contentstack-branches/README.md
@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.12 darwin-arm64 node-v20.3.1
+@contentstack/cli-cm-branches/1.0.13 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -1,14 +1,12 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.12",
     "@contentstack/cli-utilities": "~1.5.2",
-    "@oclif/command": "^1.8.16",
-    "@oclif/config": "^1.18.3",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
diff --git a/packages/contentstack-branches/src/utils/entry-create-script.ts b/packages/contentstack-branches/src/utils/entry-create-script.ts
@@ -465,7 +465,9 @@ export function entryCreateScript(contentType) {
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
   
-                updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
+                    updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  }
               }
             }
           }
diff --git a/packages/contentstack-branches/src/utils/entry-create-update-script.ts b/packages/contentstack-branches/src/utils/entry-create-update-script.ts
@@ -484,7 +484,9 @@ export function entryCreateUpdateScript(contentType) {
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
   
-                updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
+                    updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  }
               }
             }
           }
diff --git a/packages/contentstack-branches/src/utils/entry-update-script.ts b/packages/contentstack-branches/src/utils/entry-update-script.ts
@@ -483,7 +483,9 @@ export function entryUpdateScript(contentType) {
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
   
-                updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
+                    updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
+                  }
               }
             }
           }
diff --git a/packages/contentstack-bulk-publish/README.md b/packages/contentstack-bulk-publish/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bulk-publish/1.3.11 darwin-arm64 node-v20.3.1
+@contentstack/cli-cm-bulk-publish/1.3.11 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-clone/README.md b/packages/contentstack-clone/README.md
@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-clone/1.4.16 darwin-arm64 node-v20.3.1
+@contentstack/cli-cm-clone/1.4.17 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.4.16",
+  "version": "1.4.17",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
-    "@contentstack/cli-cm-export": "~1.8.1",
-    "@contentstack/cli-cm-import": "~1.8.3",
+    "@contentstack/cli-cm-export": "~1.8.2",
+    "@contentstack/cli-cm-import": "~1.8.4",
     "@contentstack/cli-command": "~1.2.12",
     "@contentstack/cli-utilities": "~1.5.2",
     "@colors/colors": "^1.5.0",
@@ -70,4 +70,4 @@
       "cm:stack-clone": "O-CLN"
     }
   }
-}
+}
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.4.11 darwin-arm64 node-v20.3.1
+@contentstack/cli-config/1.4.11 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export-to-csv",
   "description": "Export entities to csv",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "author": "Abhinav Gupta @abhinav-from-contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
diff --git a/packages/contentstack-export-to-csv/src/util/index.js b/packages/contentstack-export-to-csv/src/util/index.js
@@ -371,6 +371,22 @@ function exitProgram() {
   process.exit();
 }
 
+function sanitizeEntries(flatEntry) {
+  // sanitize against CSV Injections
+  const CSVRegex = /^[\\+\\=@\\-]/
+  for (key in flatEntry) {
+    if (typeof flatEntry[key] === 'string' && flatEntry[key].match(CSVRegex)) {
+      flatEntry[key] = flatEntry[key].replace(/\"/g, "\"\"");
+      flatEntry[key] = `"'${flatEntry[key]}"`
+    } else if (typeof flatEntry[key] === 'object') {
+      // convert any objects or arrays to string
+      // to store this data correctly in csv
+      flatEntry[key] = JSON.stringify(flatEntry[key]);
+    }
+  }
+  return flatEntry;
+}
+
 function cleanEntries(entries, language, environments, contentTypeUid) {
   const filteredEntries = entries.filter((entry) => {
     return entry['locale'] === language;
@@ -393,6 +409,7 @@ function cleanEntries(entries, language, environments, contentTypeUid) {
         }
     }
     entry = flatten(entry);
+    entry = sanitizeEntries(entry);
     entry['publish_details'] = envArr;
     entry['_workflow'] = workflow;
     entry['ACL'] = JSON.stringify({}); // setting ACL to empty obj
@@ -409,7 +426,6 @@ function cleanEntries(entries, language, environments, contentTypeUid) {
     delete entry.publishRequest;
     return entry;
   });
-  console.log(filteredEntries.length);
 }
 
 function getDateTime() {
diff --git a/packages/contentstack-export/README.md b/packages/contentstack-export/README.md
@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.8.1 darwin-arm64 node-v20.3.1
+@contentstack/cli-cm-export/1.8.2 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -1,14 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.12",
     "@contentstack/cli-utilities": "~1.5.2",
-    "@oclif/command": "^1.8.16",
-    "@oclif/config": "^1.18.3",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
@@ -100,4 +98,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md
@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.8.3 darwin-arm64 node-v20.3.1
+@contentstack/cli-cm-import/1.8.4 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -1,14 +1,13 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.12",
     "@contentstack/cli-utilities": "~1.5.2",
     "@contentstack/management": "~1.10.0",
-    "@oclif/config": "^1.18.3",
     "@oclif/core": "^2.9.3",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
@@ -96,4 +95,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-import/src/import/modules-js/entries.js b/packages/contentstack-import/src/import/modules-js/entries.js
@@ -38,7 +38,7 @@ module.exports = class ImportEntries {
   ctPath;
   lPath;
   importConcurrency;
-  skipFiles = ['__master.json', '__priority.json', 'schema.json'];
+  skipFiles = ['__master.json', '__priority.json', 'schema.json','.DS_Store'];
 
   constructor(importConfig, stackAPIClient) {
     this.config = _.merge(config, importConfig);
@@ -1258,7 +1258,7 @@ module.exports = class ImportEntries {
 
     if (element.length) {
       for (const item of element) {
-        if ((item.type === 'p' || item.type === 'a') && item.children && item.children.length > 0) {
+        if ((item.type === 'p' || item.type === 'a' || item.type === 'span') && item.children && item.children.length > 0) {
           return this.doEntryReferencesExist(item.children);
         } else if (this.isEntryRef(item)) {
           return true;
@@ -1269,7 +1269,7 @@ module.exports = class ImportEntries {
         return true;
       }
 
-      if ((element.type === 'p' || element.type === 'a') && element.children && element.children.length > 0) {
+      if ((element.type === 'p' || element.type === 'a' || element.type ==='span') && element.children && element.children.length > 0) {
         return this.doEntryReferencesExist(element.children);
       }
     }
diff --git a/packages/contentstack-import/src/import/modules-js/workflows.js b/packages/contentstack-import/src/import/modules-js/workflows.js
@@ -189,7 +189,11 @@ module.exports = class importWorkflows {
     });
 
     const updateWorkflow = this.stackAPIClient.workflow(workflow.uid);
-    Object.assign(updateWorkflow, { workflow_stages: newWorkflowStages, name: workflow.name });
+    Object.assign(updateWorkflow, {
+      name: workflow.name,
+      branches: workflow.branches,
+      workflow_stages: newWorkflowStages,
+    });
     return updateWorkflow.update();
   }
 };
diff --git a/packages/contentstack-import/src/import/modules/workflows.ts b/packages/contentstack-import/src/import/modules/workflows.ts
@@ -185,7 +185,11 @@ export default class ImportWorkflows extends BaseClass {
     });
 
     const updateWorkflow = this.stack.workflow(workflow.uid);
-    Object.assign(updateWorkflow, { workflow_stages: newWorkflowStages, name: workflow.name });
+    Object.assign(updateWorkflow, {
+      name: workflow.name,
+      branches: workflow.branches,
+      workflow_stages: newWorkflowStages,
+    });
 
     return updateWorkflow.update();
   }
diff --git a/packages/contentstack-import/src/utils/asset-helper.ts b/packages/contentstack-import/src/utils/asset-helper.ts
@@ -205,8 +205,7 @@ export const lookupAssets = function (
     jsonRteData.children.forEach((element: any) => {
       if (element.type) {
         switch (element.type) {
-          case 'a':
-          case 'p': {
+          default: {
             if (element.children && element.children.length > 0) {
               gatherJsonRteAssetIds(element);
             }
diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts
@@ -21,8 +21,7 @@ export const lookupEntries = function (data: any, mappedUids: Record<string, any
     jsonRteData.children.forEach((element: any) => {
       if (element.type) {
         switch (element.type) {
-          case 'a':
-          case 'p': {
+          default: {
             if (element.children && element.children.length > 0) {
               gatherJsonRteEntryIds(element);
             }
@@ -412,7 +411,7 @@ function doEntryReferencesExist(element: Record<string, any>[] | any): boolean {
 
   if (element.length) {
     for (const item of element) {
-      if ((item.type === 'p' || item.type === 'a') && item.children && item.children.length > 0) {
+      if ((item.type === 'p' || item.type === 'a' || item.type === 'span') && item.children && item.children.length > 0) {
         return doEntryReferencesExist(item.children);
       } else if (isEntryRef(item)) {
         return true;
@@ -423,7 +422,7 @@ function doEntryReferencesExist(element: Record<string, any>[] | any): boolean {
       return true;
     }
 
-    if ((element.type === 'p' || element.type === 'a') && element.children && element.children.length > 0) {
+    if ((element.type === 'p' || element.type === 'a' || element.type === 'span') && element.children && element.children.length > 0) {
       return doEntryReferencesExist(element.children);
     }
   }
diff --git a/packages/contentstack-launch/README.md b/packages/contentstack-launch/README.md
@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-launch
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-launch/1.0.11 darwin-arm64 node-v20.3.1
+@contentstack/cli-launch/1.0.12 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-launch/oclif.manifest.json b/packages/contentstack-launch/oclif.manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.10",
+  "version": "1.0.12",
   "commands": {
     "launch:base-command": {
       "id": "launch:base-command",
diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-launch",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Launch related operations",
   "author": "Contentstack CLI",
   "bin": {
@@ -21,7 +21,7 @@
     "@contentstack/cli-command": "~1.2.12",
     "@contentstack/cli-utilities": "~1.5.2",
     "@oclif/plugin-help": "^5",
-    "@oclif/plugin-plugins": "^2.3.2",
+    "@oclif/plugin-plugins": "^3.3.2",
     "@oclif/core": "^2.9.3",
     "@types/express": "^4.17.17",
     "@types/express-serve-static-core": "^4.17.34",
@@ -32,7 +32,7 @@
     "esm": "^3.2.25",
     "express": "^4.18.2",
     "form-data": "^4.0.0",
-    "graphql": "^16.6.0",
+    "graphql": "^16.8.1",
     "ini": "^3.0.1",
     "lodash": "^4.17.21",
     "open": "^8.4.2",
diff --git a/packages/contentstack-migrate-rte/README.md b/packages/contentstack-migrate-rte/README.md
@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-migrate-rte
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-migrate-rte/1.4.11 darwin-arm64 node-v20.3.1
+@contentstack/cli-cm-migrate-rte/1.4.11 darwin-x64 node-v20.7.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
diff --git a/packages/contentstack-migration/README.md b/packages/contentstack-migration/README.md
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,9 @@ export function entryCreateScript(contentType) {`
`465`	`465`	`.query({ query: { title: compareRefEntry.title } })`
`466`	`466`	`.find();`
`467`	`467`
`468`		`- updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);`
	`468`	`+ if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){`
	`469`	`+ updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);`
	`470`	`+ }`
`469`	`471`	`}`
`470`	`472`	`}`
`471`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,9 @@ export function entryCreateUpdateScript(contentType) {`
`484`	`484`	`.query({ query: { title: compareRefEntry.title } })`
`485`	`485`	`.find();`
`486`	`486`
`487`		`- updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);`
	`487`	`+ if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){`
	`488`	`+ updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);`
	`489`	`+ }`
`488`	`490`	`}`
`489`	`491`	`}`
`490`	`492`	`}`
Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,9 @@ export function entryUpdateScript(contentType) {`
`483`	`483`	`.query({ query: { title: compareRefEntry.title } })`
`484`	`484`	`.find();`
`485`	`485`
`486`		`- updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);`
	`486`	`+ if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){`
	`487`	`+ updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);`
	`488`	`+ }`
`487`	`489`	`}`
`488`	`490`	`}`
`489`	`491`	`}`