Merge pull request #7 from gapitio/refactor/update-to-v2-of-svgo

Refactor/update to v2 of svgo
porsager · Mar 29, 2022 · d920961 · d920961
2 parents 2517569 + a3cf916
commit d920961
Show file tree

Hide file tree

Showing 3 changed files with 344 additions and 294 deletions.
diff --git a/index.js b/index.js
@@ -1,24 +1,15 @@
-const defaults = {
-  plugins: [{
-    removeViewBox: false
-  }, {
-    removeDimensions: true
-  }]
-}
-
-module.exports = function svg(options) {
-  const svgo = options && options.raw
-    ? ({ optimize: x => Promise.resolve({ data: x }) })
-    : new (require('svgo'))(options || defaults)
 
+module.exports = function svg(options, optimize) {
+  const optimize = optimize || require('svgo').optimize;
   return {
     name: 'svgo',
     transform: (code, id) => {
       if (id.endsWith('.svg')) {
-        return svgo.optimize(code, { path: id }).then(result => ({
+        const result = options?.raw ? { data: code } : optimize(code, { path: id, ...options })
+        return {
           map: { mappings: '' },
           code: 'export default ' + JSON.stringify(result.data)
-        }))
+        }
       }
     }
   }