Fix incorrect replacement for width/height/fill incorrectly removed

Closes #9

Author: MoOx

__tests__/Test.re

@@ -26,6 +26,10 @@ describe("simple svg", () =>
   readFileSync("./test/simple.svg", `utf8)->testAll
 );
 
+describe("edge case width svg", () =>
+  readFileSync("./test/edge-case-width.svg", `utf8)->testAll
+);
+
 describe("clean & minimal svg", () =>
   readFileSync("./test/clean.svg", `utf8)->testAll
 );

__tests__/__snapshots__/Test.proxy.js.snap

@@ -30,7 +30,8 @@
     "re:clean": "bsb -clean-world",
     "re:build": "bsb -make-world",
     "svg:format": "find test/components -name \"*.re\" | grep -v \"node_modules\" | xargs bsrefmt --in-place",
-    "test": "yarn re:clean && yarn re:build && jest \"__tests__/(.*).proxy.js\"",
+    "tests": "jest \"__tests__/(.*).proxy.js\"",
+    "test": "yarn re:clean && yarn re:build && yarn tests",
     "release": "npmpub"
   },
   "dependencies": {

package.json

@@ -59,15 +59,15 @@ let transformSvg = (svg, removeFill, removeStroke) => {
     // |> Js.String.replaceByRe([%re "/></g"], {j|> <|j})
     // remove future props
     |> Js.String.replaceByRe(
-         [%re "/<svg\\s?(.*)?\\s?width=\"[^\\\"]*\"/g"],
+         [%re "/<svg\\s?([^>]*)?\\swidth=\"[^\\\"]*\"/g"],
          {j|<svg \$1|j},
        )
     |> Js.String.replaceByRe(
-         [%re "/<svg\\s?(.*)?\\s?height=\"[^\\\"]*\"/g"],
+         [%re "/<svg\\s?([^>]*)?\\sheight=\"[^\\\"]*\"/g"],
          {j|<svg \$1|j},
        )
     |> Js.String.replaceByRe(
-         [%re "/<svg\\s?(.*)?\\s?fill=\"[^\\\"]*\"/g"],
+         [%re "/<svg\\s?([^>]*)?\\sfill=\"[^\\\"]*\"/g"],
          {j|<svg \$1|j},
        )
     // inject props