eitri-cli 1.5.0 → 1.5.1-beta.2

package/.vscode/settings.json

@@ -1,6 +1,9 @@
 {
     "cSpell.words": [
+        "bifrost",
         "eitri",
+        "luminus",
+        "miniapp",
         "Unmocked",
         "Vegvisir"
     ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.5.0",
+  "version": "1.5.1-beta.2",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {

package/src/modules/vegvisir/VegvisirService.js

@@ -115,7 +115,7 @@ module.exports = class VegvisirService {
             );
             const fileContent = await readFile(workspaceGlobalPath, "utf8");
             const workspace = JSON.parse(fileContent);
-            console.log("Consutrindo de ", workspace.id)
+            console.log("Construindo de", workspace.id)
             workspace.id = validateUUID(this.workspaceId) ? this.workspaceId : workspace.id;
             return workspace;
         } catch (error) {

package/src/service/factories/WoodCoffeeFactory.js

@@ -40,9 +40,23 @@ class WoodCoffee {
         return { projectPath };
     }
 
+    async readEitriAppConf(projectPath) {
+        let confPath = path.join(projectPath, "miniapp.conf.js");
+        if (fs.existsSync(confPath)) {
+            return require(confPath);
+        }
+        confPath = path.join(projectPath, "eitri-app.conf.js");
+        if (fs.existsSync(confPath)) {
+            return require(confPath)
+        }
+        confPath = path.join(projectPath, "eitri-app.conf.json");
+        if (fs.existsSync(confPath)) {
+            return JSON.parse(await fs.promises.readFile(confPath, "utf-8"));
+        }
+    }
     /**
      *
-     * @returns Objeto que representa a estrutura de diretorios do projeto criado
+     * @returns Objeto que representa a estrutura de diretórios do projeto criado
      */
     async template(projectName, templateUrl, projectPath, target) {
         await this.downloadFromGithub(templateUrl, projectName, projectPath);
@@ -53,7 +67,7 @@ class WoodCoffee {
             "About.jsx"
         );
 
-        const miniAppConf = require(path.join(projectPath, "miniapp.conf.js"));
+        const miniAppConf = await this.readEitriAppConf(projectPath)
 
         if (fs.existsSync(aboutJsxPath)) {
             try {
@@ -90,7 +104,7 @@ class WoodCoffee {
         ) {
             // 'O arquivo About.jsx baixado, não é um arquivo consistente.'
             throw new Error(
-                "Faltam placeholders para exibicao da versao do components e client"
+                "Faltam placeholders para exibição da versão do components e client"
             );
         }
         return true;
@@ -236,8 +250,8 @@ class WoodCoffee {
     async writeEitriAppConf(project, conf) {
         const versions = await this._getLatestLibVersions();
         conf["version"] = "0.1.0";
-        conf["eitri-app-components"] = versions.componentsVersion;
-        conf["eitri-app-client"] = versions.appClientVersion;
+        conf["eitri-luminus"] = versions.componentsVersion;
+        conf["eitri-bifrost"] = versions.appClientVersion;
 
         let confString = `module.exports = ${JSON.stringify(conf, null, 4)}`;
         await writeFile(
@@ -245,9 +259,9 @@ class WoodCoffee {
             confString,
             "utf8"
         );
-        const oldColfPath = path.join(project.projectPath, "miniapp.conf.js");
-        if(fs.existsSync(oldColfPath)) {
-            await rm(oldColfPath, {force: true})
+        const oldConfPath = path.join(project.projectPath, "miniapp.conf.js");
+        if(fs.existsSync(oldConfPath)) {
+            await rm(oldConfPath, {force: true})
         }
     }
 
@@ -258,7 +272,7 @@ class WoodCoffee {
             );
 
             const { data: eitriAppClient } = await axios.get(
-                "https://cdn.83io.com.br/library/eitri-app-client/versions/index.json"
+                "https://cdn.83io.com.br/library/eitri-bifrost/versions/index.json"
             );
 
             return {