@appsemble/cli 0.24.8 → 0.24.10

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.24.8/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.24.10/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.24.8/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.24.8)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.24.10/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.24.10)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -304,5 +304,5 @@ appsemble run-cronjobs --interval 30
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.24.8/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.24.10/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/commands/app/publish.d.ts

@@ -15,6 +15,8 @@ interface PublishAppArguments extends BaseArguments {
     demoMode: boolean;
     dryRun: boolean;
     resources: boolean;
+    assets: boolean;
+    assetsClonable: boolean;
     modifyContext: boolean;
     visibility: AppVisibility;
     sentryDsn: string;

package/commands/app/publish.js

@@ -48,6 +48,14 @@ export function builder(yargs) {
         .option('resources', {
         describe: 'Whether the resources from the `resources` directory should be created after publishing the app. The names of subdirectories are used as the name of the resource, otherwise the names of top level resource .json files are used instead.',
         type: 'boolean',
+    })
+        .option('assets', {
+        describe: 'Whether the assets from the `assets` directory should be created after publishing the app.',
+        type: 'boolean',
+    })
+        .option('assets-clonable', {
+        describe: 'Whether published assets should be clonable. Ignored if assets equals false.',
+        type: 'boolean',
     })
         .option('modify-context', {
         describe: 'If the app context is specified, modify it for the current context to include the id of the published app.',

package/commands/serve.js

@@ -67,7 +67,8 @@ export async function handler(argv) {
     const appSecurity = appsembleApp.definition.security;
     const appMembers = [
         {
-            id: '1',
+            userId: '1',
+            memberId: '1',
             name: 'dev',
             primaryEmail: 'dev@example.com',
             role: passedUserRole || (appSecurity === null || appSecurity === void 0 ? void 0 : appSecurity.default.role),

package/lib/app.d.ts

@@ -56,6 +56,14 @@ interface PublishAppParams {
      * Whether resources from the `resources` directory should be published after publishing the app.
      */
     resources: boolean;
+    /**
+     * Whether assets from the `assets` directory should be published after publishing the app.
+     */
+    assets: boolean;
+    /**
+     * Whether published assets should be clonable. Ignored if `assets` equals false.
+     */
+    assetsClonable: boolean;
     /**
      * If the app context is specified,
      * modify it for the current context to include the id of the published app.
@@ -182,7 +190,7 @@ export declare function updateApp({ clientCredentials, context, force, path, ...
  *
  * @param options The options to use for publishing an app.
  */
-export declare function publishApp({ clientCredentials, context, dryRun, modifyContext, path, resources, ...options }: PublishAppParams): Promise<void>;
+export declare function publishApp({ assets, assetsClonable, clientCredentials, context, dryRun, modifyContext, path, resources, ...options }: PublishAppParams): Promise<void>;
 /**
  * Resolve the app’s ID and remote based on the app context.
  *

package/lib/app.js

@@ -5,7 +5,10 @@ import { inspect } from 'node:util';
 import { AppsembleError, authenticate, logger, opendirSafe, readData, writeData, } from '@appsemble/node-utils';
 import { extractAppMessages, has, normalizeBlockName } from '@appsemble/utils';
 import axios from 'axios';
+import fg from 'fast-glob';
 import FormData from 'form-data';
+import normalizePath from 'normalize-path';
+import { publishAsset } from './asset.js';
 import { traverseBlockThemes } from './block.js';
 import { coerceRemote } from './coercers.js';
 import { getProjectBuildConfig } from './config.js';
@@ -416,7 +419,7 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
  *
  * @param options The options to use for publishing an app.
  */
-export async function publishApp({ clientCredentials, context, dryRun, modifyContext, path, resources, ...options }) {
+export async function publishApp({ assets, assetsClonable, 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;
     const file = await stat(path);
     const formData = new FormData();
@@ -509,6 +512,28 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
         // After uploading the app, upload block styles and messages if they are available
         await traverseBlockThemes(path, data.id, remote, false);
         await uploadMessages(path, data.id, remote, false);
+        if (assets && existsSync(join(path, 'assets'))) {
+            const assetsPath = join(path, 'assets');
+            const assetFiles = await readdir(assetsPath);
+            const normalizedPaths = assetFiles.map((assetFile) => normalizePath(join(assetsPath, assetFile)));
+            const files = await fg(normalizedPaths, { absolute: true, onlyFiles: true });
+            try {
+                logger.info(`Publishing ${files.length} asset(s)`);
+                for (const assetFilePath of files) {
+                    await publishAsset({
+                        name: parse(assetFilePath).name,
+                        appId: data.id,
+                        path: assetFilePath,
+                        remote,
+                        clonable: assetsClonable,
+                    });
+                }
+            }
+            catch (error) {
+                logger.error('Something went wrong when creating assets:');
+                logger.error(error);
+            }
+        }
         if (resources && existsSync(join(path, 'resources'))) {
             const resourcePath = join(path, 'resources');
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.24.8",
+  "version": "0.24.10",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -42,9 +42,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.24.8",
-    "@appsemble/types": "0.24.8",
-    "@appsemble/utils": "0.24.8",
+    "@appsemble/node-utils": "0.24.10",
+    "@appsemble/types": "0.24.10",
+    "@appsemble/utils": "0.24.10",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^4.0.0",
     "@odata/parser": "^0.2.0",
@@ -86,7 +86,7 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.24.8",
+    "@appsemble/types": "0.24.10",
     "@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.24.8
+        version: 0.24.10
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.24.8
+        version: 0.24.10
         parameters:
           icon: arrow-left
         actions:

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

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

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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