From d2b7ba85ed635fa5da52b9e30acc616cda442012 Mon Sep 17 00:00:00 2001 From: rvh1986 Date: Sat, 27 Nov 2021 18:38:44 +0100 Subject: [PATCH 1/4] Update SVGCompositor.js Remove doctype and Illustrator comment. --- compositors/SVGCompositor.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compositors/SVGCompositor.js b/compositors/SVGCompositor.js index bc78744..366c79b 100644 --- a/compositors/SVGCompositor.js +++ b/compositors/SVGCompositor.js @@ -23,6 +23,9 @@ class SVGCompositor { var headerIndexEnd = spriteSVG.indexOf('?>'); spriteSVG = spriteSVG.substring(headerIndexEnd + 2); } + + spriteSVG = spriteSVG.replace('', ''); + spriteSVG = spriteSVG.replace('', ''); // Rename sprite ids to avoid clashing. spriteSVG = postsvg().use(renameId({pattern: 'sprite' + (++spriteId) + '_[id]'})).process(spriteSVG); From 0f166a3715d9a5a12221767c3e39ffa3ef8cf35a Mon Sep 17 00:00:00 2001 From: rvh1986 Date: Sat, 27 Nov 2021 18:46:22 +0100 Subject: [PATCH 2/4] Update SVGCompositor.js --- compositors/SVGCompositor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compositors/SVGCompositor.js b/compositors/SVGCompositor.js index 366c79b..8ab7393 100644 --- a/compositors/SVGCompositor.js +++ b/compositors/SVGCompositor.js @@ -24,8 +24,8 @@ class SVGCompositor { spriteSVG = spriteSVG.substring(headerIndexEnd + 2); } - spriteSVG = spriteSVG.replace('', ''); - spriteSVG = spriteSVG.replace('', ''); + spriteSVG = spriteSVG.replace('', ''); + spriteSVG = spriteSVG.replace('', ''); // Rename sprite ids to avoid clashing. spriteSVG = postsvg().use(renameId({pattern: 'sprite' + (++spriteId) + '_[id]'})).process(spriteSVG); From d823769d8df5947bbd2bf4488e4225c52019703c Mon Sep 17 00:00:00 2001 From: rvh1986 Date: Sat, 27 Nov 2021 19:31:07 +0100 Subject: [PATCH 3/4] Update SVGCompositor.js Remove comments, doctype and unnecessary svg tags. --- compositors/SVGCompositor.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/compositors/SVGCompositor.js b/compositors/SVGCompositor.js index 8ab7393..d44fbb3 100644 --- a/compositors/SVGCompositor.js +++ b/compositors/SVGCompositor.js @@ -24,8 +24,14 @@ class SVGCompositor { spriteSVG = spriteSVG.substring(headerIndexEnd + 2); } - spriteSVG = spriteSVG.replace('', ''); - spriteSVG = spriteSVG.replace('', ''); + // Strip comments, if any. + spriteSVG = spriteSVG.replace(new RegExp('()', 'g'), ''); + + // Strip Doctype, if any. + spriteSVG = spriteSVG.replace(new RegExp('(]*)">)', 'g'), ''); + + //Strip Svg tag. + spriteSVG = spriteSVG.replace(new RegExp('(]*)">)|()', 'g'), ''); // Rename sprite ids to avoid clashing. spriteSVG = postsvg().use(renameId({pattern: 'sprite' + (++spriteId) + '_[id]'})).process(spriteSVG); From 474f3d3b629ab02dbbc35b9dc9aa78c5cb12364d Mon Sep 17 00:00:00 2001 From: rvh1986 Date: Sat, 27 Nov 2021 19:32:29 +0100 Subject: [PATCH 4/4] Update SVGCompositor.js --- compositors/SVGCompositor.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compositors/SVGCompositor.js b/compositors/SVGCompositor.js index d44fbb3..77f9e69 100644 --- a/compositors/SVGCompositor.js +++ b/compositors/SVGCompositor.js @@ -25,13 +25,13 @@ class SVGCompositor { } // Strip comments, if any. - spriteSVG = spriteSVG.replace(new RegExp('()', 'g'), ''); + spriteSVG = spriteSVG.replace(new RegExp('()', 'g'), ''); - // Strip Doctype, if any. - spriteSVG = spriteSVG.replace(new RegExp('(]*)">)', 'g'), ''); + // Strip Doctype, if any. + spriteSVG = spriteSVG.replace(new RegExp('(]*)">)', 'g'), ''); - //Strip Svg tag. - spriteSVG = spriteSVG.replace(new RegExp('(]*)">)|()', 'g'), ''); + //Strip Svg tag. + spriteSVG = spriteSVG.replace(new RegExp('(]*)">)|()', 'g'), ''); // Rename sprite ids to avoid clashing. spriteSVG = postsvg().use(renameId({pattern: 'sprite' + (++spriteId) + '_[id]'})).process(spriteSVG);