cob-cli 2.39.0 → 2.39.2

package/lib/commands/customize.js

@@ -7,7 +7,6 @@ const axios = require("axios");
 const git = require("simple-git");
 const ncp = require("ncp");
 const { Transform } = require("stream");
-const fg = require("fast-glob");
 const fs = require("fs-extra");
 
 const customizationsVersionsFile = "customizations.json";
@@ -151,7 +150,7 @@ async function applyCustomizations(customizationRepos) {
       await customization.actions(customizationRepo.name, answers, copyAndMerge);
     } else {
       // Default actions
-      await copyAndMerge(customizationRepo.name, customizationDir, answers);
+      copyAndMerge(customizationRepo.name, customizationDir, answers);
     }
 
     // Update customizations.json file
@@ -160,7 +159,7 @@ async function applyCustomizations(customizationRepos) {
 }
 
 /* ************************************************************************ */
-async function copyAndMerge(customizationRepoName, source, substitutions = {}) {
+function copyAndMerge(customizationRepoName, source, substitutions = {}) {
   console.log("\n  Copying template files for " + colors.blue(customizationRepoName) + "...");
 
   let excludedFiles = RegExp(
@@ -178,69 +177,79 @@ async 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;
-  return new Promise((resolve, reject) => {  
-    ncp(
-      source,
-      target,
-      {
-        clobber: true,
-        filter: (src) => src.match(excludedFiles) == null,
-        rename: function(target) {
-          // Don't rename __MERGE__ templates, they will be handled by the merge method
-          if (target.match(/__MERGE__/)) return target;
-          
-          //get finalTarget from target with any existing substitution
-          const finalTarget = target.replace(substitutionRegex, (match,g1) => substitutions[g1] ? substitutions[g1] : match);
-          
-          //if the directory of finalTarget doesn't exists it means that a replacement ocurred on the dirpath (ie, there was a /__.+__/ was on the dirpath), in which case we need to create the desired directory and remove the one just created by ncp
-          if (!fs.existsSync(path.dirname(finalTarget))) {
-            fs.mkdirSync(path.dirname(finalTarget), { recursive: true })
-            fs.rmdirSync(target.substring(0,target.lastIndexOf("__")+2), { recursive: true,force: false }) //NOTE: won't handle more than 1 substitution on the same dirpath
-          }
-          return finalTarget;
-        },
-        transform(read, write) {
-          const replaceVarsTransformFunction = new Transform({
-              transform: (chunk, encoding, done) => {
-                if(/\ufffd/.test(chunk) === true) {
-                  // If chunk is binary don't change anything
-                  done(null, chunk)
-                } else {
-                  // Otherwise change any existing substitution
-                  done(null,chunk.toString().replace(substitutionRegex, (match,g1) => substitutions[g1] ? substitutions[g1] : match))
-                }
-              }
-          })
-          read.pipe(replaceVarsTransformFunction).pipe(write)
+  let filesToMerge = []
+  ncp(
+    source,
+    target,
+    {
+      clobber: true,
+      filter: (src) => src.match(excludedFiles) == null,
+      rename: function(target) {
+        // Don't rename __MERGE__ templates, they will be handled by the merge method
+        if (target.match(/__MERGE__/)) {
+          const newTmpName = target.replace(/__MERGE__/, customizationRepoName+"__MERGE__")
+          filesToMerge.push(newTmpName)
+          return newTmpName
+        };
+        
+        //get finalTarget from target with any existing substitution
+        const finalTarget = target.replace(substitutionRegex, (match,g1) => substitutions[g1] ? substitutions[g1] : match);
+        
+        //if the directory of finalTarget doesn't exists it means that a replacement ocurred on the dirpath (ie, there was a /__.+__/ was on the dirpath), in which case we need to create the desired directory and remove the one just created by ncp
+        if (!fs.existsSync(path.dirname(finalTarget))) {
+          fs.mkdirSync(path.dirname(finalTarget), { recursive: true })
+          fs.rmdirSync(target.substring(0,target.lastIndexOf("__")+2), { recursive: true,force: false }) //NOTE: won't handle more than 1 substitution on the same dirpath
         }
+        return finalTarget;
       },
-      async (error) => {
-        // If no error occurred then proced with merging files
-        if(!error) {
-          await mergeFiles(customizationRepoName);
-          resolve();
-        } else {
-          reject(error.map((e) => e.message).join("\n"))
+      transform(read, write) {
+        const replaceVarsTransformFunction = new Transform({
+            transform: (chunk, encoding, done) => {
+              if(chunk.toString().indexOf("_log.css") > 0) console.log(chunk.toString())
+              if(/\ufffd/.test(chunk) === true) {
+                // If chunk is binary don't change anything
+                done(null, chunk)
+              } else {
+                // Otherwise change any existing substitution
+                done(null,chunk.toString().replace(substitutionRegex, (match,g1) => substitutions[g1] ? substitutions[g1] : match))
+              }
+            }
+        })
+        read.pipe(replaceVarsTransformFunction).pipe(write)
+      }
+    },
+    (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)
         }
       }
-    )
-  });
+    }
+  )
 }
 
 /* ************************************************************************ */
-async function mergeFiles(block) {
-  const mergeFiles = await fg(["**/*.__MERGE__.*"], {
-    onlyFiles: false,
-    dot: true,
-  });
-  for (let mergeFile of mergeFiles) {
-    let prodFile = mergeFile.replace(/\.__MERGE__/, "");
+function mergeFiles(block,mergeFile) {
+    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();
@@ -266,7 +275,6 @@ async function mergeFiles(block) {
     fs.writeFileSync(prodFile, prodFileContent);
 
     fs.unlinkSync(mergeFile);
-  }
 }
 
 /* ************************************************************************ */

package/package.json

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