@contentful/app-scripts 2.1.1 → 2.1.2

package/lib/analytics.js

@@ -19,7 +19,9 @@ function track({ command, ci }) {
         const client = new analytics_node_1.Analytics({
             writeKey: SEGMENT_WRITE_KEY,
         });
-        client.on('error', (err) => { });
+        client.on('error', (err) => {
+            /* noop */
+        });
         client.track({
             event: 'app-cli-app-scripts',
             properties: {

package/lib/bin.js

@@ -22,7 +22,7 @@ async function runCommand(command, options) {
         .description('Upload your build folder and create an AppBundle')
         .option('--bundle-dir [directory]', 'The directory of your build folder')
         .option('--organization-id [orgId]', 'The id of your organization')
-        .option('--definition-id [defId]', 'The id of your app\'s definition')
+        .option('--definition-id [defId]', "The id of your app's definition")
         .option('--token [accessToken]', 'Your content management access token')
         .option('--comment [comment]', 'Optional comment for the created bundle')
         .option('--skip-activation', 'A Boolean flag to skip automatic activation')
@@ -35,7 +35,7 @@ async function runCommand(command, options) {
         .description('Mark an AppBundle as "active" for a given AppDefinition')
         .option('--bundle-id [bundleId]', 'The id of your bundle')
         .option('--organization-id [orgId]', 'The id of your organization')
-        .option('--definition-id  [defId]', 'The id of your app\'s definition')
+        .option('--definition-id  [defId]', "The id of your app's definition")
         .option('--token [accessToken]', 'Your content management access token')
         .option('--host [host]', 'Contentful subdomain to use, e.g. "api.contentful.com"')
         .action(async (options) => {
@@ -44,7 +44,7 @@ async function runCommand(command, options) {
     commander_1.program
         .command('open-settings')
         .description('Opens the app editor for a given AppDefinition')
-        .option('--definition-id  [defId]', 'The id of your app\'s definition')
+        .option('--definition-id  [defId]', "The id of your app's definition")
         .option('--host [host]', 'Contentful subdomain to use, e.g. "api.contentful.com"')
         .action(async (options) => {
         await runCommand(index_1.open, options);
@@ -53,7 +53,7 @@ async function runCommand(command, options) {
         .command('bundle-cleanup')
         .description('Removes old, non-active bundles, only keeps the 50 most recent ones')
         .option('--organization-id [orgId]', 'The id of your organization')
-        .option('--definition-id  [defId]', 'The id of your app\'s definition')
+        .option('--definition-id  [defId]', "The id of your app's definition")
         .option('--token [accessToken]', 'Your content management access token')
         .option('--keep [keepAmount]', 'The amount of bundles that should remain')
         .option('--host [host]', 'Contentful subdomain to use, e.g. "api.contentful.com"')
@@ -69,7 +69,7 @@ async function runCommand(command, options) {
     commander_1.program
         .command('install')
         .description('Opens a picker to select the space and environment for installing the app associated with a given AppDefinition')
-        .option('--definition-id  [defId]', 'The id of your app\'s definition')
+        .option('--definition-id  [defId]', "The id of your app's definition")
         .option('--host [host]', 'Contentful subdomain to use, e.g. "api.contentful.com"')
         .action(async (options) => {
         await runCommand(index_1.install, options);
@@ -97,7 +97,7 @@ async function runCommand(command, options) {
         .description('Upsert Action(s) for an App')
         .option('-m, --manifest-file <path>', 'Contentful app manifest file path')
         .option('--organization-id [orgId]', 'The id of your organization')
-        .option('--definition-id  [defId]', 'The id of your app\'s definition')
+        .option('--definition-id  [defId]', "The id of your app's definition")
         .option('--token [accessToken]', 'Your content management access token')
         .option('--host [host]', 'Contentful subdomain to use, e.g. "api.contentful.com"')
         .action(async (options) => {

package/lib/upload/create-app-bundle.d.ts

@@ -1,3 +1,4 @@
 import { UploadSettings } from '../types';
 export declare function createAppBundleFromUpload(settings: UploadSettings, appUploadId: string): Promise<import("contentful-management").AppBundle | null>;
+export declare function processCreateAppBundleError(err: any): any;
 export declare function createAppBundleFromSettings(settings: UploadSettings): Promise<void | import("contentful-management").AppBundle>;

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAppBundleFromUpload = createAppBundleFromUpload;
+exports.processCreateAppBundleError = processCreateAppBundleError;
 exports.createAppBundleFromSettings = createAppBundleFromSettings;
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
@@ -31,21 +32,36 @@ async function createAppBundleFromUpload(settings, appUploadId) {
         });
     }
     catch (err) {
-        try {
-            const message = JSON.parse(err.message);
-            if (message['status'] == 403 && message.details?.reasons) {
-                (0, utils_1.showCreationError)('app upload', message['details']['reasons']);
+        (0, utils_1.showCreationError)('app upload', processCreateAppBundleError(err));
+    }
+    bundleSpinner.stop();
+    return appBundle;
+}
+function processCreateAppBundleError(err) {
+    try {
+        const message = JSON.parse(err.message);
+        const reasons = message.details?.reasons;
+        if (message.status !== 403 || !reasons) {
+            return err.message;
+        }
+        if (message['status'] == 403 && message.details?.reasons) {
+            if (reasons.includes('Not entitled to App Functions.')) {
+                return 'Your app seems to be using App Functions, which your organization is not entitled to. Remove your app function, or upgrade your account to proceed with your app upload.';
+            }
+            else if (reasons.includes('App Functions beta not enabled.')) {
+                return 'Your app seems to be using App Functions, which your organization has not enabled in the Preview Center. In the Contentful web app, go to the Account Menu → Preview Center → App Functions to enable and proceed with your app upload.';
             }
             else {
-                (0, utils_1.showCreationError)('app upload', message);
+                return reasons;
             }
         }
-        catch (e) {
-            (0, utils_1.showCreationError)('app upload', err.message);
+        else {
+            return reasons;
         }
     }
-    bundleSpinner.stop();
-    return appBundle;
+    catch (e) {
+        return err.message;
+    }
 }
 async function createAppBundleFromSettings(settings) {
     let appUpload = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/app-scripts",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "A collection of scripts for building Contentful Apps",
   "author": "Contentful GmbH",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "contentful-app-scripts": "lib/bin.js"
   },
   "scripts": {
-    "prettier": "prettier **/*.js --write --ignore-path .gitignore",
+    "prettier": "prettier **/*.ts --write --ignore-path .gitignore",
     "lint": "eslint ./src",
     "lint:fix": "npm run lint -- --fix",
     "test": "ts-mocha \"./{,!(node_modules)/**/}*.test.ts\"",
@@ -67,7 +67,7 @@
     "tiged": "^2.12.7",
     "zod": "^3.24.1"
   },
-  "gitHead": "c86c0866476bf0cae4f72ff8730c2ff9c120a593",
+  "gitHead": "b88a46b43fc31d1da7cf625f32a5beb03badf99e",
   "devDependencies": {
     "@types/adm-zip": "0.5.7",
     "@types/analytics-node": "3.1.14",