Merge pull request #1587 from contentstack/staging

DX | 26-09-2024 | Variant EA Release
contentstack · Sep 26, 2024 · 34c5b27 · 34c5b27
2 parents eb3fd53 + e92c9f6
commit 34c5b27
Show file tree

Hide file tree

Showing 49 changed files with 484 additions and 242 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md
@@ -269,7 +269,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.8/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.9/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -343,7 +343,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.8/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.9/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -392,7 +392,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.8/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.9/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -422,7 +422,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.8/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.9/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -463,7 +463,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.8/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.9/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -491,7 +491,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.8/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.9/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -535,5 +535,5 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.8/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.9/src/commands/plugins/update.ts)_
 <!-- commandsstop -->
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.11.0 darwin-arm64 node-v22.2.0
+@contentstack/cli-cm-bootstrap/1.12.0 darwin-arm64 node-v22.2.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.11.0",
+  "version": "1.12.0",
   "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.8.0",
+    "@contentstack/cli-cm-seed": "~1.9.0",
     "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "inquirer": "8.2.4",

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.11.1 darwin-arm64 node-v22.2.0
+@contentstack/cli-cm-clone/1.12.0 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.5.0",
-    "@contentstack/cli-cm-export": "~1.12.0",
-    "@contentstack/cli-cm-import": "~1.17.0",
+    "@contentstack/cli-cm-export": "~1.13.0",
+    "@contentstack/cli-cm-import": "~1.18.0",
     "@contentstack/cli-command": "~1.3.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "async": "^3.2.4",

diff --git a/packages/contentstack-config/src/utils/region-handler.ts b/packages/contentstack-config/src/utils/region-handler.ts
@@ -24,7 +24,7 @@ const regions = {
     name: 'NA',
     'developerHubUrl': 'https://developerhub-api.contentstack.com',
     'launchHubUrl': 'https://launch-api.contentstack.com',
-    'personalizeUrl': 'https://personalization-api.contentstack.com',
+    'personalizeUrl': 'https://personalize-api.contentstack.com',
   },
   EU: {
     cma: 'https://eu-api.contentstack.com',
@@ -33,7 +33,7 @@ const regions = {
     name: 'EU',
     'developerHubUrl': 'https://eu-developerhub-api.contentstack.com',
     'launchHubUrl': 'https://eu-launch-api.contentstack.com',
-    'personalizeUrl': 'Not available',
+    'personalizeUrl': 'https://eu-personalize-api.contentstack.com',
   },
   'AZURE-NA': {
     cma: 'https://azure-na-api.contentstack.com',
@@ -42,7 +42,7 @@ const regions = {
     name: 'AZURE-NA',
     'developerHubUrl': 'https://azure-na-developerhub-api.contentstack.com',
     'launchHubUrl': 'https://azure-na-launch-api.contentstack.com',
-    'personalizeUrl': 'Not available',
+    'personalizeUrl': 'https://azure-na-personalize-api.contentstack.com',
   },
   'AZURE-EU': {
     cma: 'https://azure-eu-api.contentstack.com',
@@ -51,7 +51,7 @@ const regions = {
     name: 'AZURE-EU',
     'developerHubUrl': 'https://azure-eu-developerhub-api.contentstack.com',
     'launchHubUrl': 'https://azure-eu-launch-api.contentstack.com',
-    'personalizeUrl': 'Not available',
+    'personalizeUrl': 'https://azure-eu-personalize-api.contentstack.com',
   },
   'GCP-NA': {
     cma: 'https://gcp-na-api.contentstack.com',
@@ -60,7 +60,7 @@ const regions = {
     name: 'GCP-NA',
     'developerHubUrl': 'https://gcp-na-developerhub-api.contentstack.com',
     'launchHubUrl': 'Not available',
-    'personalizeUrl': 'Not available',
+    'personalizeUrl': 'https://gcp-na-personalize-api.contentstack.com',
   },
 };
 

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.12.1 darwin-arm64 node-v22.2.0
+@contentstack/cli-cm-export/1.13.0 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.3.0",
-    "@contentstack/cli-variants": "~0.0.1-alpha",
+    "@contentstack/cli-variants": "~1.0.0",
     "@contentstack/cli-utilities": "~1.7.2",
     "@oclif/core": "^3.26.5",
     "async": "^3.2.4",

diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts
@@ -107,6 +107,7 @@ export default class ExportCommand extends Command {
       exportConfig.host = this.cmaHost;
       exportConfig.region = this.region;
       exportConfig.developerHubBaseUrl = this.developerHubUrl;
+      if (this.personalizeUrl) exportConfig.modules.personalize.baseURL[exportConfig.region.name] = this.personalizeUrl;
       exportDir = exportConfig.cliLogsPath || exportConfig.data || exportConfig.exportDir;
       const managementAPIClient: ContentstackClient = await managementSDKClient(exportConfig);
       const moduleExporter = new ModuleExporter(managementAPIClient, exportConfig);

diff --git a/packages/contentstack-export/src/config/index.ts b/packages/contentstack-export/src/config/index.ts
@@ -33,7 +33,7 @@ const config: DefaultConfig = {
       'content-types',
       'custom-roles',
       'workflows',
-      'personalization',
+      'personalize',
       'entries',
       'labels',
       'marketplace-apps',
@@ -144,11 +144,11 @@ const config: DefaultConfig = {
       dependencies: ['locales', 'content-types'],
       exportVersions: false,
     },
-    personalization: {
+    personalize: {
       baseURL: {
-        NA: 'https://personalization-api.contentstack.com',
+        NA: 'https://personalize-api.contentstack.com',
       },
-      dirName: 'personalization',
+      dirName: 'personalize',
       exportOrder: ['attributes', 'audiences', 'events', 'experiences'],
       projects: {
         dirName: 'projects',

diff --git a/...ort/src/export/modules/personalization.ts → ...-export/src/export/modules/personalize.ts b/...ort/src/export/modules/personalization.ts → ...-export/src/export/modules/personalize.ts
@@ -10,12 +10,12 @@ import {
 import { log, formatError } from '../../utils';
 import { ModuleClassParams, ExportConfig } from '../../types';
 
-export default class ExportPersonalization {
+export default class ExportPersonalize {
   public exportConfig: ExportConfig;
   public personalizeConfig: { dirName: string; baseURL: Record<string, string> } & AnyProperty;
   constructor({ exportConfig }: ModuleClassParams) {
     this.exportConfig = exportConfig;
-    this.personalizeConfig = exportConfig.modules.personalization;
+    this.personalizeConfig = exportConfig.modules.personalize;
   }
 
   async start(): Promise<void> {
@@ -39,7 +39,7 @@ export default class ExportPersonalization {
           experiences: new ExportExperiences(this.exportConfig),
         };
 
-        const order: (keyof typeof moduleMapper)[] = this.exportConfig.modules.personalization
+        const order: (keyof typeof moduleMapper)[] = this.exportConfig.modules.personalize
           .exportOrder as (keyof typeof moduleMapper)[];
 
         for (const module of order) {
@@ -51,8 +51,12 @@ export default class ExportPersonalization {
         }
       }
     } catch (error) {
+      if (error === 'Forbidden') {
+        log(this.exportConfig, "Personalize is not enabled in the given organization!", 'info');
+      } else {
+        log(this.exportConfig, error, 'error');
+      }
       this.exportConfig.personalizationEnabled = false;
-      log(this.exportConfig, error, 'error');
     }
   }
 }
diff --git a/packages/contentstack-export/src/types/default-config.ts b/packages/contentstack-export/src/types/default-config.ts
@@ -122,7 +122,7 @@ export default interface DefaultConfig {
       dependencies?: Modules[];
       exportVersions: boolean;
     };
-    personalization: {
+    personalize: {
       dirName: string;
       baseURL: Record<string, string>;
     } & AnyProperty;

diff --git a/packages/contentstack-export/src/types/index.ts b/packages/contentstack-export/src/types/index.ts
@@ -49,7 +49,7 @@ export type Modules =
   | 'labels'
   | 'marketplace-apps'
   | 'taxonomies'
-  | 'personalization';
+  | 'personalize';
 
 export type ModuleClassParams = {
   stackAPIClient: ReturnType<ContentstackClient['stack']>;

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.17.1 darwin-arm64 node-v22.2.0
+@contentstack/cli-cm-import/1.18.0 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND