cob-cli 2.4.2 → 2.5.1

package/lib/commands/deploy.js

@@ -26,6 +26,7 @@ async function deploy(args) {
 
         if(changes.length == 0) {
             if(!args.force) {
+                await cmdEnv.unApplyCurrentCommandEnvironmentChanges()
                 throw new Error("Canceled:".yellow + " nothing todo\n")
             }
             console.log(" Just updating deploy information.")

package/lib/task_lists/common_enviromentHandler.js

@@ -68,14 +68,16 @@ async function _applySpecific(environmentName) {
 
     for( let envSpecificFile of envSpecificFiles ) {
         let prodFile   = envSpecificFile.replace(/\.ENV__.*__/,"")
-        if(fs.existsSync(prodFile)) {
-            let backupFile = envSpecificFile.replace(/\.ENV__.*__/,".ENV__ORIGINAL_BACKUP__")
-            await git().raw(["update-index","--assume-unchanged", prodFile])
-            fs.renameSync(prodFile, backupFile)
-        } else {
-            let deleteFile = envSpecificFile.replace(/\.ENV__.*__/,".ENV__DELETE__")
-            fs.appendFileSync('.git/info/exclude', "\n" + prodFile)
-            fs.closeSync(fs.openSync(deleteFile, 'w'));
+        let deleteFile = envSpecificFile.replace(/\.ENV__.*__/,".ENV__DELETE__")
+        if(!fs.existsSync(deleteFile)) {
+            if(fs.existsSync(prodFile)) {
+                let backupFile = envSpecificFile.replace(/\.ENV__.*__/,".ENV__ORIGINAL_BACKUP__")
+                await git().raw(["update-index","--assume-unchanged", prodFile])
+                fs.renameSync(prodFile, backupFile)
+            } else {
+                fs.appendFileSync('.git/info/exclude', "\n" + prodFile)
+                fs.closeSync(fs.openSync(deleteFile, 'w'));
+            }
         }
         fs.renameSync(envSpecificFile, prodFile)
         await git().raw(["update-index","--assume-unchanged", envSpecificFile])

package/lib/task_lists/test_otherFilesContiousReload.js

@@ -64,7 +64,7 @@ async function otherFilesContiousReload(cmdEnv) {
         let productDir = resolveCobPath(cmdEnv.server, "serverLive", product).split(":")[1];
         let productScopeFilePath = changedFile.substring(changedFile.indexOf("/") + 1); // remove o directorio inicial do producto
 
-        let isRemoteFile = await execa('ssh', [cmdEnv.server, "[[ -f " + productDir + productScopeFilePath + " ]] && echo 'file' || echo '' " ])
+        let isRemoteFile = () => execa('ssh', [cmdEnv.server, "[[ -f " + productDir + productScopeFilePath + " ]] && echo 'file' || echo '' " ])
             .then( r => {
                 return r.stdout == "file"
             }).catch( () => {
@@ -77,14 +77,15 @@ async function otherFilesContiousReload(cmdEnv) {
         } catch {}    
 
         if (
-            (isLocalFile || isRemoteFile)
-            && changedFile.indexOf("/customUI/") < 0
+            changedFile.indexOf("/customUI/") < 0
+            && changedFile.indexOf("/node_modules/") < 0
             && !changedFile.startsWith(".git")
             && !changedFile.startsWith(".idea")
             && !changedFile.startsWith(".DS_Store") 
             && !changedFile.endsWith(".swp")
             && !changedFile.endsWith(".swap")
             && changedFile.indexOf(IN_PROGRESS_TEST_FILE) < 0
+            && (isLocalFile || await isRemoteFile())
         ) {
             try {
                 await addFileToCurrentTest(cmdEnv.server, changedFile, changedFiles, " Syncing ".bgRed.bold + " ", restoreChanges );

package/lib/webpack/webpack.config.js

@@ -40,6 +40,10 @@ module.exports = env => {
           target: "http://localhost:8041",
           secure: false
         },
+        [ "/docs/**"]: {
+          target: "http://localhost:8080",
+          secure: false
+        },
         "/": {
           logLevel: "warn",
           target: env.SERVER,
@@ -58,7 +62,7 @@ module.exports = env => {
             return localPath;          
           },
           onProxyRes: response => {
-            response.headers['content-security-policy'] = "default-src 'unsafe-inline' 'unsafe-eval' https: data: http:";
+            response.headers['content-security-policy'] = "default-src 'unsafe-inline' 'unsafe-eval' https: data: http: ws:";
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.4.2",
+  "version": "2.5.1",
   "description": "A command line utility to help Cult of Bits partners develop with higher speed and reusing common code and best practices.",
   "preferGlobal": true,
   "repository": {