eitri-cli 1.10.0-beta.2 → 1.10.0-beta.4

package/bitbucket-pipelines.yml

@@ -83,7 +83,7 @@ pipelines:
           - apt-get install -y gcc-mingw-w64
           - apt-get install -y curl
           - curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
-          - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          - rustup update
           - export PATH="/root/.cargo/bin:${PATH}"
           - rustup --version
           - export CC=o64-clang

package/package.json

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

package/src/cmd/push-version.js

@@ -154,7 +154,7 @@ ${await targetService.getAppConfExampleSnippet()}
         LogVerbose(cmdObj.verbose, " ✓ Preparando os arquivos do seu Eitri-App...")
 
         const isDevMode = false
-        await workspace.uploadZip(isDevMode);
+        await workspace.uploadCleanZip(isDevMode);
         LogVerbose(cmdObj.verbose, " ✓ Arquivos preparados")
 
         LogSuccess("6/6 ✓ Gerando versão do Eitri-App");

package/src/service/Workspace.js

@@ -30,12 +30,12 @@ const HuginService = require("./HuginService");
 const EitriAppType = require("../model/EitriAppType");
 const chalk = require("chalk");
 const LibsService = require("./LibsService");
-const {LogSuccess} = require("../util/LogUtil");
+const { LogSuccess } = require("../util/LogUtil");
 const vegvisirService = new VegvisirService()
 const huginService = new HuginService()
 
 class Workspace {
-    
+
     constructor(blindGuardian, hashFolder) {
         const configService = require("./ConfigService");
         this.config = configService.get("workspace");
@@ -205,11 +205,11 @@ class Workspace {
 
         const { state, target: remoteTarget, eitriConf: remoteEitriConf } = setupData;
 
-        if(!this.eitriAppService.validEitriConf(miniConf)) {
+        if (!this.eitriAppService.validEitriConf(miniConf)) {
             await this.eitriAppService.writeEitriConf(remoteEitriConf, miniConf, this.folder2watch);
         }
 
-        await LibsService.validateLibsVersions({libs: state.libs, eitriAppConf: miniConf});
+        await LibsService.validateLibsVersions({ libs: state.libs, eitriAppConf: miniConf });
 
         this.printLibsVersion(state);
 
@@ -243,7 +243,7 @@ class Workspace {
                 libVersionsOutput += `      ${lib.name} [${version}]`;
             }
         });
-        console.log(" ",libVersionsOutput, "\n");
+        console.log(" ", libVersionsOutput, "\n");
     }
 
     async checkVersions() {
@@ -608,7 +608,7 @@ class Workspace {
         const allFiles = await this.listFilesInCorrectOrder();
         const files = allFiles.filter((f) => !f.endsWith("folder.hash"));
         const folderHash = allFiles.filter((f) => f.endsWith("folder.hash"));
-        
+
         const hasServerless = files.find(file => file.includes(this.config.hugin.watchUserDir))
         if (hasServerless) {
             const serverlessFolderPath = path.join(this.folder2watch, this.config.hugin.watchUserDir)
@@ -617,7 +617,7 @@ class Workspace {
             serverlessZip.addLocalFolder(serverlessFolderPath, undefined, (fileName) => fileName.includes('.'))
             const now = Date.now()
             const tempZip = path.join(os.tmpdir(), `eitri-serverless-${now}.zip`)
-            await serverlessZip.writeZipPromise(tempZip, {overwrite: true, perm: 777})
+            await serverlessZip.writeZipPromise(tempZip, { overwrite: true, perm: 777 })
 
             const data = {
                 filePath: tempZip,
@@ -646,6 +646,53 @@ class Workspace {
         await this.transpile(folderHash);
     }
 
+    async uploadCleanZip(isDevMode) {
+        const admZip = new AdmZip();
+        await this.mkdirs([this.folder2watch, ...this.resourceFolders2watch]);
+        await this.rmAllServerFiles();
+        await this.hashFolder.updateHashFile();
+        const allFiles = await this.listFilesInCorrectOrder();
+        const filesWithoutTestJSAndTestTS = allFiles.filter(file => !file.endsWith('.test.js') && !file.endsWith('.test.ts'));
+        const files = filesWithoutTestJSAndTestTS.filter((f) => !f.endsWith("folder.hash"));
+        const folderHash = filesWithoutTestJSAndTestTS.filter((f) => f.endsWith("folder.hash"));
+
+        const hasServerless = files.find(file => file.includes(this.config.hugin.watchUserDir))
+        if (hasServerless) {
+            const serverlessFolderPath = path.join(this.folder2watch, this.config.hugin.watchUserDir)
+
+            const serverlessZip = new AdmZip()
+            serverlessZip.addLocalFolder(serverlessFolderPath, undefined, (fileName) => fileName.includes('.'))
+            const now = Date.now()
+            const tempZip = path.join(os.tmpdir(), `eitri-serverless-${now}.zip`)
+            await serverlessZip.writeZipPromise(tempZip, { overwrite: true, perm: 777 })
+
+            const data = {
+                filePath: tempZip,
+                // No upload do Zip é ignorado
+                relativePath: tempZip,
+                isDevMode,
+            }
+            await huginService.postServerless(data, this.getMiniConf());
+
+        }
+
+        admZip.addFile(
+            "__files_order.txt",
+            filesWithoutTestJSAndTestTS
+                .map((f) => f.split(this.folder2watch)[1].replace(/\\/g, "/"))
+                .join("\n")
+        );
+        admZip.addLocalFolder("./src");
+
+        const platform = process.platform;
+
+        const zipPath = await this.resolveOs(platform);
+        admZip.writeZip(zipPath);
+        await this.sendZip(zipPath);
+
+        await this.transpile(folderHash);
+    }
+
     async resolveOs(platform) {
         let tempDir = "";
         if (tempFolderPath[platform]) {