From 4e0b6ba5c5937440f8acf579c63b129a0e5c0773 Mon Sep 17 00:00:00 2001
From: Brett Zamir <brettz9@yahoo.com>
Date: Mon, 10 Apr 2023 02:34:58 +0800
Subject: [PATCH 1/2] Update package.json

Haven't tested, but wondering if can work to avoid security issue warnings
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6a0e5aa..6911c3c 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,6 @@
   "dependencies": {
     "css-color-names": "~1.0.1",
     "dot": "^1.1.3",
-    "svgo": "2.6.0"
+    "svgo": "^3.0.2"
   }
 }

From 09d4bc6005a7c865b5f06f26cbd1ffc985b79591 Mon Sep 17 00:00:00 2001
From: Joshua Napoli <josh@cumulusds.com>
Date: Sun, 11 Jun 2023 18:19:55 -0400
Subject: [PATCH 2/2] Update unit tests

---
 test/testData/good.svg              | 2 +-
 test/testData/long.svg              | 2 +-
 test/testData/v2-example.svg        | 2 +-
 test/testData/v2-foo-bar-stroke.svg | 2 +-
 test/testData/v2-foo-bar.svg        | 2 +-
 test/testData/v2-one-color.svg      | 2 +-
 test/testData/xml.svg               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/testData/good.svg b/test/testData/good.svg
index 9c6f671..1c05e02 100644
--- a/test/testData/good.svg
+++ b/test/testData/good.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="124" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="124" height="20" rx="3" fill="#fff"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h52v20H0z"/><path fill="#97CA00" d="M52 0h72v20H52z"/><path fill="url(#b)" d="M0 0h124v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,DejaVu Sans,Geneva,sans-serif" font-size="11"><text x="26" y="15" fill="#010101" fill-opacity=".3">batman</text><text x="26" y="14">batman</text><text x="87" y="15" fill="#010101" fill-opacity=".3">component</text><text x="87" y="14">component</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="124" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="124" height="20" fill="#fff" rx="3"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h52v20H0z"/><path fill="#97CA00" d="M52 0h72v20H52z"/><path fill="url(#b)" d="M0 0h124v20H0z"/></g><g fill="#fff" font-family="Verdana,DejaVu Sans,Geneva,sans-serif" font-size="11" text-anchor="middle"><text x="26" y="15" fill="#010101" fill-opacity=".3">batman</text><text x="26" y="14">batman</text><text x="87" y="15" fill="#010101" fill-opacity=".3">component</text><text x="87" y="14">component</text></g></svg>
diff --git a/test/testData/long.svg b/test/testData/long.svg
index c7b12a7..995b46a 100644
--- a/test/testData/long.svg
+++ b/test/testData/long.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="216" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="216" height="20" rx="3" fill="#fff"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h144v20H0z"/><path fill="#97CA00" d="M144 0h72v20h-72z"/><path fill="url(#b)" d="M0 0h216v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,DejaVu Sans,Geneva,sans-serif" font-size="11"><text x="72" y="15" fill="#010101" fill-opacity=".3">batmanandrobinforever</text><text x="72" y="14">batmanandrobinforever</text><text x="179" y="15" fill="#010101" fill-opacity=".3">component</text><text x="179" y="14">component</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="216" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="216" height="20" fill="#fff" rx="3"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h144v20H0z"/><path fill="#97CA00" d="M144 0h72v20h-72z"/><path fill="url(#b)" d="M0 0h216v20H0z"/></g><g fill="#fff" font-family="Verdana,DejaVu Sans,Geneva,sans-serif" font-size="11" text-anchor="middle"><text x="72" y="15" fill="#010101" fill-opacity=".3">batmanandrobinforever</text><text x="72" y="14">batmanandrobinforever</text><text x="179" y="15" fill="#010101" fill-opacity=".3">component</text><text x="179" y="14">component</text></g></svg>
diff --git a/test/testData/v2-example.svg b/test/testData/v2-example.svg
index 5d792fc..ff35973 100644
--- a/test/testData/v2-example.svg
+++ b/test/testData/v2-example.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="219" height="32"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h70v32H0z"/><path fill="orange" d="M70 0h30v32H70z"/><path fill="olive" stroke="#fff" d="M100 0h86v32h-86z"/><path fill="#ffe4b5" d="M186 0h33v32h-33z"/><path fill="url(#smooth)" d="M0 0h219v32H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">foo/far;fun</text><text class="high" x="5" y="14">foo/far;fun</text><text class="shadow" x="75.5" y="15">bar</text><text class="high" x="75" y="14">bar</text><text class="shadow" x="75.5" y="27">baz</text><text class="high" x="75" y="26">baz</text><text class="shadow" x="105.5" y="15">mork &quot;mindy&quot;</text><text class="high" x="105" y="14">mork &quot;mindy&quot;</text><text class="shadow" x="191.5" y="15">&lt;∀&gt;</text><text class="high" x="191" y="14">&lt;∀&gt;</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="219" height="32"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" fill="#fff" rx="3"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h70v32H0z"/><path fill="orange" d="M70 0h30v32H70z"/><path fill="olive" stroke="#fff" d="M100 0h86v32h-86z"/><path fill="#ffe4b5" d="M186 0h33v32h-33z"/><path fill="url(#smooth)" d="M0 0h219v32H0z"/></g><g id="fg"><text x="5.5" y="15" class="shadow">foo/far;fun</text><text x="5" y="14" class="high">foo/far;fun</text><text x="75.5" y="15" class="shadow">bar</text><text x="75" y="14" class="high">bar</text><text x="75.5" y="27" class="shadow">baz</text><text x="75" y="26" class="high">baz</text><text x="105.5" y="15" class="shadow">mork &quot;mindy&quot;</text><text x="105" y="14" class="high">mork &quot;mindy&quot;</text><text x="191.5" y="15" class="shadow">&lt;∀&gt;</text><text x="191" y="14" class="high">&lt;∀&gt;</text></g></svg>
diff --git a/test/testData/v2-foo-bar-stroke.svg b/test/testData/v2-foo-bar-stroke.svg
index cbf9a09..02bde61 100644
--- a/test/testData/v2-foo-bar-stroke.svg
+++ b/test/testData/v2-foo-bar-stroke.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="57" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h28v20H0z"/><path fill="#d3d3d3" stroke="#fff" d="M28 0h29v20H28z"/><path fill="url(#smooth)" d="M0 0h57v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">foo</text><text class="high" x="5" y="14">foo</text><text class="shadow" x="33.5" y="15">bar</text><text class="high" x="33" y="14">bar</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="57" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" fill="#fff" rx="3"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h28v20H0z"/><path fill="#d3d3d3" stroke="#fff" d="M28 0h29v20H28z"/><path fill="url(#smooth)" d="M0 0h57v20H0z"/></g><g id="fg"><text x="5.5" y="15" class="shadow">foo</text><text x="5" y="14" class="high">foo</text><text x="33.5" y="15" class="shadow">bar</text><text x="33" y="14" class="high">bar</text></g></svg>
diff --git a/test/testData/v2-foo-bar.svg b/test/testData/v2-foo-bar.svg
index 71deae9..b667928 100644
--- a/test/testData/v2-foo-bar.svg
+++ b/test/testData/v2-foo-bar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="57" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h28v20H0z"/><path fill="#d3d3d3" d="M28 0h29v20H28z"/><path fill="url(#smooth)" d="M0 0h57v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">foo</text><text class="high" x="5" y="14">foo</text><text class="shadow" x="33.5" y="15">bar</text><text class="high" x="33" y="14">bar</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="57" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" fill="#fff" rx="3"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h28v20H0z"/><path fill="#d3d3d3" d="M28 0h29v20H28z"/><path fill="url(#smooth)" d="M0 0h57v20H0z"/></g><g id="fg"><text x="5.5" y="15" class="shadow">foo</text><text x="5" y="14" class="high">foo</text><text x="33.5" y="15" class="shadow">bar</text><text x="33" y="14" class="high">bar</text></g></svg>
diff --git a/test/testData/v2-one-color.svg b/test/testData/v2-one-color.svg
index cde1655..7010347 100644
--- a/test/testData/v2-one-color.svg
+++ b/test/testData/v2-one-color.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="57" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h28v20H0z"/><path fill="#90ee90" d="M28 0h29v20H28z"/><path fill="url(#smooth)" d="M0 0h57v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">foo</text><text class="high" x="5" y="14">foo</text><text class="shadow" x="33.5" y="15">bar</text><text class="high" x="33" y="14">bar</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="57" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" fill="#fff" rx="3"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h28v20H0z"/><path fill="#90ee90" d="M28 0h29v20H28z"/><path fill="url(#smooth)" d="M0 0h57v20H0z"/></g><g id="fg"><text x="5.5" y="15" class="shadow">foo</text><text x="5" y="14" class="high">foo</text><text x="33.5" y="15" class="shadow">bar</text><text x="33" y="14" class="high">bar</text></g></svg>
diff --git a/test/testData/xml.svg b/test/testData/xml.svg
index 197d8a1..98e80b6 100644
--- a/test/testData/xml.svg
+++ b/test/testData/xml.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="80" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="80" height="20" rx="3" fill="#fff"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h40v20H0z"/><path fill="#97CA00" d="M40 0h40v20H40z"/><path fill="url(#b)" d="M0 0h80v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,DejaVu Sans,Geneva,sans-serif" font-size="11"><text x="20" y="15" fill="#010101" fill-opacity=".3">&amp;&lt;&gt;&quot;&apos;</text><text x="20" y="14">&amp;&lt;&gt;&quot;&apos;</text><text x="59" y="15" fill="#010101" fill-opacity=".3">&amp;&lt;&gt;&quot;&apos;</text><text x="59" y="14">&amp;&lt;&gt;&quot;&apos;</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="a"><rect width="80" height="20" fill="#fff" rx="3"/></mask><g mask="url(#a)"><path fill="#555" d="M0 0h40v20H0z"/><path fill="#97CA00" d="M40 0h40v20H40z"/><path fill="url(#b)" d="M0 0h80v20H0z"/></g><g fill="#fff" font-family="Verdana,DejaVu Sans,Geneva,sans-serif" font-size="11" text-anchor="middle"><text x="20" y="15" fill="#010101" fill-opacity=".3">&amp;&lt;&gt;&quot;&apos;</text><text x="20" y="14">&amp;&lt;&gt;&quot;&apos;</text><text x="59" y="15" fill="#010101" fill-opacity=".3">&amp;&lt;&gt;&quot;&apos;</text><text x="59" y="14">&amp;&lt;&gt;&quot;&apos;</text></g></svg>