From 433dcefd646edba35b015fc4f567077a79d1d8ee Mon Sep 17 00:00:00 2001
From: Seth Falco <seth@falco.fun>
Date: Thu, 28 Dec 2023 17:51:19 +0000
Subject: [PATCH 1/9] refactor(convertPaths): clean up plugin (#1913)

---
 plugins/convertPathData.js | 125 +++++++++++--------------------------
 1 file changed, 36 insertions(+), 89 deletions(-)

diff --git a/plugins/convertPathData.js b/plugins/convertPathData.js
index 0ee7824ea..e8d8350e1 100644
--- a/plugins/convertPathData.js
+++ b/plugins/convertPathData.js
@@ -15,25 +15,15 @@ exports.name = 'convertPathData';
 exports.description =
   'optimizes path data: writes in shorter form, applies transformations';
 
-/**
- * @type {(data: number[]) => number[]}
- */
+/** @type {(data: number[]) => number[]} */
 let roundData;
-/**
- * @type {number | false}
- */
+/** @type {number | false} */
 let precision;
-/**
- * @type {number}
- */
+/** @type {number} */
 let error;
-/**
- * @type {number}
- */
+/** @type {number} */
 let arcThreshold;
-/**
- * @type {number}
- */
+/** @type {number} */
 let arcTolerance;
 
 /**
@@ -393,16 +383,17 @@ function filters(
   params,
   { isSafeToUseZ, maybeHasStrokeAndLinecap, hasMarkerMid },
 ) {
-  var stringify = data2Path.bind(null, params),
-    relSubpoint = [0, 0],
-    pathBase = [0, 0],
-    prev = {};
+  const stringify = data2Path.bind(null, params);
+  const relSubpoint = [0, 0];
+  const pathBase = [0, 0];
+  /** @type {any} */
+  let prev = {};
   /** @type {Point | undefined} */
-  let qControlPoint;
+  let prevQControlPoint;
 
   path = path.filter(function (item, index, path) {
-    const qPoint = qControlPoint;
-    qControlPoint = undefined;
+    const qControlPoint = prevQControlPoint;
+    prevQControlPoint = undefined;
 
     let command = item.command;
     let data = item.args;
@@ -415,9 +406,8 @@ function filters(
       if (command === 's') {
         sdata = [0, 0].concat(data);
 
-        // @ts-ignore
-        var pdata = prev.args,
-          n = pdata.length;
+        const pdata = prev.args;
+        const n = pdata.length;
 
         // (-x, -y) of the prev tangent point relative to the current point
         sdata[0] = pdata[n - 2] - pdata[n - 4];
@@ -464,16 +454,11 @@ function filters(
           nextLonghand;
 
         if (
-          // @ts-ignore
           (prev.command == 'c' &&
-            // @ts-ignore
             isConvex(prev.args) &&
-            // @ts-ignore
             isArcPrev(prev.args, circle)) ||
-          // @ts-ignore
           (prev.command == 'a' && prev.sdata && isArcPrev(prev.sdata, circle))
         ) {
-          // @ts-ignore
           arcCurves.unshift(prev);
           // @ts-ignore
           arc.base = prev.base;
@@ -481,7 +466,6 @@ function filters(
           arc.args[5] = arc.coords[0] - arc.base[0];
           // @ts-ignore
           arc.args[6] = arc.coords[1] - arc.base[1];
-          // @ts-ignore
           var prevData = prev.command == 'a' ? prev.sdata : prev.args;
           var prevAngle = findArcAngle(prevData, {
             center: [
@@ -498,7 +482,7 @@ function filters(
         // check if next curves are fitting the arc
         for (
           var j = index;
-          (next = path[++j]) && ~'cs'.indexOf(next.command);
+          (next = path[++j]) && 'cs'.includes(next.command);
 
         ) {
           var nextData = next.args;
@@ -574,7 +558,6 @@ function filters(
             relSubpoint[0] += prevArc.args[5] - prev.args[prev.args.length - 2];
             // @ts-ignore
             relSubpoint[1] += prevArc.args[6] - prev.args[prev.args.length - 1];
-            // @ts-ignore
             prev.command = 'a';
             // @ts-ignore
             prev.args = prevArc.args;
@@ -588,11 +571,7 @@ function filters(
             item.sdata = sdata.slice(); // preserve curve data for future checks
           } else if (arcCurves.length - 1 - hasPrev > 0) {
             // filter out consumed next items
-            path.splice.apply(
-              path,
-              // @ts-ignore
-              [index + 1, arcCurves.length - 1 - hasPrev].concat(output),
-            );
+            path.splice(index + 1, arcCurves.length - 1 - hasPrev, ...output);
           }
           if (!arc) return false;
           command = 'a';
@@ -679,9 +658,7 @@ function filters(
           data = data.slice(-2);
         } else if (
           command === 't' &&
-          // @ts-ignore
           prev.command !== 'q' &&
-          // @ts-ignore
           prev.command !== 't'
         ) {
           command = 'l';
@@ -716,39 +693,29 @@ function filters(
         params.collapseRepeated &&
         hasMarkerMid === false &&
         (command === 'm' || command === 'h' || command === 'v') &&
-        // @ts-ignore
         prev.command &&
-        // @ts-ignore
         command == prev.command.toLowerCase() &&
         ((command != 'h' && command != 'v') ||
-          // @ts-ignore
           prev.args[0] >= 0 == data[0] >= 0)
       ) {
-        // @ts-ignore
         prev.args[0] += data[0];
         if (command != 'h' && command != 'v') {
-          // @ts-ignore
           prev.args[1] += data[1];
         }
         // @ts-ignore
         prev.coords = item.coords;
-        // @ts-ignore
         path[index] = prev;
         return false;
       }
 
       // convert curves into smooth shorthands
-      // @ts-ignore
       if (params.curveSmoothShorthands && prev.command) {
         // curveto
         if (command === 'c') {
           // c + c → c + s
           if (
-            // @ts-ignore
             prev.command === 'c' &&
-            // @ts-ignore
             Math.abs(data[0] - -(prev.args[2] - prev.args[4])) < error &&
-            // @ts-ignore
             Math.abs(data[1] - -(prev.args[3] - prev.args[5])) < error
           ) {
             command = 's';
@@ -757,11 +724,8 @@ function filters(
 
           // s + c → s + s
           else if (
-            // @ts-ignore
             prev.command === 's' &&
-            // @ts-ignore
             Math.abs(data[0] - -(prev.args[0] - prev.args[2])) < error &&
-            // @ts-ignore
             Math.abs(data[1] - -(prev.args[1] - prev.args[3])) < error
           ) {
             command = 's';
@@ -770,9 +734,7 @@ function filters(
 
           // [^cs] + c → [^cs] + s
           else if (
-            // @ts-ignore
             prev.command !== 'c' &&
-            // @ts-ignore
             prev.command !== 's' &&
             Math.abs(data[0]) < error &&
             Math.abs(data[1]) < error
@@ -786,11 +748,8 @@ function filters(
         else if (command === 'q') {
           // q + q → q + t
           if (
-            // @ts-ignore
             prev.command === 'q' &&
-            // @ts-ignore
             Math.abs(data[0] - (prev.args[2] - prev.args[0])) < error &&
-            // @ts-ignore
             Math.abs(data[1] - (prev.args[3] - prev.args[1])) < error
           ) {
             command = 't';
@@ -798,12 +757,13 @@ function filters(
           }
 
           // t + q → t + t
-          else if (
-            // @ts-ignore
-            prev.command === 't'
-          ) {
-            // @ts-ignore
-            const predictedControlPoint = reflectPoint(qPoint, item.base);
+          else if (prev.command === 't') {
+            const predictedControlPoint = reflectPoint(
+              // @ts-ignore
+              qControlPoint,
+              // @ts-ignore
+              item.base,
+            );
             const realControlPoint = [
               // @ts-ignore
               data[0] + item.base[0],
@@ -837,14 +797,12 @@ function filters(
             return i === 0;
           })
         ) {
-          // @ts-ignore
           path[index] = prev;
           return false;
         }
 
         // a 25,25 -30 0,1 0,0
         if (command === 'a' && data[5] === 0 && data[6] === 0) {
-          // @ts-ignore
           path[index] = prev;
           return false;
         }
@@ -874,7 +832,6 @@ function filters(
       // z resets coordinates
       relSubpoint[0] = pathBase[0];
       relSubpoint[1] = pathBase[1];
-      // @ts-ignore
       if (prev.command === 'Z' || prev.command === 'z') return false;
     }
     if (
@@ -890,14 +847,14 @@ function filters(
 
     if (command === 'q') {
       // @ts-ignore
-      qControlPoint = [data[0] + item.base[0], data[1] + item.base[1]];
+      prevQControlPoint = [data[0] + item.base[0], data[1] + item.base[1]];
     } else if (command === 't') {
-      if (qPoint) {
+      if (qControlPoint) {
         // @ts-ignore
-        qControlPoint = reflectPoint(qPoint, item.base);
+        prevQControlPoint = reflectPoint(qControlPoint, item.base);
       } else {
         // @ts-ignore
-        qControlPoint = item.coords;
+        prevQControlPoint = item.coords;
       }
     }
     prev = item;
@@ -971,8 +928,9 @@ function convertToMixed(path, params) {
           prev.command.charCodeAt(0) > 96 &&
           absoluteDataStr.length == relativeDataStr.length - 1 &&
           (data[0] < 0 ||
-            // @ts-ignore
-            (/^0\./.test(data[0]) && prev.args[prev.args.length - 1] % 1))
+            (Math.floor(data[0]) === 0 &&
+              !Number.isInteger(data[0]) &&
+              prev.args[prev.args.length - 1] % 1))
         ))
     ) {
       // @ts-ignore
@@ -981,7 +939,6 @@ function convertToMixed(path, params) {
     }
 
     prev = item;
-
     return true;
   });
 
@@ -1098,7 +1055,6 @@ function round(data) {
  *
  * @type {(data: number[]) => boolean}
  */
-
 function isCurveStraightLine(data) {
   // Get line equation a·x + b·y + c = 0 coefficients a, b (c = 0) by start and end points.
   var i = data.length - 2,
@@ -1125,7 +1081,6 @@ function isCurveStraightLine(data) {
  */
 function calculateSagitta(data) {
   if (data[3] === 1) return undefined;
-
   const [rx, ry] = data;
   if (Math.abs(rx - ry) > error) return undefined;
   const chord = Math.sqrt(data[5] ** 2 + data[6] ** 2);
@@ -1138,7 +1093,6 @@ function calculateSagitta(data) {
  *
  * @type {(item: PathDataItem, data: number[]) => PathDataItem}
  */
-
 function makeLonghand(item, data) {
   switch (item.command) {
     case 's':
@@ -1160,20 +1114,19 @@ function makeLonghand(item, data) {
  *
  * @type {(point1: Point, point2: Point) => number}
  */
-
 function getDistance(point1, point2) {
-  return Math.hypot(point1[0] - point2[0], point1[1] - point2[1]);
+  return Math.sqrt((point1[0] - point2[0]) ** 2 + (point1[1] - point2[1]) ** 2);
 }
 
 /**
- * Reflects point across another point
+ * Reflects point across another point.
  *
- * @param {Point} input
+ * @param {Point} controlPoint
  * @param {Point} base
  * @returns {Point}
  */
-function reflectPoint(input, base) {
-  return [2 * base[0] - input[0], 2 * base[1] - input[1]];
+function reflectPoint(controlPoint, base) {
+  return [2 * base[0] - controlPoint[0], 2 * base[1] - controlPoint[1]];
 }
 
 /**
@@ -1183,7 +1136,6 @@ function reflectPoint(input, base) {
  *
  * @type {(curve: number[], t: number) => Point}
  */
-
 function getCubicBezierPoint(curve, t) {
   var sqrT = t * t,
     cubT = sqrT * t,
@@ -1201,7 +1153,6 @@ function getCubicBezierPoint(curve, t) {
  *
  * @type {(curve: number[]) => undefined | Circle}
  */
-
 function findCircle(curve) {
   var midPoint = getCubicBezierPoint(curve, 1 / 2),
     m1 = [midPoint[0] / 2, midPoint[1] / 2],
@@ -1242,7 +1193,6 @@ function findCircle(curve) {
  *
  * @type {(curve: number[], circle: Circle) => boolean}
  */
-
 function isArc(curve, circle) {
   var tolerance = Math.min(
     arcThreshold * error,
@@ -1264,7 +1214,6 @@ function isArc(curve, circle) {
  *
  * @type {(curve: number[], circle: Circle) => boolean}
  */
-
 function isArcPrev(curve, circle) {
   return isArc(curve, {
     center: [circle.center[0] + curve[4], circle.center[1] + curve[5]],
@@ -1277,7 +1226,6 @@ function isArcPrev(curve, circle) {
 
  * @type {(curve: number[], relCircle: Circle) => number}
  */
-
 function findArcAngle(curve, relCircle) {
   var x1 = -relCircle.center[0],
     y1 = -relCircle.center[1],
@@ -1294,7 +1242,6 @@ function findArcAngle(curve, relCircle) {
  *
  * @type {(params: InternalParams, pathData: PathDataItem[]) => string}
  */
-
 function data2Path(params, pathData) {
   return pathData.reduce(function (pathString, item) {
     var strData = '';

From db05c5782a02b3c137800cb04098bb1ef5b552bf Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Thu, 28 Dec 2023 14:06:05 -0500
Subject: [PATCH 2/9] chore: Use idiomatic Jest patterns to assert exceptions
 (#1909)

---
 lib/svgo-node.test.js   | 61 +++++++++++++----------------------------
 lib/svgo.test.js        |  8 +++---
 test/coa/_index.test.js | 30 ++++++++------------
 3 files changed, 34 insertions(+), 65 deletions(-)

diff --git a/lib/svgo-node.test.js b/lib/svgo-node.test.js
index 1b474e4af..2cf23dff0 100644
--- a/lib/svgo-node.test.js
+++ b/lib/svgo-node.test.js
@@ -156,56 +156,33 @@ describe('loadConfig', () => {
   });
 
   test('fails when specified config does not exist', async () => {
-    try {
-      await loadConfig('{}');
-      expect.fail('Config is loaded successfully');
-    } catch (error) {
-      expect(error.message).toMatch(/Cannot find module/);
-    }
+    await expect(loadConfig('{}')).rejects.toThrow(/Cannot find module/);
   });
 
   test('fails when exported config not an object', async () => {
-    try {
-      await loadConfig(path.join(fixtures, 'invalid-null.js'));
-      expect.fail('Config is loaded successfully');
-    } catch (error) {
-      expect(error.message).toMatch(/Invalid config file/);
-    }
-    try {
-      await loadConfig(path.join(fixtures, 'invalid-array.js'));
-      expect.fail('Config is loaded successfully');
-    } catch (error) {
-      expect(error.message).toMatch(/Invalid config file/);
-    }
-    try {
-      await loadConfig(path.join(fixtures, 'invalid-string.js'));
-      expect.fail('Config is loaded successfully');
-    } catch (error) {
-      expect(error.message).toMatch(/Invalid config file/);
-    }
+    await expect(
+      loadConfig(path.join(fixtures, 'invalid-null.js')),
+    ).rejects.toThrow(/Invalid config file/);
+    await expect(
+      loadConfig(path.join(fixtures, 'invalid-array.js')),
+    ).rejects.toThrow(/Invalid config file/);
+    await expect(
+      loadConfig(path.join(fixtures, 'invalid-string.js')),
+    ).rejects.toThrow(/Invalid config file/);
   });
 
   test('handles runtime errors properly', async () => {
-    try {
-      await loadConfig(path.join(fixtures, 'invalid-runtime.js'));
-      expect.fail('Config is loaded successfully');
-    } catch (error) {
-      expect(error.message).toMatch(/plugins is not defined/);
-    }
-    try {
-      await loadConfig(path.join(fixtures, 'invalid-runtime.mjs'));
-      expect.fail('Config is loaded successfully');
-    } catch (error) {
-      expect(error.message).toMatch(/plugins is not defined/);
-    }
+    await expect(
+      loadConfig(path.join(fixtures, 'invalid-runtime.js')),
+    ).rejects.toThrow(/plugins is not defined/);
+    await expect(
+      loadConfig(path.join(fixtures, 'invalid-runtime.mjs')),
+    ).rejects.toThrow(/plugins is not defined/);
   });
 
   test('handles MODULE_NOT_FOUND properly', async () => {
-    try {
-      await loadConfig(path.join(fixtures, 'module-not-found.js'));
-      expect.fail('Config is loaded successfully');
-    } catch (error) {
-      expect(error.message).toMatch(/Cannot find module 'unknown-module'/);
-    }
+    await expect(
+      loadConfig(path.join(fixtures, 'module-not-found.js')),
+    ).rejects.toThrow(/Cannot find module 'unknown-module'/);
   });
 });
diff --git a/lib/svgo.test.js b/lib/svgo.test.js
index 68fb8d7ea..468a894ab 100644
--- a/lib/svgo.test.js
+++ b/lib/svgo.test.js
@@ -267,13 +267,13 @@ test('plugin precision should override preset precision', () => {
 });
 
 test('provides informative error in result', () => {
+  expect.assertions(6);
   const svg = `<svg viewBox="0 0 120 120">
       <circle fill="#ff0000" cx=60.444444" cy="60" r="50"/>
     </svg>
   `;
   try {
     optimize(svg, { path: 'test.svg' });
-    expect(true).toEqual(false);
   } catch (error) {
     expect(error.name).toEqual('SvgoParserError');
     expect(error.message).toEqual('test.svg:2:33: Unquoted attribute value');
@@ -285,13 +285,13 @@ test('provides informative error in result', () => {
 });
 
 test('provides code snippet in rendered error', () => {
+  expect.assertions(1);
   const svg = `<svg viewBox="0 0 120 120">
   <circle fill="#ff0000" cx=60.444444" cy="60" r="50"/>
 </svg>
 `;
   try {
     optimize(svg, { path: 'test.svg' });
-    expect(true).toEqual(false);
   } catch (error) {
     expect(error.toString())
       .toEqual(`SvgoParserError: test.svg:2:29: Unquoted attribute value
@@ -306,6 +306,7 @@ test('provides code snippet in rendered error', () => {
 });
 
 test('supports errors without path', () => {
+  expect.assertions(1);
   const svg = `<svg viewBox="0 0 120 120">
   <circle/>
   <circle/>
@@ -321,7 +322,6 @@ test('supports errors without path', () => {
 `;
   try {
     optimize(svg);
-    expect(true).toEqual(false);
   } catch (error) {
     expect(error.toString())
       .toEqual(`SvgoParserError: <input>:11:29: Unquoted attribute value
@@ -337,13 +337,13 @@ test('supports errors without path', () => {
 });
 
 test('slices long line in error code snippet', () => {
+  expect.assertions(1);
   const svg = `<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" viewBox="0 0 230 120">
   <path d="M318.198 551.135 530.33 918.56l-289.778-77.646 38.823-144.889c77.646-289.778 294.98-231.543 256.156-86.655s178.51 203.124 217.334 58.235q58.234-217.334 250.955 222.534t579.555 155.292z stroke-width="1.5" fill="red" stroke="red" />
 </svg>
 `;
   try {
     optimize(svg);
-    expect(true).toEqual(false);
   } catch (error) {
     expect(error.toString())
       .toEqual(`SvgoParserError: <input>:2:211: Invalid attribute name
diff --git a/test/coa/_index.test.js b/test/coa/_index.test.js
index aed055c41..4fbb7d1d1 100644
--- a/test/coa/_index.test.js
+++ b/test/coa/_index.test.js
@@ -124,15 +124,11 @@ describe('coa', function () {
   it('should throw error when stated in input folder does not exist', async () => {
     replaceConsoleError();
     try {
-      await runProgram([
-        '--input',
-        svgFolderPath + 'temp',
-        '--output',
-        tempFolder,
-      ]);
-    } catch (error) {
+      await expect(
+        runProgram(['--input', svgFolderPath + 'temp', '--output', tempFolder]),
+      ).rejects.toThrow(/no such file or directory/);
+    } finally {
       restoreConsoleError();
-      expect(error.message).toMatch(/no such file or directory/);
     }
   });
 
@@ -142,23 +138,19 @@ describe('coa', function () {
       if (!fs.existsSync(emptyFolderPath)) {
         fs.mkdirSync(emptyFolderPath);
       }
-      try {
-        await runProgram(['--folder', emptyFolderPath, '--quiet']);
-      } catch (error) {
-        expect(error.message).toMatch(/No SVG files/);
-      }
+      await expect(
+        runProgram(['--folder', emptyFolderPath, '--quiet']),
+      ).rejects.toThrow(/No SVG files/);
     });
 
     it('should show message when folder does not consists any svg files', async () => {
-      try {
-        await runProgram([
+      await expect(
+        runProgram([
           '--folder',
           path.resolve(__dirname, 'testFolderWithNoSvg'),
           '--quiet',
-        ]);
-      } catch (error) {
-        expect(error.message).toMatch(/No SVG files have been found/);
-      }
+        ]),
+      ).rejects.toThrow(/No SVG files have been found/);
     });
   });
 });

From f6a2ca20d6472cb0f2b18dadd626d6db092f8767 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Thu, 28 Dec 2023 14:14:47 -0500
Subject: [PATCH 3/9] chore: improve jest tests with more precise assertions
 (#1912)

---
 lib/path.test.js               |  44 +++++++-------
 lib/style.test.js              | 102 ++++++++++++++++++++-------------
 lib/svgo-node.test.js          |  34 ++++++-----
 lib/svgo.test.js               |  40 ++++++-------
 lib/xast.test.js               |  12 ++--
 test/cli/cli.test.js           |  12 ++--
 test/plugins/_index.test.js    |   4 +-
 test/plugins/prefixIds.test.js |   6 +-
 test/svg2js/_index.test.js     |  14 ++---
 test/svgo/_index.test.js       |  18 +++---
 10 files changed, 149 insertions(+), 137 deletions(-)

diff --git a/lib/path.test.js b/lib/path.test.js
index 91e6eaa91..7fe7c5156 100644
--- a/lib/path.test.js
+++ b/lib/path.test.js
@@ -8,55 +8,55 @@ const { parsePathData, stringifyPathData } = require('./path.js');
 
 describe('parse path data', () => {
   it('should allow spaces between commands', () => {
-    expect(parsePathData('M0 10 L \n\r\t20 30')).toEqual([
+    expect(parsePathData('M0 10 L \n\r\t20 30')).toStrictEqual([
       { command: 'M', args: [0, 10] },
       { command: 'L', args: [20, 30] },
     ]);
   });
   it('should allow spaces and commas between arguments', () => {
-    expect(parsePathData('M0 , 10 L 20 \n\r\t30,40,50')).toEqual([
+    expect(parsePathData('M0 , 10 L 20 \n\r\t30,40,50')).toStrictEqual([
       { command: 'M', args: [0, 10] },
       { command: 'L', args: [20, 30] },
       { command: 'L', args: [40, 50] },
     ]);
   });
   it('should forbid commas before commands', () => {
-    expect(parsePathData(', M0 10')).toEqual([]);
+    expect(parsePathData(', M0 10')).toStrictEqual([]);
   });
   it('should forbid commas between commands', () => {
-    expect(parsePathData('M0,10 , L 20,30')).toEqual([
+    expect(parsePathData('M0,10 , L 20,30')).toStrictEqual([
       { command: 'M', args: [0, 10] },
     ]);
   });
   it('should forbid commas between command name and argument', () => {
-    expect(parsePathData('M0,10 L,20,30')).toEqual([
+    expect(parsePathData('M0,10 L,20,30')).toStrictEqual([
       { command: 'M', args: [0, 10] },
     ]);
   });
   it('should forbid multiple commas in a row', () => {
-    expect(parsePathData('M0 , , 10')).toEqual([]);
+    expect(parsePathData('M0 , , 10')).toStrictEqual([]);
   });
   it('should stop when unknown char appears', () => {
-    expect(parsePathData('M0 10 , L 20 #40')).toEqual([
+    expect(parsePathData('M0 10 , L 20 #40')).toStrictEqual([
       { command: 'M', args: [0, 10] },
     ]);
   });
   it('should stop when not enough arguments', () => {
-    expect(parsePathData('M0 10 L 20 L 30 40')).toEqual([
+    expect(parsePathData('M0 10 L 20 L 30 40')).toStrictEqual([
       { command: 'M', args: [0, 10] },
     ]);
   });
   it('should stop if moveto not the first command', () => {
-    expect(parsePathData('L 10 20')).toEqual([]);
-    expect(parsePathData('10 20')).toEqual([]);
+    expect(parsePathData('L 10 20')).toStrictEqual([]);
+    expect(parsePathData('10 20')).toStrictEqual([]);
   });
   it('should stop on invalid scientific notation', () => {
-    expect(parsePathData('M 0 5e++1 L 0 0')).toEqual([
+    expect(parsePathData('M 0 5e++1 L 0 0')).toStrictEqual([
       { command: 'M', args: [0, 5] },
     ]);
   });
   it('should stop on invalid numbers', () => {
-    expect(parsePathData('M ...')).toEqual([]);
+    expect(parsePathData('M ...')).toStrictEqual([]);
   });
   it('should handle arcs', () => {
     expect(
@@ -71,7 +71,7 @@ describe('parse path data', () => {
           l 50,-25
         `,
       ),
-    ).toEqual([
+    ).toStrictEqual([
       { command: 'M', args: [600, 350] },
       { command: 'l', args: [50, -25] },
       { command: 'a', args: [25, 25, -30, 0, 1, 50, -25] },
@@ -96,7 +96,7 @@ describe('stringify path data', () => {
           { command: 'H', args: [50] },
         ],
       }),
-    ).toEqual('M0 0h10 20 30H40 50');
+    ).toBe('M0 0h10 20 30H40 50');
   });
   it('should not combine sequence of moveto', () => {
     expect(
@@ -108,7 +108,7 @@ describe('stringify path data', () => {
           { command: 'm', args: [40, 50] },
         ],
       }),
-    ).toEqual('M0 0M10 10m20 30m40 50');
+    ).toBe('M0 0M10 10m20 30m40 50');
   });
   it('should combine moveto and sequence of lineto', () => {
     expect(
@@ -122,7 +122,7 @@ describe('stringify path data', () => {
           { command: 'L', args: [10, 10] },
         ],
       }),
-    ).toEqual('m0 0 10 10M0 0l10 10M0 0 10 10');
+    ).toBe('m0 0 10 10M0 0l10 10M0 0 10 10');
     expect(
       stringifyPathData({
         pathData: [
@@ -130,7 +130,7 @@ describe('stringify path data', () => {
           { command: 'L', args: [10, 10] },
         ],
       }),
-    ).toEqual('M0 0 10 10');
+    ).toBe('M0 0 10 10');
   });
   it('should avoid space before first, negative and decimals', () => {
     expect(
@@ -142,7 +142,7 @@ describe('stringify path data', () => {
           { command: 'L', args: [7, 0.8] },
         ],
       }),
-    ).toEqual('M0-1.2.3 4 5-.6 7 .8');
+    ).toBe('M0-1.2.3 4 5-.6 7 .8');
   });
   it('should configure precision', () => {
     /**
@@ -159,13 +159,13 @@ describe('stringify path data', () => {
         pathData,
         precision: 3,
       }),
-    ).toEqual('M0-1.988.3 3.142-.3-3.142 100 200');
+    ).toBe('M0-1.988.3 3.142-.3-3.142 100 200');
     expect(
       stringifyPathData({
         pathData,
         precision: 0,
       }),
-    ).toEqual('M0-2 0 3 0-3 100 200');
+    ).toBe('M0-2 0 3 0-3 100 200');
   });
   it('allows to avoid spaces after arc flags', () => {
     /**
@@ -182,12 +182,12 @@ describe('stringify path data', () => {
         pathData,
         disableSpaceAfterFlags: false,
       }),
-    ).toEqual('M0 0A50 50 10 1 0 .2 20a50 50 10 1 0 .2 20 50 50 10 1 0 .2 20');
+    ).toBe('M0 0A50 50 10 1 0 .2 20a50 50 10 1 0 .2 20 50 50 10 1 0 .2 20');
     expect(
       stringifyPathData({
         pathData,
         disableSpaceAfterFlags: true,
       }),
-    ).toEqual('M0 0A50 50 10 10.2 20a50 50 10 10.2 20 50 50 10 10.2 20');
+    ).toBe('M0 0A50 50 10 10.2 20a50 50 10 10.2 20 50 50 10 10.2 20');
   });
 });
diff --git a/lib/style.test.js b/lib/style.test.js
index b5e1b2c72..48a0779b2 100644
--- a/lib/style.test.js
+++ b/lib/style.test.js
@@ -58,31 +58,35 @@ it('collects styles', () => {
       </svg>
     `);
   const stylesheet = collectStylesheet(root);
-  expect(computeStyle(stylesheet, getElementById(root, 'class'))).toEqual({
-    fill: { type: 'static', inherited: false, value: 'red' },
-  });
-  expect(computeStyle(stylesheet, getElementById(root, 'two-classes'))).toEqual(
+  expect(computeStyle(stylesheet, getElementById(root, 'class'))).toStrictEqual(
     {
-      fill: { type: 'static', inherited: false, value: 'green' },
-      stroke: { type: 'static', inherited: false, value: 'black' },
+      fill: { type: 'static', inherited: false, value: 'red' },
     },
   );
-  expect(computeStyle(stylesheet, getElementById(root, 'attribute'))).toEqual({
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'two-classes')),
+  ).toStrictEqual({
+    fill: { type: 'static', inherited: false, value: 'green' },
+    stroke: { type: 'static', inherited: false, value: 'black' },
+  });
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'attribute')),
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'purple' },
   });
   expect(
     computeStyle(stylesheet, getElementById(root, 'inline-style')),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'grey' },
   });
-  expect(computeStyle(stylesheet, getElementById(root, 'inheritance'))).toEqual(
-    {
-      fill: { type: 'static', inherited: true, value: 'yellow' },
-    },
-  );
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'inheritance')),
+  ).toStrictEqual({
+    fill: { type: 'static', inherited: true, value: 'yellow' },
+  });
   expect(
     computeStyle(stylesheet, getElementById(root, 'nested-inheritance')),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: true, value: 'blue' },
   });
 });
@@ -107,12 +111,12 @@ it('prioritizes different kinds of styles', () => {
   const stylesheet = collectStylesheet(root);
   expect(
     computeStyle(stylesheet, getElementById(root, 'complex-selector')),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'red' },
   });
   expect(
     computeStyle(stylesheet, getElementById(root, 'override-selector')),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'blue' },
   });
   expect(
@@ -120,12 +124,12 @@ it('prioritizes different kinds of styles', () => {
       stylesheet,
       getElementById(root, 'attribute-over-inheritance'),
     ),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'orange' },
   });
   expect(
     computeStyle(stylesheet, getElementById(root, 'style-rule-over-attribute')),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'blue' },
   });
   expect(
@@ -133,7 +137,7 @@ it('prioritizes different kinds of styles', () => {
       stylesheet,
       getElementById(root, 'inline-style-over-style-rule'),
     ),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'purple' },
   });
 });
@@ -153,7 +157,7 @@ it('prioritizes important styles', () => {
   const stylesheet = collectStylesheet(root);
   expect(
     computeStyle(stylesheet, getElementById(root, 'complex-selector')),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'green' },
   });
   expect(
@@ -161,7 +165,7 @@ it('prioritizes important styles', () => {
       stylesheet,
       getElementById(root, 'style-rule-over-inline-style'),
     ),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'green' },
   });
   expect(
@@ -169,7 +173,7 @@ it('prioritizes important styles', () => {
       stylesheet,
       getElementById(root, 'inline-style-over-style-rule'),
     ),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'purple' },
   });
 });
@@ -195,23 +199,29 @@ it('treats at-rules and pseudo-classes as dynamic styles', () => {
       </svg>
     `);
   const stylesheet = collectStylesheet(root);
-  expect(computeStyle(stylesheet, getElementById(root, 'media-query'))).toEqual(
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'media-query')),
+  ).toStrictEqual({
+    fill: { type: 'dynamic', inherited: false },
+  });
+  expect(computeStyle(stylesheet, getElementById(root, 'hover'))).toStrictEqual(
     {
       fill: { type: 'dynamic', inherited: false },
     },
   );
-  expect(computeStyle(stylesheet, getElementById(root, 'hover'))).toEqual({
-    fill: { type: 'dynamic', inherited: false },
-  });
-  expect(computeStyle(stylesheet, getElementById(root, 'inherited'))).toEqual({
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'inherited')),
+  ).toStrictEqual({
     fill: { type: 'dynamic', inherited: true },
   });
   expect(
     computeStyle(stylesheet, getElementById(root, 'inherited-overriden')),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'blue' },
   });
-  expect(computeStyle(stylesheet, getElementById(root, 'static'))).toEqual({
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'static')),
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'black' },
   });
 });
@@ -234,17 +244,19 @@ it('considers <style> media attribute', () => {
       </svg>
     `);
   const stylesheet = collectStylesheet(root);
-  expect(computeStyle(stylesheet, getElementById(root, 'media-query'))).toEqual(
-    {
-      fill: { type: 'dynamic', inherited: false },
-    },
-  );
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'media-query')),
+  ).toStrictEqual({
+    fill: { type: 'dynamic', inherited: false },
+  });
   expect(
     computeStyle(stylesheet, getElementById(root, 'kinda-static')),
-  ).toEqual({
+  ).toStrictEqual({
     fill: { type: 'dynamic', inherited: false },
   });
-  expect(computeStyle(stylesheet, getElementById(root, 'static'))).toEqual({
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'static')),
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'blue' },
   });
 });
@@ -267,15 +279,19 @@ it('ignores <style> with invalid type', () => {
       </svg>
     `);
   const stylesheet = collectStylesheet(root);
-  expect(computeStyle(stylesheet, getElementById(root, 'valid-type'))).toEqual({
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'valid-type')),
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'red' },
   });
-  expect(computeStyle(stylesheet, getElementById(root, 'empty-type'))).toEqual({
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'empty-type')),
+  ).toStrictEqual({
     fill: { type: 'static', inherited: false, value: 'green' },
   });
   expect(
     computeStyle(stylesheet, getElementById(root, 'invalid-type')),
-  ).toEqual({});
+  ).toStrictEqual({});
 });
 
 it('ignores keyframes atrule', () => {
@@ -301,7 +317,9 @@ it('ignores keyframes atrule', () => {
       </svg>
     `);
   const stylesheet = collectStylesheet(root);
-  expect(computeStyle(stylesheet, getElementById(root, 'element'))).toEqual({
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'element')),
+  ).toStrictEqual({
     animation: {
       type: 'static',
       inherited: false,
@@ -330,7 +348,9 @@ it('ignores @-webkit-keyframes atrule', () => {
       </svg>
     `);
   const stylesheet = collectStylesheet(root);
-  expect(computeStyle(stylesheet, getElementById(root, 'element'))).toEqual({
+  expect(
+    computeStyle(stylesheet, getElementById(root, 'element')),
+  ).toStrictEqual({
     animation: {
       type: 'static',
       inherited: false,
diff --git a/lib/svgo-node.test.js b/lib/svgo-node.test.js
index 2cf23dff0..6a7e51002 100644
--- a/lib/svgo-node.test.js
+++ b/lib/svgo-node.test.js
@@ -23,8 +23,7 @@ describeLF('with LF line-endings', () => {
       </svg>
     `;
     const { data } = optimize(svg);
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120"><circle cx="60" cy="60" r="50" fill="red"/></svg>',
     );
   });
@@ -42,8 +41,7 @@ describeLF('with LF line-endings', () => {
     const { data } = optimize(svg, {
       js2svg: { pretty: true, indent: 2 },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120">\n  <circle cx="60" cy="60" r="50" fill="red"/>\n</svg>\n',
     );
   });
@@ -61,8 +59,7 @@ describeLF('with LF line-endings', () => {
     const { data } = optimize(svg, {
       js2svg: { eol: 'crlf', pretty: true, indent: 2 },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120">\r\n  <circle cx="60" cy="60" r="50" fill="red"/>\r\n</svg>\r\n',
     );
   });
@@ -80,8 +77,7 @@ describeCRLF('with CRLF line-endings', () => {
       </svg>
     `;
     const { data } = optimize(svg);
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120"><circle cx="60" cy="60" r="50" fill="red"/></svg>',
     );
   });
@@ -99,8 +95,7 @@ describeCRLF('with CRLF line-endings', () => {
     const { data } = optimize(svg, {
       js2svg: { pretty: true, indent: 2 },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120">\r\n  <circle cx="60" cy="60" r="50" fill="red"/>\r\n</svg>\r\n',
     );
   });
@@ -118,8 +113,7 @@ describeCRLF('with CRLF line-endings', () => {
     const { data } = optimize(svg, {
       js2svg: { eol: 'lf', pretty: true, indent: 2 },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120">\n  <circle cx="60" cy="60" r="50" fill="red"/>\n</svg>\n',
     );
   });
@@ -130,27 +124,31 @@ describe('loadConfig', () => {
   const fixtures = path.join(cwd, './test/fixtures/config-loader');
 
   test('loads by absolute path', async () => {
-    expect(await loadConfig(path.join(fixtures, 'one/two/config.js'))).toEqual({
+    expect(
+      await loadConfig(path.join(fixtures, 'one/two/config.js')),
+    ).toStrictEqual({
       plugins: [],
     });
   });
 
   test('loads by relative path to cwd', async () => {
     const config = await loadConfig('one/two/config.js', fixtures);
-    expect(config).toEqual({ plugins: [] });
+    expect(config).toStrictEqual({ plugins: [] });
   });
 
   test('searches in cwd and up', async () => {
-    expect(await loadConfig(null, path.join(fixtures, 'one/two'))).toEqual({
+    expect(
+      await loadConfig(null, path.join(fixtures, 'one/two')),
+    ).toStrictEqual({
       plugins: [],
     });
     expect(
       await loadConfig(null, path.join(cwd, './test/fixtures/missing')),
-    ).toEqual(null);
-    expect(await loadConfig(null, path.join(fixtures, 'mjs'))).toEqual({
+    ).toBeNull();
+    expect(await loadConfig(null, path.join(fixtures, 'mjs'))).toStrictEqual({
       plugins: ['mjs'],
     });
-    expect(await loadConfig(null, path.join(fixtures, 'cjs'))).toEqual({
+    expect(await loadConfig(null, path.join(fixtures, 'cjs'))).toStrictEqual({
       plugins: ['cjs'],
     });
   });
diff --git a/lib/svgo.test.js b/lib/svgo.test.js
index 468a894ab..de10d8317 100644
--- a/lib/svgo.test.js
+++ b/lib/svgo.test.js
@@ -109,8 +109,7 @@ describe('allow to configure EOL', () => {
     const { data } = optimize(svg, {
       js2svg: { eol: 'lf', pretty: true, indent: 2 },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120">\n  <circle cx="60" cy="60" r="50" fill="red"/>\n</svg>\n',
     );
   });
@@ -128,8 +127,7 @@ describe('allow to configure EOL', () => {
     const { data } = optimize(svg, {
       js2svg: { eol: 'crlf', pretty: true, indent: 2 },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120">\r\n  <circle cx="60" cy="60" r="50" fill="red"/>\r\n</svg>\r\n',
     );
   });
@@ -147,8 +145,7 @@ describe('allow to configure EOL', () => {
     const { data } = optimize(svg, {
       js2svg: { eol: 'invalid', pretty: true, indent: 2 },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120">\n  <circle cx="60" cy="60" r="50" fill="red"/>\n</svg>\n',
     );
   });
@@ -166,8 +163,7 @@ describe('allow to configure final newline', () => {
       </svg>
     `;
     const { data } = optimize(svg, { js2svg: { eol: 'lf' } });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120"><circle cx="60" cy="60" r="50" fill="red"/></svg>',
     );
   });
@@ -185,8 +181,7 @@ describe('allow to configure final newline', () => {
     const { data } = optimize(svg, {
       js2svg: { finalNewline: true, eol: 'lf' },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120"><circle cx="60" cy="60" r="50" fill="red"/></svg>\n',
     );
   });
@@ -204,8 +199,7 @@ describe('allow to configure final newline', () => {
     const { data } = optimize(svg, {
       js2svg: { finalNewline: true, pretty: true, indent: 2, eol: 'lf' },
     });
-    // using toEqual because line endings matter in these tests
-    expect(data).toEqual(
+    expect(data).toBe(
       '<svg viewBox="0 0 120 120">\n  <circle cx="60" cy="60" r="50" fill="red"/>\n</svg>\n',
     );
   });
@@ -275,12 +269,12 @@ test('provides informative error in result', () => {
   try {
     optimize(svg, { path: 'test.svg' });
   } catch (error) {
-    expect(error.name).toEqual('SvgoParserError');
-    expect(error.message).toEqual('test.svg:2:33: Unquoted attribute value');
-    expect(error.reason).toEqual('Unquoted attribute value');
-    expect(error.line).toEqual(2);
-    expect(error.column).toEqual(33);
-    expect(error.source).toEqual(svg);
+    expect(error.name).toBe('SvgoParserError');
+    expect(error.message).toBe('test.svg:2:33: Unquoted attribute value');
+    expect(error.reason).toBe('Unquoted attribute value');
+    expect(error.line).toBe(2);
+    expect(error.column).toBe(33);
+    expect(error.source).toBe(svg);
   }
 });
 
@@ -294,7 +288,7 @@ test('provides code snippet in rendered error', () => {
     optimize(svg, { path: 'test.svg' });
   } catch (error) {
     expect(error.toString())
-      .toEqual(`SvgoParserError: test.svg:2:29: Unquoted attribute value
+      .toBe(`SvgoParserError: test.svg:2:29: Unquoted attribute value
 
   1 | <svg viewBox="0 0 120 120">
 > 2 |   <circle fill="#ff0000" cx=60.444444" cy="60" r="50"/>
@@ -324,7 +318,7 @@ test('supports errors without path', () => {
     optimize(svg);
   } catch (error) {
     expect(error.toString())
-      .toEqual(`SvgoParserError: <input>:11:29: Unquoted attribute value
+      .toBe(`SvgoParserError: <input>:11:29: Unquoted attribute value
 
    9 |   <circle/>
   10 |   <circle/>
@@ -346,7 +340,7 @@ test('slices long line in error code snippet', () => {
     optimize(svg);
   } catch (error) {
     expect(error.toString())
-      .toEqual(`SvgoParserError: <input>:2:211: Invalid attribute name
+      .toBe(`SvgoParserError: <input>:2:211: Invalid attribute name
 
   1 | …-0.dtd" viewBox="0 0 230 120">
 > 2 | …7.334 250.955 222.534t579.555 155.292z stroke-width="1.5" fill="red" strok…
@@ -377,8 +371,8 @@ test('multipass option should trigger plugins multiple times', () => {
     },
   };
   const { data } = optimize(svg, { multipass: true, plugins: [testPlugin] });
-  expect(list).toEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
-  expect(data).toEqual(`<svg id="klmnopqrstuvwxyz"/>`);
+  expect(list).toStrictEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
+  expect(data).toBe(`<svg id="klmnopqrstuvwxyz"/>`);
 });
 
 test('encode as datauri', () => {
diff --git a/lib/xast.test.js b/lib/xast.test.js
index 4371fc938..0fed4fe98 100644
--- a/lib/xast.test.js
+++ b/lib/xast.test.js
@@ -43,7 +43,7 @@ test('visit enters into nodes', () => {
       },
     },
   });
-  expect(entered).toEqual([
+  expect(entered).toStrictEqual([
     'root',
     'element:g',
     'element:rect',
@@ -70,7 +70,7 @@ test('visit exits from nodes', () => {
       },
     },
   });
-  expect(exited).toEqual([
+  expect(exited).toStrictEqual([
     'element:rect',
     'element:circle',
     'element:g',
@@ -95,8 +95,8 @@ test('visit skips entering children if node is detached', () => {
       },
     },
   });
-  expect(entered).toEqual(['g', 'ellipse']);
-  expect(ast).toEqual(root([x('ellipse')]));
+  expect(entered).toStrictEqual(['g', 'ellipse']);
+  expect(ast).toStrictEqual(root([x('ellipse')]));
 });
 
 test('visit skips entering children when symbol is passed', () => {
@@ -115,8 +115,8 @@ test('visit skips entering children when symbol is passed', () => {
       },
     },
   });
-  expect(entered).toEqual(['g', 'ellipse']);
-  expect(ast).toEqual(
+  expect(entered).toStrictEqual(['g', 'ellipse']);
+  expect(ast).toStrictEqual(
     root([x('g', null, [x('rect'), x('circle')]), x('ellipse')]),
   );
 });
diff --git a/test/cli/cli.test.js b/test/cli/cli.test.js
index a53693bf4..ea4759015 100644
--- a/test/cli/cli.test.js
+++ b/test/cli/cli.test.js
@@ -47,7 +47,7 @@ test('accepts svg as input stream', async () => {
   proc.stdin.write('<svg><title>stdin</title></svg>');
   proc.stdin.end();
   const stdout = await waitStdout(proc);
-  expect(stdout).toEqual('<svg/>');
+  expect(stdout).toBe('<svg/>');
 });
 
 test('accepts svg as string', async () => {
@@ -58,7 +58,7 @@ test('accepts svg as string', async () => {
     { cwd: __dirname },
   );
   const stdout = await waitStdout(proc);
-  expect(stdout).toEqual('<svg/>');
+  expect(stdout).toBe('<svg/>');
 });
 
 test('accepts svg as filename', async () => {
@@ -72,7 +72,7 @@ test('accepts svg as filename', async () => {
     path.join(__dirname, 'output/single.svg'),
     'utf-8',
   );
-  expect(output).toEqual('<svg/>');
+  expect(output).toBe('<svg/>');
 });
 
 test('output as stream when "-" is specified', async () => {
@@ -82,7 +82,7 @@ test('output as stream when "-" is specified', async () => {
     { cwd: __dirname },
   );
   const stdout = await waitStdout(proc);
-  expect(stdout).toEqual('<svg/>');
+  expect(stdout).toBe('<svg/>');
 });
 
 test('should exit with 1 code on syntax error', async () => {
@@ -101,9 +101,9 @@ test('should exit with 1 code on syntax error', async () => {
       });
     }),
   ]);
-  expect(code).toEqual(1);
+  expect(code).toBe(1);
   expect(stderr)
-    .toEqual(`SvgoParserError: invalid.svg:2:27: Unquoted attribute value
+    .toBe(`SvgoParserError: invalid.svg:2:27: Unquoted attribute value
 
   1 | <svg>
 > 2 |   <rect x="0" y="0" width=10" height="20" />
diff --git a/test/plugins/_index.test.js b/test/plugins/_index.test.js
index ce1bff375..812282660 100644
--- a/test/plugins/_index.test.js
+++ b/test/plugins/_index.test.js
@@ -41,9 +41,9 @@ describe('plugins tests', function () {
               js2svg: { pretty: true },
             });
             lastResultData = result.data;
-            expect(result.error).not.toEqual(expect.anything());
+            expect(result.error).not.toStrictEqual(expect.anything());
             //FIXME: results.data has a '\n' at the end while it should not
-            expect(normalize(result.data)).toEqual(should);
+            expect(normalize(result.data)).toStrictEqual(should);
           }
         });
       });
diff --git a/test/plugins/prefixIds.test.js b/test/plugins/prefixIds.test.js
index 97f1a8fd1..8ae2b33b8 100644
--- a/test/plugins/prefixIds.test.js
+++ b/test/plugins/prefixIds.test.js
@@ -8,17 +8,17 @@ test('should extract prefix from path basename', () => {
     optimize(svg, {
       plugins: ['prefixIds'],
     }).data,
-  ).toEqual(`<svg id="prefix__my-id"/>`);
+  ).toBe(`<svg id="prefix__my-id"/>`);
   expect(
     optimize(svg, {
       plugins: ['prefixIds'],
       path: 'input.svg',
     }).data,
-  ).toEqual(`<svg id="input_svg__my-id"/>`);
+  ).toBe(`<svg id="input_svg__my-id"/>`);
   expect(
     optimize(svg, {
       plugins: ['prefixIds'],
       path: 'path/to/input.svg',
     }).data,
-  ).toEqual(`<svg id="input_svg__my-id"/>`);
+  ).toBe(`<svg id="input_svg__my-id"/>`);
 });
diff --git a/test/svg2js/_index.test.js b/test/svg2js/_index.test.js
index 77c9075fd..ece064284 100644
--- a/test/svg2js/_index.test.js
+++ b/test/svg2js/_index.test.js
@@ -22,7 +22,7 @@ describe('svg2js', function () {
 
     describe('root', function () {
       it('should exist', function () {
-        expect(root).toEqual(expect.anything());
+        expect(root).toStrictEqual(expect.anything());
       });
 
       it('should be an instance of Object', function () {
@@ -45,7 +45,7 @@ describe('svg2js', function () {
     });
 
     it('the first node should be instruction', () => {
-      expect(root.children[0]).toEqual({
+      expect(root.children[0]).toStrictEqual({
         type: 'instruction',
         name: 'xml',
         value: 'version="1.0" encoding="utf-8"',
@@ -53,7 +53,7 @@ describe('svg2js', function () {
     });
 
     it('the second node should be comment', () => {
-      expect(root.children[1]).toEqual({
+      expect(root.children[1]).toStrictEqual({
         type: 'comment',
         value:
           'Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)',
@@ -61,7 +61,7 @@ describe('svg2js', function () {
     });
 
     it('the third node should be doctype', () => {
-      expect(root.children[2]).toEqual({
+      expect(root.children[2]).toStrictEqual({
         type: 'doctype',
         name: 'svg',
         data: {
@@ -73,7 +73,7 @@ describe('svg2js', function () {
 
     describe('name', function () {
       it('should have property name: "svg"', function () {
-        expect(root.children[3]).toEqual(
+        expect(root.children[3]).toStrictEqual(
           expect.objectContaining({
             name: 'svg',
           }),
@@ -83,7 +83,7 @@ describe('svg2js', function () {
 
     describe('children', function () {
       it('should exist', function () {
-        expect(root.children[3].children).toEqual(expect.anything());
+        expect(root.children[3].children).toStrictEqual(expect.anything());
       });
 
       it('should be an instance of Array', function () {
@@ -98,7 +98,7 @@ describe('svg2js', function () {
     describe('text nodes', function () {
       it('should contain preserved whitespace', function () {
         const textNode = root.children[3].children[1].children[0].children[1];
-        expect(textNode.children[0].value).toEqual('  test  ');
+        expect(textNode.children[0].value).toBe('  test  ');
       });
     });
   });
diff --git a/test/svgo/_index.test.js b/test/svgo/_index.test.js
index e855dc6bf..9d922852d 100644
--- a/test/svgo/_index.test.js
+++ b/test/svgo/_index.test.js
@@ -24,16 +24,16 @@ describe('svgo', () => {
       plugins: [],
       js2svg: { pretty: true, indent: 2 },
     });
-    expect(normalize(result.data)).toEqual(expected);
+    expect(normalize(result.data)).toStrictEqual(expected);
   });
   it('should handle plugins order properly', async () => {
     const [original, expected] = await parseFixture('plugins-order.svg');
     const result = optimize(original, { path: 'input.svg' });
-    expect(normalize(result.data)).toEqual(expected);
+    expect(normalize(result.data)).toStrictEqual(expected);
   });
   it('should handle empty svg tag', async () => {
     const result = optimize('<svg />', { path: 'input.svg' });
-    expect(result.data).toEqual('<svg/>');
+    expect(result.data).toBe('<svg/>');
   });
   it('should preserve style specificity over attributes', async () => {
     const [original, expected] = await parseFixture('style-specificity.svg');
@@ -41,7 +41,7 @@ describe('svgo', () => {
       path: 'input.svg',
       js2svg: { pretty: true },
     });
-    expect(normalize(result.data)).toEqual(expected);
+    expect(normalize(result.data)).toStrictEqual(expected);
   });
   it('should inline entities', async () => {
     const [original, expected] = await parseFixture('entities.svg');
@@ -50,7 +50,7 @@ describe('svgo', () => {
       plugins: [],
       js2svg: { pretty: true },
     });
-    expect(normalize(result.data)).toEqual(expected);
+    expect(normalize(result.data)).toStrictEqual(expected);
   });
   it('should preserve whitespaces between tspan tags', async () => {
     const [original, expected] = await parseFixture('whitespaces.svg');
@@ -58,7 +58,7 @@ describe('svgo', () => {
       path: 'input.svg',
       js2svg: { pretty: true },
     });
-    expect(normalize(result.data)).toEqual(expected);
+    expect(normalize(result.data)).toStrictEqual(expected);
   });
   it('should preserve "to" keyframe selector', async () => {
     const [original, expected] = await parseFixture('keyframe-selectors.svg');
@@ -66,14 +66,14 @@ describe('svgo', () => {
       path: 'input.svg',
       js2svg: { pretty: true },
     });
-    expect(normalize(result.data)).toEqual(expected);
+    expect(normalize(result.data)).toStrictEqual(expected);
   });
   it('should not trim whitespace at start and end of pre element', async () => {
     const [original, expected] = await parseFixture('pre-element.svg');
     const result = optimize(original, {
       path: 'input.svg',
     });
-    expect(normalize(result.data)).toEqual(expected);
+    expect(normalize(result.data)).toStrictEqual(expected);
   });
   it('should not add whitespace in pre element', async () => {
     const [original, expected] = await parseFixture('pre-element-pretty.svg');
@@ -81,6 +81,6 @@ describe('svgo', () => {
       path: 'input.svg',
       js2svg: { pretty: true },
     });
-    expect(normalize(result.data)).toEqual(expected);
+    expect(normalize(result.data)).toStrictEqual(expected);
   });
 });

From 2661dacc249958471d10cfb887eba3c87728ce3a Mon Sep 17 00:00:00 2001
From: Seth Falco <seth@falco.fun>
Date: Sun, 31 Dec 2023 00:59:18 +0000
Subject: [PATCH 4/9] fix(convertTransform): fix scale and rotate on skew +
 refactors (#1916)

---
 lib/path.js                          |   5 +-
 lib/svgo/tools.js                    |  14 ++
 plugins/_transforms.js               | 228 +++++++++++++++------------
 plugins/convertPathData.js           |  14 +-
 plugins/convertTransform.js          |  41 +++--
 test/plugins/_transforms.test.js     |  64 ++++++++
 test/plugins/convertTransform.05.svg |  13 ++
 7 files changed, 249 insertions(+), 130 deletions(-)
 create mode 100644 test/plugins/_transforms.test.js
 create mode 100644 test/plugins/convertTransform.05.svg

diff --git a/lib/path.js b/lib/path.js
index 8e6b47221..814ee2e3b 100644
--- a/lib/path.js
+++ b/lib/path.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { removeLeadingZero } = require('./svgo/tools');
+const { removeLeadingZero, toFixed } = require('./svgo/tools');
 
 /**
  * @typedef {import('./types').PathDataItem} PathDataItem
@@ -250,8 +250,7 @@ exports.parsePathData = parsePathData;
  */
 const roundAndStringify = (number, precision) => {
   if (precision != null) {
-    const ratio = 10 ** precision;
-    number = Math.round(number * ratio) / ratio;
+    number = toFixed(number, precision);
   }
 
   return {
diff --git a/lib/svgo/tools.js b/lib/svgo/tools.js
index 618ca70aa..2d5269ec8 100644
--- a/lib/svgo/tools.js
+++ b/lib/svgo/tools.js
@@ -229,3 +229,17 @@ const findReferences = (attribute, value) => {
   return results.map((body) => decodeURI(body));
 };
 exports.findReferences = findReferences;
+
+/**
+ * Does the same as {@link Number.toFixed} but without casting
+ * the return value to a string.
+ *
+ * @param {number} num
+ * @param {number} precision
+ * @returns {number}
+ */
+const toFixed = (num, precision) => {
+  const pow = 10 ** precision;
+  return Math.round(num * pow) / pow;
+};
+exports.toFixed = toFixed;
diff --git a/plugins/_transforms.js b/plugins/_transforms.js
index 5606b6e7d..1ab6d6485 100644
--- a/plugins/_transforms.js
+++ b/plugins/_transforms.js
@@ -1,175 +1,182 @@
 'use strict';
 
-const regTransformTypes = /matrix|translate|scale|rotate|skewX|skewY/;
-const regTransformSplit =
-  /\s*(matrix|translate|scale|rotate|skewX|skewY)\s*\(\s*(.+?)\s*\)[\s,]*/;
-const regNumericValues = /[-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g;
+const { toFixed } = require('../lib/svgo/tools');
 
 /**
  * @typedef {{ name: string, data: number[] }} TransformItem
+ * @typedef {{
+ *   convertToShorts: boolean,
+ *   floatPrecision: number,
+ *   transformPrecision: number,
+ *   matrixToTransform: boolean,
+ *   shortTranslate: boolean,
+ *   shortScale: boolean,
+ *   shortRotate: boolean,
+ *   removeUseless: boolean,
+ *   collapseIntoOne: boolean,
+ *   leadingZero: boolean,
+ *   negativeExtraSpace: boolean,
+ * }} TransformParams
  */
 
+const transformTypes = new Set([
+  'matrix',
+  'rotate',
+  'scale',
+  'skewX',
+  'skewY',
+  'translate',
+]);
+
+const regTransformSplit =
+  /\s*(matrix|translate|scale|rotate|skewX|skewY)\s*\(\s*(.+?)\s*\)[\s,]*/;
+const regNumericValues = /[-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g;
+
 /**
  * Convert transform string to JS representation.
  *
- * @type {(transformString: string) => TransformItem[]}
+ * @param {string} transformString
+ * @returns {TransformItem[]} Object representation of transform, or an empty array if it was malformed.
  */
 exports.transform2js = (transformString) => {
-  // JS representation of the transform data
-  /**
-   * @type {TransformItem[]}
-   */
+  /** @type {TransformItem[]} */
   const transforms = [];
-  // current transform context
-  /**
-   * @type {?TransformItem}
-   */
-  let current = null;
+  /** @type {?TransformItem} */
+  let currentTransform = null;
+
   // split value into ['', 'translate', '10 50', '', 'scale', '2', '', 'rotate', '-45', '']
   for (const item of transformString.split(regTransformSplit)) {
-    var num;
-    if (item) {
-      // if item is a translate function
-      if (regTransformTypes.test(item)) {
-        // then collect it and change current context
-        current = { name: item, data: [] };
-        transforms.push(current);
-        // else if item is data
-      } else {
-        // then split it into [10, 50] and collect as context.data
-        while ((num = regNumericValues.exec(item))) {
-          num = Number(num);
-          if (current != null) {
-            current.data.push(num);
-          }
+    if (!item) {
+      continue;
+    }
+
+    if (transformTypes.has(item)) {
+      currentTransform = { name: item, data: [] };
+      transforms.push(currentTransform);
+    } else {
+      let num;
+      // then split it into [10, 50] and collect as context.data
+      while ((num = regNumericValues.exec(item))) {
+        num = Number(num);
+        if (currentTransform != null) {
+          currentTransform.data.push(num);
         }
       }
     }
   }
-  // return empty array if broken transform (no data)
-  return current == null || current.data.length == 0 ? [] : transforms;
+
+  return currentTransform == null || currentTransform.data.length == 0
+    ? []
+    : transforms;
 };
 
 /**
  * Multiply transforms into one.
  *
- * @type {(transforms: TransformItem[]) => TransformItem}
+ * @param {TransformItem[]} transforms
+ * @returns {TransformItem}
  */
 exports.transformsMultiply = (transforms) => {
-  // convert transforms objects to the matrices
   const matrixData = transforms.map((transform) => {
     if (transform.name === 'matrix') {
       return transform.data;
     }
     return transformToMatrix(transform);
   });
-  // multiply all matrices into one
+
   const matrixTransform = {
     name: 'matrix',
     data:
       matrixData.length > 0 ? matrixData.reduce(multiplyTransformMatrices) : [],
   };
+
   return matrixTransform;
 };
 
 /**
- * math utilities in radians.
+ * Math utilities in radians.
  */
 const mth = {
   /**
-   * @type {(deg: number) => number}
+   * @param {number} deg
+   * @returns {number}
    */
   rad: (deg) => {
     return (deg * Math.PI) / 180;
   },
 
   /**
-   * @type {(rad: number) => number}
+   * @param {number} rad
+   * @returns {number}
    */
   deg: (rad) => {
     return (rad * 180) / Math.PI;
   },
 
   /**
-   * @type {(deg: number) => number}
+   * @param {number} deg
+   * @returns {number}
    */
   cos: (deg) => {
     return Math.cos(mth.rad(deg));
   },
 
   /**
-   * @type {(val: number, floatPrecision: number) => number}
+   * @param {number} val
+   * @param {number} floatPrecision
+   * @returns {number}
    */
   acos: (val, floatPrecision) => {
-    return Number(mth.deg(Math.acos(val)).toFixed(floatPrecision));
+    return toFixed(mth.deg(Math.acos(val)), floatPrecision);
   },
 
   /**
-   * @type {(deg: number) => number}
+   * @param {number} deg
+   * @returns {number}
    */
   sin: (deg) => {
     return Math.sin(mth.rad(deg));
   },
 
   /**
-   * @type {(val: number, floatPrecision: number) => number}
+   * @param {number} val
+   * @param {number} floatPrecision
+   * @returns {number}
    */
   asin: (val, floatPrecision) => {
-    return Number(mth.deg(Math.asin(val)).toFixed(floatPrecision));
+    return toFixed(mth.deg(Math.asin(val)), floatPrecision);
   },
 
   /**
-   * @type {(deg: number) => number}
+   * @param {number} deg
+   * @returns {number}
    */
   tan: (deg) => {
     return Math.tan(mth.rad(deg));
   },
 
   /**
-   * @type {(val: number, floatPrecision: number) => number}
+   * @param {number} val
+   * @param {number} floatPrecision
+   * @returns {number}
    */
   atan: (val, floatPrecision) => {
-    return Number(mth.deg(Math.atan(val)).toFixed(floatPrecision));
+    return toFixed(mth.deg(Math.atan(val)), floatPrecision);
   },
 };
 
 /**
- * @typedef {{
- *   convertToShorts: boolean,
- *   floatPrecision: number,
- *   transformPrecision: number,
- *   matrixToTransform: boolean,
- *   shortTranslate: boolean,
- *   shortScale: boolean,
- *   shortRotate: boolean,
- *   removeUseless: boolean,
- *   collapseIntoOne: boolean,
- *   leadingZero: boolean,
- *   negativeExtraSpace: boolean,
- * }} TransformParams
- */
-
-/**
- * Decompose matrix into simple transforms. See
- * https://frederic-wang.fr/decomposition-of-2d-transform-matrices.html
+ * Decompose matrix into simple transforms.
  *
- * @type {(transform: TransformItem, params: TransformParams) => TransformItem[]}
+ * @param {TransformItem} transform
+ * @param {TransformParams} params
+ * @returns {TransformItem[]}
+ * @see https://frederic-wang.fr/decomposition-of-2d-transform-matrices.html
  */
 exports.matrixToTransform = (transform, params) => {
-  let floatPrecision = params.floatPrecision;
-  let data = transform.data;
-  let transforms = [];
-  let sx = Number(
-    Math.hypot(data[0], data[1]).toFixed(params.transformPrecision),
-  );
-  let sy = Number(
-    ((data[0] * data[3] - data[1] * data[2]) / sx).toFixed(
-      params.transformPrecision,
-    ),
-  );
-  let colsSum = data[0] * data[2] + data[1] * data[3];
-  let rowsSum = data[0] * data[1] + data[2] * data[3];
-  let scaleBefore = rowsSum != 0 || sx == sy;
+  const floatPrecision = params.floatPrecision;
+  const data = transform.data;
+  const transforms = [];
 
   // [..., ..., ..., ..., tx, ty] → translate(tx, ty)
   if (data[4] || data[5]) {
@@ -179,6 +186,15 @@ exports.matrixToTransform = (transform, params) => {
     });
   }
 
+  let sx = toFixed(Math.hypot(data[0], data[1]), params.transformPrecision);
+  let sy = toFixed(
+    (data[0] * data[3] - data[1] * data[2]) / sx,
+    params.transformPrecision,
+  );
+  const colsSum = data[0] * data[2] + data[1] * data[3];
+  const rowsSum = data[0] * data[1] + data[2] * data[3];
+  const scaleBefore = rowsSum !== 0 || sx === sy;
+
   // [sx, 0, tan(a)·sy, sy, 0, 0] → skewX(a)·scale(sx, sy)
   if (!data[1] && data[2]) {
     transforms.push({
@@ -197,19 +213,34 @@ exports.matrixToTransform = (transform, params) => {
 
     // [sx·cos(a), sx·sin(a), sy·-sin(a), sy·cos(a), x, y] → rotate(a[, cx, cy])·(scale or skewX) or
     // [sx·cos(a), sy·sin(a), sx·-sin(a), sy·cos(a), x, y] → scale(sx, sy)·rotate(a[, cx, cy]) (if !scaleBefore)
-  } else if (!colsSum || (sx == 1 && sy == 1) || !scaleBefore) {
+  } else if (!colsSum || (sx === 1 && sy === 1) || !scaleBefore) {
     if (!scaleBefore) {
-      sx = (data[0] < 0 ? -1 : 1) * Math.hypot(data[0], data[2]);
-      sy = (data[3] < 0 ? -1 : 1) * Math.hypot(data[1], data[3]);
+      sx = Math.hypot(data[0], data[2]);
+      sy = Math.hypot(data[1], data[3]);
+
+      if (toFixed(data[0], params.transformPrecision) < 0) {
+        sx = -sx;
+      }
+
+      if (
+        data[3] < 0 ||
+        (Math.sign(data[1]) === Math.sign(data[2]) &&
+          toFixed(data[3], params.transformPrecision) === 0)
+      ) {
+        sy = -sy;
+      }
+
       transforms.push({ name: 'scale', data: [sx, sy] });
     }
-    var angle = Math.min(Math.max(-1, data[0] / sx), 1),
-      rotate = [
-        mth.acos(angle, floatPrecision) *
-          ((scaleBefore ? 1 : sy) * data[1] < 0 ? -1 : 1),
-      ];
+    const angle = Math.min(Math.max(-1, data[0] / sx), 1);
+    const rotate = [
+      mth.acos(angle, floatPrecision) *
+        ((scaleBefore ? 1 : sy) * data[1] < 0 ? -1 : 1),
+    ];
 
-    if (rotate[0]) transforms.push({ name: 'rotate', data: rotate });
+    if (rotate[0]) {
+      transforms.push({ name: 'rotate', data: rotate });
+    }
 
     if (rowsSum && colsSum)
       transforms.push({
@@ -220,15 +251,15 @@ exports.matrixToTransform = (transform, params) => {
     // rotate(a, cx, cy) can consume translate() within optional arguments cx, cy (rotation point)
     if (rotate[0] && (data[4] || data[5])) {
       transforms.shift();
-      var cos = data[0] / sx,
-        sin = data[1] / (scaleBefore ? sx : sy),
-        x = data[4] * (scaleBefore ? 1 : sy),
-        y = data[5] * (scaleBefore ? 1 : sx),
-        denom =
-          (Math.pow(1 - cos, 2) + Math.pow(sin, 2)) *
-          (scaleBefore ? 1 : sx * sy);
-      rotate.push(((1 - cos) * x - sin * y) / denom);
-      rotate.push(((1 - cos) * y + sin * x) / denom);
+      const oneOverCos = 1 - data[0] / sx;
+      const sin = data[1] / (scaleBefore ? sx : sy);
+      const x = data[4] * (scaleBefore ? 1 : sy);
+      const y = data[5] * (scaleBefore ? 1 : sx);
+      const denom = (oneOverCos ** 2 + sin ** 2) * (scaleBefore ? 1 : sx * sy);
+      rotate.push(
+        (oneOverCos * x - sin * y) / denom,
+        (oneOverCos * y + sin * x) / denom,
+      );
     }
 
     // Too many transformations, return original matrix if it isn't just a scale/translate
@@ -236,11 +267,12 @@ exports.matrixToTransform = (transform, params) => {
     return [transform];
   }
 
-  if ((scaleBefore && (sx != 1 || sy != 1)) || !transforms.length)
+  if ((scaleBefore && (sx != 1 || sy != 1)) || !transforms.length) {
     transforms.push({
       name: 'scale',
       data: sx == sy ? [sx] : [sx, sy],
     });
+  }
 
   return transforms;
 };
diff --git a/plugins/convertPathData.js b/plugins/convertPathData.js
index e8d8350e1..54c006368 100644
--- a/plugins/convertPathData.js
+++ b/plugins/convertPathData.js
@@ -9,7 +9,7 @@ const { visit } = require('../lib/xast.js');
 const { pathElems } = require('./_collections.js');
 const { path2js, js2path } = require('./_path.js');
 const { applyTransforms } = require('./applyTransforms.js');
-const { cleanupOutData } = require('../lib/svgo/tools');
+const { cleanupOutData, toFixed } = require('../lib/svgo/tools');
 
 exports.name = 'convertPathData';
 exports.description =
@@ -482,7 +482,7 @@ function filters(
         // check if next curves are fitting the arc
         for (
           var j = index;
-          (next = path[++j]) && 'cs'.includes(next.command);
+          (next = path[++j]) && (next.command === 'c' || next.command === 's');
 
         ) {
           var nextData = next.args;
@@ -1004,16 +1004,6 @@ function getIntersection(coords) {
   }
 }
 
-/**
- * Does the same as `Number.prototype.toFixed` but without casting
- * the return value to a string.
- * @type {(num: number, precision: number) => number}
- */
-function toFixed(num, precision) {
-  const pow = 10 ** precision;
-  return Math.round(num * pow) / pow;
-}
-
 /**
  * Decrease accuracy of floating-point numbers
  * in path data keeping a specified number of decimals.
diff --git a/plugins/convertTransform.js b/plugins/convertTransform.js
index 730227ea3..6f3990789 100644
--- a/plugins/convertTransform.js
+++ b/plugins/convertTransform.js
@@ -1,10 +1,12 @@
 'use strict';
 
 /**
+ * @typedef {import('../lib/types').XastChild} XastChild
  * @typedef {import('../lib/types').XastElement} XastElement
+ * @typedef {import('../lib/types').XastParent} XastParent
  */
 
-const { cleanupOutData } = require('../lib/svgo/tools.js');
+const { cleanupOutData, toFixed } = require('../lib/svgo/tools.js');
 const {
   transform2js,
   transformsMultiply,
@@ -59,15 +61,14 @@ exports.fn = (_root, params) => {
   return {
     element: {
       enter: (node) => {
-        // transform
         if (node.attributes.transform != null) {
           convertTransform(node, 'transform', newParams);
         }
-        // gradientTransform
+
         if (node.attributes.gradientTransform != null) {
           convertTransform(node, 'gradientTransform', newParams);
         }
-        // patternTransform
+
         if (node.attributes.patternTransform != null) {
           convertTransform(node, 'patternTransform', newParams);
         }
@@ -98,9 +99,9 @@ exports.fn = (_root, params) => {
  */
 
 /**
- * Main function.
- *
- * @type {(item: XastElement, attrName: string, params: TransformParams) => void}
+ * @param {XastElement} item
+ * @param {string} attrName
+ * @param {TransformParams} params
  */
 const convertTransform = (item, attrName, params) => {
   let data = transform2js(item.attributes[attrName]);
@@ -145,7 +146,7 @@ const definePrecision = (data, { ...newParams }) => {
       matrixData.push(...item.data.slice(0, 4));
     }
   }
-  let significantDigits = newParams.transformPrecision;
+  let numberOfDigits = newParams.transformPrecision;
   // Limit transform precision with matrix one. Calculating with larger precision doesn't add any value.
   if (matrixData.length) {
     newParams.transformPrecision = Math.min(
@@ -153,7 +154,7 @@ const definePrecision = (data, { ...newParams }) => {
       Math.max.apply(Math, matrixData.map(floatDigits)) ||
         newParams.transformPrecision,
     );
-    significantDigits = Math.max.apply(
+    numberOfDigits = Math.max.apply(
       Math,
       matrixData.map(
         (n) => n.toString().replace(/\D+/g, '').length, // Number of digits in a number. 123.45 → 5
@@ -164,7 +165,7 @@ const definePrecision = (data, { ...newParams }) => {
   if (newParams.degPrecision == null) {
     newParams.degPrecision = Math.max(
       0,
-      Math.min(newParams.floatPrecision, significantDigits - 2),
+      Math.min(newParams.floatPrecision, numberOfDigits - 2),
     );
   }
   return newParams;
@@ -219,11 +220,13 @@ const floatDigits = (n) => {
 /**
  * Convert transforms to the shorthand alternatives.
  *
- * @type {(transforms: TransformItem[], params: TransformParams) => TransformItem[]}
+ * @param {TransformItem[]} transforms
+ * @param {TransformParams} params
+ * @returns {TransformItem[]}
  */
 const convertToShorts = (transforms, params) => {
   for (var i = 0; i < transforms.length; i++) {
-    var transform = transforms[i];
+    let transform = transforms[i];
 
     // convert matrix to the short aliases
     if (params.matrixToTransform && transform.name === 'matrix') {
@@ -267,8 +270,7 @@ const convertToShorts = (transforms, params) => {
     // translate(cx cy) rotate(a) translate(-cx -cy) → rotate(a cx cy)
     if (
       params.shortRotate &&
-      transforms[i - 2] &&
-      transforms[i - 2].name === 'translate' &&
+      transforms[i - 2]?.name === 'translate' &&
       transforms[i - 1].name === 'rotate' &&
       transforms[i].name === 'translate' &&
       transforms[i - 2].data[0] === -transforms[i].data[0] &&
@@ -332,7 +334,9 @@ const removeUseless = (transforms) => {
 /**
  * Convert transforms JS representation to string.
  *
- * @type {(transformJS: TransformItem[], params: TransformParams) => string}
+ * @param {TransformItem[]} transformJS
+ * @param {TransformParams} params
+ * @returns {string}
  */
 const js2transform = (transformJS, params) => {
   const transformString = transformJS
@@ -390,7 +394,9 @@ const round = (data) => {
  * in transforms keeping a specified number of decimals.
  * Smart rounds values like 2.349 to 2.35.
  *
- * @type {(precision: number, data: number[]) => number[]}
+ * @param {number} precision
+ * @param {number[]} data
+ * @returns {number[]}
  */
 const smartRound = (precision, data) => {
   for (
@@ -399,7 +405,7 @@ const smartRound = (precision, data) => {
     i--;
 
   ) {
-    if (Number(data[i].toFixed(precision)) !== data[i]) {
+    if (toFixed(data[i], precision) !== data[i]) {
       var rounded = +data[i].toFixed(precision - 1);
       data[i] =
         +Math.abs(rounded - data[i]).toFixed(precision + 1) >= tolerance
@@ -407,5 +413,6 @@ const smartRound = (precision, data) => {
           : rounded;
     }
   }
+
   return data;
 };
diff --git a/test/plugins/_transforms.test.js b/test/plugins/_transforms.test.js
new file mode 100644
index 000000000..6f8d72e3b
--- /dev/null
+++ b/test/plugins/_transforms.test.js
@@ -0,0 +1,64 @@
+'use strict';
+
+const { matrixToTransform } = require('../../plugins/_transforms');
+
+/**
+ * @typedef {import('../../plugins/_transforms').TransformParams} TransformParams
+ */
+
+/** @type {TransformParams} */
+const params = {
+  floatPrecision: 3,
+  transformPrecision: 5,
+  matrixToTransform: true,
+  shortTranslate: true,
+  shortScale: true,
+  shortRotate: true,
+  removeUseless: true,
+  collapseIntoOne: true,
+  leadingZero: true,
+  negativeExtraSpace: false,
+  convertToShorts: true,
+};
+
+/**
+ * Some tests live here instead of in test SVGs because the output
+ * is longer, so SVGO doesn't actually use it.
+ */
+describe('should correctly simplify transforms', () => {
+  it('matrix(0, -1, 99, 0, 0, 0)', () => {
+    const matrix = {
+      name: 'matrix',
+      data: [0, -1, 99, 0, 0, 0],
+    };
+
+    expect(matrixToTransform(matrix, params)).toStrictEqual([
+      {
+        name: 'scale',
+        data: [99, 1],
+      },
+      {
+        name: 'rotate',
+        data: [-90],
+      },
+    ]);
+  });
+
+  it('matrix(0, 1, 1, 0, 0, 0)', () => {
+    const matrix = {
+      name: 'matrix',
+      data: [0, 1, 1, 0, 0, 0],
+    };
+
+    expect(matrixToTransform(matrix, params)).toStrictEqual([
+      {
+        name: 'scale',
+        data: [1, -1],
+      },
+      {
+        name: 'rotate',
+        data: [-90],
+      },
+    ]);
+  });
+});
diff --git a/test/plugins/convertTransform.05.svg b/test/plugins/convertTransform.05.svg
new file mode 100644
index 000000000..c3a82a83e
--- /dev/null
+++ b/test/plugins/convertTransform.05.svg
@@ -0,0 +1,13 @@
+Correctly optimize transform with same sign non-zero shears and.
+
+===
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+  <rect x="-45" y="-77" height="3" width="8" transform="matrix(0,-1,-1,0,0,0)" />
+</svg>
+
+@@@
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+    <rect x="-45" y="-77" height="3" width="8" transform="scale(1 -1)rotate(90)"/>
+</svg>

From 8644cf36e8839a3dc3c6a90f8eec62c25fbc68a6 Mon Sep 17 00:00:00 2001
From: Kendell R <KTibow@users.noreply.github.com>
Date: Mon, 1 Jan 2024 12:47:21 -0800
Subject: [PATCH 5/9] feat(convertPathData): convert c to q (#1892)

---
 docs/03-plugins/convert-path-data.mdx |  3 ++
 plugins/convertPathData.js            | 41 +++++++++++++++++++++++++++
 plugins/plugins-types.d.ts            |  1 +
 test/plugins/convertPathData.16.svg   |  2 +-
 test/plugins/convertPathData.35.svg   | 13 +++++++++
 5 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 test/plugins/convertPathData.35.svg

diff --git a/docs/03-plugins/convert-path-data.mdx b/docs/03-plugins/convert-path-data.mdx
index 66848688f..1f1dc3cdd 100644
--- a/docs/03-plugins/convert-path-data.mdx
+++ b/docs/03-plugins/convert-path-data.mdx
@@ -15,6 +15,9 @@ svgo:
     straightCurves:
       description: If to convert curve commands that are effectively straight lines to line commands.
       default: true
+    convertToQ:
+      description: If to convert cubic beziers to quadratic beziers when they effectively are.
+      default: true
     lineShorthands:
       description: If to convert regular lines to an explicit horizontal or vertical line where possible.
       default: true
diff --git a/plugins/convertPathData.js b/plugins/convertPathData.js
index 54c006368..de7b357f5 100644
--- a/plugins/convertPathData.js
+++ b/plugins/convertPathData.js
@@ -35,6 +35,7 @@ let arcTolerance;
  *     tolerance: number,
  *   },
  *   straightCurves: boolean,
+ *   convertToQ: boolean,
  *   lineShorthands: boolean,
  *   convertToZ: boolean,
  *   curveSmoothShorthands: boolean,
@@ -86,6 +87,7 @@ exports.fn = (root, params) => {
       tolerance: 0.5, // percentage of radius
     },
     straightCurves = true,
+    convertToQ = true,
     lineShorthands = true,
     convertToZ = true,
     curveSmoothShorthands = true,
@@ -109,6 +111,7 @@ exports.fn = (root, params) => {
     applyTransformsStroked,
     makeArcs,
     straightCurves,
+    convertToQ,
     lineShorthands,
     convertToZ,
     curveSmoothShorthands,
@@ -674,6 +677,44 @@ function filters(
         }
       }
 
+      // degree-lower c to q when possible
+      // m 0 12 C 4 4 8 4 12 12 → M 0 12 Q 6 0 12 12
+      if (params.convertToQ && command == 'c') {
+        const x1 =
+          // @ts-ignore
+          0.75 * (item.base[0] + data[0]) - 0.25 * item.base[0];
+        const x2 =
+          // @ts-ignore
+          0.75 * (item.base[0] + data[2]) - 0.25 * (item.base[0] + data[4]);
+        if (Math.abs(x1 - x2) < error * 2) {
+          const y1 =
+            // @ts-ignore
+            0.75 * (item.base[1] + data[1]) - 0.25 * item.base[1];
+          const y2 =
+            // @ts-ignore
+            0.75 * (item.base[1] + data[3]) - 0.25 * (item.base[1] + data[5]);
+          if (Math.abs(y1 - y2) < error * 2) {
+            const newData = data.slice();
+            newData.splice(
+              0,
+              4,
+              // @ts-ignore
+              x1 + x2 - item.base[0],
+              // @ts-ignore
+              y1 + y2 - item.base[1],
+            );
+            roundData(newData);
+            const originalLength = cleanupOutData(data, params).length,
+              newLength = cleanupOutData(newData, params).length;
+            if (newLength < originalLength) {
+              command = 'q';
+              data = newData;
+              if (next && next.command == 's') makeLonghand(next, data); // fix up next curve
+            }
+          }
+        }
+      }
+
       // horizontal and vertical line shorthands
       // l 50 0 → h 50
       // l 0 50 → v 50
diff --git a/plugins/plugins-types.d.ts b/plugins/plugins-types.d.ts
index 1d4740e7b..e94e71378 100644
--- a/plugins/plugins-types.d.ts
+++ b/plugins/plugins-types.d.ts
@@ -41,6 +41,7 @@ type DefaultPlugins = {
       tolerance: number;
     };
     straightCurves?: boolean;
+    convertToQ?: boolean;
     lineShorthands?: boolean;
     convertToZ?: boolean;
     curveSmoothShorthands?: boolean;
diff --git a/test/plugins/convertPathData.16.svg b/test/plugins/convertPathData.16.svg
index 4fcee12fa..29302d876 100644
--- a/test/plugins/convertPathData.16.svg
+++ b/test/plugins/convertPathData.16.svg
@@ -7,7 +7,7 @@
 
 <svg xmlns="http://www.w3.org/2000/svg">
     <path d="M0 9V6a6 6 0 1 1 12 3"/>
-    <path d="M13 7c0-3-2-5-4-5S5 4 5 7"/>
+    <path d="M13 7q0-5-4-5-5 0-4 5"/>
 </svg>
 
 @@@
diff --git a/test/plugins/convertPathData.35.svg b/test/plugins/convertPathData.35.svg
new file mode 100644
index 000000000..432c2878c
--- /dev/null
+++ b/test/plugins/convertPathData.35.svg
@@ -0,0 +1,13 @@
+Should convert C to Q
+
+===
+
+<svg>
+    <path d="m 0 12 C 4 4 8 4 12 12"/>
+</svg>
+
+@@@
+
+<svg>
+    <path d="M0 12q6-12 12 0"/>
+</svg>

From 252b28c4bf20f3165f08529ea32d753a251b11be Mon Sep 17 00:00:00 2001
From: Seth Falco <seth@falco.fun>
Date: Mon, 1 Jan 2024 23:58:44 +0000
Subject: [PATCH 6/9] chore: increment version to 3.2.0 (#1919)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d53741856..b688b349b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "packageManager": "yarn@2.4.3",
   "name": "svgo",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Nodejs-based tool for optimizing SVG vector graphics files",
   "license": "MIT",
   "keywords": [

From 2442f742398f6c40bcf83b5c34e4a71a023adae1 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Wed, 3 Jan 2024 08:17:37 -0800
Subject: [PATCH 7/9] chore: convert project to us ECMAScript modules
 (preserving CJS compatibility) (#1905)

---
 .eslintrc                                     |   9 +-
 .github/workflows/main.yml                    |   3 +-
 README.md                                     |  12 +-
 bin/{svgo => svgo.js}                         |   6 +-
 lib/builtin.js                                | 162 ++++--
 lib/parser.js                                 |  29 +-
 lib/path.js                                   |  18 +-
 lib/path.test.js                              |   6 +-
 lib/stringifier.js                            |  31 +-
 lib/style.js                                  |  54 +-
 lib/style.test.js                             |  12 +-
 lib/svgo-node.js                              |  35 +-
 lib/svgo-node.test.js                         |  10 +-
 lib/svgo.d.ts                                 |   6 +-
 lib/svgo.js                                   |  15 +-
 lib/svgo.test.js                              |   7 +-
 lib/svgo/coa.js                               |  28 +-
 lib/svgo/css-select-adapter.d.ts              |   2 +-
 lib/svgo/css-select-adapter.js                |   4 +-
 lib/svgo/plugins.js                           |  16 +-
 lib/svgo/tools.js                             |  31 +-
 lib/xast.js                                   |  32 +-
 lib/xast.test.js                              |   8 +-
 package.json                                  |  24 +-
 plugins/_collections.js                       |  34 +-
 plugins/_path.js                              |  15 +-
 plugins/_transforms.js                        |  13 +-
 plugins/addAttributesToSVGElement.js          |  10 +-
 plugins/addClassesToSVGElement.js             |  10 +-
 plugins/applyTransforms.js                    |  27 +-
 plugins/cleanupAttrs.js                       |  11 +-
 plugins/cleanupEnableBackground.js            |  14 +-
 plugins/cleanupIds.js                         |  16 +-
 plugins/cleanupListOfValues.js                |  12 +-
 plugins/cleanupNumericValues.js               |  12 +-
 plugins/collapseGroups.js                     |  14 +-
 plugins/convertColors.js                      |  23 +-
 plugins/convertEllipseToCircle.js             |  10 +-
 plugins/convertOneStopGradients.js            |  28 +-
 plugins/convertPathData.js                    |  24 +-
 plugins/convertShapeToPath.js                 |  16 +-
 plugins/convertStyleToAttrs.js                |  12 +-
 plugins/convertTransform.js                   |  29 +-
 plugins/inlineStyles.js                       |  38 +-
 plugins/mergePaths.js                         |  20 +-
 plugins/mergeStyles.js                        |  16 +-
 plugins/minifyStyles.js                       |  20 +-
 plugins/moveElemsAttrsToGroup.js              |  15 +-
 plugins/moveGroupAttrsToElems.js              |  15 +-
 plugins/plugins-types.d.ts                    |   2 +-
 plugins/prefixIds.js                          |  16 +-
 plugins/preset-default.js                     |  77 ++-
 plugins/removeAttributesBySelector.js         |  12 +-
 plugins/removeAttrs.js                        |  10 +-
 plugins/removeComments.js                     |  12 +-
 plugins/removeDesc.js                         |  12 +-
 plugins/removeDimensions.js                   |  10 +-
 plugins/removeDoctype.js                      |  12 +-
 plugins/removeEditorsNSData.js                |  15 +-
 plugins/removeElementsByAttr.js               |  12 +-
 plugins/removeEmptyAttrs.js                   |  12 +-
 plugins/removeEmptyContainers.js              |  14 +-
 plugins/removeEmptyText.js                    |  12 +-
 plugins/removeHiddenElems.js                  |  28 +-
 plugins/removeMetadata.js                     |  12 +-
 plugins/removeNonInheritableGroupAttrs.js     |  14 +-
 plugins/removeOffCanvasPaths.js               |  18 +-
 plugins/removeRasterImages.js                 |  12 +-
 plugins/removeScriptElement.js                |  14 +-
 plugins/removeStyleElement.js                 |  12 +-
 plugins/removeTitle.js                        |  12 +-
 plugins/removeUnknownsAndDefaults.js          |  18 +-
 plugins/removeUnusedNS.js                     |  10 +-
 plugins/removeUselessDefs.js                  |  16 +-
 plugins/removeUselessStrokeAndFill.js         |  18 +-
 plugins/removeViewBox.js                      |  10 +-
 plugins/removeXMLNS.js                        |  10 +-
 plugins/removeXMLProcInst.js                  |  12 +-
 plugins/removeXlink.js                        |  14 +-
 plugins/reusePaths.js                         |  20 +-
 plugins/sortAttrs.js                          |  10 +-
 plugins/sortDefsChildren.js                   |  10 +-
 rollup.config.js                              |  59 ++-
 test/browser.js                               |   8 +-
 test/cli/cli.test.js                          |  11 +-
 test/coa/_index.test.js                       |  15 +-
 test/fixtures/config-loader/invalid-array.js  |   2 +-
 test/fixtures/config-loader/invalid-null.js   |   2 +-
 .../fixtures/config-loader/invalid-runtime.js |   3 +-
 test/fixtures/config-loader/invalid-string.js |   2 +-
 .../config-loader/module-not-found.js         |   4 +-
 test/fixtures/config-loader/one/two/config.js |   2 +-
 test/fixtures/config-loader/svgo.config.js    |   2 +-
 test/plugins/_index.test.js                   |  12 +-
 test/plugins/_transforms.test.js              |   4 +-
 test/plugins/prefixIds.test.js                |   4 +-
 test/regression-extract.js                    |  17 +-
 test/regression.js                            |  21 +-
 test/svg2js/_index.test.js                    |   9 +-
 test/svgo.cjs                                 |  33 ++
 test/svgo/_index.test.js                      |  11 +-
 tsconfig.json                                 |   2 +-
 yarn.lock                                     | 472 ++++++++++++------
 103 files changed, 1148 insertions(+), 1059 deletions(-)
 rename bin/{svgo => svgo.js} (55%)
 create mode 100644 test/svgo.cjs

diff --git a/.eslintrc b/.eslintrc
index db390436e..3ca4095d5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,7 @@
 {
   "parserOptions": {
-    "ecmaVersion": 2021
+    "ecmaVersion": 2021,
+    "sourceType": "module"
   },
   "env": {
     "node": true,
@@ -8,12 +9,6 @@
   },
   "extends": ["eslint:recommended"],
   "overrides": [
-    {
-      "files": ["rollup.config.js", "**/*.mjs"],
-      "parserOptions": {
-        "sourceType": "module"
-      }
-    },
     {
       "files": ["**/*.cjs"],
       "parserOptions": {
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 42af4a390..684a8d1cd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,7 +47,6 @@ jobs:
           - 20
           - 18
           - 16
-          - 14
         os:
           - ubuntu-latest
           - windows-latest
@@ -61,4 +60,4 @@ jobs:
       - run: yarn install
       - run: yarn playwright install --with-deps chromium
       - run: yarn test
-      - run: yarn test-browser
+      - run: yarn test-bundles
diff --git a/README.md b/README.md
index 080a93c6d..953419f9a 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ SVGO reads the configuration from `svgo.config.js` or the `--config path/to/conf
 **`svgo.config.js`**
 
 ```js
-module.exports = {
+export default {
   multipass: false, // boolean
   datauri: 'base64', // 'base64'|'enc'|'unenc'
   js2svg: {
@@ -83,7 +83,7 @@ Instead of configuring SVGO from scratch, you can tweak the default preset to su
 **`svgo.config.js`**
 
 ```js
-module.exports = {
+export default {
   plugins: [
     {
       name: 'preset-default',
@@ -112,9 +112,9 @@ You can also specify custom plugins:
 **`svgo.config.js`**
 
 ```js
-const importedPlugin = require('./imported-plugin');
+import importedPlugin from './imported-plugin';
 
-module.exports = {
+export default {
   plugins: [
     // plugin imported from another JavaScript file
     importedPlugin,
@@ -140,7 +140,7 @@ SVGO provides a few low level utilities.
 The core of SVGO is `optimize` function.
 
 ```js
-const { optimize } = require('svgo');
+import { optimize } from 'svgo';
 
 const result = optimize(svgString, {
   path: 'path-to.svg', // recommended
@@ -155,7 +155,7 @@ const optimizedSvgString = result.data;
 If you write a tool on top of SVGO you may want to resolve the `svgo.config.js` file.
 
 ```js
-const { loadConfig } = require('svgo');
+import { loadConfig } from 'svgo';
 
 const config = await loadConfig();
 ```
diff --git a/bin/svgo b/bin/svgo.js
similarity index 55%
rename from bin/svgo
rename to bin/svgo.js
index cbca2b043..a498b8586 100755
--- a/bin/svgo
+++ b/bin/svgo.js
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-const colors = require('picocolors');
-const { program } = require('commander');
-const makeProgram = require('../lib/svgo/coa');
+import colors from 'picocolors';
+import { program } from 'commander';
+import makeProgram from '../lib/svgo/coa.js';
 makeProgram(program);
 program.parseAsync(process.argv).catch((error) => {
   console.error(colors.red(error.stack));
diff --git a/lib/builtin.js b/lib/builtin.js
index 28a380ec9..7e7639758 100644
--- a/lib/builtin.js
+++ b/lib/builtin.js
@@ -1,57 +1,109 @@
-'use strict';
+import presetDefault from '../plugins/preset-default.js';
+import * as addAttributesToSVGElement from '../plugins/addAttributesToSVGElement.js';
+import * as addClassesToSVGElement from '../plugins/addClassesToSVGElement.js';
+import * as cleanupAttrs from '../plugins/cleanupAttrs.js';
+import * as cleanupEnableBackground from '../plugins/cleanupEnableBackground.js';
+import * as cleanupIds from '../plugins/cleanupIds.js';
+import * as cleanupListOfValues from '../plugins/cleanupListOfValues.js';
+import * as cleanupNumericValues from '../plugins/cleanupNumericValues.js';
+import * as collapseGroups from '../plugins/collapseGroups.js';
+import * as convertColors from '../plugins/convertColors.js';
+import * as convertEllipseToCircle from '../plugins/convertEllipseToCircle.js';
+import * as convertOneStopGradients from '../plugins/convertOneStopGradients.js';
+import * as convertPathData from '../plugins/convertPathData.js';
+import * as convertShapeToPath from '../plugins/convertShapeToPath.js';
+import * as convertStyleToAttrs from '../plugins/convertStyleToAttrs.js';
+import * as convertTransform from '../plugins/convertTransform.js';
+import * as mergeStyles from '../plugins/mergeStyles.js';
+import * as inlineStyles from '../plugins/inlineStyles.js';
+import * as mergePaths from '../plugins/mergePaths.js';
+import * as minifyStyles from '../plugins/minifyStyles.js';
+import * as moveElemsAttrsToGroup from '../plugins/moveElemsAttrsToGroup.js';
+import * as moveGroupAttrsToElems from '../plugins/moveGroupAttrsToElems.js';
+import * as prefixIds from '../plugins/prefixIds.js';
+import * as removeAttributesBySelector from '../plugins/removeAttributesBySelector.js';
+import * as removeAttrs from '../plugins/removeAttrs.js';
+import * as removeComments from '../plugins/removeComments.js';
+import * as removeDesc from '../plugins/removeDesc.js';
+import * as removeDimensions from '../plugins/removeDimensions.js';
+import * as removeDoctype from '../plugins/removeDoctype.js';
+import * as removeEditorsNSData from '../plugins/removeEditorsNSData.js';
+import * as removeElementsByAttr from '../plugins/removeElementsByAttr.js';
+import * as removeEmptyAttrs from '../plugins/removeEmptyAttrs.js';
+import * as removeEmptyContainers from '../plugins/removeEmptyContainers.js';
+import * as removeEmptyText from '../plugins/removeEmptyText.js';
+import * as removeHiddenElems from '../plugins/removeHiddenElems.js';
+import * as removeMetadata from '../plugins/removeMetadata.js';
+import * as removeNonInheritableGroupAttrs from '../plugins/removeNonInheritableGroupAttrs.js';
+import * as removeOffCanvasPaths from '../plugins/removeOffCanvasPaths.js';
+import * as removeRasterImages from '../plugins/removeRasterImages.js';
+import * as removeScriptElement from '../plugins/removeScriptElement.js';
+import * as removeStyleElement from '../plugins/removeStyleElement.js';
+import * as removeTitle from '../plugins/removeTitle.js';
+import * as removeUnknownsAndDefaults from '../plugins/removeUnknownsAndDefaults.js';
+import * as removeUnusedNS from '../plugins/removeUnusedNS.js';
+import * as removeUselessDefs from '../plugins/removeUselessDefs.js';
+import * as removeUselessStrokeAndFill from '../plugins/removeUselessStrokeAndFill.js';
+import * as removeViewBox from '../plugins/removeViewBox.js';
+import * as removeXlink from '../plugins/removeXlink.js';
+import * as removeXMLNS from '../plugins/removeXMLNS.js';
+import * as removeXMLProcInst from '../plugins/removeXMLProcInst.js';
+import * as reusePaths from '../plugins/reusePaths.js';
+import * as sortAttrs from '../plugins/sortAttrs.js';
+import * as sortDefsChildren from '../plugins/sortDefsChildren.js';
 
-exports.builtin = [
-  require('../plugins/preset-default.js'),
-  require('../plugins/addAttributesToSVGElement.js'),
-  require('../plugins/addClassesToSVGElement.js'),
-  require('../plugins/cleanupAttrs.js'),
-  require('../plugins/cleanupEnableBackground.js'),
-  require('../plugins/cleanupIds.js'),
-  require('../plugins/cleanupListOfValues.js'),
-  require('../plugins/cleanupNumericValues.js'),
-  require('../plugins/collapseGroups.js'),
-  require('../plugins/convertColors.js'),
-  require('../plugins/convertEllipseToCircle.js'),
-  require('../plugins/convertOneStopGradients.js'),
-  require('../plugins/convertPathData.js'),
-  require('../plugins/convertShapeToPath.js'),
-  require('../plugins/convertStyleToAttrs.js'),
-  require('../plugins/convertTransform.js'),
-  require('../plugins/mergeStyles.js'),
-  require('../plugins/inlineStyles.js'),
-  require('../plugins/mergePaths.js'),
-  require('../plugins/minifyStyles.js'),
-  require('../plugins/moveElemsAttrsToGroup.js'),
-  require('../plugins/moveGroupAttrsToElems.js'),
-  require('../plugins/prefixIds.js'),
-  require('../plugins/removeAttributesBySelector.js'),
-  require('../plugins/removeAttrs.js'),
-  require('../plugins/removeComments.js'),
-  require('../plugins/removeDesc.js'),
-  require('../plugins/removeDimensions.js'),
-  require('../plugins/removeDoctype.js'),
-  require('../plugins/removeEditorsNSData.js'),
-  require('../plugins/removeElementsByAttr.js'),
-  require('../plugins/removeEmptyAttrs.js'),
-  require('../plugins/removeEmptyContainers.js'),
-  require('../plugins/removeEmptyText.js'),
-  require('../plugins/removeHiddenElems.js'),
-  require('../plugins/removeMetadata.js'),
-  require('../plugins/removeNonInheritableGroupAttrs.js'),
-  require('../plugins/removeOffCanvasPaths.js'),
-  require('../plugins/removeRasterImages.js'),
-  require('../plugins/removeScriptElement.js'),
-  require('../plugins/removeStyleElement.js'),
-  require('../plugins/removeTitle.js'),
-  require('../plugins/removeUnknownsAndDefaults.js'),
-  require('../plugins/removeUnusedNS.js'),
-  require('../plugins/removeUselessDefs.js'),
-  require('../plugins/removeUselessStrokeAndFill.js'),
-  require('../plugins/removeViewBox.js'),
-  require('../plugins/removeXlink.js'),
-  require('../plugins/removeXMLNS.js'),
-  require('../plugins/removeXMLProcInst.js'),
-  require('../plugins/reusePaths.js'),
-  require('../plugins/sortAttrs.js'),
-  require('../plugins/sortDefsChildren.js'),
+export const builtin = [
+  presetDefault,
+  addAttributesToSVGElement,
+  addClassesToSVGElement,
+  cleanupAttrs,
+  cleanupEnableBackground,
+  cleanupIds,
+  cleanupListOfValues,
+  cleanupNumericValues,
+  collapseGroups,
+  convertColors,
+  convertEllipseToCircle,
+  convertOneStopGradients,
+  convertPathData,
+  convertShapeToPath,
+  convertStyleToAttrs,
+  convertTransform,
+  mergeStyles,
+  inlineStyles,
+  mergePaths,
+  minifyStyles,
+  moveElemsAttrsToGroup,
+  moveGroupAttrsToElems,
+  prefixIds,
+  removeAttributesBySelector,
+  removeAttrs,
+  removeComments,
+  removeDesc,
+  removeDimensions,
+  removeDoctype,
+  removeEditorsNSData,
+  removeElementsByAttr,
+  removeEmptyAttrs,
+  removeEmptyContainers,
+  removeEmptyText,
+  removeHiddenElems,
+  removeMetadata,
+  removeNonInheritableGroupAttrs,
+  removeOffCanvasPaths,
+  removeRasterImages,
+  removeScriptElement,
+  removeStyleElement,
+  removeTitle,
+  removeUnknownsAndDefaults,
+  removeUnusedNS,
+  removeUselessDefs,
+  removeUselessStrokeAndFill,
+  removeViewBox,
+  removeXlink,
+  removeXMLNS,
+  removeXMLProcInst,
+  reusePaths,
+  sortAttrs,
+  sortDefsChildren,
 ];
diff --git a/lib/parser.js b/lib/parser.js
index 4637acf15..71aa3293d 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,21 +1,19 @@
-'use strict';
-
 /**
- * @typedef {import('./types').XastNode} XastNode
- * @typedef {import('./types').XastInstruction} XastInstruction
- * @typedef {import('./types').XastDoctype} XastDoctype
- * @typedef {import('./types').XastComment} XastComment
- * @typedef {import('./types').XastRoot} XastRoot
- * @typedef {import('./types').XastElement} XastElement
- * @typedef {import('./types').XastCdata} XastCdata
- * @typedef {import('./types').XastText} XastText
- * @typedef {import('./types').XastParent} XastParent
- * @typedef {import('./types').XastChild} XastChild
+ * @typedef {import('./types.js').XastNode} XastNode
+ * @typedef {import('./types.js').XastInstruction} XastInstruction
+ * @typedef {import('./types.js').XastDoctype} XastDoctype
+ * @typedef {import('./types.js').XastComment} XastComment
+ * @typedef {import('./types.js').XastRoot} XastRoot
+ * @typedef {import('./types.js').XastElement} XastElement
+ * @typedef {import('./types.js').XastCdata} XastCdata
+ * @typedef {import('./types.js').XastText} XastText
+ * @typedef {import('./types.js').XastParent} XastParent
+ * @typedef {import('./types.js').XastChild} XastChild
  */
 
 // @ts-ignore sax will be replaced with something else later
-const SAX = require('@trysound/sax');
-const { textElems } = require('../plugins/_collections');
+import SAX from '@trysound/sax';
+import { textElems } from '../plugins/_collections.js';
 
 class SvgoParserError extends Error {
   /**
@@ -89,7 +87,7 @@ const config = {
  *
  * @type {(data: string, from?: string) => XastRoot}
  */
-const parseSvg = (data, from) => {
+export const parseSvg = (data, from) => {
   const sax = SAX.parser(config.strict, config);
   /**
    * @type {XastRoot}
@@ -259,4 +257,3 @@ const parseSvg = (data, from) => {
   sax.write(data).close();
   return root;
 };
-exports.parseSvg = parseSvg;
diff --git a/lib/path.js b/lib/path.js
index 814ee2e3b..8fb4e3fe0 100644
--- a/lib/path.js
+++ b/lib/path.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const { removeLeadingZero, toFixed } = require('./svgo/tools');
+import { removeLeadingZero, toFixed } from './svgo/tools.js';
 
 /**
- * @typedef {import('./types').PathDataItem} PathDataItem
- * @typedef {import('./types').PathDataCommand} PathDataCommand
+ * @typedef {import('./types.js').PathDataItem} PathDataItem
+ * @typedef {import('./types.js').PathDataCommand} PathDataCommand
  */
 
 // Based on https://www.w3.org/TR/SVG11/paths.html#PathDataBNF
@@ -137,7 +135,7 @@ const readNumber = (string, cursor) => {
 /**
  * @type {(string: string) => PathDataItem[]}
  */
-const parsePathData = (string) => {
+export const parsePathData = (string) => {
   /**
    * @type {PathDataItem[]}
    */
@@ -240,7 +238,6 @@ const parsePathData = (string) => {
   }
   return pathData;
 };
-exports.parsePathData = parsePathData;
 
 /**
  * @type {(number: number, precision?: number) => {
@@ -316,7 +313,11 @@ const stringifyArgs = (command, args, precision, disableSpaceAfterFlags) => {
  * @param {StringifyPathDataOptions} options
  * @returns {string}
  */
-const stringifyPathData = ({ pathData, precision, disableSpaceAfterFlags }) => {
+export const stringifyPathData = ({
+  pathData,
+  precision,
+  disableSpaceAfterFlags,
+}) => {
   if (pathData.length === 1) {
     const { command, args } = pathData[0];
     return (
@@ -377,4 +378,3 @@ const stringifyPathData = ({ pathData, precision, disableSpaceAfterFlags }) => {
 
   return result;
 };
-exports.stringifyPathData = stringifyPathData;
diff --git a/lib/path.test.js b/lib/path.test.js
index 7fe7c5156..2ff353835 100644
--- a/lib/path.test.js
+++ b/lib/path.test.js
@@ -1,11 +1,9 @@
-'use strict';
+import { parsePathData, stringifyPathData } from './path.js';
 
 /**
- * @typedef {import('../lib/types').PathDataItem} PathDataItem
+ * @typedef {import('../lib/types.js').PathDataItem} PathDataItem
  */
 
-const { parsePathData, stringifyPathData } = require('./path.js');
-
 describe('parse path data', () => {
   it('should allow spaces between commands', () => {
     expect(parsePathData('M0 10 L \n\r\t20 30')).toStrictEqual([
diff --git a/lib/stringifier.js b/lib/stringifier.js
index 1a710869d..83b8e12f3 100644
--- a/lib/stringifier.js
+++ b/lib/stringifier.js
@@ -1,28 +1,20 @@
-'use strict';
-
-/**
- * @typedef {import('./types').XastParent} XastParent
- * @typedef {import('./types').XastRoot} XastRoot
- * @typedef {import('./types').XastElement} XastElement
- * @typedef {import('./types').XastInstruction} XastInstruction
- * @typedef {import('./types').XastDoctype} XastDoctype
- * @typedef {import('./types').XastText} XastText
- * @typedef {import('./types').XastCdata} XastCdata
- * @typedef {import('./types').XastComment} XastComment
- * @typedef {import('./types').StringifyOptions} StringifyOptions
- */
-
-const { textElems } = require('../plugins/_collections');
+import { textElems } from '../plugins/_collections.js';
 
 /**
+ * @typedef {import('./types.js').XastParent} XastParent
+ * @typedef {import('./types.js').XastRoot} XastRoot
+ * @typedef {import('./types.js').XastElement} XastElement
+ * @typedef {import('./types.js').XastInstruction} XastInstruction
+ * @typedef {import('./types.js').XastDoctype} XastDoctype
+ * @typedef {import('./types.js').XastText} XastText
+ * @typedef {import('./types.js').XastCdata} XastCdata
+ * @typedef {import('./types.js').XastComment} XastComment
+ * @typedef {import('./types.js').StringifyOptions} StringifyOptions
  * @typedef {{
  *   indent: string,
  *   textContext: ?XastElement,
  *   indentLevel: number,
  * }} State
- */
-
-/**
  * @typedef {Required<StringifyOptions>} Options
  */
 
@@ -77,7 +69,7 @@ const entities = {
  *
  * @type {(data: XastRoot, config: StringifyOptions) => string}
  */
-const stringifySvg = (data, userOptions = {}) => {
+export const stringifySvg = (data, userOptions = {}) => {
   /**
    * @type {Options}
    */
@@ -114,7 +106,6 @@ const stringifySvg = (data, userOptions = {}) => {
   }
   return svg;
 };
-exports.stringifySvg = stringifySvg;
 
 /**
  * @type {(node: XastParent, config: Options, state: State) => string}
diff --git a/lib/style.js b/lib/style.js
index 0e62afb92..859bc6c96 100644
--- a/lib/style.js
+++ b/lib/style.js
@@ -1,30 +1,26 @@
-'use strict';
+import * as csstree from 'css-tree';
+import * as csswhat from 'css-what';
+import { syntax } from 'csso';
+import { visit, matches } from './xast.js';
+import {
+  attrsGroups,
+  inheritableAttrs,
+  presentationNonInheritableGroupAttrs,
+} from '../plugins/_collections.js';
 
 /**
  * @typedef {import('css-tree').Rule} CsstreeRule
- * @typedef {import('./types').Specificity} Specificity
- * @typedef {import('./types').Stylesheet} Stylesheet
- * @typedef {import('./types').StylesheetRule} StylesheetRule
- * @typedef {import('./types').StylesheetDeclaration} StylesheetDeclaration
- * @typedef {import('./types').ComputedStyles} ComputedStyles
- * @typedef {import('./types').XastRoot} XastRoot
- * @typedef {import('./types').XastElement} XastElement
- * @typedef {import('./types').XastParent} XastParent
- * @typedef {import('./types').XastChild} XastChild
+ * @typedef {import('./types.js').Specificity} Specificity
+ * @typedef {import('./types.js').Stylesheet} Stylesheet
+ * @typedef {import('./types.js').StylesheetRule} StylesheetRule
+ * @typedef {import('./types.js').StylesheetDeclaration} StylesheetDeclaration
+ * @typedef {import('./types.js').ComputedStyles} ComputedStyles
+ * @typedef {import('./types.js').XastRoot} XastRoot
+ * @typedef {import('./types.js').XastElement} XastElement
+ * @typedef {import('./types.js').XastParent} XastParent
+ * @typedef {import('./types.js').XastChild} XastChild
  */
 
-const csstree = require('css-tree');
-const csswhat = require('css-what');
-const {
-  syntax: { specificity },
-} = require('csso');
-const { visit, matches } = require('./xast.js');
-const {
-  attrsGroups,
-  inheritableAttrs,
-  presentationNonInheritableGroupAttrs,
-} = require('../plugins/_collections.js');
-
 // @ts-ignore not defined in @types/csstree
 const csstreeWalkSkip = csstree.walk.skip;
 
@@ -60,7 +56,7 @@ const parseRule = (ruleNode, dynamic) => {
         }
       });
       rules.push({
-        specificity: specificity(node),
+        specificity: syntax.specificity(node),
         dynamic: hasPseudoClasses || dynamic,
         // compute specificity from original node to consider pseudo classes
         selector: csstree.generate(newNode),
@@ -201,7 +197,7 @@ const computeOwnStyle = (stylesheet, node) => {
  * @param {Specificity} b
  * @returns {number}
  */
-const compareSpecificity = (a, b) => {
+export const compareSpecificity = (a, b) => {
   for (let i = 0; i < 4; i += 1) {
     if (a[i] < b[i]) {
       return -1;
@@ -212,12 +208,11 @@ const compareSpecificity = (a, b) => {
 
   return 0;
 };
-exports.compareSpecificity = compareSpecificity;
 
 /**
  * @type {(root: XastRoot) => Stylesheet}
  */
-const collectStylesheet = (root) => {
+export const collectStylesheet = (root) => {
   /** @type {StylesheetRule[]} */
   const rules = [];
   /** @type {Map<XastElement, XastParent>} */
@@ -253,14 +248,13 @@ const collectStylesheet = (root) => {
   rules.sort((a, b) => compareSpecificity(a.specificity, b.specificity));
   return { rules, parents };
 };
-exports.collectStylesheet = collectStylesheet;
 
 /**
  * @param {Stylesheet} stylesheet
  * @param {XastElement} node
  * @returns {ComputedStyles}
  */
-const computeStyle = (stylesheet, node) => {
+export const computeStyle = (stylesheet, node) => {
   const { parents } = stylesheet;
   const computedStyles = computeOwnStyle(stylesheet, node);
   let parent = parents.get(node);
@@ -279,7 +273,6 @@ const computeStyle = (stylesheet, node) => {
   }
   return computedStyles;
 };
-exports.computeStyle = computeStyle;
 
 /**
  * Determines if the CSS selector includes or traverses the given attribute.
@@ -294,7 +287,7 @@ exports.computeStyle = computeStyle;
  * @param {boolean} traversed
  * @returns {boolean}
  */
-const includesAttrSelector = (
+export const includesAttrSelector = (
   selector,
   name,
   value = null,
@@ -333,4 +326,3 @@ const includesAttrSelector = (
 
   return false;
 };
-exports.includesAttrSelector = includesAttrSelector;
diff --git a/lib/style.test.js b/lib/style.test.js
index 48a0779b2..2d3fc95d2 100644
--- a/lib/style.test.js
+++ b/lib/style.test.js
@@ -1,14 +1,12 @@
-'use strict';
+import { collectStylesheet, computeStyle } from './style.js';
+import { visit } from './xast.js';
+import { parseSvg } from './parser.js';
 
 /**
- * @typedef {import('./types').XastParent} XastParent
- * @typedef {import('./types').XastElement} XastElement
+ * @typedef {import('./types.js').XastParent} XastParent
+ * @typedef {import('./types.js').XastElement} XastElement
  */
 
-const { collectStylesheet, computeStyle } = require('./style.js');
-const { visit } = require('./xast.js');
-const { parseSvg } = require('./parser.js');
-
 /**
  * @type {(node: XastParent, id: string) => XastElement}
  */
diff --git a/lib/svgo-node.js b/lib/svgo-node.js
index fc3ba8aba..514c837da 100644
--- a/lib/svgo-node.js
+++ b/lib/svgo-node.js
@@ -1,24 +1,15 @@
-'use strict';
-
-const os = require('os');
-const fs = require('fs');
-const { pathToFileURL } = require('url');
-const path = require('path');
-const { optimize: optimizeAgnostic } = require('./svgo.js');
+import os from 'os';
+import fs from 'fs';
+import { pathToFileURL } from 'url';
+import path from 'path';
+import { optimize as optimizeAgnostic } from './svgo.js';
 
 const importConfig = async (configFile) => {
-  let config;
-  // at the moment dynamic import may randomly fail with segfault
-  // to workaround this for some users .cjs extension is loaded
-  // exclusively with require
-  if (configFile.endsWith('.cjs')) {
-    config = require(configFile);
-  } else {
-    // dynamic import expects file url instead of path and may fail
-    // when windows path is provided
-    const { default: imported } = await import(pathToFileURL(configFile));
-    config = imported;
-  }
+  // dynamic import expects file url instead of path and may fail
+  // when windows path is provided
+  const imported = await import(pathToFileURL(configFile));
+  const config = imported.default;
+
   if (config == null || typeof config !== 'object' || Array.isArray(config)) {
     throw Error(`Invalid config file "${configFile}"`);
   }
@@ -34,7 +25,7 @@ const isFile = async (file) => {
   }
 };
 
-const loadConfig = async (configFile, cwd = process.cwd()) => {
+export const loadConfig = async (configFile, cwd = process.cwd()) => {
   if (configFile != null) {
     if (path.isAbsolute(configFile)) {
       return await importConfig(configFile);
@@ -64,9 +55,8 @@ const loadConfig = async (configFile, cwd = process.cwd()) => {
     dir = parent;
   }
 };
-exports.loadConfig = loadConfig;
 
-const optimize = (input, config) => {
+export const optimize = (input, config) => {
   if (config == null) {
     config = {};
   }
@@ -82,4 +72,3 @@ const optimize = (input, config) => {
     },
   });
 };
-exports.optimize = optimize;
diff --git a/lib/svgo-node.test.js b/lib/svgo-node.test.js
index 6a7e51002..a449a6efb 100644
--- a/lib/svgo-node.test.js
+++ b/lib/svgo-node.test.js
@@ -1,13 +1,11 @@
-'use strict';
+import os from 'os';
+import path from 'path';
+import { optimize, loadConfig } from './svgo-node.js';
 
 /**
- * @typedef {import('../lib/types').Plugin} Plugin
+ * @typedef {import('../lib/types.js').Plugin} Plugin
  */
 
-const os = require('os');
-const path = require('path');
-const { optimize, loadConfig } = require('./svgo-node.js');
-
 const describeLF = os.EOL === '\r\n' ? describe.skip : describe;
 const describeCRLF = os.EOL === '\r\n' ? describe : describe.skip;
 
diff --git a/lib/svgo.d.ts b/lib/svgo.d.ts
index d4e9e3c27..b9fe178ae 100644
--- a/lib/svgo.d.ts
+++ b/lib/svgo.d.ts
@@ -1,12 +1,12 @@
-import type { StringifyOptions, DataUri, Plugin as PluginFn } from './types';
+import type { StringifyOptions, DataUri, Plugin } from './types.js';
 import type {
   BuiltinsWithOptionalParams,
   BuiltinsWithRequiredParams,
-} from '../plugins/plugins-types';
+} from '../plugins/plugins-types.js';
 
 type CustomPlugin = {
   name: string;
-  fn: PluginFn<void>;
+  fn: Plugin<void>;
 };
 
 type PluginConfig =
diff --git a/lib/svgo.js b/lib/svgo.js
index acb1f72e2..e57fb2e1e 100644
--- a/lib/svgo.js
+++ b/lib/svgo.js
@@ -1,10 +1,8 @@
-'use strict';
-
-const { parseSvg } = require('./parser.js');
-const { stringifySvg } = require('./stringifier.js');
-const { builtin } = require('./builtin.js');
-const { invokePlugins } = require('./svgo/plugins.js');
-const { encodeSVGDatauri } = require('./svgo/tools.js');
+import { parseSvg } from './parser.js';
+import { stringifySvg } from './stringifier.js';
+import { builtin } from './builtin.js';
+import { invokePlugins } from './svgo/plugins.js';
+import { encodeSVGDatauri } from './svgo/tools.js';
 
 const pluginsMap = {};
 for (const plugin of builtin) {
@@ -47,7 +45,7 @@ const resolvePluginConfig = (plugin) => {
   return null;
 };
 
-const optimize = (input, config) => {
+export const optimize = (input, config) => {
   if (config == null) {
     config = {};
   }
@@ -99,4 +97,3 @@ const optimize = (input, config) => {
     data: output,
   };
 };
-exports.optimize = optimize;
diff --git a/lib/svgo.test.js b/lib/svgo.test.js
index de10d8317..303a30757 100644
--- a/lib/svgo.test.js
+++ b/lib/svgo.test.js
@@ -1,11 +1,10 @@
-'use strict';
+import { jest } from '@jest/globals';
+import { optimize } from './svgo.js';
 
 /**
- * @typedef {import('../lib/types').Plugin} Plugin
+ * @typedef {import('../lib/types.js').Plugin} Plugin
  */
 
-const { optimize } = require('./svgo.js');
-
 test('allow to setup default preset', () => {
   const svg = `
     <?xml version="1.0" encoding="utf-8"?>
diff --git a/lib/svgo/coa.js b/lib/svgo/coa.js
index 8e638d068..4b434fe5c 100644
--- a/lib/svgo/coa.js
+++ b/lib/svgo/coa.js
@@ -1,12 +1,14 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const colors = require('picocolors');
-const { loadConfig, optimize } = require('../svgo-node.js');
-const { builtin } = require('../builtin.js');
-const PKG = require('../../package.json');
-const { encodeSVGDatauri, decodeSVGDatauri } = require('./tools.js');
+import fs from 'fs';
+import path from 'path';
+import colors from 'picocolors';
+import { fileURLToPath } from 'url';
+import { encodeSVGDatauri, decodeSVGDatauri } from './tools.js';
+import { loadConfig, optimize } from '../svgo-node.js';
+import { builtin } from '../builtin.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const pkgPath = path.join(__dirname, '../../package.json');
+const PKG = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
 
 const regSVGFile = /\.svg$/i;
 
@@ -15,7 +17,7 @@ const regSVGFile = /\.svg$/i;
  *
  * @param {string} path
  */
-function checkIsDir(path) {
+export function checkIsDir(path) {
   try {
     return fs.lstatSync(path).isDirectory();
   } catch (e) {
@@ -23,7 +25,7 @@ function checkIsDir(path) {
   }
 }
 
-module.exports = function makeProgram(program) {
+export default function makeProgram(program) {
   program
     .name(PKG.name)
     .description(PKG.description, {
@@ -77,7 +79,7 @@ module.exports = function makeProgram(program) {
     // used by picocolors internally
     .option('--no-color', 'Output plain text without color')
     .action(action);
-};
+}
 
 async function action(args, opts, command) {
   var input = opts.input || args;
@@ -524,5 +526,3 @@ function showAvailablePlugins() {
     .join('\n');
   console.log('Currently available plugins:\n' + list);
 }
-
-module.exports.checkIsDir = checkIsDir;
diff --git a/lib/svgo/css-select-adapter.d.ts b/lib/svgo/css-select-adapter.d.ts
index a11ba35fd..effff0f0d 100644
--- a/lib/svgo/css-select-adapter.d.ts
+++ b/lib/svgo/css-select-adapter.d.ts
@@ -1,2 +1,2 @@
 declare let obj: any;
-export = obj;
+export default obj;
diff --git a/lib/svgo/css-select-adapter.js b/lib/svgo/css-select-adapter.js
index e9f1024a2..450c512ad 100644
--- a/lib/svgo/css-select-adapter.js
+++ b/lib/svgo/css-select-adapter.js
@@ -1,5 +1,3 @@
-'use strict';
-
 const isTag = (node) => {
   return node.type === 'element';
 };
@@ -117,4 +115,4 @@ const svgoCssSelectAdapter = {
   findOne,
 };
 
-module.exports = svgoCssSelectAdapter;
+export default svgoCssSelectAdapter;
diff --git a/lib/svgo/plugins.js b/lib/svgo/plugins.js
index 10e93e9c0..ba1577864 100644
--- a/lib/svgo/plugins.js
+++ b/lib/svgo/plugins.js
@@ -1,6 +1,4 @@
-'use strict';
-
-const { visit } = require('../xast.js');
+import { visit } from '../xast.js';
 
 /**
  * Plugins engine.
@@ -12,7 +10,13 @@ const { visit } = require('../xast.js');
  * @param {Array} plugins plugins object from config
  * @return {Object} output ast
  */
-const invokePlugins = (ast, info, plugins, overrides, globalOverrides) => {
+export const invokePlugins = (
+  ast,
+  info,
+  plugins,
+  overrides,
+  globalOverrides,
+) => {
   for (const plugin of plugins) {
     const override = overrides?.[plugin.name];
     if (override === false) {
@@ -26,9 +30,8 @@ const invokePlugins = (ast, info, plugins, overrides, globalOverrides) => {
     }
   }
 };
-exports.invokePlugins = invokePlugins;
 
-const createPreset = ({ name, plugins }) => {
+export const createPreset = ({ name, plugins }) => {
   return {
     name,
     fn: (ast, params, info) => {
@@ -58,4 +61,3 @@ const createPreset = ({ name, plugins }) => {
     },
   };
 };
-exports.createPreset = createPreset;
diff --git a/lib/svgo/tools.js b/lib/svgo/tools.js
index 2d5269ec8..f56e8d939 100644
--- a/lib/svgo/tools.js
+++ b/lib/svgo/tools.js
@@ -1,12 +1,10 @@
-'use strict';
-
 /**
- * @typedef {import('../../lib/types').XastElement} XastElement
- * @typedef {import('../types').PathDataCommand} PathDataCommand
- * @typedef {import('../types').DataUri} DataUri
+ * @typedef {import('../types.js').DataUri} DataUri
+ * @typedef {import('../types.js').PathDataCommand} PathDataCommand
+ * @typedef {import('../../lib/types.js').XastElement} XastElement
  */
 
-const { attrsGroups, referencesProps } = require('../../plugins/_collections');
+import { attrsGroups, referencesProps } from '../../plugins/_collections.js';
 
 const regReferencesUrl = /\burl\((["'])?#(.+?)\1\)/g;
 const regReferencesHref = /^#(.+?)$/;
@@ -17,7 +15,7 @@ const regReferencesBegin = /(\w+)\.[a-zA-Z]/;
  *
  * @type {(str: string, type?: DataUri) => string}
  */
-exports.encodeSVGDatauri = (str, type) => {
+export const encodeSVGDatauri = (str, type) => {
   var prefix = 'data:image/svg+xml';
   if (!type || type === 'base64') {
     // base64
@@ -38,7 +36,7 @@ exports.encodeSVGDatauri = (str, type) => {
  *
  * @type {(str: string) => string}
  */
-exports.decodeSVGDatauri = (str) => {
+export const decodeSVGDatauri = (str) => {
   var regexp = /data:image\/svg\+xml(;charset=[^;,]*)?(;base64)?,(.*)/;
   var match = regexp.exec(str);
 
@@ -76,7 +74,7 @@ exports.decodeSVGDatauri = (str) => {
  *
  * @type {(data: number[], params: CleanupOutDataParams, command?: PathDataCommand) => string}
  */
-exports.cleanupOutData = (data, params, command) => {
+export const cleanupOutData = (data, params, command) => {
   let str = '';
   let delimiter;
   /**
@@ -130,7 +128,7 @@ exports.cleanupOutData = (data, params, command) => {
  * 0.5 → .5
  * -0.5 → -.5
  */
-const removeLeadingZero = (value) => {
+export const removeLeadingZero = (value) => {
   const strValue = value.toString();
 
   if (0 < value && value < 1 && strValue.startsWith('0')) {
@@ -143,7 +141,6 @@ const removeLeadingZero = (value) => {
 
   return strValue;
 };
-exports.removeLeadingZero = removeLeadingZero;
 
 /**
  * If the current node contains any scripts. This does not check parents or
@@ -152,7 +149,7 @@ exports.removeLeadingZero = removeLeadingZero;
  * @param {XastElement} node Current node to check against.
  * @returns {boolean} If the current node contains scripts.
  */
-const hasScripts = (node) => {
+export const hasScripts = (node) => {
   if (node.name === 'script' && node.children.length !== 0) {
     return true;
   }
@@ -180,7 +177,6 @@ const hasScripts = (node) => {
 
   return eventAttrs.some((attr) => node.attributes[attr] != null);
 };
-exports.hasScripts = hasScripts;
 
 /**
  * For example, a string that contains one or more of following would match and
@@ -192,17 +188,16 @@ exports.hasScripts = hasScripts;
  * @param {string} body
  * @returns {boolean} If the given string includes a URL reference.
  */
-const includesUrlReference = (body) => {
+export const includesUrlReference = (body) => {
   return new RegExp(regReferencesUrl).test(body);
 };
-exports.includesUrlReference = includesUrlReference;
 
 /**
  * @param {string} attribute
  * @param {string} value
  * @returns {string[]}
  */
-const findReferences = (attribute, value) => {
+export const findReferences = (attribute, value) => {
   const results = [];
 
   if (referencesProps.has(attribute)) {
@@ -228,7 +223,6 @@ const findReferences = (attribute, value) => {
 
   return results.map((body) => decodeURI(body));
 };
-exports.findReferences = findReferences;
 
 /**
  * Does the same as {@link Number.toFixed} but without casting
@@ -238,8 +232,7 @@ exports.findReferences = findReferences;
  * @param {number} precision
  * @returns {number}
  */
-const toFixed = (num, precision) => {
+export const toFixed = (num, precision) => {
   const pow = 10 ** precision;
   return Math.round(num * pow) / pow;
 };
-exports.toFixed = toFixed;
diff --git a/lib/xast.js b/lib/xast.js
index 9dca96460..342f5c321 100644
--- a/lib/xast.js
+++ b/lib/xast.js
@@ -1,15 +1,13 @@
-'use strict';
+import { selectAll, selectOne, is } from 'css-select';
+import xastAdaptor from './svgo/css-select-adapter.js';
 
 /**
- * @typedef {import('./types').XastNode} XastNode
- * @typedef {import('./types').XastChild} XastChild
- * @typedef {import('./types').XastParent} XastParent
- * @typedef {import('./types').Visitor} Visitor
+ * @typedef {import('./types.js').XastNode} XastNode
+ * @typedef {import('./types.js').XastChild} XastChild
+ * @typedef {import('./types.js').XastParent} XastParent
+ * @typedef {import('./types.js').Visitor} Visitor
  */
 
-const { selectAll, selectOne, is } = require('css-select');
-const xastAdaptor = require('./svgo/css-select-adapter.js');
-
 const cssSelectOptions = {
   xmlMode: true,
   adapter: xastAdaptor,
@@ -18,34 +16,30 @@ const cssSelectOptions = {
 /**
  * @type {(node: XastNode, selector: string) => XastChild[]}
  */
-const querySelectorAll = (node, selector) => {
+export const querySelectorAll = (node, selector) => {
   return selectAll(selector, node, cssSelectOptions);
 };
-exports.querySelectorAll = querySelectorAll;
 
 /**
  * @type {(node: XastNode, selector: string) => ?XastChild}
  */
-const querySelector = (node, selector) => {
+export const querySelector = (node, selector) => {
   return selectOne(selector, node, cssSelectOptions);
 };
-exports.querySelector = querySelector;
 
 /**
  * @type {(node: XastChild, selector: string) => boolean}
  */
-const matches = (node, selector) => {
+export const matches = (node, selector) => {
   return is(node, selector, cssSelectOptions);
 };
-exports.matches = matches;
 
-const visitSkip = Symbol();
-exports.visitSkip = visitSkip;
+export const visitSkip = Symbol();
 
 /**
  * @type {(node: XastNode, visitor: Visitor, parentNode?: any) => void}
  */
-const visit = (node, visitor, parentNode) => {
+export const visit = (node, visitor, parentNode) => {
   const callbacks = visitor[node.type];
   if (callbacks && callbacks.enter) {
     // @ts-ignore hard to infer
@@ -74,14 +68,12 @@ const visit = (node, visitor, parentNode) => {
     callbacks.exit(node, parentNode);
   }
 };
-exports.visit = visit;
 
 /**
  * @param {XastChild} node
  * @param {XastParent} parentNode
  */
-const detachNodeFromParent = (node, parentNode) => {
+export const detachNodeFromParent = (node, parentNode) => {
   // avoid splice to not break for loops
   parentNode.children = parentNode.children.filter((child) => child !== node);
 };
-exports.detachNodeFromParent = detachNodeFromParent;
diff --git a/lib/xast.test.js b/lib/xast.test.js
index 0fed4fe98..8fc4c448a 100644
--- a/lib/xast.test.js
+++ b/lib/xast.test.js
@@ -1,11 +1,9 @@
-'use strict';
-
 /**
- * @typedef {import('./types').XastRoot} XastRoot
- * @typedef {import('./types').XastElement} XastElement
+ * @typedef {import('./types.js').XastElement} XastElement
+ * @typedef {import('./types.js').XastRoot} XastRoot
  */
 
-const { visit, visitSkip, detachNodeFromParent } = require('./xast.js');
+import { visit, visitSkip, detachNodeFromParent } from './xast.js';
 
 /**
  * @type {(children: XastElement[]) => XastRoot}
diff --git a/package.json b/package.json
index b688b349b..7e666169f 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,10 @@
 {
   "packageManager": "yarn@2.4.3",
   "name": "svgo",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Nodejs-based tool for optimizing SVG vector graphics files",
   "license": "MIT",
+  "type": "module",
   "keywords": [
     "svgo",
     "svg",
@@ -50,8 +51,12 @@
     "url": "https://opencollective.com/svgo"
   },
   "main": "./lib/svgo-node.js",
-  "bin": "./bin/svgo",
+  "bin": "./bin/svgo.js",
   "types": "./lib/svgo.d.ts",
+  "exports": {
+    "require": "./dist/svgo-node.cjs",
+    "default": "./lib/svgo-node.js"
+  },
   "files": [
     "bin",
     "lib",
@@ -67,10 +72,11 @@
     "lint": "eslint --ignore-path .gitignore . && prettier --check . --ignore-path .gitignore",
     "fix": "eslint --ignore-path .gitignore --fix . && prettier --write . --ignore-path .gitignore",
     "typecheck": "tsc",
-    "test-browser": "rollup -c && node ./test/browser.js",
+    "generate-bundles": "rollup -c",
+    "test-bundles": "yarn generate-bundles && node ./test/svgo.cjs && node ./test/browser.js",
     "test-regression": "node ./test/regression-extract.js && NO_DIFF=1 node ./test/regression.js",
-    "prepublishOnly": "rm -rf dist && rollup -c",
-    "qa": "yarn lint && yarn typecheck && yarn test && yarn test-browser && yarn test-regression"
+    "prepublishOnly": "rm -rf dist && yarn generate-bundles",
+    "qa": "yarn lint && yarn typecheck && yarn test && yarn test-bundles && yarn test-regression"
   },
   "jest": {
     "coveragePathIgnorePatterns": [
@@ -87,8 +93,9 @@
     "picocolors": "^1.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-node-resolve": "^14.1.0",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
     "@types/css-tree": "^2.3.4",
     "@types/csso": "^5.0.4",
     "@types/jest": "^29.5.5",
@@ -100,8 +107,7 @@
     "playwright": "^1.40.1",
     "pngjs": "^7.0.0",
     "prettier": "^3.1.1",
-    "rollup": "^2.79.1",
-    "rollup-plugin-terser": "^7.0.2",
+    "rollup": "^4.9.2",
     "tar-stream": "^3.1.6",
     "typescript": "^5.3.3"
   }
diff --git a/plugins/_collections.js b/plugins/_collections.js
index 6f11b1365..832907103 100644
--- a/plugins/_collections.js
+++ b/plugins/_collections.js
@@ -1,11 +1,9 @@
-'use strict';
-
 // https://www.w3.org/TR/SVG11/intro.html#Definitions
 
 /**
  * @type {Record<string, Set<string>>}
  */
-exports.elemsGroups = {
+export const elemsGroups = {
   animation: new Set([
     'animate',
     'animateColor',
@@ -107,19 +105,15 @@ exports.elemsGroups = {
  *
  * @see https://developer.mozilla.org/docs/Web/HTML/Element/pre
  */
-exports.textElems = new Set([
-  ...exports.elemsGroups.textContent,
-  'pre',
-  'title',
-]);
+export const textElems = new Set([...elemsGroups.textContent, 'pre', 'title']);
 
-exports.pathElems = new Set(['glyph', 'missing-glyph', 'path']);
+export const pathElems = new Set(['glyph', 'missing-glyph', 'path']);
 
 /**
  * @type {Record<string, Set<string>>}
  * @see https://www.w3.org/TR/SVG11/intro.html#Definitions
  */
-exports.attrsGroups = {
+export const attrsGroups = {
   animationAddition: new Set(['additive', 'accumulate']),
   animationAttributeTarget: new Set(['attributeType', 'attributeName']),
   animationEvent: new Set(['onbegin', 'onend', 'onrepeat', 'onload']),
@@ -317,7 +311,7 @@ exports.attrsGroups = {
 /**
  * @type {Record<string, Record<string, string>>}
  */
-exports.attrsGroupsDefaults = {
+export const attrsGroupsDefaults = {
   core: { 'xml:space': 'default' },
   presentation: {
     clip: 'auto',
@@ -391,7 +385,7 @@ exports.attrsGroupsDefaults = {
  * }>}
  * @see https://www.w3.org/TR/SVG11/eltindex.html
  */
-exports.elems = {
+export const elems = {
   a: {
     attrsGroups: new Set([
       'conditionalProcessing',
@@ -1971,7 +1965,7 @@ exports.elems = {
 };
 
 // https://wiki.inkscape.org/wiki/index.php/Inkscape-specific_XML_attributes
-exports.editorNamespaces = new Set([
+export const editorNamespaces = new Set([
   'http://creativecommons.org/ns#',
   'http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd',
   'http://ns.adobe.com/AdobeIllustrator/10.0/',
@@ -1999,7 +1993,7 @@ exports.editorNamespaces = new Set([
 /**
  * @see https://www.w3.org/TR/SVG11/linking.html#processingIRI
  */
-exports.referencesProps = new Set([
+export const referencesProps = new Set([
   'clip-path',
   'color-profile',
   'fill',
@@ -2015,7 +2009,7 @@ exports.referencesProps = new Set([
 /**
  * @see https://www.w3.org/TR/SVG11/propidx.html
  */
-exports.inheritableAttrs = new Set([
+export const inheritableAttrs = new Set([
   'clip-rule',
   'color-interpolation-filters',
   'color-interpolation',
@@ -2063,7 +2057,7 @@ exports.inheritableAttrs = new Set([
   'writing-mode',
 ]);
 
-exports.presentationNonInheritableGroupAttrs = new Set([
+export const presentationNonInheritableGroupAttrs = new Set([
   'clip-path',
   'display',
   'filter',
@@ -2079,7 +2073,7 @@ exports.presentationNonInheritableGroupAttrs = new Set([
  *
  * @type {Record<string, string>}
  */
-exports.colorsNames = {
+export const colorsNames = {
   aliceblue: '#f0f8ff',
   antiquewhite: '#faebd7',
   aqua: '#0ff',
@@ -2233,7 +2227,7 @@ exports.colorsNames = {
 /**
  * @type {Record<string, string>}
  */
-exports.colorsShortNames = {
+export const colorsShortNames = {
   '#f0ffff': 'azure',
   '#f5f5dc': 'beige',
   '#ffe4c4': 'bisque',
@@ -2271,7 +2265,7 @@ exports.colorsShortNames = {
 /**
  * @see https://www.w3.org/TR/SVG11/single-page.html#types-DataTypeColor
  */
-exports.colorsProps = new Set([
+export const colorsProps = new Set([
   'color',
   'fill',
   'flood-color',
@@ -2281,7 +2275,7 @@ exports.colorsProps = new Set([
 ]);
 
 /** @see https://developer.mozilla.org/docs/Web/CSS/Pseudo-classes */
-exports.pseudoClasses = {
+export const pseudoClasses = {
   displayState: new Set(['fullscreen', 'modal', 'picture-in-picture']),
   input: new Set([
     'autofill',
diff --git a/plugins/_path.js b/plugins/_path.js
index 7c3a28b93..76f94ba05 100644
--- a/plugins/_path.js
+++ b/plugins/_path.js
@@ -1,12 +1,10 @@
-'use strict';
+import { parsePathData, stringifyPathData } from '../lib/path.js';
 
 /**
- * @typedef {import('../lib/types').XastElement} XastElement
- * @typedef {import('../lib/types').PathDataItem} PathDataItem
+ * @typedef {import('../lib/types.js').XastElement} XastElement
+ * @typedef {import('../lib/types.js').PathDataItem} PathDataItem
  */
 
-const { parsePathData, stringifyPathData } = require('../lib/path.js');
-
 /**
  * @type {[number, number]}
  */
@@ -17,7 +15,7 @@ var prevCtrlPoint;
  *
  * @type {(path: XastElement) => PathDataItem[]}
  */
-const path2js = (path) => {
+export const path2js = (path) => {
   // @ts-ignore legacy
   if (path.pathJS) return path.pathJS;
   /**
@@ -36,7 +34,6 @@ const path2js = (path) => {
   path.pathJS = pathData;
   return pathData;
 };
-exports.path2js = path2js;
 
 /**
  * Convert relative Path data to absolute.
@@ -181,7 +178,7 @@ const convertRelativeToAbsolute = (data) => {
  *
  * @type {(path: XastElement, data: PathDataItem[], params: Js2PathParams) => void}
  */
-exports.js2path = function (path, data, params) {
+export const js2path = function (path, data, params) {
   // @ts-ignore legacy
   path.pathJS = data;
 
@@ -226,7 +223,7 @@ function set(dest, source) {
  *
  * @type {(path1: PathDataItem[], path2: PathDataItem[]) => boolean}
  */
-exports.intersects = function (path1, path2) {
+export const intersects = function (path1, path2) {
   // Collect points of every subpath.
   const points1 = gatherPoints(convertRelativeToAbsolute(path1));
   const points2 = gatherPoints(convertRelativeToAbsolute(path2));
diff --git a/plugins/_transforms.js b/plugins/_transforms.js
index 1ab6d6485..b4ce055f3 100644
--- a/plugins/_transforms.js
+++ b/plugins/_transforms.js
@@ -1,6 +1,4 @@
-'use strict';
-
-const { toFixed } = require('../lib/svgo/tools');
+import { toFixed } from '../lib/svgo/tools.js';
 
 /**
  * @typedef {{ name: string, data: number[] }} TransformItem
@@ -38,7 +36,7 @@ const regNumericValues = /[-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g;
  * @param {string} transformString
  * @returns {TransformItem[]} Object representation of transform, or an empty array if it was malformed.
  */
-exports.transform2js = (transformString) => {
+export const transform2js = (transformString) => {
   /** @type {TransformItem[]} */
   const transforms = [];
   /** @type {?TransformItem} */
@@ -69,14 +67,13 @@ exports.transform2js = (transformString) => {
     ? []
     : transforms;
 };
-
 /**
  * Multiply transforms into one.
  *
  * @param {TransformItem[]} transforms
  * @returns {TransformItem}
  */
-exports.transformsMultiply = (transforms) => {
+export const transformsMultiply = (transforms) => {
   const matrixData = transforms.map((transform) => {
     if (transform.name === 'matrix') {
       return transform.data;
@@ -173,7 +170,7 @@ const mth = {
  * @returns {TransformItem[]}
  * @see https://frederic-wang.fr/decomposition-of-2d-transform-matrices.html
  */
-exports.matrixToTransform = (transform, params) => {
+export const matrixToTransform = (transform, params) => {
   const floatPrecision = params.floatPrecision;
   const data = transform.data;
   const transforms = [];
@@ -337,7 +334,7 @@ const transformToMatrix = (transform) => {
  *   transform: number[]
  * ) => number[]}
  */
-exports.transformArc = (cursor, arc, transform) => {
+export const transformArc = (cursor, arc, transform) => {
   const x = arc[5] - cursor[0];
   const y = arc[6] - cursor[1];
   let a = arc[0];
diff --git a/plugins/addAttributesToSVGElement.js b/plugins/addAttributesToSVGElement.js
index 845cb056a..a2b86df6c 100644
--- a/plugins/addAttributesToSVGElement.js
+++ b/plugins/addAttributesToSVGElement.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'addAttributesToSVGElement';
-exports.description = 'adds attributes to an outer <svg> element';
+export const name = 'addAttributesToSVGElement';
+export const description = 'adds attributes to an outer <svg> element';
 
 var ENOCLS = `Error in plugin "addAttributesToSVGElement": absent parameters.
 It should have a list of "attributes" or one "attribute".
@@ -47,9 +45,9 @@ plugins: [
  *
  * @author April Arcus
  *
- * @type {import('./plugins-types').Plugin<'addAttributesToSVGElement'>}
+ * @type {import('./plugins-types.js').Plugin<'addAttributesToSVGElement'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   if (!Array.isArray(params.attributes) && !params.attribute) {
     console.error(ENOCLS);
     return null;
diff --git a/plugins/addClassesToSVGElement.js b/plugins/addClassesToSVGElement.js
index 1e773d852..a36346d5e 100644
--- a/plugins/addClassesToSVGElement.js
+++ b/plugins/addClassesToSVGElement.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'addClassesToSVGElement';
-exports.description = 'adds classnames to an outer <svg> element';
+export const name = 'addClassesToSVGElement';
+export const description = 'adds classnames to an outer <svg> element';
 
 var ENOCLS = `Error in plugin "addClassesToSVGElement": absent parameters.
 It should have a list of classes in "classNames" or one "className".
@@ -49,9 +47,9 @@ plugins: [
  *
  * @author April Arcus
  *
- * @type {import('./plugins-types').Plugin<'addClassesToSVGElement'>}
+ * @type {import('./plugins-types.js').Plugin<'addClassesToSVGElement'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   if (
     !(Array.isArray(params.classNames) && params.classNames.some(String)) &&
     !params.className
diff --git a/plugins/applyTransforms.js b/plugins/applyTransforms.js
index ae492d54a..ef9546f77 100644
--- a/plugins/applyTransforms.js
+++ b/plugins/applyTransforms.js
@@ -1,22 +1,18 @@
-'use strict';
-
 /**
- * @typedef {import('../lib/types').PathDataItem} PathDataItem
- * @typedef {import('../lib/types').XastElement} XastElement
+ * @typedef {import('../lib/types.js').PathDataItem} PathDataItem
+ * @typedef {import('../lib/types.js').XastElement} XastElement
  */
 
-const { collectStylesheet, computeStyle } = require('../lib/style.js');
-const {
+import { path2js } from './_path.js';
+import {
   transformsMultiply,
   transform2js,
   transformArc,
-} = require('./_transforms.js');
-const { path2js } = require('./_path.js');
-const {
-  removeLeadingZero,
-  includesUrlReference,
-} = require('../lib/svgo/tools.js');
-const { referencesProps, attrsGroupsDefaults } = require('./_collections.js');
+} from './_transforms.js';
+import { referencesProps, attrsGroupsDefaults } from './_collections.js';
+import { collectStylesheet, computeStyle } from '../lib/style.js';
+
+import { removeLeadingZero, includesUrlReference } from '../lib/svgo/tools.js';
 
 /**
  * @typedef {PathDataItem[]} PathData
@@ -28,12 +24,12 @@ const regNumericValues = /[-+]?(\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g;
 /**
  * Apply transformation(s) to the Path data.
  *
- * @type {import('../lib/types').Plugin<{
+ * @type {import('../lib/types.js').Plugin<{
  *   transformPrecision: number,
  *   applyTransformsStroked: boolean,
  * }>}
  */
-const applyTransforms = (root, params) => {
+export const applyTransforms = (root, params) => {
   const stylesheet = collectStylesheet(root);
   return {
     element: {
@@ -160,7 +156,6 @@ const applyTransforms = (root, params) => {
     },
   };
 };
-exports.applyTransforms = applyTransforms;
 
 /**
  * @type {(matrix: Matrix, x: number, y: number) => [number, number]}
diff --git a/plugins/cleanupAttrs.js b/plugins/cleanupAttrs.js
index 7b4c6b702..ebeb2b649 100644
--- a/plugins/cleanupAttrs.js
+++ b/plugins/cleanupAttrs.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'cleanupAttrs';
-exports.description =
+export const name = 'cleanupAttrs';
+export const description =
   'cleanups attributes from newlines, trailing and repeating spaces';
 
 const regNewlinesNeedSpace = /(\S)\r?\n(\S)/g;
@@ -12,10 +10,9 @@ const regSpaces = /\s{2,}/g;
  * Cleanup attributes values from newlines, trailing and repeating spaces.
  *
  * @author Kir Belevich
- *
- * @type {import('./plugins-types').Plugin<'cleanupAttrs'>}
+ * @type {import('./plugins-types.js').Plugin<'cleanupAttrs'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const { newlines = true, trim = true, spaces = true } = params;
   return {
     element: {
diff --git a/plugins/cleanupEnableBackground.js b/plugins/cleanupEnableBackground.js
index 330cfb572..d860bba76 100644
--- a/plugins/cleanupEnableBackground.js
+++ b/plugins/cleanupEnableBackground.js
@@ -1,10 +1,8 @@
-'use strict';
+import * as csstree from 'css-tree';
+import { visit } from '../lib/xast.js';
 
-const csstree = require('css-tree');
-const { visit } = require('../lib/xast.js');
-
-exports.name = 'cleanupEnableBackground';
-exports.description =
+export const name = 'cleanupEnableBackground';
+export const description =
   'remove or cleanup enable-background attribute when possible';
 
 const regEnableBackground =
@@ -19,9 +17,9 @@ const regEnableBackground =
  *             ⬇
  * <svg width="100" height="50">
  * @author Kir Belevich
- * @type {import('./plugins-types').Plugin<'cleanupEnableBackground'>}
+ * @type {import('./plugins-types.js').Plugin<'cleanupEnableBackground'>}
  */
-exports.fn = (root) => {
+export const fn = (root) => {
   let hasFilter = false;
 
   visit(root, {
diff --git a/plugins/cleanupIds.js b/plugins/cleanupIds.js
index bfabcca55..55bee0e92 100644
--- a/plugins/cleanupIds.js
+++ b/plugins/cleanupIds.js
@@ -1,14 +1,12 @@
-'use strict';
+import { visitSkip } from '../lib/xast.js';
+import { hasScripts, findReferences } from '../lib/svgo/tools.js';
 
 /**
- * @typedef {import('../lib/types').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastElement} XastElement
  */
 
-const { visitSkip } = require('../lib/xast.js');
-const { hasScripts, findReferences } = require('../lib/svgo/tools');
-
-exports.name = 'cleanupIds';
-exports.description = 'removes unused IDs and minifies used';
+export const name = 'cleanupIds';
+export const description = 'removes unused IDs and minifies used';
 
 const generateIdChars = [
   'a',
@@ -121,9 +119,9 @@ const getIdString = (arr) => {
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'cleanupIds'>}
+ * @type {import('./plugins-types.js').Plugin<'cleanupIds'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   const {
     remove = true,
     minify = true,
diff --git a/plugins/cleanupListOfValues.js b/plugins/cleanupListOfValues.js
index 618fd062d..5bf8fa0ee 100644
--- a/plugins/cleanupListOfValues.js
+++ b/plugins/cleanupListOfValues.js
@@ -1,9 +1,7 @@
-'use strict';
+import { removeLeadingZero } from '../lib/svgo/tools.js';
 
-const { removeLeadingZero } = require('../lib/svgo/tools.js');
-
-exports.name = 'cleanupListOfValues';
-exports.description = 'rounds list of values to the fixed precision';
+export const name = 'cleanupListOfValues';
+export const description = 'rounds list of values to the fixed precision';
 
 const regNumericValues =
   /^([-+]?\d*\.?\d+([eE][-+]?\d+)?)(px|pt|pc|mm|cm|m|in|ft|em|ex|%)?$/;
@@ -32,9 +30,9 @@ const absoluteLengths = {
  *
  * @author kiyopikko
  *
- * @type {import('./plugins-types').Plugin<'cleanupListOfValues'>}
+ * @type {import('./plugins-types.js').Plugin<'cleanupListOfValues'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   const {
     floatPrecision = 3,
     leadingZero = true,
diff --git a/plugins/cleanupNumericValues.js b/plugins/cleanupNumericValues.js
index 9b782c3d5..03714097a 100644
--- a/plugins/cleanupNumericValues.js
+++ b/plugins/cleanupNumericValues.js
@@ -1,9 +1,7 @@
-'use strict';
+import { removeLeadingZero } from '../lib/svgo/tools.js';
 
-const { removeLeadingZero } = require('../lib/svgo/tools');
-
-exports.name = 'cleanupNumericValues';
-exports.description =
+export const name = 'cleanupNumericValues';
+export const description =
   'rounds numeric values to the fixed precision, removes default ‘px’ units';
 
 const regNumericValues =
@@ -25,9 +23,9 @@ const absoluteLengths = {
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'cleanupNumericValues'>}
+ * @type {import('./plugins-types.js').Plugin<'cleanupNumericValues'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   const {
     floatPrecision = 3,
     leadingZero = true,
diff --git a/plugins/collapseGroups.js b/plugins/collapseGroups.js
index 0534ad775..a4a913706 100644
--- a/plugins/collapseGroups.js
+++ b/plugins/collapseGroups.js
@@ -1,13 +1,11 @@
-'use strict';
+import { inheritableAttrs, elemsGroups } from './_collections.js';
 
 /**
- * @typedef {import('../lib/types').XastNode} XastNode
+ * @typedef {import('../lib/types.js').XastNode} XastNode
  */
 
-const { inheritableAttrs, elemsGroups } = require('./_collections.js');
-
-exports.name = 'collapseGroups';
-exports.description = 'collapses useless groups';
+export const name = 'collapseGroups';
+export const description = 'collapses useless groups';
 
 /**
  * @type {(node: XastNode, name: string) => boolean}
@@ -49,9 +47,9 @@ const hasAnimatedAttr = (node, name) => {
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'collapseGroups'>}
+ * @type {import('./plugins-types.js').Plugin<'collapseGroups'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       exit: (node, parentNode) => {
diff --git a/plugins/convertColors.js b/plugins/convertColors.js
index d894283f8..048504adb 100644
--- a/plugins/convertColors.js
+++ b/plugins/convertColors.js
@@ -1,9 +1,8 @@
-'use strict';
+import { colorsNames, colorsProps, colorsShortNames } from './_collections.js';
 
-const collections = require('./_collections.js');
-
-exports.name = 'convertColors';
-exports.description = 'converts colors: rgb() to #rrggbb and #rrggbb to #rgb';
+export const name = 'convertColors';
+export const description =
+  'converts colors: rgb() to #rrggbb and #rrggbb to #rgb';
 
 const rNumber = '([+-]?(?:\\d*\\.\\d+|\\d+\\.?)%?)';
 const rComma = '\\s*,\\s*';
@@ -61,9 +60,9 @@ const convertRgbToHex = ([r, g, b]) => {
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'convertColors'>}
+ * @type {import('./plugins-types.js').Plugin<'convertColors'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   const {
     currentColor = false,
     names2hex = true,
@@ -76,7 +75,7 @@ exports.fn = (_root, params) => {
     element: {
       enter: (node) => {
         for (const [name, value] of Object.entries(node.attributes)) {
-          if (collections.colorsProps.has(name)) {
+          if (colorsProps.has(name)) {
             let val = value;
 
             // convert colors to currentColor
@@ -97,8 +96,8 @@ exports.fn = (_root, params) => {
             // convert color name keyword to long hex
             if (names2hex) {
               const colorName = val.toLowerCase();
-              if (collections.colorsNames[colorName] != null) {
-                val = collections.colorsNames[colorName];
+              if (colorsNames[colorName] != null) {
+                val = colorsNames[colorName];
               }
             }
 
@@ -130,8 +129,8 @@ exports.fn = (_root, params) => {
             // convert hex to short name
             if (shortname) {
               const colorName = val.toLowerCase();
-              if (collections.colorsShortNames[colorName] != null) {
-                val = collections.colorsShortNames[colorName];
+              if (colorsShortNames[colorName] != null) {
+                val = colorsShortNames[colorName];
               }
             }
 
diff --git a/plugins/convertEllipseToCircle.js b/plugins/convertEllipseToCircle.js
index 50fa20db8..256eaaac9 100644
--- a/plugins/convertEllipseToCircle.js
+++ b/plugins/convertEllipseToCircle.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'convertEllipseToCircle';
-exports.description = 'converts non-eccentric <ellipse>s to <circle>s';
+export const name = 'convertEllipseToCircle';
+export const description = 'converts non-eccentric <ellipse>s to <circle>s';
 
 /**
  * Converts non-eccentric <ellipse>s to <circle>s.
@@ -10,9 +8,9 @@ exports.description = 'converts non-eccentric <ellipse>s to <circle>s';
  *
  * @author Taylor Hunt
  *
- * @type {import('./plugins-types').Plugin<'convertEllipseToCircle'>}
+ * @type {import('./plugins-types.js').Plugin<'convertEllipseToCircle'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node) => {
diff --git a/plugins/convertOneStopGradients.js b/plugins/convertOneStopGradients.js
index 1cf0d66b0..076878ed8 100644
--- a/plugins/convertOneStopGradients.js
+++ b/plugins/convertOneStopGradients.js
@@ -1,31 +1,29 @@
-'use strict';
-
-/**
- * @typedef {import('../lib/types').XastElement} XastElement
- * @typedef {import('../lib/types').XastParent} XastParent
- */
-
-const { attrsGroupsDefaults, colorsProps } = require('./_collections');
-const {
+import { attrsGroupsDefaults, colorsProps } from './_collections.js';
+import {
   detachNodeFromParent,
   querySelectorAll,
   querySelector,
-} = require('../lib/xast');
-const { computeStyle, collectStylesheet } = require('../lib/style');
+} from '../lib/xast.js';
+import { computeStyle, collectStylesheet } from '../lib/style.js';
+
+/**
+ * @typedef {import('../lib/types.js').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastParent} XastParent
+ */
 
-exports.name = 'convertOneStopGradients';
-exports.description =
+export const name = 'convertOneStopGradients';
+export const description =
   'converts one-stop (single color) gradients to a plain color';
 
 /**
  * Converts one-stop (single color) gradients to a plain color.
  *
  * @author Seth Falco <seth@falco.fun>
- * @type {import('./plugins-types').Plugin<'convertOneStopGradients'>}
+ * @type {import('./plugins-types.js').Plugin<'convertOneStopGradients'>}
  * @see https://developer.mozilla.org/docs/Web/SVG/Element/linearGradient
  * @see https://developer.mozilla.org/docs/Web/SVG/Element/radialGradient
  */
-exports.fn = (root) => {
+export const fn = (root) => {
   const stylesheet = collectStylesheet(root);
 
   /**
diff --git a/plugins/convertPathData.js b/plugins/convertPathData.js
index de7b357f5..3ba5288fe 100644
--- a/plugins/convertPathData.js
+++ b/plugins/convertPathData.js
@@ -1,18 +1,16 @@
-'use strict';
+import { path2js, js2path } from './_path.js';
+import { pathElems } from './_collections.js';
+import { applyTransforms } from './applyTransforms.js';
+import { collectStylesheet, computeStyle } from '../lib/style.js';
+import { visit } from '../lib/xast.js';
+import { cleanupOutData, toFixed } from '../lib/svgo/tools.js';
 
 /**
- * @typedef {import('../lib//types').PathDataItem} PathDataItem
+ * @typedef {import('../lib/types.js').PathDataItem} PathDataItem
  */
 
-const { collectStylesheet, computeStyle } = require('../lib/style.js');
-const { visit } = require('../lib/xast.js');
-const { pathElems } = require('./_collections.js');
-const { path2js, js2path } = require('./_path.js');
-const { applyTransforms } = require('./applyTransforms.js');
-const { cleanupOutData, toFixed } = require('../lib/svgo/tools');
-
-exports.name = 'convertPathData';
-exports.description =
+export const name = 'convertPathData';
+export const description =
   'optimizes path data: writes in shorter form, applies transformations';
 
 /** @type {(data: number[]) => number[]} */
@@ -75,9 +73,9 @@ let arcTolerance;
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'convertPathData'>}
+ * @type {import('./plugins-types.js').Plugin<'convertPathData'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const {
     // TODO convert to separate plugin in v3
     applyTransforms: _applyTransforms = true,
diff --git a/plugins/convertShapeToPath.js b/plugins/convertShapeToPath.js
index f0ba0fd84..e91a0306b 100644
--- a/plugins/convertShapeToPath.js
+++ b/plugins/convertShapeToPath.js
@@ -1,14 +1,12 @@
-'use strict';
+import { stringifyPathData } from '../lib/path.js';
+import { detachNodeFromParent } from '../lib/xast.js';
 
 /**
- * @typedef {import('../lib/types').PathDataItem} PathDataItem
+ * @typedef {import('../lib/types.js').PathDataItem} PathDataItem
  */
 
-const { stringifyPathData } = require('../lib/path.js');
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'convertShapeToPath';
-exports.description = 'converts basic shapes to more compact path form';
+export const name = 'convertShapeToPath';
+export const description = 'converts basic shapes to more compact path form';
 
 const regNumber = /[-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g;
 
@@ -21,9 +19,9 @@ const regNumber = /[-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g;
  *
  * @author Lev Solntsev
  *
- * @type {import('./plugins-types').Plugin<'convertShapeToPath'>}
+ * @type {import('./plugins-types.js').Plugin<'convertShapeToPath'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const { convertArcs = false, floatPrecision: precision } = params;
 
   return {
diff --git a/plugins/convertStyleToAttrs.js b/plugins/convertStyleToAttrs.js
index a9305fc4b..0402ca98b 100644
--- a/plugins/convertStyleToAttrs.js
+++ b/plugins/convertStyleToAttrs.js
@@ -1,9 +1,7 @@
-'use strict';
+import { attrsGroups } from './_collections.js';
 
-const { attrsGroups } = require('./_collections');
-
-exports.name = 'convertStyleToAttrs';
-exports.description = 'converts style to attributes';
+export const name = 'convertStyleToAttrs';
+export const description = 'converts style to attributes';
 
 /**
  * @type {(...args: string[]) => string}
@@ -65,9 +63,9 @@ const regStripComments = new RegExp(
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'convertStyleToAttrs'>}
+ * @type {import('./plugins-types.js').Plugin<'convertStyleToAttrs'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   const { keepImportant = false } = params;
   return {
     element: {
diff --git a/plugins/convertTransform.js b/plugins/convertTransform.js
index 6f3990789..6104b4218 100644
--- a/plugins/convertTransform.js
+++ b/plugins/convertTransform.js
@@ -1,20 +1,19 @@
-'use strict';
-
-/**
- * @typedef {import('../lib/types').XastChild} XastChild
- * @typedef {import('../lib/types').XastElement} XastElement
- * @typedef {import('../lib/types').XastParent} XastParent
- */
-
-const { cleanupOutData, toFixed } = require('../lib/svgo/tools.js');
-const {
+import { cleanupOutData, toFixed } from '../lib/svgo/tools.js';
+import {
   transform2js,
   transformsMultiply,
   matrixToTransform,
-} = require('./_transforms.js');
+} from './_transforms.js';
+
+/**
+ * @typedef {import('../lib/types.js').XastChild} XastChild
+ * @typedef {import('../lib/types.js').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastParent} XastParent
+ */
 
-exports.name = 'convertTransform';
-exports.description = 'collapses multiple transformations and optimizes it';
+export const name = 'convertTransform';
+export const description =
+  'collapses multiple transformations and optimizes it';
 
 /**
  * Convert matrices to the short aliases,
@@ -26,9 +25,9 @@ exports.description = 'collapses multiple transformations and optimizes it';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'convertTransform'>}
+ * @type {import('./plugins-types.js').Plugin<'convertTransform'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   const {
     convertToShorts = true,
     // degPrecision = 3, // transformPrecision (or matrix precision) - 2 by default
diff --git a/plugins/inlineStyles.js b/plugins/inlineStyles.js
index e09988de7..02547ac0f 100644
--- a/plugins/inlineStyles.js
+++ b/plugins/inlineStyles.js
@@ -1,24 +1,20 @@
-'use strict';
-
-/**
- * @typedef {import('../lib/types').XastElement} XastElement
- * @typedef {import('../lib/types').XastParent} XastParent
- */
-
-const csstree = require('css-tree');
-const {
-  syntax: { specificity },
-} = require('csso');
-const {
+import * as csstree from 'css-tree';
+import { syntax } from 'csso';
+import { attrsGroups, pseudoClasses } from './_collections.js';
+import {
   visitSkip,
   querySelectorAll,
   detachNodeFromParent,
-} = require('../lib/xast.js');
-const { compareSpecificity, includesAttrSelector } = require('../lib/style');
-const { attrsGroups, pseudoClasses } = require('./_collections');
+} from '../lib/xast.js';
+import { compareSpecificity, includesAttrSelector } from '../lib/style.js';
+
+/**
+ * @typedef {import('../lib/types.js').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastParent} XastParent
+ */
 
-exports.name = 'inlineStyles';
-exports.description = 'inline styles (additional options)';
+export const name = 'inlineStyles';
+export const description = 'inline styles (additional options)';
 
 /**
  * Some pseudo-classes can only be calculated by clients, like :visited,
@@ -38,10 +34,10 @@ const preservedPseudos = [
 /**
  * Merges styles from style nodes into inline styles.
  *
- * @type {import('./plugins-types').Plugin<'inlineStyles'>}
+ * @type {import('./plugins-types.js').Plugin<'inlineStyles'>}
  * @author strarsis <strarsis@gmail.com>
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const {
     onlyMatchedOnce = true,
     removeMatchedSelectors = true,
@@ -177,8 +173,8 @@ exports.fn = (root, params) => {
         const sortedSelectors = selectors
           .slice()
           .sort((a, b) => {
-            const aSpecificity = specificity(a.item.data);
-            const bSpecificity = specificity(b.item.data);
+            const aSpecificity = syntax.specificity(a.item.data);
+            const bSpecificity = syntax.specificity(b.item.data);
             return compareSpecificity(aSpecificity, bSpecificity);
           })
           .reverse();
diff --git a/plugins/mergePaths.js b/plugins/mergePaths.js
index fe982c136..7219e05fb 100644
--- a/plugins/mergePaths.js
+++ b/plugins/mergePaths.js
@@ -1,25 +1,23 @@
-'use strict';
-
 /**
- * @typedef {import("../lib/types").PathDataItem} PathDataItem
- * @typedef {import('../lib/types').XastChild} XastChild
- * @typedef {import('../lib/types').XastElement} XastElement
+ * @typedef {import("../lib/types.js").PathDataItem} PathDataItem
+ * @typedef {import('../lib/types.js').XastChild} XastChild
+ * @typedef {import('../lib/types.js').XastElement} XastElement
  */
 
-const { collectStylesheet, computeStyle } = require('../lib/style.js');
-const { path2js, js2path, intersects } = require('./_path.js');
+import { collectStylesheet, computeStyle } from '../lib/style.js';
+import { path2js, js2path, intersects } from './_path.js';
 
-exports.name = 'mergePaths';
-exports.description = 'merges multiple paths in one if possible';
+export const name = 'mergePaths';
+export const description = 'merges multiple paths in one if possible';
 
 /**
  * Merge multiple Paths into one.
  *
  * @author Kir Belevich, Lev Solntsev
  *
- * @type {import('./plugins-types').Plugin<'mergePaths'>}
+ * @type {import('./plugins-types.js').Plugin<'mergePaths'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const {
     force = false,
     floatPrecision,
diff --git a/plugins/mergeStyles.js b/plugins/mergeStyles.js
index 764d0194c..ec094b12d 100644
--- a/plugins/mergeStyles.js
+++ b/plugins/mergeStyles.js
@@ -1,23 +1,21 @@
-'use strict';
+import { visitSkip, detachNodeFromParent } from '../lib/xast.js';
 
 /**
- * @typedef {import('../lib/types').XastElement} XastElement
- * @typedef {import('../lib/types').XastChild} XastChild
+ * @typedef {import('../lib/types.js').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastChild} XastChild
  */
 
-const { visitSkip, detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'mergeStyles';
-exports.description = 'merge multiple style elements into one';
+export const name = 'mergeStyles';
+export const description = 'merge multiple style elements into one';
 
 /**
  * Merge multiple style elements into one.
  *
  * @author strarsis <strarsis@gmail.com>
  *
- * @type {import('./plugins-types').Plugin<'mergeStyles'>}
+ * @type {import('./plugins-types.js').Plugin<'mergeStyles'>}
  */
-exports.fn = () => {
+export const fn = () => {
   /**
    * @type {?XastElement}
    */
diff --git a/plugins/minifyStyles.js b/plugins/minifyStyles.js
index ade441b3b..ce200978d 100644
--- a/plugins/minifyStyles.js
+++ b/plugins/minifyStyles.js
@@ -1,24 +1,22 @@
-'use strict';
-
 /**
- * @typedef {import('../lib/types').XastElement} XastElement
- * @typedef {import('../lib/types').XastParent} XastParent
+ * @typedef {import('../lib/types.js').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastParent} XastParent
  */
 
-const csso = require('csso');
-const { detachNodeFromParent } = require('../lib/xast');
-const { hasScripts } = require('../lib/svgo/tools');
+import * as csso from 'csso';
+import { detachNodeFromParent } from '../lib/xast.js';
+import { hasScripts } from '../lib/svgo/tools.js';
 
-exports.name = 'minifyStyles';
-exports.description = 'minifies styles and removes unused styles';
+export const name = 'minifyStyles';
+export const description = 'minifies styles and removes unused styles';
 
 /**
  * Minifies styles (<style> element + style attribute) using CSSO.
  *
  * @author strarsis <strarsis@gmail.com>
- * @type {import('./plugins-types').Plugin<'minifyStyles'>}
+ * @type {import('./plugins-types.js').Plugin<'minifyStyles'>}
  */
-exports.fn = (_root, { usage, ...params }) => {
+export const fn = (_root, { usage, ...params }) => {
   /** @type {Map<XastElement, XastParent>} */
   const styleElements = new Map();
 
diff --git a/plugins/moveElemsAttrsToGroup.js b/plugins/moveElemsAttrsToGroup.js
index 633f44396..96fa6f8a0 100644
--- a/plugins/moveElemsAttrsToGroup.js
+++ b/plugins/moveElemsAttrsToGroup.js
@@ -1,10 +1,9 @@
-'use strict';
+import { visit } from '../lib/xast.js';
+import { inheritableAttrs, pathElems } from './_collections.js';
 
-const { visit } = require('../lib/xast.js');
-const { inheritableAttrs, pathElems } = require('./_collections.js');
-
-exports.name = 'moveElemsAttrsToGroup';
-exports.description = 'Move common attributes of group children to the group';
+export const name = 'moveElemsAttrsToGroup';
+export const description =
+  'Move common attributes of group children to the group';
 
 /**
  * Move common attributes of group children to the group
@@ -26,9 +25,9 @@ exports.description = 'Move common attributes of group children to the group';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'moveElemsAttrsToGroup'>}
+ * @type {import('./plugins-types.js').Plugin<'moveElemsAttrsToGroup'>}
  */
-exports.fn = (root) => {
+export const fn = (root) => {
   // find if any style element is present
   let deoptimizedWithStyles = false;
   visit(root, {
diff --git a/plugins/moveGroupAttrsToElems.js b/plugins/moveGroupAttrsToElems.js
index 450fb2654..7b5457e1a 100644
--- a/plugins/moveGroupAttrsToElems.js
+++ b/plugins/moveGroupAttrsToElems.js
@@ -1,10 +1,9 @@
-'use strict';
+import { pathElems, referencesProps } from './_collections.js';
+import { includesUrlReference } from '../lib/svgo/tools.js';
 
-const { pathElems, referencesProps } = require('./_collections.js');
-const { includesUrlReference } = require('../lib/svgo/tools.js');
-
-exports.name = 'moveGroupAttrsToElems';
-exports.description = 'moves some group attributes to the content elements';
+export const name = 'moveGroupAttrsToElems';
+export const description =
+  'moves some group attributes to the content elements';
 
 const pathElemsWithGroupsAndText = [...pathElems, 'g', 'text'];
 
@@ -24,9 +23,9 @@ const pathElemsWithGroupsAndText = [...pathElems, 'g', 'text'];
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'moveGroupAttrsToElems'>}
+ * @type {import('./plugins-types.js').Plugin<'moveGroupAttrsToElems'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node) => {
diff --git a/plugins/plugins-types.d.ts b/plugins/plugins-types.d.ts
index e94e71378..71a4a1286 100644
--- a/plugins/plugins-types.d.ts
+++ b/plugins/plugins-types.d.ts
@@ -2,7 +2,7 @@ import type {
   Plugin as PluginDef,
   PluginInfo,
   XastElement,
-} from '../lib/types';
+} from '../lib/types.js';
 
 type DefaultPlugins = {
   cleanupAttrs: {
diff --git a/plugins/prefixIds.js b/plugins/prefixIds.js
index ec305c6b0..90f348031 100644
--- a/plugins/prefixIds.js
+++ b/plugins/prefixIds.js
@@ -1,15 +1,13 @@
-'use strict';
+import * as csstree from 'css-tree';
+import { referencesProps } from './_collections.js';
 
 /**
  * @typedef {import('../lib/types.js').PluginInfo} PluginInfo
- * @typedef {import('../lib/types').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastElement} XastElement
  */
 
-const csstree = require('css-tree');
-const { referencesProps } = require('./_collections.js');
-
-exports.name = 'prefixIds';
-exports.description = 'prefix IDs';
+export const name = 'prefixIds';
+export const description = 'prefix IDs';
 
 /**
  * extract basename from path
@@ -118,9 +116,9 @@ const generatePrefix = (body, node, info, prefixGenerator, delim, history) => {
  * Prefixes identifiers
  *
  * @author strarsis <strarsis@gmail.com>
- * @type {import('./plugins-types').Plugin<'prefixIds'>}
+ * @type {import('./plugins-types.js').Plugin<'prefixIds'>}
  */
-exports.fn = (_root, params, info) => {
+export const fn = (_root, params, info) => {
   const {
     delim = '__',
     prefix,
diff --git a/plugins/preset-default.js b/plugins/preset-default.js
index 86516fd72..a6742b13e 100644
--- a/plugins/preset-default.js
+++ b/plugins/preset-default.js
@@ -1,42 +1,39 @@
-'use strict';
-
-const { createPreset } = require('../lib/svgo/plugins.js');
-
-const removeDoctype = require('./removeDoctype.js');
-const removeXMLProcInst = require('./removeXMLProcInst.js');
-const removeComments = require('./removeComments.js');
-const removeMetadata = require('./removeMetadata.js');
-const removeEditorsNSData = require('./removeEditorsNSData.js');
-const cleanupAttrs = require('./cleanupAttrs.js');
-const mergeStyles = require('./mergeStyles.js');
-const inlineStyles = require('./inlineStyles.js');
-const minifyStyles = require('./minifyStyles.js');
-const cleanupIds = require('./cleanupIds.js');
-const removeUselessDefs = require('./removeUselessDefs.js');
-const cleanupNumericValues = require('./cleanupNumericValues.js');
-const convertColors = require('./convertColors.js');
-const removeUnknownsAndDefaults = require('./removeUnknownsAndDefaults.js');
-const removeNonInheritableGroupAttrs = require('./removeNonInheritableGroupAttrs.js');
-const removeUselessStrokeAndFill = require('./removeUselessStrokeAndFill.js');
-const removeViewBox = require('./removeViewBox.js');
-const cleanupEnableBackground = require('./cleanupEnableBackground.js');
-const removeHiddenElems = require('./removeHiddenElems.js');
-const removeEmptyText = require('./removeEmptyText.js');
-const convertShapeToPath = require('./convertShapeToPath.js');
-const convertEllipseToCircle = require('./convertEllipseToCircle.js');
-const moveElemsAttrsToGroup = require('./moveElemsAttrsToGroup.js');
-const moveGroupAttrsToElems = require('./moveGroupAttrsToElems.js');
-const collapseGroups = require('./collapseGroups.js');
-const convertPathData = require('./convertPathData.js');
-const convertTransform = require('./convertTransform.js');
-const removeEmptyAttrs = require('./removeEmptyAttrs.js');
-const removeEmptyContainers = require('./removeEmptyContainers.js');
-const mergePaths = require('./mergePaths.js');
-const removeUnusedNS = require('./removeUnusedNS.js');
-const sortAttrs = require('./sortAttrs.js');
-const sortDefsChildren = require('./sortDefsChildren.js');
-const removeTitle = require('./removeTitle.js');
-const removeDesc = require('./removeDesc.js');
+import { createPreset } from '../lib/svgo/plugins.js';
+import * as removeDoctype from './removeDoctype.js';
+import * as removeXMLProcInst from './removeXMLProcInst.js';
+import * as removeComments from './removeComments.js';
+import * as removeMetadata from './removeMetadata.js';
+import * as removeEditorsNSData from './removeEditorsNSData.js';
+import * as cleanupAttrs from './cleanupAttrs.js';
+import * as mergeStyles from './mergeStyles.js';
+import * as inlineStyles from './inlineStyles.js';
+import * as minifyStyles from './minifyStyles.js';
+import * as cleanupIds from './cleanupIds.js';
+import * as removeUselessDefs from './removeUselessDefs.js';
+import * as cleanupNumericValues from './cleanupNumericValues.js';
+import * as convertColors from './convertColors.js';
+import * as removeUnknownsAndDefaults from './removeUnknownsAndDefaults.js';
+import * as removeNonInheritableGroupAttrs from './removeNonInheritableGroupAttrs.js';
+import * as removeUselessStrokeAndFill from './removeUselessStrokeAndFill.js';
+import * as removeViewBox from './removeViewBox.js';
+import * as cleanupEnableBackground from './cleanupEnableBackground.js';
+import * as removeHiddenElems from './removeHiddenElems.js';
+import * as removeEmptyText from './removeEmptyText.js';
+import * as convertShapeToPath from './convertShapeToPath.js';
+import * as convertEllipseToCircle from './convertEllipseToCircle.js';
+import * as moveElemsAttrsToGroup from './moveElemsAttrsToGroup.js';
+import * as moveGroupAttrsToElems from './moveGroupAttrsToElems.js';
+import * as collapseGroups from './collapseGroups.js';
+import * as convertPathData from './convertPathData.js';
+import * as convertTransform from './convertTransform.js';
+import * as removeEmptyAttrs from './removeEmptyAttrs.js';
+import * as removeEmptyContainers from './removeEmptyContainers.js';
+import * as mergePaths from './mergePaths.js';
+import * as removeUnusedNS from './removeUnusedNS.js';
+import * as sortAttrs from './sortAttrs.js';
+import * as sortDefsChildren from './sortDefsChildren.js';
+import * as removeTitle from './removeTitle.js';
+import * as removeDesc from './removeDesc.js';
 
 const presetDefault = createPreset({
   name: 'preset-default',
@@ -79,4 +76,4 @@ const presetDefault = createPreset({
   ],
 });
 
-module.exports = presetDefault;
+export default presetDefault;
diff --git a/plugins/removeAttributesBySelector.js b/plugins/removeAttributesBySelector.js
index 12630c2a0..126eba468 100644
--- a/plugins/removeAttributesBySelector.js
+++ b/plugins/removeAttributesBySelector.js
@@ -1,9 +1,7 @@
-'use strict';
+import { querySelectorAll } from '../lib/xast.js';
 
-const { querySelectorAll } = require('../lib/xast.js');
-
-exports.name = 'removeAttributesBySelector';
-exports.description =
+export const name = 'removeAttributesBySelector';
+export const description =
   'removes attributes of elements that match a css selector';
 
 /**
@@ -73,9 +71,9 @@ exports.description =
  *
  * @author Bradley Mease
  *
- * @type {import('./plugins-types').Plugin<'removeAttributesBySelector'>}
+ * @type {import('./plugins-types.js').Plugin<'removeAttributesBySelector'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const selectors = Array.isArray(params.selectors)
     ? params.selectors
     : [params];
diff --git a/plugins/removeAttrs.js b/plugins/removeAttrs.js
index dc1224bd3..48b3d76cf 100644
--- a/plugins/removeAttrs.js
+++ b/plugins/removeAttrs.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'removeAttrs';
-exports.description = 'removes specified attributes';
+export const name = 'removeAttrs';
+export const description = 'removes specified attributes';
 
 const DEFAULT_SEPARATOR = ':';
 const ENOATTRS = `Warning: The plugin "removeAttrs" requires the "attrs" parameter.
@@ -81,9 +79,9 @@ plugins: [
  *
  * @author Benny Schudel
  *
- * @type {import('./plugins-types').Plugin<'removeAttrs'>}
+ * @type {import('./plugins-types.js').Plugin<'removeAttrs'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   if (typeof params.attrs == 'undefined') {
     console.warn(ENOATTRS);
     return null;
diff --git a/plugins/removeComments.js b/plugins/removeComments.js
index 46a32590f..2b3ba76ea 100644
--- a/plugins/removeComments.js
+++ b/plugins/removeComments.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeComments';
-exports.description = 'removes comments';
+export const name = 'removeComments';
+export const description = 'removes comments';
 
 /**
  * If a comment matches one of the following patterns, it will be
@@ -20,9 +18,9 @@ const DEFAULT_PRESERVE_PATTERNS = [/^!/];
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeComments'>}
+ * @type {import('./plugins-types.js').Plugin<'removeComments'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   const { preservePatterns = DEFAULT_PRESERVE_PATTERNS } = params;
 
   return {
diff --git a/plugins/removeDesc.js b/plugins/removeDesc.js
index f766350ea..84efa0403 100644
--- a/plugins/removeDesc.js
+++ b/plugins/removeDesc.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeDesc';
-exports.description = 'removes <desc>';
+export const name = 'removeDesc';
+export const description = 'removes <desc>';
 
 const standardDescs = /^(Created with|Created using)/;
 
@@ -16,9 +14,9 @@ const standardDescs = /^(Created with|Created using)/;
  *
  * @author Daniel Wabyick
  *
- * @type {import('./plugins-types').Plugin<'removeDesc'>}
+ * @type {import('./plugins-types.js').Plugin<'removeDesc'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const { removeAny = false } = params;
   return {
     element: {
diff --git a/plugins/removeDimensions.js b/plugins/removeDimensions.js
index 4f4f39840..d98f5dd44 100644
--- a/plugins/removeDimensions.js
+++ b/plugins/removeDimensions.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'removeDimensions';
-exports.description =
+export const name = 'removeDimensions';
+export const description =
   'removes width and height in presence of viewBox (opposite to removeViewBox, disable it first)';
 
 /**
@@ -14,9 +12,9 @@ exports.description =
  *
  * @author Benny Schudel
  *
- * @type {import('./plugins-types').Plugin<'removeDimensions'>}
+ * @type {import('./plugins-types.js').Plugin<'removeDimensions'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node) => {
diff --git a/plugins/removeDoctype.js b/plugins/removeDoctype.js
index cbdcd013a..0f1d7ca58 100644
--- a/plugins/removeDoctype.js
+++ b/plugins/removeDoctype.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeDoctype';
-exports.description = 'removes doctype declaration';
+export const name = 'removeDoctype';
+export const description = 'removes doctype declaration';
 
 /**
  * Remove DOCTYPE declaration.
@@ -27,9 +25,9 @@ exports.description = 'removes doctype declaration';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeDoctype'>}
+ * @type {import('./plugins-types.js').Plugin<'removeDoctype'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     doctype: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeEditorsNSData.js b/plugins/removeEditorsNSData.js
index 852681bf8..986bddabe 100644
--- a/plugins/removeEditorsNSData.js
+++ b/plugins/removeEditorsNSData.js
@@ -1,10 +1,9 @@
-'use strict';
+import { editorNamespaces } from './_collections.js';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-const { editorNamespaces } = require('./_collections.js');
-
-exports.name = 'removeEditorsNSData';
-exports.description = 'removes editors namespaces, elements and attributes';
+export const name = 'removeEditorsNSData';
+export const description =
+  'removes editors namespaces, elements and attributes';
 
 /**
  * Remove editors namespaces, elements and attributes.
@@ -16,9 +15,9 @@ exports.description = 'removes editors namespaces, elements and attributes';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeEditorsNSData'>}
+ * @type {import('./plugins-types.js').Plugin<'removeEditorsNSData'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   let namespaces = [...editorNamespaces];
   if (Array.isArray(params.additionalNamespaces)) {
     namespaces = [...editorNamespaces, ...params.additionalNamespaces];
diff --git a/plugins/removeElementsByAttr.js b/plugins/removeElementsByAttr.js
index 9c9915f05..2c55e74a1 100644
--- a/plugins/removeElementsByAttr.js
+++ b/plugins/removeElementsByAttr.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeElementsByAttr';
-exports.description =
+export const name = 'removeElementsByAttr';
+export const description =
   'removes arbitrary elements by ID or className (disabled by default)';
 
 /**
@@ -37,9 +35,9 @@ exports.description =
  *
  * @author Eli Dupuis (@elidupuis)
  *
- * @type {import('./plugins-types').Plugin<'removeElementsByAttr'>}
+ * @type {import('./plugins-types.js').Plugin<'removeElementsByAttr'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const ids =
     params.id == null ? [] : Array.isArray(params.id) ? params.id : [params.id];
   const classes =
diff --git a/plugins/removeEmptyAttrs.js b/plugins/removeEmptyAttrs.js
index 194d27b81..398669336 100644
--- a/plugins/removeEmptyAttrs.js
+++ b/plugins/removeEmptyAttrs.js
@@ -1,18 +1,16 @@
-'use strict';
+import { attrsGroups } from './_collections.js';
 
-const { attrsGroups } = require('./_collections.js');
-
-exports.name = 'removeEmptyAttrs';
-exports.description = 'removes empty attributes';
+export const name = 'removeEmptyAttrs';
+export const description = 'removes empty attributes';
 
 /**
  * Remove attributes with empty values.
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeEmptyAttrs'>}
+ * @type {import('./plugins-types.js').Plugin<'removeEmptyAttrs'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node) => {
diff --git a/plugins/removeEmptyContainers.js b/plugins/removeEmptyContainers.js
index 039073449..cb4ce0c0f 100644
--- a/plugins/removeEmptyContainers.js
+++ b/plugins/removeEmptyContainers.js
@@ -1,10 +1,8 @@
-'use strict';
+import { elemsGroups } from './_collections.js';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-const { elemsGroups } = require('./_collections.js');
-
-exports.name = 'removeEmptyContainers';
-exports.description = 'removes empty container elements';
+export const name = 'removeEmptyContainers';
+export const description = 'removes empty container elements';
 
 /**
  * Remove empty containers.
@@ -19,9 +17,9 @@ exports.description = 'removes empty container elements';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeEmptyContainers'>}
+ * @type {import('./plugins-types.js').Plugin<'removeEmptyContainers'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       exit: (node, parentNode) => {
diff --git a/plugins/removeEmptyText.js b/plugins/removeEmptyText.js
index 5f6db3d37..57d72aac5 100644
--- a/plugins/removeEmptyText.js
+++ b/plugins/removeEmptyText.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeEmptyText';
-exports.description = 'removes empty <text> elements';
+export const name = 'removeEmptyText';
+export const description = 'removes empty <text> elements';
 
 /**
  * Remove empty Text elements.
@@ -22,9 +20,9 @@ exports.description = 'removes empty <text> elements';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeEmptyText'>}
+ * @type {import('./plugins-types.js').Plugin<'removeEmptyText'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const { text = true, tspan = true, tref = true } = params;
   return {
     element: {
diff --git a/plugins/removeHiddenElems.js b/plugins/removeHiddenElems.js
index 75720a068..9713d5c52 100644
--- a/plugins/removeHiddenElems.js
+++ b/plugins/removeHiddenElems.js
@@ -1,26 +1,24 @@
-'use strict';
-
 /**
- * @typedef {import('../lib/types').XastChild} XastChild
- * @typedef {import('../lib/types').XastElement} XastElement
- * @typedef {import('../lib/types').XastParent} XastParent
+ * @typedef {import('../lib/types.js').XastChild} XastChild
+ * @typedef {import('../lib/types.js').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastParent} XastParent
  */
 
-const { elemsGroups } = require('./_collections.js');
-const {
+import { elemsGroups } from './_collections.js';
+import {
   visit,
   visitSkip,
   querySelector,
   detachNodeFromParent,
-} = require('../lib/xast.js');
-const { collectStylesheet, computeStyle } = require('../lib/style.js');
-const { parsePathData } = require('../lib/path.js');
-const { hasScripts, findReferences } = require('../lib/svgo/tools.js');
+} from '../lib/xast.js';
+import { collectStylesheet, computeStyle } from '../lib/style.js';
+import { parsePathData } from '../lib/path.js';
+import { hasScripts, findReferences } from '../lib/svgo/tools.js';
 
 const nonRendering = elemsGroups.nonRendering;
 
-exports.name = 'removeHiddenElems';
-exports.description =
+export const name = 'removeHiddenElems';
+export const description =
   'removes hidden elements (zero sized, with absent attributes)';
 
 /**
@@ -38,9 +36,9 @@ exports.description =
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeHiddenElems'>}
+ * @type {import('./plugins-types.js').Plugin<'removeHiddenElems'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const {
     isHidden = true,
     displayNone = true,
diff --git a/plugins/removeMetadata.js b/plugins/removeMetadata.js
index 8c9de27e5..6f61c6d57 100644
--- a/plugins/removeMetadata.js
+++ b/plugins/removeMetadata.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeMetadata';
-exports.description = 'removes <metadata>';
+export const name = 'removeMetadata';
+export const description = 'removes <metadata>';
 
 /**
  * Remove <metadata>.
@@ -12,9 +10,9 @@ exports.description = 'removes <metadata>';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeMetadata'>}
+ * @type {import('./plugins-types.js').Plugin<'removeMetadata'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeNonInheritableGroupAttrs.js b/plugins/removeNonInheritableGroupAttrs.js
index 73e6bcdad..99a1e2f3c 100644
--- a/plugins/removeNonInheritableGroupAttrs.js
+++ b/plugins/removeNonInheritableGroupAttrs.js
@@ -1,13 +1,11 @@
-'use strict';
-
-const {
+import {
   inheritableAttrs,
   attrsGroups,
   presentationNonInheritableGroupAttrs,
-} = require('./_collections');
+} from './_collections.js';
 
-exports.name = 'removeNonInheritableGroupAttrs';
-exports.description =
+export const name = 'removeNonInheritableGroupAttrs';
+export const description =
   'removes non-inheritable group’s presentational attributes';
 
 /**
@@ -15,9 +13,9 @@ exports.description =
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeNonInheritableGroupAttrs'>}
+ * @type {import('./plugins-types.js').Plugin<'removeNonInheritableGroupAttrs'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node) => {
diff --git a/plugins/removeOffCanvasPaths.js b/plugins/removeOffCanvasPaths.js
index 60a69fb1a..45fa5d049 100644
--- a/plugins/removeOffCanvasPaths.js
+++ b/plugins/removeOffCanvasPaths.js
@@ -1,15 +1,13 @@
-'use strict';
-
 /**
- * @typedef {import('../lib/types').PathDataItem} PathDataItem
+ * @typedef {import('../lib/types.js').PathDataItem} PathDataItem
  */
 
-const { visitSkip, detachNodeFromParent } = require('../lib/xast.js');
-const { parsePathData } = require('../lib/path.js');
-const { intersects } = require('./_path.js');
+import { visitSkip, detachNodeFromParent } from '../lib/xast.js';
+import { parsePathData } from '../lib/path.js';
+import { intersects } from './_path.js';
 
-exports.name = 'removeOffCanvasPaths';
-exports.description =
+export const name = 'removeOffCanvasPaths';
+export const description =
   'removes elements that are drawn outside of the viewbox (disabled by default)';
 
 /**
@@ -17,9 +15,9 @@ exports.description =
  *
  * @author JoshyPHP
  *
- * @type {import('./plugins-types').Plugin<'removeOffCanvasPaths'>}
+ * @type {import('./plugins-types.js').Plugin<'removeOffCanvasPaths'>}
  */
-exports.fn = () => {
+export const fn = () => {
   /**
    * @type {?{
    *   top: number,
diff --git a/plugins/removeRasterImages.js b/plugins/removeRasterImages.js
index 1a4a4a12e..604f5b5f5 100644
--- a/plugins/removeRasterImages.js
+++ b/plugins/removeRasterImages.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeRasterImages';
-exports.description = 'removes raster images (disabled by default)';
+export const name = 'removeRasterImages';
+export const description = 'removes raster images (disabled by default)';
 
 /**
  * Remove raster images references in <image>.
@@ -12,9 +10,9 @@ exports.description = 'removes raster images (disabled by default)';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeRasterImages'>}
+ * @type {import('./plugins-types.js').Plugin<'removeRasterImages'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeScriptElement.js b/plugins/removeScriptElement.js
index 80fcea3b6..7d34ec01a 100644
--- a/plugins/removeScriptElement.js
+++ b/plugins/removeScriptElement.js
@@ -1,10 +1,8 @@
-'use strict';
+import { attrsGroups } from './_collections.js';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-const { attrsGroups } = require('./_collections.js');
-
-exports.name = 'removeScriptElement';
-exports.description = 'removes scripts (disabled by default)';
+export const name = 'removeScriptElement';
+export const description = 'removes scripts (disabled by default)';
 
 /** Union of all event attributes. */
 const eventAttrs = [
@@ -21,9 +19,9 @@ const eventAttrs = [
  * https://www.w3.org/TR/SVG11/script.html
  *
  * @author Patrick Klingemann
- * @type {import('./plugins-types').Plugin<'removeScriptElement'>}
+ * @type {import('./plugins-types.js').Plugin<'removeScriptElement'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeStyleElement.js b/plugins/removeStyleElement.js
index d869a50ac..37b00f4ff 100644
--- a/plugins/removeStyleElement.js
+++ b/plugins/removeStyleElement.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeStyleElement';
-exports.description = 'removes <style> element (disabled by default)';
+export const name = 'removeStyleElement';
+export const description = 'removes <style> element (disabled by default)';
 
 /**
  * Remove <style>.
@@ -12,9 +10,9 @@ exports.description = 'removes <style> element (disabled by default)';
  *
  * @author Betsy Dupuis
  *
- * @type {import('./plugins-types').Plugin<'removeStyleElement'>}
+ * @type {import('./plugins-types.js').Plugin<'removeStyleElement'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeTitle.js b/plugins/removeTitle.js
index 906dd3c20..add56a9b8 100644
--- a/plugins/removeTitle.js
+++ b/plugins/removeTitle.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeTitle';
-exports.description = 'removes <title>';
+export const name = 'removeTitle';
+export const description = 'removes <title>';
 
 /**
  * Remove <title>.
@@ -12,9 +10,9 @@ exports.description = 'removes <title>';
  *
  * @author Igor Kalashnikov
  *
- * @type {import('./plugins-types').Plugin<'removeTitle'>}
+ * @type {import('./plugins-types.js').Plugin<'removeTitle'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeUnknownsAndDefaults.js b/plugins/removeUnknownsAndDefaults.js
index e76e4e5fe..bcde52d82 100644
--- a/plugins/removeUnknownsAndDefaults.js
+++ b/plugins/removeUnknownsAndDefaults.js
@@ -1,17 +1,15 @@
-'use strict';
-
-const { visitSkip, detachNodeFromParent } = require('../lib/xast.js');
-const { collectStylesheet, computeStyle } = require('../lib/style.js');
-const {
+import {
   elems,
   attrsGroups,
   elemsGroups,
   attrsGroupsDefaults,
   presentationNonInheritableGroupAttrs,
-} = require('./_collections');
+} from './_collections.js';
+import { visitSkip, detachNodeFromParent } from '../lib/xast.js';
+import { collectStylesheet, computeStyle } from '../lib/style.js';
 
-exports.name = 'removeUnknownsAndDefaults';
-exports.description =
+export const name = 'removeUnknownsAndDefaults';
+export const description =
   'removes unknown elements content and attributes, removes attrs with default values';
 
 // resolve all groups references
@@ -92,9 +90,9 @@ for (const [name, config] of Object.entries(elems)) {
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeUnknownsAndDefaults'>}
+ * @type {import('./plugins-types.js').Plugin<'removeUnknownsAndDefaults'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const {
     unknownContent = true,
     unknownAttrs = true,
diff --git a/plugins/removeUnusedNS.js b/plugins/removeUnusedNS.js
index ac81eeaf4..5781cfc9c 100644
--- a/plugins/removeUnusedNS.js
+++ b/plugins/removeUnusedNS.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'removeUnusedNS';
-exports.description = 'removes unused namespaces declaration';
+export const name = 'removeUnusedNS';
+export const description = 'removes unused namespaces declaration';
 
 /**
  * Remove unused namespaces declaration from svg element
@@ -9,9 +7,9 @@ exports.description = 'removes unused namespaces declaration';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeUnusedNS'>}
+ * @type {import('./plugins-types.js').Plugin<'removeUnusedNS'>}
  */
-exports.fn = () => {
+export const fn = () => {
   /**
    * @type {Set<string>}
    */
diff --git a/plugins/removeUselessDefs.js b/plugins/removeUselessDefs.js
index 5d19810e3..bde64c39b 100644
--- a/plugins/removeUselessDefs.js
+++ b/plugins/removeUselessDefs.js
@@ -1,23 +1,21 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
+import { elemsGroups } from './_collections.js';
 
 /**
- * @typedef {import('../lib/types').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastElement} XastElement
  */
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-const { elemsGroups } = require('./_collections.js');
-
-exports.name = 'removeUselessDefs';
-exports.description = 'removes elements in <defs> without id';
+export const name = 'removeUselessDefs';
+export const description = 'removes elements in <defs> without id';
 
 /**
  * Removes content of defs and properties that aren't rendered directly without ids.
  *
  * @author Lev Solntsev
  *
- * @type {import('./plugins-types').Plugin<'removeUselessDefs'>}
+ * @type {import('./plugins-types.js').Plugin<'removeUselessDefs'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeUselessStrokeAndFill.js b/plugins/removeUselessStrokeAndFill.js
index 95193fa63..d62c3cc2c 100644
--- a/plugins/removeUselessStrokeAndFill.js
+++ b/plugins/removeUselessStrokeAndFill.js
@@ -1,21 +1,19 @@
-'use strict';
+import { visit, visitSkip, detachNodeFromParent } from '../lib/xast.js';
+import { collectStylesheet, computeStyle } from '../lib/style.js';
+import { hasScripts } from '../lib/svgo/tools.js';
+import { elemsGroups } from './_collections.js';
 
-const { visit, visitSkip, detachNodeFromParent } = require('../lib/xast.js');
-const { collectStylesheet, computeStyle } = require('../lib/style.js');
-const { hasScripts } = require('../lib/svgo/tools.js');
-const { elemsGroups } = require('./_collections.js');
-
-exports.name = 'removeUselessStrokeAndFill';
-exports.description = 'removes useless stroke and fill attributes';
+export const name = 'removeUselessStrokeAndFill';
+export const description = 'removes useless stroke and fill attributes';
 
 /**
  * Remove useless stroke and fill attrs.
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeUselessStrokeAndFill'>}
+ * @type {import('./plugins-types.js').Plugin<'removeUselessStrokeAndFill'>}
  */
-exports.fn = (root, params) => {
+export const fn = (root, params) => {
   const {
     stroke: removeStroke = true,
     fill: removeFill = true,
diff --git a/plugins/removeViewBox.js b/plugins/removeViewBox.js
index c0f23de26..cee52c47b 100644
--- a/plugins/removeViewBox.js
+++ b/plugins/removeViewBox.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'removeViewBox';
-exports.description = 'removes viewBox attribute when possible';
+export const name = 'removeViewBox';
+export const description = 'removes viewBox attribute when possible';
 
 const viewBoxElems = new Set(['pattern', 'svg', 'symbol']);
 
@@ -17,9 +15,9 @@ const viewBoxElems = new Set(['pattern', 'svg', 'symbol']);
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeViewBox'>}
+ * @type {import('./plugins-types.js').Plugin<'removeViewBox'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeXMLNS.js b/plugins/removeXMLNS.js
index b7ec69a12..79a3af8f0 100644
--- a/plugins/removeXMLNS.js
+++ b/plugins/removeXMLNS.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'removeXMLNS';
-exports.description =
+export const name = 'removeXMLNS';
+export const description =
   'removes xmlns attribute (for inline svg, disabled by default)';
 
 /**
@@ -14,9 +12,9 @@ exports.description =
  *
  * @author Ricardo Tomasi
  *
- * @type {import('./plugins-types').Plugin<'removeXMLNS'>}
+ * @type {import('./plugins-types.js').Plugin<'removeXMLNS'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node) => {
diff --git a/plugins/removeXMLProcInst.js b/plugins/removeXMLProcInst.js
index 73ec2335e..e8f0b2392 100644
--- a/plugins/removeXMLProcInst.js
+++ b/plugins/removeXMLProcInst.js
@@ -1,9 +1,7 @@
-'use strict';
+import { detachNodeFromParent } from '../lib/xast.js';
 
-const { detachNodeFromParent } = require('../lib/xast.js');
-
-exports.name = 'removeXMLProcInst';
-exports.description = 'removes XML processing instructions';
+export const name = 'removeXMLProcInst';
+export const description = 'removes XML processing instructions';
 
 /**
  * Remove XML Processing Instruction.
@@ -13,9 +11,9 @@ exports.description = 'removes XML processing instructions';
  *
  * @author Kir Belevich
  *
- * @type {import('./plugins-types').Plugin<'removeXMLProcInst'>}
+ * @type {import('./plugins-types.js').Plugin<'removeXMLProcInst'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     instruction: {
       enter: (node, parentNode) => {
diff --git a/plugins/removeXlink.js b/plugins/removeXlink.js
index 0411cc145..7ac960ea2 100644
--- a/plugins/removeXlink.js
+++ b/plugins/removeXlink.js
@@ -1,13 +1,11 @@
-'use strict';
-
-const { elems } = require('./_collections');
+import { elems } from './_collections.js';
 
 /**
- * @typedef {import('../lib/types').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastElement} XastElement
  */
 
-exports.name = 'removeXlink';
-exports.description =
+export const name = 'removeXlink';
+export const description =
   'remove xlink namespace and replaces attributes with the SVG 2 equivalent where applicable';
 
 /** URI indicating the Xlink namespace. */
@@ -58,10 +56,10 @@ const findPrefixedAttrs = (node, prefixes, attr) => {
  *
  * The XLink namespace is deprecated in SVG 2.
  *
- * @type {import('./plugins-types').Plugin<'removeXlink'>}
+ * @type {import('./plugins-types.js').Plugin<'removeXlink'>}
  * @see https://developer.mozilla.org/docs/Web/SVG/Attribute/xlink:href
  */
-exports.fn = (_, params) => {
+export const fn = (_, params) => {
   const { includeLegacy } = params;
 
   /**
diff --git a/plugins/reusePaths.js b/plugins/reusePaths.js
index 8c2ddf0d3..8842a3a5b 100644
--- a/plugins/reusePaths.js
+++ b/plugins/reusePaths.js
@@ -1,16 +1,14 @@
-'use strict';
-
-const { collectStylesheet } = require('../lib/style');
-const { detachNodeFromParent, querySelectorAll } = require('../lib/xast');
+import { collectStylesheet } from '../lib/style.js';
+import { detachNodeFromParent, querySelectorAll } from '../lib/xast.js';
 
 /**
- * @typedef {import('../lib/types').XastElement} XastElement
- * @typedef {import('../lib/types').XastParent} XastParent
- * @typedef {import('../lib/types').XastNode} XastNode
+ * @typedef {import('../lib/types.js').XastElement} XastElement
+ * @typedef {import('../lib/types.js').XastParent} XastParent
+ * @typedef {import('../lib/types.js').XastNode} XastNode
  */
 
-exports.name = 'reusePaths';
-exports.description =
+export const name = 'reusePaths';
+export const description =
   'Finds <path> elements with the same d, fill, and ' +
   'stroke, and converts them to <use> elements ' +
   'referencing a single <path> def.';
@@ -21,9 +19,9 @@ exports.description =
  *
  * @author Jacob Howcroft
  *
- * @type {import('./plugins-types').Plugin<'reusePaths'>}
+ * @type {import('./plugins-types.js').Plugin<'reusePaths'>}
  */
-exports.fn = (root) => {
+export const fn = (root) => {
   const stylesheet = collectStylesheet(root);
 
   /**
diff --git a/plugins/sortAttrs.js b/plugins/sortAttrs.js
index 6347f65ed..37845747c 100644
--- a/plugins/sortAttrs.js
+++ b/plugins/sortAttrs.js
@@ -1,16 +1,14 @@
-'use strict';
-
-exports.name = 'sortAttrs';
-exports.description = 'Sort element attributes for better compression';
+export const name = 'sortAttrs';
+export const description = 'Sort element attributes for better compression';
 
 /**
  * Sort element attributes for better compression
  *
  * @author Nikolay Frantsev
  *
- * @type {import('./plugins-types').Plugin<'sortAttrs'>}
+ * @type {import('./plugins-types.js').Plugin<'sortAttrs'>}
  */
-exports.fn = (_root, params) => {
+export const fn = (_root, params) => {
   const {
     order = [
       'id',
diff --git a/plugins/sortDefsChildren.js b/plugins/sortDefsChildren.js
index 6ae5d4213..70b427600 100644
--- a/plugins/sortDefsChildren.js
+++ b/plugins/sortDefsChildren.js
@@ -1,7 +1,5 @@
-'use strict';
-
-exports.name = 'sortDefsChildren';
-exports.description = 'Sorts children of <defs> to improve compression';
+export const name = 'sortDefsChildren';
+export const description = 'Sorts children of <defs> to improve compression';
 
 /**
  * Sorts children of defs in order to improve compression.
@@ -9,9 +7,9 @@ exports.description = 'Sorts children of <defs> to improve compression';
  *
  * @author David Leston
  *
- * @type {import('./plugins-types').Plugin<'sortDefsChildren'>}
+ * @type {import('./plugins-types.js').Plugin<'sortDefsChildren'>}
  */
-exports.fn = () => {
+export const fn = () => {
   return {
     element: {
       enter: (node) => {
diff --git a/rollup.config.js b/rollup.config.js
index bda7ae4b1..a323d0592 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,25 +1,44 @@
+import path from 'path';
+import { fileURLToPath } from 'url';
+import * as fs from 'node:fs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
-import { terser } from 'rollup-plugin-terser';
+import terser from '@rollup/plugin-terser';
 
-export default {
-  input: './lib/svgo.js',
-  output: {
-    file: './dist/svgo.browser.js',
-    format: 'esm',
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const pkgPath = path.join(__dirname, './package.json');
+const PKG = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+
+export default [
+  {
+    input: './lib/svgo.js',
+    output: {
+      file: './dist/svgo-node.cjs',
+      format: 'cjs',
+    },
+    external: Object.keys(PKG.dependencies),
+    onwarn(warning) {
+      throw Error(warning.toString());
+    },
+    plugins: [terser()],
   },
-  onwarn(warning) {
-    throw Error(warning.toString());
+  {
+    input: './lib/svgo.js',
+    output: {
+      file: './dist/svgo.browser.js',
+      format: 'esm',
+    },
+    onwarn(warning) {
+      throw Error(warning.toString());
+    },
+    plugins: [
+      nodeResolve({ browser: true, preferBuiltins: false }),
+      commonjs(),
+      terser({
+        compress: false,
+        mangle: false,
+        format: { comments: false },
+      }),
+    ],
   },
-  plugins: [
-    nodeResolve({ browser: true, preferBuiltins: false }),
-    commonjs(),
-    // Whitespaces and comments removal makes the browser bundle lighter
-    // while retaining the ability to debug errors
-    terser({
-      compress: false,
-      mangle: false,
-      format: { comments: false },
-    }),
-  ],
-};
+];
diff --git a/test/browser.js b/test/browser.js
index ac120674b..3f9cfc444 100644
--- a/test/browser.js
+++ b/test/browser.js
@@ -1,7 +1,7 @@
-const assert = require('assert');
-const fs = require('node:fs/promises');
-const http = require('http');
-const { chromium } = require('playwright');
+import assert from 'assert';
+import fs from 'node:fs/promises';
+import http from 'http';
+import { chromium } from 'playwright';
 
 const fixture = `<svg xmlns="http://www.w3.org/2000/svg">
     <g attr1="val1">
diff --git a/test/cli/cli.test.js b/test/cli/cli.test.js
index ea4759015..a7e3e046d 100644
--- a/test/cli/cli.test.js
+++ b/test/cli/cli.test.js
@@ -1,12 +1,13 @@
-'use strict';
-
 /**
  * @typedef {import('child_process').ChildProcessWithoutNullStreams} ChildProcessWithoutNullStreams
  */
 
-const fs = require('fs');
-const path = require('path');
-const { spawn } = require('child_process');
+import fs from 'fs';
+import path from 'path';
+import { spawn } from 'child_process';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 /**
  * @type {(proc: ChildProcessWithoutNullStreams) => Promise<string>}
diff --git a/test/coa/_index.test.js b/test/coa/_index.test.js
index 4fbb7d1d1..73e3fc23f 100644
--- a/test/coa/_index.test.js
+++ b/test/coa/_index.test.js
@@ -1,10 +1,11 @@
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import del from 'del';
+import { Command } from 'commander';
+import { fileURLToPath } from 'url';
+import svgo, { checkIsDir } from '../../lib/svgo/coa.js';
 
-const fs = require('fs');
-const path = require('path');
-const del = require('del');
-const { Command } = require('commander');
-const svgo = require('../../lib/svgo/coa.js');
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const svgFolderPath = path.resolve(__dirname, 'testSvg');
 const svgFolderPathRecursively = path.resolve(__dirname, 'testSvgRecursively');
@@ -15,8 +16,6 @@ const svgFiles = [
 const tempFolder = 'temp';
 const noop = () => {};
 
-const { checkIsDir } = svgo;
-
 function runProgram(args) {
   const program = new Command();
   svgo(program);
diff --git a/test/fixtures/config-loader/invalid-array.js b/test/fixtures/config-loader/invalid-array.js
index e0a30c5df..d6d1738de 100644
--- a/test/fixtures/config-loader/invalid-array.js
+++ b/test/fixtures/config-loader/invalid-array.js
@@ -1 +1 @@
-module.exports = [];
+export default [];
diff --git a/test/fixtures/config-loader/invalid-null.js b/test/fixtures/config-loader/invalid-null.js
index b894a23a2..7646bbd17 100644
--- a/test/fixtures/config-loader/invalid-null.js
+++ b/test/fixtures/config-loader/invalid-null.js
@@ -1 +1 @@
-module.exports = null;
+export default null;
diff --git a/test/fixtures/config-loader/invalid-runtime.js b/test/fixtures/config-loader/invalid-runtime.js
index 5681a37bd..4a5f9c5b5 100644
--- a/test/fixtures/config-loader/invalid-runtime.js
+++ b/test/fixtures/config-loader/invalid-runtime.js
@@ -1 +1,2 @@
-module.exports = { plugins }; // eslint-disable-line no-undef
+/* eslint-disable no-undef */
+export default { plugins };
diff --git a/test/fixtures/config-loader/invalid-string.js b/test/fixtures/config-loader/invalid-string.js
index 9dc5fc1e4..08d725cd4 100644
--- a/test/fixtures/config-loader/invalid-string.js
+++ b/test/fixtures/config-loader/invalid-string.js
@@ -1 +1 @@
-module.exports = '';
+export default '';
diff --git a/test/fixtures/config-loader/module-not-found.js b/test/fixtures/config-loader/module-not-found.js
index aee6ede6c..91f7aa594 100644
--- a/test/fixtures/config-loader/module-not-found.js
+++ b/test/fixtures/config-loader/module-not-found.js
@@ -1,2 +1,2 @@
-require('unknown-module');
-module.exports = {};
+import 'unknown-module';
+export default {};
diff --git a/test/fixtures/config-loader/one/two/config.js b/test/fixtures/config-loader/one/two/config.js
index 736d6d2d2..96872cc2d 100644
--- a/test/fixtures/config-loader/one/two/config.js
+++ b/test/fixtures/config-loader/one/two/config.js
@@ -1 +1 @@
-module.exports = { plugins: [] };
+export default { plugins: [] };
diff --git a/test/fixtures/config-loader/svgo.config.js b/test/fixtures/config-loader/svgo.config.js
index 736d6d2d2..96872cc2d 100644
--- a/test/fixtures/config-loader/svgo.config.js
+++ b/test/fixtures/config-loader/svgo.config.js
@@ -1 +1 @@
-module.exports = { plugins: [] };
+export default { plugins: [] };
diff --git a/test/plugins/_index.test.js b/test/plugins/_index.test.js
index 812282660..2c57686be 100644
--- a/test/plugins/_index.test.js
+++ b/test/plugins/_index.test.js
@@ -1,11 +1,12 @@
-'use strict';
+import FS from 'fs';
+import PATH from 'path';
+import { EOL } from 'os';
+import { fileURLToPath } from 'url';
+import { optimize } from '../../lib/svgo.js';
 
-const FS = require('fs');
-const PATH = require('path');
-const EOL = require('os').EOL;
 const regEOL = new RegExp(EOL, 'g');
 const regFilename = /^(.*)\.(\d+)\.svg$/;
-const { optimize } = require('../../lib/svgo.js');
+const __dirname = PATH.dirname(fileURLToPath(import.meta.url));
 
 describe('plugins tests', function () {
   FS.readdirSync(__dirname).forEach(function (file) {
@@ -41,7 +42,6 @@ describe('plugins tests', function () {
               js2svg: { pretty: true },
             });
             lastResultData = result.data;
-            expect(result.error).not.toStrictEqual(expect.anything());
             //FIXME: results.data has a '\n' at the end while it should not
             expect(normalize(result.data)).toStrictEqual(should);
           }
diff --git a/test/plugins/_transforms.test.js b/test/plugins/_transforms.test.js
index 6f8d72e3b..0441d17cd 100644
--- a/test/plugins/_transforms.test.js
+++ b/test/plugins/_transforms.test.js
@@ -1,6 +1,4 @@
-'use strict';
-
-const { matrixToTransform } = require('../../plugins/_transforms');
+import { matrixToTransform } from '../../plugins/_transforms.js';
 
 /**
  * @typedef {import('../../plugins/_transforms').TransformParams} TransformParams
diff --git a/test/plugins/prefixIds.test.js b/test/plugins/prefixIds.test.js
index 8ae2b33b8..96c744049 100644
--- a/test/plugins/prefixIds.test.js
+++ b/test/plugins/prefixIds.test.js
@@ -1,6 +1,4 @@
-'use strict';
-
-const { optimize } = require('../../lib/svgo.js');
+import { optimize } from '../../lib/svgo.js';
 
 test('should extract prefix from path basename', () => {
   const svg = `<svg id="my-id"></svg>`;
diff --git a/test/regression-extract.js b/test/regression-extract.js
index e5a594e65..8ac9898db 100644
--- a/test/regression-extract.js
+++ b/test/regression-extract.js
@@ -1,12 +1,13 @@
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import stream from 'stream';
+import util from 'util';
+import zlib from 'zlib';
+import fetch from 'node-fetch';
+import tarStream from 'tar-stream';
+import { fileURLToPath } from 'url';
 
-const fs = require('fs');
-const path = require('path');
-const stream = require('stream');
-const util = require('util');
-const zlib = require('zlib');
-const { default: fetch } = require('node-fetch');
-const tarStream = require('tar-stream');
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const pipeline = util.promisify(stream.pipeline);
 
diff --git a/test/regression.js b/test/regression.js
index 6eed809a3..20592ee10 100644
--- a/test/regression.js
+++ b/test/regression.js
@@ -1,18 +1,19 @@
-'use strict';
-
 /**
  * @typedef {import('playwright').Page} Page
  * @typedef {import('playwright').PageScreenshotOptions} PageScreenshotOptions
  */
 
-const fs = require('node:fs/promises');
-const http = require('http');
-const os = require('os');
-const path = require('path');
-const pixelmatch = require('pixelmatch');
-const { chromium } = require('playwright');
-const { PNG } = require('pngjs');
-const { optimize } = require('../lib/svgo.js');
+import fs from 'node:fs/promises';
+import http from 'http';
+import os from 'os';
+import path from 'path';
+import pixelmatch from 'pixelmatch';
+import { chromium } from 'playwright';
+import { PNG } from 'pngjs';
+import { fileURLToPath } from 'url';
+import { optimize } from '../lib/svgo.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const width = 960;
 const height = 720;
diff --git a/test/svg2js/_index.test.js b/test/svg2js/_index.test.js
index ece064284..fee646e6d 100644
--- a/test/svg2js/_index.test.js
+++ b/test/svg2js/_index.test.js
@@ -1,8 +1,9 @@
-'use strict';
+import FS from 'fs';
+import PATH from 'path';
+import { fileURLToPath } from 'url';
+import { parseSvg } from '../../lib/parser.js';
 
-const FS = require('fs');
-const PATH = require('path');
-const { parseSvg } = require('../../lib/parser.js');
+const __dirname = PATH.dirname(fileURLToPath(import.meta.url));
 
 describe('svg2js', function () {
   describe('working svg', function () {
diff --git a/test/svgo.cjs b/test/svgo.cjs
new file mode 100644
index 000000000..2e661a0bc
--- /dev/null
+++ b/test/svgo.cjs
@@ -0,0 +1,33 @@
+const { optimize } = require('../dist/svgo-node.cjs');
+const assert = require('assert');
+
+const fixture = `<svg xmlns="http://www.w3.org/2000/svg">
+    <g attr1="val1">
+        <g attr2="val2">
+            <path attr2="val3" d="..."/>
+        </g>
+        <path d="..."/>
+    </g>
+</svg>`;
+
+const expected = `<svg xmlns="http://www.w3.org/2000/svg">
+  <g attr1="val1">
+    <g attr2="val2">
+      <path attr2="val3" d="..."/>
+    </g>
+    <path d="..."/>
+  </g>
+</svg>
+`;
+
+const runTest = () => {
+  const result = optimize(fixture, {
+    plugins: [],
+    js2svg: { pretty: true, indent: 2 },
+  });
+  const actual = result.data;
+
+  assert.equal(actual, expected);
+};
+
+runTest();
diff --git a/test/svgo/_index.test.js b/test/svgo/_index.test.js
index 9d922852d..423b97f0f 100644
--- a/test/svgo/_index.test.js
+++ b/test/svgo/_index.test.js
@@ -1,9 +1,10 @@
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import { EOL } from 'os';
+import { fileURLToPath } from 'url';
+import { optimize } from '../../lib/svgo.js';
 
-const fs = require('fs');
-const path = require('path');
-const { EOL } = require('os');
-const { optimize } = require('../../lib/svgo.js');
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const regEOL = new RegExp(EOL, 'g');
 
diff --git a/tsconfig.json b/tsconfig.json
index 5bc6f365d..658db4af2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "noEmit": true,
-    "module": "commonjs",
+    "module": "node16",
     "target": "es2018",
     "lib": ["es2018"],
     "allowJs": true,
diff --git a/yarn.lock b/yarn.lock
index e6b23d23c..212af8186 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,13 +22,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13":
-  version: 7.22.13
-  resolution: "@babel/code-frame@npm:7.22.13"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.22.13":
+  version: 7.23.5
+  resolution: "@babel/code-frame@npm:7.23.5"
   dependencies:
-    "@babel/highlight": ^7.22.13
+    "@babel/highlight": ^7.23.4
     chalk: ^2.4.2
-  checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
+  checksum: d90981fdf56a2824a9b14d19a4c0e8db93633fd488c772624b4e83e0ceac6039a27cd298a247c3214faa952bf803ba23696172ae7e7235f3b97f43ba278c569a
   languageName: node
   linkType: hard
 
@@ -196,14 +196,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.22.13":
-  version: 7.22.20
-  resolution: "@babel/highlight@npm:7.22.20"
+"@babel/highlight@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/highlight@npm:7.23.4"
   dependencies:
     "@babel/helper-validator-identifier": ^7.22.20
     chalk: ^2.4.2
     js-tokens: ^4.0.0
-  checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
+  checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89
   languageName: node
   linkType: hard
 
@@ -786,7 +786,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
   checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
@@ -850,49 +850,164 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/plugin-commonjs@npm:^22.0.2":
-  version: 22.0.2
-  resolution: "@rollup/plugin-commonjs@npm:22.0.2"
+"@rollup/plugin-commonjs@npm:^25.0.7":
+  version: 25.0.7
+  resolution: "@rollup/plugin-commonjs@npm:25.0.7"
   dependencies:
-    "@rollup/pluginutils": ^3.1.0
+    "@rollup/pluginutils": ^5.0.1
     commondir: ^1.0.1
-    estree-walker: ^2.0.1
-    glob: ^7.1.6
-    is-reference: ^1.2.1
-    magic-string: ^0.25.7
-    resolve: ^1.17.0
+    estree-walker: ^2.0.2
+    glob: ^8.0.3
+    is-reference: 1.2.1
+    magic-string: ^0.30.3
   peerDependencies:
-    rollup: ^2.68.0
-  checksum: 70098a4b91afe3f164f5d27cba65edf148c5ed146ee0e07a964b66940681553ac77391083114cdcf9427e7f2706bf0d61eab310b3a2caeab83b7452c0292fcae
+    rollup: ^2.68.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 052e11839a9edc556eda5dcc759ab816dcc57e9f0f905a1e6e14fff954eaa6b1e2d0d544f5bd18d863993c5eba43d8ac9c19d9bb53b1c3b1213f32cfc9d50b2e
   languageName: node
   linkType: hard
 
-"@rollup/plugin-node-resolve@npm:^14.1.0":
-  version: 14.1.0
-  resolution: "@rollup/plugin-node-resolve@npm:14.1.0"
+"@rollup/plugin-node-resolve@npm:^15.2.3":
+  version: 15.2.3
+  resolution: "@rollup/plugin-node-resolve@npm:15.2.3"
   dependencies:
-    "@rollup/pluginutils": ^3.1.0
-    "@types/resolve": 1.17.1
+    "@rollup/pluginutils": ^5.0.1
+    "@types/resolve": 1.20.2
     deepmerge: ^4.2.2
-    is-builtin-module: ^3.1.0
+    is-builtin-module: ^3.2.1
     is-module: ^1.0.0
-    resolve: ^1.19.0
+    resolve: ^1.22.1
   peerDependencies:
-    rollup: ^2.78.0
-  checksum: 7c5bed3e5a511ee47172acd91da1a828383f7ef72d54d27d8050598ef9038df0f86a8559db455611e138e07b99d787fd7445b11f81129970d07104644576d80a
+    rollup: ^2.78.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 730f32c2f8fdddff07cf0fca86a5dac7c475605fb96930197a868c066e62eb6388c557545e4f7d99b7a283411754c9fbf98944ab086b6074e04fc1292e234aa8
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@rollup/pluginutils@npm:3.1.0"
+"@rollup/plugin-terser@npm:^0.4.4":
+  version: 0.4.4
+  resolution: "@rollup/plugin-terser@npm:0.4.4"
   dependencies:
-    "@types/estree": 0.0.39
-    estree-walker: ^1.0.1
-    picomatch: ^2.2.2
+    serialize-javascript: ^6.0.1
+    smob: ^1.0.0
+    terser: ^5.17.4
   peerDependencies:
-    rollup: ^1.20.0||^2.0.0
-  checksum: 8be16e27863c219edbb25a4e6ec2fe0e1e451d9e917b6a43cf2ae5bc025a6b8faaa40f82a6e53b66d0de37b58ff472c6c3d57a83037ae635041f8df959d6d9aa
+    rollup: ^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 5472f659fbb7034488df91eb01ecd2ddf6d2cf203d049aa486139225ad5566254c6ec24aad1f5d1167e35f480212ede5160df9cc80e149a28874f78ed6a7fd9a
+  languageName: node
+  linkType: hard
+
+"@rollup/pluginutils@npm:^5.0.1":
+  version: 5.1.0
+  resolution: "@rollup/pluginutils@npm:5.1.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    estree-walker: ^2.0.2
+    picomatch: ^2.3.1
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 3cc5a6d91452a6eabbfd1ae79b4dd1f1e809d2eecda6e175deb784e75b0911f47e9ecce73f8dd315d6a8b3f362582c91d3c0f66908b6ced69345b3cbe28f8ce8
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm-eabi@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.9.2"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm64@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-android-arm64@npm:4.9.2"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-arm64@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.9.2"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-x64@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-darwin-x64@npm:4.9.2"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.9.2"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-gnu@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.9.2"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-musl@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.9.2"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-riscv64-gnu@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.9.2"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-gnu@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.9.2"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-musl@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.9.2"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-arm64-msvc@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.9.2"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-ia32-msvc@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.9.2"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-x64-msvc@npm:4.9.2":
+  version: 4.9.2
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.9.2"
+  conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
@@ -992,10 +1107,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:0.0.39":
-  version: 0.0.39
-  resolution: "@types/estree@npm:0.0.39"
-  checksum: 412fb5b9868f2c418126451821833414189b75cc6bf84361156feed733e3d92ec220b9d74a89e52722e03d5e241b2932732711b7497374a404fad49087adc248
+"@types/estree@npm:*, @types/estree@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a
   languageName: node
   linkType: hard
 
@@ -1050,12 +1165,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/resolve@npm:1.17.1":
-  version: 1.17.1
-  resolution: "@types/resolve@npm:1.17.1"
-  dependencies:
-    "@types/node": "*"
-  checksum: dc6a6df507656004e242dcb02c784479deca516d5f4b58a1707e708022b269ae147e1da0521f3e8ad0d63638869d87e0adc023f0bd5454aa6f72ac66c7525cf5
+"@types/resolve@npm:1.20.2":
+  version: 1.20.2
+  resolution: "@types/resolve@npm:1.20.2"
+  checksum: 61c2cad2499ffc8eab36e3b773945d337d848d3ac6b7b0a87c805ba814bc838ef2f262fc0f109bfd8d2e0898ff8bd80ad1025f9ff64f1f71d3d4294c9f14e5f6
   languageName: node
   linkType: hard
 
@@ -1368,6 +1481,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"brace-expansion@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "brace-expansion@npm:2.0.1"
+  dependencies:
+    balanced-match: ^1.0.0
+  checksum: a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1
+  languageName: node
+  linkType: hard
+
 "braces@npm:^3.0.1":
   version: 3.0.2
   resolution: "braces@npm:3.0.2"
@@ -2060,14 +2182,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estree-walker@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "estree-walker@npm:1.0.1"
-  checksum: 7e70da539691f6db03a08e7ce94f394ce2eef4180e136d251af299d41f92fb2d28ebcd9a6e393e3728d7970aeb5358705ddf7209d52fbcb2dd4693f95dcf925f
-  languageName: node
-  linkType: hard
-
-"estree-walker@npm:^2.0.1":
+"estree-walker@npm:^2.0.2":
   version: 2.0.2
   resolution: "estree-walker@npm:2.0.2"
   checksum: 6151e6f9828abe2259e57f5fd3761335bb0d2ebd76dc1a01048ccee22fabcfef3c0859300f6d83ff0d1927849368775ec5a6d265dde2f6de5a1be1721cd94efc
@@ -2267,10 +2382,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function-bind@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "function-bind@npm:1.1.1"
-  checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a
+"function-bind@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "function-bind@npm:1.1.2"
+  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
   languageName: node
   linkType: hard
 
@@ -2336,17 +2451,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6":
-  version: 7.2.0
-  resolution: "glob@npm:7.2.0"
+"glob@npm:^7.1.3, glob@npm:^7.1.4":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
   dependencies:
     fs.realpath: ^1.0.0
     inflight: ^1.0.4
     inherits: 2
-    minimatch: ^3.0.4
+    minimatch: ^3.1.1
     once: ^1.3.0
     path-is-absolute: ^1.0.0
-  checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
+  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
+  languageName: node
+  linkType: hard
+
+"glob@npm:^8.0.3":
+  version: 8.1.0
+  resolution: "glob@npm:8.1.0"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^5.0.1
+    once: ^1.3.0
+  checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47
   languageName: node
   linkType: hard
 
@@ -2415,12 +2543,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has@npm:1.0.3"
+"hasown@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "hasown@npm:2.0.0"
   dependencies:
-    function-bind: ^1.1.1
-  checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792
+    function-bind: ^1.1.2
+  checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176
   languageName: node
   linkType: hard
 
@@ -2565,21 +2693,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-builtin-module@npm:^3.1.0":
-  version: 3.2.0
-  resolution: "is-builtin-module@npm:3.2.0"
+"is-builtin-module@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "is-builtin-module@npm:3.2.1"
   dependencies:
     builtin-modules: ^3.3.0
-  checksum: 0315751b898feff0646511c896e88b608a755c5025d0ce9a3ad25783de50be870e47dafb838cebbb06fbb2a948b209ea55348eee267836c9dd40d3a11ec717d3
+  checksum: e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.2.0":
-  version: 2.6.0
-  resolution: "is-core-module@npm:2.6.0"
+"is-core-module@npm:^2.13.0":
+  version: 2.13.1
+  resolution: "is-core-module@npm:2.13.1"
   dependencies:
-    has: ^1.0.3
-  checksum: 183b3b96fed19822b13959876b0317e61fc2cb5ebcbc21639904c81f7ae328af57f8e18cc4750a9c4abebd686130c70d34a89521e57dbe002edfa4614507ce18
+    hasown: ^2.0.0
+  checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c
   languageName: node
   linkType: hard
 
@@ -2664,7 +2792,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-reference@npm:^1.2.1":
+"is-reference@npm:1.2.1":
   version: 1.2.1
   resolution: "is-reference@npm:1.2.1"
   dependencies:
@@ -3167,17 +3295,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^26.2.1":
-  version: 26.6.2
-  resolution: "jest-worker@npm:26.6.2"
-  dependencies:
-    "@types/node": "*"
-    merge-stream: ^2.0.0
-    supports-color: ^7.0.0
-  checksum: f9afa3b88e3f12027901e4964ba3ff048285b5783b5225cab28fac25b4058cea8ad54001e9a1577ee2bed125fac3ccf5c80dc507b120300cc1bbcb368796533e
-  languageName: node
-  linkType: hard
-
 "jest-worker@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-worker@npm:29.7.0"
@@ -3343,12 +3460,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.25.7":
-  version: 0.25.7
-  resolution: "magic-string@npm:0.25.7"
+"magic-string@npm:^0.30.3":
+  version: 0.30.5
+  resolution: "magic-string@npm:0.30.5"
   dependencies:
-    sourcemap-codec: ^1.4.4
-  checksum: 727a1fb70f9610304fe384f1df0251eb7d1d9dd779c07ef1225690361b71b216f26f5d934bfb11c919b5b0e7ba50f6240c823a6f2e44cfd33d4a07d7747ca829
+    "@jridgewell/sourcemap-codec": ^1.4.15
+  checksum: da10fecff0c0a7d3faf756913ce62bd6d5e7b0402be48c3b27bfd651b90e29677e279069a63b764bcdc1b8ecdcdb898f29a5c5ec510f2323e8d62ee057a6eb18
   languageName: node
   linkType: hard
 
@@ -3438,7 +3555,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.2":
+"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
   dependencies:
@@ -3447,6 +3564,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^5.0.1":
+  version: 5.1.6
+  resolution: "minimatch@npm:5.1.6"
+  dependencies:
+    brace-expansion: ^2.0.1
+  checksum: 7564208ef81d7065a370f788d337cd80a689e981042cb9a1d0e6580b6c6a8c9279eba80010516e258835a988363f99f54a6f711a315089b8b42694f5da9d0d77
+  languageName: node
+  linkType: hard
+
 "minipass-collect@npm:^1.0.2":
   version: 1.0.2
   resolution: "minipass-collect@npm:1.0.2"
@@ -3783,7 +3909,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-parse@npm:^1.0.6":
+"path-parse@npm:^1.0.7":
   version: 1.0.7
   resolution: "path-parse@npm:1.0.7"
   checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
@@ -3804,10 +3930,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picomatch@npm:^2.0.4, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3":
-  version: 2.3.0
-  resolution: "picomatch@npm:2.3.0"
-  checksum: 16818720ea7c5872b6af110760dee856c8e4cd79aed1c7a006d076b1cc09eff3ae41ca5019966694c33fbd2e1cc6ea617ab10e4adac6df06556168f13be3fca2
+"picomatch@npm:^2.0.4, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "picomatch@npm:2.3.1"
+  checksum: 050c865ce81119c4822c45d3c84f1ced46f93a0126febae20737bd05ca20589c564d6e9226977df859ed5e03dc73f02584a2b0faad36e896936238238b0446cf
   languageName: node
   linkType: hard
 
@@ -4033,23 +4159,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0":
-  version: 1.20.0
-  resolution: "resolve@npm:1.20.0"
+"resolve@^1.20.0, resolve@npm:^1.22.1":
+  version: 1.22.8
+  resolution: "resolve@npm:1.22.8"
   dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: 40cf70b2cde00ef57f99daf2dc63c6a56d6c14a1b7fc51735d06a6f0a3b97cb67b4fb7ef6c747b4e13a7baba83b0ef625d7c4ce92a483cd5af923c3b65fd16fe
+    is-core-module: ^2.13.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>":
-  version: 1.20.0
-  resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=07638b"
+"resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
+  version: 1.22.8
+  resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=07638b"
   dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: a0dd7d16a8e47af23afa9386df2dff10e3e0debb2c7299a42e581d9d9b04d7ad5d2c53f24f1e043f7b3c250cbdc71150063e53d0b6559683d37f790b7c8c3cd5
+    is-core-module: ^2.13.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
   languageName: node
   linkType: hard
 
@@ -4078,31 +4210,56 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup-plugin-terser@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "rollup-plugin-terser@npm:7.0.2"
-  dependencies:
-    "@babel/code-frame": ^7.10.4
-    jest-worker: ^26.2.1
-    serialize-javascript: ^4.0.0
-    terser: ^5.0.0
-  peerDependencies:
-    rollup: ^2.0.0
-  checksum: af84bb7a7a894cd00852b6486528dfb8653cf94df4c126f95f389a346f401d054b08c46bee519a2ab6a22b33804d1d6ac6d8c90b1b2bf8fffb097eed73fc3c72
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^2.79.1":
-  version: 2.79.1
-  resolution: "rollup@npm:2.79.1"
-  dependencies:
+"rollup@npm:^4.9.2":
+  version: 4.9.2
+  resolution: "rollup@npm:4.9.2"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": 4.9.2
+    "@rollup/rollup-android-arm64": 4.9.2
+    "@rollup/rollup-darwin-arm64": 4.9.2
+    "@rollup/rollup-darwin-x64": 4.9.2
+    "@rollup/rollup-linux-arm-gnueabihf": 4.9.2
+    "@rollup/rollup-linux-arm64-gnu": 4.9.2
+    "@rollup/rollup-linux-arm64-musl": 4.9.2
+    "@rollup/rollup-linux-riscv64-gnu": 4.9.2
+    "@rollup/rollup-linux-x64-gnu": 4.9.2
+    "@rollup/rollup-linux-x64-musl": 4.9.2
+    "@rollup/rollup-win32-arm64-msvc": 4.9.2
+    "@rollup/rollup-win32-ia32-msvc": 4.9.2
+    "@rollup/rollup-win32-x64-msvc": 4.9.2
     fsevents: ~2.3.2
   dependenciesMeta:
+    "@rollup/rollup-android-arm-eabi":
+      optional: true
+    "@rollup/rollup-android-arm64":
+      optional: true
+    "@rollup/rollup-darwin-arm64":
+      optional: true
+    "@rollup/rollup-darwin-x64":
+      optional: true
+    "@rollup/rollup-linux-arm-gnueabihf":
+      optional: true
+    "@rollup/rollup-linux-arm64-gnu":
+      optional: true
+    "@rollup/rollup-linux-arm64-musl":
+      optional: true
+    "@rollup/rollup-linux-riscv64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-musl":
+      optional: true
+    "@rollup/rollup-win32-arm64-msvc":
+      optional: true
+    "@rollup/rollup-win32-ia32-msvc":
+      optional: true
+    "@rollup/rollup-win32-x64-msvc":
+      optional: true
     fsevents:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 6a2bf167b3587d4df709b37d149ad0300692cc5deb510f89ac7bdc77c8738c9546ae3de9322b0968e1ed2b0e984571f5f55aae28fa7de4cfcb1bc5402a4e2be6
+  checksum: 2e4cd90c8fa004b5ff1f4028e331bc627206c5719b45c71cab21578bf60704bc71da241c7dfffcc0aa58bcf380b926ca39a27d6e2482b5996740a6697971b26d
   languageName: node
   linkType: hard
 
@@ -4156,12 +4313,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serialize-javascript@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "serialize-javascript@npm:4.0.0"
+"serialize-javascript@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "serialize-javascript@npm:6.0.1"
   dependencies:
     randombytes: ^2.1.0
-  checksum: 3273b3394b951671fcf388726e9577021870dfbf85e742a1183fb2e91273e6101bdccea81ff230724f6659a7ee4cef924b0ff9baca32b79d9384ec37caf07302
+  checksum: 3c4f4cb61d0893b988415bdb67243637333f3f574e9e9cc9a006a2ced0b390b0b3b44aef8d51c951272a9002ec50885eefdc0298891bc27eb2fe7510ea87dc4f
   languageName: node
   linkType: hard
 
@@ -4216,6 +4373,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"smob@npm:^1.0.0":
+  version: 1.4.1
+  resolution: "smob@npm:1.4.1"
+  checksum: 3bd9e6bcc440356b0e06165f04f0ea170ebc1d57713e4a1d64c57227cb423d8346d3e0894fd7ce28bf75958f73a62f91ba13574a9a0fb4cbc271fa9ef5d75f4e
+  languageName: node
+  linkType: hard
+
 "socks-proxy-agent@npm:^5.0.0":
   version: 5.0.1
   resolution: "socks-proxy-agent@npm:5.0.1"
@@ -4271,13 +4435,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sourcemap-codec@npm:^1.4.4":
-  version: 1.4.8
-  resolution: "sourcemap-codec@npm:1.4.8"
-  checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316
-  languageName: node
-  linkType: hard
-
 "sprintf-js@npm:~1.0.2":
   version: 1.0.3
   resolution: "sprintf-js@npm:1.0.3"
@@ -4421,7 +4578,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0":
+"supports-color@npm:^7.1.0":
   version: 7.2.0
   resolution: "supports-color@npm:7.2.0"
   dependencies:
@@ -4439,12 +4596,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"supports-preserve-symlinks-flag@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
+  checksum: 53b1e247e68e05db7b3808b99b892bd36fb096e6fba213a06da7fab22045e97597db425c724f2bbd6c99a3c295e1e73f3e4de78592289f38431049e1277ca0ae
+  languageName: node
+  linkType: hard
+
 "svgo@workspace:.":
   version: 0.0.0-use.local
   resolution: "svgo@workspace:."
   dependencies:
-    "@rollup/plugin-commonjs": ^22.0.2
-    "@rollup/plugin-node-resolve": ^14.1.0
+    "@rollup/plugin-commonjs": ^25.0.7
+    "@rollup/plugin-node-resolve": ^15.2.3
+    "@rollup/plugin-terser": ^0.4.4
     "@trysound/sax": 0.2.0
     "@types/css-tree": ^2.3.4
     "@types/csso": ^5.0.4
@@ -4463,12 +4628,11 @@ __metadata:
     playwright: ^1.40.1
     pngjs: ^7.0.0
     prettier: ^3.1.1
-    rollup: ^2.79.1
-    rollup-plugin-terser: ^7.0.2
+    rollup: ^4.9.2
     tar-stream: ^3.1.6
     typescript: ^5.3.3
   bin:
-    svgo: ./bin/svgo
+    svgo: ./bin/svgo.js
   languageName: unknown
   linkType: soft
 
@@ -4497,9 +4661,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser@npm:^5.0.0":
-  version: 5.20.0
-  resolution: "terser@npm:5.20.0"
+"terser@npm:^5.17.4":
+  version: 5.26.0
+  resolution: "terser@npm:5.26.0"
   dependencies:
     "@jridgewell/source-map": ^0.3.3
     acorn: ^8.8.2
@@ -4507,7 +4671,7 @@ __metadata:
     source-map-support: ~0.5.20
   bin:
     terser: bin/terser
-  checksum: 251d1b62d7c651ace29f997cf336ff5d5f8e30c65c8698ab7b831764d9e012ab0640895cb609906fb939a5bdf5143d73b5781c5c8c67b9216c77ce92dafdc0bc
+  checksum: 02a9bb896f04df828025af8f0eced36c315d25d310b6c2418e7dad2bed19ddeb34a9cea9b34e7c24789830fa51e1b6a9be26679980987a9c817a7e6d9cd4154b
   languageName: node
   linkType: hard
 

From 51c59f5ad2af4666a9730e58e87ba6fd80301ff5 Mon Sep 17 00:00:00 2001
From: johnkenny54 <45182853+johnkenny54@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:31:42 -0800
Subject: [PATCH 8/9] fix(removeUselessDefs): dont remove node if children has
 id (#1923)

---
 plugins/removeUselessDefs.js          | 11 +++++------
 test/plugins/removeUselessDefs.04.svg | 23 +++++++++++++++++++++++
 test/plugins/removeUselessDefs.05.svg | 23 +++++++++++++++++++++++
 3 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 test/plugins/removeUselessDefs.04.svg
 create mode 100644 test/plugins/removeUselessDefs.05.svg

diff --git a/plugins/removeUselessDefs.js b/plugins/removeUselessDefs.js
index bde64c39b..f61fcb3b5 100644
--- a/plugins/removeUselessDefs.js
+++ b/plugins/removeUselessDefs.js
@@ -19,7 +19,11 @@ export const fn = () => {
   return {
     element: {
       enter: (node, parentNode) => {
-        if (node.name === 'defs') {
+        if (
+          node.name === 'defs' ||
+          (elemsGroups.nonRendering.has(node.name) &&
+            node.attributes.id == null)
+        ) {
           /**
            * @type {XastElement[]}
            */
@@ -36,11 +40,6 @@ export const fn = () => {
             });
           }
           node.children = usefulNodes;
-        } else if (
-          elemsGroups.nonRendering.has(node.name) &&
-          node.attributes.id == null
-        ) {
-          detachNodeFromParent(node, parentNode);
         }
       },
     },
diff --git a/test/plugins/removeUselessDefs.04.svg b/test/plugins/removeUselessDefs.04.svg
new file mode 100644
index 000000000..84e729072
--- /dev/null
+++ b/test/plugins/removeUselessDefs.04.svg
@@ -0,0 +1,23 @@
+Don't remove non-rendering elements if children have IDs.
+
+===
+
+<svg xmlns="http://www.w3.org/2000/svg">
+    <rect fill="url(#a)" width="64" height="64"/>
+    <symbol>
+        <linearGradient id="a">
+            <stop offset="5%" stop-color="gold" />
+        </linearGradient>
+    </symbol>
+</svg>
+
+@@@
+
+<svg xmlns="http://www.w3.org/2000/svg">
+    <rect fill="url(#a)" width="64" height="64"/>
+    <symbol>
+        <linearGradient id="a">
+            <stop offset="5%" stop-color="gold"/>
+        </linearGradient>
+    </symbol>
+</svg>
\ No newline at end of file
diff --git a/test/plugins/removeUselessDefs.05.svg b/test/plugins/removeUselessDefs.05.svg
new file mode 100644
index 000000000..ef3557e0a
--- /dev/null
+++ b/test/plugins/removeUselessDefs.05.svg
@@ -0,0 +1,23 @@
+Don't remove used symbols.
+
+===
+
+<svg xmlns="http://www.w3.org/2000/svg">
+    <rect fill="url(#a)" width="64" height="64"/>
+    <g>
+        <linearGradient id="a">
+            <stop offset="5%" stop-color="gold" />
+        </linearGradient>
+    </g>
+</svg>
+
+@@@
+
+<svg xmlns="http://www.w3.org/2000/svg">
+    <rect fill="url(#a)" width="64" height="64"/>
+    <g>
+        <linearGradient id="a">
+            <stop offset="5%" stop-color="gold"/>
+        </linearGradient>
+    </g>
+</svg>
\ No newline at end of file

From 9e017692bc903bd2c537fa9201e34892ef573fc5 Mon Sep 17 00:00:00 2001
From: johnkenny54 <45182853+johnkenny54@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:58:41 -0800
Subject: [PATCH 9/9] chore: use .svg.txt extension on plugin test files
 (#1917)

---
 .gitignore                                           |  1 +
 test/plugins/_index.test.js                          |  2 +-
 ...t.01.svg => addAttributesToSVGElement.01.svg.txt} |  0
 ...t.02.svg => addAttributesToSVGElement.02.svg.txt} |  0
 ...t.03.svg => addAttributesToSVGElement.03.svg.txt} |  0
 ...t.04.svg => addAttributesToSVGElement.04.svg.txt} |  0
 ...ment.01.svg => addClassesToSVGElement.01.svg.txt} |  0
 ...ment.02.svg => addClassesToSVGElement.02.svg.txt} |  0
 ...ment.03.svg => addClassesToSVGElement.03.svg.txt} |  0
 .../{cleanupAttrs.01.svg => cleanupAttrs.01.svg.txt} |  0
 .../{cleanupAttrs.02.svg => cleanupAttrs.02.svg.txt} |  0
 ...und.01.svg => cleanupEnableBackground.01.svg.txt} |  0
 ...und.02.svg => cleanupEnableBackground.02.svg.txt} |  0
 ...und.03.svg => cleanupEnableBackground.03.svg.txt} |  0
 ...und.04.svg => cleanupEnableBackground.04.svg.txt} |  0
 ...und.05.svg => cleanupEnableBackground.05.svg.txt} |  0
 .../{cleanupIds.01.svg => cleanupIds.01.svg.txt}     |  0
 .../{cleanupIds.02.svg => cleanupIds.02.svg.txt}     |  0
 .../{cleanupIds.03.svg => cleanupIds.03.svg.txt}     |  0
 .../{cleanupIds.04.svg => cleanupIds.04.svg.txt}     |  0
 .../{cleanupIds.05.svg => cleanupIds.05.svg.txt}     |  0
 .../{cleanupIds.06.svg => cleanupIds.06.svg.txt}     |  0
 .../{cleanupIds.07.svg => cleanupIds.07.svg.txt}     |  0
 .../{cleanupIds.08.svg => cleanupIds.08.svg.txt}     |  0
 .../{cleanupIds.09.svg => cleanupIds.09.svg.txt}     |  0
 .../{cleanupIds.10.svg => cleanupIds.10.svg.txt}     |  0
 .../{cleanupIds.11.svg => cleanupIds.11.svg.txt}     |  0
 .../{cleanupIds.12.svg => cleanupIds.12.svg.txt}     |  0
 .../{cleanupIds.13.svg => cleanupIds.13.svg.txt}     |  0
 .../{cleanupIds.14.svg => cleanupIds.14.svg.txt}     |  0
 .../{cleanupIds.15.svg => cleanupIds.15.svg.txt}     |  0
 .../{cleanupIds.16.svg => cleanupIds.16.svg.txt}     |  0
 .../{cleanupIds.17.svg => cleanupIds.17.svg.txt}     |  0
 .../{cleanupIds.18.svg => cleanupIds.18.svg.txt}     |  0
 .../{cleanupIds.19.svg => cleanupIds.19.svg.txt}     |  0
 .../{cleanupIds.20.svg => cleanupIds.20.svg.txt}     |  0
 .../{cleanupIds.21.svg => cleanupIds.21.svg.txt}     |  0
 .../{cleanupIds.22.svg => cleanupIds.22.svg.txt}     |  0
 .../{cleanupIds.23.svg => cleanupIds.23.svg.txt}     |  0
 .../{cleanupIds.24.svg => cleanupIds.24.svg.txt}     |  0
 .../{cleanupIds.25.svg => cleanupIds.25.svg.txt}     |  0
 ...fValues.01.svg => cleanupListOfValues.01.svg.txt} |  0
 ...fValues.02.svg => cleanupListOfValues.02.svg.txt} |  0
 ...fValues.03.svg => cleanupListOfValues.03.svg.txt} |  0
 ...Values.01.svg => cleanupNumericValues.01.svg.txt} |  0
 ...Values.02.svg => cleanupNumericValues.02.svg.txt} |  0
 ...llapseGroups.01.svg => collapseGroups.01.svg.txt} |  0
 ...llapseGroups.02.svg => collapseGroups.02.svg.txt} |  0
 ...llapseGroups.06.svg => collapseGroups.06.svg.txt} |  0
 ...llapseGroups.07.svg => collapseGroups.07.svg.txt} |  0
 ...llapseGroups.08.svg => collapseGroups.08.svg.txt} |  0
 ...llapseGroups.09.svg => collapseGroups.09.svg.txt} |  0
 ...llapseGroups.11.svg => collapseGroups.11.svg.txt} |  0
 ...llapseGroups.12.svg => collapseGroups.12.svg.txt} |  0
 ...llapseGroups.13.svg => collapseGroups.13.svg.txt} |  0
 ...llapseGroups.14.svg => collapseGroups.14.svg.txt} |  0
 ...llapseGroups.15.svg => collapseGroups.15.svg.txt} |  0
 ...llapseGroups.16.svg => collapseGroups.16.svg.txt} |  0
 ...convertColors.01.svg => convertColors.01.svg.txt} |  0
 ...convertColors.02.svg => convertColors.02.svg.txt} |  0
 ...convertColors.03.svg => convertColors.03.svg.txt} |  0
 ...convertColors.04.svg => convertColors.04.svg.txt} |  0
 ...rcle.01.svg => convertEllipseToCircle.01.svg.txt} |  0
 ...nts.01.svg => convertOneStopGradients.01.svg.txt} |  0
 ...nts.02.svg => convertOneStopGradients.02.svg.txt} |  0
 ...nts.03.svg => convertOneStopGradients.03.svg.txt} |  0
 ...ertPathData.01.svg => convertPathData.01.svg.txt} |  0
 ...ertPathData.02.svg => convertPathData.02.svg.txt} |  0
 ...ertPathData.03.svg => convertPathData.03.svg.txt} |  0
 ...ertPathData.04.svg => convertPathData.04.svg.txt} |  0
 ...ertPathData.05.svg => convertPathData.05.svg.txt} |  0
 ...ertPathData.06.svg => convertPathData.06.svg.txt} |  0
 ...ertPathData.07.svg => convertPathData.07.svg.txt} |  0
 ...ertPathData.08.svg => convertPathData.08.svg.txt} |  0
 ...ertPathData.09.svg => convertPathData.09.svg.txt} |  0
 ...ertPathData.10.svg => convertPathData.10.svg.txt} |  0
 ...ertPathData.11.svg => convertPathData.11.svg.txt} |  0
 ...ertPathData.12.svg => convertPathData.12.svg.txt} |  0
 ...ertPathData.13.svg => convertPathData.13.svg.txt} |  0
 ...ertPathData.14.svg => convertPathData.14.svg.txt} |  0
 ...ertPathData.15.svg => convertPathData.15.svg.txt} |  0
 ...ertPathData.16.svg => convertPathData.16.svg.txt} |  0
 ...ertPathData.17.svg => convertPathData.17.svg.txt} |  0
 ...ertPathData.18.svg => convertPathData.18.svg.txt} |  0
 ...ertPathData.19.svg => convertPathData.19.svg.txt} |  0
 ...ertPathData.20.svg => convertPathData.20.svg.txt} |  0
 ...ertPathData.21.svg => convertPathData.21.svg.txt} |  0
 ...ertPathData.22.svg => convertPathData.22.svg.txt} |  0
 ...ertPathData.23.svg => convertPathData.23.svg.txt} |  0
 ...ertPathData.24.svg => convertPathData.24.svg.txt} |  0
 ...ertPathData.25.svg => convertPathData.25.svg.txt} |  0
 ...ertPathData.26.svg => convertPathData.26.svg.txt} |  0
 ...ertPathData.27.svg => convertPathData.27.svg.txt} |  0
 ...ertPathData.28.svg => convertPathData.28.svg.txt} |  0
 ...ertPathData.29.svg => convertPathData.29.svg.txt} |  0
 ...ertPathData.30.svg => convertPathData.30.svg.txt} |  0
 ...ertPathData.31.svg => convertPathData.31.svg.txt} |  0
 ...ertPathData.32.svg => convertPathData.32.svg.txt} |  0
 ...ertPathData.33.svg => convertPathData.33.svg.txt} |  0
 ...ertPathData.34.svg => convertPathData.34.svg.txt} |  0
 ...ertPathData.35.svg => convertPathData.35.svg.txt} |  0
 ...peToPath.01.svg => convertShapeToPath.01.svg.txt} |  0
 ...peToPath.02.svg => convertShapeToPath.02.svg.txt} |  0
 ...peToPath.03.svg => convertShapeToPath.03.svg.txt} |  0
 ...peToPath.04.svg => convertShapeToPath.04.svg.txt} |  0
 ...peToPath.05.svg => convertShapeToPath.05.svg.txt} |  0
 ...ToAttrs.01.svg => convertStyleToAttrs.01.svg.txt} |  0
 ...ToAttrs.02.svg => convertStyleToAttrs.02.svg.txt} |  0
 ...ToAttrs.03.svg => convertStyleToAttrs.03.svg.txt} |  0
 ...ToAttrs.04.svg => convertStyleToAttrs.04.svg.txt} |  0
 ...ToAttrs.05.svg => convertStyleToAttrs.05.svg.txt} |  0
 ...tTransform.01.svg => convertTransform.01.svg.txt} |  0
 ...tTransform.02.svg => convertTransform.02.svg.txt} |  0
 ...tTransform.03.svg => convertTransform.03.svg.txt} |  0
 ...tTransform.04.svg => convertTransform.04.svg.txt} |  0
 ...tTransform.05.svg => convertTransform.05.svg.txt} |  0
 .../{inlineStyles.01.svg => inlineStyles.01.svg.txt} |  0
 .../{inlineStyles.02.svg => inlineStyles.02.svg.txt} |  0
 .../{inlineStyles.03.svg => inlineStyles.03.svg.txt} |  0
 .../{inlineStyles.04.svg => inlineStyles.04.svg.txt} |  0
 .../{inlineStyles.05.svg => inlineStyles.05.svg.txt} |  0
 .../{inlineStyles.06.svg => inlineStyles.06.svg.txt} |  0
 .../{inlineStyles.07.svg => inlineStyles.07.svg.txt} |  0
 .../{inlineStyles.08.svg => inlineStyles.08.svg.txt} |  0
 .../{inlineStyles.09.svg => inlineStyles.09.svg.txt} |  0
 .../{inlineStyles.10.svg => inlineStyles.10.svg.txt} |  0
 .../{inlineStyles.11.svg => inlineStyles.11.svg.txt} |  0
 .../{inlineStyles.12.svg => inlineStyles.12.svg.txt} |  0
 .../{inlineStyles.13.svg => inlineStyles.13.svg.txt} |  0
 .../{inlineStyles.14.svg => inlineStyles.14.svg.txt} |  0
 .../{inlineStyles.15.svg => inlineStyles.15.svg.txt} |  0
 .../{inlineStyles.16.svg => inlineStyles.16.svg.txt} |  0
 .../{inlineStyles.17.svg => inlineStyles.17.svg.txt} |  0
 .../{inlineStyles.18.svg => inlineStyles.18.svg.txt} |  0
 .../{inlineStyles.19.svg => inlineStyles.19.svg.txt} |  0
 .../{inlineStyles.20.svg => inlineStyles.20.svg.txt} |  0
 .../{inlineStyles.21.svg => inlineStyles.21.svg.txt} |  0
 .../{inlineStyles.22.svg => inlineStyles.22.svg.txt} |  0
 .../{inlineStyles.23.svg => inlineStyles.23.svg.txt} |  0
 .../{inlineStyles.24.svg => inlineStyles.24.svg.txt} |  0
 .../{inlineStyles.25.svg => inlineStyles.25.svg.txt} |  0
 .../{inlineStyles.26.svg => inlineStyles.26.svg.txt} |  0
 .../{inlineStyles.27.svg => inlineStyles.27.svg.txt} |  0
 .../{inlineStyles.28.svg => inlineStyles.28.svg.txt} |  0
 .../{mergePaths.01.svg => mergePaths.01.svg.txt}     |  0
 .../{mergePaths.02.svg => mergePaths.02.svg.txt}     |  0
 .../{mergePaths.03.svg => mergePaths.03.svg.txt}     |  0
 .../{mergePaths.04.svg => mergePaths.04.svg.txt}     |  0
 .../{mergePaths.05.svg => mergePaths.05.svg.txt}     |  0
 .../{mergePaths.06.svg => mergePaths.06.svg.txt}     |  0
 .../{mergePaths.07.svg => mergePaths.07.svg.txt}     |  0
 .../{mergeStyles.01.svg => mergeStyles.01.svg.txt}   |  0
 .../{mergeStyles.02.svg => mergeStyles.02.svg.txt}   |  0
 .../{mergeStyles.03.svg => mergeStyles.03.svg.txt}   |  0
 .../{mergeStyles.04.svg => mergeStyles.04.svg.txt}   |  0
 .../{mergeStyles.05.svg => mergeStyles.05.svg.txt}   |  0
 .../{mergeStyles.06.svg => mergeStyles.06.svg.txt}   |  0
 .../{mergeStyles.07.svg => mergeStyles.07.svg.txt}   |  0
 .../{mergeStyles.08.svg => mergeStyles.08.svg.txt}   |  0
 .../{mergeStyles.09.svg => mergeStyles.09.svg.txt}   |  0
 .../{mergeStyles.10.svg => mergeStyles.10.svg.txt}   |  0
 .../{mergeStyles.11.svg => mergeStyles.11.svg.txt}   |  0
 .../{mergeStyles.12.svg => mergeStyles.12.svg.txt}   |  0
 .../{minifyStyles.01.svg => minifyStyles.01.svg.txt} |  0
 .../{minifyStyles.02.svg => minifyStyles.02.svg.txt} |  0
 .../{minifyStyles.03.svg => minifyStyles.03.svg.txt} |  0
 .../{minifyStyles.04.svg => minifyStyles.04.svg.txt} |  0
 .../{minifyStyles.05.svg => minifyStyles.05.svg.txt} |  0
 .../{minifyStyles.06.svg => minifyStyles.06.svg.txt} |  0
 .../{minifyStyles.07.svg => minifyStyles.07.svg.txt} |  0
 .../{minifyStyles.08.svg => minifyStyles.08.svg.txt} |  0
 .../{minifyStyles.09.svg => minifyStyles.09.svg.txt} |  0
 .../{minifyStyles.10.svg => minifyStyles.10.svg.txt} |  0
 .../{minifyStyles.11.svg => minifyStyles.11.svg.txt} |  0
 ...Group.01.svg => moveElemsAttrsToGroup.01.svg.txt} |  0
 ...Group.02.svg => moveElemsAttrsToGroup.02.svg.txt} |  0
 ...Group.03.svg => moveElemsAttrsToGroup.03.svg.txt} |  0
 ...Group.04.svg => moveElemsAttrsToGroup.04.svg.txt} |  0
 ...Group.06.svg => moveElemsAttrsToGroup.06.svg.txt} |  0
 ...Group.07.svg => moveElemsAttrsToGroup.07.svg.txt} |  0
 ...Elems.01.svg => moveGroupAttrsToElems.01.svg.txt} |  0
 ...Elems.02.svg => moveGroupAttrsToElems.02.svg.txt} |  0
 ...Elems.03.svg => moveGroupAttrsToElems.03.svg.txt} |  0
 ...Elems.04.svg => moveGroupAttrsToElems.04.svg.txt} |  0
 ...Elems.05.svg => moveGroupAttrsToElems.05.svg.txt} |  0
 ...Elems.06.svg => moveGroupAttrsToElems.06.svg.txt} |  0
 .../{prefixIds.01.svg => prefixIds.01.svg.txt}       |  6 +++---
 .../{prefixIds.02.svg => prefixIds.02.svg.txt}       |  4 ++--
 .../{prefixIds.03.svg => prefixIds.03.svg.txt}       |  2 +-
 .../{prefixIds.04.svg => prefixIds.04.svg.txt}       |  2 +-
 .../{prefixIds.05.svg => prefixIds.05.svg.txt}       | 12 ++++++------
 .../{prefixIds.06.svg => prefixIds.06.svg.txt}       | 10 +++++-----
 .../{prefixIds.07.svg => prefixIds.07.svg.txt}       |  4 ++--
 .../{prefixIds.08.svg => prefixIds.08.svg.txt}       |  4 ++--
 .../{prefixIds.09.svg => prefixIds.09.svg.txt}       |  0
 .../{prefixIds.10.svg => prefixIds.10.svg.txt}       |  6 +++---
 .../{prefixIds.11.svg => prefixIds.11.svg.txt}       |  6 +++---
 .../{prefixIds.12.svg => prefixIds.12.svg.txt}       |  2 +-
 ....01.svg => removeAttributesBySelector.01.svg.txt} |  0
 ....02.svg => removeAttributesBySelector.02.svg.txt} |  0
 ....03.svg => removeAttributesBySelector.03.svg.txt} |  0
 .../{removeAttrs.01.svg => removeAttrs.01.svg.txt}   |  0
 .../{removeAttrs.02.svg => removeAttrs.02.svg.txt}   |  0
 .../{removeAttrs.03.svg => removeAttrs.03.svg.txt}   |  0
 .../{removeAttrs.04.svg => removeAttrs.04.svg.txt}   |  0
 .../{removeAttrs.05.svg => removeAttrs.05.svg.txt}   |  0
 .../{removeAttrs.06.svg => removeAttrs.06.svg.txt}   |  0
 ...moveComments.01.svg => removeComments.01.svg.txt} |  0
 ...moveComments.02.svg => removeComments.02.svg.txt} |  0
 ...moveComments.03.svg => removeComments.03.svg.txt} |  0
 .../{removeDesc.01.svg => removeDesc.01.svg.txt}     |  0
 ...Dimensions.01.svg => removeDimensions.01.svg.txt} |  0
 ...Dimensions.02.svg => removeDimensions.02.svg.txt} |  0
 ...Dimensions.03.svg => removeDimensions.03.svg.txt} |  0
 ...Dimensions.04.svg => removeDimensions.04.svg.txt} |  0
 ...Dimensions.05.svg => removeDimensions.05.svg.txt} |  0
 ...removeDoctype.01.svg => removeDoctype.01.svg.txt} |  0
 ...sNSData.01.svg => removeEditorsNSData.01.svg.txt} |  0
 ...sNSData.02.svg => removeEditorsNSData.02.svg.txt} |  0
 ...ByAttr.01.svg => removeElementsByAttr.01.svg.txt} |  0
 ...ByAttr.02.svg => removeElementsByAttr.02.svg.txt} |  0
 ...ByAttr.03.svg => removeElementsByAttr.03.svg.txt} |  0
 ...ByAttr.04.svg => removeElementsByAttr.04.svg.txt} |  0
 ...ByAttr.05.svg => removeElementsByAttr.05.svg.txt} |  0
 ...ByAttr.06.svg => removeElementsByAttr.06.svg.txt} |  0
 ...ByAttr.07.svg => removeElementsByAttr.07.svg.txt} |  0
 ...EmptyAttrs.01.svg => removeEmptyAttrs.01.svg.txt} |  0
 ...EmptyAttrs.02.svg => removeEmptyAttrs.02.svg.txt} |  0
 ...iners.01.svg => removeEmptyContainers.01.svg.txt} |  0
 ...iners.02.svg => removeEmptyContainers.02.svg.txt} |  0
 ...iners.03.svg => removeEmptyContainers.03.svg.txt} |  0
 ...iners.04.svg => removeEmptyContainers.04.svg.txt} |  0
 ...iners.05.svg => removeEmptyContainers.05.svg.txt} |  0
 ...iners.06.svg => removeEmptyContainers.06.svg.txt} |  0
 ...veEmptyText.01.svg => removeEmptyText.01.svg.txt} |  0
 ...veEmptyText.02.svg => removeEmptyText.02.svg.txt} |  0
 ...veEmptyText.03.svg => removeEmptyText.03.svg.txt} |  0
 ...ddenElems.01.svg => removeHiddenElems.01.svg.txt} |  0
 ...ddenElems.02.svg => removeHiddenElems.02.svg.txt} |  0
 ...ddenElems.03.svg => removeHiddenElems.03.svg.txt} |  0
 ...ddenElems.04.svg => removeHiddenElems.04.svg.txt} |  0
 ...ddenElems.05.svg => removeHiddenElems.05.svg.txt} |  0
 ...ddenElems.06.svg => removeHiddenElems.06.svg.txt} |  0
 ...ddenElems.07.svg => removeHiddenElems.07.svg.txt} |  0
 ...ddenElems.08.svg => removeHiddenElems.08.svg.txt} |  0
 ...ddenElems.09.svg => removeHiddenElems.09.svg.txt} |  0
 ...ddenElems.10.svg => removeHiddenElems.10.svg.txt} |  0
 ...ddenElems.11.svg => removeHiddenElems.11.svg.txt} |  0
 ...ddenElems.12.svg => removeHiddenElems.12.svg.txt} |  0
 ...ddenElems.13.svg => removeHiddenElems.13.svg.txt} |  0
 ...ddenElems.14.svg => removeHiddenElems.14.svg.txt} |  0
 ...ddenElems.15.svg => removeHiddenElems.15.svg.txt} |  0
 ...moveMetadata.01.svg => removeMetadata.01.svg.txt} |  0
 ...svg => removeNonInheritableGroupAttrs.01.svg.txt} |  0
 ...svg => removeNonInheritableGroupAttrs.02.svg.txt} |  0
 ...sPaths.01.svg => removeOffCanvasPaths.01.svg.txt} |  0
 ...sPaths.02.svg => removeOffCanvasPaths.02.svg.txt} |  0
 ...sPaths.03.svg => removeOffCanvasPaths.03.svg.txt} |  0
 ...sPaths.04.svg => removeOffCanvasPaths.04.svg.txt} |  0
 ...sPaths.05.svg => removeOffCanvasPaths.05.svg.txt} |  0
 ...sPaths.06.svg => removeOffCanvasPaths.06.svg.txt} |  0
 ...erImages.01.svg => removeRasterImages.01.svg.txt} |  0
 ...erImages.02.svg => removeRasterImages.02.svg.txt} |  0
 ...Element.01.svg => removeScriptElement.01.svg.txt} |  0
 ...Element.02.svg => removeScriptElement.02.svg.txt} |  0
 ...Element.03.svg => removeScriptElement.03.svg.txt} |  0
 ...Element.04.svg => removeScriptElement.04.svg.txt} |  0
 ...Element.05.svg => removeScriptElement.05.svg.txt} |  0
 ...eElement.01.svg => removeStyleElement.01.svg.txt} |  0
 .../{removeTitle.01.svg => removeTitle.01.svg.txt}   |  0
 ...s.01.svg => removeUnknownsAndDefaults.01.svg.txt} |  0
 ...s.02.svg => removeUnknownsAndDefaults.02.svg.txt} |  0
 ...s.03.svg => removeUnknownsAndDefaults.03.svg.txt} |  0
 ...s.04.svg => removeUnknownsAndDefaults.04.svg.txt} |  0
 ...s.05.svg => removeUnknownsAndDefaults.05.svg.txt} |  0
 ...s.06.svg => removeUnknownsAndDefaults.06.svg.txt} |  0
 ...s.07.svg => removeUnknownsAndDefaults.07.svg.txt} |  0
 ...s.08.svg => removeUnknownsAndDefaults.08.svg.txt} |  0
 ...s.09.svg => removeUnknownsAndDefaults.09.svg.txt} |  0
 ...s.10.svg => removeUnknownsAndDefaults.10.svg.txt} |  0
 ...s.11.svg => removeUnknownsAndDefaults.11.svg.txt} |  0
 ...s.12.svg => removeUnknownsAndDefaults.12.svg.txt} |  0
 ...s.13.svg => removeUnknownsAndDefaults.13.svg.txt} |  0
 ...s.14.svg => removeUnknownsAndDefaults.14.svg.txt} |  0
 ...s.15.svg => removeUnknownsAndDefaults.15.svg.txt} |  0
 ...s.16.svg => removeUnknownsAndDefaults.16.svg.txt} |  0
 ...moveUnusedNS.01.svg => removeUnusedNS.01.svg.txt} |  0
 ...moveUnusedNS.02.svg => removeUnusedNS.02.svg.txt} |  0
 ...moveUnusedNS.03.svg => removeUnusedNS.03.svg.txt} |  0
 ...moveUnusedNS.04.svg => removeUnusedNS.04.svg.txt} |  0
 ...moveUnusedNS.05.svg => removeUnusedNS.05.svg.txt} |  0
 ...moveUnusedNS.06.svg => removeUnusedNS.06.svg.txt} |  0
 ...moveUnusedNS.07.svg => removeUnusedNS.07.svg.txt} |  0
 ...elessDefs.01.svg => removeUselessDefs.01.svg.txt} |  0
 ...elessDefs.02.svg => removeUselessDefs.02.svg.txt} |  0
 ...elessDefs.03.svg => removeUselessDefs.03.svg.txt} |  0
 ...elessDefs.04.svg => removeUselessDefs.04.svg.txt} |  0
 ...elessDefs.05.svg => removeUselessDefs.05.svg.txt} |  0
 ....01.svg => removeUselessStrokeAndFill.01.svg.txt} |  0
 ....02.svg => removeUselessStrokeAndFill.02.svg.txt} |  0
 ....03.svg => removeUselessStrokeAndFill.03.svg.txt} |  0
 ....04.svg => removeUselessStrokeAndFill.04.svg.txt} |  0
 ....05.svg => removeUselessStrokeAndFill.05.svg.txt} |  0
 ...removeViewBox.01.svg => removeViewBox.01.svg.txt} |  0
 ...removeViewBox.02.svg => removeViewBox.02.svg.txt} |  0
 ...removeViewBox.03.svg => removeViewBox.03.svg.txt} |  0
 ...removeViewBox.04.svg => removeViewBox.04.svg.txt} |  0
 ...removeViewBox.05.svg => removeViewBox.05.svg.txt} |  0
 .../{removeXMLNS.01.svg => removeXMLNS.01.svg.txt}   |  0
 ...LProcInst.01.svg => removeXMLProcInst.01.svg.txt} |  0
 ...LProcInst.02.svg => removeXMLProcInst.02.svg.txt} |  0
 .../{removeXlink.01.svg => removeXlink.01.svg.txt}   |  0
 .../{removeXlink.02.svg => removeXlink.02.svg.txt}   |  0
 .../{removeXlink.03.svg => removeXlink.03.svg.txt}   |  0
 .../{removeXlink.04.svg => removeXlink.04.svg.txt}   |  0
 .../{reusePaths.01.svg => reusePaths.01.svg.txt}     |  0
 .../{reusePaths.02.svg => reusePaths.02.svg.txt}     |  0
 .../{reusePaths.03.svg => reusePaths.03.svg.txt}     |  0
 .../{reusePaths.04.svg => reusePaths.04.svg.txt}     |  0
 .../{reusePaths.05.svg => reusePaths.05.svg.txt}     |  0
 .../{reusePaths.06.svg => reusePaths.06.svg.txt}     |  0
 .../{sortAttrs.01.svg => sortAttrs.01.svg.txt}       |  0
 .../{sortAttrs.02.svg => sortAttrs.02.svg.txt}       |  0
 .../{sortAttrs.03.svg => sortAttrs.03.svg.txt}       |  0
 .../{sortAttrs.04.svg => sortAttrs.04.svg.txt}       |  0
 ...fsChildren.01.svg => sortDefsChildren.01.svg.txt} |  0
 326 files changed, 31 insertions(+), 30 deletions(-)
 rename test/plugins/{addAttributesToSVGElement.01.svg => addAttributesToSVGElement.01.svg.txt} (100%)
 rename test/plugins/{addAttributesToSVGElement.02.svg => addAttributesToSVGElement.02.svg.txt} (100%)
 rename test/plugins/{addAttributesToSVGElement.03.svg => addAttributesToSVGElement.03.svg.txt} (100%)
 rename test/plugins/{addAttributesToSVGElement.04.svg => addAttributesToSVGElement.04.svg.txt} (100%)
 rename test/plugins/{addClassesToSVGElement.01.svg => addClassesToSVGElement.01.svg.txt} (100%)
 rename test/plugins/{addClassesToSVGElement.02.svg => addClassesToSVGElement.02.svg.txt} (100%)
 rename test/plugins/{addClassesToSVGElement.03.svg => addClassesToSVGElement.03.svg.txt} (100%)
 rename test/plugins/{cleanupAttrs.01.svg => cleanupAttrs.01.svg.txt} (100%)
 rename test/plugins/{cleanupAttrs.02.svg => cleanupAttrs.02.svg.txt} (100%)
 rename test/plugins/{cleanupEnableBackground.01.svg => cleanupEnableBackground.01.svg.txt} (100%)
 rename test/plugins/{cleanupEnableBackground.02.svg => cleanupEnableBackground.02.svg.txt} (100%)
 rename test/plugins/{cleanupEnableBackground.03.svg => cleanupEnableBackground.03.svg.txt} (100%)
 rename test/plugins/{cleanupEnableBackground.04.svg => cleanupEnableBackground.04.svg.txt} (100%)
 rename test/plugins/{cleanupEnableBackground.05.svg => cleanupEnableBackground.05.svg.txt} (100%)
 rename test/plugins/{cleanupIds.01.svg => cleanupIds.01.svg.txt} (100%)
 rename test/plugins/{cleanupIds.02.svg => cleanupIds.02.svg.txt} (100%)
 rename test/plugins/{cleanupIds.03.svg => cleanupIds.03.svg.txt} (100%)
 rename test/plugins/{cleanupIds.04.svg => cleanupIds.04.svg.txt} (100%)
 rename test/plugins/{cleanupIds.05.svg => cleanupIds.05.svg.txt} (100%)
 rename test/plugins/{cleanupIds.06.svg => cleanupIds.06.svg.txt} (100%)
 rename test/plugins/{cleanupIds.07.svg => cleanupIds.07.svg.txt} (100%)
 rename test/plugins/{cleanupIds.08.svg => cleanupIds.08.svg.txt} (100%)
 rename test/plugins/{cleanupIds.09.svg => cleanupIds.09.svg.txt} (100%)
 rename test/plugins/{cleanupIds.10.svg => cleanupIds.10.svg.txt} (100%)
 rename test/plugins/{cleanupIds.11.svg => cleanupIds.11.svg.txt} (100%)
 rename test/plugins/{cleanupIds.12.svg => cleanupIds.12.svg.txt} (100%)
 rename test/plugins/{cleanupIds.13.svg => cleanupIds.13.svg.txt} (100%)
 rename test/plugins/{cleanupIds.14.svg => cleanupIds.14.svg.txt} (100%)
 rename test/plugins/{cleanupIds.15.svg => cleanupIds.15.svg.txt} (100%)
 rename test/plugins/{cleanupIds.16.svg => cleanupIds.16.svg.txt} (100%)
 rename test/plugins/{cleanupIds.17.svg => cleanupIds.17.svg.txt} (100%)
 rename test/plugins/{cleanupIds.18.svg => cleanupIds.18.svg.txt} (100%)
 rename test/plugins/{cleanupIds.19.svg => cleanupIds.19.svg.txt} (100%)
 rename test/plugins/{cleanupIds.20.svg => cleanupIds.20.svg.txt} (100%)
 rename test/plugins/{cleanupIds.21.svg => cleanupIds.21.svg.txt} (100%)
 rename test/plugins/{cleanupIds.22.svg => cleanupIds.22.svg.txt} (100%)
 rename test/plugins/{cleanupIds.23.svg => cleanupIds.23.svg.txt} (100%)
 rename test/plugins/{cleanupIds.24.svg => cleanupIds.24.svg.txt} (100%)
 rename test/plugins/{cleanupIds.25.svg => cleanupIds.25.svg.txt} (100%)
 rename test/plugins/{cleanupListOfValues.01.svg => cleanupListOfValues.01.svg.txt} (100%)
 rename test/plugins/{cleanupListOfValues.02.svg => cleanupListOfValues.02.svg.txt} (100%)
 rename test/plugins/{cleanupListOfValues.03.svg => cleanupListOfValues.03.svg.txt} (100%)
 rename test/plugins/{cleanupNumericValues.01.svg => cleanupNumericValues.01.svg.txt} (100%)
 rename test/plugins/{cleanupNumericValues.02.svg => cleanupNumericValues.02.svg.txt} (100%)
 rename test/plugins/{collapseGroups.01.svg => collapseGroups.01.svg.txt} (100%)
 rename test/plugins/{collapseGroups.02.svg => collapseGroups.02.svg.txt} (100%)
 rename test/plugins/{collapseGroups.06.svg => collapseGroups.06.svg.txt} (100%)
 rename test/plugins/{collapseGroups.07.svg => collapseGroups.07.svg.txt} (100%)
 rename test/plugins/{collapseGroups.08.svg => collapseGroups.08.svg.txt} (100%)
 rename test/plugins/{collapseGroups.09.svg => collapseGroups.09.svg.txt} (100%)
 rename test/plugins/{collapseGroups.11.svg => collapseGroups.11.svg.txt} (100%)
 rename test/plugins/{collapseGroups.12.svg => collapseGroups.12.svg.txt} (100%)
 rename test/plugins/{collapseGroups.13.svg => collapseGroups.13.svg.txt} (100%)
 rename test/plugins/{collapseGroups.14.svg => collapseGroups.14.svg.txt} (100%)
 rename test/plugins/{collapseGroups.15.svg => collapseGroups.15.svg.txt} (100%)
 rename test/plugins/{collapseGroups.16.svg => collapseGroups.16.svg.txt} (100%)
 rename test/plugins/{convertColors.01.svg => convertColors.01.svg.txt} (100%)
 rename test/plugins/{convertColors.02.svg => convertColors.02.svg.txt} (100%)
 rename test/plugins/{convertColors.03.svg => convertColors.03.svg.txt} (100%)
 rename test/plugins/{convertColors.04.svg => convertColors.04.svg.txt} (100%)
 rename test/plugins/{convertEllipseToCircle.01.svg => convertEllipseToCircle.01.svg.txt} (100%)
 rename test/plugins/{convertOneStopGradients.01.svg => convertOneStopGradients.01.svg.txt} (100%)
 rename test/plugins/{convertOneStopGradients.02.svg => convertOneStopGradients.02.svg.txt} (100%)
 rename test/plugins/{convertOneStopGradients.03.svg => convertOneStopGradients.03.svg.txt} (100%)
 rename test/plugins/{convertPathData.01.svg => convertPathData.01.svg.txt} (100%)
 rename test/plugins/{convertPathData.02.svg => convertPathData.02.svg.txt} (100%)
 rename test/plugins/{convertPathData.03.svg => convertPathData.03.svg.txt} (100%)
 rename test/plugins/{convertPathData.04.svg => convertPathData.04.svg.txt} (100%)
 rename test/plugins/{convertPathData.05.svg => convertPathData.05.svg.txt} (100%)
 rename test/plugins/{convertPathData.06.svg => convertPathData.06.svg.txt} (100%)
 rename test/plugins/{convertPathData.07.svg => convertPathData.07.svg.txt} (100%)
 rename test/plugins/{convertPathData.08.svg => convertPathData.08.svg.txt} (100%)
 rename test/plugins/{convertPathData.09.svg => convertPathData.09.svg.txt} (100%)
 rename test/plugins/{convertPathData.10.svg => convertPathData.10.svg.txt} (100%)
 rename test/plugins/{convertPathData.11.svg => convertPathData.11.svg.txt} (100%)
 rename test/plugins/{convertPathData.12.svg => convertPathData.12.svg.txt} (100%)
 rename test/plugins/{convertPathData.13.svg => convertPathData.13.svg.txt} (100%)
 rename test/plugins/{convertPathData.14.svg => convertPathData.14.svg.txt} (100%)
 rename test/plugins/{convertPathData.15.svg => convertPathData.15.svg.txt} (100%)
 rename test/plugins/{convertPathData.16.svg => convertPathData.16.svg.txt} (100%)
 rename test/plugins/{convertPathData.17.svg => convertPathData.17.svg.txt} (100%)
 rename test/plugins/{convertPathData.18.svg => convertPathData.18.svg.txt} (100%)
 rename test/plugins/{convertPathData.19.svg => convertPathData.19.svg.txt} (100%)
 rename test/plugins/{convertPathData.20.svg => convertPathData.20.svg.txt} (100%)
 rename test/plugins/{convertPathData.21.svg => convertPathData.21.svg.txt} (100%)
 rename test/plugins/{convertPathData.22.svg => convertPathData.22.svg.txt} (100%)
 rename test/plugins/{convertPathData.23.svg => convertPathData.23.svg.txt} (100%)
 rename test/plugins/{convertPathData.24.svg => convertPathData.24.svg.txt} (100%)
 rename test/plugins/{convertPathData.25.svg => convertPathData.25.svg.txt} (100%)
 rename test/plugins/{convertPathData.26.svg => convertPathData.26.svg.txt} (100%)
 rename test/plugins/{convertPathData.27.svg => convertPathData.27.svg.txt} (100%)
 rename test/plugins/{convertPathData.28.svg => convertPathData.28.svg.txt} (100%)
 rename test/plugins/{convertPathData.29.svg => convertPathData.29.svg.txt} (100%)
 rename test/plugins/{convertPathData.30.svg => convertPathData.30.svg.txt} (100%)
 rename test/plugins/{convertPathData.31.svg => convertPathData.31.svg.txt} (100%)
 rename test/plugins/{convertPathData.32.svg => convertPathData.32.svg.txt} (100%)
 rename test/plugins/{convertPathData.33.svg => convertPathData.33.svg.txt} (100%)
 rename test/plugins/{convertPathData.34.svg => convertPathData.34.svg.txt} (100%)
 rename test/plugins/{convertPathData.35.svg => convertPathData.35.svg.txt} (100%)
 rename test/plugins/{convertShapeToPath.01.svg => convertShapeToPath.01.svg.txt} (100%)
 rename test/plugins/{convertShapeToPath.02.svg => convertShapeToPath.02.svg.txt} (100%)
 rename test/plugins/{convertShapeToPath.03.svg => convertShapeToPath.03.svg.txt} (100%)
 rename test/plugins/{convertShapeToPath.04.svg => convertShapeToPath.04.svg.txt} (100%)
 rename test/plugins/{convertShapeToPath.05.svg => convertShapeToPath.05.svg.txt} (100%)
 rename test/plugins/{convertStyleToAttrs.01.svg => convertStyleToAttrs.01.svg.txt} (100%)
 rename test/plugins/{convertStyleToAttrs.02.svg => convertStyleToAttrs.02.svg.txt} (100%)
 rename test/plugins/{convertStyleToAttrs.03.svg => convertStyleToAttrs.03.svg.txt} (100%)
 rename test/plugins/{convertStyleToAttrs.04.svg => convertStyleToAttrs.04.svg.txt} (100%)
 rename test/plugins/{convertStyleToAttrs.05.svg => convertStyleToAttrs.05.svg.txt} (100%)
 rename test/plugins/{convertTransform.01.svg => convertTransform.01.svg.txt} (100%)
 rename test/plugins/{convertTransform.02.svg => convertTransform.02.svg.txt} (100%)
 rename test/plugins/{convertTransform.03.svg => convertTransform.03.svg.txt} (100%)
 rename test/plugins/{convertTransform.04.svg => convertTransform.04.svg.txt} (100%)
 rename test/plugins/{convertTransform.05.svg => convertTransform.05.svg.txt} (100%)
 rename test/plugins/{inlineStyles.01.svg => inlineStyles.01.svg.txt} (100%)
 rename test/plugins/{inlineStyles.02.svg => inlineStyles.02.svg.txt} (100%)
 rename test/plugins/{inlineStyles.03.svg => inlineStyles.03.svg.txt} (100%)
 rename test/plugins/{inlineStyles.04.svg => inlineStyles.04.svg.txt} (100%)
 rename test/plugins/{inlineStyles.05.svg => inlineStyles.05.svg.txt} (100%)
 rename test/plugins/{inlineStyles.06.svg => inlineStyles.06.svg.txt} (100%)
 rename test/plugins/{inlineStyles.07.svg => inlineStyles.07.svg.txt} (100%)
 rename test/plugins/{inlineStyles.08.svg => inlineStyles.08.svg.txt} (100%)
 rename test/plugins/{inlineStyles.09.svg => inlineStyles.09.svg.txt} (100%)
 rename test/plugins/{inlineStyles.10.svg => inlineStyles.10.svg.txt} (100%)
 rename test/plugins/{inlineStyles.11.svg => inlineStyles.11.svg.txt} (100%)
 rename test/plugins/{inlineStyles.12.svg => inlineStyles.12.svg.txt} (100%)
 rename test/plugins/{inlineStyles.13.svg => inlineStyles.13.svg.txt} (100%)
 rename test/plugins/{inlineStyles.14.svg => inlineStyles.14.svg.txt} (100%)
 rename test/plugins/{inlineStyles.15.svg => inlineStyles.15.svg.txt} (100%)
 rename test/plugins/{inlineStyles.16.svg => inlineStyles.16.svg.txt} (100%)
 rename test/plugins/{inlineStyles.17.svg => inlineStyles.17.svg.txt} (100%)
 rename test/plugins/{inlineStyles.18.svg => inlineStyles.18.svg.txt} (100%)
 rename test/plugins/{inlineStyles.19.svg => inlineStyles.19.svg.txt} (100%)
 rename test/plugins/{inlineStyles.20.svg => inlineStyles.20.svg.txt} (100%)
 rename test/plugins/{inlineStyles.21.svg => inlineStyles.21.svg.txt} (100%)
 rename test/plugins/{inlineStyles.22.svg => inlineStyles.22.svg.txt} (100%)
 rename test/plugins/{inlineStyles.23.svg => inlineStyles.23.svg.txt} (100%)
 rename test/plugins/{inlineStyles.24.svg => inlineStyles.24.svg.txt} (100%)
 rename test/plugins/{inlineStyles.25.svg => inlineStyles.25.svg.txt} (100%)
 rename test/plugins/{inlineStyles.26.svg => inlineStyles.26.svg.txt} (100%)
 rename test/plugins/{inlineStyles.27.svg => inlineStyles.27.svg.txt} (100%)
 rename test/plugins/{inlineStyles.28.svg => inlineStyles.28.svg.txt} (100%)
 rename test/plugins/{mergePaths.01.svg => mergePaths.01.svg.txt} (100%)
 rename test/plugins/{mergePaths.02.svg => mergePaths.02.svg.txt} (100%)
 rename test/plugins/{mergePaths.03.svg => mergePaths.03.svg.txt} (100%)
 rename test/plugins/{mergePaths.04.svg => mergePaths.04.svg.txt} (100%)
 rename test/plugins/{mergePaths.05.svg => mergePaths.05.svg.txt} (100%)
 rename test/plugins/{mergePaths.06.svg => mergePaths.06.svg.txt} (100%)
 rename test/plugins/{mergePaths.07.svg => mergePaths.07.svg.txt} (100%)
 rename test/plugins/{mergeStyles.01.svg => mergeStyles.01.svg.txt} (100%)
 rename test/plugins/{mergeStyles.02.svg => mergeStyles.02.svg.txt} (100%)
 rename test/plugins/{mergeStyles.03.svg => mergeStyles.03.svg.txt} (100%)
 rename test/plugins/{mergeStyles.04.svg => mergeStyles.04.svg.txt} (100%)
 rename test/plugins/{mergeStyles.05.svg => mergeStyles.05.svg.txt} (100%)
 rename test/plugins/{mergeStyles.06.svg => mergeStyles.06.svg.txt} (100%)
 rename test/plugins/{mergeStyles.07.svg => mergeStyles.07.svg.txt} (100%)
 rename test/plugins/{mergeStyles.08.svg => mergeStyles.08.svg.txt} (100%)
 rename test/plugins/{mergeStyles.09.svg => mergeStyles.09.svg.txt} (100%)
 rename test/plugins/{mergeStyles.10.svg => mergeStyles.10.svg.txt} (100%)
 rename test/plugins/{mergeStyles.11.svg => mergeStyles.11.svg.txt} (100%)
 rename test/plugins/{mergeStyles.12.svg => mergeStyles.12.svg.txt} (100%)
 rename test/plugins/{minifyStyles.01.svg => minifyStyles.01.svg.txt} (100%)
 rename test/plugins/{minifyStyles.02.svg => minifyStyles.02.svg.txt} (100%)
 rename test/plugins/{minifyStyles.03.svg => minifyStyles.03.svg.txt} (100%)
 rename test/plugins/{minifyStyles.04.svg => minifyStyles.04.svg.txt} (100%)
 rename test/plugins/{minifyStyles.05.svg => minifyStyles.05.svg.txt} (100%)
 rename test/plugins/{minifyStyles.06.svg => minifyStyles.06.svg.txt} (100%)
 rename test/plugins/{minifyStyles.07.svg => minifyStyles.07.svg.txt} (100%)
 rename test/plugins/{minifyStyles.08.svg => minifyStyles.08.svg.txt} (100%)
 rename test/plugins/{minifyStyles.09.svg => minifyStyles.09.svg.txt} (100%)
 rename test/plugins/{minifyStyles.10.svg => minifyStyles.10.svg.txt} (100%)
 rename test/plugins/{minifyStyles.11.svg => minifyStyles.11.svg.txt} (100%)
 rename test/plugins/{moveElemsAttrsToGroup.01.svg => moveElemsAttrsToGroup.01.svg.txt} (100%)
 rename test/plugins/{moveElemsAttrsToGroup.02.svg => moveElemsAttrsToGroup.02.svg.txt} (100%)
 rename test/plugins/{moveElemsAttrsToGroup.03.svg => moveElemsAttrsToGroup.03.svg.txt} (100%)
 rename test/plugins/{moveElemsAttrsToGroup.04.svg => moveElemsAttrsToGroup.04.svg.txt} (100%)
 rename test/plugins/{moveElemsAttrsToGroup.06.svg => moveElemsAttrsToGroup.06.svg.txt} (100%)
 rename test/plugins/{moveElemsAttrsToGroup.07.svg => moveElemsAttrsToGroup.07.svg.txt} (100%)
 rename test/plugins/{moveGroupAttrsToElems.01.svg => moveGroupAttrsToElems.01.svg.txt} (100%)
 rename test/plugins/{moveGroupAttrsToElems.02.svg => moveGroupAttrsToElems.02.svg.txt} (100%)
 rename test/plugins/{moveGroupAttrsToElems.03.svg => moveGroupAttrsToElems.03.svg.txt} (100%)
 rename test/plugins/{moveGroupAttrsToElems.04.svg => moveGroupAttrsToElems.04.svg.txt} (100%)
 rename test/plugins/{moveGroupAttrsToElems.05.svg => moveGroupAttrsToElems.05.svg.txt} (100%)
 rename test/plugins/{moveGroupAttrsToElems.06.svg => moveGroupAttrsToElems.06.svg.txt} (100%)
 rename test/plugins/{prefixIds.01.svg => prefixIds.01.svg.txt} (62%)
 rename test/plugins/{prefixIds.02.svg => prefixIds.02.svg.txt} (78%)
 rename test/plugins/{prefixIds.03.svg => prefixIds.03.svg.txt} (80%)
 rename test/plugins/{prefixIds.04.svg => prefixIds.04.svg.txt} (94%)
 rename test/plugins/{prefixIds.05.svg => prefixIds.05.svg.txt} (73%)
 rename test/plugins/{prefixIds.06.svg => prefixIds.06.svg.txt} (51%)
 rename test/plugins/{prefixIds.07.svg => prefixIds.07.svg.txt} (78%)
 rename test/plugins/{prefixIds.08.svg => prefixIds.08.svg.txt} (77%)
 rename test/plugins/{prefixIds.09.svg => prefixIds.09.svg.txt} (100%)
 rename test/plugins/{prefixIds.10.svg => prefixIds.10.svg.txt} (53%)
 rename test/plugins/{prefixIds.11.svg => prefixIds.11.svg.txt} (63%)
 rename test/plugins/{prefixIds.12.svg => prefixIds.12.svg.txt} (90%)
 rename test/plugins/{removeAttributesBySelector.01.svg => removeAttributesBySelector.01.svg.txt} (100%)
 rename test/plugins/{removeAttributesBySelector.02.svg => removeAttributesBySelector.02.svg.txt} (100%)
 rename test/plugins/{removeAttributesBySelector.03.svg => removeAttributesBySelector.03.svg.txt} (100%)
 rename test/plugins/{removeAttrs.01.svg => removeAttrs.01.svg.txt} (100%)
 rename test/plugins/{removeAttrs.02.svg => removeAttrs.02.svg.txt} (100%)
 rename test/plugins/{removeAttrs.03.svg => removeAttrs.03.svg.txt} (100%)
 rename test/plugins/{removeAttrs.04.svg => removeAttrs.04.svg.txt} (100%)
 rename test/plugins/{removeAttrs.05.svg => removeAttrs.05.svg.txt} (100%)
 rename test/plugins/{removeAttrs.06.svg => removeAttrs.06.svg.txt} (100%)
 rename test/plugins/{removeComments.01.svg => removeComments.01.svg.txt} (100%)
 rename test/plugins/{removeComments.02.svg => removeComments.02.svg.txt} (100%)
 rename test/plugins/{removeComments.03.svg => removeComments.03.svg.txt} (100%)
 rename test/plugins/{removeDesc.01.svg => removeDesc.01.svg.txt} (100%)
 rename test/plugins/{removeDimensions.01.svg => removeDimensions.01.svg.txt} (100%)
 rename test/plugins/{removeDimensions.02.svg => removeDimensions.02.svg.txt} (100%)
 rename test/plugins/{removeDimensions.03.svg => removeDimensions.03.svg.txt} (100%)
 rename test/plugins/{removeDimensions.04.svg => removeDimensions.04.svg.txt} (100%)
 rename test/plugins/{removeDimensions.05.svg => removeDimensions.05.svg.txt} (100%)
 rename test/plugins/{removeDoctype.01.svg => removeDoctype.01.svg.txt} (100%)
 rename test/plugins/{removeEditorsNSData.01.svg => removeEditorsNSData.01.svg.txt} (100%)
 rename test/plugins/{removeEditorsNSData.02.svg => removeEditorsNSData.02.svg.txt} (100%)
 rename test/plugins/{removeElementsByAttr.01.svg => removeElementsByAttr.01.svg.txt} (100%)
 rename test/plugins/{removeElementsByAttr.02.svg => removeElementsByAttr.02.svg.txt} (100%)
 rename test/plugins/{removeElementsByAttr.03.svg => removeElementsByAttr.03.svg.txt} (100%)
 rename test/plugins/{removeElementsByAttr.04.svg => removeElementsByAttr.04.svg.txt} (100%)
 rename test/plugins/{removeElementsByAttr.05.svg => removeElementsByAttr.05.svg.txt} (100%)
 rename test/plugins/{removeElementsByAttr.06.svg => removeElementsByAttr.06.svg.txt} (100%)
 rename test/plugins/{removeElementsByAttr.07.svg => removeElementsByAttr.07.svg.txt} (100%)
 rename test/plugins/{removeEmptyAttrs.01.svg => removeEmptyAttrs.01.svg.txt} (100%)
 rename test/plugins/{removeEmptyAttrs.02.svg => removeEmptyAttrs.02.svg.txt} (100%)
 rename test/plugins/{removeEmptyContainers.01.svg => removeEmptyContainers.01.svg.txt} (100%)
 rename test/plugins/{removeEmptyContainers.02.svg => removeEmptyContainers.02.svg.txt} (100%)
 rename test/plugins/{removeEmptyContainers.03.svg => removeEmptyContainers.03.svg.txt} (100%)
 rename test/plugins/{removeEmptyContainers.04.svg => removeEmptyContainers.04.svg.txt} (100%)
 rename test/plugins/{removeEmptyContainers.05.svg => removeEmptyContainers.05.svg.txt} (100%)
 rename test/plugins/{removeEmptyContainers.06.svg => removeEmptyContainers.06.svg.txt} (100%)
 rename test/plugins/{removeEmptyText.01.svg => removeEmptyText.01.svg.txt} (100%)
 rename test/plugins/{removeEmptyText.02.svg => removeEmptyText.02.svg.txt} (100%)
 rename test/plugins/{removeEmptyText.03.svg => removeEmptyText.03.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.01.svg => removeHiddenElems.01.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.02.svg => removeHiddenElems.02.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.03.svg => removeHiddenElems.03.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.04.svg => removeHiddenElems.04.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.05.svg => removeHiddenElems.05.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.06.svg => removeHiddenElems.06.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.07.svg => removeHiddenElems.07.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.08.svg => removeHiddenElems.08.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.09.svg => removeHiddenElems.09.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.10.svg => removeHiddenElems.10.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.11.svg => removeHiddenElems.11.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.12.svg => removeHiddenElems.12.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.13.svg => removeHiddenElems.13.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.14.svg => removeHiddenElems.14.svg.txt} (100%)
 rename test/plugins/{removeHiddenElems.15.svg => removeHiddenElems.15.svg.txt} (100%)
 rename test/plugins/{removeMetadata.01.svg => removeMetadata.01.svg.txt} (100%)
 rename test/plugins/{removeNonInheritableGroupAttrs.01.svg => removeNonInheritableGroupAttrs.01.svg.txt} (100%)
 rename test/plugins/{removeNonInheritableGroupAttrs.02.svg => removeNonInheritableGroupAttrs.02.svg.txt} (100%)
 rename test/plugins/{removeOffCanvasPaths.01.svg => removeOffCanvasPaths.01.svg.txt} (100%)
 rename test/plugins/{removeOffCanvasPaths.02.svg => removeOffCanvasPaths.02.svg.txt} (100%)
 rename test/plugins/{removeOffCanvasPaths.03.svg => removeOffCanvasPaths.03.svg.txt} (100%)
 rename test/plugins/{removeOffCanvasPaths.04.svg => removeOffCanvasPaths.04.svg.txt} (100%)
 rename test/plugins/{removeOffCanvasPaths.05.svg => removeOffCanvasPaths.05.svg.txt} (100%)
 rename test/plugins/{removeOffCanvasPaths.06.svg => removeOffCanvasPaths.06.svg.txt} (100%)
 rename test/plugins/{removeRasterImages.01.svg => removeRasterImages.01.svg.txt} (100%)
 rename test/plugins/{removeRasterImages.02.svg => removeRasterImages.02.svg.txt} (100%)
 rename test/plugins/{removeScriptElement.01.svg => removeScriptElement.01.svg.txt} (100%)
 rename test/plugins/{removeScriptElement.02.svg => removeScriptElement.02.svg.txt} (100%)
 rename test/plugins/{removeScriptElement.03.svg => removeScriptElement.03.svg.txt} (100%)
 rename test/plugins/{removeScriptElement.04.svg => removeScriptElement.04.svg.txt} (100%)
 rename test/plugins/{removeScriptElement.05.svg => removeScriptElement.05.svg.txt} (100%)
 rename test/plugins/{removeStyleElement.01.svg => removeStyleElement.01.svg.txt} (100%)
 rename test/plugins/{removeTitle.01.svg => removeTitle.01.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.01.svg => removeUnknownsAndDefaults.01.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.02.svg => removeUnknownsAndDefaults.02.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.03.svg => removeUnknownsAndDefaults.03.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.04.svg => removeUnknownsAndDefaults.04.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.05.svg => removeUnknownsAndDefaults.05.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.06.svg => removeUnknownsAndDefaults.06.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.07.svg => removeUnknownsAndDefaults.07.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.08.svg => removeUnknownsAndDefaults.08.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.09.svg => removeUnknownsAndDefaults.09.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.10.svg => removeUnknownsAndDefaults.10.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.11.svg => removeUnknownsAndDefaults.11.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.12.svg => removeUnknownsAndDefaults.12.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.13.svg => removeUnknownsAndDefaults.13.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.14.svg => removeUnknownsAndDefaults.14.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.15.svg => removeUnknownsAndDefaults.15.svg.txt} (100%)
 rename test/plugins/{removeUnknownsAndDefaults.16.svg => removeUnknownsAndDefaults.16.svg.txt} (100%)
 rename test/plugins/{removeUnusedNS.01.svg => removeUnusedNS.01.svg.txt} (100%)
 rename test/plugins/{removeUnusedNS.02.svg => removeUnusedNS.02.svg.txt} (100%)
 rename test/plugins/{removeUnusedNS.03.svg => removeUnusedNS.03.svg.txt} (100%)
 rename test/plugins/{removeUnusedNS.04.svg => removeUnusedNS.04.svg.txt} (100%)
 rename test/plugins/{removeUnusedNS.05.svg => removeUnusedNS.05.svg.txt} (100%)
 rename test/plugins/{removeUnusedNS.06.svg => removeUnusedNS.06.svg.txt} (100%)
 rename test/plugins/{removeUnusedNS.07.svg => removeUnusedNS.07.svg.txt} (100%)
 rename test/plugins/{removeUselessDefs.01.svg => removeUselessDefs.01.svg.txt} (100%)
 rename test/plugins/{removeUselessDefs.02.svg => removeUselessDefs.02.svg.txt} (100%)
 rename test/plugins/{removeUselessDefs.03.svg => removeUselessDefs.03.svg.txt} (100%)
 rename test/plugins/{removeUselessDefs.04.svg => removeUselessDefs.04.svg.txt} (100%)
 rename test/plugins/{removeUselessDefs.05.svg => removeUselessDefs.05.svg.txt} (100%)
 rename test/plugins/{removeUselessStrokeAndFill.01.svg => removeUselessStrokeAndFill.01.svg.txt} (100%)
 rename test/plugins/{removeUselessStrokeAndFill.02.svg => removeUselessStrokeAndFill.02.svg.txt} (100%)
 rename test/plugins/{removeUselessStrokeAndFill.03.svg => removeUselessStrokeAndFill.03.svg.txt} (100%)
 rename test/plugins/{removeUselessStrokeAndFill.04.svg => removeUselessStrokeAndFill.04.svg.txt} (100%)
 rename test/plugins/{removeUselessStrokeAndFill.05.svg => removeUselessStrokeAndFill.05.svg.txt} (100%)
 rename test/plugins/{removeViewBox.01.svg => removeViewBox.01.svg.txt} (100%)
 rename test/plugins/{removeViewBox.02.svg => removeViewBox.02.svg.txt} (100%)
 rename test/plugins/{removeViewBox.03.svg => removeViewBox.03.svg.txt} (100%)
 rename test/plugins/{removeViewBox.04.svg => removeViewBox.04.svg.txt} (100%)
 rename test/plugins/{removeViewBox.05.svg => removeViewBox.05.svg.txt} (100%)
 rename test/plugins/{removeXMLNS.01.svg => removeXMLNS.01.svg.txt} (100%)
 rename test/plugins/{removeXMLProcInst.01.svg => removeXMLProcInst.01.svg.txt} (100%)
 rename test/plugins/{removeXMLProcInst.02.svg => removeXMLProcInst.02.svg.txt} (100%)
 rename test/plugins/{removeXlink.01.svg => removeXlink.01.svg.txt} (100%)
 rename test/plugins/{removeXlink.02.svg => removeXlink.02.svg.txt} (100%)
 rename test/plugins/{removeXlink.03.svg => removeXlink.03.svg.txt} (100%)
 rename test/plugins/{removeXlink.04.svg => removeXlink.04.svg.txt} (100%)
 rename test/plugins/{reusePaths.01.svg => reusePaths.01.svg.txt} (100%)
 rename test/plugins/{reusePaths.02.svg => reusePaths.02.svg.txt} (100%)
 rename test/plugins/{reusePaths.03.svg => reusePaths.03.svg.txt} (100%)
 rename test/plugins/{reusePaths.04.svg => reusePaths.04.svg.txt} (100%)
 rename test/plugins/{reusePaths.05.svg => reusePaths.05.svg.txt} (100%)
 rename test/plugins/{reusePaths.06.svg => reusePaths.06.svg.txt} (100%)
 rename test/plugins/{sortAttrs.01.svg => sortAttrs.01.svg.txt} (100%)
 rename test/plugins/{sortAttrs.02.svg => sortAttrs.02.svg.txt} (100%)
 rename test/plugins/{sortAttrs.03.svg => sortAttrs.03.svg.txt} (100%)
 rename test/plugins/{sortAttrs.04.svg => sortAttrs.04.svg.txt} (100%)
 rename test/plugins/{sortDefsChildren.01.svg => sortDefsChildren.01.svg.txt} (100%)

diff --git a/.gitignore b/.gitignore
index 1c9775de0..f834ff6ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ test/regression-diffs
 test/cli/output
 coverage
 .DS_Store
+.vscode
 *.log
diff --git a/test/plugins/_index.test.js b/test/plugins/_index.test.js
index 2c57686be..42fd17766 100644
--- a/test/plugins/_index.test.js
+++ b/test/plugins/_index.test.js
@@ -5,7 +5,7 @@ import { fileURLToPath } from 'url';
 import { optimize } from '../../lib/svgo.js';
 
 const regEOL = new RegExp(EOL, 'g');
-const regFilename = /^(.*)\.(\d+)\.svg$/;
+const regFilename = /^(.*)\.(\d+)\.svg\.txt$/;
 const __dirname = PATH.dirname(fileURLToPath(import.meta.url));
 
 describe('plugins tests', function () {
diff --git a/test/plugins/addAttributesToSVGElement.01.svg b/test/plugins/addAttributesToSVGElement.01.svg.txt
similarity index 100%
rename from test/plugins/addAttributesToSVGElement.01.svg
rename to test/plugins/addAttributesToSVGElement.01.svg.txt
diff --git a/test/plugins/addAttributesToSVGElement.02.svg b/test/plugins/addAttributesToSVGElement.02.svg.txt
similarity index 100%
rename from test/plugins/addAttributesToSVGElement.02.svg
rename to test/plugins/addAttributesToSVGElement.02.svg.txt
diff --git a/test/plugins/addAttributesToSVGElement.03.svg b/test/plugins/addAttributesToSVGElement.03.svg.txt
similarity index 100%
rename from test/plugins/addAttributesToSVGElement.03.svg
rename to test/plugins/addAttributesToSVGElement.03.svg.txt
diff --git a/test/plugins/addAttributesToSVGElement.04.svg b/test/plugins/addAttributesToSVGElement.04.svg.txt
similarity index 100%
rename from test/plugins/addAttributesToSVGElement.04.svg
rename to test/plugins/addAttributesToSVGElement.04.svg.txt
diff --git a/test/plugins/addClassesToSVGElement.01.svg b/test/plugins/addClassesToSVGElement.01.svg.txt
similarity index 100%
rename from test/plugins/addClassesToSVGElement.01.svg
rename to test/plugins/addClassesToSVGElement.01.svg.txt
diff --git a/test/plugins/addClassesToSVGElement.02.svg b/test/plugins/addClassesToSVGElement.02.svg.txt
similarity index 100%
rename from test/plugins/addClassesToSVGElement.02.svg
rename to test/plugins/addClassesToSVGElement.02.svg.txt
diff --git a/test/plugins/addClassesToSVGElement.03.svg b/test/plugins/addClassesToSVGElement.03.svg.txt
similarity index 100%
rename from test/plugins/addClassesToSVGElement.03.svg
rename to test/plugins/addClassesToSVGElement.03.svg.txt
diff --git a/test/plugins/cleanupAttrs.01.svg b/test/plugins/cleanupAttrs.01.svg.txt
similarity index 100%
rename from test/plugins/cleanupAttrs.01.svg
rename to test/plugins/cleanupAttrs.01.svg.txt
diff --git a/test/plugins/cleanupAttrs.02.svg b/test/plugins/cleanupAttrs.02.svg.txt
similarity index 100%
rename from test/plugins/cleanupAttrs.02.svg
rename to test/plugins/cleanupAttrs.02.svg.txt
diff --git a/test/plugins/cleanupEnableBackground.01.svg b/test/plugins/cleanupEnableBackground.01.svg.txt
similarity index 100%
rename from test/plugins/cleanupEnableBackground.01.svg
rename to test/plugins/cleanupEnableBackground.01.svg.txt
diff --git a/test/plugins/cleanupEnableBackground.02.svg b/test/plugins/cleanupEnableBackground.02.svg.txt
similarity index 100%
rename from test/plugins/cleanupEnableBackground.02.svg
rename to test/plugins/cleanupEnableBackground.02.svg.txt
diff --git a/test/plugins/cleanupEnableBackground.03.svg b/test/plugins/cleanupEnableBackground.03.svg.txt
similarity index 100%
rename from test/plugins/cleanupEnableBackground.03.svg
rename to test/plugins/cleanupEnableBackground.03.svg.txt
diff --git a/test/plugins/cleanupEnableBackground.04.svg b/test/plugins/cleanupEnableBackground.04.svg.txt
similarity index 100%
rename from test/plugins/cleanupEnableBackground.04.svg
rename to test/plugins/cleanupEnableBackground.04.svg.txt
diff --git a/test/plugins/cleanupEnableBackground.05.svg b/test/plugins/cleanupEnableBackground.05.svg.txt
similarity index 100%
rename from test/plugins/cleanupEnableBackground.05.svg
rename to test/plugins/cleanupEnableBackground.05.svg.txt
diff --git a/test/plugins/cleanupIds.01.svg b/test/plugins/cleanupIds.01.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.01.svg
rename to test/plugins/cleanupIds.01.svg.txt
diff --git a/test/plugins/cleanupIds.02.svg b/test/plugins/cleanupIds.02.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.02.svg
rename to test/plugins/cleanupIds.02.svg.txt
diff --git a/test/plugins/cleanupIds.03.svg b/test/plugins/cleanupIds.03.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.03.svg
rename to test/plugins/cleanupIds.03.svg.txt
diff --git a/test/plugins/cleanupIds.04.svg b/test/plugins/cleanupIds.04.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.04.svg
rename to test/plugins/cleanupIds.04.svg.txt
diff --git a/test/plugins/cleanupIds.05.svg b/test/plugins/cleanupIds.05.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.05.svg
rename to test/plugins/cleanupIds.05.svg.txt
diff --git a/test/plugins/cleanupIds.06.svg b/test/plugins/cleanupIds.06.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.06.svg
rename to test/plugins/cleanupIds.06.svg.txt
diff --git a/test/plugins/cleanupIds.07.svg b/test/plugins/cleanupIds.07.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.07.svg
rename to test/plugins/cleanupIds.07.svg.txt
diff --git a/test/plugins/cleanupIds.08.svg b/test/plugins/cleanupIds.08.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.08.svg
rename to test/plugins/cleanupIds.08.svg.txt
diff --git a/test/plugins/cleanupIds.09.svg b/test/plugins/cleanupIds.09.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.09.svg
rename to test/plugins/cleanupIds.09.svg.txt
diff --git a/test/plugins/cleanupIds.10.svg b/test/plugins/cleanupIds.10.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.10.svg
rename to test/plugins/cleanupIds.10.svg.txt
diff --git a/test/plugins/cleanupIds.11.svg b/test/plugins/cleanupIds.11.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.11.svg
rename to test/plugins/cleanupIds.11.svg.txt
diff --git a/test/plugins/cleanupIds.12.svg b/test/plugins/cleanupIds.12.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.12.svg
rename to test/plugins/cleanupIds.12.svg.txt
diff --git a/test/plugins/cleanupIds.13.svg b/test/plugins/cleanupIds.13.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.13.svg
rename to test/plugins/cleanupIds.13.svg.txt
diff --git a/test/plugins/cleanupIds.14.svg b/test/plugins/cleanupIds.14.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.14.svg
rename to test/plugins/cleanupIds.14.svg.txt
diff --git a/test/plugins/cleanupIds.15.svg b/test/plugins/cleanupIds.15.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.15.svg
rename to test/plugins/cleanupIds.15.svg.txt
diff --git a/test/plugins/cleanupIds.16.svg b/test/plugins/cleanupIds.16.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.16.svg
rename to test/plugins/cleanupIds.16.svg.txt
diff --git a/test/plugins/cleanupIds.17.svg b/test/plugins/cleanupIds.17.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.17.svg
rename to test/plugins/cleanupIds.17.svg.txt
diff --git a/test/plugins/cleanupIds.18.svg b/test/plugins/cleanupIds.18.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.18.svg
rename to test/plugins/cleanupIds.18.svg.txt
diff --git a/test/plugins/cleanupIds.19.svg b/test/plugins/cleanupIds.19.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.19.svg
rename to test/plugins/cleanupIds.19.svg.txt
diff --git a/test/plugins/cleanupIds.20.svg b/test/plugins/cleanupIds.20.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.20.svg
rename to test/plugins/cleanupIds.20.svg.txt
diff --git a/test/plugins/cleanupIds.21.svg b/test/plugins/cleanupIds.21.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.21.svg
rename to test/plugins/cleanupIds.21.svg.txt
diff --git a/test/plugins/cleanupIds.22.svg b/test/plugins/cleanupIds.22.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.22.svg
rename to test/plugins/cleanupIds.22.svg.txt
diff --git a/test/plugins/cleanupIds.23.svg b/test/plugins/cleanupIds.23.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.23.svg
rename to test/plugins/cleanupIds.23.svg.txt
diff --git a/test/plugins/cleanupIds.24.svg b/test/plugins/cleanupIds.24.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.24.svg
rename to test/plugins/cleanupIds.24.svg.txt
diff --git a/test/plugins/cleanupIds.25.svg b/test/plugins/cleanupIds.25.svg.txt
similarity index 100%
rename from test/plugins/cleanupIds.25.svg
rename to test/plugins/cleanupIds.25.svg.txt
diff --git a/test/plugins/cleanupListOfValues.01.svg b/test/plugins/cleanupListOfValues.01.svg.txt
similarity index 100%
rename from test/plugins/cleanupListOfValues.01.svg
rename to test/plugins/cleanupListOfValues.01.svg.txt
diff --git a/test/plugins/cleanupListOfValues.02.svg b/test/plugins/cleanupListOfValues.02.svg.txt
similarity index 100%
rename from test/plugins/cleanupListOfValues.02.svg
rename to test/plugins/cleanupListOfValues.02.svg.txt
diff --git a/test/plugins/cleanupListOfValues.03.svg b/test/plugins/cleanupListOfValues.03.svg.txt
similarity index 100%
rename from test/plugins/cleanupListOfValues.03.svg
rename to test/plugins/cleanupListOfValues.03.svg.txt
diff --git a/test/plugins/cleanupNumericValues.01.svg b/test/plugins/cleanupNumericValues.01.svg.txt
similarity index 100%
rename from test/plugins/cleanupNumericValues.01.svg
rename to test/plugins/cleanupNumericValues.01.svg.txt
diff --git a/test/plugins/cleanupNumericValues.02.svg b/test/plugins/cleanupNumericValues.02.svg.txt
similarity index 100%
rename from test/plugins/cleanupNumericValues.02.svg
rename to test/plugins/cleanupNumericValues.02.svg.txt
diff --git a/test/plugins/collapseGroups.01.svg b/test/plugins/collapseGroups.01.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.01.svg
rename to test/plugins/collapseGroups.01.svg.txt
diff --git a/test/plugins/collapseGroups.02.svg b/test/plugins/collapseGroups.02.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.02.svg
rename to test/plugins/collapseGroups.02.svg.txt
diff --git a/test/plugins/collapseGroups.06.svg b/test/plugins/collapseGroups.06.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.06.svg
rename to test/plugins/collapseGroups.06.svg.txt
diff --git a/test/plugins/collapseGroups.07.svg b/test/plugins/collapseGroups.07.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.07.svg
rename to test/plugins/collapseGroups.07.svg.txt
diff --git a/test/plugins/collapseGroups.08.svg b/test/plugins/collapseGroups.08.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.08.svg
rename to test/plugins/collapseGroups.08.svg.txt
diff --git a/test/plugins/collapseGroups.09.svg b/test/plugins/collapseGroups.09.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.09.svg
rename to test/plugins/collapseGroups.09.svg.txt
diff --git a/test/plugins/collapseGroups.11.svg b/test/plugins/collapseGroups.11.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.11.svg
rename to test/plugins/collapseGroups.11.svg.txt
diff --git a/test/plugins/collapseGroups.12.svg b/test/plugins/collapseGroups.12.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.12.svg
rename to test/plugins/collapseGroups.12.svg.txt
diff --git a/test/plugins/collapseGroups.13.svg b/test/plugins/collapseGroups.13.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.13.svg
rename to test/plugins/collapseGroups.13.svg.txt
diff --git a/test/plugins/collapseGroups.14.svg b/test/plugins/collapseGroups.14.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.14.svg
rename to test/plugins/collapseGroups.14.svg.txt
diff --git a/test/plugins/collapseGroups.15.svg b/test/plugins/collapseGroups.15.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.15.svg
rename to test/plugins/collapseGroups.15.svg.txt
diff --git a/test/plugins/collapseGroups.16.svg b/test/plugins/collapseGroups.16.svg.txt
similarity index 100%
rename from test/plugins/collapseGroups.16.svg
rename to test/plugins/collapseGroups.16.svg.txt
diff --git a/test/plugins/convertColors.01.svg b/test/plugins/convertColors.01.svg.txt
similarity index 100%
rename from test/plugins/convertColors.01.svg
rename to test/plugins/convertColors.01.svg.txt
diff --git a/test/plugins/convertColors.02.svg b/test/plugins/convertColors.02.svg.txt
similarity index 100%
rename from test/plugins/convertColors.02.svg
rename to test/plugins/convertColors.02.svg.txt
diff --git a/test/plugins/convertColors.03.svg b/test/plugins/convertColors.03.svg.txt
similarity index 100%
rename from test/plugins/convertColors.03.svg
rename to test/plugins/convertColors.03.svg.txt
diff --git a/test/plugins/convertColors.04.svg b/test/plugins/convertColors.04.svg.txt
similarity index 100%
rename from test/plugins/convertColors.04.svg
rename to test/plugins/convertColors.04.svg.txt
diff --git a/test/plugins/convertEllipseToCircle.01.svg b/test/plugins/convertEllipseToCircle.01.svg.txt
similarity index 100%
rename from test/plugins/convertEllipseToCircle.01.svg
rename to test/plugins/convertEllipseToCircle.01.svg.txt
diff --git a/test/plugins/convertOneStopGradients.01.svg b/test/plugins/convertOneStopGradients.01.svg.txt
similarity index 100%
rename from test/plugins/convertOneStopGradients.01.svg
rename to test/plugins/convertOneStopGradients.01.svg.txt
diff --git a/test/plugins/convertOneStopGradients.02.svg b/test/plugins/convertOneStopGradients.02.svg.txt
similarity index 100%
rename from test/plugins/convertOneStopGradients.02.svg
rename to test/plugins/convertOneStopGradients.02.svg.txt
diff --git a/test/plugins/convertOneStopGradients.03.svg b/test/plugins/convertOneStopGradients.03.svg.txt
similarity index 100%
rename from test/plugins/convertOneStopGradients.03.svg
rename to test/plugins/convertOneStopGradients.03.svg.txt
diff --git a/test/plugins/convertPathData.01.svg b/test/plugins/convertPathData.01.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.01.svg
rename to test/plugins/convertPathData.01.svg.txt
diff --git a/test/plugins/convertPathData.02.svg b/test/plugins/convertPathData.02.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.02.svg
rename to test/plugins/convertPathData.02.svg.txt
diff --git a/test/plugins/convertPathData.03.svg b/test/plugins/convertPathData.03.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.03.svg
rename to test/plugins/convertPathData.03.svg.txt
diff --git a/test/plugins/convertPathData.04.svg b/test/plugins/convertPathData.04.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.04.svg
rename to test/plugins/convertPathData.04.svg.txt
diff --git a/test/plugins/convertPathData.05.svg b/test/plugins/convertPathData.05.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.05.svg
rename to test/plugins/convertPathData.05.svg.txt
diff --git a/test/plugins/convertPathData.06.svg b/test/plugins/convertPathData.06.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.06.svg
rename to test/plugins/convertPathData.06.svg.txt
diff --git a/test/plugins/convertPathData.07.svg b/test/plugins/convertPathData.07.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.07.svg
rename to test/plugins/convertPathData.07.svg.txt
diff --git a/test/plugins/convertPathData.08.svg b/test/plugins/convertPathData.08.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.08.svg
rename to test/plugins/convertPathData.08.svg.txt
diff --git a/test/plugins/convertPathData.09.svg b/test/plugins/convertPathData.09.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.09.svg
rename to test/plugins/convertPathData.09.svg.txt
diff --git a/test/plugins/convertPathData.10.svg b/test/plugins/convertPathData.10.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.10.svg
rename to test/plugins/convertPathData.10.svg.txt
diff --git a/test/plugins/convertPathData.11.svg b/test/plugins/convertPathData.11.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.11.svg
rename to test/plugins/convertPathData.11.svg.txt
diff --git a/test/plugins/convertPathData.12.svg b/test/plugins/convertPathData.12.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.12.svg
rename to test/plugins/convertPathData.12.svg.txt
diff --git a/test/plugins/convertPathData.13.svg b/test/plugins/convertPathData.13.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.13.svg
rename to test/plugins/convertPathData.13.svg.txt
diff --git a/test/plugins/convertPathData.14.svg b/test/plugins/convertPathData.14.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.14.svg
rename to test/plugins/convertPathData.14.svg.txt
diff --git a/test/plugins/convertPathData.15.svg b/test/plugins/convertPathData.15.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.15.svg
rename to test/plugins/convertPathData.15.svg.txt
diff --git a/test/plugins/convertPathData.16.svg b/test/plugins/convertPathData.16.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.16.svg
rename to test/plugins/convertPathData.16.svg.txt
diff --git a/test/plugins/convertPathData.17.svg b/test/plugins/convertPathData.17.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.17.svg
rename to test/plugins/convertPathData.17.svg.txt
diff --git a/test/plugins/convertPathData.18.svg b/test/plugins/convertPathData.18.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.18.svg
rename to test/plugins/convertPathData.18.svg.txt
diff --git a/test/plugins/convertPathData.19.svg b/test/plugins/convertPathData.19.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.19.svg
rename to test/plugins/convertPathData.19.svg.txt
diff --git a/test/plugins/convertPathData.20.svg b/test/plugins/convertPathData.20.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.20.svg
rename to test/plugins/convertPathData.20.svg.txt
diff --git a/test/plugins/convertPathData.21.svg b/test/plugins/convertPathData.21.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.21.svg
rename to test/plugins/convertPathData.21.svg.txt
diff --git a/test/plugins/convertPathData.22.svg b/test/plugins/convertPathData.22.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.22.svg
rename to test/plugins/convertPathData.22.svg.txt
diff --git a/test/plugins/convertPathData.23.svg b/test/plugins/convertPathData.23.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.23.svg
rename to test/plugins/convertPathData.23.svg.txt
diff --git a/test/plugins/convertPathData.24.svg b/test/plugins/convertPathData.24.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.24.svg
rename to test/plugins/convertPathData.24.svg.txt
diff --git a/test/plugins/convertPathData.25.svg b/test/plugins/convertPathData.25.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.25.svg
rename to test/plugins/convertPathData.25.svg.txt
diff --git a/test/plugins/convertPathData.26.svg b/test/plugins/convertPathData.26.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.26.svg
rename to test/plugins/convertPathData.26.svg.txt
diff --git a/test/plugins/convertPathData.27.svg b/test/plugins/convertPathData.27.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.27.svg
rename to test/plugins/convertPathData.27.svg.txt
diff --git a/test/plugins/convertPathData.28.svg b/test/plugins/convertPathData.28.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.28.svg
rename to test/plugins/convertPathData.28.svg.txt
diff --git a/test/plugins/convertPathData.29.svg b/test/plugins/convertPathData.29.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.29.svg
rename to test/plugins/convertPathData.29.svg.txt
diff --git a/test/plugins/convertPathData.30.svg b/test/plugins/convertPathData.30.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.30.svg
rename to test/plugins/convertPathData.30.svg.txt
diff --git a/test/plugins/convertPathData.31.svg b/test/plugins/convertPathData.31.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.31.svg
rename to test/plugins/convertPathData.31.svg.txt
diff --git a/test/plugins/convertPathData.32.svg b/test/plugins/convertPathData.32.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.32.svg
rename to test/plugins/convertPathData.32.svg.txt
diff --git a/test/plugins/convertPathData.33.svg b/test/plugins/convertPathData.33.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.33.svg
rename to test/plugins/convertPathData.33.svg.txt
diff --git a/test/plugins/convertPathData.34.svg b/test/plugins/convertPathData.34.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.34.svg
rename to test/plugins/convertPathData.34.svg.txt
diff --git a/test/plugins/convertPathData.35.svg b/test/plugins/convertPathData.35.svg.txt
similarity index 100%
rename from test/plugins/convertPathData.35.svg
rename to test/plugins/convertPathData.35.svg.txt
diff --git a/test/plugins/convertShapeToPath.01.svg b/test/plugins/convertShapeToPath.01.svg.txt
similarity index 100%
rename from test/plugins/convertShapeToPath.01.svg
rename to test/plugins/convertShapeToPath.01.svg.txt
diff --git a/test/plugins/convertShapeToPath.02.svg b/test/plugins/convertShapeToPath.02.svg.txt
similarity index 100%
rename from test/plugins/convertShapeToPath.02.svg
rename to test/plugins/convertShapeToPath.02.svg.txt
diff --git a/test/plugins/convertShapeToPath.03.svg b/test/plugins/convertShapeToPath.03.svg.txt
similarity index 100%
rename from test/plugins/convertShapeToPath.03.svg
rename to test/plugins/convertShapeToPath.03.svg.txt
diff --git a/test/plugins/convertShapeToPath.04.svg b/test/plugins/convertShapeToPath.04.svg.txt
similarity index 100%
rename from test/plugins/convertShapeToPath.04.svg
rename to test/plugins/convertShapeToPath.04.svg.txt
diff --git a/test/plugins/convertShapeToPath.05.svg b/test/plugins/convertShapeToPath.05.svg.txt
similarity index 100%
rename from test/plugins/convertShapeToPath.05.svg
rename to test/plugins/convertShapeToPath.05.svg.txt
diff --git a/test/plugins/convertStyleToAttrs.01.svg b/test/plugins/convertStyleToAttrs.01.svg.txt
similarity index 100%
rename from test/plugins/convertStyleToAttrs.01.svg
rename to test/plugins/convertStyleToAttrs.01.svg.txt
diff --git a/test/plugins/convertStyleToAttrs.02.svg b/test/plugins/convertStyleToAttrs.02.svg.txt
similarity index 100%
rename from test/plugins/convertStyleToAttrs.02.svg
rename to test/plugins/convertStyleToAttrs.02.svg.txt
diff --git a/test/plugins/convertStyleToAttrs.03.svg b/test/plugins/convertStyleToAttrs.03.svg.txt
similarity index 100%
rename from test/plugins/convertStyleToAttrs.03.svg
rename to test/plugins/convertStyleToAttrs.03.svg.txt
diff --git a/test/plugins/convertStyleToAttrs.04.svg b/test/plugins/convertStyleToAttrs.04.svg.txt
similarity index 100%
rename from test/plugins/convertStyleToAttrs.04.svg
rename to test/plugins/convertStyleToAttrs.04.svg.txt
diff --git a/test/plugins/convertStyleToAttrs.05.svg b/test/plugins/convertStyleToAttrs.05.svg.txt
similarity index 100%
rename from test/plugins/convertStyleToAttrs.05.svg
rename to test/plugins/convertStyleToAttrs.05.svg.txt
diff --git a/test/plugins/convertTransform.01.svg b/test/plugins/convertTransform.01.svg.txt
similarity index 100%
rename from test/plugins/convertTransform.01.svg
rename to test/plugins/convertTransform.01.svg.txt
diff --git a/test/plugins/convertTransform.02.svg b/test/plugins/convertTransform.02.svg.txt
similarity index 100%
rename from test/plugins/convertTransform.02.svg
rename to test/plugins/convertTransform.02.svg.txt
diff --git a/test/plugins/convertTransform.03.svg b/test/plugins/convertTransform.03.svg.txt
similarity index 100%
rename from test/plugins/convertTransform.03.svg
rename to test/plugins/convertTransform.03.svg.txt
diff --git a/test/plugins/convertTransform.04.svg b/test/plugins/convertTransform.04.svg.txt
similarity index 100%
rename from test/plugins/convertTransform.04.svg
rename to test/plugins/convertTransform.04.svg.txt
diff --git a/test/plugins/convertTransform.05.svg b/test/plugins/convertTransform.05.svg.txt
similarity index 100%
rename from test/plugins/convertTransform.05.svg
rename to test/plugins/convertTransform.05.svg.txt
diff --git a/test/plugins/inlineStyles.01.svg b/test/plugins/inlineStyles.01.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.01.svg
rename to test/plugins/inlineStyles.01.svg.txt
diff --git a/test/plugins/inlineStyles.02.svg b/test/plugins/inlineStyles.02.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.02.svg
rename to test/plugins/inlineStyles.02.svg.txt
diff --git a/test/plugins/inlineStyles.03.svg b/test/plugins/inlineStyles.03.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.03.svg
rename to test/plugins/inlineStyles.03.svg.txt
diff --git a/test/plugins/inlineStyles.04.svg b/test/plugins/inlineStyles.04.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.04.svg
rename to test/plugins/inlineStyles.04.svg.txt
diff --git a/test/plugins/inlineStyles.05.svg b/test/plugins/inlineStyles.05.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.05.svg
rename to test/plugins/inlineStyles.05.svg.txt
diff --git a/test/plugins/inlineStyles.06.svg b/test/plugins/inlineStyles.06.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.06.svg
rename to test/plugins/inlineStyles.06.svg.txt
diff --git a/test/plugins/inlineStyles.07.svg b/test/plugins/inlineStyles.07.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.07.svg
rename to test/plugins/inlineStyles.07.svg.txt
diff --git a/test/plugins/inlineStyles.08.svg b/test/plugins/inlineStyles.08.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.08.svg
rename to test/plugins/inlineStyles.08.svg.txt
diff --git a/test/plugins/inlineStyles.09.svg b/test/plugins/inlineStyles.09.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.09.svg
rename to test/plugins/inlineStyles.09.svg.txt
diff --git a/test/plugins/inlineStyles.10.svg b/test/plugins/inlineStyles.10.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.10.svg
rename to test/plugins/inlineStyles.10.svg.txt
diff --git a/test/plugins/inlineStyles.11.svg b/test/plugins/inlineStyles.11.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.11.svg
rename to test/plugins/inlineStyles.11.svg.txt
diff --git a/test/plugins/inlineStyles.12.svg b/test/plugins/inlineStyles.12.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.12.svg
rename to test/plugins/inlineStyles.12.svg.txt
diff --git a/test/plugins/inlineStyles.13.svg b/test/plugins/inlineStyles.13.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.13.svg
rename to test/plugins/inlineStyles.13.svg.txt
diff --git a/test/plugins/inlineStyles.14.svg b/test/plugins/inlineStyles.14.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.14.svg
rename to test/plugins/inlineStyles.14.svg.txt
diff --git a/test/plugins/inlineStyles.15.svg b/test/plugins/inlineStyles.15.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.15.svg
rename to test/plugins/inlineStyles.15.svg.txt
diff --git a/test/plugins/inlineStyles.16.svg b/test/plugins/inlineStyles.16.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.16.svg
rename to test/plugins/inlineStyles.16.svg.txt
diff --git a/test/plugins/inlineStyles.17.svg b/test/plugins/inlineStyles.17.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.17.svg
rename to test/plugins/inlineStyles.17.svg.txt
diff --git a/test/plugins/inlineStyles.18.svg b/test/plugins/inlineStyles.18.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.18.svg
rename to test/plugins/inlineStyles.18.svg.txt
diff --git a/test/plugins/inlineStyles.19.svg b/test/plugins/inlineStyles.19.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.19.svg
rename to test/plugins/inlineStyles.19.svg.txt
diff --git a/test/plugins/inlineStyles.20.svg b/test/plugins/inlineStyles.20.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.20.svg
rename to test/plugins/inlineStyles.20.svg.txt
diff --git a/test/plugins/inlineStyles.21.svg b/test/plugins/inlineStyles.21.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.21.svg
rename to test/plugins/inlineStyles.21.svg.txt
diff --git a/test/plugins/inlineStyles.22.svg b/test/plugins/inlineStyles.22.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.22.svg
rename to test/plugins/inlineStyles.22.svg.txt
diff --git a/test/plugins/inlineStyles.23.svg b/test/plugins/inlineStyles.23.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.23.svg
rename to test/plugins/inlineStyles.23.svg.txt
diff --git a/test/plugins/inlineStyles.24.svg b/test/plugins/inlineStyles.24.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.24.svg
rename to test/plugins/inlineStyles.24.svg.txt
diff --git a/test/plugins/inlineStyles.25.svg b/test/plugins/inlineStyles.25.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.25.svg
rename to test/plugins/inlineStyles.25.svg.txt
diff --git a/test/plugins/inlineStyles.26.svg b/test/plugins/inlineStyles.26.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.26.svg
rename to test/plugins/inlineStyles.26.svg.txt
diff --git a/test/plugins/inlineStyles.27.svg b/test/plugins/inlineStyles.27.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.27.svg
rename to test/plugins/inlineStyles.27.svg.txt
diff --git a/test/plugins/inlineStyles.28.svg b/test/plugins/inlineStyles.28.svg.txt
similarity index 100%
rename from test/plugins/inlineStyles.28.svg
rename to test/plugins/inlineStyles.28.svg.txt
diff --git a/test/plugins/mergePaths.01.svg b/test/plugins/mergePaths.01.svg.txt
similarity index 100%
rename from test/plugins/mergePaths.01.svg
rename to test/plugins/mergePaths.01.svg.txt
diff --git a/test/plugins/mergePaths.02.svg b/test/plugins/mergePaths.02.svg.txt
similarity index 100%
rename from test/plugins/mergePaths.02.svg
rename to test/plugins/mergePaths.02.svg.txt
diff --git a/test/plugins/mergePaths.03.svg b/test/plugins/mergePaths.03.svg.txt
similarity index 100%
rename from test/plugins/mergePaths.03.svg
rename to test/plugins/mergePaths.03.svg.txt
diff --git a/test/plugins/mergePaths.04.svg b/test/plugins/mergePaths.04.svg.txt
similarity index 100%
rename from test/plugins/mergePaths.04.svg
rename to test/plugins/mergePaths.04.svg.txt
diff --git a/test/plugins/mergePaths.05.svg b/test/plugins/mergePaths.05.svg.txt
similarity index 100%
rename from test/plugins/mergePaths.05.svg
rename to test/plugins/mergePaths.05.svg.txt
diff --git a/test/plugins/mergePaths.06.svg b/test/plugins/mergePaths.06.svg.txt
similarity index 100%
rename from test/plugins/mergePaths.06.svg
rename to test/plugins/mergePaths.06.svg.txt
diff --git a/test/plugins/mergePaths.07.svg b/test/plugins/mergePaths.07.svg.txt
similarity index 100%
rename from test/plugins/mergePaths.07.svg
rename to test/plugins/mergePaths.07.svg.txt
diff --git a/test/plugins/mergeStyles.01.svg b/test/plugins/mergeStyles.01.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.01.svg
rename to test/plugins/mergeStyles.01.svg.txt
diff --git a/test/plugins/mergeStyles.02.svg b/test/plugins/mergeStyles.02.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.02.svg
rename to test/plugins/mergeStyles.02.svg.txt
diff --git a/test/plugins/mergeStyles.03.svg b/test/plugins/mergeStyles.03.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.03.svg
rename to test/plugins/mergeStyles.03.svg.txt
diff --git a/test/plugins/mergeStyles.04.svg b/test/plugins/mergeStyles.04.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.04.svg
rename to test/plugins/mergeStyles.04.svg.txt
diff --git a/test/plugins/mergeStyles.05.svg b/test/plugins/mergeStyles.05.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.05.svg
rename to test/plugins/mergeStyles.05.svg.txt
diff --git a/test/plugins/mergeStyles.06.svg b/test/plugins/mergeStyles.06.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.06.svg
rename to test/plugins/mergeStyles.06.svg.txt
diff --git a/test/plugins/mergeStyles.07.svg b/test/plugins/mergeStyles.07.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.07.svg
rename to test/plugins/mergeStyles.07.svg.txt
diff --git a/test/plugins/mergeStyles.08.svg b/test/plugins/mergeStyles.08.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.08.svg
rename to test/plugins/mergeStyles.08.svg.txt
diff --git a/test/plugins/mergeStyles.09.svg b/test/plugins/mergeStyles.09.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.09.svg
rename to test/plugins/mergeStyles.09.svg.txt
diff --git a/test/plugins/mergeStyles.10.svg b/test/plugins/mergeStyles.10.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.10.svg
rename to test/plugins/mergeStyles.10.svg.txt
diff --git a/test/plugins/mergeStyles.11.svg b/test/plugins/mergeStyles.11.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.11.svg
rename to test/plugins/mergeStyles.11.svg.txt
diff --git a/test/plugins/mergeStyles.12.svg b/test/plugins/mergeStyles.12.svg.txt
similarity index 100%
rename from test/plugins/mergeStyles.12.svg
rename to test/plugins/mergeStyles.12.svg.txt
diff --git a/test/plugins/minifyStyles.01.svg b/test/plugins/minifyStyles.01.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.01.svg
rename to test/plugins/minifyStyles.01.svg.txt
diff --git a/test/plugins/minifyStyles.02.svg b/test/plugins/minifyStyles.02.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.02.svg
rename to test/plugins/minifyStyles.02.svg.txt
diff --git a/test/plugins/minifyStyles.03.svg b/test/plugins/minifyStyles.03.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.03.svg
rename to test/plugins/minifyStyles.03.svg.txt
diff --git a/test/plugins/minifyStyles.04.svg b/test/plugins/minifyStyles.04.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.04.svg
rename to test/plugins/minifyStyles.04.svg.txt
diff --git a/test/plugins/minifyStyles.05.svg b/test/plugins/minifyStyles.05.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.05.svg
rename to test/plugins/minifyStyles.05.svg.txt
diff --git a/test/plugins/minifyStyles.06.svg b/test/plugins/minifyStyles.06.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.06.svg
rename to test/plugins/minifyStyles.06.svg.txt
diff --git a/test/plugins/minifyStyles.07.svg b/test/plugins/minifyStyles.07.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.07.svg
rename to test/plugins/minifyStyles.07.svg.txt
diff --git a/test/plugins/minifyStyles.08.svg b/test/plugins/minifyStyles.08.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.08.svg
rename to test/plugins/minifyStyles.08.svg.txt
diff --git a/test/plugins/minifyStyles.09.svg b/test/plugins/minifyStyles.09.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.09.svg
rename to test/plugins/minifyStyles.09.svg.txt
diff --git a/test/plugins/minifyStyles.10.svg b/test/plugins/minifyStyles.10.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.10.svg
rename to test/plugins/minifyStyles.10.svg.txt
diff --git a/test/plugins/minifyStyles.11.svg b/test/plugins/minifyStyles.11.svg.txt
similarity index 100%
rename from test/plugins/minifyStyles.11.svg
rename to test/plugins/minifyStyles.11.svg.txt
diff --git a/test/plugins/moveElemsAttrsToGroup.01.svg b/test/plugins/moveElemsAttrsToGroup.01.svg.txt
similarity index 100%
rename from test/plugins/moveElemsAttrsToGroup.01.svg
rename to test/plugins/moveElemsAttrsToGroup.01.svg.txt
diff --git a/test/plugins/moveElemsAttrsToGroup.02.svg b/test/plugins/moveElemsAttrsToGroup.02.svg.txt
similarity index 100%
rename from test/plugins/moveElemsAttrsToGroup.02.svg
rename to test/plugins/moveElemsAttrsToGroup.02.svg.txt
diff --git a/test/plugins/moveElemsAttrsToGroup.03.svg b/test/plugins/moveElemsAttrsToGroup.03.svg.txt
similarity index 100%
rename from test/plugins/moveElemsAttrsToGroup.03.svg
rename to test/plugins/moveElemsAttrsToGroup.03.svg.txt
diff --git a/test/plugins/moveElemsAttrsToGroup.04.svg b/test/plugins/moveElemsAttrsToGroup.04.svg.txt
similarity index 100%
rename from test/plugins/moveElemsAttrsToGroup.04.svg
rename to test/plugins/moveElemsAttrsToGroup.04.svg.txt
diff --git a/test/plugins/moveElemsAttrsToGroup.06.svg b/test/plugins/moveElemsAttrsToGroup.06.svg.txt
similarity index 100%
rename from test/plugins/moveElemsAttrsToGroup.06.svg
rename to test/plugins/moveElemsAttrsToGroup.06.svg.txt
diff --git a/test/plugins/moveElemsAttrsToGroup.07.svg b/test/plugins/moveElemsAttrsToGroup.07.svg.txt
similarity index 100%
rename from test/plugins/moveElemsAttrsToGroup.07.svg
rename to test/plugins/moveElemsAttrsToGroup.07.svg.txt
diff --git a/test/plugins/moveGroupAttrsToElems.01.svg b/test/plugins/moveGroupAttrsToElems.01.svg.txt
similarity index 100%
rename from test/plugins/moveGroupAttrsToElems.01.svg
rename to test/plugins/moveGroupAttrsToElems.01.svg.txt
diff --git a/test/plugins/moveGroupAttrsToElems.02.svg b/test/plugins/moveGroupAttrsToElems.02.svg.txt
similarity index 100%
rename from test/plugins/moveGroupAttrsToElems.02.svg
rename to test/plugins/moveGroupAttrsToElems.02.svg.txt
diff --git a/test/plugins/moveGroupAttrsToElems.03.svg b/test/plugins/moveGroupAttrsToElems.03.svg.txt
similarity index 100%
rename from test/plugins/moveGroupAttrsToElems.03.svg
rename to test/plugins/moveGroupAttrsToElems.03.svg.txt
diff --git a/test/plugins/moveGroupAttrsToElems.04.svg b/test/plugins/moveGroupAttrsToElems.04.svg.txt
similarity index 100%
rename from test/plugins/moveGroupAttrsToElems.04.svg
rename to test/plugins/moveGroupAttrsToElems.04.svg.txt
diff --git a/test/plugins/moveGroupAttrsToElems.05.svg b/test/plugins/moveGroupAttrsToElems.05.svg.txt
similarity index 100%
rename from test/plugins/moveGroupAttrsToElems.05.svg
rename to test/plugins/moveGroupAttrsToElems.05.svg.txt
diff --git a/test/plugins/moveGroupAttrsToElems.06.svg b/test/plugins/moveGroupAttrsToElems.06.svg.txt
similarity index 100%
rename from test/plugins/moveGroupAttrsToElems.06.svg
rename to test/plugins/moveGroupAttrsToElems.06.svg.txt
diff --git a/test/plugins/prefixIds.01.svg b/test/plugins/prefixIds.01.svg.txt
similarity index 62%
rename from test/plugins/prefixIds.01.svg
rename to test/plugins/prefixIds.01.svg.txt
index e99c2ea48..311aaa3e9 100644
--- a/test/plugins/prefixIds.01.svg
+++ b/test/plugins/prefixIds.01.svg.txt
@@ -16,8 +16,8 @@
 
 <svg width="120" height="120" xmlns="http://www.w3.org/2000/svg">
     <style>
-        .prefixIds_01_svg__test{color:blue}#prefixIds_01_svg__test{color:red}
+        .prefixIds_01_svg_txt__test{color:blue}#prefixIds_01_svg_txt__test{color:red}
     </style>
-    <rect class="prefixIds_01_svg__test" x="10" y="10" width="100" height="100"/>
-    <rect class="" id="prefixIds_01_svg__test" x="10" y="10" width="100" height="100"/>
+    <rect class="prefixIds_01_svg_txt__test" x="10" y="10" width="100" height="100"/>
+    <rect class="" id="prefixIds_01_svg_txt__test" x="10" y="10" width="100" height="100"/>
 </svg>
diff --git a/test/plugins/prefixIds.02.svg b/test/plugins/prefixIds.02.svg.txt
similarity index 78%
rename from test/plugins/prefixIds.02.svg
rename to test/plugins/prefixIds.02.svg.txt
index fe22dad7e..9b83f6560 100644
--- a/test/plugins/prefixIds.02.svg
+++ b/test/plugins/prefixIds.02.svg.txt
@@ -12,10 +12,10 @@
 
 <svg width="120" height="120" xmlns="http://www.w3.org/2000/svg">
     <defs>
-        <linearGradient id="prefixIds_02_svg__MyGradient">
+        <linearGradient id="prefixIds_02_svg_txt__MyGradient">
             <stop offset="5%" stop-color="green"/>
             <stop offset="95%" stop-color="gold"/>
         </linearGradient>
     </defs>
-    <rect fill="url(#prefixIds_02_svg__MyGradient)" x="10" y="10" width="100" height="100"/>
+    <rect fill="url(#prefixIds_02_svg_txt__MyGradient)" x="10" y="10" width="100" height="100"/>
 </svg>
diff --git a/test/plugins/prefixIds.03.svg b/test/plugins/prefixIds.03.svg.txt
similarity index 80%
rename from test/plugins/prefixIds.03.svg
rename to test/plugins/prefixIds.03.svg.txt
index b87b25ece..655672ae1 100644
--- a/test/plugins/prefixIds.03.svg
+++ b/test/plugins/prefixIds.03.svg.txt
@@ -5,5 +5,5 @@
 @@@
 
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <use xlink:href="#prefixIds_03_svg__Port"/>
+    <use xlink:href="#prefixIds_03_svg_txt__Port"/>
 </svg>
diff --git a/test/plugins/prefixIds.04.svg b/test/plugins/prefixIds.04.svg.txt
similarity index 94%
rename from test/plugins/prefixIds.04.svg
rename to test/plugins/prefixIds.04.svg.txt
index d3d475597..b8f18c023 100644
--- a/test/plugins/prefixIds.04.svg
+++ b/test/plugins/prefixIds.04.svg.txt
@@ -15,7 +15,7 @@
 
 <svg width="120" height="120" xmlns="http://www.w3.org/2000/svg">
     <style>
-        rect{cursor:pointer;shape-rendering:crispEdges;fill:url(#prefixIds_04_svg__MyGradient)}
+        rect{cursor:pointer;shape-rendering:crispEdges;fill:url(#prefixIds_04_svg_txt__MyGradient)}
     </style>
     <rect x="10" y="10" width="100" height="100"/>
     <rect x="10" y="10" width="100" height="100"/>
diff --git a/test/plugins/prefixIds.05.svg b/test/plugins/prefixIds.05.svg.txt
similarity index 73%
rename from test/plugins/prefixIds.05.svg
rename to test/plugins/prefixIds.05.svg.txt
index d7805dd5d..8e263e09a 100644
--- a/test/plugins/prefixIds.05.svg
+++ b/test/plugins/prefixIds.05.svg.txt
@@ -22,20 +22,20 @@
 
 <svg width="340" height="120" xmlns="http://www.w3.org/2000/svg">
     <defs>
-        <linearGradient id="prefixIds_05_svg__gradient_1">
+        <linearGradient id="prefixIds_05_svg_txt__gradient_1">
             <stop offset="5%" stop-color="green"/>
             <stop offset="95%" stop-color="gold"/>
         </linearGradient>
-        <linearGradient id="prefixIds_05_svg__gradient_2">
+        <linearGradient id="prefixIds_05_svg_txt__gradient_2">
             <stop offset="5%" stop-color="red"/>
             <stop offset="95%" stop-color="black"/>
         </linearGradient>
-        <linearGradient id="prefixIds_05_svg__gradient_3">
+        <linearGradient id="prefixIds_05_svg_txt__gradient_3">
             <stop offset="5%" stop-color="blue"/>
             <stop offset="95%" stop-color="orange"/>
         </linearGradient>
     </defs>
-    <rect fill="url(#prefixIds_05_svg__gradient_1)" x="10" y="10" width="100" height="100"/>
-    <rect fill="url(#prefixIds_05_svg__gradient_2)" x="120" y="10" width="100" height="100"/>
-    <rect fill="url(#prefixIds_05_svg__gradient_3)" x="230" y="10" width="100" height="100"/>
+    <rect fill="url(#prefixIds_05_svg_txt__gradient_1)" x="10" y="10" width="100" height="100"/>
+    <rect fill="url(#prefixIds_05_svg_txt__gradient_2)" x="120" y="10" width="100" height="100"/>
+    <rect fill="url(#prefixIds_05_svg_txt__gradient_3)" x="230" y="10" width="100" height="100"/>
 </svg>
diff --git a/test/plugins/prefixIds.06.svg b/test/plugins/prefixIds.06.svg.txt
similarity index 51%
rename from test/plugins/prefixIds.06.svg
rename to test/plugins/prefixIds.06.svg.txt
index 9bd4f7643..5b93b949a 100644
--- a/test/plugins/prefixIds.06.svg
+++ b/test/plugins/prefixIds.06.svg.txt
@@ -29,10 +29,10 @@
 
 <svg width="120" height="120" xmlns="http://www.w3.org/2000/svg">
     <style>
-        .prefixIds_06_svg__test{color:blue}.prefixIds_06_svg__test2{color:green}#prefixIds_06_svg__test{color:red}.prefixIds_06_svg__test3 .prefixIds_06_svg__test4{color:black}.prefixIds_06_svg__test5.prefixIds_06_svg__test6{color:brown}.prefixIds_06_svg__test5.prefixIds_06_svg__test6 #prefixIds_06_svg__test7{color:yellow}
+        .prefixIds_06_svg_txt__test{color:blue}.prefixIds_06_svg_txt__test2{color:green}#prefixIds_06_svg_txt__test{color:red}.prefixIds_06_svg_txt__test3 .prefixIds_06_svg_txt__test4{color:black}.prefixIds_06_svg_txt__test5.prefixIds_06_svg_txt__test6{color:brown}.prefixIds_06_svg_txt__test5.prefixIds_06_svg_txt__test6 #prefixIds_06_svg_txt__test7{color:yellow}
     </style>
-    <rect class="prefixIds_06_svg__test" x="10" y="10" width="100" height="100"/>
-    <rect class="prefixIds_06_svg__test prefixIds_06_svg__test2" x="10" y="10" width="100" height="100"/>
-    <rect class="prefixIds_06_svg__test prefixIds_06_svg__test2" x="10" y="10" width="100" height="100"/>
-    <rect class="" id="prefixIds_06_svg__test" x="10" y="10" width="100" height="100"/>
+    <rect class="prefixIds_06_svg_txt__test" x="10" y="10" width="100" height="100"/>
+    <rect class="prefixIds_06_svg_txt__test prefixIds_06_svg_txt__test2" x="10" y="10" width="100" height="100"/>
+    <rect class="prefixIds_06_svg_txt__test prefixIds_06_svg_txt__test2" x="10" y="10" width="100" height="100"/>
+    <rect class="" id="prefixIds_06_svg_txt__test" x="10" y="10" width="100" height="100"/>
 </svg>
diff --git a/test/plugins/prefixIds.07.svg b/test/plugins/prefixIds.07.svg.txt
similarity index 78%
rename from test/plugins/prefixIds.07.svg
rename to test/plugins/prefixIds.07.svg.txt
index add8a8d18..00903c3c6 100644
--- a/test/plugins/prefixIds.07.svg
+++ b/test/plugins/prefixIds.07.svg.txt
@@ -16,9 +16,9 @@
 
 <svg width="120" height="120" xmlns="http://www.w3.org/2000/svg">
     <style>
-        .prefixIds_07_svg__test{color:blue}#test{color:red}
+        .prefixIds_07_svg_txt__test{color:blue}#test{color:red}
     </style>
-    <rect class="prefixIds_07_svg__test" x="10" y="10" width="100" height="100"/>
+    <rect class="prefixIds_07_svg_txt__test" x="10" y="10" width="100" height="100"/>
     <rect class="" id="test" x="10" y="10" width="100" height="100"/>
 </svg>
 
diff --git a/test/plugins/prefixIds.08.svg b/test/plugins/prefixIds.08.svg.txt
similarity index 77%
rename from test/plugins/prefixIds.08.svg
rename to test/plugins/prefixIds.08.svg.txt
index 1008b6cd2..74d7b0078 100644
--- a/test/plugins/prefixIds.08.svg
+++ b/test/plugins/prefixIds.08.svg.txt
@@ -16,10 +16,10 @@
 
 <svg width="120" height="120" xmlns="http://www.w3.org/2000/svg">
     <style>
-        .test{color:blue}#prefixIds_08_svg__test{color:red}
+        .test{color:blue}#prefixIds_08_svg_txt__test{color:red}
     </style>
     <rect class="test" x="10" y="10" width="100" height="100"/>
-    <rect class="" id="prefixIds_08_svg__test" x="10" y="10" width="100" height="100"/>
+    <rect class="" id="prefixIds_08_svg_txt__test" x="10" y="10" width="100" height="100"/>
 </svg>
 
 @@@
diff --git a/test/plugins/prefixIds.09.svg b/test/plugins/prefixIds.09.svg.txt
similarity index 100%
rename from test/plugins/prefixIds.09.svg
rename to test/plugins/prefixIds.09.svg.txt
diff --git a/test/plugins/prefixIds.10.svg b/test/plugins/prefixIds.10.svg.txt
similarity index 53%
rename from test/plugins/prefixIds.10.svg
rename to test/plugins/prefixIds.10.svg.txt
index 7b4ce3188..f9a9ffe9d 100644
--- a/test/plugins/prefixIds.10.svg
+++ b/test/plugins/prefixIds.10.svg.txt
@@ -8,8 +8,8 @@
 @@@
 
 <g xmlns="http://www.w3.org/2000/svg" transform="translate(130, 112)">
-    <path class="prefixIds_10_svg__st1" d="M27,0h-37v64C-10,64,27,64.2,27,0z" transform="scale(0.811377 1)">
-        <animateTransform id="prefixIds_10_svg__t_1s" attributeName="transform" type="scale" from="1 1" to="-1 1" begin="0s; prefixIds_10_svg__t_2s.end" dur="0.5s" repeatCount="0"/>
-        <animateTransform id="prefixIds_10_svg__t_2s" attributeName="transform" type="scale" from="-1 1" to="1 1" begin="prefixIds_10_svg__t_1s.end" dur="0.5s" repeatCount="0"/>
+    <path class="prefixIds_10_svg_txt__st1" d="M27,0h-37v64C-10,64,27,64.2,27,0z" transform="scale(0.811377 1)">
+        <animateTransform id="prefixIds_10_svg_txt__t_1s" attributeName="transform" type="scale" from="1 1" to="-1 1" begin="0s; prefixIds_10_svg_txt__t_2s.end" dur="0.5s" repeatCount="0"/>
+        <animateTransform id="prefixIds_10_svg_txt__t_2s" attributeName="transform" type="scale" from="-1 1" to="1 1" begin="prefixIds_10_svg_txt__t_1s.end" dur="0.5s" repeatCount="0"/>
     </path>
 </g>
diff --git a/test/plugins/prefixIds.11.svg b/test/plugins/prefixIds.11.svg.txt
similarity index 63%
rename from test/plugins/prefixIds.11.svg
rename to test/plugins/prefixIds.11.svg.txt
index aad0aabde..3c6bf3821 100644
--- a/test/plugins/prefixIds.11.svg
+++ b/test/plugins/prefixIds.11.svg.txt
@@ -14,8 +14,8 @@ prefixIds should correctly handle url()s in style attribute, including multiple
 
 <svg width="120" height="120" xmlns="http://www.w3.org/2000/svg">
     <defs>
-        <linearGradient id="prefixIds_11_svg__fill"/>
-        <linearGradient id="prefixIds_11_svg__stroke"/>
+        <linearGradient id="prefixIds_11_svg_txt__fill"/>
+        <linearGradient id="prefixIds_11_svg_txt__stroke"/>
     </defs>
-    <rect style="fill:url(#prefixIds_11_svg__fill); stroke: url(#prefixIds_11_svg__stroke)" x="10" y="10" width="100" height="100"/>
+    <rect style="fill:url(#prefixIds_11_svg_txt__fill); stroke: url(#prefixIds_11_svg_txt__stroke)" x="10" y="10" width="100" height="100"/>
 </svg>
diff --git a/test/plugins/prefixIds.12.svg b/test/plugins/prefixIds.12.svg.txt
similarity index 90%
rename from test/plugins/prefixIds.12.svg
rename to test/plugins/prefixIds.12.svg.txt
index fb38f1f6d..e1886858a 100644
--- a/test/plugins/prefixIds.12.svg
+++ b/test/plugins/prefixIds.12.svg.txt
@@ -15,6 +15,6 @@ into multiple nodes due to XML comments.
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1">
     <style>
 <!--uwu-->
-        #prefixIds_12_svg__a{}
+        #prefixIds_12_svg_txt__a{}
     </style>
 </svg>
diff --git a/test/plugins/removeAttributesBySelector.01.svg b/test/plugins/removeAttributesBySelector.01.svg.txt
similarity index 100%
rename from test/plugins/removeAttributesBySelector.01.svg
rename to test/plugins/removeAttributesBySelector.01.svg.txt
diff --git a/test/plugins/removeAttributesBySelector.02.svg b/test/plugins/removeAttributesBySelector.02.svg.txt
similarity index 100%
rename from test/plugins/removeAttributesBySelector.02.svg
rename to test/plugins/removeAttributesBySelector.02.svg.txt
diff --git a/test/plugins/removeAttributesBySelector.03.svg b/test/plugins/removeAttributesBySelector.03.svg.txt
similarity index 100%
rename from test/plugins/removeAttributesBySelector.03.svg
rename to test/plugins/removeAttributesBySelector.03.svg.txt
diff --git a/test/plugins/removeAttrs.01.svg b/test/plugins/removeAttrs.01.svg.txt
similarity index 100%
rename from test/plugins/removeAttrs.01.svg
rename to test/plugins/removeAttrs.01.svg.txt
diff --git a/test/plugins/removeAttrs.02.svg b/test/plugins/removeAttrs.02.svg.txt
similarity index 100%
rename from test/plugins/removeAttrs.02.svg
rename to test/plugins/removeAttrs.02.svg.txt
diff --git a/test/plugins/removeAttrs.03.svg b/test/plugins/removeAttrs.03.svg.txt
similarity index 100%
rename from test/plugins/removeAttrs.03.svg
rename to test/plugins/removeAttrs.03.svg.txt
diff --git a/test/plugins/removeAttrs.04.svg b/test/plugins/removeAttrs.04.svg.txt
similarity index 100%
rename from test/plugins/removeAttrs.04.svg
rename to test/plugins/removeAttrs.04.svg.txt
diff --git a/test/plugins/removeAttrs.05.svg b/test/plugins/removeAttrs.05.svg.txt
similarity index 100%
rename from test/plugins/removeAttrs.05.svg
rename to test/plugins/removeAttrs.05.svg.txt
diff --git a/test/plugins/removeAttrs.06.svg b/test/plugins/removeAttrs.06.svg.txt
similarity index 100%
rename from test/plugins/removeAttrs.06.svg
rename to test/plugins/removeAttrs.06.svg.txt
diff --git a/test/plugins/removeComments.01.svg b/test/plugins/removeComments.01.svg.txt
similarity index 100%
rename from test/plugins/removeComments.01.svg
rename to test/plugins/removeComments.01.svg.txt
diff --git a/test/plugins/removeComments.02.svg b/test/plugins/removeComments.02.svg.txt
similarity index 100%
rename from test/plugins/removeComments.02.svg
rename to test/plugins/removeComments.02.svg.txt
diff --git a/test/plugins/removeComments.03.svg b/test/plugins/removeComments.03.svg.txt
similarity index 100%
rename from test/plugins/removeComments.03.svg
rename to test/plugins/removeComments.03.svg.txt
diff --git a/test/plugins/removeDesc.01.svg b/test/plugins/removeDesc.01.svg.txt
similarity index 100%
rename from test/plugins/removeDesc.01.svg
rename to test/plugins/removeDesc.01.svg.txt
diff --git a/test/plugins/removeDimensions.01.svg b/test/plugins/removeDimensions.01.svg.txt
similarity index 100%
rename from test/plugins/removeDimensions.01.svg
rename to test/plugins/removeDimensions.01.svg.txt
diff --git a/test/plugins/removeDimensions.02.svg b/test/plugins/removeDimensions.02.svg.txt
similarity index 100%
rename from test/plugins/removeDimensions.02.svg
rename to test/plugins/removeDimensions.02.svg.txt
diff --git a/test/plugins/removeDimensions.03.svg b/test/plugins/removeDimensions.03.svg.txt
similarity index 100%
rename from test/plugins/removeDimensions.03.svg
rename to test/plugins/removeDimensions.03.svg.txt
diff --git a/test/plugins/removeDimensions.04.svg b/test/plugins/removeDimensions.04.svg.txt
similarity index 100%
rename from test/plugins/removeDimensions.04.svg
rename to test/plugins/removeDimensions.04.svg.txt
diff --git a/test/plugins/removeDimensions.05.svg b/test/plugins/removeDimensions.05.svg.txt
similarity index 100%
rename from test/plugins/removeDimensions.05.svg
rename to test/plugins/removeDimensions.05.svg.txt
diff --git a/test/plugins/removeDoctype.01.svg b/test/plugins/removeDoctype.01.svg.txt
similarity index 100%
rename from test/plugins/removeDoctype.01.svg
rename to test/plugins/removeDoctype.01.svg.txt
diff --git a/test/plugins/removeEditorsNSData.01.svg b/test/plugins/removeEditorsNSData.01.svg.txt
similarity index 100%
rename from test/plugins/removeEditorsNSData.01.svg
rename to test/plugins/removeEditorsNSData.01.svg.txt
diff --git a/test/plugins/removeEditorsNSData.02.svg b/test/plugins/removeEditorsNSData.02.svg.txt
similarity index 100%
rename from test/plugins/removeEditorsNSData.02.svg
rename to test/plugins/removeEditorsNSData.02.svg.txt
diff --git a/test/plugins/removeElementsByAttr.01.svg b/test/plugins/removeElementsByAttr.01.svg.txt
similarity index 100%
rename from test/plugins/removeElementsByAttr.01.svg
rename to test/plugins/removeElementsByAttr.01.svg.txt
diff --git a/test/plugins/removeElementsByAttr.02.svg b/test/plugins/removeElementsByAttr.02.svg.txt
similarity index 100%
rename from test/plugins/removeElementsByAttr.02.svg
rename to test/plugins/removeElementsByAttr.02.svg.txt
diff --git a/test/plugins/removeElementsByAttr.03.svg b/test/plugins/removeElementsByAttr.03.svg.txt
similarity index 100%
rename from test/plugins/removeElementsByAttr.03.svg
rename to test/plugins/removeElementsByAttr.03.svg.txt
diff --git a/test/plugins/removeElementsByAttr.04.svg b/test/plugins/removeElementsByAttr.04.svg.txt
similarity index 100%
rename from test/plugins/removeElementsByAttr.04.svg
rename to test/plugins/removeElementsByAttr.04.svg.txt
diff --git a/test/plugins/removeElementsByAttr.05.svg b/test/plugins/removeElementsByAttr.05.svg.txt
similarity index 100%
rename from test/plugins/removeElementsByAttr.05.svg
rename to test/plugins/removeElementsByAttr.05.svg.txt
diff --git a/test/plugins/removeElementsByAttr.06.svg b/test/plugins/removeElementsByAttr.06.svg.txt
similarity index 100%
rename from test/plugins/removeElementsByAttr.06.svg
rename to test/plugins/removeElementsByAttr.06.svg.txt
diff --git a/test/plugins/removeElementsByAttr.07.svg b/test/plugins/removeElementsByAttr.07.svg.txt
similarity index 100%
rename from test/plugins/removeElementsByAttr.07.svg
rename to test/plugins/removeElementsByAttr.07.svg.txt
diff --git a/test/plugins/removeEmptyAttrs.01.svg b/test/plugins/removeEmptyAttrs.01.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyAttrs.01.svg
rename to test/plugins/removeEmptyAttrs.01.svg.txt
diff --git a/test/plugins/removeEmptyAttrs.02.svg b/test/plugins/removeEmptyAttrs.02.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyAttrs.02.svg
rename to test/plugins/removeEmptyAttrs.02.svg.txt
diff --git a/test/plugins/removeEmptyContainers.01.svg b/test/plugins/removeEmptyContainers.01.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyContainers.01.svg
rename to test/plugins/removeEmptyContainers.01.svg.txt
diff --git a/test/plugins/removeEmptyContainers.02.svg b/test/plugins/removeEmptyContainers.02.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyContainers.02.svg
rename to test/plugins/removeEmptyContainers.02.svg.txt
diff --git a/test/plugins/removeEmptyContainers.03.svg b/test/plugins/removeEmptyContainers.03.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyContainers.03.svg
rename to test/plugins/removeEmptyContainers.03.svg.txt
diff --git a/test/plugins/removeEmptyContainers.04.svg b/test/plugins/removeEmptyContainers.04.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyContainers.04.svg
rename to test/plugins/removeEmptyContainers.04.svg.txt
diff --git a/test/plugins/removeEmptyContainers.05.svg b/test/plugins/removeEmptyContainers.05.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyContainers.05.svg
rename to test/plugins/removeEmptyContainers.05.svg.txt
diff --git a/test/plugins/removeEmptyContainers.06.svg b/test/plugins/removeEmptyContainers.06.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyContainers.06.svg
rename to test/plugins/removeEmptyContainers.06.svg.txt
diff --git a/test/plugins/removeEmptyText.01.svg b/test/plugins/removeEmptyText.01.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyText.01.svg
rename to test/plugins/removeEmptyText.01.svg.txt
diff --git a/test/plugins/removeEmptyText.02.svg b/test/plugins/removeEmptyText.02.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyText.02.svg
rename to test/plugins/removeEmptyText.02.svg.txt
diff --git a/test/plugins/removeEmptyText.03.svg b/test/plugins/removeEmptyText.03.svg.txt
similarity index 100%
rename from test/plugins/removeEmptyText.03.svg
rename to test/plugins/removeEmptyText.03.svg.txt
diff --git a/test/plugins/removeHiddenElems.01.svg b/test/plugins/removeHiddenElems.01.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.01.svg
rename to test/plugins/removeHiddenElems.01.svg.txt
diff --git a/test/plugins/removeHiddenElems.02.svg b/test/plugins/removeHiddenElems.02.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.02.svg
rename to test/plugins/removeHiddenElems.02.svg.txt
diff --git a/test/plugins/removeHiddenElems.03.svg b/test/plugins/removeHiddenElems.03.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.03.svg
rename to test/plugins/removeHiddenElems.03.svg.txt
diff --git a/test/plugins/removeHiddenElems.04.svg b/test/plugins/removeHiddenElems.04.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.04.svg
rename to test/plugins/removeHiddenElems.04.svg.txt
diff --git a/test/plugins/removeHiddenElems.05.svg b/test/plugins/removeHiddenElems.05.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.05.svg
rename to test/plugins/removeHiddenElems.05.svg.txt
diff --git a/test/plugins/removeHiddenElems.06.svg b/test/plugins/removeHiddenElems.06.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.06.svg
rename to test/plugins/removeHiddenElems.06.svg.txt
diff --git a/test/plugins/removeHiddenElems.07.svg b/test/plugins/removeHiddenElems.07.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.07.svg
rename to test/plugins/removeHiddenElems.07.svg.txt
diff --git a/test/plugins/removeHiddenElems.08.svg b/test/plugins/removeHiddenElems.08.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.08.svg
rename to test/plugins/removeHiddenElems.08.svg.txt
diff --git a/test/plugins/removeHiddenElems.09.svg b/test/plugins/removeHiddenElems.09.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.09.svg
rename to test/plugins/removeHiddenElems.09.svg.txt
diff --git a/test/plugins/removeHiddenElems.10.svg b/test/plugins/removeHiddenElems.10.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.10.svg
rename to test/plugins/removeHiddenElems.10.svg.txt
diff --git a/test/plugins/removeHiddenElems.11.svg b/test/plugins/removeHiddenElems.11.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.11.svg
rename to test/plugins/removeHiddenElems.11.svg.txt
diff --git a/test/plugins/removeHiddenElems.12.svg b/test/plugins/removeHiddenElems.12.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.12.svg
rename to test/plugins/removeHiddenElems.12.svg.txt
diff --git a/test/plugins/removeHiddenElems.13.svg b/test/plugins/removeHiddenElems.13.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.13.svg
rename to test/plugins/removeHiddenElems.13.svg.txt
diff --git a/test/plugins/removeHiddenElems.14.svg b/test/plugins/removeHiddenElems.14.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.14.svg
rename to test/plugins/removeHiddenElems.14.svg.txt
diff --git a/test/plugins/removeHiddenElems.15.svg b/test/plugins/removeHiddenElems.15.svg.txt
similarity index 100%
rename from test/plugins/removeHiddenElems.15.svg
rename to test/plugins/removeHiddenElems.15.svg.txt
diff --git a/test/plugins/removeMetadata.01.svg b/test/plugins/removeMetadata.01.svg.txt
similarity index 100%
rename from test/plugins/removeMetadata.01.svg
rename to test/plugins/removeMetadata.01.svg.txt
diff --git a/test/plugins/removeNonInheritableGroupAttrs.01.svg b/test/plugins/removeNonInheritableGroupAttrs.01.svg.txt
similarity index 100%
rename from test/plugins/removeNonInheritableGroupAttrs.01.svg
rename to test/plugins/removeNonInheritableGroupAttrs.01.svg.txt
diff --git a/test/plugins/removeNonInheritableGroupAttrs.02.svg b/test/plugins/removeNonInheritableGroupAttrs.02.svg.txt
similarity index 100%
rename from test/plugins/removeNonInheritableGroupAttrs.02.svg
rename to test/plugins/removeNonInheritableGroupAttrs.02.svg.txt
diff --git a/test/plugins/removeOffCanvasPaths.01.svg b/test/plugins/removeOffCanvasPaths.01.svg.txt
similarity index 100%
rename from test/plugins/removeOffCanvasPaths.01.svg
rename to test/plugins/removeOffCanvasPaths.01.svg.txt
diff --git a/test/plugins/removeOffCanvasPaths.02.svg b/test/plugins/removeOffCanvasPaths.02.svg.txt
similarity index 100%
rename from test/plugins/removeOffCanvasPaths.02.svg
rename to test/plugins/removeOffCanvasPaths.02.svg.txt
diff --git a/test/plugins/removeOffCanvasPaths.03.svg b/test/plugins/removeOffCanvasPaths.03.svg.txt
similarity index 100%
rename from test/plugins/removeOffCanvasPaths.03.svg
rename to test/plugins/removeOffCanvasPaths.03.svg.txt
diff --git a/test/plugins/removeOffCanvasPaths.04.svg b/test/plugins/removeOffCanvasPaths.04.svg.txt
similarity index 100%
rename from test/plugins/removeOffCanvasPaths.04.svg
rename to test/plugins/removeOffCanvasPaths.04.svg.txt
diff --git a/test/plugins/removeOffCanvasPaths.05.svg b/test/plugins/removeOffCanvasPaths.05.svg.txt
similarity index 100%
rename from test/plugins/removeOffCanvasPaths.05.svg
rename to test/plugins/removeOffCanvasPaths.05.svg.txt
diff --git a/test/plugins/removeOffCanvasPaths.06.svg b/test/plugins/removeOffCanvasPaths.06.svg.txt
similarity index 100%
rename from test/plugins/removeOffCanvasPaths.06.svg
rename to test/plugins/removeOffCanvasPaths.06.svg.txt
diff --git a/test/plugins/removeRasterImages.01.svg b/test/plugins/removeRasterImages.01.svg.txt
similarity index 100%
rename from test/plugins/removeRasterImages.01.svg
rename to test/plugins/removeRasterImages.01.svg.txt
diff --git a/test/plugins/removeRasterImages.02.svg b/test/plugins/removeRasterImages.02.svg.txt
similarity index 100%
rename from test/plugins/removeRasterImages.02.svg
rename to test/plugins/removeRasterImages.02.svg.txt
diff --git a/test/plugins/removeScriptElement.01.svg b/test/plugins/removeScriptElement.01.svg.txt
similarity index 100%
rename from test/plugins/removeScriptElement.01.svg
rename to test/plugins/removeScriptElement.01.svg.txt
diff --git a/test/plugins/removeScriptElement.02.svg b/test/plugins/removeScriptElement.02.svg.txt
similarity index 100%
rename from test/plugins/removeScriptElement.02.svg
rename to test/plugins/removeScriptElement.02.svg.txt
diff --git a/test/plugins/removeScriptElement.03.svg b/test/plugins/removeScriptElement.03.svg.txt
similarity index 100%
rename from test/plugins/removeScriptElement.03.svg
rename to test/plugins/removeScriptElement.03.svg.txt
diff --git a/test/plugins/removeScriptElement.04.svg b/test/plugins/removeScriptElement.04.svg.txt
similarity index 100%
rename from test/plugins/removeScriptElement.04.svg
rename to test/plugins/removeScriptElement.04.svg.txt
diff --git a/test/plugins/removeScriptElement.05.svg b/test/plugins/removeScriptElement.05.svg.txt
similarity index 100%
rename from test/plugins/removeScriptElement.05.svg
rename to test/plugins/removeScriptElement.05.svg.txt
diff --git a/test/plugins/removeStyleElement.01.svg b/test/plugins/removeStyleElement.01.svg.txt
similarity index 100%
rename from test/plugins/removeStyleElement.01.svg
rename to test/plugins/removeStyleElement.01.svg.txt
diff --git a/test/plugins/removeTitle.01.svg b/test/plugins/removeTitle.01.svg.txt
similarity index 100%
rename from test/plugins/removeTitle.01.svg
rename to test/plugins/removeTitle.01.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.01.svg b/test/plugins/removeUnknownsAndDefaults.01.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.01.svg
rename to test/plugins/removeUnknownsAndDefaults.01.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.02.svg b/test/plugins/removeUnknownsAndDefaults.02.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.02.svg
rename to test/plugins/removeUnknownsAndDefaults.02.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.03.svg b/test/plugins/removeUnknownsAndDefaults.03.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.03.svg
rename to test/plugins/removeUnknownsAndDefaults.03.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.04.svg b/test/plugins/removeUnknownsAndDefaults.04.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.04.svg
rename to test/plugins/removeUnknownsAndDefaults.04.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.05.svg b/test/plugins/removeUnknownsAndDefaults.05.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.05.svg
rename to test/plugins/removeUnknownsAndDefaults.05.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.06.svg b/test/plugins/removeUnknownsAndDefaults.06.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.06.svg
rename to test/plugins/removeUnknownsAndDefaults.06.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.07.svg b/test/plugins/removeUnknownsAndDefaults.07.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.07.svg
rename to test/plugins/removeUnknownsAndDefaults.07.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.08.svg b/test/plugins/removeUnknownsAndDefaults.08.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.08.svg
rename to test/plugins/removeUnknownsAndDefaults.08.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.09.svg b/test/plugins/removeUnknownsAndDefaults.09.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.09.svg
rename to test/plugins/removeUnknownsAndDefaults.09.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.10.svg b/test/plugins/removeUnknownsAndDefaults.10.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.10.svg
rename to test/plugins/removeUnknownsAndDefaults.10.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.11.svg b/test/plugins/removeUnknownsAndDefaults.11.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.11.svg
rename to test/plugins/removeUnknownsAndDefaults.11.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.12.svg b/test/plugins/removeUnknownsAndDefaults.12.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.12.svg
rename to test/plugins/removeUnknownsAndDefaults.12.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.13.svg b/test/plugins/removeUnknownsAndDefaults.13.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.13.svg
rename to test/plugins/removeUnknownsAndDefaults.13.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.14.svg b/test/plugins/removeUnknownsAndDefaults.14.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.14.svg
rename to test/plugins/removeUnknownsAndDefaults.14.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.15.svg b/test/plugins/removeUnknownsAndDefaults.15.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.15.svg
rename to test/plugins/removeUnknownsAndDefaults.15.svg.txt
diff --git a/test/plugins/removeUnknownsAndDefaults.16.svg b/test/plugins/removeUnknownsAndDefaults.16.svg.txt
similarity index 100%
rename from test/plugins/removeUnknownsAndDefaults.16.svg
rename to test/plugins/removeUnknownsAndDefaults.16.svg.txt
diff --git a/test/plugins/removeUnusedNS.01.svg b/test/plugins/removeUnusedNS.01.svg.txt
similarity index 100%
rename from test/plugins/removeUnusedNS.01.svg
rename to test/plugins/removeUnusedNS.01.svg.txt
diff --git a/test/plugins/removeUnusedNS.02.svg b/test/plugins/removeUnusedNS.02.svg.txt
similarity index 100%
rename from test/plugins/removeUnusedNS.02.svg
rename to test/plugins/removeUnusedNS.02.svg.txt
diff --git a/test/plugins/removeUnusedNS.03.svg b/test/plugins/removeUnusedNS.03.svg.txt
similarity index 100%
rename from test/plugins/removeUnusedNS.03.svg
rename to test/plugins/removeUnusedNS.03.svg.txt
diff --git a/test/plugins/removeUnusedNS.04.svg b/test/plugins/removeUnusedNS.04.svg.txt
similarity index 100%
rename from test/plugins/removeUnusedNS.04.svg
rename to test/plugins/removeUnusedNS.04.svg.txt
diff --git a/test/plugins/removeUnusedNS.05.svg b/test/plugins/removeUnusedNS.05.svg.txt
similarity index 100%
rename from test/plugins/removeUnusedNS.05.svg
rename to test/plugins/removeUnusedNS.05.svg.txt
diff --git a/test/plugins/removeUnusedNS.06.svg b/test/plugins/removeUnusedNS.06.svg.txt
similarity index 100%
rename from test/plugins/removeUnusedNS.06.svg
rename to test/plugins/removeUnusedNS.06.svg.txt
diff --git a/test/plugins/removeUnusedNS.07.svg b/test/plugins/removeUnusedNS.07.svg.txt
similarity index 100%
rename from test/plugins/removeUnusedNS.07.svg
rename to test/plugins/removeUnusedNS.07.svg.txt
diff --git a/test/plugins/removeUselessDefs.01.svg b/test/plugins/removeUselessDefs.01.svg.txt
similarity index 100%
rename from test/plugins/removeUselessDefs.01.svg
rename to test/plugins/removeUselessDefs.01.svg.txt
diff --git a/test/plugins/removeUselessDefs.02.svg b/test/plugins/removeUselessDefs.02.svg.txt
similarity index 100%
rename from test/plugins/removeUselessDefs.02.svg
rename to test/plugins/removeUselessDefs.02.svg.txt
diff --git a/test/plugins/removeUselessDefs.03.svg b/test/plugins/removeUselessDefs.03.svg.txt
similarity index 100%
rename from test/plugins/removeUselessDefs.03.svg
rename to test/plugins/removeUselessDefs.03.svg.txt
diff --git a/test/plugins/removeUselessDefs.04.svg b/test/plugins/removeUselessDefs.04.svg.txt
similarity index 100%
rename from test/plugins/removeUselessDefs.04.svg
rename to test/plugins/removeUselessDefs.04.svg.txt
diff --git a/test/plugins/removeUselessDefs.05.svg b/test/plugins/removeUselessDefs.05.svg.txt
similarity index 100%
rename from test/plugins/removeUselessDefs.05.svg
rename to test/plugins/removeUselessDefs.05.svg.txt
diff --git a/test/plugins/removeUselessStrokeAndFill.01.svg b/test/plugins/removeUselessStrokeAndFill.01.svg.txt
similarity index 100%
rename from test/plugins/removeUselessStrokeAndFill.01.svg
rename to test/plugins/removeUselessStrokeAndFill.01.svg.txt
diff --git a/test/plugins/removeUselessStrokeAndFill.02.svg b/test/plugins/removeUselessStrokeAndFill.02.svg.txt
similarity index 100%
rename from test/plugins/removeUselessStrokeAndFill.02.svg
rename to test/plugins/removeUselessStrokeAndFill.02.svg.txt
diff --git a/test/plugins/removeUselessStrokeAndFill.03.svg b/test/plugins/removeUselessStrokeAndFill.03.svg.txt
similarity index 100%
rename from test/plugins/removeUselessStrokeAndFill.03.svg
rename to test/plugins/removeUselessStrokeAndFill.03.svg.txt
diff --git a/test/plugins/removeUselessStrokeAndFill.04.svg b/test/plugins/removeUselessStrokeAndFill.04.svg.txt
similarity index 100%
rename from test/plugins/removeUselessStrokeAndFill.04.svg
rename to test/plugins/removeUselessStrokeAndFill.04.svg.txt
diff --git a/test/plugins/removeUselessStrokeAndFill.05.svg b/test/plugins/removeUselessStrokeAndFill.05.svg.txt
similarity index 100%
rename from test/plugins/removeUselessStrokeAndFill.05.svg
rename to test/plugins/removeUselessStrokeAndFill.05.svg.txt
diff --git a/test/plugins/removeViewBox.01.svg b/test/plugins/removeViewBox.01.svg.txt
similarity index 100%
rename from test/plugins/removeViewBox.01.svg
rename to test/plugins/removeViewBox.01.svg.txt
diff --git a/test/plugins/removeViewBox.02.svg b/test/plugins/removeViewBox.02.svg.txt
similarity index 100%
rename from test/plugins/removeViewBox.02.svg
rename to test/plugins/removeViewBox.02.svg.txt
diff --git a/test/plugins/removeViewBox.03.svg b/test/plugins/removeViewBox.03.svg.txt
similarity index 100%
rename from test/plugins/removeViewBox.03.svg
rename to test/plugins/removeViewBox.03.svg.txt
diff --git a/test/plugins/removeViewBox.04.svg b/test/plugins/removeViewBox.04.svg.txt
similarity index 100%
rename from test/plugins/removeViewBox.04.svg
rename to test/plugins/removeViewBox.04.svg.txt
diff --git a/test/plugins/removeViewBox.05.svg b/test/plugins/removeViewBox.05.svg.txt
similarity index 100%
rename from test/plugins/removeViewBox.05.svg
rename to test/plugins/removeViewBox.05.svg.txt
diff --git a/test/plugins/removeXMLNS.01.svg b/test/plugins/removeXMLNS.01.svg.txt
similarity index 100%
rename from test/plugins/removeXMLNS.01.svg
rename to test/plugins/removeXMLNS.01.svg.txt
diff --git a/test/plugins/removeXMLProcInst.01.svg b/test/plugins/removeXMLProcInst.01.svg.txt
similarity index 100%
rename from test/plugins/removeXMLProcInst.01.svg
rename to test/plugins/removeXMLProcInst.01.svg.txt
diff --git a/test/plugins/removeXMLProcInst.02.svg b/test/plugins/removeXMLProcInst.02.svg.txt
similarity index 100%
rename from test/plugins/removeXMLProcInst.02.svg
rename to test/plugins/removeXMLProcInst.02.svg.txt
diff --git a/test/plugins/removeXlink.01.svg b/test/plugins/removeXlink.01.svg.txt
similarity index 100%
rename from test/plugins/removeXlink.01.svg
rename to test/plugins/removeXlink.01.svg.txt
diff --git a/test/plugins/removeXlink.02.svg b/test/plugins/removeXlink.02.svg.txt
similarity index 100%
rename from test/plugins/removeXlink.02.svg
rename to test/plugins/removeXlink.02.svg.txt
diff --git a/test/plugins/removeXlink.03.svg b/test/plugins/removeXlink.03.svg.txt
similarity index 100%
rename from test/plugins/removeXlink.03.svg
rename to test/plugins/removeXlink.03.svg.txt
diff --git a/test/plugins/removeXlink.04.svg b/test/plugins/removeXlink.04.svg.txt
similarity index 100%
rename from test/plugins/removeXlink.04.svg
rename to test/plugins/removeXlink.04.svg.txt
diff --git a/test/plugins/reusePaths.01.svg b/test/plugins/reusePaths.01.svg.txt
similarity index 100%
rename from test/plugins/reusePaths.01.svg
rename to test/plugins/reusePaths.01.svg.txt
diff --git a/test/plugins/reusePaths.02.svg b/test/plugins/reusePaths.02.svg.txt
similarity index 100%
rename from test/plugins/reusePaths.02.svg
rename to test/plugins/reusePaths.02.svg.txt
diff --git a/test/plugins/reusePaths.03.svg b/test/plugins/reusePaths.03.svg.txt
similarity index 100%
rename from test/plugins/reusePaths.03.svg
rename to test/plugins/reusePaths.03.svg.txt
diff --git a/test/plugins/reusePaths.04.svg b/test/plugins/reusePaths.04.svg.txt
similarity index 100%
rename from test/plugins/reusePaths.04.svg
rename to test/plugins/reusePaths.04.svg.txt
diff --git a/test/plugins/reusePaths.05.svg b/test/plugins/reusePaths.05.svg.txt
similarity index 100%
rename from test/plugins/reusePaths.05.svg
rename to test/plugins/reusePaths.05.svg.txt
diff --git a/test/plugins/reusePaths.06.svg b/test/plugins/reusePaths.06.svg.txt
similarity index 100%
rename from test/plugins/reusePaths.06.svg
rename to test/plugins/reusePaths.06.svg.txt
diff --git a/test/plugins/sortAttrs.01.svg b/test/plugins/sortAttrs.01.svg.txt
similarity index 100%
rename from test/plugins/sortAttrs.01.svg
rename to test/plugins/sortAttrs.01.svg.txt
diff --git a/test/plugins/sortAttrs.02.svg b/test/plugins/sortAttrs.02.svg.txt
similarity index 100%
rename from test/plugins/sortAttrs.02.svg
rename to test/plugins/sortAttrs.02.svg.txt
diff --git a/test/plugins/sortAttrs.03.svg b/test/plugins/sortAttrs.03.svg.txt
similarity index 100%
rename from test/plugins/sortAttrs.03.svg
rename to test/plugins/sortAttrs.03.svg.txt
diff --git a/test/plugins/sortAttrs.04.svg b/test/plugins/sortAttrs.04.svg.txt
similarity index 100%
rename from test/plugins/sortAttrs.04.svg
rename to test/plugins/sortAttrs.04.svg.txt
diff --git a/test/plugins/sortDefsChildren.01.svg b/test/plugins/sortDefsChildren.01.svg.txt
similarity index 100%
rename from test/plugins/sortDefsChildren.01.svg
rename to test/plugins/sortDefsChildren.01.svg.txt