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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "process: add more version properties to release" (alternative to #19574) #19577

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions doc/api/process.md
Original file line number Diff line number Diff line change
Expand Up @@ -1509,21 +1509,6 @@ tarball.
- `'Argon'` for the 4.x LTS line beginning with 4.2.0.
- `'Boron'` for the 6.x LTS line beginning with 6.9.0.
- `'Carbon'` for the 8.x LTS line beginning with 8.9.1.
* `majorVersion` {number} The major version of Node.js.
* `minorVersion` {number} The minor version of Node.js.
* `patchVersion` {number} The patch version of Node.js.
* `prereleaseTag` {string} The SemVer pre-release tag for Node.js.
* `computedVersion` {number} A number representing the current version, created
using the following method:
`(majorVersion << 16) + (minorVersion << 8) + patchVersion`
* `compareVersion` {function} Perform a SemVer comparison to the release
version.
* `major`
* `minor`
* `patch`
* Returns: {number} `-1` if the given version is lower than the release
version, `0` if the given version matches the process version, and `1`
if the given version is greater than the release version.

<!-- eslint-skip -->
```js
Expand All @@ -1532,12 +1517,7 @@ tarball.
lts: 'Argon',
sourceUrl: 'https://nodejs.org/download/release/v4.4.5/node-v4.4.5.tar.gz',
headersUrl: 'https://nodejs.org/download/release/v4.4.5/node-v4.4.5-headers.tar.gz',
libUrl: 'https://nodejs.org/download/release/v4.4.5/win-x64/node.lib',
majorVersion: 4,
minorVersion: 4,
patchVersion: 5,
prereleaseTag: '',
computedVersion: 263173,
libUrl: 'https://nodejs.org/download/release/v4.4.5/win-x64/node.lib'
}
```

Expand Down
1 change: 0 additions & 1 deletion lib/internal/bootstrap/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
_process.setupConfig(NativeModule._source);
_process.setupSignalHandlers();
_process.setupUncaughtExceptionCapture(exceptionHandlerState);
_process.setupCompareVersion();
NativeModule.require('internal/process/warning').setup();
NativeModule.require('internal/process/next_tick').setup();
NativeModule.require('internal/process/stdio').setup();
Expand Down
13 changes: 1 addition & 12 deletions lib/internal/process.js
Original file line number Diff line number Diff line change
Expand Up @@ -269,16 +269,6 @@ function setupUncaughtExceptionCapture(exceptionHandlerState) {
};
}

function setupCompareVersion() {
const { computedVersion } = process.release;
process.release.compareVersion = (major, minor, patch) => {
const comp = (major << 16) + (minor << 8) + patch;
if (comp === computedVersion)
return 0;
return comp > computedVersion ? 1 : -1;
};
}

module.exports = {
setup_performance,
setup_cpuUsage,
Expand All @@ -289,6 +279,5 @@ module.exports = {
setupSignalHandlers,
setupChannel,
setupRawDebug,
setupUncaughtExceptionCapture,
setupCompareVersion,
setupUncaughtExceptionCapture
};
17 changes: 0 additions & 17 deletions src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3022,23 +3022,6 @@ void SetupProcessObject(Environment* env,
READONLY_PROPERTY(release, "name",
OneByteString(env->isolate(), NODE_RELEASE));

READONLY_PROPERTY(release, "majorVersion",
Integer::New(env->isolate(), NODE_MAJOR_VERSION));
READONLY_PROPERTY(release, "minorVersion",
Integer::New(env->isolate(), NODE_MINOR_VERSION));
READONLY_PROPERTY(release, "patchVersion",
Integer::New(env->isolate(), NODE_PATCH_VERSION));

READONLY_PROPERTY(release, "prereleaseTag",
OneByteString(env->isolate(), NODE_TAG));

READONLY_PROPERTY(release,
"computedVersion",
Integer::New(env->isolate(),
(NODE_MAJOR_VERSION << 16) +
(NODE_MINOR_VERSION << 8) +
NODE_PATCH_VERSION));

#if NODE_VERSION_IS_LTS
READONLY_PROPERTY(release, "lts",
OneByteString(env->isolate(), NODE_VERSION_LTS_CODENAME));
Expand Down
15 changes: 0 additions & 15 deletions test/parallel/test-process-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,3 @@ if (versionParts[0] === '4' && versionParts[1] >= 2) {
} else {
assert.strictEqual(process.release.lts, undefined);
}

const {
majorVersion: major,
minorVersion: minor,
patchVersion: patch,
computedVersion,
compareVersion,
} = process.release;

assert.strictEqual(
(major << 16) + (minor << 8) + patch, computedVersion);

assert.strictEqual(0, compareVersion(major, minor, patch));
assert.strictEqual(1, compareVersion(major, minor, patch + 1));
assert.strictEqual(-1, compareVersion(major - 1, minor, patch));