Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

use another heuristic

Browse source
This commit is contained in:
Yury Semikhatsky 2025-02-25 14:30:38 -08:00
parent 267f096a53
commit 02a2180ccf
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
packages/playwright-core/src/utils/isomorphic/urlMatch.ts
View file

@ -101,24 +101,18 @@ export function urlMatches(baseURL: string | undefined, urlString: string, match
// Allow http(s) baseURL to match ws(s) urls. // Allow http(s) baseURL to match ws(s) urls.
if (baseURL && /^https?:\/\//.test(baseURL) && /^wss?:\/\//.test(urlString)) if (baseURL && /^https?:\/\//.test(baseURL) && /^wss?:\/\//.test(urlString))
baseURL = baseURL.replace(/^http/, 'ws'); baseURL = baseURL.replace(/^http/, 'ws');
if (baseURL) { // Resolve match relative to baseURL only if baseURL is set and match is not an absolute URL.
// String starting with a dot are treated as explicit relative URL. // Otherwise, leave it unchanged to prevent the URL constructor from interpreting glob symbols
if (match.startsWith('.')) { // like ?, {, and }, which could alter the pattern.
match = constructURLBasedOnBaseURL(baseURL, match); if (baseURL && !parseURL(match))
} else { match = constructURLBasedOnBaseURL(baseURL, match);
// We cannot pass `match` as the relative URL as regex symbols would be misinterpreted.
const relativeBase = match.startsWith('/') ? '/' : '.';
let prefix = constructURLBasedOnBaseURL(baseURL, relativeBase);
if (prefix !== relativeBase) {
if (match.startsWith('/') && prefix.endsWith('/'))
prefix = prefix.substring(0, prefix.length - 1);
match = prefix + match;
}
}
}
} }
if (isString(match)) if (isString(match)) {
const tryWithoutTrailingSlash = urlString.endsWith('/') && !match.endsWith('/');
match = globToRegex(match); match = globToRegex(match);
if (tryWithoutTrailingSlash && match.test(urlString.substring(0, urlString.length - 1)))
return true;
}
if (isRegExp(match)) if (isRegExp(match))
return match.test(urlString); return match.test(urlString);
const url = parseURL(urlString); const url = parseURL(urlString);