From 16a8abd5e35589385accf7deb18ddaff9e059d0f Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Wed, 8 Mar 2023 20:32:20 -0800 Subject: [PATCH 1/3] Remove old references to Node v4 --- src/compiler/sys.ts | 4 +--- src/tsserver/nodeServer.ts | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index df9221e20ab6e..c429a7b23de35 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -1492,8 +1492,6 @@ export let sys: System = (() => { from?(input: string, encoding?: string): any; } = require("buffer").Buffer; - const nodeVersion = getNodeMajorVersion(); - const isNode4OrLater = nodeVersion! >= 4; const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin"; const platform: string = _os.platform(); @@ -1507,7 +1505,7 @@ export let sys: System = (() => { // Note that if we ever emit as files like cjs/mjs, this check will be wrong. const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename; - const fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin"); + const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin"; const getCurrentDirectory = memoize(() => process.cwd()); const { watchFile, watchDirectory } = createSystemWatchFunctions({ pollingWatchFileWorker: fsWatchFileWorker, diff --git a/src/tsserver/nodeServer.ts b/src/tsserver/nodeServer.ts index a3c65bec0c245..bba46b325be81 100644 --- a/src/tsserver/nodeServer.ts +++ b/src/tsserver/nodeServer.ts @@ -11,7 +11,6 @@ import { DirectoryWatcherCallback, FileWatcher, getDirectoryPath, - getNodeMajorVersion, getRootLength, JsTyping, LanguageServiceMode, @@ -299,9 +298,7 @@ export function initializeNodeSystem(): StartInput { const libDirectory = getDirectoryPath(normalizePath(sys.getExecutingFilePath())); - const nodeVersion = getNodeMajorVersion(); - // use watchGuard process on Windows when node version is 4 or later - const useWatchGuard = process.platform === "win32" && nodeVersion! >= 4; + const useWatchGuard = process.platform === "win32"; const originalWatchDirectory: ServerHost["watchDirectory"] = sys.watchDirectory.bind(sys); const logger = createLogger(); From 5a628109527eb2d3a397d41975e087c5888069f9 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Wed, 8 Mar 2023 20:39:19 -0800 Subject: [PATCH 2/3] Remove function only used for logging --- src/compiler/sys.ts | 15 --------------- src/tsserver/server.ts | 3 +-- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index c429a7b23de35..547bcd680a01c 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -1449,21 +1449,6 @@ declare const global: any; declare const __filename: string; declare const __dirname: string; -export function getNodeMajorVersion(): number | undefined { - if (typeof process === "undefined") { - return undefined; - } - const version: string = process.version; - if (!version) { - return undefined; - } - const dot = version.indexOf("."); - if (dot === -1) { - return undefined; - } - return parseInt(version.substring(1, dot)); -} - // TODO: GH#18217 this is used as if it's certainly defined in many places. export let sys: System = (() => { // NodeJS detects "\uFEFF" at the start of the string and *replaces* it with the actual diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts index 38dc43c224479..f752178022f08 100644 --- a/src/tsserver/server.ts +++ b/src/tsserver/server.ts @@ -1,6 +1,5 @@ import { Debug, - getNodeMajorVersion, setStackTraceLimit, sys, version, @@ -30,7 +29,7 @@ function start({ args, logger, cancellationToken, serverMode, unknownServerMode, logger.info(`Starting TS Server`); logger.info(`Version: ${version}`); logger.info(`Arguments: ${args.join(" ")}`); - logger.info(`Platform: ${platform} NodeVersion: ${getNodeMajorVersion()} CaseSensitive: ${sys.useCaseSensitiveFileNames}`); + logger.info(`Platform: ${platform} NodeVersion: ${process.version} CaseSensitive: ${sys.useCaseSensitiveFileNames}`); logger.info(`ServerMode: ${serverMode} hasUnknownServerMode: ${unknownServerMode}`); setStackTraceLimit(); From 036e5687ed07af00e958783ad1275569f9a77cb5 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Wed, 8 Mar 2023 21:04:15 -0800 Subject: [PATCH 3/3] Update baselines (this was public???) --- tests/baselines/reference/api/tsserverlibrary.d.ts | 1 - tests/baselines/reference/api/typescript.d.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index b8a37c275ff07..44b2efdcbfdfb 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -8285,7 +8285,6 @@ declare namespace ts { negative: boolean; base10Value: string; } - function getNodeMajorVersion(): number | undefined; enum FileWatcherEventKind { Created = 0, Changed = 1, diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index c6481e4bf67b9..d3f3c6897e489 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4342,7 +4342,6 @@ declare namespace ts { negative: boolean; base10Value: string; } - function getNodeMajorVersion(): number | undefined; enum FileWatcherEventKind { Created = 0, Changed = 1,