From 9b20d943be8663c22c5f6f208c32e3b39bd800c0 Mon Sep 17 00:00:00 2001 From: Andy Creeth Date: Thu, 19 May 2022 10:11:33 -0700 Subject: [PATCH] electron 17 (#4156) * electron 17 * upgrade spectron * fix alertbox tests * clear comments Co-authored-by: Alexander Nazarov --- .../windows/ScreenCaptureProperties.tsx | 16 +- app/util/guest-api-handler.ts | 2 +- main.js | 3 + package.json | 9 +- scripts/postinstall.js | 3 - test/helpers/modules/core.ts | 13 +- test/regular/widgets/alertbox.ts | 6 +- test/screentest/screenshoter.ts | 5 +- test/tsconfig.json | 3 +- yarn.lock | 748 ++++++++++++------ 10 files changed, 537 insertions(+), 271 deletions(-) diff --git a/app/components-react/windows/ScreenCaptureProperties.tsx b/app/components-react/windows/ScreenCaptureProperties.tsx index 112ad722f34e..e4889a01734c 100644 --- a/app/components-react/windows/ScreenCaptureProperties.tsx +++ b/app/components-react/windows/ScreenCaptureProperties.tsx @@ -59,10 +59,13 @@ function useCaptureSource(sourceId: string): ICaptureSourceApi { useEffect(() => { (async () => { - const windows = await electron.desktopCapturer.getSources({ - types: ['window'], - fetchWindowIcons: true, - }); + const windows: Electron.DesktopCapturerSource[] = await electron.ipcRenderer.invoke( + 'DESKTOP_CAPTURER_GET_SOURCES', + { + types: ['window'], + fetchWindowIcons: true, + }, + ); const windowOptions = windows.map(win => { const opt: ICapturableOption = { description: win.name, @@ -76,7 +79,10 @@ function useCaptureSource(sourceId: string): ICaptureSourceApi { }); // Attempt to get thumbnails for screens - const screenData = await electron.desktopCapturer.getSources({ types: ['screen'] }); + const screenData: Electron.DesktopCapturerSource[] = await electron.ipcRenderer.invoke( + 'DESKTOP_CAPTURER_GET_SOURCES', + { types: ['screen'] }, + ); const screenOptions = remote.screen.getAllDisplays().map((screen, index) => { const opt: ICapturableOption = { diff --git a/app/util/guest-api-handler.ts b/app/util/guest-api-handler.ts index 38030565e05d..046f946654bb 100644 --- a/app/util/guest-api-handler.ts +++ b/app/util/guest-api-handler.ts @@ -197,7 +197,7 @@ export class GuestApiHandler { method: RequestHandlerMethod, args: any[], request: IGuestApiRequest, - contents: electron.webContents, + contents: Electron.WebContents, ) { method(...args) .then(result => { diff --git a/main.js b/main.js index 9e446e9df048..c245d092a329 100644 --- a/main.js +++ b/main.js @@ -29,6 +29,7 @@ const { crashReporter, dialog, webContents, + desktopCapturer, } = require('electron'); const path = require('path'); const rimraf = require('rimraf'); @@ -806,3 +807,5 @@ function measure(msg, time) { if (delta > 2000) console.log('------------------'); console.log(msg, delta + 'ms'); } + +ipcMain.handle('DESKTOP_CAPTURER_GET_SOURCES', (event, opts) => desktopCapturer.getSources(opts)); diff --git a/package.json b/package.json index 4004fe3e735f..1f0340989a10 100644 --- a/package.json +++ b/package.json @@ -62,13 +62,12 @@ "serial": true }, "dependencies": { - "@electron/remote": "^2.0.1", + "@electron/remote": "2.0.8", "abort-controller": "^3.0.0", "archiver": "2.1.1", "aws-sdk": "^2.344.0", "color-picker": "https://obs-studio-deployment.s3-us-west-2.amazonaws.com/color-picker-0.0.0.tar.gz", "crash-handler": "https://slobs-crash-handler.s3-us-west-2.amazonaws.com/crash-handler-0.0.0.tar.gz", - "electron-chromedriver": "^14.0.0", "electron-react-devtools": "^0.5.3", "electron-updater": "^4.2.0", "electron-window-state": "5.0.3", @@ -145,7 +144,7 @@ "css-element-queries": "1.2.3", "css-loader": "2.1.1", "dotenv": "8.2.0", - "electron": "14.2.6", + "electron": "17.4.1", "electron-builder": "22.14.5", "electron-devtools-installer": "3.1.1", "electron-notarize": "1.0.0", @@ -194,7 +193,7 @@ "sockjs": "0.3.20", "sockjs-client": "1.1.5", "sortablejs": "1.13.0", - "spectron": "15.0.0", + "spectron": "19.0.0", "streamlabs-beaker": "0.9.4", "style-loader": "2.0.0", "stylelint": "10.0.1", @@ -205,7 +204,7 @@ "traverse": "0.6.6", "tree-kill": "1.2.2", "ts-loader": "8.0.11", - "ts-node": "7.0.1", + "ts-node": "^10.7.0", "typedoc": "0.22.10", "typescript": "4.5.5", "urijs": "1.19.7", diff --git a/scripts/postinstall.js b/scripts/postinstall.js index 2449e6bc587b..90427af85d0d 100644 --- a/scripts/postinstall.js +++ b/scripts/postinstall.js @@ -14,6 +14,3 @@ const antdlibSettings = JSON.parse(fs.readFileSync(antdLibSettingsPath, 'utf8')) delete antdlibSettings.module; antdlibSettings.main = 'dist/antd.min.js'; fs.writeFileSync(antdLibSettingsPath, JSON.stringify(antdlibSettings, null, 2)); - -// force Spectron to use a ChromeDriver version from package.json -rimraf.sync(path.resolve('./node_modules/spectron/node_modules/electron-chromedriver')); diff --git a/test/helpers/modules/core.ts b/test/helpers/modules/core.ts index 4eb6cbd77551..c9a296509950 100644 --- a/test/helpers/modules/core.ts +++ b/test/helpers/modules/core.ts @@ -5,10 +5,11 @@ import { getContext } from '../spectron'; import { getApiClient } from '../api-client'; import { WindowsService } from '../../../app/services/windows'; +import { ClickOptions, WaitForOptions } from 'webdriverio'; export type TSelectorOrEl = string | WebdriverIO.Element; -export function getClient(): WebdriverIO.BrowserObject { +export function getClient(): WebdriverIO.Browser { return getContext().context.app.client; } @@ -30,7 +31,7 @@ export function selectButton(buttonText: string) { // CLICK SHORTCUTS -export async function click(selectorOrEl: TSelectorOrEl, options?: WebdriverIO.ClickOptions) { +export async function click(selectorOrEl: TSelectorOrEl, options?: ClickOptions) { const $el = await select(selectorOrEl); await $el.waitForClickable(); await $el.click(options); @@ -59,7 +60,7 @@ export async function clickTab(tabText: string) { export async function isDisplayed( selectorOrEl: TSelectorOrEl, - waitForOptions?: WebdriverIO.WaitForOptions, + waitForOptions?: WaitForOptions, ) { if (waitForOptions) { try { @@ -74,14 +75,14 @@ export async function isDisplayed( export async function waitForDisplayed( selectorOrEl: TSelectorOrEl, - options?: WebdriverIO.WaitForOptions, + options?: WaitForOptions, ) { await (await select(selectorOrEl)).waitForDisplayed(options); } export async function waitForClickable( selectorOrEl: TSelectorOrEl, - options?: WebdriverIO.WaitForOptions, + options?: WaitForOptions, ) { await (await select(selectorOrEl)).waitForClickable(options); } @@ -92,7 +93,7 @@ export function waitForText(text: string) { export async function waitForEnabled( selectorOrEl: TSelectorOrEl, - options?: WebdriverIO.WaitForOptions, + options?: WaitForOptions, ) { await (await select(selectorOrEl)).waitForEnabled(options); } diff --git a/test/regular/widgets/alertbox.ts b/test/regular/widgets/alertbox.ts index aed66ce0d30f..d5e96d59c001 100644 --- a/test/regular/widgets/alertbox.ts +++ b/test/regular/widgets/alertbox.ts @@ -14,7 +14,7 @@ import { CustomizationService } from '../../../app/services/customization'; import { assertFormContains, fillForm } from '../../helpers/modules/forms'; import { sleep } from '../../helpers/sleep'; -useSpectron(); +useSpectron({pauseIfFailed: false }); test('AlertBox for Twitch', t => testAlertbox(t, 'twitch')); test('AlertBox for YouTube', t => testAlertbox(t, 'youtube')); @@ -40,12 +40,14 @@ async function testAlertbox(t: TExecutionContext, platform: TPlatform) { // create alertbox await enableNewAlertbox(); - await addSource('Alertbox', 'Alertbox', false); + await addSource('Alertbox', 'Alertbox'); + await sleep(500); await openAlertboxSettings(); // click through all available alert types and check for console errors const alerts = platformAlerts[platform]; for (const alert of alerts) await click(`span*=${alert}`); + await sleep(500); // test the donation alert settings if (platform === 'twitch') await testDonationAlert(); diff --git a/test/screentest/screenshoter.ts b/test/screentest/screenshoter.ts index a5304bc8b001..88247e6eedad 100644 --- a/test/screentest/screenshoter.ts +++ b/test/screentest/screenshoter.ts @@ -7,8 +7,7 @@ import { afterAppStart, TExecutionContext } from '../helpers/spectron'; import { PerformanceService } from '../../app/services/performance'; import { IAudioServiceApi } from '../../app/services/audio'; import { WindowsService } from '../../app/services/windows'; -import NativeImage = Electron.NativeImage; -import {focusChild, focusMain} from "../helpers/modules/core"; +import { focusChild, focusMain } from '../helpers/modules/core'; const fs = require('fs'); const CONFIG = getConfig(); @@ -69,7 +68,7 @@ export async function makeScreenshots(t: TExecutionContext, title = '') { processedConfigs.push(configStr); await applyConfig(t, config); - await t.context.app.browserWindow.capturePage().then((imageBuffer: NativeImage) => { + await t.context.app.browserWindow.capturePage().then(imageBuffer => { const testName = t.title.replace('afterEach hook for ', ''); const screenshotName = title ? `${testName}_${title}` : testName; const imageFileName = `${screenshotName}__${configInd}.png`; diff --git a/test/tsconfig.json b/test/tsconfig.json index 4a2b47183de2..bbc04e38d697 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -37,7 +37,8 @@ "socket.io-client", "tapable", "uuid", - "vue-tsx-support" + "vue-tsx-support", + "webdriverio/async", ] }, "exclude": [ diff --git a/yarn.lock b/yarn.lock index d0a953e7eb60..ce8c4524eea3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1684,6 +1684,22 @@ __metadata: languageName: node linkType: hard +"@cspotcode/source-map-consumer@npm:0.8.0": + version: 0.8.0 + resolution: "@cspotcode/source-map-consumer@npm:0.8.0" + checksum: c0c16ca3d2f58898f1bd74c4f41a189dbcc202e642e60e489cbcc2e52419c4e89bdead02c886a12fb13ea37798ede9e562b2321df997ebc210ae9bd881561b4e + languageName: node + linkType: hard + +"@cspotcode/source-map-support@npm:0.7.0": + version: 0.7.0 + resolution: "@cspotcode/source-map-support@npm:0.7.0" + dependencies: + "@cspotcode/source-map-consumer": 0.8.0 + checksum: 9faddda7757cd778b5fd6812137b2cc265810043680d6399acc20441668fafcdc874053be9dccd0d9110087287bfad27eb3bf342f72bceca9aa9059f5d0c4be8 + languageName: node + linkType: hard + "@ctrl/tinycolor@npm:^3.4.0": version: 3.4.0 resolution: "@ctrl/tinycolor@npm:3.4.0" @@ -1713,9 +1729,9 @@ __metadata: languageName: node linkType: hard -"@electron/get@npm:^1.0.1": - version: 1.12.2 - resolution: "@electron/get@npm:1.12.2" +"@electron/get@npm:^1.12.4": + version: 1.13.0 + resolution: "@electron/get@npm:1.13.0" dependencies: debug: ^4.1.1 env-paths: ^2.2.0 @@ -1724,25 +1740,25 @@ __metadata: global-tunnel-ng: ^2.7.1 got: ^9.6.0 progress: ^2.0.3 - sanitize-filename: ^1.6.2 + semver: ^6.2.0 sumchecker: ^3.0.1 dependenciesMeta: global-agent: optional: true global-tunnel-ng: optional: true - checksum: 447a08021d6fabc437dcf02b2a2edac718802f3b5dd1ff86c3a8aa7b35de03b39c7abc0a817ca58ea68c295cf64365935156191fa5b5a3d00263c8b4a8439ef1 + checksum: a5158bb2f81ed68491d1ece5f4acfb9d497dbec1f126d0db2212c2fa6b2851a752900fd24b7620cd2e23563a356127134366027e7a98993f035c6d0c8e643577 languageName: node linkType: hard -"@electron/get@npm:^1.12.4": - version: 1.13.0 - resolution: "@electron/get@npm:1.13.0" +"@electron/get@npm:^1.13.0": + version: 1.14.1 + resolution: "@electron/get@npm:1.14.1" dependencies: debug: ^4.1.1 env-paths: ^2.2.0 fs-extra: ^8.1.0 - global-agent: ^2.0.2 + global-agent: ^3.0.0 global-tunnel-ng: ^2.7.1 got: ^9.6.0 progress: ^2.0.3 @@ -1753,25 +1769,25 @@ __metadata: optional: true global-tunnel-ng: optional: true - checksum: a5158bb2f81ed68491d1ece5f4acfb9d497dbec1f126d0db2212c2fa6b2851a752900fd24b7620cd2e23563a356127134366027e7a98993f035c6d0c8e643577 + checksum: 21fec5e82bbee8f9fa183b46e05675b137c3130c7999d3b2b34a0047d1a06ec3c76347b9bbdb9911ba9b2123697804e360a15dda9db614c0226d5d4dcc4d6d15 languageName: node linkType: hard -"@electron/remote@npm:^1.1.0": - version: 1.2.1 - resolution: "@electron/remote@npm:1.2.1" +"@electron/remote@npm:2.0.4": + version: 2.0.4 + resolution: "@electron/remote@npm:2.0.4" peerDependencies: - electron: ">= 10.0.0-beta.1" - checksum: 2ec4a3f7bee66ed89097ae449fe70a4dca63fb49c4c19235cc8c38b4a44caa2edae2df4de05a9fb8e234187f7bb3edfcd71dddac5fdb06e9f873f57495c69aff + electron: ">= 13.0.0" + checksum: 9a587f240f083fc6362aa7653d0af92e2c37e3ce5ca25d88334a9bb893b0402be229fd8acfe41f921c6870ba6cd819e070c9f79b2192017e6b7794ef88b0fdc6 languageName: node linkType: hard -"@electron/remote@npm:^2.0.1": - version: 2.0.1 - resolution: "@electron/remote@npm:2.0.1" +"@electron/remote@npm:2.0.8": + version: 2.0.8 + resolution: "@electron/remote@npm:2.0.8" peerDependencies: - electron: ">= 10.0.0-beta.1" - checksum: 0d363d8c41d21041b0ba294f538bb7cabf6e7cc7719910634be4bc3318f090a0acdcf079c90199f2a739418ef72664bf97eb260ec81053f48464cb5dd1871e67 + electron: ">= 13.0.0" + checksum: d0ef11b3f09d789baf4330c2c021cfc1a997fc5ffdb56e8810ed7fe2fd76cda1a168c0589d2a10284a907fd3829bae14002a58b35c4881473cdd0049f07fbd63 languageName: node linkType: hard @@ -2184,6 +2200,34 @@ __metadata: languageName: node linkType: hard +"@tsconfig/node10@npm:^1.0.7": + version: 1.0.8 + resolution: "@tsconfig/node10@npm:1.0.8" + checksum: b8d5fffbc6b17ef64ef74f7fdbccee02a809a063ade785c3648dae59406bc207f70ea2c4296f92749b33019fa36a5ae716e42e49cc7f1bbf0fd147be0d6b970a + languageName: node + linkType: hard + +"@tsconfig/node12@npm:^1.0.7": + version: 1.0.9 + resolution: "@tsconfig/node12@npm:1.0.9" + checksum: a01b2400ab3582b86b589c6d31dcd0c0656f333adecde85d6d7d4086adb059808b82692380bb169546d189bf771ae21d02544a75b57bd6da4a5dd95f8567bec9 + languageName: node + linkType: hard + +"@tsconfig/node14@npm:^1.0.0": + version: 1.0.1 + resolution: "@tsconfig/node14@npm:1.0.1" + checksum: 976345e896c0f059867f94f8d0f6ddb8b1844fb62bf36b727de8a9a68f024857e5db97ed51d3325e23e0616a5e48c034ff51a8d595b3fe7e955f3587540489be + languageName: node + linkType: hard + +"@tsconfig/node16@npm:^1.0.2": + version: 1.0.2 + resolution: "@tsconfig/node16@npm:1.0.2" + checksum: ca94d3639714672bbfd55f03521d3f56bb6a25479bd425da81faf21f13e1e9d15f40f97377dedbbf477a5841c5b0c8f4cd1b391f33553d750b9202c54c2c07aa + languageName: node + linkType: hard + "@types/anymatch@npm:*": version: 1.3.1 resolution: "@types/anymatch@npm:1.3.1" @@ -2200,6 +2244,13 @@ __metadata: languageName: node linkType: hard +"@types/aria-query@npm:^5.0.0": + version: 5.0.0 + resolution: "@types/aria-query@npm:5.0.0" + checksum: 81edec88be7387e349fce594e2efe045b04d53f29d76e9fc2a21d3fcaec38c29b11f1518915f5fe33d9e5161994634202dca033f3ed74b8ffd38512e1b970b0c + languageName: node + linkType: hard + "@types/cacheable-request@npm:^6.0.1": version: 6.0.1 resolution: "@types/cacheable-request@npm:6.0.1" @@ -2449,6 +2500,13 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:^17.0.4": + version: 17.0.31 + resolution: "@types/node@npm:17.0.31" + checksum: 704618350f8420d5c47db0f7778398e821b7724369946f5c441a7e6b9343295553936400eb8309f0b07d5e39c240988ab3456b983712ca86265dabc9aee4ad3d + languageName: node + linkType: hard + "@types/normalize-package-data@npm:^2.4.0": version: 2.4.0 resolution: "@types/normalize-package-data@npm:2.4.0" @@ -2487,24 +2545,6 @@ __metadata: languageName: node linkType: hard -"@types/puppeteer-core@npm:^5.4.0": - version: 5.4.0 - resolution: "@types/puppeteer-core@npm:5.4.0" - dependencies: - "@types/puppeteer": "*" - checksum: a62fef210beed01bc122007eebc7b223e28d4e49cb6233587e388c86d8954aab124bb0818fee3ca3e6536f5fa3126e1f63f570534f5fa149eb063eb6f1573775 - languageName: node - linkType: hard - -"@types/puppeteer@npm:*": - version: 5.4.2 - resolution: "@types/puppeteer@npm:5.4.2" - dependencies: - "@types/node": "*" - checksum: 4b638725a9c931ebf2e8c4debc4c799dc978826313c59b74aa64957dc7cf7ead554701f5c17877a1569e2307ea692faeb698c9acb0129db2a5201a0804aa6b3f - languageName: node - linkType: hard - "@types/qrcode.react@npm:1.0.2": version: 1.0.2 resolution: "@types/qrcode.react@npm:1.0.2" @@ -2620,6 +2660,13 @@ __metadata: languageName: node linkType: hard +"@types/ua-parser-js@npm:^0.7.33": + version: 0.7.36 + resolution: "@types/ua-parser-js@npm:0.7.36" + checksum: 8c24d4dc12ed1b8b98195838093391c358c81bf75e9cae0ecec8f7824b441e069daaa17b974a3e257172caddb671439f0c0b44bf43bfcf409b7a574a25aab948 + languageName: node + linkType: hard + "@types/uglify-js@npm:*": version: 3.11.1 resolution: "@types/uglify-js@npm:3.11.1" @@ -2943,51 +2990,64 @@ __metadata: languageName: node linkType: hard -"@wdio/config@npm:6.12.1": - version: 6.12.1 - resolution: "@wdio/config@npm:6.12.1" +"@wdio/config@npm:7.16.13": + version: 7.16.13 + resolution: "@wdio/config@npm:7.16.13" dependencies: - "@wdio/logger": 6.10.10 + "@wdio/logger": 7.16.0 + "@wdio/types": 7.16.13 deepmerge: ^4.0.0 glob: ^7.1.2 - checksum: 7d34bd1ff608228921f585c5a62caa05aaadd259fb4e795605934699f1400ab4f4b9a1a826ddf78584516ceb72bbc4233e2ec3056b4cebaf096286cfddf3bfba + checksum: 8bb6f1f6529d6d84a4ad388fd99cc493db63b487896cc58cda313ebb2313ef257d481b147c1e0f3d1b47c6db17667323786d4398b11e83cfa0955b23e261970a languageName: node linkType: hard -"@wdio/logger@npm:6.10.10": - version: 6.10.10 - resolution: "@wdio/logger@npm:6.10.10" +"@wdio/logger@npm:7.16.0": + version: 7.16.0 + resolution: "@wdio/logger@npm:7.16.0" dependencies: chalk: ^4.0.0 loglevel: ^1.6.0 loglevel-plugin-prefix: ^0.8.4 strip-ansi: ^6.0.0 - checksum: 865e56b86c256ea2b667f84c909b9a7816350ba028841e9a79e6f1c644912e5b369937e29b7e70e7099e51ea122fca30e812e17291282708a04dd2248721746e + checksum: e34ae20260cef3a00dc1a8f81e4d1310f3b1dc39511536c533a8a330800c641ae007a3e507024ba714a9a549bb8d176a6c5014e5a9af857573097673774d7477 languageName: node linkType: hard -"@wdio/protocols@npm:6.12.0": - version: 6.12.0 - resolution: "@wdio/protocols@npm:6.12.0" - checksum: 939e005c1cd4e6c837782ba6d1197d6272dfd1446f2b65ca6f0f274fd6fa901764857634bff2a2d848f1422a7c76e2796769b90bc510671b47461f382dc16538 +"@wdio/protocols@npm:7.16.7": + version: 7.16.7 + resolution: "@wdio/protocols@npm:7.16.7" + checksum: 62b2586a236ec7745aa7e552ee10eeb60c854efd3758509565eb0b3a46430df623ed0dc67e5ee0c78fe627b73944e0f14f772db73d6ab4c15dd4729f1172ebb3 languageName: node linkType: hard -"@wdio/repl@npm:6.11.0": - version: 6.11.0 - resolution: "@wdio/repl@npm:6.11.0" +"@wdio/repl@npm:7.16.13": + version: 7.16.13 + resolution: "@wdio/repl@npm:7.16.13" dependencies: - "@wdio/utils": 6.11.0 - checksum: 6afa1fe8766cd431189f99b025bcc0d107d9dec9568ea0f51e43dee08892b33ab8afc0623cc1573429f300aa5e4421eca89d4fc0a971ffb7d33bbecbd341e967 + "@wdio/utils": 7.16.13 + checksum: 00335375890744cbe03ea58a938ae7cf5bf8e549b18938ddeddc21673426c9bd73ed0a7173a3445a527b14cb53572bf9d0c8619d741dab796dedaca05c17a971 languageName: node linkType: hard -"@wdio/utils@npm:6.11.0": - version: 6.11.0 - resolution: "@wdio/utils@npm:6.11.0" +"@wdio/types@npm:7.16.13": + version: 7.16.13 + resolution: "@wdio/types@npm:7.16.13" dependencies: - "@wdio/logger": 6.10.10 - checksum: 1cc1f379ecd83f8d4bcd65b00f74035333a63d886b4e95addc870c9c7512571772275a8da2869f2fbf8a2f6d8c57ff6745eab3b7cbad18b2d0168a7a4392bfc2 + "@types/node": ^17.0.4 + got: ^11.8.1 + checksum: 319d097ecf032e3112f0ea10ef98a9b7f4ab6f475ea741447e142197fdaf784e5a8cfc5b6f1109375f8ab583769c8ebe33655d7e814906831093736fc6cfe301 + languageName: node + linkType: hard + +"@wdio/utils@npm:7.16.13": + version: 7.16.13 + resolution: "@wdio/utils@npm:7.16.13" + dependencies: + "@wdio/logger": 7.16.0 + "@wdio/types": 7.16.13 + p-iteration: ^1.1.8 + checksum: c28c90476c2197af6adf94d108f36452d3e1b35a8a891d5e54607d6d452562f9c24886122eafd7f355145bab31621c2b07c14fbe5a920333dda946bc5c89c5ed languageName: node linkType: hard @@ -3218,6 +3278,13 @@ __metadata: languageName: node linkType: hard +"acorn-walk@npm:^8.1.1": + version: 8.2.0 + resolution: "acorn-walk@npm:8.2.0" + checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 + languageName: node + linkType: hard + "acorn@npm:^7.1.1, acorn@npm:^7.4.0": version: 7.4.1 resolution: "acorn@npm:7.4.1" @@ -3236,6 +3303,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.4.1": + version: 8.7.1 + resolution: "acorn@npm:8.7.1" + bin: + acorn: bin/acorn + checksum: aca0aabf98826717920ac2583fdcad0a6fbe4e583fdb6e843af2594e907455aeafe30b1e14f1757cd83ce1776773cf8296ffc3a4acf13f0bd3dfebcf1db6ae80 + languageName: node + linkType: hard + "add-dom-event-listener@npm:^1.1.0": version: 1.1.0 resolution: "add-dom-event-listener@npm:1.1.0" @@ -3252,13 +3328,6 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:5": - version: 5.1.1 - resolution: "agent-base@npm:5.1.1" - checksum: 61ae789f3019f1dc10e8cba6d3ae9826949299a4e54aaa1cfa2fa37c95a108e70e95423b963bb987d7891a703fd9a5c383a506f4901819f3ee56f3147c0aa8ab - languageName: node - linkType: hard - "agent-base@npm:6, agent-base@npm:^6.0.2": version: 6.0.2 resolution: "agent-base@npm:6.0.2" @@ -3598,6 +3667,13 @@ __metadata: languageName: node linkType: hard +"arg@npm:^4.1.0": + version: 4.1.3 + resolution: "arg@npm:4.1.3" + checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43 + languageName: node + linkType: hard + "argparse@npm:^1.0.7": version: 1.0.9 resolution: "argparse@npm:1.0.9" @@ -3614,6 +3690,13 @@ __metadata: languageName: node linkType: hard +"aria-query@npm:^5.0.0": + version: 5.0.0 + resolution: "aria-query@npm:5.0.0" + checksum: c41f98866c5a304561ee8cae55856711cddad6f3f85d8cb43cc5f79667078d9b8979ce32d244c1ff364e6463a4d0b6865804a33ccc717fed701b281cf7dc6296 + languageName: node + linkType: hard + "arr-diff@npm:^4.0.0": version: 4.0.0 resolution: "arr-diff@npm:4.0.0" @@ -3721,7 +3804,7 @@ __metadata: languageName: node linkType: hard -"arrify@npm:^1.0.0, arrify@npm:^1.0.1": +"arrify@npm:^1.0.1": version: 1.0.1 resolution: "arrify@npm:1.0.1" checksum: 745075dd4a4624ff0225c331dacb99be501a515d39bcb7c84d24660314a6ec28e68131b137e6f7e16318170842ce97538cd298fc4cd6b2cc798e0b957f2747e7 @@ -3853,7 +3936,7 @@ __metadata: languageName: node linkType: hard -"atob@npm:^2.0.0, atob@npm:^2.1.2": +"atob@npm:^2.0.0": version: 2.1.2 resolution: "atob@npm:2.1.2" bin: @@ -4511,7 +4594,7 @@ __metadata: languageName: node linkType: hard -"buffer-from@npm:^1.0.0, buffer-from@npm:^1.1.0": +"buffer-from@npm:^1.0.0": version: 1.1.1 resolution: "buffer-from@npm:1.1.1" checksum: ccc53b69736008bff764497367c4d24879ba7122bc619ee499ff47eef3a5b885ca496e87272e7ebffa0bec3804c83f84041c616f6e3318f40624e27c1d80f045 @@ -4705,6 +4788,21 @@ __metadata: languageName: node linkType: hard +"cacheable-request@npm:^7.0.2": + version: 7.0.2 + resolution: "cacheable-request@npm:7.0.2" + dependencies: + clone-response: ^1.0.2 + get-stream: ^5.1.0 + http-cache-semantics: ^4.0.0 + keyv: ^4.0.0 + lowercase-keys: ^2.0.0 + normalize-url: ^6.0.1 + responselike: ^2.0.0 + checksum: 6152813982945a5c9989cb457a6c499f12edcc7ade323d2fbfd759abc860bdbd1306e08096916bb413c3c47e812f8e4c0a0cc1e112c8ce94381a960f115bc77f + languageName: node + linkType: hard + "call-bind@npm:^1.0.0": version: 1.0.2 resolution: "call-bind@npm:1.0.2" @@ -4950,17 +5048,17 @@ __metadata: languageName: node linkType: hard -"chrome-launcher@npm:^0.13.1": - version: 0.13.4 - resolution: "chrome-launcher@npm:0.13.4" +"chrome-launcher@npm:^0.15.0": + version: 0.15.0 + resolution: "chrome-launcher@npm:0.15.0" dependencies: "@types/node": "*" - escape-string-regexp: ^1.0.5 + escape-string-regexp: ^4.0.0 is-wsl: ^2.2.0 lighthouse-logger: ^1.0.0 - mkdirp: ^0.5.3 - rimraf: ^3.0.2 - checksum: 9da52a74f53242f7b281290cdccc7ba3902984933f88ab0f489b5e868ba4e939b82cf72669527ed38a4425bd3602fc6ba8fa4c00d197a0d99aab4c1779c45dd5 + bin: + print-chrome-path: bin/print-chrome-path.js + checksum: a86e2b3873cac291e632662a36891dd61ffa0d4a0ec31a9167658bc22c10c38ae243cb68c4ef0977f7c6266fbf2410f5cc5f0a6182958682d04a6ed9ba7089b1 languageName: node linkType: hard @@ -5657,6 +5755,13 @@ __metadata: languageName: node linkType: hard +"create-require@npm:^1.1.0": + version: 1.1.1 + resolution: "create-require@npm:1.1.1" + checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff + languageName: node + linkType: hard + "cross-env@npm:7.0.3": version: 7.0.3 resolution: "cross-env@npm:7.0.3" @@ -5669,6 +5774,15 @@ __metadata: languageName: node linkType: hard +"cross-fetch@npm:3.1.5": + version: 3.1.5 + resolution: "cross-fetch@npm:3.1.5" + dependencies: + node-fetch: 2.6.7 + checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb + languageName: node + linkType: hard + "cross-spawn@npm:^6.0.0, cross-spawn@npm:^6.0.5": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" @@ -5851,6 +5965,18 @@ __metadata: languageName: node linkType: hard +"debug@npm:4.3.4": + version: 4.3.4 + resolution: "debug@npm:4.3.4" + dependencies: + ms: 2.1.2 + peerDependenciesMeta: + supports-color: + optional: true + checksum: 3dbad3f94ea64f34431a9cbf0bafb61853eda57bff2880036153438f50fb5a84f27683ba0d8e5426bf41a8c6ff03879488120cf5b3a761e77953169c0600a708 + languageName: node + linkType: hard + "debug@npm:^3.2.6": version: 3.2.7 resolution: "debug@npm:3.2.7" @@ -6077,34 +6203,45 @@ __metadata: languageName: node linkType: hard -"devtools-protocol@npm:0.0.818844": - version: 0.0.818844 - resolution: "devtools-protocol@npm:0.0.818844" - checksum: a05c8588950c30e5262152c63ad8eef3eb208816c412599465b223e4a1795b7f3f78447d0c8149cc135b9816b3d3467b00ce30dc5b4ba49f6db05f206a364077 +"devtools-protocol@npm:0.0.981744": + version: 0.0.981744 + resolution: "devtools-protocol@npm:0.0.981744" + checksum: 609901bff551f5fbe98e272bdda7269de527e28fab138de371ffd7e9a06fa68ca2eec2e961bd1cd6fd98223ccee562c55b7ce3235d4e37cc8d85d6681bc45593 languageName: node linkType: hard -"devtools@npm:6.12.1": - version: 6.12.1 - resolution: "devtools@npm:6.12.1" +"devtools-protocol@npm:^0.0.953906": + version: 0.0.953906 + resolution: "devtools-protocol@npm:0.0.953906" + checksum: 49487c489c236a1c18dec039ee27ae5587c8299aa695b93968a3a2a73cc256eb2476cce40c9e75359b27ce6e633d375523480f2ad87240b4933dd18b12d514e0 + languageName: node + linkType: hard + +"devtools@npm:7.16.13": + version: 7.16.13 + resolution: "devtools@npm:7.16.13" dependencies: - "@wdio/config": 6.12.1 - "@wdio/logger": 6.10.10 - "@wdio/protocols": 6.12.0 - "@wdio/utils": 6.11.0 - chrome-launcher: ^0.13.1 + "@types/node": ^17.0.4 + "@types/ua-parser-js": ^0.7.33 + "@wdio/config": 7.16.13 + "@wdio/logger": 7.16.0 + "@wdio/protocols": 7.16.7 + "@wdio/types": 7.16.13 + "@wdio/utils": 7.16.13 + chrome-launcher: ^0.15.0 edge-paths: ^2.1.0 - puppeteer-core: ^5.1.0 - ua-parser-js: ^0.7.21 + puppeteer-core: ^13.0.0 + query-selector-shadow-dom: ^1.0.0 + ua-parser-js: ^1.0.1 uuid: ^8.0.0 - checksum: 5df4449c3f257a35a23be25d11f578a40e4168b456df781f96f721a4240cc98d538614f392a764abbb0af58eabd120b912e700d929a4cac322e54273278cb0be + checksum: eb9b82fddd2003ebdb375f3e2004bf89eea6a40a232af9558df70df97b578f74cdb595433491516de0414f4941a993537fad1798eab6b969a60411c532b3d6e5 languageName: node linkType: hard -"diff@npm:^3.1.0": - version: 3.5.0 - resolution: "diff@npm:3.5.0" - checksum: 00842950a6551e26ce495bdbce11047e31667deea546527902661f25cc2e73358967ebc78cf86b1a9736ec3e14286433225f9970678155753a6291c3bca5227b +"diff@npm:^4.0.1": + version: 4.0.2 + resolution: "diff@npm:4.0.2" + checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d languageName: node linkType: hard @@ -6375,27 +6512,15 @@ __metadata: languageName: node linkType: hard -"electron-chromedriver@npm:^13.0.0": - version: 13.0.0 - resolution: "electron-chromedriver@npm:13.0.0" +"electron-chromedriver@npm:17.0.0": + version: 17.0.0 + resolution: "electron-chromedriver@npm:17.0.0" dependencies: "@electron/get": ^1.12.4 extract-zip: ^2.0.0 bin: chromedriver: chromedriver.js - checksum: 6f8c1fb440117bbe2d212a6d4920db1a9e2464ade4cf948c5ff8a89903d9b9674f015513d761c033308338a94c0403d0595abbd057bb362848f278067d5a9cd9 - languageName: node - linkType: hard - -"electron-chromedriver@npm:^14.0.0": - version: 14.0.0 - resolution: "electron-chromedriver@npm:14.0.0" - dependencies: - "@electron/get": ^1.12.4 - extract-zip: ^2.0.0 - bin: - chromedriver: chromedriver.js - checksum: 3a29b6e3b359ffc12f1b580516631df584a5367c1231843a331009ce40f0a5ef98f897f8b74bdb9899494be89262b63b7a4205ccc2ea0d1424004ec975349046 + checksum: e498aff6fe3bfd95d7e5f9d1158bdad5147ebd18266292c62879b305720fe9e188eac62d1bf40e71267159a0a9a9d6a9539aed2dc6224efeafebf3bd7dcee3df languageName: node linkType: hard @@ -6498,16 +6623,16 @@ __metadata: languageName: node linkType: hard -"electron@npm:14.2.6": - version: 14.2.6 - resolution: "electron@npm:14.2.6" +"electron@npm:17.4.1": + version: 17.4.1 + resolution: "electron@npm:17.4.1" dependencies: - "@electron/get": ^1.0.1 + "@electron/get": ^1.13.0 "@types/node": ^14.6.2 extract-zip: ^1.0.3 bin: electron: cli.js - checksum: f0ce42459502f9f7d937374699eefbb56dacc03b21c7e7933f5a865c4f1f05aba00eafa3a217fa97d91559ffffe5f57ab17c2001a5e122118957932e360bb707 + checksum: 7f70989d52620beaeb4f83a5608f68e9381714718950e1cf5e0581e8ec1325ba0d15227228c0a25a4e68c466a1338d74f05ca47edd8909df708a1bd17db93eec languageName: node linkType: hard @@ -7204,21 +7329,7 @@ __metadata: languageName: node linkType: hard -"extract-zip@npm:^1.0.3, extract-zip@npm:^1.6.7": - version: 1.6.7 - resolution: "extract-zip@npm:1.6.7" - dependencies: - concat-stream: 1.6.2 - debug: 2.6.9 - mkdirp: 0.5.1 - yauzl: 2.4.1 - bin: - extract-zip: cli.js - checksum: 27047b70ab043785f1fc89f7c041e0f97046e7c187685e119b073cffbbc8e7173b7f05a5ec7edb7d621dc6a86daf67441878ecb29d0dd078ae22764d0a934164 - languageName: node - linkType: hard - -"extract-zip@npm:^2.0.0": +"extract-zip@npm:2.0.1, extract-zip@npm:^2.0.0": version: 2.0.1 resolution: "extract-zip@npm:2.0.1" dependencies: @@ -7235,6 +7346,20 @@ __metadata: languageName: node linkType: hard +"extract-zip@npm:^1.0.3, extract-zip@npm:^1.6.7": + version: 1.6.7 + resolution: "extract-zip@npm:1.6.7" + dependencies: + concat-stream: 1.6.2 + debug: 2.6.9 + mkdirp: 0.5.1 + yauzl: 2.4.1 + bin: + extract-zip: cli.js + checksum: 27047b70ab043785f1fc89f7c041e0f97046e7c187685e119b073cffbbc8e7173b7f05a5ec7edb7d621dc6a86daf67441878ecb29d0dd078ae22764d0a934164 + languageName: node + linkType: hard + "extsprintf@npm:1.3.0": version: 1.3.0 resolution: "extsprintf@npm:1.3.0" @@ -7983,6 +8108,20 @@ __metadata: languageName: node linkType: hard +"global-agent@npm:^3.0.0": + version: 3.0.0 + resolution: "global-agent@npm:3.0.0" + dependencies: + boolean: ^3.0.1 + es6-error: ^4.1.1 + matcher: ^3.0.0 + roarr: ^2.15.3 + semver: ^7.3.2 + serialize-error: ^7.0.1 + checksum: 75074d80733b4bd5386c47f5df028e798018025beac0ab310e9908c72bf5639e408203e7bca0130d5ee01b5f4abc6d34385d96a9f950ea5fe1979bb431c808f7 + languageName: node + linkType: hard + "global-dirs@npm:^2.0.1": version: 2.0.1 resolution: "global-dirs@npm:2.0.1" @@ -8189,6 +8328,25 @@ __metadata: languageName: node linkType: hard +"got@npm:^11.8.1": + version: 11.8.3 + resolution: "got@npm:11.8.3" + dependencies: + "@sindresorhus/is": ^4.0.0 + "@szmarczak/http-timer": ^4.0.5 + "@types/cacheable-request": ^6.0.1 + "@types/responselike": ^1.0.0 + cacheable-lookup: ^5.0.3 + cacheable-request: ^7.0.2 + decompress-response: ^6.0.0 + http2-wrapper: ^1.0.0-beta.5.2 + lowercase-keys: ^2.0.0 + p-cancelable: ^2.0.0 + responselike: ^2.0.0 + checksum: 3b6db107d9765470b18e4cb22f7c7400381be7425b9be5823f0168d6c21b5d6b28b023c0b3ee208f73f6638c3ce251948ca9b54a1e8f936d3691139ac202d01b + languageName: node + linkType: hard + "got@npm:^9.6.0": version: 9.6.0 resolution: "got@npm:9.6.0" @@ -8485,13 +8643,13 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^4.0.0": - version: 4.0.0 - resolution: "https-proxy-agent@npm:4.0.0" +"https-proxy-agent@npm:5.0.1": + version: 5.0.1 + resolution: "https-proxy-agent@npm:5.0.1" dependencies: - agent-base: 5 + agent-base: 6 debug: 4 - checksum: 19471d5aae3e747b1c98b17556647e2a1362e68220c6b19585a8527498f32e62e03c41d2872d059d8720d56846bd7460a80ac06f876bccfa786468ff40dd5eef + checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765 languageName: node linkType: hard @@ -9812,6 +9970,13 @@ __metadata: languageName: node linkType: hard +"ky@npm:^0.28.5": + version: 0.28.7 + resolution: "ky@npm:0.28.7" + checksum: ff38c9c5a5b9c0354b9db167662cdb1fc48c91803a580807a1d18a1fccc024953cba3708e7bcbd9c7a27670c68631d4806e2c5a169ebc586e573a7c5802a6086 + languageName: node + linkType: hard + "latest-version@npm:^5.0.0, latest-version@npm:^5.1.0": version: 5.1.0 resolution: "latest-version@npm:5.1.0" @@ -10388,9 +10553,9 @@ __metadata: linkType: hard "make-error@npm:^1.1.1": - version: 1.3.5 - resolution: "make-error@npm:1.3.5" - checksum: bb9578cb5f36df27509b2a269fc5fda483130096e2989fff8788c2608ed01be780d1e85ba3653e27c0863a114c560410b410be89e19271cb5ff987c37a17c1fd + version: 1.3.6 + resolution: "make-error@npm:1.3.6" + checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 languageName: node linkType: hard @@ -10872,7 +11037,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3": +"mkdirp@npm:^0.5.1": version: 0.5.5 resolution: "mkdirp@npm:0.5.5" dependencies: @@ -11037,6 +11202,20 @@ __metadata: languageName: node linkType: hard +"node-fetch@npm:2.6.7": + version: 2.6.7 + resolution: "node-fetch@npm:2.6.7" + dependencies: + whatwg-url: ^5.0.0 + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b + languageName: node + linkType: hard + "node-fetch@npm:^2.3.0, node-fetch@npm:^2.6.1": version: 2.6.1 resolution: "node-fetch@npm:2.6.1" @@ -11168,6 +11347,13 @@ __metadata: languageName: node linkType: hard +"normalize-url@npm:^6.0.1": + version: 6.1.0 + resolution: "normalize-url@npm:6.1.0" + checksum: 4a4944631173e7d521d6b80e4c85ccaeceb2870f315584fa30121f505a6dfd86439c5e3fdd8cd9e0e291290c41d0c3599f0cb12ab356722ed242584c30348e50 + languageName: node + linkType: hard + "npm-conf@npm:^1.1.3": version: 1.1.3 resolution: "npm-conf@npm:1.1.3" @@ -11475,6 +11661,13 @@ __metadata: languageName: node linkType: hard +"p-iteration@npm:^1.1.8": + version: 1.1.8 + resolution: "p-iteration@npm:1.1.8" + checksum: 3eb8d8affc2ef947c076807e5c57030949abad0ff81759ebc54fc43823e30ce918e69b035bf1884991c61b7885c77efaf32c0de7ac01110a2c874f6aa81e0d7f + languageName: node + linkType: hard + "p-limit@npm:^1.1.0": version: 1.1.0 resolution: "p-limit@npm:1.1.0" @@ -11898,6 +12091,15 @@ __metadata: languageName: node linkType: hard +"pkg-dir@npm:4.2.0, pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0": + version: 4.2.0 + resolution: "pkg-dir@npm:4.2.0" + dependencies: + find-up: ^4.0.0 + checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6 + languageName: node + linkType: hard + "pkg-dir@npm:^2.0.0": version: 2.0.0 resolution: "pkg-dir@npm:2.0.0" @@ -11907,15 +12109,6 @@ __metadata: languageName: node linkType: hard -"pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0": - version: 4.2.0 - resolution: "pkg-dir@npm:4.2.0" - dependencies: - find-up: ^4.0.0 - checksum: 9863e3f35132bf99ae1636d31ff1e1e3501251d480336edb1c211133c8d58906bed80f154a1d723652df1fda91e01c7442c2eeaf9dc83157c7ae89087e43c8d6 - languageName: node - linkType: hard - "pkg-dir@npm:^5.0.0": version: 5.0.0 resolution: "pkg-dir@npm:5.0.0" @@ -12272,7 +12465,7 @@ __metadata: languageName: node linkType: hard -"progress@npm:^2.0.0, progress@npm:^2.0.1, progress@npm:^2.0.3": +"progress@npm:2.0.3, progress@npm:^2.0.0, progress@npm:^2.0.3": version: 2.0.3 resolution: "progress@npm:2.0.3" checksum: f67403fe7b34912148d9252cb7481266a354bd99ce82c835f79070643bb3c6583d10dbcfda4d41e04bbc1d8437e9af0fb1e1f2135727878f5308682a579429b7 @@ -12321,7 +12514,7 @@ __metadata: languageName: node linkType: hard -"proxy-from-env@npm:^1.0.0": +"proxy-from-env@npm:1.1.0": version: 1.1.0 resolution: "proxy-from-env@npm:1.1.0" checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 @@ -12398,23 +12591,23 @@ __metadata: languageName: node linkType: hard -"puppeteer-core@npm:^5.1.0": - version: 5.5.0 - resolution: "puppeteer-core@npm:5.5.0" +"puppeteer-core@npm:^13.0.0": + version: 13.7.0 + resolution: "puppeteer-core@npm:13.7.0" dependencies: - debug: ^4.1.0 - devtools-protocol: 0.0.818844 - extract-zip: ^2.0.0 - https-proxy-agent: ^4.0.0 - node-fetch: ^2.6.1 - pkg-dir: ^4.2.0 - progress: ^2.0.1 - proxy-from-env: ^1.0.0 - rimraf: ^3.0.2 - tar-fs: ^2.0.0 - unbzip2-stream: ^1.3.3 - ws: ^7.2.3 - checksum: b50e55dd6e88524e50fa6b71dd45b32d7ff556e21f60f4ec0cf0ca686248959abcb14d98e5bb7324210ac822b041b773d9bd17c49ea95641f9c7a1f66ed88eec + cross-fetch: 3.1.5 + debug: 4.3.4 + devtools-protocol: 0.0.981744 + extract-zip: 2.0.1 + https-proxy-agent: 5.0.1 + pkg-dir: 4.2.0 + progress: 2.0.3 + proxy-from-env: 1.1.0 + rimraf: 3.0.2 + tar-fs: 2.1.1 + unbzip2-stream: 1.4.3 + ws: 8.5.0 + checksum: 652c4cfc9d228a8c5162227368a78a3a28ea6f287b4bfb359fa84cb83109e8203b4251103f8b0f7eca173a2a3f5d8cb8a7b664cc958a13d536ec91b5e729e731 languageName: node linkType: hard @@ -12445,6 +12638,13 @@ __metadata: languageName: node linkType: hard +"query-selector-shadow-dom@npm:^1.0.0": + version: 1.0.0 + resolution: "query-selector-shadow-dom@npm:1.0.0" + checksum: 001ec9708956b9fb70941c1ac921bc006e0d668e9d4f6e6bdb07a06c572e3fdd990ea598329abcd2f5188c979c8f182357d2d2265ded6e2db684deba8a6a2bea + languageName: node + linkType: hard + "querystring@npm:0.2.0": version: 0.2.0 resolution: "querystring@npm:0.2.0" @@ -13783,10 +13983,10 @@ __metadata: languageName: node linkType: hard -"rgb2hex@npm:0.2.3": - version: 0.2.3 - resolution: "rgb2hex@npm:0.2.3" - checksum: 469e8146c3edd8fd27358ed744ee6febd53723ff4741e982521e83431a60fa7a4a7908fddd2ec4d806e024405b651a97524472bccea9059d994d69ed1d3f1950 +"rgb2hex@npm:0.2.5": + version: 0.2.5 + resolution: "rgb2hex@npm:0.2.5" + checksum: 2c36c878bd28b24112dbf5b8d6e898ddb03dcc14e5bd0ddb1a0cc48479aac426cc4f3d1c56d22358ea7ff06154ca4dbe26bca8af303145392afa2d139a8131c4 languageName: node linkType: hard @@ -13801,25 +14001,25 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^2.6.1, rimraf@npm:^2.6.3": - version: 2.7.1 - resolution: "rimraf@npm:2.7.1" +"rimraf@npm:3.0.2, rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": + version: 3.0.2 + resolution: "rimraf@npm:3.0.2" dependencies: glob: ^7.1.3 bin: - rimraf: ./bin.js - checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd + rimraf: bin.js + checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0 languageName: node linkType: hard -"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": - version: 3.0.2 - resolution: "rimraf@npm:3.0.2" +"rimraf@npm:^2.6.1, rimraf@npm:^2.6.3": + version: 2.7.1 + resolution: "rimraf@npm:2.7.1" dependencies: glob: ^7.1.3 bin: - rimraf: bin.js - checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0 + rimraf: ./bin.js + checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd languageName: node linkType: hard @@ -13883,7 +14083,7 @@ __metadata: languageName: node linkType: hard -"sanitize-filename@npm:^1.6.2, sanitize-filename@npm:^1.6.3": +"sanitize-filename@npm:^1.6.3": version: 1.6.3 resolution: "sanitize-filename@npm:1.6.3" dependencies: @@ -14294,7 +14494,7 @@ __metadata: "@babel/core": 7.17.2 "@babel/plugin-proposal-decorators": 7.17.2 "@babel/preset-env": 7.16.11 - "@electron/remote": ^2.0.1 + "@electron/remote": 2.0.8 "@octokit/app": 3.0.2 "@octokit/request": 4.1.1 "@octokit/rest": 16.43.2 @@ -14345,9 +14545,8 @@ __metadata: css-element-queries: 1.2.3 css-loader: 2.1.1 dotenv: 8.2.0 - electron: 14.2.6 + electron: 17.4.1 electron-builder: 22.14.5 - electron-chromedriver: ^14.0.0 electron-devtools-installer: 3.1.1 electron-notarize: 1.0.0 electron-react-devtools: ^0.5.3 @@ -14417,7 +14616,7 @@ __metadata: sockjs: 0.3.20 sockjs-client: 1.1.5 sortablejs: 1.13.0 - spectron: 15.0.0 + spectron: 19.0.0 streamlabs-beaker: 0.9.4 style-loader: 2.0.0 stylelint: 10.0.1 @@ -14429,7 +14628,7 @@ __metadata: traverse: 0.6.6 tree-kill: 1.2.2 ts-loader: 8.0.11 - ts-node: 7.0.1 + ts-node: ^10.7.0 typedoc: 0.22.10 typescript: 4.5.5 urijs: 1.19.7 @@ -14619,7 +14818,7 @@ __metadata: languageName: node linkType: hard -"source-map-support@npm:^0.5.19, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.19": +"source-map-support@npm:^0.5.19, source-map-support@npm:~0.5.19": version: 0.5.19 resolution: "source-map-support@npm:0.5.19" dependencies: @@ -14689,17 +14888,17 @@ __metadata: languageName: node linkType: hard -"spectron@npm:15.0.0": - version: 15.0.0 - resolution: "spectron@npm:15.0.0" +"spectron@npm:19.0.0": + version: 19.0.0 + resolution: "spectron@npm:19.0.0" dependencies: - "@electron/remote": ^1.1.0 + "@electron/remote": 2.0.4 dev-null: ^0.1.1 - electron-chromedriver: ^13.0.0 + electron-chromedriver: 17.0.0 got: ^11.8.0 split: ^1.0.1 - webdriverio: ^6.9.1 - checksum: 3aefbc8c46eddd5a7d55cf7f2aec8bb6dbf3cfc6ee8a1cf7d7e0edb2f7b75738f0c5ab0b990dfef3458aab712430e37a05b43fee96d99556f8a82f09b9c2c321 + webdriverio: 7.16.13 + checksum: 6d8ceba7240b9414f6813296ebefa1c9ce4dc9d667a637e52c19d734f072e860321df5bdc5683fa41b9e9f53267828c1fe752eb1d5cd181935671ce99dd983fe languageName: node linkType: hard @@ -15293,7 +15492,7 @@ __metadata: languageName: node linkType: hard -"tar-fs@npm:^2.0.0": +"tar-fs@npm:2.1.1": version: 2.1.1 resolution: "tar-fs@npm:2.1.1" dependencies: @@ -15604,6 +15803,13 @@ __metadata: languageName: node linkType: hard +"tr46@npm:~0.0.3": + version: 0.0.3 + resolution: "tr46@npm:0.0.3" + checksum: 726321c5eaf41b5002e17ffbd1fb7245999a073e8979085dacd47c4b4e8068ff5777142fc6726d6ca1fd2ff16921b48788b87225cbc57c72636f6efa8efbffe3 + languageName: node + linkType: hard + "traverse@npm:0.6.6": version: 0.6.6 resolution: "traverse@npm:0.6.6" @@ -15680,21 +15886,41 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:7.0.1": - version: 7.0.1 - resolution: "ts-node@npm:7.0.1" +"ts-node@npm:^10.7.0": + version: 10.7.0 + resolution: "ts-node@npm:10.7.0" dependencies: - arrify: ^1.0.0 - buffer-from: ^1.1.0 - diff: ^3.1.0 + "@cspotcode/source-map-support": 0.7.0 + "@tsconfig/node10": ^1.0.7 + "@tsconfig/node12": ^1.0.7 + "@tsconfig/node14": ^1.0.0 + "@tsconfig/node16": ^1.0.2 + acorn: ^8.4.1 + acorn-walk: ^8.1.1 + arg: ^4.1.0 + create-require: ^1.1.0 + diff: ^4.0.1 make-error: ^1.1.1 - minimist: ^1.2.0 - mkdirp: ^0.5.1 - source-map-support: ^0.5.6 - yn: ^2.0.0 + v8-compile-cache-lib: ^3.0.0 + yn: 3.1.1 + peerDependencies: + "@swc/core": ">=1.2.50" + "@swc/wasm": ">=1.2.50" + "@types/node": "*" + typescript: ">=2.7" + peerDependenciesMeta: + "@swc/core": + optional: true + "@swc/wasm": + optional: true bin: ts-node: dist/bin.js - checksum: 07ed6ea1805361828737a767cfd6c57ea6e267ee8679282afb933610af02405e1a87c1f2aea1d38ed8e66b34fcbf6272b6021ab95d78849105d2e57fc283870b + ts-node-cwd: dist/bin-cwd.js + ts-node-esm: dist/bin-esm.js + ts-node-script: dist/bin-script.js + ts-node-transpile-only: dist/bin-transpile.js + ts-script: dist/bin-script-deprecated.js + checksum: 2a379e43f7478d0b79e1e63af91fe222d83857727957df4bd3bdf3c0a884de5097b12feb9bbf530074526b8874c0338b0e6328cf334f3a5e2c49c71e837273f7 languageName: node linkType: hard @@ -15863,10 +16089,10 @@ __metadata: languageName: node linkType: hard -"ua-parser-js@npm:^0.7.21": - version: 0.7.23 - resolution: "ua-parser-js@npm:0.7.23" - checksum: ccf0d98c1e1d02e31edae55adbc85c88b01a9499bbad4e159ecd0787aafd68bd63c40cac2bab6a7899fbab4f92347132b53e66d60140d81cda51f12ec56b0cc6 +"ua-parser-js@npm:^1.0.1": + version: 1.0.2 + resolution: "ua-parser-js@npm:1.0.2" + checksum: ff7f6d79a9c1a38aa85a0e751040fc7e17a0b621bda876838d14ebe55aca4e50e68da0350f181e58801c2d8a35e7db4e12473776e558910c4b7cabcec96aa3bf languageName: node linkType: hard @@ -15877,7 +16103,7 @@ __metadata: languageName: node linkType: hard -"unbzip2-stream@npm:^1.3.3": +"unbzip2-stream@npm:1.4.3": version: 1.4.3 resolution: "unbzip2-stream@npm:1.4.3" dependencies: @@ -16317,6 +16543,13 @@ __metadata: languageName: node linkType: hard +"v8-compile-cache-lib@npm:^3.0.0": + version: 3.0.1 + resolution: "v8-compile-cache-lib@npm:3.0.1" + checksum: 78089ad549e21bcdbfca10c08850022b22024cdcc2da9b168bcf5a73a6ed7bf01a9cebb9eac28e03cd23a684d81e0502797e88f3ccd27a32aeab1cfc44c39da0 + languageName: node + linkType: hard + "v8-compile-cache@npm:^2.0.3, v8-compile-cache@npm:^2.2.0": version: 2.2.0 resolution: "v8-compile-cache@npm:2.2.0" @@ -16638,35 +16871,42 @@ __metadata: languageName: node linkType: hard -"webdriver@npm:6.12.1": - version: 6.12.1 - resolution: "webdriver@npm:6.12.1" +"webdriver@npm:7.16.13": + version: 7.16.13 + resolution: "webdriver@npm:7.16.13" dependencies: - "@wdio/config": 6.12.1 - "@wdio/logger": 6.10.10 - "@wdio/protocols": 6.12.0 - "@wdio/utils": 6.11.0 + "@types/node": ^17.0.4 + "@wdio/config": 7.16.13 + "@wdio/logger": 7.16.0 + "@wdio/protocols": 7.16.7 + "@wdio/types": 7.16.13 + "@wdio/utils": 7.16.13 got: ^11.0.2 + ky: ^0.28.5 lodash.merge: ^4.6.1 - checksum: d196064cb0fba8f0a6174a4481e518c6caac252db0ea1f7d95fb1c9f11b0364d87a19d970519445d5f490516562cd3f3e51ba4401e22b1261e65794d5683a94c + checksum: 9f385f15dc97db138080b63fd8a3e5a3fec3b3bb0fc361b4eda89139e560387e824c0082165e43fe937ec144542df12e5d3ed9d5a2d019aa8a76a0d720171664 languageName: node linkType: hard -"webdriverio@npm:^6.9.1": - version: 6.12.1 - resolution: "webdriverio@npm:6.12.1" +"webdriverio@npm:7.16.13": + version: 7.16.13 + resolution: "webdriverio@npm:7.16.13" dependencies: - "@types/puppeteer-core": ^5.4.0 - "@wdio/config": 6.12.1 - "@wdio/logger": 6.10.10 - "@wdio/repl": 6.11.0 - "@wdio/utils": 6.11.0 + "@types/aria-query": ^5.0.0 + "@types/node": ^17.0.4 + "@wdio/config": 7.16.13 + "@wdio/logger": 7.16.0 + "@wdio/protocols": 7.16.7 + "@wdio/repl": 7.16.13 + "@wdio/types": 7.16.13 + "@wdio/utils": 7.16.13 archiver: ^5.0.0 - atob: ^2.1.2 + aria-query: ^5.0.0 css-shorthand-properties: ^1.1.1 css-value: ^0.0.1 - devtools: 6.12.1 - fs-extra: ^9.0.1 + devtools: 7.16.13 + devtools-protocol: ^0.0.953906 + fs-extra: ^10.0.0 get-port: ^5.1.1 grapheme-splitter: ^1.0.2 lodash.clonedeep: ^4.5.0 @@ -16674,12 +16914,20 @@ __metadata: lodash.isplainobject: ^4.0.6 lodash.zip: ^4.2.0 minimatch: ^3.0.4 - puppeteer-core: ^5.1.0 + puppeteer-core: ^13.0.0 + query-selector-shadow-dom: ^1.0.0 resq: ^1.9.1 - rgb2hex: 0.2.3 + rgb2hex: 0.2.5 serialize-error: ^8.0.0 - webdriver: 6.12.1 - checksum: 8c57d41688c62a6e4b4a6d81b786a00641d81e4eebf262a4ceecf3214b56738aadb9a3e20c14eee115cfbb0f621dcaa8bac37f20cc238e85e142d784677f7188 + webdriver: 7.16.13 + checksum: b2ddbe9b39e6ed945dec41f11d3471eff9d7574eda7ee0334f0d61efa388a72d0f5aefe31fe879da716191b697981e28903c9a95cef27ea09dd71b1b8056c96d + languageName: node + linkType: hard + +"webidl-conversions@npm:^3.0.0": + version: 3.0.1 + resolution: "webidl-conversions@npm:3.0.1" + checksum: c92a0a6ab95314bde9c32e1d0a6dfac83b578f8fa5f21e675bc2706ed6981bc26b7eb7e6a1fab158e5ce4adf9caa4a0aee49a52505d4d13c7be545f15021b17c languageName: node linkType: hard @@ -16839,6 +17087,16 @@ __metadata: languageName: node linkType: hard +"whatwg-url@npm:^5.0.0": + version: 5.0.0 + resolution: "whatwg-url@npm:5.0.0" + dependencies: + tr46: ~0.0.3 + webidl-conversions: ^3.0.0 + checksum: b8daed4ad3356cc4899048a15b2c143a9aed0dfae1f611ebd55073310c7b910f522ad75d727346ad64203d7e6c79ef25eafd465f4d12775ca44b90fa82ed9e2c + languageName: node + linkType: hard + "whatwg-url@npm:^6.5.0": version: 6.5.0 resolution: "whatwg-url@npm:6.5.0" @@ -16980,9 +17238,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:^7.2.3": - version: 7.4.2 - resolution: "ws@npm:7.4.2" +"ws@npm:8.5.0": + version: 8.5.0 + resolution: "ws@npm:8.5.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -16991,7 +17249,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 7a17918cd741f6b083e47c04bbd5383066a6f516a80562034b1b4851c345c1702e925d915b3998ca353e7f4b7a5d9544dc1263279abb96fdb99ea10b5a0252d6 + checksum: 76f2f90e40344bf18fd544194e7067812fb1372b2a37865678d8f12afe4b478ff2ebc0c7c0aff82cd5e6b66fc43d889eec0f1865c2365d8f7a66d92da7744a77 languageName: node linkType: hard @@ -17193,10 +17451,10 @@ __metadata: languageName: node linkType: hard -"yn@npm:^2.0.0": - version: 2.0.0 - resolution: "yn@npm:2.0.0" - checksum: 9d49527cb3e9a0948cc057223810bf30607bf04b9ff7666cc1681a6501d660b60d90000c16f9e29311b0f28d8a06222ada565ccdca5f1049cdfefb1908217572 +"yn@npm:3.1.1": + version: 3.1.1 + resolution: "yn@npm:3.1.1" + checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6 languageName: node linkType: hard