Skip to content

Commit

Permalink
update deps - fixes #98
Browse files Browse the repository at this point in the history
  • Loading branch information
christian-bromann committed Jan 13, 2024
1 parent 879877d commit 1b50504
Showing 17 changed files with 1,359 additions and 1,329 deletions.
2,590 changes: 1,310 additions & 1,280 deletions package-lock.json

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -42,23 +42,23 @@
"tests"
],
"dependencies": {
"@fastify/cors": "^8.3.0",
"@fastify/static": "^6.10.2",
"@types/ws": "^8.5.5",
"@vscode/test-electron": "^2.3.4",
"@wdio/logger": "^8.11.0",
"@fastify/cors": "^8.5.0",
"@fastify/static": "^6.12.0",
"@types/ws": "^8.5.10",
"@vscode/test-electron": "^2.3.8",
"@wdio/logger": "^8.24.12",
"clipboardy": "^3.0.0",
"decamelize": "6.0.0",
"download": "^8.0.0",
"fastify": "^4.21.0",
"fastify": "^4.25.2",
"get-port": "7.0.0",
"hpagent": "^1.2.0",
"slash": "^5.1.0",
"tmp-promise": "^3.0.3",
"undici": "^5.23.0",
"vscode-uri": "^3.0.8",
"wdio-chromedriver-service": "^8.1.1",
"ws": "^8.13.0",
"ws": "^8.16.0",
"yargs-parser": "^21.1.1"
},
"peerDependencies": {
@@ -74,37 +74,37 @@
}
},
"devDependencies": {
"@types/chromedriver": "^81.0.1",
"@types/download": "^8.0.2",
"@types/chromedriver": "^81.0.5",
"@types/download": "^8.0.5",
"@types/node": "^18.16.1",
"@types/vscode": "^1.77.0",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"@wdio/cli": "^8.15.7",
"@wdio/globals": "^8.15.7",
"@wdio/local-runner": "^8.15.7",
"@wdio/mocha-framework": "^8.15.7",
"@wdio/spec-reporter": "^8.15.7",
"@wdio/types": "^8.15.7",
"@typescript-eslint/eslint-plugin": "^6.18.1",
"@typescript-eslint/parser": "^6.18.1",
"@wdio/cli": "^8.27.2",
"@wdio/globals": "^8.27.2",
"@wdio/local-runner": "^8.27.2",
"@wdio/mocha-framework": "^8.27.2",
"@wdio/spec-reporter": "^8.27.2",
"@wdio/types": "^8.27.2",
"chromedriver": "*",
"eslint": "^8.48.0",
"eslint": "^8.56.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-base-typescript": "^1.1.0",
"eslint-import-resolver-typescript": "^3.6.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jest": "^27.2.3",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^27.6.3",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-unicorn": "^48.0.1",
"eslint-plugin-wdio": "^8.8.7",
"eslint-plugin-unicorn": "^50.0.1",
"eslint-plugin-wdio": "^8.24.12",
"husky": "^8.0.3",
"npm-run-all": "^4.1.5",
"pkg": "^5.8.1",
"release-it": "^16.1.5",
"rimraf": "^5.0.1",
"ts-node": "^10.9.1",
"typedoc": "^0.24.8",
"typescript": "^5.1.6"
"release-it": "^17.0.1",
"rimraf": "^5.0.5",
"ts-node": "^10.9.2",
"typedoc": "^0.25.7",
"typescript": "^5.3.3"
},
"files": [
"dist/*",
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'node:path'
import { Key } from 'webdriverio'
import type { ArgsParams, VSCodeProxyOptions } from './types'
import type { ArgsParams, VSCodeProxyOptions } from './types.js'

export const VSCODE_CAPABILITY_KEY = 'wdio:vscodeOptions' as const
export const DEFAULT_CHANNEL = 'stable'
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import VSCodeServiceLauncher from './launcher.js'
import VSCodeWorkerService from './service.js'
import type { WDIOVSCodeServiceOptions as WDIOVSCodeServiceOptionsExtension } from './types'
import type { WDIOVSCodeServiceOptions as WDIOVSCodeServiceOptionsExtension } from './types.js'

export default VSCodeWorkerService
export const launcher = VSCodeServiceLauncher
7 changes: 4 additions & 3 deletions src/launcher.ts
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ import {
import type {
ServiceOptions, ServiceCapability, VSCodeCapabilities, WebStandaloneResponse,
Bundle
} from './types'
} from './types.js'

interface BundeInformation {
chromedriver: string
@@ -54,6 +54,7 @@ if (httpsProxy) {
: undefined

setGlobalDispatcher(new ProxyAgent({ uri: proxyUrl.protocol + proxyUrl.host, token }))
// @ts-expect-error downloadAgentConfiguration is not part of the official API
downloadAgentConfiguration = { agent: new HttpsProxyAgent({ proxy: proxyUrl }) }
}
// use HTTPS_PROXY or https_proxy for @vscode/test-electron if not already set
@@ -69,7 +70,7 @@ export default class VSCodeServiceLauncher extends ChromedriverServiceLauncher {

constructor (
private _options: ServiceOptions,
private _capabilities: Capabilities.Capabilities,
private _capabilities: WebdriverIO.Capabilities,
config: Options.Testrunner
) {
super(_options, _capabilities, config)
@@ -371,7 +372,7 @@ export default class VSCodeServiceLauncher extends ChromedriverServiceLauncher {
throw new SevereServiceError('This service deson\'t support multiremote yet')
}

for (const cap of this._capabilities as any as Capabilities.Capabilities[]) {
for (const cap of this._capabilities as any as WebdriverIO.Capabilities[]) {
if (isChrome(cap)) {
Object.assign(cap, options)
}
2 changes: 1 addition & 1 deletion src/pageobjects/activityBar/ActionsControl.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ElementWithContextMenu } from '../utils.js'
import { ActivityBar as ActivityBarLocators } from '../../locators/1.73.0.js'
import type { ContextMenu } from '../menu/ContextMenu'
import type { ContextMenu } from '../menu/ContextMenu.js'

/**
* Page object representing the global action controls on the bottom of the action bar.
2 changes: 1 addition & 1 deletion src/pageobjects/dialog/ModalDialog.ts
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ export class ModalDialog extends BasePage<typeof DialogLocators> {
*/
async pushButton (title: string): Promise<void> {
const buttons = await this.getButtons()
const titles = await Promise.all(buttons.map(async (btn) => btn.getAttribute('title')))
const titles = await buttons.map(async (btn) => btn.getAttribute('title'))
const index = titles.findIndex((value) => value === title)
if (index > -1) {
await buttons[index].click()
2 changes: 1 addition & 1 deletion src/pageobjects/menu/MenuItem.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BasePage } from '../utils.js'
import type { Menu } from './Menu'
import type { Menu } from './Menu.js'

/**
* Abstract element representing a menu item
Original file line number Diff line number Diff line change
@@ -128,7 +128,7 @@ export class ExtensionsViewSection extends ViewSection {
}

private getSectionForCategory (title: string): string {
const category = title.split(' ')[0].toLowerCase()
const category = title.split(' ')[0].toLowerCase() as ExtensionCategory
switch (category) {
case ExtensionCategory.Disabled:
return 'Disabled'
2 changes: 1 addition & 1 deletion src/pageobjects/workbench/WebView.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio'
import { BasePage, PageDecorator, IPageDecorator } from '../utils.js'
import { WebView as WebViewLocators } from '../../locators/1.73.0.js'
import type { VSCodeLocatorMap } from '../utils'
import type { VSCodeLocatorMap } from '../utils.js'

export interface WebView extends IPageDecorator<typeof WebViewLocators> { }
@PageDecorator(WebViewLocators)
2 changes: 1 addition & 1 deletion src/proxy/index.ts
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import type VSCodeImport from 'vscode'
import WebSocket from 'ws'

import { SETTINGS_KEY } from '../constants.js'
import type { RemoteCommand, RemoteResponse } from '../types'
import type { RemoteCommand, RemoteResponse } from '../types.js'

export async function run (vscode: typeof VSCodeImport): Promise<void> {
const config = vscode.workspace.getConfiguration(SETTINGS_KEY)
2 changes: 1 addition & 1 deletion src/server/index.ts
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import { getWorkbenchOptions } from './utils.js'
import { getFileType } from '../utils.js'
import { fsProviderExtensionPrefix } from './constants.js'
import { DEFAULT_VSCODE_WEB_PORT, DEFAULT_CHANNEL, DEFAULT_VSCODE_WEB_HOSTNAME } from '../constants.js'
import type { VSCodeOptions, Bundle } from '../types'
import type { VSCodeOptions, Bundle } from '../types.js'

const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
const log = logger('wdio-vscode-service/server')
2 changes: 1 addition & 1 deletion src/server/workbench.tpl.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { TemplateOptions } from '../types'
import type { TemplateOptions } from '../types.js'

export default function getWorkbench (opts: TemplateOptions) {
return /* html */`
2 changes: 1 addition & 1 deletion src/service.ts
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import {
import type {
VSCodeCapabilities, WDIOLogs, ArgsParams, RemoteCommand, RemoteResponse,
PendingMessageResolver, VSCodeProxyOptions, VSCodeOptions
} from './types'
} from './types.js'

const log = logger('wdio-vscode-service')
const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
5 changes: 2 additions & 3 deletions src/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { ServiceOptions as ChromedriverServiceOptions } from 'wdio-chromedriver-service'
import type { Capabilities } from '@wdio/types'
import type { VSCODE_CAPABILITY_KEY } from './constants'
import type { VSCODE_CAPABILITY_KEY } from './constants.js'

/**
* extend WebdriverIO capabilities object
@@ -9,7 +8,7 @@ export interface WDIOVSCodeServiceOptions {
[VSCODE_CAPABILITY_KEY]?: VSCodeOptions
}

export interface VSCodeCapabilities extends Capabilities.Capabilities, WDIOVSCodeServiceOptions {}
export interface VSCodeCapabilities extends WebdriverIO.Capabilities, WDIOVSCodeServiceOptions {}

/**
* Settings to handle VSCode Proxy API
4 changes: 2 additions & 2 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@ import child_process from 'node:child_process'
import type { Dirent, Stats } from 'node:fs'

import { VSCODE_CAPABILITY_KEY } from './constants.js'
import type { VSCodeLocatorMap } from './pageobjects/utils'
import type { VSCodeCapabilities } from './types'
import type { VSCodeLocatorMap } from './pageobjects/utils.js'
import type { VSCodeCapabilities } from './types.js'

const __dirname = url.fileURLToPath(new URL('.', import.meta.url))

4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"compilerOptions": {
"target": "ES2021",
"module": "ESNext",
"module": "NodeNext",
"baseUrl": "src",
"outDir": "./dist",
"moduleResolution": "node",
"moduleResolution": "node16",
"esModuleInterop": true,
"strict": true,
"declaration": true,

0 comments on commit 1b50504

Please sign in to comment.