diff --git a/e2e/package.json b/e2e/package.json index 2ffc58ba522..9e0a601bc67 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -44,12 +44,16 @@ "@testing-library/svelte": "^4.0.5", "@testing-library/user-event": "^14.5.2", "@testing-library/vue": "^8.0.1", + "@testplane/wdio-config": "workspace:*", + "@testplane/wdio-repl": "workspace:*", + "@testplane/wdio-types": "workspace:*", + "@testplane/webdriver": "workspace:*", + "@testplane/webdriverio": "workspace:*", "@types/mocha": "^10.0.6", "@types/testing-library__jest-dom": "^5.14.9", "@vue/compiler-dom": "^3.4.19", "@vue/test-utils": "^2.4.3", "@wdio/browser-runner": "workspace:*", - "@testplane/wdio-config": "workspace:*", "@wdio/cli": "workspace:*", "@wdio/dot-reporter": "workspace:*", "@wdio/globals": "workspace:*", @@ -57,23 +61,19 @@ "@wdio/lighthouse-service": "workspace:*", "@wdio/local-runner": "workspace:*", "@wdio/mocha-framework": "workspace:*", - "@testplane/wdio-repl": "workspace:*", "@wdio/sauce-service": "workspace:*", "@wdio/shared-store-service": "workspace:*", "@wdio/spec-reporter": "workspace:*", - "@testplane/wdio-types": "workspace:*", "babel-plugin-transform-hook-names": "^1.0.2", "cross-env": "^7.0.3", "expect": "^29.7.0", "graphql-request": "^6.1.0", "is-url": "^1.2.4", "mocha": "^10.2.0", - "puppeteer-core": "^22.2.0", + "puppeteer-core": "^23.11.1", "string-width": "^7.1.0", "tailwindcss": "^3.4.1", - "vite": "^5.1.3", - "@testplane/webdriver": "workspace:*", - "@testplane/webdriverio": "workspace:*" + "vite": "^5.1.3" }, "dependencies": { "@stencil-community/router": "^1.0.2", diff --git a/package.json b/package.json index 2ee0113df3f..e6bfff03834 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,8 @@ "@serenity-js/core": "^3.25.3", "@stencil/core": "^4.20.0", "@sveltejs/vite-plugin-svelte": "^3.1.1", + "@testplane/wdio-config": "workspace:*", + "@testplane/wdio-repl": "workspace:*", "@types/archiver": "^6.0.2", "@types/cheerio": "^0.22.35", "@types/inquirer": "^9.0.7", @@ -89,9 +91,7 @@ "@vitejs/plugin-react": "^4.3.1", "@vitejs/plugin-vue": "^5.1.2", "@vitest/coverage-v8": "^2.0.5", - "@testplane/wdio-config": "workspace:*", "@wdio/eslint": "^0.0.5", - "@testplane/wdio-repl": "workspace:*", "camelcase": "^8.0.0", "cddl": "^0.8.5", "cddl2ts": "^0.2.2", @@ -114,7 +114,7 @@ "lerna-changelog": "^2.2.0", "mime-types": "^2.1.35", "npm-run-all2": "^6.2.2", - "puppeteer-core": "^23.0.2", + "puppeteer-core": "^23.11.1", "recast": "^0.23.9", "recursive-readdir": "^2.2.3", "rimraf": "^6.0.1", diff --git a/packages/webdriverio/package.json b/packages/webdriverio/package.json index ecf4f3b843f..e83d6a427f7 100644 --- a/packages/webdriverio/package.json +++ b/packages/webdriverio/package.json @@ -96,7 +96,7 @@ "lodash.clonedeep": "^4.5.0", "lodash.zip": "^4.2.0", "minimatch": "9.0.0", - "puppeteer-core": "^20.9.0", + "puppeteer-core": "^23.11.1", "query-selector-shadow-dom": "^1.0.1", "resq": "^1.11.0", "rgb2hex": "0.2.5", diff --git a/packages/webdriverio/src/commands/browser/mock.ts b/packages/webdriverio/src/commands/browser/mock.ts index f1defe32558..23fe12c22fb 100644 --- a/packages/webdriverio/src/commands/browser/mock.ts +++ b/packages/webdriverio/src/commands/browser/mock.ts @@ -7,7 +7,7 @@ import { getBrowserObject } from '@testplane/wdio-utils' import type { MockFilterOptions } from '../../utils/interception/types.js' import BidiInterception from '../../utils/interception/bidi.js' import { getContextManager } from '../../session/context.js' -import type { CDPSession } from 'puppeteer-core/lib/esm/puppeteer/common/Connection.js' +import type { CDPSession, Protocol, Handler } from 'puppeteer-core' export const SESSION_MOCKS: Record> = {} export const SESSION_BIDI_MOCKS: Record> = {} @@ -181,7 +181,7 @@ export async function mock( client.on( 'Fetch.requestPaused', (NetworkInterception as unknown as typeof DevtoolsNetworkInterception) - .handleRequestInterception(client, SESSION_MOCKS[handle]) + .handleRequestInterception(client, SESSION_MOCKS[handle]) as unknown as Handler ) } diff --git a/packages/webdriverio/src/utils/interception/devtools.ts b/packages/webdriverio/src/utils/interception/devtools.ts index d148894c8b4..97e940ac866 100644 --- a/packages/webdriverio/src/utils/interception/devtools.ts +++ b/packages/webdriverio/src/utils/interception/devtools.ts @@ -1,7 +1,7 @@ import fs from 'node:fs/promises' import path from 'node:path' import logger from '@testplane/wdio-logger' -import type { CDPSession } from 'puppeteer-core/lib/esm/puppeteer/common/Connection.js' +import type { CDPSession } from 'puppeteer-core' import type { Protocol } from 'devtools-protocol' import Interception from './index.js' diff --git a/packages/webdriverio/src/utils/interception/types.ts b/packages/webdriverio/src/utils/interception/types.ts index bdce08bd01b..095c45f7756 100644 --- a/packages/webdriverio/src/utils/interception/types.ts +++ b/packages/webdriverio/src/utils/interception/types.ts @@ -1,7 +1,7 @@ import type { local } from '@testplane/webdriver' import type { Cookie } from '@testplane/wdio-protocols' -import type { CDPSession } from 'puppeteer-core/lib/esm/puppeteer/common/Connection.js' +import type { CDPSession } from 'puppeteer-core' import type { JsonCompatible } from '@testplane/wdio-types' // export type MockFilterOptions = { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 09518aef20b..97996bf8594 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -159,7 +159,7 @@ importers: specifier: ^6.2.2 version: 6.2.6 puppeteer-core: - specifier: ^23.0.2 + specifier: ^23.11.1 version: 23.11.1 recast: specifier: ^0.23.9 @@ -316,8 +316,8 @@ importers: specifier: ^10.2.0 version: 10.8.2 puppeteer-core: - specifier: ^22.2.0 - version: 22.15.0 + specifier: ^23.11.1 + version: 23.11.1 string-width: specifier: ^7.1.0 version: 7.2.0 @@ -1599,8 +1599,8 @@ importers: specifier: 9.0.0 version: 9.0.0 puppeteer-core: - specifier: ^20.9.0 - version: 20.9.0(encoding@0.1.13)(typescript@5.7.3) + specifier: ^23.11.1 + version: 23.11.1 query-selector-shadow-dom: specifier: ^1.0.1 version: 1.0.1 @@ -4693,11 +4693,6 @@ packages: engines: {node: '>=18'} hasBin: true - '@puppeteer/browsers@2.3.0': - resolution: {integrity: sha512-ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==} - engines: {node: '>=18'} - hasBin: true - '@puppeteer/browsers@2.6.1': resolution: {integrity: sha512-aBSREisdsGH890S2rQqK82qmQYU3uFpSH8wcZWHgHzl3LfzsxAKbLNiAG9mO8v1Y0UICBeClICxPJvyr0rcuxg==} engines: {node: '>=18'} @@ -7004,11 +6999,6 @@ packages: peerDependencies: devtools-protocol: '*' - chromium-bidi@0.6.3: - resolution: {integrity: sha512-qXlsCmpCZJAnoTYI83Iu6EdYQpMYdVkCfq08KDh2pmlVqK5t5IA9mGs4/LwCwp4fqisSOMXZxP3HIh8w8aRn0A==} - peerDependencies: - devtools-protocol: '*' - ci-info@2.0.0: resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==} @@ -7803,9 +7793,6 @@ packages: devtools-protocol@0.0.1302984: resolution: {integrity: sha512-Rgh2Sk5fUSCtEx4QGH9iwTyECdFPySG2nlz5J8guGh2Wlha6uzSOCq/DCEC8faHlLaMPZJMuZ4ovgcX4LvOkKA==} - devtools-protocol@0.0.1312386: - resolution: {integrity: sha512-DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==} - devtools-protocol@0.0.1367902: resolution: {integrity: sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==} @@ -12081,10 +12068,6 @@ packages: resolution: {integrity: sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==} engines: {node: '>=16.13.2'} - puppeteer-core@22.15.0: - resolution: {integrity: sha512-cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==} - engines: {node: '>=18'} - puppeteer-core@22.3.0: resolution: {integrity: sha512-Ho5Vdpdro05ZyCx/l5Hkc5vHiibKTaY37fIAD9NF9Gi/vDxkVTeX40U/mFnEmeoxyuYALvWCJfi7JTT82R6Tuw==} engines: {node: '>=18'} @@ -18475,20 +18458,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@puppeteer/browsers@2.3.0': - dependencies: - debug: 4.4.0(supports-color@8.1.1) - extract-zip: 2.0.1 - progress: 2.0.3 - proxy-agent: 6.5.0 - semver: 7.7.1 - tar-fs: 3.0.8 - unbzip2-stream: 1.4.3 - yargs: 17.7.2 - transitivePeerDependencies: - - bare-buffer - - supports-color - '@puppeteer/browsers@2.6.1': dependencies: debug: 4.4.0(supports-color@8.1.1) @@ -21475,13 +21444,6 @@ snapshots: urlpattern-polyfill: 10.0.0 optional: true - chromium-bidi@0.6.3(devtools-protocol@0.0.1312386): - dependencies: - devtools-protocol: 0.0.1312386 - mitt: 3.0.1 - urlpattern-polyfill: 10.0.0 - zod: 3.23.8 - ci-info@2.0.0: {} ci-info@3.9.0: {} @@ -22317,8 +22279,6 @@ snapshots: devtools-protocol@0.0.1302984: {} - devtools-protocol@0.0.1312386: {} - devtools-protocol@0.0.1367902: {} devtools-protocol@0.0.1415363: {} @@ -27717,19 +27677,6 @@ snapshots: - utf-8-validate optional: true - puppeteer-core@22.15.0: - dependencies: - '@puppeteer/browsers': 2.3.0 - chromium-bidi: 0.6.3(devtools-protocol@0.0.1312386) - debug: 4.4.0(supports-color@8.1.1) - devtools-protocol: 0.0.1312386 - ws: 8.18.0 - transitivePeerDependencies: - - bare-buffer - - bufferutil - - supports-color - - utf-8-validate - puppeteer-core@22.3.0(encoding@0.1.13): dependencies: '@puppeteer/browsers': 2.1.0 @@ -27753,6 +27700,7 @@ snapshots: typed-query-selector: 2.12.0 ws: 8.18.0 transitivePeerDependencies: + - bare-buffer - bufferutil - supports-color - utf-8-validate