Merge pull request #299846 from mjbvz/dev/mjbvz/embarrassed-rodent

Update build TS versions
This commit is contained in:
Matt Bierner
2026-03-09 00:47:50 -07:00
committed by GitHub
12 changed files with 86 additions and 64 deletions

View File

@@ -14,18 +14,37 @@
"parse5": "^3.0.2"
},
"devDependencies": {
"@types/markdown-it": "0.0.2",
"@types/markdown-it": "^14",
"@types/node": "22.x"
},
"engines": {
"vscode": "^1.4.0"
}
},
"node_modules/@types/linkify-it": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
"integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
"dev": true,
"license": "MIT"
},
"node_modules/@types/markdown-it": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-0.0.2.tgz",
"integrity": "sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA= sha512-A2seE+zJYSjGHy7L/v0EN/xRfgv2A60TuXOwI8tt5aZxF4UeoYIkM2jERnNH8w4VFr7oFEm0lElGOao7fZgygQ==",
"dev": true
"version": "14.1.2",
"resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
"integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
"dev": true,
"license": "MIT",
"dependencies": {
"@types/linkify-it": "^5",
"@types/mdurl": "^2"
}
},
"node_modules/@types/mdurl": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
"integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
"dev": true,
"license": "MIT"
},
"node_modules/@types/node": {
"version": "22.13.10",

View File

@@ -66,7 +66,7 @@
]
},
"devDependencies": {
"@types/markdown-it": "0.0.2",
"@types/markdown-it": "^14",
"@types/node": "22.x"
},
"repository": {

View File

@@ -8,7 +8,7 @@ import * as fs from 'fs';
import { URL } from 'url';
import { parseTree, findNodeAtLocation, Node as JsonNode, getNodeValue } from 'jsonc-parser';
import * as MarkdownItType from 'markdown-it';
import type MarkdownIt from 'markdown-it';
import { commands, languages, workspace, Disposable, TextDocument, Uri, Diagnostic, Range, DiagnosticSeverity, Position, env, l10n } from 'vscode';
import { INormalizedVersion, normalizeVersion, parseVersion } from './extensionEngineValidation';
@@ -44,7 +44,7 @@ enum Context {
}
interface TokenAndPosition {
token: MarkdownItType.Token;
token: MarkdownIt.Token;
begin: number;
end: number;
}
@@ -67,7 +67,7 @@ export class ExtensionLinter {
private packageJsonQ = new Set<TextDocument>();
private readmeQ = new Set<TextDocument>();
private timer: NodeJS.Timeout | undefined;
private markdownIt: MarkdownItType.MarkdownIt | undefined;
private markdownIt: MarkdownIt | undefined;
private parse5: typeof import('parse5') | undefined;
constructor() {
@@ -292,7 +292,7 @@ export class ExtensionLinter {
this.markdownIt = new ((await import('markdown-it')).default);
}
const tokens = this.markdownIt.parse(text, {});
const tokensAndPositions: TokenAndPosition[] = (function toTokensAndPositions(this: ExtensionLinter, tokens: MarkdownItType.Token[], begin = 0, end = text.length): TokenAndPosition[] {
const tokensAndPositions: TokenAndPosition[] = (function toTokensAndPositions(this: ExtensionLinter, tokens: MarkdownIt.Token[], begin = 0, end = text.length): TokenAndPosition[] {
const tokensAndPositions = tokens.map<TokenAndPosition>(token => {
if (token.map) {
const tokenBegin = document.offsetAt(new Position(token.map[0], 0));
@@ -313,7 +313,7 @@ export class ExtensionLinter {
});
return tokensAndPositions.concat(
...tokensAndPositions.filter(tnp => tnp.token.children && tnp.token.children.length)
.map(tnp => toTokensAndPositions.call(this, tnp.token.children, tnp.begin, tnp.end))
.map(tnp => toTokensAndPositions.call(this, tnp.token.children ?? [], tnp.begin, tnp.end))
);
}).call(this, tokens);
@@ -373,7 +373,7 @@ export class ExtensionLinter {
}
}
private locateToken(text: string, begin: number, end: number, token: MarkdownItType.Token, content: string | null) {
private locateToken(text: string, begin: number, end: number, token: MarkdownIt.Token, content: string | null) {
if (content) {
const tokenBegin = text.indexOf(content, begin);
if (tokenBegin !== -1) {

View File

@@ -24,7 +24,7 @@ export function activate(_context: vscode.ExtensionContext) {
* actual WebSocket.
*/
class InitialManagedMessagePassing implements vscode.ManagedMessagePassing {
private readonly dataEmitter = new vscode.EventEmitter<Uint8Array>();
private readonly dataEmitter = new vscode.EventEmitter<Uint8Array<ArrayBuffer>>();
private readonly closeEmitter = new vscode.EventEmitter<Error | undefined>();
private readonly endEmitter = new vscode.EventEmitter<void>();
@@ -38,7 +38,7 @@ class InitialManagedMessagePassing implements vscode.ManagedMessagePassing {
public send(d: Uint8Array): void {
if (this._actual) {
// we already got the HTTP headers
this._actual.send(d);
this._actual.send(d as Uint8Array<ArrayBuffer>);
return;
}
@@ -80,7 +80,7 @@ class OpeningManagedMessagePassing {
private readonly socket: WebSocket;
private isOpen = false;
private bufferedData: Uint8Array[] = [];
private bufferedData: Uint8Array<ArrayBuffer>[] = [];
constructor(
url: URL,
@@ -119,7 +119,7 @@ class OpeningManagedMessagePassing {
});
}
public send(d: Uint8Array): void {
public send(d: Uint8Array<ArrayBuffer>): void {
if (!this.isOpen) {
this.bufferedData.push(d);
return;

View File

@@ -211,12 +211,12 @@ export function activate(context: vscode.ExtensionContext) {
console.log('Connecting via a managed authority');
return Promise.resolve(new vscode.ManagedResolvedAuthority(async () => {
const remoteSocket = net.createConnection({ port: serverAddr.port });
const dataEmitter = new vscode.EventEmitter<Uint8Array>();
const dataEmitter = new vscode.EventEmitter<Uint8Array<ArrayBuffer>>();
const closeEmitter = new vscode.EventEmitter<Error | undefined>();
const endEmitter = new vscode.EventEmitter<void>();
await new Promise((res, rej) => {
remoteSocket.on('data', d => dataEmitter.fire(d))
remoteSocket.on('data', d => dataEmitter.fire(d as Uint8Array<ArrayBuffer>))
.on('error', err => { rej(); closeEmitter.fire(err); })
.on('close', () => endEmitter.fire())
.on('end', () => endEmitter.fire())

72
package-lock.json generated
View File

@@ -83,7 +83,7 @@
"@types/yauzl": "^2.10.0",
"@types/yazl": "^2.4.2",
"@typescript-eslint/utils": "^8.45.0",
"@typescript/native-preview": "^7.0.0-dev.20260130",
"@typescript/native-preview": "^7.0.0-dev.20260306",
"@vscode/component-explorer": "^0.1.1-19",
"@vscode/component-explorer-cli": "^0.1.1-15",
"@vscode/gulp-electron": "1.40.1",
@@ -157,7 +157,7 @@
"ts-loader": "^9.5.1",
"tsec": "0.2.7",
"tslib": "^2.6.3",
"typescript": "^6.0.0-dev.20260130",
"typescript": "^6.0.0-dev.20260306",
"typescript-eslint": "^8.45.0",
"util": "^0.12.4",
"webpack": "^5.105.0",
@@ -3034,28 +3034,28 @@
}
},
"node_modules/@typescript/native-preview": {
"version": "7.0.0-dev.20260130.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20260130.1.tgz",
"integrity": "sha512-lvt9sECmBkrABxl3rMNRAX2unzhYcoNhlTyR7rOvbyM//QTXKUctVD7ByWBvk02et2caUUwIWq2vnygaeW8Mew==",
"version": "7.0.0-dev.20260306.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20260306.1.tgz",
"integrity": "sha512-4m7cOjtKu+iLazWW5MuJuI2ZZMkQkS42+GxN6FVdja1nL0t47l1wpaTnzUa1Ny9Xa0opIJ7psPAMBKYAPKbCKA==",
"dev": true,
"license": "Apache-2.0",
"bin": {
"tsgo": "bin/tsgo.js"
},
"optionalDependencies": {
"@typescript/native-preview-darwin-arm64": "7.0.0-dev.20260130.1",
"@typescript/native-preview-darwin-x64": "7.0.0-dev.20260130.1",
"@typescript/native-preview-linux-arm": "7.0.0-dev.20260130.1",
"@typescript/native-preview-linux-arm64": "7.0.0-dev.20260130.1",
"@typescript/native-preview-linux-x64": "7.0.0-dev.20260130.1",
"@typescript/native-preview-win32-arm64": "7.0.0-dev.20260130.1",
"@typescript/native-preview-win32-x64": "7.0.0-dev.20260130.1"
"@typescript/native-preview-darwin-arm64": "7.0.0-dev.20260306.1",
"@typescript/native-preview-darwin-x64": "7.0.0-dev.20260306.1",
"@typescript/native-preview-linux-arm": "7.0.0-dev.20260306.1",
"@typescript/native-preview-linux-arm64": "7.0.0-dev.20260306.1",
"@typescript/native-preview-linux-x64": "7.0.0-dev.20260306.1",
"@typescript/native-preview-win32-arm64": "7.0.0-dev.20260306.1",
"@typescript/native-preview-win32-x64": "7.0.0-dev.20260306.1"
}
},
"node_modules/@typescript/native-preview-darwin-arm64": {
"version": "7.0.0-dev.20260130.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260130.1.tgz",
"integrity": "sha512-Jo5kVoxaewKPn/3bKWyUB/gPR+Tjhj6isLc8VshV4OyFX4n6pkvVyk3ANivl7Kwmiv3WGKGUotbZ71DKCZATwA==",
"version": "7.0.0-dev.20260306.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260306.1.tgz",
"integrity": "sha512-4vuh4VlPydMS/nymDzjJIKDk3dntnEEB5UzyJV9mM4kxF5+geFgJih1DTtZS3qVafhHLB3e4l8omtvGftMnb8g==",
"cpu": [
"arm64"
],
@@ -3067,9 +3067,9 @@
]
},
"node_modules/@typescript/native-preview-darwin-x64": {
"version": "7.0.0-dev.20260130.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260130.1.tgz",
"integrity": "sha512-dR0fjdcLykfiDOIKjZMGqPBHVl9Dd/C+jFU43Wr3dcPFPFf1oVYsaWAZBSkTXnN9QP8i0/ZV+ZUr1gDjoi3x0Q==",
"version": "7.0.0-dev.20260306.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260306.1.tgz",
"integrity": "sha512-qxYfv0aM4KCZPEe584KIjT5sO4uR+xdyuQXX5tXbnH1UoksIz7bvJ9KUgRloS/q/ww0f8UjPS2+27LnRA4y7ig==",
"cpu": [
"x64"
],
@@ -3081,9 +3081,9 @@
]
},
"node_modules/@typescript/native-preview-linux-arm": {
"version": "7.0.0-dev.20260130.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260130.1.tgz",
"integrity": "sha512-wnx4bY/1u006U67fEkPtPVZ65VYMLgkFqOadGyrUxhtveR5WbbgFUuUBES0mPxvzS4ToZzn94jhcnAvN8VOTcA==",
"version": "7.0.0-dev.20260306.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260306.1.tgz",
"integrity": "sha512-8gRAFx0ExDWHOmphl8mzBrSoGWnLWDU4VpxkPRsWqaJpHVbjr9Yk2QkuJNIaDmF6q44eJmW/huSiObmHTbZ1UQ==",
"cpu": [
"arm"
],
@@ -3095,9 +3095,9 @@
]
},
"node_modules/@typescript/native-preview-linux-arm64": {
"version": "7.0.0-dev.20260130.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260130.1.tgz",
"integrity": "sha512-P/1YTpIiFd2pPtHt4sKEmUTaKf1xvuuiV0TvhQ7n2gDYskNjZ66iWCC9w7okjgsmWE9JLh/IRrNcb9FKVk3SHw==",
"version": "7.0.0-dev.20260306.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260306.1.tgz",
"integrity": "sha512-8G0BKvTkE+eKX1tSnyKeDaf3bWPWY7OI77SMipagCAyYi06v4gxx+IVE3Px7W7kLX2Wqp1MjWDXu2N76wfJtXQ==",
"cpu": [
"arm64"
],
@@ -3109,9 +3109,9 @@
]
},
"node_modules/@typescript/native-preview-linux-x64": {
"version": "7.0.0-dev.20260130.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260130.1.tgz",
"integrity": "sha512-OgHVjivuOS22WIZvIm+Pnm7yqFLwonkIrBOxRdew/pPwVGLQVSo+bQ+RocQDj2VFYxXcHs2yXwCk3PDmwLIYYg==",
"version": "7.0.0-dev.20260306.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260306.1.tgz",
"integrity": "sha512-rsJV3Z9J/zYCEtcqvm+WfLAml3i1OAyMEUn0hja7i8C0kzE+tXKXzsJ0+I1TrSU5O7hHvqlLTvueBoCoM4aL4g==",
"cpu": [
"x64"
],
@@ -3123,9 +3123,9 @@
]
},
"node_modules/@typescript/native-preview-win32-arm64": {
"version": "7.0.0-dev.20260130.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260130.1.tgz",
"integrity": "sha512-f/DUxQtIWkZq0eUjZHFmaSxterO/ccu1NxFk0L/Oqj7AfjWVDCqrLVgZJKjvwcG5TEb5AVt7GMUpGEAYZQiUvg==",
"version": "7.0.0-dev.20260306.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260306.1.tgz",
"integrity": "sha512-US1WsIu9IukaFzM+w8wt0fIAkmk2WtxeVuk8nkbrnH9S3ax39r0J4ikMNZSXEJE0VMxhXJoymzfWxhj3s9yW/Q==",
"cpu": [
"arm64"
],
@@ -3137,9 +3137,9 @@
]
},
"node_modules/@typescript/native-preview-win32-x64": {
"version": "7.0.0-dev.20260130.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260130.1.tgz",
"integrity": "sha512-Isr051Cq8RbXOUMYYmwLYw8yBGaEG/Zp0sp7HNeYhVVkc3/3KeveEqCk29q1QRwiBr7HnApdzJP7f+lSZk8gmg==",
"version": "7.0.0-dev.20260306.1",
"resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260306.1.tgz",
"integrity": "sha512-MlneT0RWS9Zdb8XoWvHsUgmnMJu6K3S0BXRu5ZgUYjcbQKlkz+Z87aUB8eX8qnDFd9csJcMp3+ZrgQ/LKVGP1g==",
"cpu": [
"x64"
],
@@ -19702,9 +19702,9 @@
"dev": true
},
"node_modules/typescript": {
"version": "6.0.0-dev.20260130",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.0-dev.20260130.tgz",
"integrity": "sha512-flWwLX5Xzh7to9d46u3LXfVDq9F0L0FtgnsYcx/SksqP05uHBIPnWfB6wWOZphTkb7GRSRKU13X/zBHmbzhXXg==",
"version": "6.0.0-dev.20260306",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.0-dev.20260306.tgz",
"integrity": "sha512-ssxgK3/0yA2LEW23KzSNtnqSL9zDaVGTesx2S3EN+v8kqkPScFTin7S63KfQ4UDZGZGcvBgHCEoEz7t7v2yR8Q==",
"dev": true,
"license": "Apache-2.0",
"bin": {

View File

@@ -153,7 +153,7 @@
"@types/yauzl": "^2.10.0",
"@types/yazl": "^2.4.2",
"@typescript-eslint/utils": "^8.45.0",
"@typescript/native-preview": "^7.0.0-dev.20260130",
"@typescript/native-preview": "^7.0.0-dev.20260306",
"@vscode/component-explorer": "^0.1.1-19",
"@vscode/component-explorer-cli": "^0.1.1-15",
"@vscode/gulp-electron": "1.40.1",
@@ -227,7 +227,7 @@
"ts-loader": "^9.5.1",
"tsec": "0.2.7",
"tslib": "^2.6.3",
"typescript": "^6.0.0-dev.20260130",
"typescript": "^6.0.0-dev.20260306",
"typescript-eslint": "^8.45.0",
"util": "^0.12.4",
"webpack": "^5.105.0",

View File

@@ -1,7 +1,7 @@
{
"compilerOptions": {
"noEmit": true,
"module": "None",
"module": "preserve",
"experimentalDecorators": false,
"noImplicitReturns": true,
"noImplicitOverride": true,

View File

@@ -826,7 +826,7 @@ export class SelectedSuggestionInfo {
) {
}
public equals(other: SelectedSuggestionInfo) {
public equals(other: SelectedSuggestionInfo): boolean {
return Range.lift(this.range).equalsRange(other.range)
&& this.text === other.text
&& this.completionKind === other.completionKind

6
src/vs/monaco.d.ts vendored
View File

@@ -5263,7 +5263,7 @@ declare namespace monaco.editor {
export const EditorOptions: {
acceptSuggestionOnCommitCharacter: IEditorOption<EditorOption.acceptSuggestionOnCommitCharacter, boolean>;
acceptSuggestionOnEnter: IEditorOption<EditorOption.acceptSuggestionOnEnter, 'on' | 'off' | 'smart'>;
accessibilitySupport: IEditorOption<EditorOption.accessibilitySupport, AccessibilitySupport>;
accessibilitySupport: IEditorOption<EditorOption.accessibilitySupport, any>;
accessibilityPageSize: IEditorOption<EditorOption.accessibilityPageSize, number>;
allowOverflow: IEditorOption<EditorOption.allowOverflow, boolean>;
allowVariableLineHeights: IEditorOption<EditorOption.allowVariableLineHeights, boolean>;
@@ -5326,7 +5326,7 @@ declare namespace monaco.editor {
foldingMaximumRegions: IEditorOption<EditorOption.foldingMaximumRegions, number>;
unfoldOnClickAfterEndOfLine: IEditorOption<EditorOption.unfoldOnClickAfterEndOfLine, boolean>;
fontFamily: IEditorOption<EditorOption.fontFamily, string>;
fontInfo: IEditorOption<EditorOption.fontInfo, FontInfo>;
fontInfo: IEditorOption<EditorOption.fontInfo, any>;
fontLigatures2: IEditorOption<EditorOption.fontLigatures, string>;
fontSize: IEditorOption<EditorOption.fontSize, number>;
fontWeight: IEditorOption<EditorOption.fontWeight, string>;
@@ -5366,7 +5366,7 @@ declare namespace monaco.editor {
pasteAs: IEditorOption<EditorOption.pasteAs, Readonly<Required<IPasteAsOptions>>>;
parameterHints: IEditorOption<EditorOption.parameterHints, Readonly<Required<IEditorParameterHintOptions>>>;
peekWidgetDefaultFocus: IEditorOption<EditorOption.peekWidgetDefaultFocus, 'tree' | 'editor'>;
placeholder: IEditorOption<EditorOption.placeholder, string>;
placeholder: IEditorOption<EditorOption.placeholder, string | undefined>;
definitionLinkOpensInPeek: IEditorOption<EditorOption.definitionLinkOpensInPeek, boolean>;
quickSuggestions: IEditorOption<EditorOption.quickSuggestions, InternalQuickSuggestionsOptions>;
quickSuggestionsDelay: IEditorOption<EditorOption.quickSuggestionsDelay, number>;

View File

@@ -43,7 +43,7 @@ export interface IWebSocket {
readonly onError: Event<unknown>;
traceSocketEvent?(type: SocketDiagnosticsEventType, data?: VSBuffer | Uint8Array | ArrayBuffer | ArrayBufferView | unknown): void;
send(data: ArrayBuffer | ArrayBufferView): void;
send(data: ArrayBuffer | ArrayBufferView<ArrayBuffer>): void;
close(): void;
}
@@ -182,7 +182,7 @@ class BrowserWebSocket extends Disposable implements IWebSocket {
}));
}
send(data: ArrayBuffer | ArrayBufferView): void {
send(data: ArrayBuffer | ArrayBufferView<ArrayBuffer>): void {
if (this._isClosed) {
// Refuse to write data to closed WebSocket...
return;
@@ -254,7 +254,7 @@ class BrowserSocket implements ISocket {
}
public write(buffer: VSBuffer): void {
this.socket.send(buffer.buffer);
this.socket.send(buffer.buffer as Uint8Array<ArrayBuffer>);
}
public end(): void {

View File

@@ -9,6 +9,9 @@
"sourceMap": true,
"skipLibCheck": true,
"declaration": true,
"types": [
"mocha"
],
"lib": [
"esnext", // for #201187
"dom"