From 7bc89e0f84ab54f95ca5b63d0bd1607c4bf24124 Mon Sep 17 00:00:00 2001
From: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:36:57 -0700
Subject: [PATCH 1/2] fix: strip XML preamble in devvit create icons

Fixes #128

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 packages/cli/src/commands/create/icons.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/create/icons.ts b/packages/cli/src/commands/create/icons.ts
index ae18df136..907fbf5c8 100644
--- a/packages/cli/src/commands/create/icons.ts
+++ b/packages/cli/src/commands/create/icons.ts
@@ -58,7 +58,9 @@ export default class Icons extends DevvitCommand {
       assets.map(async (asset) => {
         const name = path.relative(assetsPath, asset);
         const contents = await fsp.readFile(asset, 'utf-8');
-        return { name, contents };
+        // Strip XML preamble (<?xml?>, <!DOCTYPE>, comments) before <svg> tag.
+        const stripped = contents.replace(/^[\s\S]*?(<svg)/i, '$1');
+        return { name, contents: stripped };
       })
     );
   }

From 3b156af06125dcc1fce323263a3768a01901b164 Mon Sep 17 00:00:00 2001
From: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
Date: Wed, 18 Mar 2026 18:08:32 -0700
Subject: [PATCH 2/2] fix: extract stripXmlPreamble and add unit tests

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../cli/src/commands/create/icons.test.ts     | 41 +++++++++++++++++++
 packages/cli/src/commands/create/icons.ts     |  9 ++--
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 packages/cli/src/commands/create/icons.test.ts

diff --git a/packages/cli/src/commands/create/icons.test.ts b/packages/cli/src/commands/create/icons.test.ts
new file mode 100644
index 000000000..09525ba7f
--- /dev/null
+++ b/packages/cli/src/commands/create/icons.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it } from 'vitest';
+
+import { stripXmlPreamble } from './icons.js';
+
+describe('stripXmlPreamble', () => {
+  it('strips <?xml?> declaration', () => {
+    const input = '<?xml version="1.0" encoding="UTF-8"?>\n<svg viewBox="0 0 24 24"></svg>';
+    expect(stripXmlPreamble(input)).toBe('<svg viewBox="0 0 24 24"></svg>');
+  });
+
+  it('strips <!DOCTYPE> declaration', () => {
+    const input =
+      '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n<svg></svg>';
+    expect(stripXmlPreamble(input)).toBe('<svg></svg>');
+  });
+
+  it('strips XML comments before <svg>', () => {
+    const input = '<!-- generated by Inkscape -->\n<svg></svg>';
+    expect(stripXmlPreamble(input)).toBe('<svg></svg>');
+  });
+
+  it('strips combined preamble (<?xml?> + <!DOCTYPE> + comment)', () => {
+    const input = [
+      '<?xml version="1.0" encoding="UTF-8"?>',
+      '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
+      '<!-- Created with Illustrator -->',
+      '<svg viewBox="0 0 100 100"></svg>',
+    ].join('\n');
+    expect(stripXmlPreamble(input)).toBe('<svg viewBox="0 0 100 100"></svg>');
+  });
+
+  it('returns input unchanged when no preamble exists', () => {
+    const input = '<svg viewBox="0 0 24 24"><path d="M0 0"/></svg>';
+    expect(stripXmlPreamble(input)).toBe(input);
+  });
+
+  it('handles leading whitespace before <svg>', () => {
+    const input = '  \n  <svg></svg>';
+    expect(stripXmlPreamble(input)).toBe('<svg></svg>');
+  });
+});
diff --git a/packages/cli/src/commands/create/icons.ts b/packages/cli/src/commands/create/icons.ts
index 907fbf5c8..77ac19b26 100644
--- a/packages/cli/src/commands/create/icons.ts
+++ b/packages/cli/src/commands/create/icons.ts
@@ -9,6 +9,11 @@ import { dirExists } from '../../util/files.js';
 
 type SvgAsset = { name: string; contents: string };
 
+/** Strip XML preamble (<?xml?>, <!DOCTYPE>, comments) before the <svg> tag. */
+export function stripXmlPreamble(contents: string): string {
+  return contents.replace(/^[\s\S]*?(<svg)/i, '$1');
+}
+
 // TODO: When Blocks support is fully removed, this command can be removed as well, since icons will
 //  be loaded directly in the webview once we're fully in a Devvit Web world.
 export default class Icons extends DevvitCommand {
@@ -58,9 +63,7 @@ export default class Icons extends DevvitCommand {
       assets.map(async (asset) => {
         const name = path.relative(assetsPath, asset);
         const contents = await fsp.readFile(asset, 'utf-8');
-        // Strip XML preamble (<?xml?>, <!DOCTYPE>, comments) before <svg> tag.
-        const stripped = contents.replace(/^[\s\S]*?(<svg)/i, '$1');
-        return { name, contents: stripped };
+        return { name, contents: stripXmlPreamble(contents) };
       })
     );
   }