Remove pngquant

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.0.0 (31.01.2022)
+
+Removed [pngquant-bin](https://github.com/imagemin/pngquant-bin) due to license issues.
+
+
 ## 2.7.5 (23.09.2021)
 
 Fixed “Cannot find module” error that occurred if Optimizt was installed using Yarn.

MIGRATION.md

@@ -1,5 +1,15 @@
 # Migration
 
+## 2.7.5 → 3.0.0
+
+[sharp](README.md#png) module is now used to process PNG files.
+
+The size of PNG files and their visual quality may differ from files processed with older versions of Optimizt.
+
+Also, when you process PNG files in lossless mode, Optimizt will now try to preserve the original visual quality of
+the image.
+
+
 ## 1.0.1 → 2.0.0
 
 There were no any breaking changes. 

README.md

@@ -65,36 +65,53 @@ find . -iname \*.jpg -exec optimizt {} +
 
 ### JPEG
 
-In lossy mode [jpegoptim](https://github.com/tjko/jpegoptim) is used with flags: `--strip-all`,
-`--all-progressive`, `--max=80`.
+#### Lossy
 
-Lossless mode uses [Guetzli](https://github.com/google/guetzli) encoder with `--quality 90` flag.
+[jpegoptim](https://github.com/tjko/jpegoptim) with flags: `--strip-all`, `--all-progressive`, `--max=80`.
+
+#### Lossless
+
+[Guetzli](https://github.com/google/guetzli) with `--quality 90` flag.
 
 Guetzli aims for excellent compression density at high visual quality.
 
-If you re-optimize the same file in lossless mode, the file size may decrease, but the visual quality will also degrade.
+Keep in mind that if you reoptimize the same file in lossless mode, the file size may decrease, but the visual quality
+will also degrade.
 
 ### PNG
 
-For both modes [pngquant](https://github.com/kornelski/pngquant) (lossy compressor) is used with flags:
-`--speed 1`, `--strip`.
+[sharp](https://github.com/lovell/sharp) with [parameters](https://sharp.pixelplumbing.com/api-output#png):
+
+- **lossy**: `compressionLevel: 9`, `adaptiveFiltering: false`, `palette: true`
+- **lossless**: `compressionLevel: 9`, `adaptiveFiltering: true`, `palette: false`
 
 ### GIF
 
-For both modes [gifsicle](https://github.com/kohler/gifsicle) utility is used.
+[gifsicle](https://github.com/kohler/gifsicle) with flags:
+
+- **lossy**: `-O3`, `--lossy=100`
+- **lossless**: no flags
+
+### WebP
+
+[sharp](https://github.com/lovell/sharp) with [parameters](https://sharp.pixelplumbing.com/api-output#webp):
+
+- **lossy**: `quality: 85`, `lossless: false`
+- **lossless**: `quality: 85`, `lossless: true`
 
-Following flags is used in lossy mode: `-O3`, `--lossy=100`.
+### WebP (GIF)
 
-In lossless mode no additional flags is used.
+[gif2webp](https://developers.google.com/speed/webp/docs/gif2webp) with flags:
 
-### WebP & AVIF
+- **lossy**: `-lossy`, `-min_size`
+- **lossless**: no flags
 
-For both modes [sharp](https://github.com/lovell/sharp) module is used.
+### AVIF
 
-In lossless mode an “lossless” option is used:
+[sharp](https://github.com/lovell/sharp) with [parameters](https://sharp.pixelplumbing.com/api-output#avif):
 
-- https://sharp.pixelplumbing.com/api-output#webp
-- https://sharp.pixelplumbing.com/api-output#avif
+- **lossy**: `lossless: false`
+- **lossless**: `lossless: true`
 
 ## Integrations
 

README.ru.md

@@ -63,10 +63,13 @@ find . -iname \*.jpg -exec optimizt {} +
 
 ### JPEG
 
-По умолчанию, в режиме lossy, используется [jpegoptim](https://github.com/tjko/jpegoptim) с ключами: `--strip-all`,
-`--all-progressive`, `--max=80`.
+#### Lossy
 
-В режиме lossless используется энкодер [Guetzli](https://github.com/google/guetzli) с ключом `--quality 90`.
+[jpegoptim](https://github.com/tjko/jpegoptim) с ключами: `--strip-all`, `--all-progressive`, `--max=80`.
+
+#### Lossless
+
+[Guetzli](https://github.com/google/guetzli) с ключом `--quality 90`.
 
 Guetzli позволяет получить высокий уровень компрессии и при этом сохранить хорошее визуальное качество изображения.
 
@@ -75,25 +78,38 @@ Guetzli позволяет получить высокий уровень ком
 
 ### PNG
 
-В обоих режимах используется lossy-компрессор [pngquant](https://github.com/kornelski/pngquant) с ключами: `--speed 1`,
-`--strip`.
+[sharp](https://github.com/lovell/sharp) с [параметрами](https://sharp.pixelplumbing.com/api-output#png):
+
+- **lossy**: `compressionLevel: 9`, `adaptiveFiltering: false`, `palette: true`
+- **lossless**: `compressionLevel: 9`, `adaptiveFiltering: true`, `palette: false`
 
 ### GIF
 
-В обоих режимах используется утилита [gifsicle](https://github.com/kohler/gifsicle).
+[gifsicle](https://github.com/kohler/gifsicle) с ключами:
+
+- **lossy**: `-O3`, `--lossy=100`
+- **lossless**: без ключей
+
+### WebP
+
+[sharp](https://github.com/lovell/sharp) с [параметрами](https://sharp.pixelplumbing.com/api-output#webp):
+
+- **lossy**: `quality: 85`, `lossless: false`
+- **lossless**: `quality: 85`, `lossless: true`
 
-При запуске в режиме lossy используются ключи: `-O3`, `--lossy=100`.
+### WebP (GIF)
 
-В режиме lossless дополнительные ключи не устанавливаются.
+[gif2webp](https://developers.google.com/speed/webp/docs/gif2webp) с ключами:
 
-### WebP & AVIF
+- **lossy**: `-lossy`, `-min_size`
+- **lossless**: без ключей
 
-В обоих режимах используется модуль [sharp](https://github.com/lovell/sharp).
+### AVIF
 
-Для режима lossless используется одноимённая опция, которая гарантирует сжатие без потерь:
+[sharp](https://github.com/lovell/sharp) с [параметрами](https://sharp.pixelplumbing.com/api-output#avif):
 
-- https://sharp.pixelplumbing.com/api-output#webp
-- https://sharp.pixelplumbing.com/api-output#avif
+- **lossy**: `lossless: false`
+- **lossless**: `lossless: true`
 
 ## Интеграции
 

cli.js

@@ -12,8 +12,8 @@ program
 
 program
   .usage('[options] <dir> <file ...>')
-  .version(require('./package').version, '-V, --version')
-  .description(require('./package').description)
+  .version(require('./package.json').version, '-V, --version')
+  .description(require('./package.json').description)
   .parse(process.argv);
 
 if (!program.args.length) {

lib/convert.js

@@ -8,12 +8,12 @@ const gif2webp = require('gif2webp-bin');
 const pLimit = require('p-limit');
 const sharp = require('sharp');
 
-const calcRatio = require('../lib/calcRatio');
-const getImageFormat = require('../lib/getImageFormat');
-const formatBytes = require('../lib/formatBytes');
-const getPlural = require('../lib/getPlural');
-const { log } = require('../lib/log');
-const showTotal = require('../lib/showTotal');
+const calcRatio = require('./calcRatio');
+const getImageFormat = require('./getImageFormat');
+const formatBytes = require('./formatBytes');
+const getPlural = require('./getPlural');
+const { log } = require('./log');
+const showTotal = require('./showTotal');
 
 async function convert({ paths, lossless, avif, webp, force }) {
   const totalPaths = paths.length;
@@ -168,7 +168,6 @@ async function createAvif({ fileBuffer, lossless }) {
 
   return sharp(fileBuffer)
     .avif({
-      quality: 50,
       lossless,
     })
     .toBuffer();

lib/log.js

@@ -26,7 +26,8 @@ function log(title = '', { type = 'info', description, verboseOnly } = {}) {
   if (!isVerbose && verboseOnly && type === 'info') return;
 
   console.log(
-    colorize(symbols[type][symbolIndex])[colors[type]], title,
+    colorize(symbols[type][symbolIndex])[colors[type]],
+    title,
     ...description ? [EOL, ' ', colorize(description).dim] : [],
   );
 }

lib/optimize.js

@@ -9,17 +9,16 @@ const gifsicle = require('gifsicle');
 const guetzli = require('guetzli');
 const jpegoptim = require('jpegoptim-bin');
 const pLimit = require('p-limit');
-const pngquant = require('pngquant-bin');
 const sharp = require('sharp');
 const svgo = require('svgo');
 
-const calcRatio = require('../lib/calcRatio');
-const formatBytes = require('../lib/formatBytes');
-const getImageFormat = require('../lib/getImageFormat');
-const getPlural = require('../lib/getPlural');
-const setSrgbColorspace = require('../lib/setSrgbColorspace');
-const { log } = require('../lib/log');
-const showTotal = require('../lib/showTotal');
+const calcRatio = require('./calcRatio');
+const formatBytes = require('./formatBytes');
+const getImageFormat = require('./getImageFormat');
+const getPlural = require('./getPlural');
+const setSrgbColorspace = require('./setSrgbColorspace');
+const { log } = require('./log');
+const showTotal = require('./showTotal');
 
 const svgoConfig = require('../svgo/config');
 
@@ -197,11 +196,13 @@ async function optimizeByType({ fileBuffer, filePath, isLossless }) {
         return fileBuffer;
       }
 
-      return execBuffer({
-        bin: pngquant,
-        args: ['--speed', '1', '--strip', '--output', execBuffer.output, execBuffer.input],
-        input: fileBuffer,
-      });
+      return sharp(fileBuffer)
+        .png({
+          compressionLevel: 9,
+          adaptiveFiltering: isLossless,
+          palette: !isLossless,
+        })
+        .toBuffer();
 
     case '.gif':
       if (imageFormat !== 'gif') {