diff --git a/package-lock.json b/package-lock.json
index fd395ebd432..65396691394 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 eb0abcc3221..8af17f6ef37 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/src/bootstrap-node.ts b/src/bootstrap-node.ts
index c0d5cd3693c..0fcd81f9a62 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.ts';
 
 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 9c7aacd4f11..a817569101c 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/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts
index 7efb786c763..59a0dadcb7d 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 08be57db219..fe271ec428d 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 dde553ec057..d04a15e1c67 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;