diff --git a/package-lock.json b/package-lock.json index 5f2b14c3e3973..ac46ac9d1147a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "v8-inspect-profiler": "^0.1.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", - "vscode-textmate": "9.1.0", + "vscode-textmate": "9.2.0", "yauzl": "^3.0.0", "yazl": "^2.4.3" }, @@ -18248,9 +18248,10 @@ } }, "node_modules/vscode-textmate": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.1.0.tgz", - "integrity": "sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA==" + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.2.0.tgz", + "integrity": "sha512-rkvG4SraZQaPSN/5XjwKswdU0OP9MF28QjrYzUBbhb8QyG3ljB1Ky996m++jiI7KdiAP2CkBiQZd9pqEDTClqA==", + "license": "MIT" }, "node_modules/vscode-uri": { "version": "3.0.8", diff --git a/package.json b/package.json index 3316ae225ea89..3ccd7b2528624 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "v8-inspect-profiler": "^0.1.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", - "vscode-textmate": "9.1.0", + "vscode-textmate": "9.2.0", "yauzl": "^3.0.0", "yazl": "^2.4.3" }, diff --git a/remote/package-lock.json b/remote/package-lock.json index 3cf2293986152..71119e97cf668 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -40,7 +40,7 @@ "tas-client-umd": "0.2.0", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", - "vscode-textmate": "9.1.0", + "vscode-textmate": "9.2.0", "yauzl": "^3.0.0", "yazl": "^2.4.3" } @@ -1447,9 +1447,10 @@ } }, "node_modules/vscode-textmate": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.1.0.tgz", - "integrity": "sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA==" + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.2.0.tgz", + "integrity": "sha512-rkvG4SraZQaPSN/5XjwKswdU0OP9MF28QjrYzUBbhb8QyG3ljB1Ky996m++jiI7KdiAP2CkBiQZd9pqEDTClqA==", + "license": "MIT" }, "node_modules/wrappy": { "version": "1.0.2", diff --git a/remote/package.json b/remote/package.json index 5a61a15c0513c..26c002943e69f 100644 --- a/remote/package.json +++ b/remote/package.json @@ -35,7 +35,7 @@ "tas-client-umd": "0.2.0", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", - "vscode-textmate": "9.1.0", + "vscode-textmate": "9.2.0", "yauzl": "^3.0.0", "yazl": "^2.4.3" }, diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json index 3e45e62a14dc7..4d27bc8a29cd4 100644 --- a/remote/web/package-lock.json +++ b/remote/web/package-lock.json @@ -24,7 +24,7 @@ "jschardet": "3.1.4", "tas-client-umd": "0.2.0", "vscode-oniguruma": "1.7.0", - "vscode-textmate": "9.1.0" + "vscode-textmate": "9.2.0" } }, "node_modules/@microsoft/1ds-core-js": { @@ -266,9 +266,10 @@ "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==" }, "node_modules/vscode-textmate": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.1.0.tgz", - "integrity": "sha512-lxKSVp2DkFOx9RDAvpiYUrB9/KT1fAfi1aE8CBGstP8N7rLF+Seifj8kDA198X0mYj1CjQUC+81+nQf8CO0nVA==" + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.2.0.tgz", + "integrity": "sha512-rkvG4SraZQaPSN/5XjwKswdU0OP9MF28QjrYzUBbhb8QyG3ljB1Ky996m++jiI7KdiAP2CkBiQZd9pqEDTClqA==", + "license": "MIT" }, "node_modules/yallist": { "version": "4.0.0", diff --git a/remote/web/package.json b/remote/web/package.json index 8c1decd65bba7..3bd5d4a937dd4 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -19,6 +19,6 @@ "jschardet": "3.1.4", "tas-client-umd": "0.2.0", "vscode-oniguruma": "1.7.0", - "vscode-textmate": "9.1.0" + "vscode-textmate": "9.2.0" } } diff --git a/src/bootstrap-node.ts b/src/bootstrap-node.ts index c0d5cd3693cfe..1f4b3a2f6a608 100644 --- a/src/bootstrap-node.ts +++ b/src/bootstrap-node.ts @@ -7,7 +7,7 @@ import * as path from 'path'; import * as fs from 'fs'; import { fileURLToPath } from 'url'; import { createRequire } from 'node:module'; -import type { IProductConfiguration } from './vs/base/common/product'; +import type { IProductConfiguration } from './vs/base/common/product.js'; const require = createRequire(import.meta.url); const __dirname = path.dirname(fileURLToPath(import.meta.url)); diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json index 9c7aacd4f11b0..a817569101c91 100644 --- a/src/tsconfig.base.json +++ b/src/tsconfig.base.json @@ -1,7 +1,7 @@ { "compilerOptions": { "module": "es2022", - "moduleResolution": "node", + "moduleResolution": "nodenext", "experimentalDecorators": true, "noImplicitReturns": true, "noImplicitOverride": true, @@ -27,4 +27,4 @@ ], "allowSyntheticDefaultImports": true } -} \ No newline at end of file +} diff --git a/src/tsconfig.tsec.json b/src/tsconfig.tsec.json index d822b0a4e8979..64550458ab70f 100644 --- a/src/tsconfig.tsec.json +++ b/src/tsconfig.tsec.json @@ -2,6 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "noEmit": true, + "skipLibCheck": true, "plugins": [ { "name": "tsec", diff --git a/src/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts index 7efb786c7630c..59a0dadcb7d87 100644 --- a/src/vs/platform/telemetry/common/1dsAppender.ts +++ b/src/vs/platform/telemetry/common/1dsAppender.ts @@ -57,7 +57,7 @@ async function getClient(instrumentationKey: string, addInternalFlag?: boolean, appInsightsCore.initialize(coreConfig, []); - appInsightsCore.addTelemetryInitializer((envelope) => { + appInsightsCore.addTelemetryInitializer((envelope: any) => { // Opt the user out of 1DS data sharing envelope['ext'] = envelope['ext'] ?? {}; envelope['ext']['web'] = envelope['ext']['web'] ?? {}; diff --git a/src/vs/platform/telemetry/node/1dsAppender.ts b/src/vs/platform/telemetry/node/1dsAppender.ts index 08be57db219fc..fe271ec428da0 100644 --- a/src/vs/platform/telemetry/node/1dsAppender.ts +++ b/src/vs/platform/telemetry/node/1dsAppender.ts @@ -105,7 +105,7 @@ export class OneDataSystemAppender extends AbstractOneDataSystemAppender { ) { // Override the way events get sent since node doesn't have XHTMLRequest const customHttpXHROverride: IXHROverride = { - sendPOST: (payload: IPayloadData, oncomplete) => { + sendPOST: (payload: IPayloadData, oncomplete: OnCompleteFunc) => { // Fire off the async request without awaiting it sendPostAsync(requestService, payload, oncomplete); } diff --git a/src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts b/src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts index dde553ec05724..d04a15e1c6723 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewMessages.d.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { IMouseWheelEvent } from 'vs/base/browser/mouseEvent'; -import type { WebviewStyles } from 'vs/workbench/contrib/webview/browser/webview'; +import type { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.ts'; +import type { WebviewStyles } from './webview.ts'; type KeyEvent = { key: string;