@appsemble/cli 0.37.5 → 0.38.0

package/README.md

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

package/index.js

@@ -32,6 +32,7 @@ import * as start from './commands/start.js';
 import * as synchronizeTrainings from './commands/synchronizeTrainings.js';
 import { coerceRemote } from './lib/coercers.js';
 import { initAxios } from './lib/initAxios.js';
+import { validateServerVersion } from './lib/validateServerVersion.js';
 process.title = 'appsemble';
 const explorer = cosmiconfig('appsembleServer');
 const found = await explorer.search(process.cwd());
@@ -56,7 +57,7 @@ let parser = yargs(process.argv.slice(2))
     description: `OAuth2 client credentials formatted as "client_id:client_secret". This may also be defined in the ${CREDENTIALS_ENV_VAR} environment variable.`,
 })
     // @ts-expect-error 2322 ... is not assignable to type (strictNullChecks)
-    .middleware([configureLogger, initAxios])
+    .middleware([configureLogger, initAxios, () => validateServerVersion()])
     .command(app)
     .command(asset)
     .command(block)

package/lib/authentication.js

@@ -1,5 +1,5 @@
 import { hostname } from 'node:os';
-import { AppsembleError, assertKoaCondition, getKeytar, getService, logger, throwKoaError, } from '@appsemble/node-utils';
+import { AppsembleError, assertKoaCondition, getKeyring, getService, logger, throwKoaError, } from '@appsemble/node-utils';
 import { checkbox } from '@inquirer/prompts';
 import Koa from 'koa';
 import open from 'open';
@@ -43,7 +43,7 @@ function waitForCredentials(url) {
     });
 }
 export async function login({ clientCredentials, remote }) {
-    const { setPassword } = await getKeytar();
+    const { setPassword } = await getKeyring();
     const url = new URL('/settings/client-credentials', remote);
     let credentials = clientCredentials;
     if (credentials) {
@@ -61,7 +61,7 @@ export async function login({ clientCredentials, remote }) {
     logger.info(`Successfully stored credentials for ${clientId} 🕶`);
 }
 export async function remove({ remote }) {
-    const { deletePassword, findCredentials } = await getKeytar();
+    const { deletePassword, findCredentials } = await getKeyring();
     const choices = await findCredentials(getService(remote));
     if (choices.length === 0) {
         logger.warn('No client credentials are currently in use.');

package/lib/validateServerVersion.d.ts

@@ -0,0 +1,13 @@
+interface VersionResponse {
+    headers: Record<string, unknown>;
+}
+interface VersionClient {
+    get: (url: string, options: {
+        timeout: number;
+    }) => Promise<VersionResponse>;
+    head: (url: string, options: {
+        timeout: number;
+    }) => Promise<VersionResponse>;
+}
+export declare function validateServerVersion(client?: VersionClient): Promise<void>;
+export {};

package/lib/validateServerVersion.js

@@ -0,0 +1,30 @@
+import { logger, version } from '@appsemble/node-utils';
+import axios from 'axios';
+let warned = false;
+async function requestServerVersion(client) {
+    const options = { timeout: 5000 };
+    try {
+        return await client.head('/api', options);
+    }
+    catch (error) {
+        if (!axios.isAxiosError(error) ||
+            (error.response?.status !== 404 && error.response?.status !== 405)) {
+            throw error;
+        }
+        return client.get('/api', options);
+    }
+}
+export async function validateServerVersion(client = axios) {
+    try {
+        const response = await requestServerVersion(client);
+        const serverVersion = response.headers['x-appsemble-version'];
+        if (!warned && serverVersion && serverVersion !== version) {
+            warned = true;
+            logger.warn(`The Appsemble server version (${serverVersion}) does not match the CLI version (${version}).`);
+        }
+    }
+    catch (error) {
+        logger.verbose(error);
+    }
+}
+//# sourceMappingURL=validateServerVersion.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.37.5",
+  "version": "0.38.0",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -44,10 +44,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.37.5",
-    "@appsemble/types": "0.37.5",
-    "@appsemble/lang-sdk": "0.37.5",
-    "@appsemble/utils": "0.37.5",
+    "@appsemble/node-utils": "0.38.0",
+    "@appsemble/types": "0.38.0",
+    "@appsemble/lang-sdk": "0.38.0",
+    "@appsemble/utils": "0.38.0",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@inquirer/prompts": "^8.0.0",
     "@koa/cors": "^5.0.0",
@@ -81,7 +81,7 @@
     "prettier": "^3.0.0",
     "raw-body": "^2.0.0",
     "read-package-up": "^11.0.0",
-    "sharp": "0.34.5",
+    "sharp": "0.35.3",
     "ts-json-schema-generator": "^1.0.0",
     "type-fest": "^4.0.0",
     "url": "0.11.4",
@@ -90,8 +90,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.37.5",
-    "@appsemble/server": "0.37.5",
+    "@appsemble/types": "0.38.0",
+    "@appsemble/server": "0.38.0",
     "@types/concat-stream": "2.0.3",
     "@types/koa__cors": "5.0.1",
     "@types/koa-compress": "4.0.7",
@@ -99,20 +99,20 @@
     "@types/normalize-path": "3.0.2",
     "@types/postcss-import": "14.0.3",
     "@types/postcss-url": "10.0.4",
-    "axios-test-instance": "7.0.0",
+    "axios-test-instance": "8.0.0",
     "bcrypt": "5.1.1",
     "big-integer": "1.6.52",
     "concat-stream": "2.0.0",
-    "default-browser": "5.5.0",
+    "default-browser": "5.5.1",
     "is-inside-container": "1.0.0",
     "sequelize": "6.37.8",
     "titleize": "4.0.0",
     "untildify": "6.0.0",
-    "vitest": "2.1.9",
+    "vitest": "4.1.11",
     "yoctocolors-cjs": "2.1.3"
   },
   "optionalDependencies": {
-    "keytar": "^7.0.0"
+    "@napi-rs/keyring": "^1.3.0"
   },
   "engines": {
     "node": ">=24"

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

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

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

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

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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