mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

MinifyWorker: Fix buggy error handling in compressCSS

Browse source
This commit is contained in:
Richard Hansen 2021-11-15 03:14:04 -05:00
parent 98f0e931fe
commit 24b22e3a6d
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/node/utils/MinifyWorker.js
View file

@ -5,14 +5,15 @@
const CleanCSS = require('clean-css'); const CleanCSS = require('clean-css');
const Terser = require('terser'); const Terser = require('terser');
const fsp = require('fs').promises;
const path = require('path'); const path = require('path');
const Threads = require('threads'); const Threads = require('threads');
const compressJS = (content) => Terser.minify(content); const compressJS = (content) => Terser.minify(content);
const compressCSS = async (filename, ROOT_DIR) => { const compressCSS = async (filename, ROOT_DIR) => {
try {
const absPath = path.resolve(ROOT_DIR, filename); const absPath = path.resolve(ROOT_DIR, filename);
try {
const basePath = path.dirname(absPath); const basePath = path.dirname(absPath);
const output = await new CleanCSS({ const output = await new CleanCSS({
rebase: true, rebase: true,
@ -22,7 +23,7 @@ const compressCSS = async (filename, ROOT_DIR) => {
} catch (error) { } catch (error) {
// on error, just yield the un-minified original, but write a log message // on error, just yield the un-minified original, but write a log message
console.error(`Unexpected error minifying ${filename} (${absPath}): ${error}`); console.error(`Unexpected error minifying ${filename} (${absPath}): ${error}`);
callback(null, content); return await fsp.readFile(absPath, 'utf8');
} }
}; };