fix: #8134, upgrade mkdirp to 1.0.x

install/package.json

@@ -73,7 +73,7 @@
         "lru-cache": "5.1.1",
         "material-design-lite": "^1.3.0",
         "mime": "^2.2.0",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^1.0.3",
         "mongodb": "3.5.2",
         "morgan": "^1.9.1",
         "mousetrap": "^1.6.1",

src/file.js

@@ -10,7 +10,6 @@ const graceful = require('graceful-fs');
 const util = require('util');
 
 const readdirAsync = util.promisify(fs.readdir);
-const mkdirpAsync = util.promisify(mkdirp);
 const copyFileAsync = util.promisify(fs.copyFile);
 const writeFleAsync = util.promisify(fs.writeFile);
 const statAsync = util.promisify(fs.stat);
@@ -33,7 +32,7 @@ file.saveFileToLocal = async function (filename, folder, tempPath) {
 	const uploadPath = path.join(nconf.get('upload_path'), folder, filename);
 
 	winston.verbose('Saving file ' + filename + ' to : ' + uploadPath);
-	await mkdirpAsync(path.dirname(uploadPath));
+	await mkdirp(path.dirname(uploadPath));
 	await copyFileAsync(tempPath, uploadPath);
 	return {
 		url: '/assets/uploads/' + (folder ? folder + '/' : '') + filename,

src/meta/cacheBuster.js

@@ -5,7 +5,6 @@ const path = require('path');
 const mkdirp = require('mkdirp');
 const winston = require('winston');
 const util = require('util');
-const mkdirpAsync = util.promisify(mkdirp);
 const writeFileAsync = util.promisify(fs.writeFile);
 const readFileAsync = util.promisify(fs.readFile);
 
@@ -19,7 +18,7 @@ function generate() {
 }
 
 exports.write = async function write() {
-	await mkdirpAsync(path.dirname(filePath));
+	await mkdirp(path.dirname(filePath));
 	await writeFileAsync(filePath, generate());
 };
 

src/meta/js.js

@@ -3,7 +3,9 @@
 var path = require('path');
 var async = require('async');
 var fs = require('fs');
+const util = require('util');
 var mkdirp = require('mkdirp');
+var mkdirpCallback = util.callbackify(mkdirp);
 var rimraf = require('rimraf');
 
 var file = require('../file');
@@ -119,7 +121,7 @@ function minifyModules(modules, fork, callback) {
 		return prev;
 	}, []);
 
-	async.each(moduleDirs, mkdirp, function (err) {
+	async.each(moduleDirs, mkdirpCallback, function (err) {
 		if (err) {
 			return callback(err);
 		}
@@ -156,7 +158,7 @@ function linkModules(callback) {
 
 		async.parallel({
 			dir: function (cb) {
-				mkdirp(path.dirname(destPath), function (err) {
+				mkdirpCallback(path.dirname(destPath), function (err) {
 					cb(err);
 				});
 			},
@@ -272,7 +274,7 @@ JS.linkStatics = function (callback) {
 			var sourceDir = plugins.staticDirs[mappedPath];
 			var destDir = path.join(__dirname, '../../build/public/plugins', mappedPath);
 
-			mkdirp(path.dirname(destDir), function (err) {
+			mkdirpCallback(path.dirname(destDir), function (err) {
 				if (err) {
 					return next(err);
 				}
@@ -343,7 +345,7 @@ JS.buildBundle = function (target, fork, callback) {
 			getBundleScriptList(target, next);
 		},
 		function (files, next) {
-			mkdirp(path.join(__dirname, '../../build/public'), function (err) {
+			mkdirpCallback(path.join(__dirname, '../../build/public'), function (err) {
 				next(err, files);
 			});
 		},

src/meta/languages.js

@@ -7,7 +7,6 @@ const rimraf = require('rimraf');
 const _ = require('lodash');
 
 const util = require('util');
-const mkdirpAsync = util.promisify(mkdirp);
 const rimrafAsync = util.promisify(rimraf);
 const writeFileAsync = util.promisify(fs.writeFile);
 const readFileAsync = util.promisify(fs.readFile);
@@ -46,7 +45,7 @@ async function getTranslationMetadata() {
 
 	// save a list of languages to `${buildLanguagesPath}/metadata.json`
 	// avoids readdirs later on
-	await mkdirpAsync(buildLanguagesPath);
+	await mkdirp(buildLanguagesPath);
 	const result = {
 		languages: languages,
 		namespaces: namespaces,
@@ -59,7 +58,7 @@ async function writeLanguageFile(language, namespace, translations) {
 	const dev = global.env === 'development';
 	const filePath = path.join(buildLanguagesPath, language, namespace + '.json');
 
-	await mkdirpAsync(path.dirname(filePath));
+	await mkdirp(path.dirname(filePath));
 	await writeFileAsync(filePath, JSON.stringify(translations, null, dev ? 2 : 0));
 }
 

src/meta/sounds.js

@@ -9,7 +9,6 @@ const util = require('util');
 
 const readdirAsync = util.promisify(fs.readdir);
 const rimrafAsync = util.promisify(rimraf);
-const mkdirpAsync = util.promisify(mkdirp);
 const writeFileAsync = util.promisify(fs.writeFile);
 
 const file = require('../file');
@@ -70,7 +69,7 @@ Sounds.build = async function build() {
 	map.unshift({});
 	map = Object.assign.apply(null, map);
 	await rimrafAsync(soundsPath);
-	await mkdirpAsync(soundsPath);
+	await mkdirp(soundsPath);
 
 	await writeFileAsync(path.join(soundsPath, 'fileMap.json'), JSON.stringify(map));
 

src/meta/templates.js

@@ -123,10 +123,9 @@ Templates.compileTemplate = compileTemplate;
 
 async function compile() {
 	const _rimraf = util.promisify(rimraf);
-	const _mkdirp = util.promisify(mkdirp);
 
 	await _rimraf(viewsPath);
-	await _mkdirp(viewsPath);
+	await mkdirp(viewsPath);
 
 	let files = await db.getSortedSetRange('plugins:active', 0, -1);
 	files = await getTemplateDirs(files);
@@ -137,7 +136,7 @@ async function compile() {
 		let imported = await fsReadFile(filePath, 'utf8');
 		imported = await processImports(files, name, imported);
 
-		await _mkdirp(path.join(viewsPath, path.dirname(name)));
+		await mkdirp(path.join(viewsPath, path.dirname(name)));
 
 		await fsWriteFile(path.join(viewsPath, name), imported);
 		const compiled = await Benchpress.precompile(imported, { minify: global.env !== 'development' });

test/build.js

@@ -11,8 +11,8 @@ var db = require('./mocks/databasemock');
 var file = require('../src/file');
 
 describe('minifier', function () {
-	before(function (done) {
-		mkdirp(path.join(__dirname, '../build/test'), done);
+	before(async function () {
+		await mkdirp(path.join(__dirname, '../build/test'));
 	});
 
 	var minifier = require('../src/meta/minifier');

test/mocks/databasemock.js

@@ -182,7 +182,7 @@ async function setupMockDefaults() {
 	const rimraf = util.promisify(require('rimraf'));
 	await rimraf('test/uploads');
 
-	const mkdirp = util.promisify(require('mkdirp'));
+	const mkdirp = require('mkdirp');
 
 	const folders = [
 		'test/uploads',