Skip to content

Commit bccff2c

Browse files
authored
fix: messy issues with nodeVersionUtils helper needing semver installed (#489)
1 parent 736e981 commit bccff2c

File tree

8 files changed

+35
-35
lines changed

8 files changed

+35
-35
lines changed

__tests__/bin.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { exec } = require('child_process');
2-
const { isSupportedNodeVersion } = require('../src/lib/nodeVersionUtils');
2+
const isSupportedNodeVersion = require('../src/lib/isSupportedNodeVersion');
33
const pkg = require('../package.json');
44

55
describe('bin', () => {

__tests__/lib/getNodeVersion.test.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const getNodeVersion = require('../../src/lib/getNodeVersion');
2+
const pkg = require('../../package.json');
3+
const semver = require('semver');
4+
5+
describe('#getNodeVersion()', () => {
6+
it('should extract version that matches range in package.json', () => {
7+
const version = parseInt(getNodeVersion(), 10);
8+
const cleanedVersion = semver.valid(semver.coerce(version));
9+
expect(semver.satisfies(cleanedVersion, pkg.engines.node)).toBe(true);
10+
});
11+
});
Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
const { isSupportedNodeVersion, getNodeVersion } = require('../../src/lib/nodeVersionUtils');
2-
const pkg = require('../../package.json');
3-
const semver = require('semver');
1+
const isSupportedNodeVersion = require('../../src/lib/isSupportedNodeVersion');
42

53
describe('#isSupportedNodeVersion()', () => {
64
it('should return true for a supported version of node', () => {
@@ -14,11 +12,3 @@ describe('#isSupportedNodeVersion()', () => {
1412
expect(isSupportedNodeVersion('18.0.0')).toBe(false);
1513
});
1614
});
17-
18-
describe('#getNodeVersion()', () => {
19-
it('should extract version that matches range in package.json', () => {
20-
const version = parseInt(getNodeVersion(), 10);
21-
const cleanedVersion = semver.valid(semver.coerce(version));
22-
expect(semver.satisfies(cleanedVersion, pkg.engines.node)).toBe(true);
23-
});
24-
});

bin/rdme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const updateNotifier = require('update-notifier');
77
const pkg = require('../package.json');
88

99
const isGHA = require('../src/lib/isGitHub');
10-
const { isSupportedNodeVersion } = require('../src/lib/nodeVersionUtils');
10+
const isSupportedNodeVersion = require('../src/lib/isSupportedNodeVersion');
1111

1212
updateNotifier({ pkg }).notify();
1313

bin/set-version-output

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /usr/bin/env node
22

3-
const { getNodeVersion } = require('../src/lib/nodeVersionUtils');
3+
const getNodeVersion = require('../src/lib/getNodeVersion');
44
const pkg = require('../package.json');
55

66
const name1 = 'RDME_VERSION';

src/lib/getNodeVersion.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
const pkg = require('../../package.json');
2+
3+
/**
4+
* @example 14
5+
* @returns {String} The maximum major Node.js version specified in the package.json
6+
*/
7+
module.exports = function getNodeVersion() {
8+
const { node } = pkg.engines;
9+
return Array.from(node.matchAll(/\d+/g)).pop();
10+
};

src/lib/isSupportedNodeVersion.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
const semver = require('semver');
2+
const pkg = require('../../package.json');
3+
4+
/**
5+
* Determine if the current version of Node is one that we explicitly support.
6+
*
7+
*/
8+
module.exports = function isSupportedNodeVersion(version) {
9+
return semver.satisfies(semver.coerce(version), pkg.engines.node);
10+
};

src/lib/nodeVersionUtils.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)