Skip to content

Commit

Permalink
refactor: linting and consistent-return compliance
Browse files Browse the repository at this point in the history
  • Loading branch information
MrGriefs committed Oct 3, 2021
1 parent b6f12ab commit f80d933
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/merger.js
Expand Up @@ -53,9 +53,9 @@ async function merge(paths, options) {
if (ent.isDirectory()) dirs.push(nodePath.join(path, ent.name));
}
if (dirs.length > 0) {
return merge([...dirs, ...paths.slice(0, i), ... paths.slice(i, -1)], Object.assign({}, options))
return merge([...dirs, ...paths.slice(0, i), ...paths.slice(i, -1)], Object.assign({}, options));
} else {
console.warn(`Directory './${nodePath.relative(process.cwd(), path)}' contains no resources. Continuing...`)
console.warn(`Directory './${nodePath.relative(process.cwd(), path)}' contains no resources. Continuing...`);
continue;
}
}
Expand Down Expand Up @@ -144,6 +144,8 @@ async function merge(paths, options) {
mv(tempPath, options.outputPath, error => {
if (error) throw error;
});

return true;
}

module.exports = merge;

0 comments on commit f80d933

Please sign in to comment.