@faable/faable 1.4.4 → 1.4.6

package/dist/commands/deploy/deploy_command.js

@@ -10,7 +10,7 @@ const deploy_command = async (args) => {
     const workdir = args.workdir || process.cwd();
     const { api } = await context();
     // Resolve runtime
-    const { app_name, runtime, runtime_version } = await runtime_detection(workdir);
+    const { app_name, runtime } = await runtime_detection(workdir);
     const name = args.app_slug || app_name;
     if (!name) {
         throw new Error("Missing <app_name>");
@@ -19,20 +19,23 @@ const deploy_command = async (args) => {
     const app = await api.getBySlug(name);
     // Check if we can build docker images
     await check_environment();
-    log.info(`🚀 Deploying [${app.name}] runtime=${runtime}-${runtime_version} app_id=${app.id}`);
+    log.info(`🚀 Deploying ${app.name} (${app.id}) runtime=${runtime.name}-${runtime.version} `);
     let type;
-    if (runtime == "node") {
-        const node_result = await build_node(app, workdir);
+    if (runtime.name == "node") {
+        const node_result = await build_node(app, {
+            workdir,
+            runtime,
+        });
         type = node_result.type;
     }
-    else if (runtime == "docker") {
+    else if (runtime.name == "docker") {
         type = "node";
         await cmd(`docker build -t ${app.id} .`, {
             enableOutput: true,
         });
     }
     else {
-        throw new Error(`No build pipeline for runtime=${runtime}`);
+        throw new Error(`No build pipeline for runtime=${runtime.name}`);
     }
     // Upload to Faable registry
     const { upload_tagname } = await upload_tag({ app, api });

package/dist/commands/deploy/node-pipeline/index.js

@@ -2,8 +2,12 @@ import { bundle_docker } from './bundle_docker.js';
 import { analyze_package } from './analyze_package.js';
 import { build_project } from './build_project.js';
 
-const build_node = async (app, workdir) => {
+const build_node = async (app, options) => {
     // log.info(`🚀 Build Toolchain ${app.name} [${app.id}]`);
+    const { workdir, runtime } = options;
+    if (!runtime.version) {
+        throw new Error("Runtime version not specified for node");
+    }
     // Analyze package.json to check if build is needed
     const { build_script, type } = await analyze_package({ workdir });
     await build_project({ app, build_script });
@@ -12,7 +16,7 @@ const build_node = async (app, workdir) => {
         app,
         workdir,
         template_context: {
-            from: "node:18.19.0-slim",
+            from: `node:${runtime.version}`,
         },
     });
     return { type };

package/dist/commands/deploy/runtime-detect/strategies/docker.js

@@ -1,7 +1,8 @@
 const strategy_docker = async (workdir) => {
     return {
-        runtime: "docker",
-        runtime_version: "docker",
+        runtime: {
+            name: "docker",
+        },
     };
 };
 

package/dist/commands/deploy/runtime-detect/strategies/nodejs.js

@@ -1,5 +1,6 @@
 import fs from 'fs-extra';
 import path__default from 'path';
+import { cmd } from '../../../../lib/cmd.js';
 
 /**
  * Strategy to detect app name from package.json
@@ -10,14 +11,22 @@ import path__default from 'path';
 const strategy_nodejs = async (workdir) => {
     const packageJSONFile = path__default.join(workdir, "package.json");
     // Check we have a valid name
-    const { name } = fs.readJSONSync(packageJSONFile);
+    const { name, engines } = fs.readJSONSync(packageJSONFile);
     if (!name) {
         throw new Error("Missing name in package.json");
     }
+    // Use engines.node if found
+    let runtime_version = "18.19.0";
+    if (engines?.node) {
+        const out = await cmd(`npm view node@20.8 version | tail -n 1 | cut -d "'" -f2`);
+        runtime_version = out.stdout.toString();
+    }
     return {
         app_name: name,
-        runtime: "node",
-        runtime_version: "18",
+        runtime: {
+            name: "node",
+            version: runtime_version,
+        },
     };
 };
 

package/dist/commands/deploy/runtime-detect/strategies/python.js

@@ -14,8 +14,10 @@ const strategy_python = async (workdir) => {
         runtime_version = runtime_data.split("-")[1];
     }
     return {
-        runtime: "python",
-        runtime_version,
+        runtime: {
+            name: "python",
+            version: runtime_version,
+        },
     };
 };
 

package/dist/commands/init/ConfigurationHelper.js

@@ -18,7 +18,7 @@ class ConfigurationHelper {
     }
     async demandConfig(force = false) {
         const creds = await this.store.loadCredentials();
-        if (creds.apikey) {
+        if (creds?.apikey) {
             return;
         }
         const { apikey } = await prompts([

package/dist/lib/CredentialsStore.js

@@ -29,7 +29,7 @@ class CredentialsStore {
         }
         // Return credentials
         const config = await fs.readJSON(this.credentials_path);
-        return config;
+        return config || {};
     }
 }
 

package/package.json

@@ -14,7 +14,7 @@
     "yaml": "^2.2.2",
     "yargs": "^17.6.2"
   },
-  "version": "1.4.4",
+  "version": "1.4.6",
   "bin": {
     "faable": "bin/faable.js"
   },