Skip to content

Commit d685337

Browse files
committed
Use semver-umd everywhere
1 parent bd57ca7 commit d685337

14 files changed

Lines changed: 229 additions & 25 deletions

File tree

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
"node-pty": "0.9.0-beta19",
4343
"nsfw": "1.2.5",
4444
"onigasm-umd": "^2.2.2",
45-
"semver": "^5.5.0",
46-
"semver-umd": "^5.5.0",
45+
"semver-umd": "^5.5.3",
4746
"spdlog": "^0.9.0",
4847
"sudo-prompt": "9.0.0",
4948
"v8-inspect-profiler": "^0.0.20",

remote/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
"node-pty": "0.9.0-beta19",
1515
"nsfw": "1.2.5",
1616
"onigasm-umd": "^2.2.2",
17-
"semver": "^5.5.0",
18-
"semver-umd": "^5.5.0",
17+
"semver-umd": "^5.5.3",
1918
"spdlog": "^0.9.0",
2019
"vscode-chokidar": "2.1.7",
2120
"vscode-proxy-agent": "0.4.0",

remote/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"xterm": "3.15.0-beta67",
88
"xterm-addon-search": "0.2.0-beta2",
99
"xterm-addon-web-links": "0.1.0-beta10",
10-
"semver-umd": "^5.5.0"
10+
"semver-umd": "^5.5.3"
1111
}
1212
}

remote/web/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ oniguruma@^7.2.0:
1919
dependencies:
2020
nan "^2.14.0"
2121

22-
semver-umd@^5.5.0:
23-
version "5.5.1"
24-
resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.1.tgz#ad0211c4addc9d93b22c807ef5166a3d0581c79b"
25-
integrity sha512-BogOfRyzUCjHU3dENRlf3HxliVcQRjQRy+mx+1/ILZSV6WCOGniAxcg45Rol3CGFfKaCiodeTgfaGAswWBOU+g==
22+
semver-umd@^5.5.3:
23+
version "5.5.3"
24+
resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.3.tgz#b64d7a2d4f5a717b369d56e31940a38e47e34d1e"
25+
integrity sha512-HOnQrn2iKnVe/xlqCTzMXQdvSz3rPbD0DmQXYuQ+oK1dpptGFfPghonQrx5JHl2O7EJwDqtQnjhE7ME23q6ngw==
2626

2727
vscode-textmate@^4.1.1:
2828
version "4.2.2"

remote/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -876,17 +876,17 @@ safe-regex@^1.1.0:
876876
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
877877
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
878878

879-
semver-umd@^5.5.0:
880-
version "5.5.1"
881-
resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.1.tgz#ad0211c4addc9d93b22c807ef5166a3d0581c79b"
882-
integrity sha512-BogOfRyzUCjHU3dENRlf3HxliVcQRjQRy+mx+1/ILZSV6WCOGniAxcg45Rol3CGFfKaCiodeTgfaGAswWBOU+g==
879+
semver-umd@^5.5.3:
880+
version "5.5.3"
881+
resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.3.tgz#b64d7a2d4f5a717b369d56e31940a38e47e34d1e"
882+
integrity sha512-HOnQrn2iKnVe/xlqCTzMXQdvSz3rPbD0DmQXYuQ+oK1dpptGFfPghonQrx5JHl2O7EJwDqtQnjhE7ME23q6ngw==
883883

884884
semver@^5.3.0:
885885
version "5.6.0"
886886
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
887887
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
888888

889-
semver@^5.5.0, semver@^5.6.0:
889+
semver@^5.6.0:
890890
version "5.7.0"
891891
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
892892
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==

src/typings/semver-umd.d.ts

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
declare module 'semver-umd' {
7+
8+
// Type definitions for semver 5.5
9+
// Project: https://github.com/npm/node-semver
10+
// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
11+
// BendingBender <https://github.com/BendingBender>
12+
// Lucian Buzzo <https://github.com/LucianBuzzo>
13+
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/semver
14+
15+
export const SEMVER_SPEC_VERSION: "2.0.0";
16+
17+
export type ReleaseType = "major" | "premajor" | "minor" | "preminor" | "patch" | "prepatch" | "prerelease";
18+
19+
/**
20+
* Return the parsed version as a SemVer object, or null if it's not valid.
21+
*/
22+
export function parse(v: string | SemVer, loose?: boolean): SemVer | null;
23+
/**
24+
* Return the parsed version, or null if it's not valid.
25+
*/
26+
export function valid(v: string | SemVer, loose?: boolean): string | null;
27+
/**
28+
* Returns cleaned (removed leading/trailing whitespace, remove '=v' prefix) and parsed version, or null if version is invalid.
29+
*/
30+
export function clean(version: string, loose?: boolean): string | null;
31+
/**
32+
* Return the version incremented by the release type (major, minor, patch, or prerelease), or null if it's not valid.
33+
*/
34+
export function inc(v: string | SemVer, release: ReleaseType, loose?: boolean, identifier?: string): string | null;
35+
/**
36+
* Return the major version number.
37+
*/
38+
export function major(v: string | SemVer, loose?: boolean): number;
39+
/**
40+
* Return the minor version number.
41+
*/
42+
export function minor(v: string | SemVer, loose?: boolean): number;
43+
/**
44+
* Return the patch version number.
45+
*/
46+
export function patch(v: string | SemVer, loose?: boolean): number;
47+
/**
48+
* Returns an array of prerelease components, or null if none exist.
49+
*/
50+
export function prerelease(v: string | SemVer, loose?: boolean): string[] | null;
51+
52+
// Comparison
53+
/**
54+
* v1 > v2
55+
*/
56+
export function gt(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
57+
/**
58+
* v1 >= v2
59+
*/
60+
export function gte(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
61+
/**
62+
* v1 < v2
63+
*/
64+
export function lt(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
65+
/**
66+
* v1 <= v2
67+
*/
68+
export function lte(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
69+
/**
70+
* v1 == v2 This is true if they're logically equivalent, even if they're not the exact same string. You already know how to compare strings.
71+
*/
72+
export function eq(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
73+
/**
74+
* v1 != v2 The opposite of eq.
75+
*/
76+
export function neq(v1: string | SemVer, v2: string | SemVer, loose?: boolean): boolean;
77+
78+
/**
79+
* Pass in a comparison string, and it'll call the corresponding semver comparison function.
80+
* "===" and "!==" do simple string comparison, but are included for completeness.
81+
* Throws if an invalid comparison string is provided.
82+
*/
83+
export function cmp(v1: string | SemVer, operator: Operator, v2: string | SemVer, loose?: boolean): boolean;
84+
export type Operator = '===' | '!==' | '' | '=' | '==' | '!=' | '>' | '>=' | '<' | '<=';
85+
86+
/**
87+
* Return 0 if v1 == v2, or 1 if v1 is greater, or -1 if v2 is greater. Sorts in ascending order if passed to Array.sort().
88+
*/
89+
export function compare(v1: string | SemVer, v2: string | SemVer, loose?: boolean): 1 | 0 | -1;
90+
/**
91+
* The reverse of compare. Sorts an array of versions in descending order when passed to Array.sort().
92+
*/
93+
export function rcompare(v1: string | SemVer, v2: string | SemVer, loose?: boolean): 1 | 0 | -1;
94+
95+
/**
96+
* Compares two identifiers, must be numeric strings or truthy/falsy values. Sorts in ascending order if passed to Array.sort().
97+
*/
98+
export function compareIdentifiers(a: string | null, b: string | null): 1 | 0 | -1;
99+
/**
100+
* The reverse of compareIdentifiers. Sorts in descending order when passed to Array.sort().
101+
*/
102+
export function rcompareIdentifiers(a: string | null, b: string | null): 1 | 0 | -1;
103+
104+
/**
105+
* Sorts an array of semver entries in ascending order.
106+
*/
107+
export function sort(list: Array<string | SemVer>, loose?: boolean): Array<string | SemVer>;
108+
/**
109+
* Sorts an array of semver entries in descending order.
110+
*/
111+
export function rsort(list: Array<string | SemVer>, loose?: boolean): Array<string | SemVer>;
112+
113+
/**
114+
* Returns difference between two versions by the release type (major, premajor, minor, preminor, patch, prepatch, or prerelease), or null if the versions are the same.
115+
*/
116+
export function diff(v1: string, v2: string, loose?: boolean): ReleaseType | null;
117+
118+
// Ranges
119+
/**
120+
* Return the valid range or null if it's not valid
121+
*/
122+
export function validRange(range: string | Range, loose?: boolean): string;
123+
/**
124+
* Return true if the version satisfies the range.
125+
*/
126+
export function satisfies(version: string | SemVer, range: string | Range, loose?: boolean): boolean;
127+
/**
128+
* Return the highest version in the list that satisfies the range, or null if none of them do.
129+
*/
130+
export function maxSatisfying(versions: Array<string | SemVer>, range: string | Range, loose?: boolean): string;
131+
/**
132+
* Return the lowest version in the list that satisfies the range, or null if none of them do.
133+
*/
134+
export function minSatisfying(versions: Array<string | SemVer>, range: string, loose?: boolean): string;
135+
/**
136+
* Return true if version is greater than all the versions possible in the range.
137+
*/
138+
export function gtr(version: string | SemVer, range: string | Range, loose?: boolean): boolean;
139+
/**
140+
* Return true if version is less than all the versions possible in the range.
141+
*/
142+
export function ltr(version: string | SemVer, range: string | Range, loose?: boolean): boolean;
143+
/**
144+
* Return true if the version is outside the bounds of the range in either the high or low direction.
145+
* The hilo argument must be either the string '>' or '<'. (This is the function called by gtr and ltr.)
146+
*/
147+
export function outside(version: string | SemVer, range: string | Range, hilo: '>' | '<', loose?: boolean): boolean;
148+
/**
149+
* Return true if any of the ranges comparators intersect
150+
*/
151+
export function intersects(range1: string | Range, range2: string | Range, loose?: boolean): boolean;
152+
153+
// Coercion
154+
/**
155+
* Coerces a string to semver if possible
156+
*/
157+
export function coerce(version: string | SemVer): SemVer | null;
158+
159+
export class SemVer {
160+
constructor(version: string | SemVer, loose?: boolean);
161+
162+
raw: string;
163+
loose: boolean;
164+
format(): string;
165+
inspect(): string;
166+
167+
major: number;
168+
minor: number;
169+
patch: number;
170+
version: string;
171+
build: string[];
172+
prerelease: string[];
173+
174+
compare(other: string | SemVer): 1 | 0 | -1;
175+
compareMain(other: string | SemVer): 1 | 0 | -1;
176+
comparePre(other: string | SemVer): 1 | 0 | -1;
177+
inc(release: ReleaseType, identifier?: string): SemVer;
178+
}
179+
180+
export class Comparator {
181+
constructor(comp: string | Comparator, loose?: boolean);
182+
183+
semver: SemVer;
184+
operator: string;
185+
value: boolean;
186+
parse(comp: string): void;
187+
test(version: string | SemVer): boolean;
188+
intersects(comp: Comparator, loose?: boolean): boolean;
189+
}
190+
191+
export class Range {
192+
constructor(range: string | Range, loose?: boolean);
193+
194+
range: string;
195+
raw: string;
196+
loose: boolean;
197+
format(): string;
198+
inspect(): string;
199+
200+
set: Comparator[][];
201+
parseRange(range: string): Comparator[];
202+
test(version: string | SemVer): boolean;
203+
intersects(range: Range, loose?: boolean): boolean;
204+
}
205+
206+
}

src/vs/code/browser/workbench/workbench.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
'xterm': `${window.location.origin}/node_modules/xterm/lib/xterm.js`,
1616
'xterm-addon-search': `${window.location.origin}/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
1717
'xterm-addon-web-links': `${window.location.origin}/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,
18-
'semver': `${window.location.origin}/node_modules/semver-umd/lib/semver-umd.js`,
18+
'semver-umd': `${window.location.origin}/node_modules/semver-umd/lib/semver-umd.js`,
1919
}
2020
});
2121

src/vs/code/node/cliProcessMain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
77
import product from 'vs/platform/product/node/product';
88
import pkg from 'vs/platform/product/node/package';
99
import * as path from 'vs/base/common/path';
10-
import * as semver from 'semver';
10+
import * as semver from 'semver-umd';
1111

1212
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
1313
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';

src/vs/platform/extensionManagement/node/extensionManagementService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { localizeManifest } from '../common/extensionNls';
2626
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
2727
import { Limiter, createCancelablePromise, CancelablePromise, Queue } from 'vs/base/common/async';
2828
import { Event, Emitter } from 'vs/base/common/event';
29-
import * as semver from 'semver';
29+
import * as semver from 'semver-umd';
3030
import { URI } from 'vs/base/common/uri';
3131
import pkg from 'vs/platform/product/node/package';
3232
import { isMacintosh, isWindows } from 'vs/base/common/platform';

src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as nls from 'vs/nls';
7-
import * as semver from 'semver';
7+
import * as semver from 'semver-umd';
88
import { Event, Emitter } from 'vs/base/common/event';
99
import { index, distinct } from 'vs/base/common/arrays';
1010
import { ThrottledDelayer } from 'vs/base/common/async';

0 commit comments

Comments
 (0)