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

Removed lightningcss (#6509)

Browse source 
Co-authored-by: SamTv12345 <samtv12345@samtv12345.com>
This commit is contained in:
SamTV12345 2024-07-12 11:16:07 +02:00 • committed by GitHub
parent c5b7442acd
commit b84b4c0878
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 28 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/node/utils/Minify.js
View file

@ -300,7 +300,13 @@ const getFileCompressed = async (filename, contentType) => {
try {
logger.info('Compress CSS file %s.', filename);
content = await compressCSS(filename, ROOT_DIR);
const compressResult = await compressCSS(content);
if (compressResult.error) {
console.error(`Error compressing CSS (${filename}) using terser`, compressResult.error);
} else {
content = compressResult.code.toString(); // Convert content obj code to string
}
} catch (error) {
console.error(`CleanCSS.minify() returned an error on ${filename}: ${error}`);
}

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

@ -4,9 +4,7 @@
*/
const fsp = require('fs').promises;
import path from 'node:path'
import {expose} from 'threads'
import lightminify from 'lightningcss'
import {transform} from 'esbuild';
/*
@ -22,23 +20,9 @@ const compressJS = async (content) => {
* @param {string} filename - name of the file
* @param {string} ROOT_DIR - the root dir of Etherpad
*/
const compressCSS = async (filename, ROOT_DIR) => {
const absPath = path.resolve(ROOT_DIR, filename);
try {
const basePath = path.dirname(absPath);
const file = await fsp.readFile(absPath, 'utf8');
let { code } = lightminify.transform({
errorRecovery: true,
filename: basePath,
minify: true,
code: Buffer.from(file, 'utf8')
});
return code.toString();
} catch (error) {
// on error, just yield the un-minified original, but write a log message
console.error(`Unexpected error minifying ${filename} (${absPath}): ${JSON.stringify(error)}`);
return await fsp.readFile(absPath, 'utf8');
}
const compressCSS = async (content) => {
return await transform(content, {loader: 'css', minify: true});
};
expose({