Skip to content

Commit 01162cb

Browse files
authored
chore: migrate TypeScript config to ESM modules (#2355)
Agent-Logs-Url: https://github.com/microsoft/vscode-js-debug/sessions/ab31ec66-4ec4-4010-a0a1-ff78b6204026 Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent 3ce0f4b commit 01162cb

8 files changed

Lines changed: 22 additions & 18 deletions

File tree

src/adapter/cdpProxy.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import { randomBytes } from 'crypto';
66
import { inject, injectable } from 'inversify';
7-
import WebSocket from 'ws';
7+
import WebSocket, { type RawData, type WebSocketServer } from 'ws';
88
import { Cdp } from '../cdp/api';
99
import { ICdpApi, ProtocolError } from '../cdp/connection';
1010
import { CdpProtocol } from '../cdp/protocol';
@@ -162,7 +162,7 @@ export const ICdpProxyProvider = Symbol('ICdpProxyProvider');
162162
*/
163163
@injectable()
164164
export class CdpProxyProvider implements ICdpProxyProvider {
165-
private server?: Promise<{ server: WebSocket.Server; path: string }>;
165+
private server?: Promise<{ server: WebSocketServer; path: string }>;
166166
private readonly disposables = new DisposableList();
167167
private readonly replay = new DomainReplays();
168168

@@ -241,7 +241,7 @@ export class CdpProxyProvider implements ICdpProxyProvider {
241241

242242
this.logger.info(LogTag.ProxyActivity, 'activated cdp proxy');
243243

244-
server.on('connection', client => {
244+
server.on('connection', (client: WebSocket) => {
245245
const clientHandle = new ClientHandle(client, this.logger);
246246
this.logger.info(LogTag.ProxyActivity, 'accepted proxy connection', {
247247
id: clientHandle.id,
@@ -254,7 +254,7 @@ export class CdpProxyProvider implements ICdpProxyProvider {
254254
this.disposables.disposeObject(clientHandle);
255255
});
256256

257-
client.on('message', async d => {
257+
client.on('message', async (d: RawData) => {
258258
let message: CdpProtocol.ICommand;
259259
try {
260260
message = JSON.parse(d.toString());

src/adapter/portLeaseTracker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import { inject, injectable } from 'inversify';
66
import * as net from 'net';
77
import { CancellationToken } from 'vscode';
8-
import * as WebSocket from 'ws';
8+
import { type ServerOptions } from 'ws';
99
import { cancellableRace, NeverCancelled } from '../common/cancellation';
1010
import { IDisposable } from '../common/disposable';
1111
import { EventEmitter } from '../common/events';
@@ -43,7 +43,7 @@ export const acquireTrackedServer = async (
4343
*/
4444
export const acquireTrackedWebSocketServer = async (
4545
tracker: IPortLeaseTracker,
46-
options?: WebSocket.ServerOptions,
46+
options?: ServerOptions,
4747
ct?: CancellationToken,
4848
) => {
4949
const server = await findOpenPort({ tester: makeAcquireWebSocketServer(options) }, ct);

src/build/documentReadme.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import strings from '../../package.nls.json';
99
import { getPreferredOrDebugType } from '../common/contributionUtils';
1010
import { debuggers, DescribedAttribute } from './generate-contributions.js';
1111

12+
const nlsStrings = strings as Record<string, string | { message: string }>;
13+
1214
(async () => {
1315
let out = `# Options\n\n`;
1416
for (const dbg of debuggers) {
@@ -27,7 +29,11 @@ import { debuggers, DescribedAttribute } from './generate-contributions.js';
2729
}
2830

2931
const descriptionKey = descriptionKeyRaw.slice(1, -1);
30-
const description = strings[descriptionKey].replace(/\n/g, '<br>');
32+
const localized = nlsStrings[descriptionKey];
33+
const description = (typeof localized === 'string' ? localized : localized?.message)?.replace(
34+
/\n/g,
35+
'<br>',
36+
);
3137
if (!description) {
3238
continue;
3339
}

src/common/findOpenPort.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import * as net from 'net';
66
import type { CancellationToken } from 'vscode';
7-
import * as WebSocket from 'ws';
7+
import { WebSocketServer, type ServerOptions } from 'ws';
88
import { NeverCancelled, TaskCancelledError } from './cancellation';
99
import { IDisposable } from './disposable';
1010
import { randomInRange } from './random';
@@ -112,9 +112,9 @@ export const makeAcquireTcpServer =
112112
* @returns the listening server
113113
*/
114114
export const makeAcquireWebSocketServer =
115-
(options?: WebSocket.ServerOptions): PortTesterFn<WebSocket.Server> => (port, ct) =>
115+
(options?: ServerOptions): PortTesterFn<WebSocketServer> => (port, ct) =>
116116
waitForServerToListen(
117-
new WebSocket.WebSocketServer({ host: '127.0.0.1', ...options, port }),
117+
new WebSocketServer({ host: '127.0.0.1', ...options, port }),
118118
ct,
119119
);
120120

src/test/common/cdpTransport.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { expect } from 'chai';
66
import { randomBytes } from 'crypto';
77
import { stub } from 'sinon';
88
import { PassThrough } from 'stream';
9-
import { AddressInfo, Server as WebSocketServer } from 'ws';
9+
import { AddressInfo, WebSocketServer } from 'ws';
1010
import { RawPipeTransport } from '../../cdp/rawPipeTransport';
1111
import { ITransport } from '../../cdp/transport';
1212
import { WebSocketTransport } from '../../cdp/webSocketTransport';
@@ -41,7 +41,7 @@ describe('cdp transport', () => {
4141
const address = server.address() as AddressInfo;
4242
const a = WebSocketTransport.create(`ws://127.0.0.1:${address.port}`, NeverCancelled);
4343
const b = new Promise<WebSocketTransport>((resolve, reject) => {
44-
server.on('connection', cnx => resolve(new WebSocketTransport(cnx)));
44+
server.on('connection', (cnx: import('ws').WebSocket) => resolve(new WebSocketTransport(cnx)));
4545
server.on('error', reject);
4646
});
4747

src/test/reporters/goldenTextReporter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ class GoldenTextReporter extends mocha.reporters.Spec {
3232
}
3333
}
3434

35-
// Must be default export
36-
export = GoldenTextReporter;
35+
export default GoldenTextReporter;

src/test/reporters/logTestReporter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,4 @@ class LoggingReporter extends mocha.reporters.Spec {
3030
}
3131
}
3232

33-
// Must be default export
34-
export = LoggingReporter;
33+
export default LoggingReporter;

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"compilerOptions": {
3-
"module": "commonjs",
3+
"module": "ES2022",
44
"target": "ES2021",
55
"lib": ["ES2022"],
6-
"moduleResolution": "node",
6+
"moduleResolution": "bundler",
77
"noImplicitAny": true,
88
"noImplicitThis": true,
99
"sourceMap": true,

0 commit comments

Comments
 (0)