Skip to content

patch: fix script injection location #3281

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

Open
beenotung wants to merge 1 commit into
base: master
Choose a base branch
from
Open

patch: fix script injection location #3281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions lib/live-server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ function staticServer(root, onTagMissedCallback) {
var reqpath = isFile ? "" : url.parse(req.url).pathname;
var hasNoOrigin = !req.headers.origin;
var injectCandidates = [
new RegExp("</body>", "i"),
new RegExp("</svg>"),
new RegExp("</head>", "i")
{ regex: new RegExp("</body>", "i"), lastOccurrence: true },
{ regex: new RegExp("</svg>"), lastOccurrence: true },
{ regex: new RegExp("</head>", "i"), lastOccurrence: false }
];

// extraInjectCandidates = extraInjectCandidates || [];
Expand All @@ -88,11 +88,18 @@ function staticServer(root, onTagMissedCallback) {
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");
var lastIndex = -1;
for (var i = 0; i < injectCandidates.length; ++i) {
match = injectCandidates[i].exec(contents);
if (match) {
injectTag = match[0];
break;
var allMatches = [...contents.matchAll(injectCandidates[i].regex)];
if (allMatches.length > 0) {
var selectedMatch = injectCandidates[i].lastOccurrence
? allMatches[allMatches.length - 1]
: allMatches[0];
var matchIndex = selectedMatch.index;
if (matchIndex > lastIndex) {
lastIndex = matchIndex;
injectTag = selectedMatch[0];
}
}
}

Expand Down