cob-cli 2.39.1 → 2.39.3

package/lib/commands/customize.js

@@ -177,6 +177,7 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
   // Source is on cob-cli customizationRepo and Destination on the server repo
   const target = process.cwd() // Always copy to directory where command is being executed, ie, the root directory of the server repo
   const substitutionRegex = /__(((?!word).)*)__/g;
+  let filesToMerge = []
   ncp(
     source,
     target,
@@ -186,8 +187,9 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
       rename: function(target) {
         // Don't rename __MERGE__ templates, they will be handled by the merge method
         if (target.match(/__MERGE__/)) {
-          setTimeout(()=>mergeFiles(customizationRepoName, target),200)
-          return target
+          const newTmpName = target.replace(/__MERGE__/, customizationRepoName+"__MERGE__")
+          filesToMerge.push(newTmpName)
+          return newTmpName
         };
         
         //get finalTarget from target with any existing substitution
@@ -218,6 +220,12 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
     (error) => {
       if(error) {
         console.log(error.map((e) => e.message).join("\n"))
+      } else {
+        // Only run this on the last call 
+        for(let file of filesToMerge) {
+          //Allow a little time for file to be written to disk
+          setTimeout(() => mergeFiles(customizationRepoName, file), 200)
+        }
       }
     }
   )
@@ -225,13 +233,22 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
 
 /* ************************************************************************ */
 function mergeFiles(block,mergeFile) {
-    let prodFile = mergeFile.replace(/\.__MERGE__/, "");
+    if (!fs.existsSync(mergeFile)) {
+      //Already processed 
+      return 
+    }
+
+    let prodFileRexp =  new RegExp(block + "__MERGE__.");
+    let prodFile = mergeFile.replace(prodFileRexp, "");
     let blockMark = block == undefined ? "" : block;
     if (!fs.existsSync(prodFile)) {
       // If prod file does not exist creates it
       console.log("  Creating " + prodFile);
       fs.closeSync(fs.openSync(prodFile, "w"));
     } else {
+      fs.open(prodFile, "a+",(err, fd) => {
+        fs.fdatasync(fd /*, optional callback here */);
+      })
       console.log("  Merging " + prodFile + " " + block);
     }
     let prodFileContent = fs.readFileSync(prodFile).toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.39.1",
+  "version": "2.39.3",
   "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": {