Merge branch 'development' into feat/DX-523

contentstack · May 7, 2024 · 6495f46 · 6495f46
2 parents 28e8eff + 905a28d
commit 6495f46
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@colors/colors": "^1.5.0",
     "@contentstack/cli-cm-export": "~1.11.2",
-    "@contentstack/cli-cm-import": "~1.15.3",
+    "@contentstack/cli-cm-import": "~1.15.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "async": "^3.2.4",

diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.15.3",
+  "version": "1.15.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

diff --git a/packages/contentstack-import/src/import/modules/content-types.ts b/packages/contentstack-import/src/import/modules/content-types.ts
@@ -52,6 +52,7 @@ export default class ContentTypesImport extends BaseClass {
   private taxonomiesPath: string;
   public taxonomies: Record<string, unknown>;
   private extPendingPath: string;
+  private isExtensionsUpdate = false;
 
   constructor({ importConfig, stackAPIClient }: ModuleClassParams) {
     super({ importConfig, stackAPIClient });
@@ -110,7 +111,9 @@ export default class ContentTypesImport extends BaseClass {
     }
     log(this.importConfig, 'Updating the extensions...', 'success');
     await this.updatePendingExtensions();
-    log(this.importConfig, 'Successfully updated the extensions.', 'success');
+    if (this.isExtensionsUpdate) {
+      log(this.importConfig, 'Successfully updated the extensions.', 'success');
+    }
     await this.updatePendingGFs().catch((error) => {
       log(this.importConfig, `Error while updating pending global field ${formatError(error)}`, 'error');
     });
@@ -263,6 +266,7 @@ export default class ContentTypesImport extends BaseClass {
       return;
     }
 
+    this.isExtensionsUpdate = true;
     const onSuccess = ({ response, apiData: { uid, title } = { uid: null, title: '' } }: any) => {
       log(this.importConfig, `Successfully updated the '${response.title}' extension.`, 'success');
     };

diff --git a/packages/contentstack-import/src/utils/marketplace-app-helper.ts b/packages/contentstack-import/src/utils/marketplace-app-helper.ts
@@ -102,6 +102,8 @@ export const getConfirmationToCreateApps = async (privateApps: any, config: Impo
           return Promise.resolve(false);
         }
       }
+    } else {
+      return Promise.resolve(true);
     }
   } else {
     return Promise.resolve(true);

diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.15.3",
+    "@contentstack/cli-cm-import": "~1.15.4",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "inquirer": "8.2.4",

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -30,7 +30,7 @@
     "@contentstack/cli-cm-export": "~1.11.2",
     "@contentstack/cli-cm-clone": "~1.10.3",
     "@contentstack/cli-cm-export-to-csv": "~1.7.0",
-    "@contentstack/cli-cm-import": "~1.15.3",
+    "@contentstack/cli-cm-import": "~1.15.4",
     "@contentstack/cli-cm-migrate-rte": "~1.4.15",
     "@contentstack/cli-cm-seed": "~1.7.3",
     "@contentstack/cli-command": "~1.2.17",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml