From d97bb67c0a52b5a48067c7ada1d1a587b3d36d39 Mon Sep 17 00:00:00 2001
From: TypeScript Bot <ts_bot@rcavanaugh.com>
Date: Tue, 14 Mar 2023 14:15:54 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#53174=20(Remove=20o?=
 =?UTF-8?q?ld=20references=20to=20Node=20v4,=20s...)=20into=20release-5.0?=
 =?UTF-8?q?=20(#53189)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
---
 src/compiler/sys.ts                           | 19 +------------------
 src/tsserver/nodeServer.ts                    |  5 +----
 src/tsserver/server.ts                        |  3 +--
 .../reference/api/tsserverlibrary.d.ts        |  1 -
 tests/baselines/reference/api/typescript.d.ts |  1 -
 5 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 7efb312fadc51..21418f24574e0 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.
 // eslint-disable-next-line prefer-const
 export let sys: System = (() => {
@@ -1493,8 +1478,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();
@@ -1508,7 +1491,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();
 
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();
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index f23fc06fcc24a..c77ba617e3617 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -8286,7 +8286,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 4b06d971712f5..374e65ab49e59 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -4311,7 +4311,6 @@ declare namespace ts {
         negative: boolean;
         base10Value: string;
     }
-    function getNodeMajorVersion(): number | undefined;
     enum FileWatcherEventKind {
         Created = 0,
         Changed = 1,