Add support for PostCSS 8

.babelrc

@@ -1,8 +1,5 @@
 {
 	"presets": [
-		["es2015", { "loose": true }]
-	],
-	"plugins": [
-		"add-module-exports"
+		["@babel/preset-env", { "loose": true, "targets": { "node": "12" } }]
 	]
 }

.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+on:
+  - push
+  - pull_request
+jobs:
+  Test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version:
+          - 12
+          - 16
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v2
+
+      - name: Use Node ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Test
+        run: npm test

.gitignore

@@ -2,3 +2,4 @@
 node_modules/
 test/build/
 lib/
+package-lock.json

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [5.0.0] - 2021-11-08
+### Changed
+- Support PostCSS >= 8
+- Support Node >= 12
+- Dependencies upgrade
+- Default export is now inside `default` (follows default Babel implementation)
+
 ## [4.2.1] - 2017-02-07
 ### Fixed
 - Preserve source of original declarations - See #90

README.md

@@ -1,4 +1,4 @@
-# postcss-sprites [![Build Status](https://travis-ci.org/2createStudio/postcss-sprites.svg?branch=master)](https://travis-ci.org/2createStudio/postcss-sprites) [![npm version](https://badge.fury.io/js/postcss-sprites.svg)](http://badge.fury.io/js/postcss-sprites)
+# postcss-sprites [![Build Status](https://github.com/niksy/postcss-sprites/workflows/CI/badge.svg?branch=postcss-8-support)](https://github.com/niksy/postcss-sprites/actions?query=workflow%3ACI) [![npm version](https://badge.fury.io/js/@niksy%2Fpostcss-sprites.svg)](https://badge.fury.io/js/@niksy%2Fpostcss-sprites)
 
 > [PostCSS](https://github.com/postcss/postcss) plugin that generates spritesheets from your stylesheets.
 
@@ -21,7 +21,7 @@
 ```javascript
 var fs = require('fs');
 var postcss = require('postcss');
-var sprites = require('postcss-sprites');
+var { default: sprites } = require('@niksy/postcss-sprites');
 
 var css = fs.readFileSync('./css/style.css', 'utf8');
 var opts = {
@@ -265,7 +265,7 @@ Every filter or group function will be called with an ``Image`` object.
 Pull requests are welcome.
 
 ```
-$ git clone git@github.com:2createStudio/postcss-sprites.git
+$ git clone git@github.com:niksy/postcss-sprites.git
 $ npm install
 $ npm run watch
 ```

examples/filter-by.md

@@ -10,7 +10,7 @@
 
 ```javascript
 var postcss = require('postcss');
-var sprites = require('postcss-sprites');
+var sprites = require('@niksy/postcss-sprites');
 var opts = {
 	stylesheetPath: './css',
 	spritePath: './css/images/',

examples/group-by.md

@@ -12,7 +12,7 @@
 
 ```javascript
 var postcss = require('postcss');
-var sprites = require('postcss-sprites');
+var sprites = require('@niksy/postcss-sprites');
 var opts = {
 	stylesheetPath: './css',
 	spritePath: './css/images/',

examples/output-dimensions.md

@@ -10,7 +10,7 @@
 
 ```javascript
 var postcss = require('postcss');
-var sprites = require('postcss-sprites');
+var sprites = require('@niksy/postcss-sprites');
 var updateRule = require('postcss-sprites/lib/core').updateRule;
 var opts = {
 	stylesheetPath: './css',

examples/relative-to-rule.md

@@ -16,7 +16,7 @@
 
 ```javascript
 var postcss = require('postcss');
-var sprites = require('postcss-sprites');
+var sprites = require('@niksy/postcss-sprites');
 var opts = {
 	stylesheetPath: './css',
 	spritePath: './css/images/',

examples/responsive-spritesheets.md

@@ -10,7 +10,7 @@
 
 ```javascript
 var postcss = require('postcss');
-var sprites = require('postcss-sprites');
+var sprites = require('@niksy/postcss-sprites');
 var opts = {
 	stylesheetPath: './css',
 	spritePath: './css/images/',

examples/skip-prefix.md

@@ -13,7 +13,7 @@ There [used to be a `skipPrefix` plugin option](https://github.com/2createStudio
 ```js
 var path = require('path');
 var postcss = require('postcss');
-var sprites = require('postcss-sprites');
+var sprites = require('@niksy/postcss-sprites');
 var opts = {
 	stylesheetPath: './css',
 	spritePath: './css/images/',

examples/webpack-hot-load.md

@@ -10,7 +10,7 @@ If you want to hot load image assets as they are introduced or edited, you can c
 ```js
 var path = require('path');
 var postcss = require('postcss');
-var sprites = require('postcss-sprites');
+var sprites = require('@niksy/postcss-sprites');
 var revHash = require('rev-hash');
 
 module.exports = function loadPostcssPlugins() {

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "postcss-sprites",
-  "version": "4.2.1",
+  "name": "@niksy/postcss-sprites",
+  "version": "5.0.0",
   "description": "Generate spritesheets from stylesheets",
   "main": "lib/index.js",
   "keywords": [
@@ -14,31 +14,48 @@
     "svg"
   ],
   "scripts": {
-    "test": "./node_modules/.bin/ava test/*.js --verbose --serial",
-    "build": "./node_modules/.bin/babel src/ --out-dir lib/",
-    "watch": "./node_modules/.bin/babel --watch src/ --out-dir lib/",
-    "prepublish": "npm test",
-    "pretest": "npm run build"
+    "test": "ava test/*.js --verbose --serial",
+    "build": "babel src/ --out-dir lib/",
+    "watch": "babel --watch src/ --out-dir lib/",
+    "prepublishOnly": "npm run build",
+    "pretest": "npm run build",
+    "release": "np"
   },
-  "repository": "2createStudio/postcss-sprites",
+  "repository": "niksy/postcss-sprites",
   "author": "2createStudio",
   "license": "MIT",
-  "bugs": "https://github.com/2createStudio/postcss-sprites/issues",
-  "homepage": "https://github.com/2createStudio/postcss-sprites#readme",
+  "bugs": "https://github.com/niksy/postcss-sprites/issues",
+  "homepage": "https://github.com/niksy/postcss-sprites#readme",
   "devDependencies": {
-    "ava": "^0.15.2",
-    "babel-cli": "^6.4.0",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-preset-es2015": "^6.3.13"
+    "@ava/babel": "^2.0.0",
+    "@babel/cli": "^7.16.0",
+    "@babel/preset-env": "^7.16.0",
+    "ava": "^3.15.0",
+    "np": "^6.5.0",
+    "postcss": "^8.1.2"
   },
   "dependencies": {
-    "bluebird": "^3.1.1",
-    "debug": "^2.6.0",
-    "fs-extra": "^0.26.4",
+    "debug": "^4.3.2",
+    "fs-extra": "^10.0.0",
     "lodash": "^4.0.0",
-    "postcss": "^5.0.14",
+    "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"
   },
-  "typings": "./typings.d.ts"
+  "peerDependencies": {
+    "postcss": "^8.1.2"
+  },
+  "typings": "./typings.d.ts",
+  "engines": {
+    "node": ">=12"
+  },
+  "ava": {
+    "babel": true
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }

src/core.js

@@ -1,16 +1,14 @@
 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';
 
-/**
- * Wrap with promises.
- */
-Promise.promisifyAll(fs);
-
 /**
  * Plugin constants.
  */
@@ -61,7 +59,7 @@ export const defaults = {
 		shape: {
 			id: {
 				generator(name, file) {
-					return new Buffer(file.path).toString('base64');
+					return Buffer.from(file.path).toString('base64');
 				}
 			}
 		},
@@ -86,7 +84,7 @@ export function prepareFilterBy(opts, result) {
 
 	// Filter non existing images
 	opts.filterBy.unshift(image => {
-		return fs.statAsync(image.path)
+		return fs.stat(image.path)
 			.catch(() => {
 				const message = `Skip ${image.url} because doesn't exist.`;
 
@@ -201,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);
@@ -219,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);
@@ -344,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)) :
@@ -363,7 +361,7 @@ export function saveSpritesheets(opts, images, spritesheets) {
 
 				spritesheet.path = spritesheet.path.replace(/\\/g, '/');
 
-				return fs.outputFileAsync(spritesheet.path, spritesheet.image);
+				return fs.outputFile(spritesheet.path, spritesheet.image);
 			});
 	}).then(spritesheets => {
 		return [opts, images, spritesheets];

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';
@@ -33,7 +38,7 @@ export default function run(opts, images) {
 
 
 		data.css.shapes.forEach((shape) => {
-			spritesheet.coordinates[new Buffer(shape.name, 'base64').toString()] = {
+			spritesheet.coordinates[Buffer.from(shape.name, 'base64').toString()] = {
 				width: shape.width.outer,
 				height: shape.height.outer,
 				x: shape.position.absolute.x,