Skip to content

Commit ac01ece

Browse files
Joshua GrossoJoshua Grosso
authored andcommitted
Use semver for dependency version comparisons
1 parent 1a0174a commit ac01ece

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"node-pty": "github:implausible/node-pty#57f5f4ef6b751ffcd056fb6f2b626a0a0d804301",
6161
"promisify-node": "^0.4.0",
6262
"ramda": "^0.24.1",
63+
"semver": "^5.4.1",
6364
"tmp": "^0.0.33"
6465
}
6566
}

src/utils/checkDependencies.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import fse from 'fs-extra';
22
import path from 'path';
33
import R from 'ramda';
4-
5-
import {
6-
gitVersion,
7-
lfsVersion
8-
} from '../commands/version';
9-
import generateResponse from './generateResponse';
4+
import semver from 'semver';
105

116
import {
127
minimumVersions,
138
BAD_VERSION
149
} from '../constants';
10+
import generateResponse from './generateResponse';
11+
12+
import { gitVersion, lfsVersion } from '../commands/version';
1513

1614
/**
1715
* @function normalizeVersion
@@ -62,7 +60,7 @@ const handleVersionResponse = (dependencyName, response) => {
6260
}
6361

6462
const exists = version !== BAD_VERSION;
65-
const meetsVersion = exists && version >= minimumVersions[dependencyName];
63+
const meetsVersion = exists && semver.gte(version, minimumVersions[dependencyName]);
6664

6765
const constructKey = key => `${R.toLower(dependencyName)}_${key}`;
6866
return {

yarn.lock

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2343,11 +2343,7 @@ mute-stream@~0.0.4:
23432343
version "0.0.7"
23442344
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
23452345

2346-
nan@^2.3.0:
2347-
version "2.5.0"
2348-
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
2349-
2350-
nan@^2.6.2:
2346+
nan@^2.3.0, nan@^2.6.2:
23512347
version "2.7.0"
23522348
resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
23532349

@@ -3011,7 +3007,7 @@ samsam@1.x, samsam@^1.1.3:
30113007
version "1.2.1"
30123008
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
30133009

3014-
"semver@2 || 3 || 4 || 5", semver@^5.3.0:
3010+
"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1:
30153011
version "5.4.1"
30163012
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
30173013

0 commit comments

Comments
 (0)