eitri-cli 1.4.0-beta.3 → 1.4.0-beta.5

package/index.js

@@ -77,6 +77,7 @@ const run = async () => {
         )
         .option("-l, --local", "Aponta para o servidor local")
         .option("-v, --verbose", "Exibe mais logs")
+        .option("-r, --release", "Gera uma nova release baseado nos commits. Um arquivo CHANGELOG.md será gerado automaticamente.")
         .option(
             "-c, --components",
             "Publica o Eitri-App como biblioteca de components"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eitri-cli",
-  "version": "1.4.0-beta.3",
+  "version": "1.4.0-beta.5",
   "description": "Command Line Interface to make \"Eitri-App\" with code and fire.",
   "main": "index.js",
   "bin": {
@@ -57,6 +57,7 @@
     "semver": "^7.1.3",
     "slugify": "^1.4.0",
     "socket.io-client": "^4.5.2",
+    "standard-version": "^9.5.0",
     "temp-dir": "^2.0.0",
     "tmp": "^0.1.0",
     "tough-cookie": "^3.0.1",

package/src/cmd/push-version.js

@@ -11,11 +11,12 @@ const TrackingEitriAnalytics = require('../service/TrackingEitriAnalytics')
 const UserLocalCredential = require('../util/UserLocalCredential')
 const VegvisirService = require('../modules/vegvisir/VegvisirService')
 const {randomUUID} = require('crypto')
-
+const childProcess = require('child_process')
 const blindGuardian = workspace.blindGuardian
 const trackingService = new TrackingService(blindGuardian)
 const targetService = new TargetService(workspace)
 const vegvisirService = new VegvisirService()
+const standardVersion = require('standard-version')
 
 module.exports = async function pushVersion(cmdObj) {
     try {
@@ -40,6 +41,24 @@ module.exports = async function pushVersion(cmdObj) {
         workspace.publishing = true
         const miniConf = workspace.getMiniConf()
 
+        if (cmdObj?.release) {
+            try {
+                await releaseGenerator(cmdObj)
+                const lastTag = childProcess.execSync('git describe --tags --abbrev=0').toString().trim();
+                const newVersion = lastTag?.replace(/^v/, "");
+
+                miniConf.version = newVersion
+                const newMiniConf = {
+                    ...miniConf,
+                    version: newVersion
+                }
+                workspace.setMiniConf(newMiniConf)
+                console.log(`Versão [${newVersion}] atualizada no eitri-app.conf.js`)
+            } catch (error) {
+                console.error("Erro ao gerar a nova versão: ", error?.message)
+            }
+        }
+
         let validateResult = checkErros(miniConf)
 
         if (!validateResult.isSuccess()) {
@@ -85,9 +104,8 @@ ${await targetService.getAppConfExampleSnippet()}
         const tempWorkspaceId = randomUUID()
         vegvisirService.setWorkspaceId(tempWorkspaceId)        
         await workspace.initPushVersion(tempWorkspaceId)
-        const userWorkspace = await vegvisirService.getWorkspace()
 
-        await miniLog.connect(userWorkspace.id)
+        await miniLog.connect(tempWorkspaceId)
         console.log(separator)
         console.log("Analisando versões...");
 
@@ -195,3 +213,22 @@ async function logPermissionsAndOpenPrompt(addedPermissions, removedPermissions,
         }
     }
 }
+
+
+async function releaseGenerator(cmdObj) {
+    return new Promise((resolve, reject) => {
+        standardVersion({
+            noVerify: true,
+            silent: true,
+        }).then(() => {
+            resolve()
+        }).catch(err => {
+            if (cmdObj?.verbose) {
+                console.error(`standard-version failed with message: ${err?.message}`)
+            }
+            const errorMessage = "Ocorreu um erro ao gerar a versão. Por favor, verifique se a versão foi gerada no Console."
+            reject(errorMessage)
+        })
+
+    })
+}

package/src/service/Workspace.js

@@ -189,22 +189,41 @@ class Workspace {
     setMiniConf(miniConf) {
         this._miniConf = miniConf;
         return new Promise((resolve, reject) => {
-            const miniAppConfPath = path.resolve(
+            const eitriAppConfPath = path.resolve(
                 this.folder2watch,
-                "../miniapp.conf.js"
+                "../eitri-app.conf.js"
             );
-            const jsonContent = JSON.stringify(miniConf, null, 4);
-            fs.writeFile(
-                miniAppConfPath,
-                `module.exports = ${jsonContent}`,
-                (err) => {
-                    if (err) {
-                        console.log(err);
-                        return reject(err);
+            if (fs.existsSync(eitriAppConfPath)) {
+                const jsonContent = JSON.stringify(miniConf, null, 4);
+                fs.writeFile(
+                    eitriAppConfPath,
+                    `module.exports = ${jsonContent}`,
+                    (err) => {
+                        if (err) {
+                            console.log(err);
+                            return reject(err);
+                        }
+                        resolve();
                     }
-                    resolve();
-                }
-            );
+                );
+            } else {
+                const miniAppConfPath = path.resolve(
+                    this.folder2watch,
+                    "../miniapp.conf.js"
+                );
+                const jsonContent = JSON.stringify(miniConf, null, 4);
+                fs.writeFile(
+                    miniAppConfPath,
+                    `module.exports = ${jsonContent}`,
+                    (err) => {
+                        if (err) {
+                            console.log(err);
+                            return reject(err);
+                        }
+                        resolve();
+                    }
+                );
+            }
         });
     }
 

package/test/e2e/cli.test.js

@@ -117,7 +117,7 @@ describe("eitri-cli", () => {
             inputPassword.type(String(loginVars.EITRI_TEST_LOGIN_PASSWORD));
 
             const buttonElement = await page.waitForXPath(
-                "/html/body/div/div/div[2]/div[2]/div/div/div/form/div/button"
+                '//*[@id="root"]/div/div/div[2]/div/div/div/form/div/button'
             );
             console.log("Clicando no botão");
             buttonElement.click();