cob-cli 2.39.7 → 2.39.9

package/lib/commands/customize.js

@@ -186,11 +186,11 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
       {
         clobber: true,
         filter: (src) => src.match(excludedFiles) == null,
-      rename: function(target) {
+        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)
+            filesToMerge.push({name:newTmpName, block: customizationRepoName})
             return newTmpName
           };
 
@@ -226,7 +226,7 @@ function copyAndMerge(customizationRepoName, source, substitutions = {}) {
           while(filesToMerge.length > 0) {
             let file = filesToMerge.pop();
             //Allow a little time for file to be written to disk
-            setTimeout( () => mergeFiles(customizationRepoName, file), 200)
+            setTimeout( () => mergeFiles(file.block, file.name), 200)
           }
         }
       }

package/package.json

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