diff --git a/docs/src/docker.md b/docs/src/docker.md index bfcf5e73b5..b2a3e906b9 100644 --- a/docs/src/docker.md +++ b/docs/src/docker.md @@ -132,7 +132,7 @@ Browser builds for Firefox and WebKit are built for the [glibc](https://en.wikip You can use the [.NET install script](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script) in order to install different SDK versions: ```bash -curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --install-dir /usr/share/dotnet --channel 6.0 +curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --install-dir /usr/share/dotnet --channel 9.0 ``` ## Build your own image diff --git a/packages/playwright-core/src/server/frames.ts b/packages/playwright-core/src/server/frames.ts index 81f04d94eb..ad793aded8 100644 --- a/packages/playwright-core/src/server/frames.ts +++ b/packages/playwright-core/src/server/frames.ts @@ -942,7 +942,7 @@ export class Frame extends SdkObject { origin(): string | undefined { if (!this._url.startsWith('http')) return; - return network.parsedURL(this._url)?.origin; + return network.parseURL(this._url)?.origin; } parentFrame(): Frame | null { diff --git a/packages/playwright-core/src/server/har/harTracer.ts b/packages/playwright-core/src/server/har/harTracer.ts index b4b90d7976..ba0e8b46c2 100644 --- a/packages/playwright-core/src/server/har/harTracer.ts +++ b/packages/playwright-core/src/server/har/harTracer.ts @@ -257,7 +257,7 @@ export class HarTracer { const page = request.frame()?._page; if (this._page && page !== this._page) return; - const url = network.parsedURL(request.url()); + const url = network.parseURL(request.url()); if (!url) return; diff --git a/packages/playwright-core/src/server/network.ts b/packages/playwright-core/src/server/network.ts index 42c94fe97b..006f2f4cbf 100644 --- a/packages/playwright-core/src/server/network.ts +++ b/packages/playwright-core/src/server/network.ts @@ -74,7 +74,7 @@ export function rewriteCookies(cookies: channels.SetNetworkCookie[]): channels.S }); } -export function parsedURL(url: string): URL | null { +export function parseURL(url: string): URL | null { try { return new URL(url); } catch (e) { diff --git a/packages/playwright-core/src/utils/isomorphic/urlMatch.ts b/packages/playwright-core/src/utils/isomorphic/urlMatch.ts index f5d6efb70d..1d3bd011dc 100644 --- a/packages/playwright-core/src/utils/isomorphic/urlMatch.ts +++ b/packages/playwright-core/src/utils/isomorphic/urlMatch.ts @@ -107,19 +107,15 @@ export function urlMatches(baseURL: string | undefined, urlString: string, match match = globToRegex(match); if (isRegExp(match)) return match.test(urlString); - if (typeof match === 'string' && match === urlString) - return true; - const url = parsedURL(urlString); + const url = parseURL(urlString); if (!url) return false; - if (typeof match === 'string') - return url.pathname === match; if (typeof match !== 'function') throw new Error('url parameter should be string, RegExp or function'); return match(url); } -function parsedURL(url: string): URL | null { +function parseURL(url: string): URL | null { try { return new URL(url); } catch (e) {