@faable/faable 1.3.11 → 1.3.13

package/dist/commands/configure/index.js

@@ -1,5 +1,5 @@
 import { ConfigStore } from '../../lib/ConfigStore.js';
-import { ConfigurationHelper } from '../init/ConfigurationHelper.js';
+import prompts from 'prompts';
 
 const configure = {
     command: "configure",
@@ -17,11 +17,17 @@ const configure = {
     handler: async (args) => {
         const { app_name, workdir, api, remove } = args;
         const store = new ConfigStore();
-        const helper = new ConfigurationHelper();
         if (remove) {
             await store.deleteCredentials();
         }
-        await helper.demandConfig();
+        const { apikey } = await prompts([
+            {
+                type: "text",
+                name: "apikey",
+                message: "What is your Faable ApiKey?",
+            },
+        ]);
+        await store.saveApiKey({ apikey });
     },
 };
 

package/dist/commands/deploy/analyze_package.js

@@ -12,10 +12,13 @@ const analyze_package = async (params) => {
         throw new Error("Missing start script");
     }
     // Check if build is required to run
-    const build_script = params.build_script || "build";
-    let build = pkg?.scripts[build_script];
-    if (!build) {
-        log.info(`No build script found`);
+    const build_script = process.env.FAABLE_NPM_BUILD_SCRIPT
+        ? process.env.FAABLE_NPM_BUILD_SCRIPT
+        : pkg?.scripts["build"]
+            ? "build"
+            : null;
+    if (!build_script) {
+        log.info(`No build script on package.json`);
     }
     // Detect deployment type
     let type = "node";

package/dist/commands/deploy/build_project.js

@@ -2,16 +2,20 @@ import { log } from '../../log.js';
 import { cmd } from './cmd.js';
 
 const build_project = async (args) => {
-    const cwd = args?.cwd || process.cwd();
-    const build_script = args?.build_script || "build";
-    args.app;
-    log.info(`⚡️ Running build script [${build_script}]...`);
-    const timeout = 1000 * 60 * 10; // 10 minute timeout
-    await cmd("yarn", ["run", build_script], {
-        timeout,
-        cwd,
-        enableOutput: true,
-    });
+    const build_script = args.build_script;
+    if (build_script) {
+        const cwd = args.cwd || process.cwd();
+        log.info(`⚡️ Running build [${build_script}]...`);
+        const timeout = 1000 * 60 * 10; // 10 minute timeout
+        await cmd("yarn", ["run", build_script], {
+            timeout,
+            cwd,
+            enableOutput: true,
+        });
+    }
+    else {
+        log.info(`⚡️ No build step`);
+    }
 };
 
 export { build_project };

package/dist/commands/deploy/deploy_command.js

@@ -36,9 +36,7 @@ const deploy_command = async (args) => {
     log.info(`🚀 Preparing to build ${app.name} [${app.id}]`);
     // Analyze package.json to check if build is needed
     const { build_script, type } = await analyze_package({ workdir });
-    if (build_script) {
-        await build_project({ app, build_script });
-    }
+    await build_project({ app, build_script });
     // Bundle project inside a docker image
     const { tagname } = await bundle_docker({
         app,

package/dist/commands/init/ConfigurationHelper.js

@@ -16,12 +16,12 @@ class ConfigurationHelper {
     get default_action() {
         return path__default.join(this.workflows_dir, "deploy.yml");
     }
-    async demandConfig() {
+    async demandConfig(force = false) {
         const creds = await this.store.loadCredentials();
         if (creds.apikey) {
             return;
         }
-        const apikey = await prompts([
+        const { apikey } = await prompts([
             {
                 type: "text",
                 name: "apikey",

package/dist/config.js

@@ -0,0 +1,10 @@
+import fs from 'fs-extra';
+import path__default from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path__default.dirname(__filename);
+const pkg = fs.readJSONSync(path__default.join(__dirname, "..", "package.json"));
+const version = pkg.version;
+
+export { version };

package/dist/index.js

@@ -5,9 +5,13 @@ import { configure } from './commands/configure/index.js';
 import { deploy } from './commands/deploy/index.js';
 import { log } from './log.js';
 import { init } from './commands/init/index.js';
+import { version } from './config.js';
 
 const yg = yargs();
 yg.scriptName("faable")
+    .middleware(function (argv) {
+    console.log(`Faable CLI ${version}`);
+}, true)
     .command(deploy)
     .command(apps)
     .command(configure)

package/package.json

@@ -13,6 +13,7 @@
     "yaml": "^2.2.2",
     "yargs": "^17.6.2"
   },
+  "version": "1.3.13",
   "bin": {
     "faable": "bin/faable.js"
   },
@@ -26,6 +27,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "homepage": "https://github.com/faablecloud/faable#readme",
-  "version": "1.3.11"
+  "homepage": "https://github.com/faablecloud/faable#readme"
 }