public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minify: Use `fs.promises`

pull/4765/head
Richard Hansen 2021-02-11 18:19:31 -05:00 committed by John McLear
parent 073052ac66
commit aa11667ff7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/node/utils/Minify.js
View File

@ -22,7 +22,7 @@
*/ */
const settings = require('./Settings'); const settings = require('./Settings');
const fs = require('fs'); const fs = require('fs').promises;
const path = require('path'); const path = require('path');
const plugins = require('../../static/js/pluginfw/plugin_defs'); const plugins = require('../../static/js/pluginfw/plugin_defs');
const RequireKernel = require('etherpad-require-kernel'); const RequireKernel = require('etherpad-require-kernel');
@ -30,7 +30,6 @@ const urlutil = require('url');
const mime = require('mime-types'); const mime = require('mime-types');
const Threads = require('threads'); const Threads = require('threads');
const log4js = require('log4js'); const log4js = require('log4js');
const util = require('util');
const logger = log4js.getLogger('Minify'); const logger = log4js.getLogger('Minify');
@ -195,7 +194,7 @@ const minify = async (req, res) => {
// find all includes in ace.js and embed them. // find all includes in ace.js and embed them.
const getAceFile = async () => { const getAceFile = async () => {
let data = await util.promisify(fs.readFile)(`${ROOT_DIR}js/ace.js`, 'utf8'); let data = await fs.readFile(`${ROOT_DIR}js/ace.js`, 'utf8');
// Find all includes in ace.js and embed them // Find all includes in ace.js and embed them
const filenames = []; const filenames = [];
@ -255,7 +254,7 @@ const statFile = async (filename, dirStatLimit) => {
} else { } else {
let stats; let stats;
try { try {
stats = await util.promisify(fs.stat)(ROOT_DIR + filename); stats = await fs.stat(ROOT_DIR + filename);
} catch (err) { } catch (err) {
if (err.code === 'ENOENT') { if (err.code === 'ENOENT') {
// Stat the directory instead. // Stat the directory instead.
@ -274,7 +273,7 @@ const lastModifiedDateOfEverything = async () => {
// go through this two folders // go through this two folders
await Promise.all(folders2check.map(async (path) => { await Promise.all(folders2check.map(async (path) => {
// read the files in the folder // read the files in the folder
const files = await util.promisify(fs.readdir)(path); const files = await fs.readdir(path);
// we wanna check the directory itself for changes too // we wanna check the directory itself for changes too
files.push('.'); files.push('.');
@ -282,7 +281,7 @@ const lastModifiedDateOfEverything = async () => {
// go through all files in this folder // go through all files in this folder
await Promise.all(files.map(async (filename) => { await Promise.all(files.map(async (filename) => {
// get the stat data of this file // get the stat data of this file
const stats = await util.promisify(fs.stat)(`${path}/${filename}`); const stats = await fs.stat(`${path}/${filename}`);
// get the modification time // get the modification time
const modificationTime = stats.mtime.getTime(); const modificationTime = stats.mtime.getTime();
@ -348,7 +347,7 @@ const getFileCompressed = async (filename, contentType) => {
const getFile = async (filename) => { const getFile = async (filename) => {
if (filename === 'js/ace.js') return await getAceFile(); if (filename === 'js/ace.js') return await getAceFile();
if (filename === 'js/require-kernel.js') return requireDefinition(); if (filename === 'js/require-kernel.js') return requireDefinition();
return await util.promisify(fs.readFile)(ROOT_DIR + filename); return await fs.readFile(ROOT_DIR + filename);
}; };
exports.minify = (req, res, next) => minify(req, res).catch((err) => next(err || new Error(err))); exports.minify = (req, res, next) => minify(req, res).catch((err) => next(err || new Error(err)));