Skip to content

Commit 50139a6

Browse files
committed
refactor: update dependencies
1 parent 6669a6d commit 50139a6

6 files changed

Lines changed: 176 additions & 178 deletions

File tree

package-lock.json

Lines changed: 61 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"email-validator": "^1.0.3",
3838
"gradle-to-js": "^2.0.0",
3939
"jsonwebtoken": "^8.3.0",
40-
"mkdirp": "^0.5.1",
41-
"moment": "^2.21.0",
40+
"mkdirp": "^1.0.4",
41+
"moment": "^2.27.0",
4242
"opener": "^1.4.1",
4343
"parse-duration": "0.1.1",
4444
"plist": "^3.0.1",
@@ -47,23 +47,23 @@
4747
"properties": "^1.2.1",
4848
"q": "~1.4.1",
4949
"recursive-fs": "0.1.4",
50-
"rimraf": "^2.5.1",
51-
"semver": "4.3.6",
50+
"rimraf": "^3.0.2",
51+
"semver": "^7.3.2",
5252
"simctl": "0.0.9",
5353
"slash": "1.0.0",
5454
"update-notifier": "^2.5.0",
5555
"which": "^1.2.7",
5656
"wordwrap": "1.0.0",
57-
"xml2js": "^0.4.16",
57+
"xml2js": "^0.4.23",
5858
"yargs": "^6.5.0",
5959
"yazl": "^2.4.1"
6060
},
6161
"devDependencies": {
62-
"@types/node": "^14.0.10",
62+
"@types/node": "^14.6.0",
6363
"@types/q": "^1.5.4",
64-
"@types/semver": "^7.2.0",
64+
"@types/semver": "^7.3.3",
6565
"@types/yazl": "^2.4.2",
6666
"standard-version": "^9.0.0",
67-
"typescript": "^3.9.3"
67+
"typescript": "^3.9.7"
6868
}
6969
}

src/command-executor.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import os from "os";
1010
import path from "path";
1111
var prompt = require("prompt");
1212
import Q from "q";
13-
var rimraf = require("rimraf");
14-
import semver from "semver";
13+
import * as rimraf from "rimraf";
1514
var which = require("which");
1615
import wordwrap = require("wordwrap");
1716
import * as cli from "./definitions/cli";
@@ -38,6 +37,7 @@ import {
3837
} from "./lib/react-native-utils";
3938
import { isBinaryOrZip } from "./lib/file-utils";
4039
import { out } from "./util/interaction";
40+
import { isValidRange } from "./lib/validation-utils";
4141

4242
var configFilePath: string = path.join(process.env.LOCALAPPDATA || process.env.HOME, ".code-push.config");
4343
var emailValidator = require("email-validator");
@@ -1388,7 +1388,7 @@ function throwForInvalidEmail(email: string): void {
13881388
}
13891389

13901390
function throwForInvalidSemverRange(semverRange: string): void {
1391-
if (semver.validRange(semverRange) === null) {
1391+
if (!isValidRange(semverRange)) {
13921392
throw new Error('Please use a semver-compliant target binary version range, for example "1.0.0", "*" or "^1.2.3".');
13931393
}
13941394
}
File renamed without changes.

src/lib/validation-utils.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ export function isValidVersion(version: string): boolean {
99
return !!semver.valid(version) || regexpForMajorMinor.test(version) || regexpForMajor.test(version);
1010
}
1111

12+
// Allow plain integer versions (as well as '1.0' values) for now, e.g. '1' is valid here and we assume that it is equal to '1.0.0'.
13+
export function isValidRange(semverRange: string): boolean {
14+
return !!semver.validRange(semverRange);
15+
}
16+
1217
export function isLowVersion(v1: string, v2: string): boolean {
1318
return semver.compare(v1, v2) === -1 ? true : false;
1419
}

0 commit comments

Comments
 (0)