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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Remove old references to Node v4, small cleanup of node version stuff #53174

Merged
merged 3 commits into from Mar 9, 2023
Merged

Remove old references to Node v4, small cleanup of node version stuff #53174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16a8abd
Remove old references to Node v4
jakebailey Mar 9, 2023
5a62810
Remove function only used for logging
jakebailey Mar 9, 2023
036e568
Update baselines (this was public???)
jakebailey Mar 9, 2023
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
View file
Open in desktop
Expand Up @@ -1449,21 +1449,6 @@ declare const global: any;
declare const __filename: string;
declare const __dirname: string;

export function getNodeMajorVersion(): number | undefined {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could leave this, but, it's always going to be in the git history.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, this was public. Why?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider cherry-picking to release-5.0?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole PR? Or should I just make the function internal so it looks like it's going away?

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
Expand Down Expand Up @@ -1492,8 +1477,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 @@ -1507,7 +1490,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
View file
Open in desktop
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
View file
Open in desktop
@@ -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
View file
Open in desktop
Expand Up @@ -8285,7 +8285,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
View file
Open in desktop
Expand Up @@ -4342,7 +4342,6 @@ declare namespace ts {
negative: boolean;
base10Value: string;
}
function getNodeMajorVersion(): number | undefined;
enum FileWatcherEventKind {
Created = 0,
Changed = 1,
Expand Down