@contentful/app-scripts 1.7.13 → 1.8.2

package/README.md

@@ -76,13 +76,13 @@ It only runs in interactive mode.
 ### Upload a bundle to an App Definition
 
 Allows you to upload a build directory and create a new AppBundle that is bound to an [AppDefinition](https://www.contentful.com/developers/docs/extensibility/app-framework/app-definition/).
-It runs in interactive or non-interactive mode
+It runs in interactive or non-interactive mode.
 
-**Note:** The command will automatically activate the bundle. To skip the activation you can pass the `--skip-activation` argument in interactive and non-interactive mode and then manually [activate](#activate-an-appBundle) it
+**Note:** The command will automatically activate the bundle. To skip the activation you can pass the `--skip-activation` argument in interactive and non-interactive mode and then manually [activate](#activate-an-appBundle) it.
 
 #### Interactive mode:
 
-In the interactive mode, the CLI will ask for all required options
+In the interactive mode, the CLI will ask for all required options.
 
 > **Example**
 >
@@ -124,7 +124,7 @@ When activated the app will serve the newly activated AppBundle.
 
 #### Interactive mode:
 
-In the interactive mode, the CLI will ask for all required options
+In the interactive mode, the CLI will ask for all required options.
 
 > **Example**
 >
@@ -134,7 +134,7 @@ In the interactive mode, the CLI will ask for all required options
 
 #### Non-interactive mode:
 
-When passing the `--ci` argument adding all variables as arguments is required
+When passing the `--ci` argument adding all variables as arguments is required.
 
 > **Example**
 >
@@ -182,7 +182,7 @@ You can adjust the amount you want to keep by passing `--keep <amount>` to the a
 
 #### Interactive mode:
 
-In the interactive mode, the CLI will ask for all required options
+In the interactive mode, the CLI will ask for all required options.
 
 > **Example**
 >

package/bin/app-scripts

@@ -65,7 +65,7 @@ async function runCommand(command, options) {
     });
 
   program.hook('preAction', (thisCommand) => {
-    track({ command: thisCommand.args[0], ci: thisCommand._optionValues.ci })
+    track({ command: thisCommand.args[0], ci: `${thisCommand._optionValues.ci}` })
   })
 
   await program.parseAsync(process.argv);

package/lib/upload/build-upload-settings.js

@@ -2,8 +2,10 @@
 
 const inquirer = require('inquirer');
 const { getAppInfo } = require('../get-app-info');
+const { getActionsManifest } = require('../utils');
 
 async function buildAppUploadSettings(options) {
+  const actionsManifest = getActionsManifest();
   const prompts = [];
   if (!options.bundleDir) {
     prompts.push({
@@ -28,6 +30,7 @@ async function buildAppUploadSettings(options) {
     bundleDirectory: options.bundleDir,
     skipActivation: !!options.skipActivation,
     comment: options.comment,
+    actions: actionsManifest,
     ...appUploadSettings,
     ...appInfo,
   };

package/lib/upload/create-app-bundle.js

@@ -23,6 +23,7 @@ async function createAppBundleFromUpload(settings, appUploadId) {
     appBundle = await appDefinition.createAppBundle({
       appUploadId,
       comment: settings.comment && settings.comment.length > 0 ? settings.comment : undefined,
+      actions: settings.actions,
     });
   } catch (err) {
     showCreationError('app upload', err.message);

package/lib/upload/get-upload-settings-args.js

@@ -2,6 +2,7 @@ const chalk = require('chalk');
 const ora = require('ora');
 const { getAppInfo } = require('../get-app-info');
 const { validateArguments } = require('../validate-arguments');
+const { getActionsManifest } = require('../utils');
 
 const requiredOptions = {
   definitionId: '--definition-id',
@@ -12,6 +13,7 @@ const requiredOptions = {
 
 async function getUploadSettingsArgs(options) {
   const validateSpinner = ora('Validating your input...').start();
+  const actionsManifest = getActionsManifest();
 
   try {
     validateArguments(requiredOptions, options, 'upload');
@@ -22,6 +24,7 @@ async function getUploadSettingsArgs(options) {
       skipActivation: options.skipActivation,
       comment: options.comment,
       userAgentApplication: options.userAgentApplication,
+      actions: actionsManifest,
     };
   } catch (err) {
     console.log(`

package/lib/upload/index.js

@@ -6,7 +6,7 @@ const { buildAppUploadSettings } = require('./build-upload-settings');
 
 async function uploadAndActivate(settings) {
   const bundle = await createAppBundleFromSettings(settings);
-  if (!settings.skipActivation) {
+  if (!settings.skipActivation && bundle) {
     await activateBundle({ ...settings, bundleId: bundle.sys.id });
   }
 }

package/lib/utils.js

@@ -1,7 +1,10 @@
+const fs = require('fs');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { cacheEnvVars } = require('../utils/cache-credential');
 
+const DEFAULT_MANIFEST_PATH = './contentful-app-manifest.json';
+
 const throwValidationException = (subject, message, details) => {
   console.log(`${chalk.red('Validation Error:')} Missing or invalid ${subject}.`);
   message && console.log(message);
@@ -31,16 +34,15 @@ ${err.message}
 };
 
 const selectFromList = async (list, message, cachedOptionEnvVar) => {
-  const cachedEnvVar = process.env[cachedOptionEnvVar]
-  const cachedElement = list.find(item => item.value === cachedEnvVar);
+  const cachedEnvVar = process.env[cachedOptionEnvVar];
+  const cachedElement = list.find((item) => item.value === cachedEnvVar);
 
   if (cachedElement) {
     console.log(`
   ${message}
   Using environment variable: ${cachedElement.name} (${chalk.blue(cachedElement.value)})
-    `)
+    `);
     return cachedElement;
-
   } else {
     const { elementId } = await inquirer.prompt([
       {
@@ -52,16 +54,49 @@ const selectFromList = async (list, message, cachedOptionEnvVar) => {
     ]);
 
     if (cachedOptionEnvVar) {
-      await cacheEnvVars({[cachedOptionEnvVar]: elementId});
+      await cacheEnvVars({ [cachedOptionEnvVar]: elementId });
     }
 
     return list.find((el) => el.value === elementId);
   }
 };
 
+function getActionsManifest() {
+  const isManifestExists = fs.existsSync(DEFAULT_MANIFEST_PATH);
+
+  if (!isManifestExists) {
+    return;
+  }
+
+  try {
+    const manifest = JSON.parse(fs.readFileSync(DEFAULT_MANIFEST_PATH, { encoding: 'utf8' }));
+
+    if (!Array.isArray(manifest.actions) || manifest.actions.length === 0) {
+      return;
+    }
+
+    console.log('');
+    console.log(`  ----------------------------
+  App actions manifest found in ${chalk.bold(DEFAULT_MANIFEST_PATH)}.
+  ----------------------------`);
+    console.log('');
+
+    return manifest.actions.map((action) => ({ parameters: [], ...action })); // adding required parameters
+  } catch {
+    console.log(
+      `${chalk.red('Error:')} Invalid JSON in manifest file at ${chalk.bold(
+        DEFAULT_MANIFEST_PATH
+      )}.`
+    );
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+}
+
 module.exports = {
   throwValidationException,
   throwError,
   selectFromList,
   showCreationError,
+  getActionsManifest,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/app-scripts",
-  "version": "1.7.13",
+  "version": "1.8.2",
   "description": "A collection of scripts for building Contentful Apps",
   "author": "Contentful GmbH",
   "license": "MIT",
@@ -52,8 +52,8 @@
     "analytics-node": "^6.2.0",
     "bottleneck": "2.19.5",
     "chalk": "4.1.2",
-    "commander": "10.0.0",
-    "contentful-management": "10.30.0",
+    "commander": "10.0.1",
+    "contentful-management": "10.35.3",
     "dotenv": "16.0.3",
     "ignore": "5.2.4",
     "inquirer": "8.2.5",
@@ -61,5 +61,5 @@
     "open": "8.4.2",
     "ora": "5.4.1"
   },
-  "gitHead": "d149765155fe0bf0fca88893e463a0c43b20380c"
+  "gitHead": "43e318bc4b0ce268d1e40cf91b2116debf48e93f"
 }