Capture stylesheets designated as rel="preload" (#1374)
* feat(Snapshot): Capture stylesheets designated as `rel="preload"` * fix(Snapshot): Harden asset file extension matching * Add changeset * chore: Lint * Tweak regex, add try-catch block on URL constructor
This commit is contained in:
@@ -23,6 +23,7 @@ import {
|
||||
stringifyStylesheet,
|
||||
getInputType,
|
||||
toLowerCase,
|
||||
extractFileExtension,
|
||||
} from './utils';
|
||||
|
||||
let _id = 1;
|
||||
@@ -847,7 +848,7 @@ function slimDOMExcluded(
|
||||
(sn.tagName === 'link' &&
|
||||
sn.attributes.rel === 'prefetch' &&
|
||||
typeof sn.attributes.href === 'string' &&
|
||||
sn.attributes.href.endsWith('.js')))
|
||||
extractFileExtension(sn.attributes.href) === 'js'))
|
||||
) {
|
||||
return true;
|
||||
} else if (
|
||||
@@ -1177,7 +1178,11 @@ export function serializeNodeWithId(
|
||||
if (
|
||||
serializedNode.type === NodeType.Element &&
|
||||
serializedNode.tagName === 'link' &&
|
||||
serializedNode.attributes.rel === 'stylesheet'
|
||||
typeof serializedNode.attributes.rel === 'string' &&
|
||||
(serializedNode.attributes.rel === 'stylesheet' ||
|
||||
(serializedNode.attributes.rel === 'preload' &&
|
||||
typeof serializedNode.attributes.href === 'string' &&
|
||||
extractFileExtension(serializedNode.attributes.href) === 'css'))
|
||||
) {
|
||||
onceStylesheetLoaded(
|
||||
n as HTMLLinkElement,
|
||||
|
||||
@@ -331,3 +331,23 @@ export function getInputType(element: HTMLElement): Lowercase<string> | null {
|
||||
toLowerCase(type)
|
||||
: null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts the file extension from an a path, considering search parameters and fragments.
|
||||
* @param path - Path to file
|
||||
* @param baseURL - [optional] Base URL of the page, used to resolve relative paths. Defaults to current page URL.
|
||||
*/
|
||||
export function extractFileExtension(
|
||||
path: string,
|
||||
baseURL?: string,
|
||||
): string | null {
|
||||
let url;
|
||||
try {
|
||||
url = new URL(path, baseURL ?? window.location.href);
|
||||
} catch (err) {
|
||||
return null;
|
||||
}
|
||||
const regex = /\.([0-9a-z]+)(?:$)/i;
|
||||
const match = url.pathname.match(regex);
|
||||
return match?.[1] ?? null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user