Merge pull request #75 from nhost/canary

git

Author: Johan Eliasson

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nhost",
   "description": "Nhost's command-line",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "Nuno Pato @nhost",
   "bin": {
     "nhost": "./bin/run"
@@ -20,7 +20,6 @@
     "inquirer": "^7.3.2",
     "js-yaml": "^3.13.1",
     "node-fetch": "^2.6.0",
-    "nunjucks": "^3.2.1",
     "ora": "^4.0.4",
     "tree-kill": "^1.2.2",
     "write-json-file": "^4.3.0"

src/commands/dev.js

@@ -4,12 +4,11 @@ const { spawn, execSync } = require("child_process");
 const yaml = require("js-yaml");
 const crypto = require("crypto");
 const chalk = require("chalk");
-const nunjucks = require("nunjucks");
 const kill = require("tree-kill");
 const detect = require("detect-port");
 
 const spinnerWith = require("../util/spinner");
-const getComposeTemplate = require("../util/compose");
+const { generateNhostBackendYaml } = require("../util/compose");
 const getDockerApiTemplate = require("../util/docker-api");
 
 const util = require("util");
@@ -151,19 +150,23 @@ class DevCommand extends Command {
       process.exit(1);
     }
 
-    if (await exists("./api")) {
-      nhostConfig["startApi"] = true;
-    }
+    nhostConfig["startAPI"] = await exists("./api");
 
     nhostConfig.graphql_jwt_key = crypto
       .randomBytes(128)
       .toString("hex")
       .slice(0, 128);
 
-    await writeFile(
-      `${dotNhost}/docker-compose.yaml`,
-      nunjucks.renderString(getComposeTemplate(), nhostConfig)
-    );
+    // generate
+    const nhostBackendYaml = generateNhostBackendYaml(nhostConfig);
+
+    // write to file
+    const safeDumpOptions = {
+      skipInvalid: true,
+    };
+    const dockerComposeYaml = yaml.safeDump(nhostBackendYaml, safeDumpOptions);
+
+    await writeFile(`${dotNhost}/docker-compose.yaml`, dockerComposeYaml);
 
     // write docker api file
     await writeFile(`${dotNhost}/Dockerfile-api`, getDockerApiTemplate());
@@ -272,6 +275,4 @@ DevCommand.description = `Start Nhost project for local development
 Start Nhost project for local development
 `;
 
-nunjucks.configure({ autoescape: true });
-
 module.exports = DevCommand;

src/commands/init.js

@@ -1,5 +1,4 @@
 const { Command } = require("@oclif/command");
-const nunjucks = require("nunjucks");
 const fs = require("fs");
 const fetch = require("node-fetch");
 const chalk = require("chalk");
@@ -8,14 +7,15 @@ const exec = util.promisify(require("child_process").exec);
 const exists = util.promisify(fs.exists);
 const writeFile = util.promisify(fs.writeFile);
 const mkdir = util.promisify(fs.mkdir);
+const yaml = require("js-yaml");
 
 const spinnerWith = require("../util/spinner");
 const selectProject = require("../util/projects");
 const {
   authFileExists,
   readAuthFile,
   getCustomApiEndpoint,
-  getNhostConfigTemplate,
+  getNhostConfig,
 } = require("../util/config");
 const { validateAuth } = require("../util/login");
 const checkForHasura = require("../util/dependencies");
@@ -159,12 +159,17 @@ class InitCommand extends Command {
       `project_id: ${selectedProjectId}`
     );
 
+    // generate Nhost config
+    const nhostConfig = getNhostConfig(project);
+
+    const safeDumpOptions = {
+      skipInvalid: true,
+    };
+    const nhostConfigYaml = yaml.safeDump(nhostConfig, safeDumpOptions);
+
     // config.yaml holds configuration for GraphQL engine, PostgreSQL and HBP
     // it is also a requirement for hasura to work
-    await writeFile(
-      `${nhostDir}/config.yaml`,
-      nunjucks.renderString(getNhostConfigTemplate(), project)
-    );
+    await writeFile(`${nhostDir}/config.yaml`, nhostConfigYaml);
 
     // create directory for migrations
     const migrationDirectory = `${nhostDir}/migrations`;
@@ -307,8 +312,7 @@ class InitCommand extends Command {
       if (project.backend_user_fields) {
         await this._writeToFileSync(
           envFile,
-          `JWT_CUSTOM_FIELDS=${project.backend_user_fields}\n`,
-          { flag: "a" }
+          `JWT_CUSTOM_FIELDS=${project.backend_user_fields}\n`
         );
       }