Don't indirect through _namespaces in tsserver/typingsInstaller (microsoft#57829)

jakebailey · web-flow · commit dc113f8170bc · 2024-03-20T16:41:05.000-07:00
diff --git a/src/tsserver/_namespaces/ts.ts b/src/tsserver/_namespaces/ts.ts
diff --git 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
@@ -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
@@ -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
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as ts from "./_namespaces/ts";`
	`1`	`+import * as ts from "../typescript/typescript";`
`2`	`2`
`3`	`3`	`/** @internal */`
`4`	`4`	`export function getLogLevel(level: string \| undefined) {`