@contentstack/cli-cm-import 1.15.8 → 1.16.1

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.15.8 linux-x64 node-v18.20.3
+@contentstack/cli-cm-import/1.16.1 linux-x64 node-v18.20.4
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -79,6 +79,7 @@ FLAGS
   -k, --stack-api-key=<value>       API key of the target stack
   -m, --module=<value>              [optional] specific module name
   -y, --yes                         [optional] Override marketplace prompts
+  --exclude-global-modules          Excludes the branch-independent module from the import operation
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
   --replace-existing                Replaces the existing module in the target stack.
@@ -128,6 +129,7 @@ FLAGS
   -k, --stack-api-key=<value>       API key of the target stack
   -m, --module=<value>              [optional] specific module name
   -y, --yes                         [optional] Override marketplace prompts
+  --exclude-global-modules          Excludes the branch-independent module from the import operation
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
   --replace-existing                Replaces the existing module in the target stack.

package/lib/commands/cm/stacks/import.js

@@ -129,6 +129,10 @@ ImportCommand.flags = {
     'skip-audit': cli_utilities_1.flags.boolean({
         description: 'Skips the audit fix.',
     }),
+    'exclude-global-modules': cli_utilities_1.flags.boolean({
+        description: 'Excludes the branch-independent module from the import operation',
+        default: false
+    }),
 };
 ImportCommand.aliases = ['cm:import'];
 ImportCommand.usage = 'cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]';

package/lib/config/index.js

@@ -394,6 +394,8 @@ const config = {
         returnResponse: true,
         noTerminalOutput: false,
         config: { basePath: '' }, // To overwrite any build-in config. And this config is equal to --config flag.
-    }
+    },
+    //'taxonomies', 'environments', 'marketplace_apps', workflows, custom-roles --> Add this incase need to extend to the other global modules
+    globalModules: ['webhooks'],
 };
 exports.default = config;

package/lib/import/module-importer.js

@@ -86,6 +86,10 @@ class ModuleImporter {
     async importAllModules() {
         // use the algorithm to determine the parallel and sequential execution of modules
         for (let moduleName of this.importConfig.modules.types) {
+            if (this.importConfig.globalModules.includes(moduleName) && this.importConfig['exclude-global-modules']) {
+                (0, utils_1.log)(this.importConfig, `Skipping the import of the global module '${moduleName}', as it already exists in the stack.`, 'warn');
+                continue;
+            }
             await this.importByModuleByName(moduleName);
         }
     }

package/lib/import/modules/entries.js

@@ -331,9 +331,6 @@ class EntriesImport extends base_class_1.default {
             if (this.jsonRteCTsWithRef.indexOf(cTUid) > -1) {
                 entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
             }
-            if (this.rteCTs.indexOf(cTUid) > -1) {
-                entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
-            }
             if (this.rteCTsWithRef.indexOf(cTUid) > -1) {
                 entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
             }

package/lib/types/default-config.d.ts

@@ -156,4 +156,5 @@ export default interface DefaultConfig {
             branch?: string;
         } & Record<string, any>;
     };
+    globalModules: string[];
 }

package/lib/types/import-config.d.ts

@@ -49,6 +49,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     skipExisting?: boolean;
     skipAudit?: boolean;
     stackName?: string;
+    'exclude-global-modules': false;
 }
 type branch = {
     uid: string;

package/lib/utils/extension-helper.js

@@ -16,6 +16,7 @@ const lookupExtension = function (config, schema, preserveStackVersion, installe
     const fs = new cli_utilities_1.FsUtility({ basePath: config.backupDir });
     const extensionPath = (0, node_path_1.join)(config.backupDir, 'mapper/extensions', 'uid-mapping.json');
     const globalfieldsPath = (0, node_path_1.join)(config.backupDir, 'mapper/globalfields', 'uid-mapping.json');
+    const marketPlaceAppsPath = (0, node_path_1.join)(config.backupDir, 'mapper/marketplace_apps', 'uid-mapping.json');
     for (let i in schema) {
         if (schema[i].data_type === 'group') {
             (0, exports.lookupExtension)(config, schema[i].schema, preserveStackVersion, installedExtensions);
@@ -72,10 +73,14 @@ const lookupExtension = function (config, schema, preserveStackVersion, installe
         else if (schema[i].data_type === 'json' && schema[i].hasOwnProperty('plugins') && schema[i].plugins.length > 0) {
             const newPluginUidsArray = [];
             const data = fs.readFile(extensionPath);
+            const marketPlaceAppsData = fs.readFile(marketPlaceAppsPath);
             schema[i].plugins.forEach((extension_key_value) => {
                 if (data && data.hasOwnProperty(extension_key_value)) {
                     newPluginUidsArray.push(data[extension_key_value]);
                 }
+                else if (marketPlaceAppsData && marketPlaceAppsData.extension_uid && marketPlaceAppsData.extension_uid.hasOwnProperty(extension_key_value)) {
+                    newPluginUidsArray.push(marketPlaceAppsData.extension_uid[extension_key_value]);
+                }
             });
             schema[i].plugins = newPluginUidsArray;
         }

package/lib/utils/import-config-handler.js

@@ -88,6 +88,9 @@ const setupConfig = async (importCmdFlags) => {
     config.target_stack = config.apiKey;
     config.replaceExisting = importCmdFlags['replace-existing'];
     config.skipExisting = importCmdFlags['skip-existing'];
+    if (importCmdFlags['exclude-global-modules']) {
+        config['exclude-global-modules'] = importCmdFlags['exclude-global-modules'];
+    }
     return config;
 };
 exports.default = setupConfig;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.15.8",
+  "version": "1.16.1",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",
@@ -149,6 +149,12 @@
           "type": "boolean",
           "description": "Skips the audit fix.",
           "allowNo": false
+        },
+        "exclude-global-modules": {
+          "name": "exclude-global-modules",
+          "type": "boolean",
+          "description": "Excludes the branch-independent module from the import operation",
+          "allowNo": false
         }
       },
       "args": {}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.15.8",
+  "version": "1.16.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.6.2",
+    "@contentstack/cli-audit": "~1.6.3",
     "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.2",
+    "@contentstack/cli-utilities": "~1.6.3",
     "@contentstack/management": "~1.15.3",
     "@oclif/core": "^3.26.5",
     "big-json": "^3.2.0",