Skip to content

Fix multiple <svg> and missing content issue #2722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gerteck merged 2 commits into from
Jun 3, 2025
Merged

Fix multiple <svg> and missing content issue #2722

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bedd5e9
Fix bug with mulitple svgs
AgentHagu May 30, 2025
c51d973
Clean up small nits
AgentHagu May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions packages/cli/src/lib/live-server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ function staticServer(root) {
if (req.method !== 'GET' && req.method !== 'HEAD') return next();
const reqpath = isFile ? "" : parse(req.url).pathname;
var hasNoOrigin = !req.headers.origin;
var injectCandidates = [ new RegExp("</body>", "i"), new RegExp("</svg>"), new RegExp("</head>", "i")];
var injectCandidates = [ new RegExp("</body>", "i"), new RegExp("</svg>", "gi"), new RegExp("</head>", "i")];
var injectTag = null;
var injectCount = 0;

function directory() {
var pathname = parse(req.url).pathname;
Expand All @@ -79,15 +80,16 @@ function staticServer(root) {
}

function file(filepath /*, stat*/) {
var x = path.extname(filepath).toLocaleLowerCase(), match,
var x = path.extname(filepath).toLocaleLowerCase(), matches,
possibleExtensions = [ "", ".html", ".htm", ".xhtml", ".php", ".svg" ];
if (hasNoOrigin && (possibleExtensions.indexOf(x) > -1)) {
// TODO: Sync file read here is not nice, but we need to determine if the html should be injected or not
var contents = fs.readFileSync(filepath, "utf8");
for (var i = 0; i < injectCandidates.length; ++i) {
match = injectCandidates[i].exec(contents);
if (match) {
injectTag = match[0];
matches = contents.match(injectCandidates[i]);
injectCount = matches && matches.length || 0;
if (injectCount > 0) {
injectTag = matches[0];
break;
}
}
Expand All @@ -107,7 +109,8 @@ function staticServer(root) {
function inject(stream) {
if (injectTag) {
// We need to modify the length given to browser
var len = INJECTED_CODE.length + res.getHeader('Content-Length');
var contentLength = Number(res.getHeader('Content-Length')) || 0;
var len = INJECTED_CODE.length * injectCount + contentLength;
res.setHeader('Content-Length', len);
var originalPipe = stream.pipe;
stream.pipe = function(resp) {
Expand Down