@appsemble/cli 0.35.20 → 0.36.1

package/README.md

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

package/commands/organization/create.d.ts

@@ -15,9 +15,10 @@ interface CreateOrganizationArguments extends BaseArguments {
     zipCode: string;
     countryCode: string;
     invoiceReference: string;
+    locale: string;
 }
 export declare const command = "create <id>";
 export declare const description = "Register a new organization. You will be the owner of the new organization.";
 export declare function builder(yargs: Argv): Argv<any>;
-export declare function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, name, remote, streetName, vatIdNumber, website, zipCode, }: CreateOrganizationArguments): Promise<void>;
+export declare function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, locale, name, remote, streetName, vatIdNumber, website, zipCode, }: CreateOrganizationArguments): Promise<void>;
 export {};

package/commands/organization/create.js

@@ -44,14 +44,18 @@ export function builder(yargs) {
     })
         .option('invoiceReference', {
         describe: 'Optional reference the organization can set to appear on the invoice.',
+    })
+        .option('locale', {
+        describe: 'Locale of the organization in which subscription emails will be delivered.',
     });
 }
-export async function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, name, remote, streetName, vatIdNumber, website, zipCode, }) {
+export async function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, locale, name, remote, streetName, vatIdNumber, website, zipCode, }) {
     await authenticate(remote, 'organizations:write', clientCredentials);
     await createOrganization({
         description: desc,
         email,
         invoiceReference,
+        locale,
         icon,
         id,
         name,

package/commands/organization/update.d.ts

@@ -15,9 +15,10 @@ interface UpdateOrganizationArguments extends BaseArguments {
     zipCode: string;
     countryCode: string;
     invoiceReference: string;
+    locale: string;
 }
 export declare const command = "update <id>";
 export declare const description = "Update an existing organization. You must be an owner of the organization.";
 export declare function builder(yargs: Argv): Argv<any>;
-export declare function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, name, remote, streetName, vatIdNumber, website, zipCode, }: UpdateOrganizationArguments): Promise<void>;
+export declare function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, locale, name, remote, streetName, vatIdNumber, website, zipCode, }: UpdateOrganizationArguments): Promise<void>;
 export {};

package/commands/organization/update.js

@@ -44,14 +44,18 @@ export function builder(yargs) {
     })
         .option('invoiceReference', {
         describe: 'Optional reference the organization can set to appear on the invoice.',
+    })
+        .option('locale', {
+        describe: 'Locale of the organization in which subscription emails will be delivered.',
     });
 }
-export async function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, name, remote, streetName, vatIdNumber, website, zipCode, }) {
+export async function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, locale, name, remote, streetName, vatIdNumber, website, zipCode, }) {
     await authenticate(remote, 'organizations:write', clientCredentials);
     await updateOrganization({
         description: desc,
         email,
         invoiceReference,
+        locale,
         icon,
         id,
         name,

package/commands/organization/upsert.d.ts

@@ -15,9 +15,10 @@ interface UpsertOrganizationArguments extends BaseArguments {
     zipCode: string;
     countryCode: string;
     invoiceReference: string;
+    locale: string;
 }
 export declare const command = "upsert <id>";
 export declare const description = "Create a new organization for the given id or update if there exists one already.";
 export declare function builder(yargs: Argv): Argv<any>;
-export declare function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, name, remote, streetName, vatIdNumber, website, zipCode, }: UpsertOrganizationArguments): Promise<void>;
+export declare function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, locale, name, remote, streetName, vatIdNumber, website, zipCode, }: UpsertOrganizationArguments): Promise<void>;
 export {};

package/commands/organization/upsert.js

@@ -44,14 +44,18 @@ export function builder(yargs) {
     })
         .option('invoiceReference', {
         describe: 'Optional reference the organization can set to appear on the invoice.',
+    })
+        .option('locale', {
+        describe: 'Locale of the organization in which subscription emails will be delivered.',
     });
 }
-export async function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, name, remote, streetName, vatIdNumber, website, zipCode, }) {
+export async function handler({ city, clientCredentials, countryCode, description: desc, email, houseNumber, icon, id, invoiceReference, locale, name, remote, streetName, vatIdNumber, website, zipCode, }) {
     await authenticate(remote, 'organizations:write', clientCredentials);
     await upsertOrganization({
         description: desc,
         email,
         invoiceReference,
+        locale,
         icon,
         id,
         name,

package/lib/app.d.ts

@@ -120,6 +120,10 @@ interface PublishAppParams {
      * Whether to publish seed members from `members/index.json` after publishing the app.
      */
     members?: boolean;
+    /**
+     * Whether sending emails should be skipped for the group invites,
+     */
+    skipGroupInvites?: boolean;
     /**
      * Languages officially supported by the app
      */
@@ -229,6 +233,10 @@ interface UpdateAppParams {
      * Whether to publish seed members from `members/index.json` after publishing the app.
      */
     members?: boolean;
+    /**
+     * Whether sending emails should be skipped for the group invites.
+     */
+    skipGroupInvites?: boolean;
     /**
      * Languages officially supported by the app
      */
@@ -357,6 +365,10 @@ interface PatchAppParams {
      * Languages officially supported by the app
      */
     supportedLanguages?: string[];
+    /**
+     * Whether sending emails should be skipped for the group invites.
+     */
+    skipGroupInvites?: boolean;
     /**
      * Whether the Appsemble OAuth2 login method should be shown.
      */

package/lib/app.js

@@ -819,6 +819,7 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     const dbHost = appsembleContext.dbHost ?? options.dbHost;
     const dbPort = appsembleContext.dbPort ?? options.dbPort;
     const dbUser = appsembleContext.dbUser ?? options.dbUser;
+    const skipGroupInvites = appsembleContext.skipGroupInvites ?? options.skipGroupInvites ?? false;
     const { dbPassword } = options;
     logger.verbose(`App remote: ${remote}`);
     logger.verbose(`App organization: ${organizationId}`);
@@ -834,6 +835,7 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     formData.append('visibility', visibility);
     formData.append('iconBackground', iconBackground);
     formData.append('locked', appLock);
+    formData.append('skipGroupInvites', String(skipGroupInvites));
     if (dbName) {
         formData.append('dbName', dbName);
     }
@@ -942,7 +944,6 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     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)}`);
-    // eslint-disable-next-line max-len
     // @ts-expect-error 2454 Variable used before it was assigned, 2538 Undefined cannot be used as an index type
     const rcCollections = rc?.context?.[context]?.collections;
     if (Array.isArray(rcCollections)) {
@@ -1024,6 +1025,7 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     const msClarityId = appsembleContext.msClarityId ?? options.msClarityId;
     const resources = appsembleContext.resources ?? options.resources;
     const members = appsembleContext.members ?? options.members;
+    const skipGroupInvites = appsembleContext.skipGroupInvites ?? options.skipGroupInvites;
     const supportedLanguages = appsembleContext.supportedLanguages ?? options.supportedLanguages;
     const assets = appsembleContext.assets ?? options.assets;
     const { appLock } = appsembleContext;
@@ -1069,6 +1071,9 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         logger.info(`Using icon from ${realIcon.path ?? 'stdin'}`);
         formData.append('icon', realIcon);
     }
+    if (skipGroupInvites !== undefined) {
+        formData.append('skipGroupInvites', String(skipGroupInvites));
+    }
     if (maskableIcon) {
         const realIcon = typeof maskableIcon === 'string' ? createReadStream(maskableIcon) : maskableIcon;
         logger.info(`Using maskable icon from ${realIcon.path ?? 'stdin'}`);
@@ -1164,6 +1169,10 @@ export async function patchApp({ id, remote, ...options }) {
         logger.info(`Setting app path to ${options.path}`);
         formData.append('path', options.path);
     }
+    if (options.skipGroupInvites !== undefined) {
+        logger.info(`Setting skipGroupInvites to ${options.skipGroupInvites}`);
+        formData.append('skipGroupInvites', String(options.skipGroupInvites));
+    }
     if (options.force !== undefined) {
         formData.append('force', String(options.force));
     }

package/lib/organization.d.ts

@@ -5,6 +5,7 @@ interface OrganizationArguments {
     id: string;
     icon: ReadStream;
     name: string;
+    locale: string;
     website: string;
     vatIdNumber: string | null;
     streetName: string | null;
@@ -14,7 +15,7 @@ interface OrganizationArguments {
     countryCode: string | null;
     invoiceReference: string | null;
 }
-export declare function createOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
-export declare function updateOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
-export declare function upsertOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
+export declare function createOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
+export declare function updateOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
+export declare function upsertOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
 export {};

package/lib/organization.js

@@ -1,7 +1,7 @@
 import { logger } from '@appsemble/node-utils';
 import axios from 'axios';
 import FormData from 'form-data';
-export async function createOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, name, streetName, vatIdNumber, website, zipCode, }) {
+export async function createOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }) {
     const formData = new FormData();
     formData.append('id', id);
     if (description) {
@@ -52,6 +52,10 @@ export async function createOrganization({ city, countryCode, description, email
         logger.info(`Setting invoice reference name to ${invoiceReference}`);
         formData.append('invoiceReference', invoiceReference);
     }
+    if (locale) {
+        logger.info(`Setting locale to ${locale}`);
+        formData.append('locale', locale);
+    }
     logger.info(`Creating organization ${id}${name ? ` (${name})` : ''}`);
     try {
         await axios.post('/api/organizations', formData);
@@ -62,7 +66,7 @@ export async function createOrganization({ city, countryCode, description, email
         throw error;
     }
 }
-export async function updateOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, name, streetName, vatIdNumber, website, zipCode, }) {
+export async function updateOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }) {
     logger.info(`Updating organization ${id}${name ? ` (${name})` : ''}`);
     const formData = new FormData();
     if (description) {
@@ -113,6 +117,10 @@ export async function updateOrganization({ city, countryCode, description, email
         logger.info(`Setting invoice reference name to ${invoiceReference}`);
         formData.append('invoiceReference', invoiceReference);
     }
+    if (locale) {
+        logger.info(`Setting locale to ${locale}`);
+        formData.append('locale', locale);
+    }
     try {
         await axios.patch(`/api/organizations/${id}`, formData);
         logger.info(`Successfully updated organization ${id}${name ? ` (${name})` : ''}`);
@@ -122,7 +130,7 @@ export async function updateOrganization({ city, countryCode, description, email
         throw error;
     }
 }
-export async function upsertOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, name, streetName, vatIdNumber, website, zipCode, }) {
+export async function upsertOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }) {
     try {
         await axios.get(`/api/organizations/${id}`);
         await updateOrganization({
@@ -130,6 +138,7 @@ export async function upsertOrganization({ city, countryCode, description, email
             email,
             icon,
             id,
+            locale,
             name,
             website,
             vatIdNumber,
@@ -148,6 +157,7 @@ export async function upsertOrganization({ city, countryCode, description, email
                 email,
                 icon,
                 id,
+                locale,
                 name,
                 website,
                 vatIdNumber,

package/lib/serverImport.js

@@ -1,5 +1,6 @@
 import { AppsembleError } from '@appsemble/node-utils';
 import { has } from '@appsemble/utils';
+import { fileURLToPath } from 'url';
 const PROMPT = process.platform === 'win32' ? '>' : '$';
 const COMMAND = /yarn/.test(process.env.npm_execpath ?? '')
     ? 'yarn add --dev --ignore-workspace-root-check'
@@ -16,7 +17,7 @@ ${PROMPT} ${COMMAND} @appsemble/server
  */
 export async function serverImport(...members) {
     try {
-        // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore Because the the server isn’t built and published, an error is expected here at
         // build time, but while type checking.
         const mod = await import('@appsemble/server');
@@ -29,7 +30,7 @@ export async function serverImport(...members) {
     }
     catch (error) {
         if (error.code !== 'MODULE_NOT_FOUND' ||
-            error.requireStack?.[0] !== __filename) {
+            error.requireStack?.[0] !== fileURLToPath(import.meta.url)) {
             throw error;
         }
         throw new AppsembleError(INSTALL_MESSAGE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.35.20",
+  "version": "0.36.1",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -44,10 +44,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.35.20",
-    "@appsemble/types": "0.35.20",
-    "@appsemble/lang-sdk": "0.35.20",
-    "@appsemble/utils": "0.35.20",
+    "@appsemble/node-utils": "0.36.1",
+    "@appsemble/types": "0.36.1",
+    "@appsemble/lang-sdk": "0.36.1",
+    "@appsemble/utils": "0.36.1",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^5.0.0",
     "@odata/parser": "^0.2.0",
@@ -69,8 +69,6 @@
     "koas-core": "^0.7.0",
     "koas-operations": "^0.7.0",
     "koas-status-code": "^0.7.0",
-    "language-tags": "^1.0.0",
-    "lodash-es": "^4.0.0",
     "mime-types": "^2.0.0",
     "node-json-db": "^2.0.0",
     "normalize-path": "^3.0.0",
@@ -85,25 +83,32 @@
     "sharp": "^0.32.0",
     "ts-json-schema-generator": "^1.0.0",
     "type-fest": "^4.0.0",
+    "url": "0.11.4",
     "webpack": "^5.0.0",
     "yaml": "^2.0.0",
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.35.20",
-    "@appsemble/server": "0.35.20",
-    "bcrypt": "5.1.1",
+    "@appsemble/types": "0.36.1",
+    "@appsemble/server": "0.36.1",
     "axios-test-instance": "7.0.0",
+    "bcrypt": "5.1.1",
+    "default-browser": "5.4.0",
+    "is-inside-container": "1.0.0",
+    "titleize": "4.0.0",
+    "yoctocolors-cjs": "2.1.3",
+    "@inquirer/figures": "2.0.2",
     "@types/concat-stream": "2.0.3",
     "@types/inquirer": "9.0.7",
     "@types/koa__cors": "5.0.0",
+    "@types/koa-compress": "4.0.6",
+    "@types/koa-range": "0.3.5",
     "@types/normalize-path": "3.0.2",
     "@types/postcss-import": "14.0.3",
     "@types/postcss-url": "10.0.4",
     "concat-stream": "2.0.0",
     "vitest": "2.1.9",
-    "sequelize": "6.37.7",
-    "minio": "8.0.6"
+    "sequelize": "6.37.7"
   },
   "optionalDependencies": {
     "keytar": "^7.0.0"

package/server/db/methods.js

@@ -10,7 +10,9 @@ let appName = 'app';
 export function setAppName(name) {
     appName = name;
 }
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const comparators = ['gt', 'gte', 'lt', 'lte', 'eq', 'ne'];
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const expressions = ['and', 'or'];
 function parseValue(value) {
     const toNumber = Number(value);

package/server/options/getBlockAsset.js

@@ -6,7 +6,7 @@ import globalCacheDir from 'global-cache-dir';
 import { lookup } from 'mime-types';
 export async function getBlockAsset({ context, filename, name, version, }) {
     const { blockConfigs } = context;
-    // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore 2488 [...] | undefined must have a '[Symbol.iterator]()'
     const [organisation, blockName] = parseBlockName(name);
     if (existsSync(join(process.cwd(), 'blocks', blockName))) {

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

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

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

@@ -5,7 +5,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.35.20",
+    "@appsemble/sdk": "0.36.1",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -5,8 +5,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/preact": "0.35.20",
-    "@appsemble/sdk": "0.35.20",
+    "@appsemble/preact": "0.36.1",
+    "@appsemble/sdk": "0.36.1",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -5,6 +5,6 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.35.20"
+    "@appsemble/sdk": "0.36.1"
   }
 }

package/vitest.setup.js

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
 import { clearAllS3Buckets, CREDENTIALS_ENV_VAR, initS3Client, setFixtureBase, setLogLevel, } from '@appsemble/node-utils';
 import { getRootDB, models, setupTestDatabase } from '@appsemble/server';
-// eslint-disable-next-line import/no-extraneous-dependencies
+// eslint-disable-next-line import-x/no-extraneous-dependencies
 import { afterAll, afterEach, beforeAll, beforeEach, vi } from 'vitest';
 setFixtureBase(import.meta);
 delete process.env[CREDENTIALS_ENV_VAR];