@appsemble/cli 0.27.7 → 0.27.9

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.27.7/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.27.9/config/assets/logo.svg) Appsemble CLI
 
 > Manage apps and blocks from the command line.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/cli)](https://www.npmjs.com/package/@appsemble/cli)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.27.7/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.27.7)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.27.9/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.27.9)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -157,6 +157,24 @@ Similarly, to update an app using an app directory, run the following command:
 appsemble app update --id <app-id> <path/to/updated app>.
 ```
 
+If you want to update settings for an app, run the following command:
+
+```sh
+appsemble app patch --id <app-id>
+```
+
+Use `--help` flag with the above command to view the supported arguments.
+
+---
+
+**🛈NOTE**
+
+> The `app patch` command supports updating the `locked` property of an app, locked property is
+> updated before other properties. If you set the locked property to `fullLock`, any other changes
+> won’t be applied unless you are using `--force` flag.
+
+---
+
 To delete an app using the CLI use the following command:
 
 ```sh
@@ -169,10 +187,10 @@ To export an app as a zip file, run the following:
 appsemble app export --id <app-id>
 ```
 
-Supported arguments for this app are `resources`, `assets` and `path`. Resources is used to specify
-whether to include the resources in the exported file, the same can be applied to assets and path is
-the path of the folder where you want to put your downloaded file. The default path is `./apps`, and
-resources and assets are by default `false`.
+Supported arguments for this command are `resources`, `assets` and `path`. Resources is used to
+specify whether to include the resources in the exported file, the same can be applied to assets and
+path is the path of the folder where you want to put your downloaded file. The default path is
+`./apps`, and resources and assets are by default `false`.
 
 To import an app from a zip file, use the following command:
 
@@ -305,5 +323,5 @@ appsemble run-cronjobs --interval 30
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.27.7/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.27.9/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/commands/app/index.js

@@ -3,6 +3,7 @@ import * as remove from './delete.js';
 import * as exportApp from './export.js';
 import * as extractMessages from './extract-messages.js';
 import * as importApp from './import.js';
+import * as patch from './patch.js';
 import * as publish from './publish.js';
 import * as update from './update.js';
 export { noop as handler } from '@appsemble/utils';
@@ -16,6 +17,7 @@ export function builder(yargs) {
         .command(exportApp)
         .command(extractMessages)
         .command(importApp)
+        .command(patch)
         .command(update)
         .demandCommand(1);
 }

package/commands/app/patch.d.ts

@@ -0,0 +1,22 @@
+import { type AppLock, type AppVisibility } from '@appsemble/types';
+import { type Argv } from 'yargs';
+import { type BaseArguments } from '../../types.js';
+interface PatchAppArguments extends BaseArguments {
+    id: number;
+    iconBackground?: string;
+    force?: boolean;
+    path?: string;
+    visibility?: AppVisibility;
+    showAppDefinition?: boolean;
+    template?: boolean;
+    demoMode?: boolean;
+    locked?: AppLock;
+    showAppsembleOAuth2Login?: boolean;
+    showAppsembleLogin?: boolean;
+    enableSelfRegistration?: boolean;
+}
+export declare const command = "patch";
+export declare const description = "Change the settings of an app without having the entire source.";
+export declare function builder(yargs: Argv): Argv<any>;
+export declare function handler({ clientCredentials, id, remote, ...args }: PatchAppArguments): Promise<void>;
+export {};

package/commands/app/patch.js

@@ -0,0 +1,115 @@
+import { authenticate, logger } from '@appsemble/node-utils';
+import axios from 'axios';
+import FormData from 'form-data';
+export const command = 'patch';
+export const description = 'Change the settings of an app without having the entire source.';
+export function builder(yargs) {
+    return yargs
+        .option('id', {
+        description: 'Id of the app to patch.',
+        demandOption: true,
+    })
+        .option('iconBackground', {
+        description: 'The background color to use for the icon in opaque contexts.',
+    })
+        .option('path', {
+        description: 'Path to be used to determine the URL path of the app',
+    })
+        .option('visibility', {
+        description: 'Visibility of the app in the public app store.',
+        choices: ['public', 'unlisted', 'private'],
+    })
+        .option('showAppDefinition', {
+        description: 'Whether to expose the app definition in Appsemble studio.',
+        type: 'boolean',
+    })
+        .option('template', {
+        description: 'Whether to mark the app as template',
+        type: 'boolean',
+    })
+        .option('demoMode', {
+        description: 'Whether the app should be used in demo mode',
+        type: 'boolean',
+    })
+        .option('locked', {
+        description: 'Change the value of AppLock for your app.',
+        type: 'string',
+        choices: ['fullLock', 'studioLock', 'unlocked'],
+    })
+        .option('showAppsembleOAuth2Login', {
+        description: 'Whether the Appsemble OAuth2 login method should be shown',
+        type: 'boolean',
+    })
+        .option('showAppsembleLogin', {
+        description: 'Whether the Appsemble password login method should be shown',
+        type: 'boolean',
+    })
+        .option('enableSelfRegistration', {
+        description: 'Whether new users should be able to register themselves',
+        type: 'boolean',
+    })
+        .option('force', {
+        description: 'Whether the lock property should be ignored',
+        type: 'boolean',
+    });
+}
+export async function handler({ clientCredentials, id, remote, ...args }) {
+    await authenticate(remote, 'apps:write', clientCredentials);
+    const formData = new FormData();
+    if (args.path) {
+        logger.info(`Setting app path to ${args.path}`);
+        formData.append('path', args.path);
+    }
+    if (args.force) {
+        formData.append('force', String(args.force));
+    }
+    if (args.demoMode) {
+        logger.info(`Setting app demo mode to ${args.demoMode}`);
+        formData.append('demoMode', String(args.demoMode));
+    }
+    if (args.template) {
+        logger.info(`Setting template to ${args.template}`);
+        formData.append('template', String(args.template));
+    }
+    if (args.visibility) {
+        logger.info(`Setting app visibility to ${args.visibility}`);
+        formData.append('visibility', args.visibility);
+    }
+    if (args.iconBackground) {
+        logger.info(`Setting app icon background to ${args.iconBackground}`);
+        formData.append('iconBackground', args.iconBackground);
+    }
+    if (args.showAppDefinition) {
+        logger.info(`Setting showAppDefinition to ${args.showAppDefinition}`);
+        formData.append('showAppDefinition', String(args.showAppDefinition));
+    }
+    if (args.showAppsembleLogin) {
+        logger.info(`Setting showAppsembleLogin to ${args.showAppsembleLogin}`);
+        formData.append('showAppsembleLogin', String(args.showAppsembleLogin));
+    }
+    if (args.showAppsembleOAuth2Login) {
+        logger.info(`Setting showAppsembleOAuth2Login to ${args.showAppsembleOAuth2Login}`);
+        formData.append('showAppsembleOAuth2Login', String(args.showAppsembleOAuth2Login));
+    }
+    if (args.enableSelfRegistration) {
+        logger.info(`Setting enableSelfRegistration to ${args.enableSelfRegistration}`);
+        formData.append('enableSelfRegistration', String(args.enableSelfRegistration));
+    }
+    try {
+        if (args.locked) {
+            await axios.post(`api/apps/${id}/lock`, {
+                locked: args.locked,
+            });
+            logger.info(`Successfully set app lock value for app with id ${id} to ${args.locked}`);
+            if (!formData.getLengthSync()) {
+                return;
+            }
+        }
+        await axios.patch(`/api/apps/${id}`, formData);
+        logger.info(`Successfully updated app with id ${id}`);
+    }
+    catch (error) {
+        logger.error(error);
+    }
+}
+//# sourceMappingURL=patch.js.map

package/commands/app/publish.js

@@ -14,7 +14,7 @@ export function builder(yargs) {
         describe: 'If specified, use the specified context from .appsemblerc.yaml',
     })
         .option('organization', {
-        describe: 'The organization ID the app should be published for.',
+        describe: 'The organization ID the app should be published under.',
     })
         .option('icon', {
         describe: 'The icon to upload. By default "icon.png" in the app directory is used.',
@@ -27,6 +27,9 @@ export function builder(yargs) {
         .option('maskable-icon', {
         describe: 'The maskable icon to upload. By default "maskable-icon.png" in the app directory is used.',
         coerce: coerceFile,
+    })
+        .option('variant', {
+        describe: 'The shared variant to use instead.',
     })
         .option('visibility', {
         describe: 'Visibility of the app in the public app store.',

package/commands/app/update.js

@@ -29,6 +29,9 @@ export function builder(yargs) {
         .option('maskable-icon', {
         describe: 'The maskable icon to upload. By default "maskable-icon.png" in the app directory is used.',
         coerce: coerceFile,
+    })
+        .option('variant', {
+        describe: 'The shared variant to use instead.',
     })
         .option('visibility', {
         describe: 'Visibility of the app in the public app store.',

package/commands/serve.js

@@ -56,7 +56,7 @@ export function builder(yargs) {
 export async function handler(argv) {
     setArgv(argv);
     const appPath = join(process.cwd(), argv.path);
-    const [, , , appsembleApp] = await traverseAppDirectory(appPath, 'development', new FormData());
+    const [, , appsembleApp] = await traverseAppDirectory(appPath, new FormData());
     const appRoles = appsembleApp.definition.roles;
     const passedUserRole = argv['user-role'];
     if (passedUserRole && !(appRoles === null || appRoles === void 0 ? void 0 : appRoles.includes(passedUserRole))) {

package/lib/app.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
 import { type ReadStream } from 'node:fs';
-import { type App, type AppsembleContext, type AppsembleRC, type AppVisibility } from '@appsemble/types';
+import { type App, type AppsembleRC, type AppVisibility } from '@appsemble/types';
 import FormData from 'form-data';
 interface PublishAppParams {
     /**
@@ -20,6 +20,10 @@ interface PublishAppParams {
      * The path in which the App YAML is located.
      */
     path: string;
+    /**
+     * The shared variant to use instead.
+     */
+    variant?: string;
     /**
      * Visibility of the app in the public app store.
      */
@@ -103,6 +107,10 @@ interface UpdateAppParams {
      * The path in which the App YAML is located.
      */
     path: string;
+    /**
+     * The shared variant to use instead.
+     */
+    variant?: string;
     /**
      * Visibility of the app in the public app store.
      */
@@ -164,11 +172,10 @@ interface UpdateAppParams {
  * Traverses an app directory and appends the files it finds to the given FormData object.
  *
  * @param path The path of the app directory to traverse.
- * @param context The Context to use from `.appsemblerc.yaml`.
  * @param formData The FormData object to append the results into..
  * @returns The context from `.appsemblerc.yaml` if a match was found.
  */
-export declare function traverseAppDirectory(path: string, context: string, formData: FormData): Promise<[AppsembleContext, AppsembleRC, string, App]>;
+export declare function traverseAppDirectory(path: string, formData: FormData): Promise<[AppsembleRC, string, App]>;
 /**
  * Export an app as a zip file.
  *
@@ -203,13 +210,13 @@ export declare function writeAppMessages(path: string, languages: string[], veri
  *
  * @param argv The command line options used for updating the app.
  */
-export declare function updateApp({ assets, clientCredentials, context, force, path, resources, ...options }: UpdateAppParams): Promise<void>;
+export declare function updateApp({ clientCredentials, context, force, path, ...options }: UpdateAppParams): Promise<void>;
 /**
  * Publish a new app.
  *
  * @param options The options to use for publishing an app.
  */
-export declare function publishApp({ assets, clientCredentials, context, dryRun, modifyContext, path, resources, ...options }: PublishAppParams): Promise<void>;
+export declare function publishApp({ clientCredentials, context, dryRun, modifyContext, path, ...options }: PublishAppParams): Promise<void>;
 /**
  * Resolve the app’s ID and remote based on the app context.
  *

package/lib/app.js

@@ -1,4 +1,4 @@
-import { createReadStream, createWriteStream, existsSync } from 'node:fs';
+import { cpSync, createReadStream, createWriteStream, existsSync } from 'node:fs';
 import { mkdir, readdir, readFile, rm, stat } from 'node:fs/promises';
 import { basename, dirname, join, parse, relative, resolve } from 'node:path';
 import { inspect } from 'node:util';
@@ -20,21 +20,25 @@ import { publishResourcesRecursively } from './resource.js';
  * Traverses an app directory and appends the files it finds to the given FormData object.
  *
  * @param path The path of the app directory to traverse.
- * @param context The Context to use from `.appsemblerc.yaml`.
  * @param formData The FormData object to append the results into..
  * @returns The context from `.appsemblerc.yaml` if a match was found.
  */
-export async function traverseAppDirectory(path, context, formData) {
-    let discoveredContext;
+export async function traverseAppDirectory(path, formData) {
     let rc;
-    let iconPath;
-    let maskableIconPath;
     let yaml;
     let controllerPath;
     let controllerBuildConfig;
     let controllerBuildResult;
     let controllerCode;
     let controllerImplementations;
+    let supportedLanguages = new Set();
+    try {
+        const languageFiles = await readdir(join(path, 'i18n'));
+        supportedLanguages = new Set(languageFiles.map((lang) => lang.split('.json')[0].toLowerCase()));
+    }
+    catch {
+        logger.warn(`Could not read ${join(path, 'i18n')}. No supported languages found.`);
+    }
     const gatheredData = {
         screenshotUrls: [],
     };
@@ -48,10 +52,6 @@ export async function traverseAppDirectory(path, context, formData) {
                     formData.append('iconBackground', rc.iconBackground);
                     gatheredData.iconBackground = rc.iconBackground;
                 }
-                if (context && has(rc === null || rc === void 0 ? void 0 : rc.context, context)) {
-                    discoveredContext = rc.context[context];
-                    logger.verbose(`Using context: ${inspect(discoveredContext, { colors: true })}`);
-                }
                 break;
             case 'app-definition.yaml': {
                 logger.info(`Using app definition from ${filepath}`);
@@ -66,11 +66,9 @@ export async function traverseAppDirectory(path, context, formData) {
             }
             case 'icon.png':
             case 'icon.svg':
-                iconPath = filepath;
                 gatheredData.iconUrl = filepath;
                 return;
             case 'maskable-icon.png':
-                maskableIconPath = filepath;
                 return;
             case 'readme.md':
                 logger.info(`Including longDescription from ${filepath}`);
@@ -79,13 +77,28 @@ export async function traverseAppDirectory(path, context, formData) {
                 return;
             case 'screenshots':
                 return opendirSafe(filepath, (screenshotPath, screenshotStat) => {
-                    logger.info(`Adding screenshot ${screenshotPath} 🖼️`);
-                    if (!screenshotStat.isFile()) {
-                        throw new AppsembleError(`Expected ${screenshotPath} to be an image file`);
+                    if (screenshotStat.isDirectory() &&
+                        !['screenshots', ...supportedLanguages].includes(screenshotStat.name)) {
+                        logger.warn(`Unsupported directory name at ${screenshotPath}. Skipping...`);
                     }
-                    formData.append('screenshots', createReadStream(screenshotPath));
-                    gatheredData.screenshotUrls.push(basename(screenshotPath));
-                }, { allowMissing: true });
+                    if (screenshotStat.isFile()) {
+                        const screenshotDirectoryPath = dirname(screenshotPath);
+                        const screenshotDirectoryName = basename(screenshotDirectoryPath);
+                        if (!['screenshots', ...supportedLanguages].includes(screenshotDirectoryName)) {
+                            return;
+                        }
+                        const screenshotName = basename(screenshotPath);
+                        const language = supportedLanguages.has(screenshotDirectoryName)
+                            ? screenshotDirectoryName
+                            : 'unspecified';
+                        const tmpFilePath = join(screenshotDirectoryPath, `${language}-${screenshotName}`);
+                        cpSync(screenshotPath, tmpFilePath);
+                        logger.info(`Adding screenshot ${tmpFilePath} 🖼️`);
+                        formData.append('screenshots', createReadStream(tmpFilePath));
+                        gatheredData.screenshotUrls.push(basename(screenshotPath));
+                        rm(tmpFilePath);
+                    }
+                }, { allowMissing: true, recursive: true });
             case 'theme':
                 return opendirSafe(filepath, async (themeDir, themeStat) => {
                     const name = themeStat.name.toLowerCase();
@@ -117,6 +130,34 @@ export async function traverseAppDirectory(path, context, formData) {
     if (yaml === undefined) {
         throw new AppsembleError('No app definition found');
     }
+    return [rc, yaml, gatheredData];
+}
+async function retrieveContext(path, context) {
+    let rc;
+    let discoveredContext;
+    let iconPath;
+    let maskableIconPath;
+    await opendirSafe(path, async (filepath, filestat) => {
+        switch (filestat.name.toLowerCase()) {
+            case '.appsemblerc.yaml':
+                logger.info(`Reading app settings from ${filepath}`);
+                [rc] = await readData(filepath);
+                if (context && has(rc === null || rc === void 0 ? void 0 : rc.context, context)) {
+                    discoveredContext = rc.context[context];
+                    logger.verbose(`Using context: ${inspect(discoveredContext, { colors: true })}`);
+                }
+                break;
+            case 'icon.png':
+            case 'icon.svg':
+                iconPath = filepath;
+                return;
+            case 'maskable-icon.png':
+                maskableIconPath = filepath;
+                break;
+            default:
+                break;
+        }
+    });
     discoveredContext || (discoveredContext = {});
     discoveredContext.icon = discoveredContext.icon
         ? resolve(path, discoveredContext.icon)
@@ -124,7 +165,7 @@ export async function traverseAppDirectory(path, context, formData) {
     discoveredContext.maskableIcon = discoveredContext.maskableIcon
         ? resolve(path, discoveredContext.maskableIcon)
         : maskableIconPath;
-    return [discoveredContext, rc, yaml, gatheredData];
+    return discoveredContext;
 }
 /**
  * Export an app as a zip file.
@@ -412,38 +453,45 @@ This block version is not used in the app`);
  *
  * @param argv The command line options used for updating the app.
  */
-export async function updateApp({ assets, clientCredentials, context, force, path, resources, ...options }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+export async function updateApp({ clientCredentials, context, force, path, ...options }) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const file = await stat(path);
     const formData = new FormData();
-    let appsembleContext;
+    const appsembleContext = await retrieveContext(path, context);
+    let yaml;
+    let filename = relative(process.cwd(), path);
+    const variant = (_b = (_a = appsembleContext.variant) !== null && _a !== void 0 ? _a : options.variant) !== null && _b !== void 0 ? _b : context;
     let appVariantPath = path;
-    if (existsSync(join(path, 'variants', context))) {
-        await applyAppVariant(path, context);
-        appVariantPath = join(dirname(path), `${basename(path)}-${context}`);
+    if (variant && existsSync(join(path, 'variants', variant))) {
+        await applyAppVariant(path, variant);
+        appVariantPath = join(dirname(path), `${basename(path)}-${variant}`);
     }
     else {
-        logger.warn(`App variant ${context} is not defined. Using default app.`);
+        logger.warn(`App variant ${variant} is not defined in ${join(path, 'variants')}. Using default app.`);
     }
     if (file.isFile()) {
         const [, data] = await readData(appVariantPath);
+        yaml = data;
         formData.append('yaml', data);
     }
     else {
-        [appsembleContext] = await traverseAppDirectory(appVariantPath, context, formData);
-    }
-    const remote = (_a = appsembleContext.remote) !== null && _a !== void 0 ? _a : options.remote;
-    const id = (_b = appsembleContext.id) !== null && _b !== void 0 ? _b : options.id;
-    const template = (_d = (_c = appsembleContext.template) !== null && _c !== void 0 ? _c : options.template) !== null && _d !== void 0 ? _d : false;
-    const assetsClonable = (_f = (_e = appsembleContext.assetsClonable) !== null && _e !== void 0 ? _e : options.assetsClonable) !== null && _f !== void 0 ? _f : false;
-    const demoMode = (_h = (_g = appsembleContext.demoMode) !== null && _g !== void 0 ? _g : options.demoMode) !== null && _h !== void 0 ? _h : false;
-    const visibility = (_j = appsembleContext.visibility) !== null && _j !== void 0 ? _j : options.visibility;
-    const iconBackground = (_k = appsembleContext.iconBackground) !== null && _k !== void 0 ? _k : options.iconBackground;
-    const icon = (_l = options.icon) !== null && _l !== void 0 ? _l : appsembleContext.icon;
-    const maskableIcon = (_m = options.maskableIcon) !== null && _m !== void 0 ? _m : appsembleContext.maskableIcon;
-    const sentryDsn = (_o = appsembleContext.sentryDsn) !== null && _o !== void 0 ? _o : options.sentryDsn;
-    const sentryEnvironment = (_p = appsembleContext.sentryEnvironment) !== null && _p !== void 0 ? _p : options.sentryEnvironment;
-    const googleAnalyticsId = (_q = appsembleContext.googleAnalyticsId) !== null && _q !== void 0 ? _q : options.googleAnalyticsId;
+        [, yaml] = await traverseAppDirectory(appVariantPath, formData);
+        filename = join(filename, 'app-definition.yaml');
+    }
+    const remote = (_c = appsembleContext.remote) !== null && _c !== void 0 ? _c : options.remote;
+    const id = (_d = appsembleContext.id) !== null && _d !== void 0 ? _d : options.id;
+    const template = (_f = (_e = appsembleContext.template) !== null && _e !== void 0 ? _e : options.template) !== null && _f !== void 0 ? _f : false;
+    const assetsClonable = (_h = (_g = appsembleContext.assetsClonable) !== null && _g !== void 0 ? _g : options.assetsClonable) !== null && _h !== void 0 ? _h : false;
+    const demoMode = (_k = (_j = appsembleContext.demoMode) !== null && _j !== void 0 ? _j : options.demoMode) !== null && _k !== void 0 ? _k : false;
+    const visibility = (_l = appsembleContext.visibility) !== null && _l !== void 0 ? _l : options.visibility;
+    const iconBackground = (_m = appsembleContext.iconBackground) !== null && _m !== void 0 ? _m : options.iconBackground;
+    const icon = (_o = options.icon) !== null && _o !== void 0 ? _o : appsembleContext.icon;
+    const maskableIcon = (_p = options.maskableIcon) !== null && _p !== void 0 ? _p : appsembleContext.maskableIcon;
+    const sentryDsn = (_q = appsembleContext.sentryDsn) !== null && _q !== void 0 ? _q : options.sentryDsn;
+    const sentryEnvironment = (_r = appsembleContext.sentryEnvironment) !== null && _r !== void 0 ? _r : options.sentryEnvironment;
+    const googleAnalyticsId = (_s = appsembleContext.googleAnalyticsId) !== null && _s !== void 0 ? _s : options.googleAnalyticsId;
+    const resources = (_t = appsembleContext.resources) !== null && _t !== void 0 ? _t : options.resources;
+    const assets = (_u = appsembleContext.assets) !== null && _u !== void 0 ? _u : options.assets;
     const { appLock } = appsembleContext;
     logger.info(`App id: ${id}`);
     logger.verbose(`App remote: ${remote}`);
@@ -461,12 +509,12 @@ export async function updateApp({ assets, clientCredentials, context, force, pat
     formData.append('iconBackground', iconBackground);
     if (icon) {
         const realIcon = typeof icon === 'string' ? createReadStream(icon) : icon;
-        logger.info(`Using icon from ${(_r = realIcon.path) !== null && _r !== void 0 ? _r : 'stdin'}`);
+        logger.info(`Using icon from ${(_v = realIcon.path) !== null && _v !== void 0 ? _v : 'stdin'}`);
         formData.append('icon', realIcon);
     }
     if (maskableIcon) {
         const realIcon = typeof maskableIcon === 'string' ? createReadStream(maskableIcon) : maskableIcon;
-        logger.info(`Using maskable icon from ${(_s = realIcon.path) !== null && _s !== void 0 ? _s : 'stdin'}`);
+        logger.info(`Using maskable icon from ${(_w = realIcon.path) !== null && _w !== void 0 ? _w : 'stdin'}`);
         formData.append('maskableIcon', realIcon);
     }
     if (sentryDsn) {
@@ -499,19 +547,16 @@ export async function updateApp({ assets, clientCredentials, context, force, pat
     }
     let data;
     try {
-        data = await axios
-            .patch(`/api/apps/${id}`, formData, { baseURL: remote })
-            .then((r) => r.data);
+        ({ data } = await axios.patch(`/api/apps/${id}`, formData, { baseURL: remote }));
     }
     catch (error) {
         if (!axios.isAxiosError(error)) {
             throw error;
         }
-        if (((_u = (_t = error.response) === null || _t === void 0 ? void 0 : _t.data) === null || _u === void 0 ? void 0 : _u.message) !== 'App validation failed') {
+        if (((_y = (_x = error.response) === null || _x === void 0 ? void 0 : _x.data) === null || _y === void 0 ? void 0 : _y.message) !== 'App validation failed') {
             throw error;
         }
-        logger.error(error.response.data);
-        process.exit(1);
+        throw new AppsembleError(printAxiosError(filename, yaml, error.response.data.data.errors));
     }
     if (file.isDirectory()) {
         // After uploading the app, upload block styles and messages if they are available
@@ -539,21 +584,22 @@ export async function updateApp({ assets, clientCredentials, context, force, pat
  *
  * @param options The options to use for publishing an app.
  */
-export async function publishApp({ assets, clientCredentials, context, dryRun, modifyContext, path, resources, ...options }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+export async function publishApp({ clientCredentials, context, dryRun, modifyContext, path, ...options }) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     const file = await stat(path);
     const formData = new FormData();
-    let appsembleContext;
+    const appsembleContext = await retrieveContext(path, context);
     let rc;
     let yaml;
     let filename = relative(process.cwd(), path);
+    const variant = (_b = (_a = appsembleContext.variant) !== null && _a !== void 0 ? _a : options.variant) !== null && _b !== void 0 ? _b : context;
     let appVariantPath = path;
-    if (existsSync(join(path, 'variants', context))) {
-        await applyAppVariant(path, context);
-        appVariantPath = join(dirname(path), `${basename(path)}-${context}`);
+    if (variant && existsSync(join(path, 'variants', variant))) {
+        await applyAppVariant(path, variant);
+        appVariantPath = join(dirname(path), `${basename(path)}-${variant}`);
     }
     else {
-        logger.warn(`App variant ${context} is not defined. Using default app.`);
+        logger.warn(`App variant ${variant} is not defined in ${join(path, 'variants')}. Using default app.`);
     }
     if (file.isFile()) {
         // Assuming file is App YAML
@@ -562,21 +608,23 @@ export async function publishApp({ assets, clientCredentials, context, dryRun, m
         formData.append('yaml', data);
     }
     else {
-        [appsembleContext, rc, yaml] = await traverseAppDirectory(appVariantPath, context, formData);
+        [rc, yaml] = await traverseAppDirectory(appVariantPath, formData);
         filename = join(filename, 'app-definition.yaml');
     }
-    const remote = (_a = appsembleContext.remote) !== null && _a !== void 0 ? _a : options.remote;
-    const organizationId = (_b = appsembleContext.organization) !== null && _b !== void 0 ? _b : options.organization;
-    const template = (_d = (_c = appsembleContext.template) !== null && _c !== void 0 ? _c : options.template) !== null && _d !== void 0 ? _d : false;
-    const assetsClonable = (_f = (_e = appsembleContext.assetsClonable) !== null && _e !== void 0 ? _e : options.assetsClonable) !== null && _f !== void 0 ? _f : false;
-    const demoMode = (_h = (_g = appsembleContext.demoMode) !== null && _g !== void 0 ? _g : options.demoMode) !== null && _h !== void 0 ? _h : false;
-    const visibility = (_j = appsembleContext.visibility) !== null && _j !== void 0 ? _j : options.visibility;
-    const iconBackground = (_k = appsembleContext.iconBackground) !== null && _k !== void 0 ? _k : options.iconBackground;
-    const icon = (_l = options.icon) !== null && _l !== void 0 ? _l : appsembleContext.icon;
-    const maskableIcon = (_m = options.maskableIcon) !== null && _m !== void 0 ? _m : appsembleContext.maskableIcon;
-    const sentryDsn = (_o = appsembleContext.sentryDsn) !== null && _o !== void 0 ? _o : options.sentryDsn;
-    const sentryEnvironment = (_p = appsembleContext.sentryEnvironment) !== null && _p !== void 0 ? _p : options.sentryEnvironment;
-    const googleAnalyticsId = (_q = appsembleContext.googleAnalyticsId) !== null && _q !== void 0 ? _q : options.googleAnalyticsId;
+    const remote = (_c = appsembleContext.remote) !== null && _c !== void 0 ? _c : options.remote;
+    const organizationId = (_d = appsembleContext.organization) !== null && _d !== void 0 ? _d : options.organization;
+    const template = (_f = (_e = appsembleContext.template) !== null && _e !== void 0 ? _e : options.template) !== null && _f !== void 0 ? _f : false;
+    const assetsClonable = (_h = (_g = appsembleContext.assetsClonable) !== null && _g !== void 0 ? _g : options.assetsClonable) !== null && _h !== void 0 ? _h : false;
+    const demoMode = (_k = (_j = appsembleContext.demoMode) !== null && _j !== void 0 ? _j : options.demoMode) !== null && _k !== void 0 ? _k : false;
+    const visibility = (_l = appsembleContext.visibility) !== null && _l !== void 0 ? _l : options.visibility;
+    const iconBackground = (_m = appsembleContext.iconBackground) !== null && _m !== void 0 ? _m : options.iconBackground;
+    const icon = (_o = options.icon) !== null && _o !== void 0 ? _o : appsembleContext.icon;
+    const maskableIcon = (_p = options.maskableIcon) !== null && _p !== void 0 ? _p : appsembleContext.maskableIcon;
+    const sentryDsn = (_q = appsembleContext.sentryDsn) !== null && _q !== void 0 ? _q : options.sentryDsn;
+    const sentryEnvironment = (_r = appsembleContext.sentryEnvironment) !== null && _r !== void 0 ? _r : options.sentryEnvironment;
+    const googleAnalyticsId = (_s = appsembleContext.googleAnalyticsId) !== null && _s !== void 0 ? _s : options.googleAnalyticsId;
+    const assets = (_t = appsembleContext.assets) !== null && _t !== void 0 ? _t : options.assets;
+    const resources = (_u = appsembleContext.resources) !== null && _u !== void 0 ? _u : options.resources;
     const appLock = appsembleContext.appLock || 'unlocked';
     logger.verbose(`App remote: ${remote}`);
     logger.verbose(`App organization: ${organizationId}`);
@@ -594,12 +642,12 @@ export async function publishApp({ assets, clientCredentials, context, dryRun, m
     formData.append('locked', appLock);
     if (icon) {
         const realIcon = typeof icon === 'string' ? createReadStream(icon) : icon;
-        logger.info(`Using icon from ${(_r = realIcon.path) !== null && _r !== void 0 ? _r : 'stdin'}`);
+        logger.info(`Using icon from ${(_v = realIcon.path) !== null && _v !== void 0 ? _v : 'stdin'}`);
         formData.append('icon', realIcon);
     }
     if (maskableIcon) {
         const realIcon = typeof maskableIcon === 'string' ? createReadStream(maskableIcon) : maskableIcon;
-        logger.info(`Using maskable icon from ${(_s = realIcon.path) !== null && _s !== void 0 ? _s : 'stdin'}`);
+        logger.info(`Using maskable icon from ${(_w = realIcon.path) !== null && _w !== void 0 ? _w : 'stdin'}`);
         formData.append('maskableIcon', realIcon);
     }
     if (sentryDsn) {
@@ -629,7 +677,7 @@ export async function publishApp({ assets, clientCredentials, context, dryRun, m
         if (!axios.isAxiosError(error)) {
             throw error;
         }
-        if (((_u = (_t = error.response) === null || _t === void 0 ? void 0 : _t.data) === null || _u === void 0 ? void 0 : _u.message) !== 'App validation failed') {
+        if (((_y = (_x = error.response) === null || _x === void 0 ? void 0 : _x.data) === null || _y === void 0 ? void 0 : _y.message) !== 'App validation failed') {
             throw error;
         }
         throw new AppsembleError(printAxiosError(filename, yaml, error.response.data.data.errors));
@@ -660,7 +708,7 @@ export async function publishApp({ assets, clientCredentials, context, dryRun, m
     logger.info(`Successfully published app ${data.definition.name}! 🙌`);
     logger.info(`App URL: ${protocol}//${data.path}.${data.OrganizationId}.${host}`);
     logger.info(`App store page: ${new URL(`/apps/${data.id}`, remote)}`);
-    const rcCollections = rc.context[context].collections;
+    const rcCollections = (_z = rc.context[context]) === null || _z === void 0 ? void 0 : _z.collections;
     if (Array.isArray(rcCollections)) {
         for (const collectionId of rcCollections) {
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.27.7",
+  "version": "0.27.9",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -42,9 +42,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.27.7",
-    "@appsemble/types": "0.27.7",
-    "@appsemble/utils": "0.27.7",
+    "@appsemble/node-utils": "0.27.9",
+    "@appsemble/types": "0.27.9",
+    "@appsemble/utils": "0.27.9",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^4.0.0",
     "@odata/parser": "^0.2.0",
@@ -87,7 +87,7 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.27.7",
+    "@appsemble/types": "0.27.9",
     "@types/concat-stream": "^2.0.0",
     "@types/inquirer": "^9.0.0",
     "@types/normalize-path": "^3.0.0",

package/templates/apps/empty/app-definition.yaml

@@ -6,7 +6,7 @@ pages:
   - name: Example Page A
     blocks:
       - type: action-button
-        version: 0.27.7
+        version: 0.27.9
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.27.7
+        version: 0.27.9
         parameters:
           icon: arrow-left
         actions:

package/templates/blocks/mini-jsx/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/sdk": "0.27.7",
+    "@appsemble/sdk": "0.27.9",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -2,8 +2,8 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/preact": "0.27.7",
-    "@appsemble/sdk": "0.27.7",
+    "@appsemble/preact": "0.27.9",
+    "@appsemble/sdk": "0.27.9",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -2,6 +2,6 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/sdk": "0.27.7"
+    "@appsemble/sdk": "0.27.9"
   }
 }