Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃 Pick PR #53174 (Remove old references to Node v4, s...) into release-5.0 #53189

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 1 addition & 18 deletions src/compiler/sys.ts
Expand Up @@ -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 = (() => {
Expand Down Expand Up @@ -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();
Expand All @@ -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,
Expand Down
5 changes: 1 addition & 4 deletions src/tsserver/nodeServer.ts
Expand Up @@ -11,7 +11,6 @@ import {
DirectoryWatcherCallback,
FileWatcher,
getDirectoryPath,
getNodeMajorVersion,
getRootLength,
JsTyping,
LanguageServiceMode,
Expand Down Expand Up @@ -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();

Expand Down
3 changes: 1 addition & 2 deletions src/tsserver/server.ts
@@ -1,6 +1,5 @@
import {
Debug,
getNodeMajorVersion,
setStackTraceLimit,
sys,
version,
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion tests/baselines/reference/api/tsserverlibrary.d.ts
Expand Up @@ -8280,7 +8280,6 @@ declare namespace ts {
negative: boolean;
base10Value: string;
}
function getNodeMajorVersion(): number | undefined;
enum FileWatcherEventKind {
Created = 0,
Changed = 1,
Expand Down
1 change: 0 additions & 1 deletion tests/baselines/reference/api/typescript.d.ts
Expand Up @@ -4305,7 +4305,6 @@ declare namespace ts {
negative: boolean;
base10Value: string;
}
function getNodeMajorVersion(): number | undefined;
enum FileWatcherEventKind {
Created = 0,
Changed = 1,
Expand Down