Skip to content

Closes #7391: FileNotFound is preloaded for some page templates #56

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
jeawhanlee merged 1 commit into from
May 29, 2025
Merged

Closes #7391: FileNotFound is preloaded for some page templates #56

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
71 changes: 37 additions & 34 deletions src/BeaconPreloadFonts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,22 +506,6 @@ class BeaconPreloadFonts {
const aboveElements = elements.filter(el => this.isElementAboveFold(el));
const belowElements = elements.filter(el => !this.isElementAboveFold(el));

if (!allFonts[fontFamily]) {
allFonts[fontFamily] = {
type: 'hosted',
variations: [],
elementCount: {
aboveFold: aboveElements.length,
belowFold: belowElements.length,
total: elements.length
},
urlCount: {
aboveFold: new Set(),
belowFold: new Set()
}
};
}

data.variations.forEach(variation => {
let matchingUrl = null;
for (const styleUrl of data.urls) {
Expand All @@ -532,20 +516,37 @@ class BeaconPreloadFonts {
}
}

// Add variation with correct element counts
allFonts[fontFamily].variations.push({
weight: variation.weight,
style: variation.style,
url: matchingUrl || 'File not found',
elementCount: {
aboveFold: aboveElements.length,
belowFold: belowElements.length,
total: elements.length
}
});

// Track URLs per location
if (matchingUrl) {
// Only create new object if a valid matching url exist in network loaded fonts.
if (!allFonts[fontFamily]) {
allFonts[fontFamily] = {
type: 'hosted',
variations: [],
elementCount: {
aboveFold: aboveElements.length,
belowFold: belowElements.length,
total: elements.length
},
urlCount: {
aboveFold: new Set(),
belowFold: new Set()
}
};
}

// Add variation with correct element counts
allFonts[fontFamily].variations.push({
weight: variation.weight,
style: variation.style,
url: matchingUrl,
elementCount: {
aboveFold: aboveElements.length,
belowFold: belowElements.length,
total: elements.length
}
});

if (aboveElements.length > 0) {
allFonts[fontFamily].urlCount.aboveFold.add(matchingUrl);
}
Expand All @@ -559,12 +560,14 @@ class BeaconPreloadFonts {
return;
}

// Copy to hostedFontsResults
hostedFontsResults[fontFamily] = {
variations: allFonts[fontFamily].variations,
elementCount: { ...allFonts[fontFamily].elementCount },
urlCount: { ...allFonts[fontFamily].urlCount },
};
if (allFonts[fontFamily]) {
// Copy to hostedFontsResults
hostedFontsResults[fontFamily] = {
variations: allFonts[fontFamily].variations,
elementCount: { ...allFonts[fontFamily].elementCount },
urlCount: { ...allFonts[fontFamily].urlCount },
};
}
}
});
}
Expand Down