Upgrade SVGO to v3

.gitignore

@@ -1,6 +1,5 @@
-.DS_Store
-package-lock.json
-node_modules/
+.DS_Store
+node_modules/
 
 desktop-output
 mobile-output

bin/optimize.js

@@ -1,47 +1,51 @@
-const fs = require('fs-extra');
-const glob = require('glob-promise');
-const SVGO = require('svgo');
-const progress = require('cli-progress');
+const fs = require("fs-extra");
+const glob = require("glob-promise");
+const svgo = require("svgo");
+const progress = require("cli-progress");
 
 let options = {
   plugins: [
-    {cleanupIDs: {remove: false}},
-    {removeStyleElement: true},
-    {removeUselessDefs: true},
-    {removeUselessStrokeAndFill: false},
-    {removeHiddenElems: true},
-    {removeEmptyText: true},
-    {convertShapeToPath: { convertArcs: true }},
-    {convertPathData: { noSpaceAfterFlags: false }},
-    {removeEmptyAttrs: true},
-    {removeEmptyContainers: true},
-    {mergePaths: false},
-    {removeTitle: true},
-    {removeDesc: true},
-    {removeDimensions: true},
-    {removeAttrs: {attrs: ['class', '(stroke)']}}
+    {
+      name: "cleanupIds",
+      params: { remove: false },
+    },
+    { name: "removeAttrs", params: { attrs: ["class", "(stroke)"] } },
+    { name: "convertShapeToPath", params: { convertArcs: true } },
+    { name: "convertPathData", params: { noSpaceAfterFlags: false } },
+    "removeStyleElement",
+    "removeUselessDefs",
+    "removeHiddenElems",
+    "removeEmptyText",
+    "removeEmptyAttrs",
+    "removeEmptyContainers",
+    "removeTitle",
+    "removeDesc",
+    "removeDimensions",
   ],
-  multipass: true
+  multipass: true,
 };
 
 /**
  * Reads an icon file off disk and optimizes it, saving to same location
- * @param {string[]}           filePaths  array of relative file paths
- * @param {SVGO}               svgo       SVGO instance with correct options
- * @param {SingleBar}          bar        progress bar instance
+ * @param {string[]}           filePaths   array of relative file paths
+ * @param {svgoOptions}        svgoOptions options to pass to the optimize function
+ * @param {SingleBar}          bar         progress bar instance
  * @return {Promise}
  */
-function optimizeIcons (filePaths, svgo, bar) {
+function optimizeIcons(filePaths, svgoOptions, bar) {
   var num = 0;
-  return Promise.all(filePaths.map((path) => {
-    return fs.readFile(path, 'utf-8')
-      .then((svg) => svgo.optimize(svg, { path }))
-      .then((result) => {
-        num++;
-        bar.update(num);
-        return fs.writeFile(path, result.data, 'utf-8');
-      });
-  }));
+  return Promise.all(
+    filePaths.map((path) => {
+      return fs
+        .readFile(path, "utf-8")
+        .then((svg) => svgo.optimize(svg, { ...svgoOptions, path }))
+        .then((result) => {
+          num++;
+          bar.update(num);
+          return fs.writeFile(path, result.data, "utf-8");
+        });
+    })
+  );
 }
 
 /**
@@ -54,15 +58,17 @@ module.exports = function (files, remove) {
   if (!files) {
     return Promise.resolve(true);
   }
-  options.plugins[0] = {cleanupIDs: { remove }};
-  svgo = new SVGO(options);
+  options.plugins[0].params = { remove };
   return glob(files).then((iconPaths) => {
     const format = "  \x1b[32m {bar} {percentage}% | {value}/{total} \x1b[0m";
-    const bar = new progress.SingleBar({ format }, progress.Presets.shades_classic);
+    const bar = new progress.SingleBar(
+      { format },
+      progress.Presets.shades_classic
+    );
     bar.start(iconPaths.length, 0);
-    return optimizeIcons(iconPaths, svgo, bar).then(() => {
+    return optimizeIcons(iconPaths, options, bar).then(() => {
       bar.stop();
       console.log("");
     });
   });
-}
+};