diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json index c71da70c2d..d5d3b3a4a6 100644 --- a/packages/playwright-core/browsers.json +++ b/packages/playwright-core/browsers.json @@ -23,7 +23,7 @@ }, { "name": "webkit", - "revision": "1625", + "revision": "1629", "installByDefault": true, "revisionOverrides": { "mac10.14": "1446", diff --git a/packages/playwright-core/src/server/registry/dependencies.ts b/packages/playwright-core/src/server/registry/dependencies.ts index 17504adebf..8c55e5da53 100644 --- a/packages/playwright-core/src/server/registry/dependencies.ts +++ b/packages/playwright-core/src/server/registry/dependencies.ts @@ -270,6 +270,8 @@ function isSharedLib(basename: string) { } async function executablesOrSharedLibraries(directoryPath: string): Promise { + if (!fs.existsSync(directoryPath)) + return []; const allPaths = (await fs.promises.readdir(directoryPath)).map(file => path.resolve(directoryPath, file)); const allStats = await Promise.all(allPaths.map(aPath => fs.promises.stat(aPath))); const filePaths = allPaths.filter((aPath, index) => (allStats[index] as any).isFile()); diff --git a/packages/playwright-core/src/server/registry/index.ts b/packages/playwright-core/src/server/registry/index.ts index adc5f0fd5c..13b0d56158 100644 --- a/packages/playwright-core/src/server/registry/index.ts +++ b/packages/playwright-core/src/server/registry/index.ts @@ -437,9 +437,11 @@ export class Registry { path.join('minibrowser-gtk'), path.join('minibrowser-gtk', 'bin'), path.join('minibrowser-gtk', 'lib'), + path.join('minibrowser-gtk', 'sys', 'lib'), path.join('minibrowser-wpe'), path.join('minibrowser-wpe', 'bin'), path.join('minibrowser-wpe', 'lib'), + path.join('minibrowser-wpe', 'sys', 'lib'), ]; this._executables.push({ type: 'browser', diff --git a/packages/playwright-core/src/server/webkit/protocol.d.ts b/packages/playwright-core/src/server/webkit/protocol.d.ts index 485ee114de..7261db2524 100644 --- a/packages/playwright-core/src/server/webkit/protocol.d.ts +++ b/packages/playwright-core/src/server/webkit/protocol.d.ts @@ -853,11 +853,11 @@ export module Protocol { */ export interface Grouping { /** - * Source of the media query: "media-rule" if specified by a @media rule, "media-import-rule" if specified by an @import rule, "media-link-node" if specified by a "media" attribute in a linked style sheet's LINK tag, "media-style-node" if specified by a "media" attribute in an inline style sheet's STYLE tag, "supports-rule" if specified by an @supports rule, "layer-rule" if specified by an @layer rule. + * Source of the media query: "media-rule" if specified by a @media rule, "media-import-rule" if specified by an @import rule, "media-link-node" if specified by a "media" attribute in a linked style sheet's LINK tag, "media-style-node" if specified by a "media" attribute in an inline style sheet's STYLE tag, "supports-rule" if specified by an @supports rule, "layer-rule" if specified by an @layer rule, "container-rule" if specified by an @container rule. */ - type: "media-rule"|"media-import-rule"|"media-link-node"|"media-style-node"|"supports-rule"|"layer-rule"|"layer-import-rule"; + type: "media-rule"|"media-import-rule"|"media-link-node"|"media-style-node"|"supports-rule"|"layer-rule"|"layer-import-rule"|"container-rule"; /** - * Query text if specified by a @media or @supports rule. Layer name (or not present for anonymous layers) for @layer rules. + * Query text if specified by a @media, @supports, or @container rule. Layer name (or not present for anonymous layers) for @layer rules. */ text?: string; /** @@ -5345,6 +5345,10 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the * Connection information for the completed request. */ securityConnection?: Security.Connection; + /** + * Whether or not the connection was proxied through a server. If true, the remoteAddress will be for the proxy server, not the server that provided the resource to the proxy server. + */ + isProxyConnection?: boolean; } /** * WebSocket request data. diff --git a/tests/library/defaultbrowsercontext-2.spec.ts b/tests/library/defaultbrowsercontext-2.spec.ts index 3cde43b3d5..1016cc191c 100644 --- a/tests/library/defaultbrowsercontext-2.spec.ts +++ b/tests/library/defaultbrowsercontext-2.spec.ts @@ -96,7 +96,8 @@ it('should accept userDataDir', async ({ createUserDataDir, browserType }) => { expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0); }); -it('should restore state from userDataDir', async ({ browserType, server, createUserDataDir }) => { +it('should restore state from userDataDir', async ({ browserType, server, createUserDataDir, isMac, browserName }) => { + it.skip(isMac && browserName === 'webkit', 'Started failing after roll https://github.com/microsoft/playwright/issues/13433'); it.slow(); const userDataDir = await createUserDataDir();