cob-cli 2.36.1 → 2.36.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -214,10 +214,10 @@ async function copyAndMerge(customizationRepoName, source, substitutions = {}) {
|
|
|
214
214
|
read.pipe(replaceVarsTransformFunction).pipe(write)
|
|
215
215
|
}
|
|
216
216
|
},
|
|
217
|
-
(error) => {
|
|
217
|
+
async (error) => {
|
|
218
218
|
// If no error occurred then proced with merging files
|
|
219
219
|
if(!error) {
|
|
220
|
-
mergeFiles(customizationRepoName);
|
|
220
|
+
await mergeFiles(customizationRepoName);
|
|
221
221
|
resolve();
|
|
222
222
|
} else {
|
|
223
223
|
reject(error.map((e) => e.message).join("\n"))
|
|
@@ -228,8 +228,8 @@ async function copyAndMerge(customizationRepoName, source, substitutions = {}) {
|
|
|
228
228
|
}
|
|
229
229
|
|
|
230
230
|
/* ************************************************************************ */
|
|
231
|
-
function mergeFiles(block) {
|
|
232
|
-
const mergeFiles = fg
|
|
231
|
+
async function mergeFiles(block) {
|
|
232
|
+
const mergeFiles = await fg(["**/*.__MERGE__.*"], {
|
|
233
233
|
onlyFiles: false,
|
|
234
234
|
dot: true,
|
|
235
235
|
});
|
package/package.json
CHANGED