@appsemble/cli 0.23.4 → 0.23.6

package/server/options/createSettings.js

@@ -1,8 +1,23 @@
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import { createSettings as createUtilsSettings, } from '@appsemble/node-utils';
-export function createSettings({ context, host, languages, }) {
-    const { appBlocks, appsembleApp } = context;
-    return Promise.resolve(createUtilsSettings({
+import { getProjectBuildConfig } from '../../lib/config.js';
+import { buildProject, makeProjectPayload } from '../../lib/project.js';
+export async function createSettings({ context, host, languages, }) {
+    const { appBlocks, appPath, appsembleApp } = context;
+    const controllerPath = join(appPath, 'controller');
+    let controllerCode;
+    let controllerImplementations;
+    if (existsSync(controllerPath)) {
+        const controllerBuildConfig = await getProjectBuildConfig(controllerPath);
+        const controllerBuildResult = await buildProject(controllerBuildConfig);
+        [, controllerImplementations] = await makeProjectPayload(controllerBuildConfig);
+        controllerCode = controllerBuildResult.outputFiles[0].text;
+    }
+    return createUtilsSettings({
         apiUrl: host,
+        appControllerCode: controllerCode,
+        appControllerImplementations: JSON.stringify(controllerImplementations),
         blockManifests: appBlocks,
         id: appsembleApp.id,
         languages,
@@ -10,6 +25,6 @@ export function createSettings({ context, host, languages, }) {
         appUpdated: appsembleApp.$updated,
         logins: [],
         development: true,
-    }));
+    });
 }
 //# sourceMappingURL=createSettings.js.map

package/server/options/getBlockAsset.d.ts

@@ -1,2 +1,2 @@
-import { type BlockAsset as BlockAssetInterface, type GetBlockAssetParams } from '@appsemble/node-utils';
-export declare function getBlockAsset({ context, filename, name, version, }: GetBlockAssetParams): Promise<BlockAssetInterface>;
+import { type GetBlockAssetParams, type ProjectAsset } from '@appsemble/node-utils';
+export declare function getBlockAsset({ context, filename, name, version, }: GetBlockAssetParams): Promise<ProjectAsset>;

package/server/options/getBlockAsset.js

@@ -13,6 +13,7 @@ export async function getBlockAsset({ context, filename, name, version, }) {
         const mime = lookup(filename) || '';
         return {
             content: asset,
+            filename,
             mime,
         };
     }
@@ -22,6 +23,7 @@ export async function getBlockAsset({ context, filename, name, version, }) {
     const mime = lookup(filename) || '';
     return {
         content: asset,
+        filename,
         mime,
     };
 }

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

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

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

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

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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

package/lib/getBlockConfigFromTypeScript.d.ts

@@ -1,10 +0,0 @@
-import { type BlockConfig, type BlockManifest } from '@appsemble/types';
-/**
- * Generate a block manifest from the block metadata and TypeScript project.
- *
- * Uses the .appsemblerc file and the type definitions of the block.
- *
- * @param blockConfig The block configuration
- * @returns The block configuration appended from the TypeScript project.
- */
-export declare function getBlockConfigFromTypeScript(blockConfig: BlockConfig): Pick<BlockManifest, 'actions' | 'events' | 'messages' | 'parameters'>;

package/lib/loadWebpackConfig.d.ts

@@ -1,15 +0,0 @@
-import { type BlockConfig } from '@appsemble/types';
-import { type Configuration } from 'webpack';
-/**
- * Load a webpack configuration file.
- *
- * A webpack configuration file may export either an webpack configuration object, or a synchronous
- * or asynchronous function which returns a webpack configuration object. This function supports
- * all 3 use cases.
- *
- * @param block The path to the webpack configuration file.
- * @param mode The env that would be passed to webpack by invoking `webpack --env $env`.
- * @param outputPath The path where the build will be output on disk.
- * @returns The webpack configuration as exposed by the webpack configuration file.
- */
-export declare function loadWebpackConfig(block: BlockConfig, mode?: 'development' | 'production', outputPath?: string): Promise<Configuration>;

package/lib/loadWebpackConfig.js

@@ -1,45 +0,0 @@
-import { stat } from 'node:fs/promises';
-import { join } from 'node:path';
-import { logger } from '@appsemble/node-utils';
-/**
- * Load a webpack configuration file.
- *
- * A webpack configuration file may export either an webpack configuration object, or a synchronous
- * or asynchronous function which returns a webpack configuration object. This function supports
- * all 3 use cases.
- *
- * @param block The path to the webpack configuration file.
- * @param mode The env that would be passed to webpack by invoking `webpack --env $env`.
- * @param outputPath The path where the build will be output on disk.
- * @returns The webpack configuration as exposed by the webpack configuration file.
- */
-export async function loadWebpackConfig(block, mode, outputPath) {
-    let configPath;
-    if (block.webpack) {
-        configPath = join(block.dir, block.webpack);
-    }
-    else {
-        configPath = join(block.dir, 'webpack.config.js');
-        try {
-            await stat(configPath);
-        }
-        catch {
-            configPath = '@appsemble/webpack-config';
-        }
-    }
-    logger.info(`Using webpack config from ${configPath}`);
-    const publicPath = `/api/blocks/${block.name}/versions/${block.version}/`;
-    let config = await import(String(configPath));
-    config = await (config.default || config);
-    config = config instanceof Function ? await config(block, { mode, publicPath }) : config;
-    // Koa-webpack serves assets on the `output.path` path. Normally this field describes where to
-    // output the files on the file system. This is monkey patched to support usage with our dev
-    // server.
-    config.output = config.output || {};
-    config.output.path = outputPath || publicPath;
-    logger.verbose(`Patched webpack config output.path to ${config.output.path}`);
-    config.output.publicPath = publicPath;
-    logger.verbose(`Patched webpack config output.publicPath to ${config.output.publicPath}`);
-    return config;
-}
-//# sourceMappingURL=loadWebpackConfig.js.map