From 24b22e3a6df7781e5c147b7e189d78a230a696c0 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Mon, 15 Nov 2021 03:14:04 -0500 Subject: [PATCH] MinifyWorker: Fix buggy error handling in `compressCSS` --- src/node/utils/MinifyWorker.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/node/utils/MinifyWorker.js b/src/node/utils/MinifyWorker.js index 5736bd3a1..364ecc96c 100644 --- a/src/node/utils/MinifyWorker.js +++ b/src/node/utils/MinifyWorker.js @@ -5,14 +5,15 @@ const CleanCSS = require('clean-css'); const Terser = require('terser'); +const fsp = require('fs').promises; const path = require('path'); const Threads = require('threads'); const compressJS = (content) => Terser.minify(content); const compressCSS = async (filename, ROOT_DIR) => { + const absPath = path.resolve(ROOT_DIR, filename); try { - const absPath = path.resolve(ROOT_DIR, filename); const basePath = path.dirname(absPath); const output = await new CleanCSS({ rebase: true, @@ -22,7 +23,7 @@ const compressCSS = async (filename, ROOT_DIR) => { } catch (error) { // on error, just yield the un-minified original, but write a log message console.error(`Unexpected error minifying ${filename} (${absPath}): ${error}`); - callback(null, content); + return await fsp.readFile(absPath, 'utf8'); } };