cob-cli 2.39.4 → 2.39.6

package/lib/commands/customize.js

@@ -222,10 +222,12 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
         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)
-        }
+        //Allow a little time for file to be written to disk
+        setTimeout(() => {
+          for(let file of filesToMerge) {
+            mergeFiles(customizationRepoName, file)
+          }
+        }, 200)
       }
     }
   )
@@ -246,27 +248,24 @@ function mergeFiles(block,mergeFile) {
       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();
     let mergeFileContent = fs.readFileSync(mergeFile).toString();
     // With comments we support JS, CSS, GROOVY
-    let startStr = "/* COB-CLI START " + blockMark + " */\n";
+    let startStr = "/* COB-CLI START " + blockMark + " */";
     let endStr = "\n/* COB-CLI END " + blockMark + " */";
 
     if (prodFileContent.indexOf(startStr) < 0) {
       // If previous customization does not exist
-      prodFileContent = startStr + mergeFileContent + endStr + "\n" + prodFileContent;
+      prodFileContent = startStr + "\n" + mergeFileContent + endStr + "\n" + prodFileContent;
     } else {
       // If previous customization exists
       let beforeMerge = prodFileContent.indexOf(startStr);
       let afterMerge = prodFileContent.indexOf(endStr) + endStr.length;
       prodFileContent =
         prodFileContent.substring(0, beforeMerge) +
-        startStr +
+        startStr + "\n" +
         mergeFileContent +
         endStr +
         prodFileContent.substring(afterMerge);

package/lib/webpack/fake_customizations2.js

@@ -3,6 +3,7 @@
 console.log("[CoB] Starting live-reload")
 
 var scriptTag = document.createElement('script');
+scriptTag.type = "module";
 scriptTag.src = "/recordm/localresource/js/customizations2.real.js";
 document.body.appendChild(scriptTag);
 

package/package.json

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