punchcutter 2.0.4 → 2.0.6

package/lib/buildGlyph.js

@@ -3,16 +3,14 @@ const _ = require('lodash');
 const chalk = require('chalk');
 const DirectoryColorfy = require('directory-colorfy');
 const fs = require('fs-extra');
+const globby = require('globby');
 const path = require('path');
 const Promise = require('bluebird');
 const loadFiles = require('./loadFiles');
-const multiGlob = require('./multiGlob');
 const svg2pngMin = require('./svg2pngMin');
 const svgMin = require('./svgMin');
 const {PNG, SVG} = require('./constants');
 
-Promise.promisifyAll(fs);
-
 /**
  *
  * @param   {Object} config
@@ -41,20 +39,18 @@ module.exports = function (config) {
   // Delete temp directories.
   return (
     Promise.mapSeries([tempDir1, tempDir2], function (file) {
-      return fs.removeAsync(file);
+      return fs.remove(file);
     })
       .then(function () {
         const dirs = [tempDir1, tempDir2].concat(svgBuildsDist, pngBuildsDist);
 
         // Create temp and destination directories.
         return Promise.mapSeries(dirs, function (dir) {
-          return fs.mkdirpAsync(dir);
+          return fs.mkdirp(dir);
         });
       })
       // Find source files.
-      .then(function () {
-        return multiGlob(config.src);
-      })
+      .then(() => globby(config.src))
       .then(function (files) {
         srcFiles = files;
 
@@ -68,7 +64,7 @@ module.exports = function (config) {
             svgDistDirs.push(svgDistDir);
 
             return fs
-              .mkdirpAsync(svgDistDir)
+              .mkdirp(svgDistDir)
               .then(function () {
                 return Promise.mapSeries(srcFiles, function (file) {
                   // Add colors to filename for DirectoryColorfy.
@@ -85,7 +81,7 @@ module.exports = function (config) {
                     )} > ${chalk.cyan(basename)} > ${chalk.cyan(color.name)}`
                   );
 
-                  return fs.copyAsync(file, copy);
+                  return fs.copy(file, copy);
                 });
               })
               .then(function () {
@@ -101,7 +97,7 @@ module.exports = function (config) {
               })
               .then(function (files) {
                 return Promise.mapSeries(files, function (file) {
-                  return fs.writeFileAsync(file.path, file.data, 'utf-8');
+                  return fs.writeFile(file.path, file.data, 'utf-8');
                 });
               })
               .then(function () {
@@ -124,7 +120,7 @@ module.exports = function (config) {
                   );
                   const distPath = path.resolve(svgDistDir, basename + '.svg');
 
-                  return fs.renameAsync(srcPath, distPath);
+                  return fs.rename(srcPath, distPath);
                 });
               });
           });
@@ -144,13 +140,13 @@ module.exports = function (config) {
           );
 
           return fs
-            .readFileAsync(file, 'utf-8')
+            .readFile(file, 'utf-8')
             .then(function (data) {
               // Minify SVG.
               return svgMin(data);
             })
             .then(function (data) {
-              return fs.writeFileAsync(svgDistPath, data, 'utf-8');
+              return fs.writeFile(svgDistPath, data, 'utf-8');
             })
             .then(function () {
               if (pngBuilds.length) {
@@ -172,7 +168,7 @@ module.exports = function (config) {
           });
           const base = path.resolve(svgDistDirs[0], '..');
 
-          return multiGlob(src).then(function (files) {
+          return globby(src).then(function (files) {
             return Promise.mapSeries(pngBuilds, function (pngBuild, i) {
               console.log(
                 `Building PNG glyphs [${i + 1}/${
@@ -209,7 +205,7 @@ module.exports = function (config) {
 
         // Clean up.
         return Promise.mapSeries(dirs, function (file) {
-          return fs.removeAsync(file);
+          return fs.remove(file);
         });
       })
   );

package/lib/buildJsFont.js

@@ -8,8 +8,6 @@ const Promise = require('bluebird');
 const loadFiles = require('./loadFiles');
 const svgMin = require('./svgMin');
 
-Promise.promisifyAll(fs);
-
 /**
  *
  * @param   {Object} config
@@ -55,8 +53,8 @@ module.exports = function (config) {
       const distPath = path.resolve(config.build.dist, config.name + '.js');
       const distDir = path.dirname(distPath);
 
-      return fs.mkdirpAsync(distDir).then(function () {
-        return fs.writeFileAsync(distPath, data, 'utf-8');
+      return fs.mkdirp(distDir).then(function () {
+        return fs.writeFile(distPath, data, 'utf-8');
       });
     });
 };

package/lib/buildPngSprite.js

@@ -4,17 +4,15 @@ const autoprefixer = require('autoprefixer');
 const chalk = require('chalk');
 const crypto = require('crypto');
 const fs = require('fs-extra');
+const globby = require('globby');
 const path = require('path');
 const postcss = require('postcss');
 const Promise = require('bluebird');
 const sass = require('node-sass');
 const Spritesmith = require('spritesmith');
 const nunjucks = require('nunjucks');
-const multiGlob = require('./multiGlob');
 const packageJson = require('../package.json');
 
-Promise.promisifyAll(fs);
-
 const md5 = crypto.createHash('md5');
 
 /**
@@ -27,7 +25,7 @@ module.exports = function (config) {
   md5.update(JSON.stringify(config));
 
   return Promise.mapSeries(config.build.rules, (rule) =>
-    multiGlob(rule.src).then((glyphs) =>
+    globby(rule.src).then((glyphs) =>
       Promise.resolve(
         _.assign({}, rule, {
           src: glyphs.map((glyph) => ({
@@ -75,11 +73,9 @@ module.exports = function (config) {
 
                 md5.update(result.image);
 
-                fs.outputFileAsync(file, result.image, 'binary').then(
-                  function () {
-                    resolve(sprite);
-                  }
-                );
+                fs.outputFile(file, result.image, 'binary').then(function () {
+                  resolve(sprite);
+                });
               }
             });
           })
@@ -94,10 +90,8 @@ module.exports = function (config) {
 
       // Build stylesheet data.
       const {sprite: baselineSprite} = rules[0];
-      const {
-        width: spriteWidth,
-        height: spriteHeight
-      } = baselineSprite.properties;
+      const {width: spriteWidth, height: spriteHeight} =
+        baselineSprite.properties;
       const baselineRuleGlyphs = _.values(baselineSprite.coordinates);
       const {width: glyphWidth, height: glyphHeight} = baselineRuleGlyphs.length
         ? baselineRuleGlyphs[0]
@@ -137,10 +131,7 @@ module.exports = function (config) {
       }));
 
       return fs
-        .readFileAsync(
-          path.join(__dirname, '../src/png-sprite.scss.njk'),
-          'utf8'
-        )
+        .readFile(path.join(__dirname, '../src/png-sprite.scss.njk'), 'utf-8')
         .then((data) =>
           Promise.resolve(
             nunjucks.renderString(data, {
@@ -170,11 +161,11 @@ module.exports = function (config) {
                     }
                   )
                   .then((result) =>
-                    fs.outputFileAsync(cssPath, result.css, 'utf8')
+                    fs.outputFile(cssPath, result.css, 'utf-8')
                   );
 
               case 'scss':
-                return fs.outputFileAsync(scssPath, data, 'utf8');
+                return fs.outputFile(scssPath, data, 'utf-8');
             }
 
             return Promise.reject(
@@ -199,14 +190,11 @@ module.exports = function (config) {
         };
 
         return fs
-          .readFileAsync(
-            path.join(__dirname, '../src/png-sprite.html.njk'),
-            'utf8'
-          )
+          .readFile(path.join(__dirname, '../src/png-sprite.html.njk'), 'utf-8')
           .then((data) =>
             Promise.resolve(nunjucks.renderString(data, htmlData))
           )
-          .then((data) => fs.outputFileAsync(htmlPath, data, 'utf8'));
+          .then((data) => fs.outputFile(htmlPath, data, 'utf-8'));
       }
 
       return Promise.resolve();

package/lib/buildSvgSprite.js

@@ -9,8 +9,6 @@ const svgstore = require('svgstore');
 const loadFiles = require('./loadFiles');
 const svgMin = require('./svgMin');
 
-Promise.promisifyAll(fs);
-
 /**
  *
  * @param   {Object} config
@@ -52,8 +50,8 @@ module.exports = function (config) {
         const distPath = path.resolve(build.dist, config.name + '.svg');
         const distDir = path.dirname(distPath);
 
-        return fs.mkdirpAsync(distDir).then(function () {
-          return fs.writeFileAsync(distPath, data, 'utf-8');
+        return fs.mkdirp(distDir).then(function () {
+          return fs.writeFile(distPath, data, 'utf-8');
         });
       });
     });

package/lib/buildWebFont.js

@@ -1,9 +1,9 @@
 /* eslint no-console: 0 */
 const _ = require('lodash');
 const chalk = require('chalk');
+const globby = require('globby');
 const Promise = require('bluebird');
 const webfont = require('grunt-webfont');
-const multiGlob = require('./multiGlob');
 
 /**
  *
@@ -13,7 +13,7 @@ const multiGlob = require('./multiGlob');
 module.exports = function (config) {
   console.log(`Building web font: ${chalk.cyan(config.name)}`);
 
-  return multiGlob(config.src).then(function (files) {
+  return globby(config.src).then(function (files) {
     return new Promise(function (resolve, reject) {
       let task;
 

package/lib/constants.js

@@ -5,7 +5,6 @@ const SVG_SPRITE = 'svg-sprite';
 const WEB_FONT = 'web-font';
 const PNG = 'png';
 const SVG = 'svg';
-const EOT = 'eot';
 const WOFF2 = 'woff2';
 const WOFF = 'woff';
 const TTF = 'ttf';
@@ -18,7 +17,6 @@ module.exports = {
   WEB_FONT,
   PNG,
   SVG,
-  EOT,
   WOFF,
   WOFF2,
   TTF

package/lib/loadFiles.js

@@ -1,9 +1,7 @@
 const _ = require('lodash');
 const fs = require('fs-extra');
+const globby = require('globby');
 const Promise = require('bluebird');
-const multiGlob = require('./multiGlob');
-
-Promise.promisifyAll(fs);
 
 /**
  *
@@ -11,14 +9,14 @@ Promise.promisifyAll(fs);
  * @returns {Promise}
  */
 module.exports = function (src) {
-  return multiGlob(src).then(function (matches) {
+  return globby(src).then(function (matches) {
     const files = _.map(matches, function (file) {
       return {path: file};
     });
 
     return Promise.mapSeries(files, function (file) {
       return Promise.props(
-        _.assign(file, {data: fs.readFileAsync(file.path, 'utf-8')})
+        _.assign(file, {data: fs.readFile(file.path, 'utf-8')})
       );
     });
   });

package/lib/svg2pngMin.js

@@ -5,8 +5,6 @@ const path = require('path');
 const Promise = require('bluebird');
 const sharp = require('sharp');
 
-Promise.promisifyAll(fs);
-
 /**
  *
  * @param   {string} src - Soure file path
@@ -24,8 +22,8 @@ module.exports = function (src, destDir, scale, suffix) {
   );
 
   return fs
-    .mkdirpAsync(destDir)
-    .then(() => fs.readFileAsync(src, 'utf-8'))
+    .mkdirp(destDir)
+    .then(() => fs.readFile(src, 'utf-8'))
     .then((data) => {
       let resize;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "punchcutter",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Build fonts",
   "main": "lib/punchcutter.js",
   "repository": {
@@ -21,7 +21,7 @@
     "url": "https://github.com/netbek/punchcutter/issues"
   },
   "dependencies": {
-    "@babel/core": "7.20.2",
+    "@babel/core": "7.20.12",
     "@babel/eslint-parser": "7.19.1",
     "autoprefixer": "10.4.13",
     "babel-loader": "8.3.0",
@@ -31,41 +31,39 @@
     "chalk": "4.1.2",
     "cheerio": "0.22.0",
     "directory-colorfy": "https://github.com/netbek/directory-colorfy.git#netbek-jsdom-9",
-    "eslint": "8.26.0",
+    "eslint": "8.32.0",
     "eslint-config-airbnb": "19.0.4",
-    "eslint-config-prettier": "8.5.0",
+    "eslint-config-prettier": "8.6.0",
     "eslint-plugin-babel": "5.3.1",
     "eslint-plugin-dollar-sign": "1.0.2",
     "eslint-plugin-html": "6.2.0",
-    "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-jsdoc": "39.6.2",
-    "eslint-plugin-jsx-a11y": "6.6.1",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-jsdoc": "39.6.9",
+    "eslint-plugin-jsx-a11y": "6.7.1",
     "eslint-plugin-markdown": "2.2.1",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-react": "7.31.10",
+    "eslint-plugin-react": "7.32.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "fs-extra": "10.1.0",
-    "glob": "7.2.3",
-    "glob-promise": "4.2.2",
+    "globby": "9.2.0",
     "grunt": "1.5.3",
     "grunt-webfont": "git+https://github.com/netbek/grunt-webfont.git#netbek-logger-option",
     "lodash": "4.17.21",
     "lodash-webpack-plugin": "0.11.6",
     "node-sass": "7.0.3",
     "nunjucks": "3.2.3",
-    "postcss": "8.4.18",
-    "prettier": "2.7.1",
+    "postcss": "8.4.21",
+    "prettier": "2.8.3",
     "replace-ext": "2.0.0",
-    "sharp": "0.31.2",
+    "sharp": "0.31.3",
     "spritesmith": "3.4.0",
     "svgo": "2.8.0",
     "svgstore": "3.0.1",
     "webpack": "4.46.0"
   },
   "devDependencies": {
-    "chai": "4.3.6",
+    "chai": "4.3.7",
     "chai-as-promised": "7.1.1",
-    "glob-promise": "4.2.2",
     "mocha": "9.2.2"
   }
 }

package/test/index.js

@@ -3,8 +3,8 @@ const {assert} = chai;
 const chaiAsPromised = require('chai-as-promised');
 chai.use(chaiAsPromised);
 const fs = require('fs-extra');
+const globby = require('globby');
 const Promise = require('bluebird');
-const multiGlob = require('../lib/multiGlob');
 const {
   build,
   GLYPH,
@@ -14,13 +14,10 @@ const {
   WEB_FONT,
   PNG,
   SVG,
-  EOT,
   WOFF,
   TTF
 } = require('..');
 
-Promise.promisifyAll(fs);
-
 describe('Punchcutter', function () {
   const testDir = __dirname.substring(process.cwd().length + 1) + '/';
 
@@ -65,14 +62,14 @@ describe('Punchcutter', function () {
             font: {
               dist: testDir + 'data/dist/poly/font/'
             },
-            order: [EOT, WOFF, TTF],
+            order: [WOFF, TTF],
             stylesheets: ['scss'],
             syntax: 'bem',
             templateOptions: {
               baseClass: 'poly',
               classPrefix: 'poly--'
             },
-            types: [EOT, WOFF, TTF]
+            types: [WOFF, TTF]
           },
           {
             type: GLYPH,
@@ -139,7 +136,7 @@ describe('Punchcutter', function () {
 
   const setup = function (done) {
     // Delete test output.
-    fs.removeAsync(testDir + 'data/dist/').then(function () {
+    fs.remove(testDir + 'data/dist/').then(function () {
       done();
     });
   };
@@ -153,7 +150,7 @@ describe('Punchcutter', function () {
 
       const actual = () =>
         Promise.mapSeries(config.fonts, (font) => build(font))
-          .then(() => multiGlob([testDir + 'data/dist/**/*'], {nodir: true}))
+          .then(() => globby([testDir + 'data/dist/**/*'], {onlyFiles: true}))
           .then((files) => Promise.resolve(files.sort()));
 
       const expected = [
@@ -161,7 +158,6 @@ describe('Punchcutter', function () {
         testDir + 'data/dist/mono/glyph/svg/eye.svg',
         testDir + 'data/dist/mono/svg-sprite/mono.svg',
         testDir + 'data/dist/poly/font/_poly.scss',
-        testDir + 'data/dist/poly/font/poly.eot',
         testDir + 'data/dist/poly/font/poly.ttf',
         testDir + 'data/dist/poly/font/poly.woff',
         testDir + 'data/dist/poly/glyph/png/@1x/blue/erlenmeyer-flask.png',

package/lib/multiGlob.js

@@ -1,23 +0,0 @@
-const fs = require('fs-extra');
-const globPromise = require('glob-promise');
-const Promise = require('bluebird');
-
-Promise.promisifyAll(fs);
-
-/**
- *
- * @param   {Array} patterns
- * @param   {Object} options
- * @returns {Promise}
- */
-module.exports = function (patterns, options) {
-  let matches = [];
-
-  return Promise.mapSeries(patterns, function (pattern) {
-    return globPromise(pattern, options).then(function (files) {
-      matches = matches.concat(files);
-    });
-  }).then(function () {
-    return Promise.resolve(matches);
-  });
-};