Skip to content

Commit ea8723d

Browse files
jakebaileytypescript-bot
authored andcommitted
Cherry-pick PR microsoft#53174 into release-5.0
Component commits: 16a8abd Remove old references to Node v4 5a62810 Remove function only used for logging 036e568 Update baselines (this was public???)
1 parent f7f44da commit ea8723d

File tree

5 files changed

+3
-26
lines changed

5 files changed

+3
-26
lines changed

src/compiler/sys.ts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,21 +1449,6 @@ declare const global: any;
14491449
declare const __filename: string;
14501450
declare const __dirname: string;
14511451

1452-
export function getNodeMajorVersion(): number | undefined {
1453-
if (typeof process === "undefined") {
1454-
return undefined;
1455-
}
1456-
const version: string = process.version;
1457-
if (!version) {
1458-
return undefined;
1459-
}
1460-
const dot = version.indexOf(".");
1461-
if (dot === -1) {
1462-
return undefined;
1463-
}
1464-
return parseInt(version.substring(1, dot));
1465-
}
1466-
14671452
// TODO: GH#18217 this is used as if it's certainly defined in many places.
14681453
// eslint-disable-next-line prefer-const
14691454
export let sys: System = (() => {
@@ -1493,8 +1478,6 @@ export let sys: System = (() => {
14931478
from?(input: string, encoding?: string): any;
14941479
} = require("buffer").Buffer;
14951480

1496-
const nodeVersion = getNodeMajorVersion();
1497-
const isNode4OrLater = nodeVersion! >= 4;
14981481
const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
14991482

15001483
const platform: string = _os.platform();
@@ -1508,7 +1491,7 @@ export let sys: System = (() => {
15081491
// Note that if we ever emit as files like cjs/mjs, this check will be wrong.
15091492
const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
15101493

1511-
const fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
1494+
const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
15121495
const getCurrentDirectory = memoize(() => process.cwd());
15131496
const { watchFile, watchDirectory } = createSystemWatchFunctions({
15141497
pollingWatchFileWorker: fsWatchFileWorker,

src/tsserver/nodeServer.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
DirectoryWatcherCallback,
1212
FileWatcher,
1313
getDirectoryPath,
14-
getNodeMajorVersion,
1514
getRootLength,
1615
JsTyping,
1716
LanguageServiceMode,
@@ -299,9 +298,7 @@ export function initializeNodeSystem(): StartInput {
299298

300299
const libDirectory = getDirectoryPath(normalizePath(sys.getExecutingFilePath()));
301300

302-
const nodeVersion = getNodeMajorVersion();
303-
// use watchGuard process on Windows when node version is 4 or later
304-
const useWatchGuard = process.platform === "win32" && nodeVersion! >= 4;
301+
const useWatchGuard = process.platform === "win32";
305302
const originalWatchDirectory: ServerHost["watchDirectory"] = sys.watchDirectory.bind(sys);
306303
const logger = createLogger();
307304

src/tsserver/server.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {
22
Debug,
3-
getNodeMajorVersion,
43
setStackTraceLimit,
54
sys,
65
version,
@@ -30,7 +29,7 @@ function start({ args, logger, cancellationToken, serverMode, unknownServerMode,
3029
logger.info(`Starting TS Server`);
3130
logger.info(`Version: ${version}`);
3231
logger.info(`Arguments: ${args.join(" ")}`);
33-
logger.info(`Platform: ${platform} NodeVersion: ${getNodeMajorVersion()} CaseSensitive: ${sys.useCaseSensitiveFileNames}`);
32+
logger.info(`Platform: ${platform} NodeVersion: ${process.version} CaseSensitive: ${sys.useCaseSensitiveFileNames}`);
3433
logger.info(`ServerMode: ${serverMode} hasUnknownServerMode: ${unknownServerMode}`);
3534

3635
setStackTraceLimit();

tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8280,7 +8280,6 @@ declare namespace ts {
82808280
negative: boolean;
82818281
base10Value: string;
82828282
}
8283-
function getNodeMajorVersion(): number | undefined;
82848283
enum FileWatcherEventKind {
82858284
Created = 0,
82868285
Changed = 1,

tests/baselines/reference/api/typescript.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4305,7 +4305,6 @@ declare namespace ts {
43054305
negative: boolean;
43064306
base10Value: string;
43074307
}
4308-
function getNodeMajorVersion(): number | undefined;
43094308
enum FileWatcherEventKind {
43104309
Created = 0,
43114310
Changed = 1,

0 commit comments

Comments
 (0)