From 75db9eb5095097daab33ecfbfc809f94a85ca284 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Wed, 22 Jan 2025 08:37:06 -0800
Subject: [PATCH] Remove paths from tsconfig.base.json

---
 src/bootstrap-window.ts                                   | 6 +++---
 src/tsconfig.base.json                                    | 6 ------
 src/vs/base/parts/sandbox/electron-sandbox/preload.ts     | 2 +-
 .../electron-sandbox/processExplorer/processExplorer.ts   | 6 +++---
 src/vs/code/electron-sandbox/workbench/workbench.ts       | 8 ++++----
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/bootstrap-window.ts b/src/bootstrap-window.ts
index 3c127002603..2f6c296a3ae 100644
--- a/src/bootstrap-window.ts
+++ b/src/bootstrap-window.ts
@@ -5,9 +5,9 @@
 
 (function () {
 
-	type ISandboxConfiguration = import('vs/base/parts/sandbox/common/sandboxTypes.js').ISandboxConfiguration;
-	type ILoadResult<M, T extends ISandboxConfiguration> = import('vs/platform/window/electron-sandbox/window.js').ILoadResult<M, T>;
-	type ILoadOptions<T extends ISandboxConfiguration> = import('vs/platform/window/electron-sandbox/window.js').ILoadOptions<T>;
+	type ISandboxConfiguration = import('./vs/base/parts/sandbox/common/sandboxTypes.js').ISandboxConfiguration;
+	type ILoadResult<M, T extends ISandboxConfiguration> = import('./vs/platform/window/electron-sandbox/window.js').ILoadResult<M, T>;
+	type ILoadOptions<T extends ISandboxConfiguration> = import('./vs/platform/window/electron-sandbox/window.js').ILoadOptions<T>;
 	type IMainWindowSandboxGlobals = import('./vs/base/parts/sandbox/electron-sandbox/globals.js').IMainWindowSandboxGlobals;
 
 	const preloadGlobals: IMainWindowSandboxGlobals = (window as any).vscode; // defined by preload.ts
diff --git a/src/tsconfig.base.json b/src/tsconfig.base.json
index fc5247fab0c..e354b0ed463 100644
--- a/src/tsconfig.base.json
+++ b/src/tsconfig.base.json
@@ -12,12 +12,6 @@
 		"exactOptionalPropertyTypes": false,
 		"useUnknownInCatchVariables": false,
 		"forceConsistentCasingInFileNames": true,
-		"baseUrl": ".",
-		"paths": {
-			"vs/*": [
-				"./vs/*"
-			]
-		},
 		"target": "es2022",
 		"useDefineForClassFields": false,
 		"lib": [
diff --git a/src/vs/base/parts/sandbox/electron-sandbox/preload.ts b/src/vs/base/parts/sandbox/electron-sandbox/preload.ts
index ba5476ffb2c..7ff6c24d2c7 100644
--- a/src/vs/base/parts/sandbox/electron-sandbox/preload.ts
+++ b/src/vs/base/parts/sandbox/electron-sandbox/preload.ts
@@ -9,7 +9,7 @@
 
 	const { ipcRenderer, webFrame, contextBridge, webUtils } = require('electron');
 
-	type ISandboxConfiguration = import('vs/base/parts/sandbox/common/sandboxTypes.js').ISandboxConfiguration;
+	type ISandboxConfiguration = import('../common/sandboxTypes.js').ISandboxConfiguration;
 
 	//#region Utilities
 
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.ts b/src/vs/code/electron-sandbox/processExplorer/processExplorer.ts
index 35db4812515..17be24c02f0 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.ts
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.ts
@@ -7,9 +7,9 @@
 
 (async function () {
 
-	type IBootstrapWindow = import('vs/platform/window/electron-sandbox/window.js').IBootstrapWindow;
-	type IProcessExplorerMain = import('vs/code/electron-sandbox/processExplorer/processExplorerMain.js').IProcessExplorerMain;
-	type ProcessExplorerWindowConfiguration = import('vs/platform/process/common/process.js').ProcessExplorerWindowConfiguration;
+	type IBootstrapWindow = import('../../../platform/window/electron-sandbox/window.js').IBootstrapWindow;
+	type IProcessExplorerMain = import('./processExplorerMain.js').IProcessExplorerMain;
+	type ProcessExplorerWindowConfiguration = import('../../../platform/process/common/process.js').ProcessExplorerWindowConfiguration;
 
 	const bootstrapWindow: IBootstrapWindow = (window as any).MonacoBootstrapWindow; // defined by bootstrap-window.ts
 
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.ts b/src/vs/code/electron-sandbox/workbench/workbench.ts
index daddd15eb07..833f8118d7a 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.ts
+++ b/src/vs/code/electron-sandbox/workbench/workbench.ts
@@ -10,10 +10,10 @@
 	// Add a perf entry right from the top
 	performance.mark('code/didStartRenderer');
 
-	type INativeWindowConfiguration = import('vs/platform/window/common/window.ts').INativeWindowConfiguration;
-	type IBootstrapWindow = import('vs/platform/window/electron-sandbox/window.js').IBootstrapWindow;
-	type IMainWindowSandboxGlobals = import('vs/base/parts/sandbox/electron-sandbox/globals.js').IMainWindowSandboxGlobals;
-	type IDesktopMain = import('vs/workbench/electron-sandbox/desktop.main.js').IDesktopMain;
+	type INativeWindowConfiguration = import('../../../platform/window/common/window.ts').INativeWindowConfiguration;
+	type IBootstrapWindow = import('../../../platform/window/electron-sandbox/window.js').IBootstrapWindow;
+	type IMainWindowSandboxGlobals = import('../../../base/parts/sandbox/electron-sandbox/globals.js').IMainWindowSandboxGlobals;
+	type IDesktopMain = import('../../../workbench/electron-sandbox/desktop.main.js').IDesktopMain;
 
 	const bootstrapWindow: IBootstrapWindow = (window as any).MonacoBootstrapWindow; 	// defined by bootstrap-window.ts
 	const preloadGlobals: IMainWindowSandboxGlobals = (window as any).vscode; 			// defined by preload.ts