Refactor concat.js

Changed:
- Replaced "fs" callback API with "fs/promises" promise API to centralize catching of errors and easier readability of file.
- Prefixed "fs/promises" with 'node:' URI scheme to target Node.js builtin modules.
This commit is contained in:
Chauncey McAskill
2021-09-16 18:05:31 -04:00
parent 834c6165b0
commit 91109c5221

View File

@@ -2,7 +2,7 @@ import paths from '../mconfig.json';
import message from './utils/message.js'; import message from './utils/message.js';
import notification from './utils/notification.js'; import notification from './utils/notification.js';
import concat from 'concat'; import concat from 'concat';
import fs from 'fs'; import { readdir } from 'node:fs/promises';
/** /**
* Concatenates third-party JavaScript files. * Concatenates third-party JavaScript files.
@@ -18,17 +18,9 @@ export async function concatVendors() {
const timeLabel = `${filename} concatenated in`; const timeLabel = `${filename} concatenated in`;
console.time(timeLabel); console.time(timeLabel);
// Get all files in `scripts/vendors/` try {
fs.readdir(paths.scripts.vendors.src, (err, files) => { // Get all files in `scripts/vendors/`
if (err) { let files = await readdir(paths.scripts.vendors.src);
message(`Error preparing ${filename}`, 'error');
message(err);
notification({
title: `${filename} concatenation failed 🚨`,
message: `${err.name}: ${e.message}`
});
}
if (files.length) { if (files.length) {
// Exclude files that are not JavaScript // Exclude files that are not JavaScript
@@ -42,16 +34,16 @@ export async function concatVendors() {
files = files.concat(external); files = files.concat(external);
} }
concat(files, outfile).then(() => { await concat(files, outfile);
message(`${filename} concatenated`, 'success', timeLabel);
}).catch((err) => {
message(`Error concatenating ${filename}`, 'error');
message(err);
notification({ message(`${filename} concatenated`, 'success', timeLabel);
title: `${filename} concatenation failed 🚨`, } catch (err) {
message: `${err.name}: ${err.message}` message(`Error concatenating ${filename}`, 'error');
}); message(err);
notification({
title: `${filename} concatenation failed 🚨`,
message: `${err.name}: ${err.message}`
}); });
}); }
}; };