@appsemble/cli 0.20.9 → 0.20.12

package/lib/asset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asset.js","sourceRoot":"","sources":["asset.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAsC;AAEtC,sDAA+C;AAC/C,4CAA6C;AAC7C,kDAA0B;AAC1B,0DAAiC;AAyB1B,KAAK,UAAU,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAqB;IAChF,MAAM,QAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,IAAA,qBAAgB,EAAC,IAAI,CAAC,CAAC;IACpC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9B,IAAI,IAAI,EAAE;QACR,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAC,CAAC;KAC1C;IAED,MAAM,EACJ,IAAI,EAAE,EAAE,EAAE,EAAE,GACb,GAAG,MAAM,eAAK,CAAC,IAAI,CAAiB,aAAa,KAAK,SAAS,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACjG,mBAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,cAAc,IAAA,iBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACnF,CAAC;AAZD,kCAYC"}

package/lib/asset.ts

@@ -0,0 +1,43 @@
+import { createReadStream } from 'fs';
+
+import { logger } from '@appsemble/node-utils';
+import { normalize } from '@appsemble/utils';
+import axios from 'axios';
+import FormData from 'form-data';
+
+interface CreateAssetParams {
+  /**
+   * The name of the asset being uploaded.
+   * This must be a unique name for the app. If left empty, the ID is used instead.
+   */
+  name: string;
+
+  /**
+   * The path in which the resource JSON is located.
+   */
+  path: string;
+
+  /**
+   * The ID of the app to create a resource entry for.
+   */
+  appId: number;
+
+  /**
+   * The remote server to create the app on.
+   */
+  remote: string;
+}
+
+export async function createAsset({ appId, name, path, remote }: CreateAssetParams): Promise<void> {
+  const formData = new FormData();
+  const file = createReadStream(path);
+  formData.append('file', file);
+  if (name) {
+    formData.append('name', normalize(name));
+  }
+
+  const {
+    data: { id },
+  } = await axios.post<{ id: string }>(`/api/apps/${appId}/assets`, formData, { baseURL: remote });
+  logger.info(`Created asset ${id}${name ? ` with name ${normalize(name)}` : ''}`);
+}

package/{dist/lib → lib}/authentication.d.ts

@@ -5,9 +5,9 @@ export declare function remove({ remote }: BaseArguments): Promise<void>;
 /**
  * Login to the server using OAuth2 client credentials.
  *
- * @param remote - Host to fetch token from.
- * @param scope - The OAuth2 scope to request. This may be space separated to request
+ * @param remote Host to fetch token from.
+ * @param scope The OAuth2 scope to request. This may be space separated to request
  * multiple scopes.
- * @param inputCredentials - Client credentials passed from the command line.
+ * @param inputCredentials Client credentials passed from the command line.
  */
 export declare function authenticate(remote: string, scope: string, inputCredentials: string): Promise<void>;

package/{dist/lib → lib}/authentication.js

@@ -27,9 +27,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authenticate = exports.remove = exports.login = exports.CREDENTIALS_ENV_VAR = void 0;
+const os_1 = require("os");
 const node_utils_1 = require("@appsemble/node-utils");
 const axios_1 = __importDefault(require("axios"));
-const inquirer_1 = require("inquirer");
+const inquirer_1 = __importDefault(require("inquirer"));
+const koa_1 = __importDefault(require("koa"));
+const open_1 = __importDefault(require("open"));
+const raw_body_1 = __importDefault(require("raw-body"));
 exports.CREDENTIALS_ENV_VAR = 'APPSEMBLE_CLIENT_CREDENTIALS';
 const authorizedRemotes = new Set();
 function validate(credentials) {
@@ -38,6 +42,41 @@ function validate(credentials) {
 function getService(remote) {
     return `appsemble://${new URL(remote).host}`;
 }
+function waitForCredentials(url) {
+    return new Promise((resolve) => {
+        const app = new koa_1.default();
+        let server;
+        app.use(async (ctx) => {
+            ctx.set({
+                'access-control-allow-headers': '*',
+                'access-control-allow-methods': 'post',
+                'access-control-allow-origin': url.origin,
+            });
+            if (ctx.method === 'OPTIONS') {
+                ctx.status = 204;
+                return;
+            }
+            ctx.assert(ctx.path === '/', 404);
+            ctx.assert(ctx.method === 'POST', 405);
+            ctx.assert(ctx.is('json'), 415);
+            let credentials;
+            try {
+                ({ credentials } = JSON.parse(await (0, raw_body_1.default)(ctx.req, { encoding: 'utf8' })));
+            }
+            catch {
+                ctx.throw(400, 'Invalid JSON');
+            }
+            ctx.assert(typeof credentials === 'string' && validate(credentials), 400, 'Invalid client credentials');
+            ctx.status = 204;
+            server.close();
+            resolve(credentials);
+        });
+        server = app.listen();
+        url.searchParams.set('callback', String(server.address().port));
+        url.searchParams.set('description', (0, os_1.hostname)());
+        (0, open_1.default)(String(url));
+    });
+}
 async function getKeytar() {
     try {
         return await Promise.resolve().then(() => __importStar(require('keytar')));
@@ -65,7 +104,7 @@ async function getClientCredentials(remote, inputCredentials) {
         [choice] = choices;
     }
     else {
-        ({ choice } = await (0, inquirer_1.prompt)([
+        ({ choice } = await inquirer_1.default.prompt([
             {
                 name: 'choice',
                 message: 'Select client id to use',
@@ -87,15 +126,8 @@ async function login({ clientCredentials, remote }) {
         credentials = clientCredentials;
     }
     else {
-        node_utils_1.logger.info(`Client credentials can be registered on ${url}`);
-        ({ credentials } = await (0, inquirer_1.prompt)([
-            {
-                name: 'credentials',
-                type: 'password',
-                message: 'Enter client credentials',
-                validate,
-            },
-        ]));
+        node_utils_1.logger.info(`Opening ${url}`);
+        credentials = await waitForCredentials(url);
     }
     const [clientId, clientSecret] = credentials.split(':');
     await setPassword(getService(remote), clientId, clientSecret);
@@ -109,7 +141,7 @@ async function remove({ remote }) {
         node_utils_1.logger.warn('No client credentials are currently in use.');
         return;
     }
-    const { clientIds } = await (0, inquirer_1.prompt)([
+    const { clientIds } = await inquirer_1.default.prompt([
         {
             name: 'clientIds',
             message: 'Select client ids to delete',
@@ -126,10 +158,10 @@ exports.remove = remove;
 /**
  * Login to the server using OAuth2 client credentials.
  *
- * @param remote - Host to fetch token from.
- * @param scope - The OAuth2 scope to request. This may be space separated to request
+ * @param remote Host to fetch token from.
+ * @param scope The OAuth2 scope to request. This may be space separated to request
  * multiple scopes.
- * @param inputCredentials - Client credentials passed from the command line.
+ * @param inputCredentials Client credentials passed from the command line.
  */
 async function authenticate(remote, scope, inputCredentials) {
     const credentials = await getClientCredentials(remote, inputCredentials);

package/lib/authentication.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authentication.js","sourceRoot":"","sources":["authentication.ts"],"names":[],"mappings":"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"}

package/lib/authentication.ts

@@ -0,0 +1,193 @@
+import { AddressInfo, Server } from 'net';
+import { hostname } from 'os';
+
+import { AppsembleError, logger } from '@appsemble/node-utils';
+import { TokenResponse } from '@appsemble/types';
+import axios from 'axios';
+import inquirer from 'inquirer';
+import Koa, { Context } from 'koa';
+import open from 'open';
+import raw from 'raw-body';
+
+import { BaseArguments } from '../types';
+
+export const CREDENTIALS_ENV_VAR = 'APPSEMBLE_CLIENT_CREDENTIALS';
+
+const authorizedRemotes = new Set<string>();
+
+function validate(credentials: string): boolean {
+  return /.+:.+/.test(credentials);
+}
+
+function getService(remote: string): string {
+  return `appsemble://${new URL(remote).host}`;
+}
+
+function waitForCredentials(url: URL): Promise<string> {
+  return new Promise((resolve) => {
+    const app = new Koa();
+
+    let server: Server;
+    app.use(async (ctx: Context) => {
+      ctx.set({
+        'access-control-allow-headers': '*',
+        'access-control-allow-methods': 'post',
+        'access-control-allow-origin': url.origin,
+      });
+      if (ctx.method === 'OPTIONS') {
+        ctx.status = 204;
+        return;
+      }
+      ctx.assert(ctx.path === '/', 404);
+      ctx.assert(ctx.method === 'POST', 405);
+      ctx.assert(ctx.is('json'), 415);
+      let credentials: string;
+      try {
+        ({ credentials } = JSON.parse(await raw(ctx.req, { encoding: 'utf8' })));
+      } catch {
+        ctx.throw(400, 'Invalid JSON');
+      }
+      ctx.assert(
+        typeof credentials === 'string' && validate(credentials),
+        400,
+        'Invalid client credentials',
+      );
+      ctx.status = 204;
+      server.close();
+      resolve(credentials);
+    });
+    server = app.listen();
+
+    url.searchParams.set('callback', String((server.address() as AddressInfo).port));
+    url.searchParams.set('description', hostname());
+    open(String(url));
+  });
+}
+
+async function getKeytar(): Promise<typeof import('keytar')> {
+  try {
+    return await import('keytar');
+  } catch {
+    throw new AppsembleError(
+      'Couldn’t find module keytar. Either install libsecret and reinstall @appsemble/cli, or pass --client-credentials on the command line.',
+    );
+  }
+}
+
+async function getClientCredentials(remote: string, inputCredentials: string): Promise<string> {
+  if (inputCredentials) {
+    return inputCredentials;
+  }
+
+  const envCredentials = process.env[CREDENTIALS_ENV_VAR];
+  if (envCredentials) {
+    logger.info(`Detected client credentials from ${CREDENTIALS_ENV_VAR} environment variable`);
+    return envCredentials;
+  }
+
+  const { findCredentials } = await getKeytar();
+  const choices = await findCredentials(getService(remote));
+  if (choices.length === 0) {
+    throw new AppsembleError(
+      `No client credentials found. Register them using:\n\nappsemble login --remote ${remote}`,
+    );
+  }
+  let choice;
+  if (choices.length === 1) {
+    [choice] = choices;
+  } else {
+    ({ choice } = await inquirer.prompt([
+      {
+        name: 'choice',
+        message: 'Select client id to use',
+        choices: choices.map((value) => ({ name: value.account, value })),
+        type: 'list',
+      },
+    ]));
+  }
+  return `${choice.account}:${choice.password}`;
+}
+
+export async function login({ clientCredentials, remote }: BaseArguments): Promise<void> {
+  const { setPassword } = await getKeytar();
+  const url = new URL('/settings/client-credentials', remote);
+  let credentials = clientCredentials;
+  if (credentials) {
+    if (!validate(clientCredentials)) {
+      throw new AppsembleError(
+        `Invalid client credentials. Client credentials can be registered on ${url}`,
+      );
+    }
+    credentials = clientCredentials;
+  } else {
+    logger.info(`Opening ${url}`);
+    credentials = await waitForCredentials(url);
+  }
+  const [clientId, clientSecret] = credentials.split(':');
+  await setPassword(getService(remote), clientId, clientSecret);
+  logger.info(`Successfully stored credentials for ${clientId} 🕶`);
+}
+
+export async function remove({ remote }: BaseArguments): Promise<void> {
+  const { deletePassword, findCredentials } = await getKeytar();
+  const choices = await findCredentials(getService(remote));
+  if (choices.length === 0) {
+    logger.warn('No client credentials are currently in use.');
+    return;
+  }
+  const { clientIds } = await inquirer.prompt<{ clientIds: string[] }>([
+    {
+      name: 'clientIds',
+      message: 'Select client ids to delete',
+      choices: choices.map(({ account }) => account),
+      type: 'checkbox',
+    },
+  ]);
+  await Promise.all(
+    clientIds.map(async (clientId) => {
+      await deletePassword(getService(remote), clientId);
+      logger.info(`Successfully delete client id ${clientId}`);
+    }),
+  );
+}
+
+/**
+ * Login to the server using OAuth2 client credentials.
+ *
+ * @param remote Host to fetch token from.
+ * @param scope The OAuth2 scope to request. This may be space separated to request
+ * multiple scopes.
+ * @param inputCredentials Client credentials passed from the command line.
+ */
+export async function authenticate(
+  remote: string,
+  scope: string,
+  inputCredentials: string,
+): Promise<void> {
+  const credentials = await getClientCredentials(remote, inputCredentials);
+  if (authorizedRemotes.has(remote)) {
+    logger.verbose(`Already logged in to ${remote}`);
+    return;
+  }
+  logger.verbose(`Logging in to ${remote}`);
+  const { data } = await axios.post<TokenResponse>(
+    '/oauth2/token',
+    new URLSearchParams({ grant_type: 'client_credentials', scope }),
+    {
+      headers: { authorization: `Basic ${Buffer.from(credentials).toString('base64')}` },
+      baseURL: remote,
+    },
+  );
+  authorizedRemotes.add(remote);
+  axios.interceptors.request.use((config) => {
+    if (config.baseURL === remote) {
+      return {
+        ...config,
+        headers: { authorization: `Bearer ${data.access_token}`, ...config.headers },
+      };
+    }
+    return config;
+  });
+  logger.info(`Logged in to ${remote} successfully`);
+  logger.verbose(`Login scope: ${scope}`);
+}

package/{dist/lib → lib}/block.d.ts

@@ -4,14 +4,14 @@ import { Stats } from 'webpack';
 /**
  * Builds a block using Webpack.
  *
- * @param config - The config of the block to build.
+ * @param config The config of the block to build.
  * @returns The Webpack stats object.
  */
 export declare function buildBlock(config: BlockConfig): Promise<Stats>;
 /**
  * Get the block configuration from a block directory.
  *
- * @param dir - The directory in which to search for the configuration file.
+ * @param dir The directory in which to search for the configuration file.
  * @returns The block configuration.
  */
 export declare function getBlockConfig(dir: string): Promise<BlockConfig>;
@@ -20,42 +20,42 @@ export declare function getBlockConfig(dir: string): Promise<BlockConfig>;
  *
  * Both Lerna and Yarn workspaces are supported.
  *
- * @param root - The project root in which to find workspaces.
+ * @param root The project root in which to find workspaces.
  * @returns Discovered Appsemble blocks.
  */
 export declare function discoverBlocks(root: string): Promise<BlockConfig[]>;
 /**
  * Configure the payload for a new block version upload.
  *
- * @param config - The block configuration
+ * @param config The block configuration
  * @returns The payload that should be sent to the version endpoint.
  */
 export declare function makePayload(config: BlockConfig): Promise<FormData>;
 /**
  * Publish a new block version.
  *
- * @param config - The block configuration
- * @param ignoreConflict - Prevent the command from crashing when a conflict has been detected.
+ * @param config The block configuration
+ * @param ignoreConflict Prevent the command from crashing when a conflict has been detected.
  */
 export declare function publishBlock(config: BlockConfig, ignoreConflict: boolean): Promise<void>;
 /**
  * Uploads an app block theme
  *
- * @param filePath - The path of the index.css file
- * @param organization - The ID of the organization the block belongs to.
- * @param appId - The ID of the app to upload the theme for.
- * @param block - The name of the block.
- * @param remote - The HTTP origin to upload the theme to.
- * @param force - Force update the theme if the app is locked.
+ * @param filePath The path of the index.css file
+ * @param organization The ID of the organization the block belongs to.
+ * @param appId The ID of the app to upload the theme for.
+ * @param block The name of the block.
+ * @param remote The HTTP origin to upload the theme to.
+ * @param force Force update the theme if the app is locked.
  */
 export declare function uploadAppBlockTheme(filePath: string, organization: string, appId: number, block: string, remote: string, force: boolean): Promise<void>;
 /**
  * Traverses the directory at a given path for app block themes and uploads them.
  *
- * @param path - The path of the app.
- * @param appId - The ID of the app.
- * @param remote - The HTTP origin to upload the themes to.
- * @param force - Force update the theme if the app is locked.
+ * @param path The path of the app.
+ * @param appId The ID of the app.
+ * @param remote The HTTP origin to upload the themes to.
+ * @param force Force update the theme if the app is locked.
  */
 export declare function traverseBlockThemes(path: string, appId: number, remote: string, force: boolean): Promise<void>;
 export declare function processBlockMessages(config: BlockConfig, languages: string[]): Promise<void>;

package/{dist/lib → lib}/block.js

@@ -5,15 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processBlockMessages = exports.traverseBlockThemes = exports.uploadAppBlockTheme = exports.publishBlock = exports.makePayload = exports.discoverBlocks = exports.getBlockConfig = exports.buildBlock = void 0;
 const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const util_1 = require("util");
 const node_utils_1 = require("@appsemble/node-utils");
 const utils_1 = require("@appsemble/utils");
 const axios_1 = __importDefault(require("axios"));
-const chalk_1 = require("chalk");
+const chalk_1 = __importDefault(require("chalk"));
 const cosmiconfig_1 = require("cosmiconfig");
 const form_data_1 = __importDefault(require("form-data"));
-const fs_extra_1 = require("fs-extra");
 const webpack_1 = require("webpack");
 const getBlockConfigFromTypeScript_1 = require("./getBlockConfigFromTypeScript");
 const loadWebpackConfig_1 = require("./loadWebpackConfig");
@@ -21,14 +21,14 @@ const processCss_1 = require("./processCss");
 /**
  * Builds a block using Webpack.
  *
- * @param config - The config of the block to build.
+ * @param config The config of the block to build.
  * @returns The Webpack stats object.
  */
 async function buildBlock(config) {
     const conf = await (0, loadWebpackConfig_1.loadWebpackConfig)(config, 'production', (0, path_1.join)(config.dir, config.output));
-    if (await (0, fs_extra_1.pathExists)(conf.output.path)) {
+    if ((0, fs_1.existsSync)(conf.output.path)) {
         node_utils_1.logger.warn(`Removing ${conf.output.path}`);
-        await (0, fs_extra_1.remove)(conf.output.path);
+        await (0, promises_1.rm)(conf.output.path, { force: true, recursive: true });
     }
     node_utils_1.logger.info(`Building ${config.name}@${config.version} 🔨`);
     const compiler = (0, webpack_1.webpack)(conf);
@@ -51,7 +51,7 @@ exports.buildBlock = buildBlock;
 /**
  * Get the block configuration from a block directory.
  *
- * @param dir - The directory in which to search for the configuration file.
+ * @param dir The directory in which to search for the configuration file.
  * @returns The block configuration.
  */
 async function getBlockConfig(dir) {
@@ -64,11 +64,11 @@ async function getBlockConfig(dir) {
     node_utils_1.logger.info(`Found configuration file: ${filepath}`);
     const [pkg] = await (0, node_utils_1.readData)((0, path_1.join)(dir, 'package.json'));
     if (!pkg.private) {
-        node_utils_1.logger.warn(`It is ${chalk_1.underline.yellow('highly recommended')} to set “${(0, chalk_1.green)('"private"')}: ${(0, chalk_1.cyan)('true')}” in package.json`);
+        node_utils_1.logger.warn(`It is ${chalk_1.default.underline.yellow('highly recommended')} to set “${chalk_1.default.green('"private"')}: ${chalk_1.default.cyan('true')}” in package.json`);
     }
     let longDescription;
     if ((0, fs_1.existsSync)((0, path_1.join)(dir, 'README.md'))) {
-        longDescription = await fs_1.promises.readFile((0, path_1.join)(dir, 'README.md'), 'utf8');
+        longDescription = await (0, promises_1.readFile)((0, path_1.join)(dir, 'README.md'), 'utf8');
     }
     const result = {
         description: pkg.description,
@@ -88,7 +88,7 @@ exports.getBlockConfig = getBlockConfig;
  *
  * Both Lerna and Yarn workspaces are supported.
  *
- * @param root - The project root in which to find workspaces.
+ * @param root The project root in which to find workspaces.
  * @returns Discovered Appsemble blocks.
  */
 async function discoverBlocks(root) {
@@ -104,7 +104,7 @@ exports.discoverBlocks = discoverBlocks;
 /**
  * Configure the payload for a new block version upload.
  *
- * @param config - The block configuration
+ * @param config The block configuration
  * @returns The payload that should be sent to the version endpoint.
  */
 async function makePayload(config) {
@@ -113,7 +113,7 @@ async function makePayload(config) {
     const form = new form_data_1.default();
     const { description, layout, longDescription, name, version, visibility } = config;
     const { actions, events, messages, parameters } = (0, getBlockConfigFromTypeScript_1.getBlockConfigFromTypeScript)(config);
-    const files = await fs_1.promises.readdir(dir);
+    const files = await (0, promises_1.readdir)(dir);
     const icon = files.find((entry) => entry.match(/^icon\.(png|svg)$/));
     function append(field, value) {
         if (value) {
@@ -148,7 +148,7 @@ async function makePayload(config) {
         const messageKeys = Object.keys(messages).sort(utils_1.compareStrings);
         const messagesResult = {};
         const messagesPath = (0, path_1.join)(dir, 'i18n');
-        const translations = (await fs_1.promises.readdir(messagesPath)).map((language) => language.toLowerCase());
+        const translations = (await (0, promises_1.readdir)(messagesPath)).map((language) => language.toLowerCase());
         if (!translations.includes('en.json')) {
             throw new node_utils_1.AppsembleError('Could not find ‘en.json’. Try running extract-messages');
         }
@@ -170,6 +170,15 @@ async function makePayload(config) {
         }
         form.append('messages', JSON.stringify(messagesResult));
     }
+    if (files.includes('examples')) {
+        await (0, node_utils_1.opendirSafe)((0, path_1.join)(dir, 'examples'), async (file, stat) => {
+            if (!stat.isFile() || !file.endsWith('.yaml')) {
+                throw new node_utils_1.AppsembleError(`Expected ${file} to be a YAML file`);
+            }
+            node_utils_1.logger.info(`Adding example file ${file}`);
+            form.append('examples', await (0, promises_1.readFile)(file, 'utf8'));
+        }, { allowMissing: true });
+    }
     await (0, node_utils_1.opendirSafe)(distPath, (fullpath, stat) => {
         if (!stat.isFile()) {
             return;
@@ -187,8 +196,8 @@ exports.makePayload = makePayload;
 /**
  * Publish a new block version.
  *
- * @param config - The block configuration
- * @param ignoreConflict - Prevent the command from crashing when a conflict has been detected.
+ * @param config The block configuration
+ * @param ignoreConflict Prevent the command from crashing when a conflict has been detected.
  */
 async function publishBlock(config, ignoreConflict) {
     node_utils_1.logger.info(`Publishing ${config.name}@${config.version}…`);
@@ -209,12 +218,12 @@ exports.publishBlock = publishBlock;
 /**
  * Uploads an app block theme
  *
- * @param filePath - The path of the index.css file
- * @param organization - The ID of the organization the block belongs to.
- * @param appId - The ID of the app to upload the theme for.
- * @param block - The name of the block.
- * @param remote - The HTTP origin to upload the theme to.
- * @param force - Force update the theme if the app is locked.
+ * @param filePath The path of the index.css file
+ * @param organization The ID of the organization the block belongs to.
+ * @param appId The ID of the app to upload the theme for.
+ * @param block The name of the block.
+ * @param remote The HTTP origin to upload the theme to.
+ * @param force Force update the theme if the app is locked.
  */
 async function uploadAppBlockTheme(filePath, organization, appId, block, remote, force) {
     node_utils_1.logger.info(`Upload ${organization}/${block} stylesheet for app ${appId}`);
@@ -226,10 +235,10 @@ exports.uploadAppBlockTheme = uploadAppBlockTheme;
 /**
  * Traverses the directory at a given path for app block themes and uploads them.
  *
- * @param path - The path of the app.
- * @param appId - The ID of the app.
- * @param remote - The HTTP origin to upload the themes to.
- * @param force - Force update the theme if the app is locked.
+ * @param path The path of the app.
+ * @param appId The ID of the app.
+ * @param remote The HTTP origin to upload the themes to.
+ * @param force Force update the theme if the app is locked.
  */
 async function traverseBlockThemes(path, appId, remote, force) {
     node_utils_1.logger.verbose(`Searching themes in ${path}`);
@@ -258,8 +267,8 @@ async function traverseBlockThemes(path, appId, remote, force) {
 exports.traverseBlockThemes = traverseBlockThemes;
 async function processBlockMessages(config, languages) {
     const path = (0, path_1.join)(config.dir, 'i18n');
-    await fs_1.promises.mkdir(path, { recursive: true });
-    const dir = await fs_1.promises.readdir(path);
+    await (0, promises_1.mkdir)(path, { recursive: true });
+    const dir = await (0, promises_1.readdir)(path);
     const { messages } = (0, getBlockConfigFromTypeScript_1.getBlockConfigFromTypeScript)(config);
     if (!messages) {
         node_utils_1.logger.warn(`Block ${config.name} has no messages.`);

package/lib/block.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"block.js","sourceRoot":"","sources":["block.ts"],"names":[],"mappings":"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"}

package/lib/block.test.d.ts

@@ -0,0 +1 @@
+export {};