Remove Bluebird

Author: niksy

package.json

@@ -34,10 +34,13 @@
     "postcss": "^8.1.2"
   },
   "dependencies": {
-    "bluebird": "^3.1.1",
     "debug": "^4.3.2",
     "fs-extra": "^10.0.0",
     "lodash": "^4.0.0",
+    "p-each-series": "^2.2.0",
+    "p-filter": "^2.1.0",
+    "p-map": "^4.0.0",
+    "p-reduce": "^2.1.0",
     "spritesmith": "^3.0.1",
     "svg-sprite": "^1.3.5"
   },

src/core.js

@@ -1,8 +1,11 @@
 import path from 'path';
 import fs from 'fs-extra';
-import Promise from 'bluebird';
 import _ from 'lodash';
 import debug from 'debug';
+import pFilter from 'p-filter';
+import pReduce from 'p-reduce';
+import pMap from 'p-map';
+import pEach from 'p-each-series';
 import RasterFactory from './factories/raster';
 import VectorFactory from './factories/vector';
 
@@ -196,8 +199,8 @@ export function extractImages(root, opts, result) {
 export function applyFilterBy(opts, images) {
 	opts.logger('Applying the filters...');
 
-	return Promise.reduce(opts.filterBy, (images, filterFn) => {
-		return Promise.filter(images, (image) => {
+	return pReduce(opts.filterBy, (images, filterFn) => {
+		return pFilter(images, (image) => {
 			return filterFn(image)
 				.then(() => true)
 				.catch(() => false);
@@ -214,8 +217,8 @@ export function applyFilterBy(opts, images) {
 export function applyGroupBy(opts, images) {
 	opts.logger('Applying the groups...');
 
-	return Promise.reduce(opts.groupBy, (images, groupFn) => {
-		return Promise.map(images, (image) => {
+	return pReduce(opts.groupBy, (images, groupFn) => {
+		return pMap(images, (image) => {
 			return groupFn(image)
 				.then(group => {
 					image.groups.push(group);
@@ -339,7 +342,7 @@ export function runSpritesmith(opts, images) {
 export function saveSpritesheets(opts, images, spritesheets) {
 	opts.logger('Saving the spritesheets...');
 
-	return Promise.each(spritesheets, (spritesheet) => {
+	return pEach(spritesheets, (spritesheet) => {
 		return (
 				_.isFunction(opts.hooks.onSaveSpritesheet) ?
 				Promise.resolve(opts.hooks.onSaveSpritesheet(opts, spritesheet)) :

src/factories/raster.js

@@ -1,5 +1,5 @@
 import Spritesmith from 'spritesmith';
-import Promise from 'bluebird';
+import { promisify } from 'util';
 import _ from 'lodash';
 
 /**
@@ -27,7 +27,7 @@ export default function run(opts, images) {
 		}
 	}
 
-	return Promise.promisify(Spritesmith.run, { context: Spritesmith })(config)
+	return promisify(Spritesmith.run.bind(Spritesmith))(config)
 		.then((spritesheet) => {
 			spritesheet.extension = 'png';
 

src/factories/vector.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import SVGSpriter from 'svg-sprite';
-import Promise from 'bluebird';
+import { promisify } from 'util';
 import _ from 'lodash';
 
 /**
@@ -17,10 +17,15 @@ export default function run(opts, images) {
 		spriter.add(path, null, fs.readFileSync(path, { encoding: 'utf-8' }));
 	});
 
-	return Promise.promisify(spriter.compile, {
-		context: spriter,
-		multiArgs: true
-	})().spread((result, data) => {
+	return new Promise((resolve, reject) => {
+		spriter.compile((error, ...result) => {
+			if (error) {
+				reject(error);
+				return
+			}
+			resolve(result);
+		})
+	}).then(([result, data]) => {
 		const spritesheet = {};
 
 		spritesheet.extension = 'svg';

src/index.js

@@ -33,14 +33,14 @@ const plugin = (options = {}) => {
 
 			// Process it
 			return extractImages(css, opts, result)
-				.spread((opts, images) => applyFilterBy(opts, images))
-				.spread((opts, images) => applyGroupBy(opts, images))
-				.spread((opts, images) => setTokens(css, opts, images))
-				.spread((root, opts, images) => runSpritesmith(opts, images))
-				.spread((opts, images, spritesheets) => saveSpritesheets(opts, images, spritesheets))
-				.spread((opts, images, spritesheets) => mapSpritesheetProps(opts, images, spritesheets))
-				.spread((opts, images, spritesheets) => updateReferences(css, opts, images, spritesheets))
-				.spread((root, opts, images, spritesheets) => {
+				.then(([opts, images]) => applyFilterBy(opts, images))
+				.then(([opts, images]) => applyGroupBy(opts, images))
+				.then(([opts, images]) => setTokens(css, opts, images))
+				.then(([root, opts, images]) => runSpritesmith(opts, images))
+				.then(([opts, images, spritesheets]) => saveSpritesheets(opts, images, spritesheets))
+				.then(([opts, images, spritesheets]) => mapSpritesheetProps(opts, images, spritesheets))
+				.then(([opts, images, spritesheets]) => updateReferences(css, opts, images, spritesheets))
+				.then(([root, opts, images, spritesheets]) => {
 					opts.logger(`${spritesheets.length} ${spritesheets.length > 1 ? 'spritesheets' : 'spritesheet'} generated.`);
 				})
 				.catch((err) => {