fix(preprocess-inline-svg): unscape & during preprocessing

vnphanquang · Oct 4, 2024 · 15de2df · 15de2df
1 parent fd22b57
commit 15de2df
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/.changeset/small-oranges-joke.md b/.changeset/small-oranges-joke.md
@@ -0,0 +1,6 @@
+---
+"@svelte-put/preprocess-inline-svg": patch
+---
+
+unescape &amp; to & during preprocessing (fixes #322)
+
diff --git a/packages/preprocess-inline-svg/package.json b/packages/preprocess-inline-svg/package.json
@@ -68,8 +68,9 @@
 	"dependencies": {
 		"hast-util-to-html": "^9.0.1",
 		"lodash.debounce": "^4.0.8",
-		"magic-string": "^0.30.9",
-		"svelte-parse-markup": "^0.1.2",
+		"magic-string": "^0.30.10",
+		"svelte-parse-markup": "^0.1.5",
 		"svg-parser": "^2.0.4"
 	}
 }
+
diff --git a/packages/preprocess-inline-svg/src/preprocessor/preprocessor.internals.ts b/packages/preprocess-inline-svg/src/preprocessor/preprocessor.internals.ts
@@ -158,7 +158,8 @@ export function transform(
 				);
 			}
 
-			const hast = parseSvg(fs.readFileSync(svgSource, 'utf8'));
+			const svgStr = fs.readFileSync(svgSource, 'utf8').replace(/&amp;/g, '&');
+			const hast = parseSvg(svgStr);
 			const svg = hast.children[0] as ElementNode;
 
 			const attributes = {
@@ -199,3 +200,4 @@ export function transform(
 		map: s.generateMap(),
 	};
 }
+
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml