From 82a1f32429d4a2bd5a9c88149934a96c61a6cbf5 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Mon, 18 Mar 2024 08:26:30 -0700
Subject: [PATCH] Don't indirect through _namespaces in
 tsserver/typingsInstaller

---
 src/tsserver/_namespaces/ts.ts               | 1 -
 src/tsserver/common.ts                       | 2 +-
 src/tsserver/nodeServer.ts                   | 4 ++--
 src/tsserver/server.ts                       | 2 +-
 src/typingsInstaller/_namespaces/ts.ts       | 1 -
 src/typingsInstaller/nodeTypingsInstaller.ts | 4 ++--
 6 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 src/tsserver/_namespaces/ts.ts
 delete mode 100644 src/typingsInstaller/_namespaces/ts.ts

diff --git a/src/tsserver/_namespaces/ts.ts b/src/tsserver/_namespaces/ts.ts
deleted file mode 100644
index 205e6849694b0..0000000000000
--- a/src/tsserver/_namespaces/ts.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../typescript/typescript";
diff --git a/src/tsserver/common.ts b/src/tsserver/common.ts
index 3a973486cbd73..bdf6ca2a17ea0 100644
--- a/src/tsserver/common.ts
+++ b/src/tsserver/common.ts
@@ -1,4 +1,4 @@
-import * as ts from "./_namespaces/ts";
+import * as ts from "../typescript/typescript";
 
 /** @internal */
 export function getLogLevel(level: string | undefined) {
diff --git a/src/tsserver/nodeServer.ts b/src/tsserver/nodeServer.ts
index 09ad7a88f830e..8859225b5e00e 100644
--- a/src/tsserver/nodeServer.ts
+++ b/src/tsserver/nodeServer.ts
@@ -23,8 +23,8 @@ import {
     validateLocaleAndSetLanguage,
     versionMajorMinor,
     WatchOptions,
-} from "./_namespaces/ts";
-import * as ts from "./_namespaces/ts";
+} from "../typescript/typescript";
+import * as ts from "../typescript/typescript";
 import {
     getLogLevel,
     StartInput,
diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts
index bcd6f78d84e5b..a7966729aad97 100644
--- a/src/tsserver/server.ts
+++ b/src/tsserver/server.ts
@@ -1,4 +1,4 @@
-import * as ts from "./_namespaces/ts";
+import * as ts from "../typescript/typescript";
 import {
     StartInput,
 } from "./common";
diff --git a/src/typingsInstaller/_namespaces/ts.ts b/src/typingsInstaller/_namespaces/ts.ts
deleted file mode 100644
index 205e6849694b0..0000000000000
--- a/src/typingsInstaller/_namespaces/ts.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "../../typescript/typescript";
diff --git a/src/typingsInstaller/nodeTypingsInstaller.ts b/src/typingsInstaller/nodeTypingsInstaller.ts
index 4846a1e40d30c..7fb5b38e73367 100644
--- a/src/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/typingsInstaller/nodeTypingsInstaller.ts
@@ -11,8 +11,8 @@ import {
     sys,
     toPath,
     version,
-} from "./_namespaces/ts";
-import * as ts from "./_namespaces/ts";
+} from "../typescript/typescript";
+import * as ts from "../typescript/typescript";
 
 class FileLog implements ts.server.typingsInstaller.Log {
     constructor(private logFile: string | undefined) {