npm-check-updates 12.3.1 → 12.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +13 -17
- package/build/package.json +1 -1
- package/build/src/cli-options.js +26 -8
- package/build/src/cli-options.js.map +1 -1
- package/build/src/lib/filterAndReject.d.ts +6 -6
- package/build/src/lib/filterAndReject.js +16 -11
- package/build/src/lib/filterAndReject.js.map +1 -1
- package/build/src/lib/mergeOptions.d.ts +5 -5
- package/build/src/lib/queryVersions.d.ts +1 -1
- package/build/src/lib/queryVersions.js +11 -9
- package/build/src/lib/queryVersions.js.map +1 -1
- package/build/src/logging.js +2 -1
- package/build/src/logging.js.map +1 -1
- package/build/src/types.d.ts +15 -11
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -280,25 +280,21 @@ For example, `.ncurc.json`:
|
|
|
280
280
|
|
|
281
281
|
## Module/Programmatic Usage
|
|
282
282
|
|
|
283
|
-
npm-check-updates can be
|
|
283
|
+
npm-check-updates can be imported as a module:
|
|
284
284
|
|
|
285
285
|
```js
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
console.log(upgraded) // { "mypackage": "^2.0.0", ... }
|
|
300
|
-
|
|
301
|
-
})()
|
|
286
|
+
import ncu from 'npm-check-updates'
|
|
287
|
+
|
|
288
|
+
const upgraded = await ncu.run({
|
|
289
|
+
// Pass any cli option
|
|
290
|
+
packageFile: '../package.json',
|
|
291
|
+
upgrade: true,
|
|
292
|
+
// Defaults:
|
|
293
|
+
// jsonUpgraded: true,
|
|
294
|
+
// silent: true,
|
|
295
|
+
})
|
|
296
|
+
|
|
297
|
+
console.log(upgraded) // { "mypackage": "^2.0.0", ... }
|
|
302
298
|
```
|
|
303
299
|
|
|
304
300
|
## Known Issues
|
package/build/package.json
CHANGED
package/build/src/cli-options.js
CHANGED
|
@@ -9,10 +9,10 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
9
9
|
const constants_1 = require("./constants");
|
|
10
10
|
/**
|
|
11
11
|
* "newest" means most recently released in terms of release date, even if there are other version numbers that are higher. It includes prereleases.
|
|
12
|
-
* "greatest" means highest version number, regardless of release date. It includes prereleases.
|
|
12
|
+
* "greatest" means the highest version number, regardless of release date. It includes prereleases.
|
|
13
13
|
* "latest" is whatever the project's "latest" git tag points to. It's usually the non-prerelease version with the highest version number, but is ultimately decided by each project's maintainers.
|
|
14
|
-
* "minor" means highest minor version without incrementing the current major.
|
|
15
|
-
* "patch" means highest patch version without incrementing the current major or minor.
|
|
14
|
+
* "minor" means the highest minor version without incrementing the current major.
|
|
15
|
+
* "patch" means the highest patch version without incrementing the current major or minor.
|
|
16
16
|
**/
|
|
17
17
|
const getHelpTargetTable = () => {
|
|
18
18
|
/* eslint-disable fp/no-mutating-methods */
|
|
@@ -28,7 +28,24 @@ by each project's maintainers. Default.`]);
|
|
|
28
28
|
table.push(['newest', `Upgrade to the version with the most recent publish date, even if there are
|
|
29
29
|
other version numbers that are higher. Includes prereleases.`]);
|
|
30
30
|
table.push(['patch', `Upgrade to the highest patch version without bumping the minor or major versions.`]);
|
|
31
|
-
return `Set the target version that is upgraded to (default: "latest")
|
|
31
|
+
return `Set the target version that is upgraded to (default: "latest").
|
|
32
|
+
|
|
33
|
+
${table.toString()}
|
|
34
|
+
|
|
35
|
+
You can also specify a custom function in your .ncurc.js file, or when importing npm-check-updates:
|
|
36
|
+
|
|
37
|
+
${chalk_1.default.gray(`/** Custom target.
|
|
38
|
+
@param dependencyName The name of the dependency.
|
|
39
|
+
@param parsedVersion A parsed Semver object from semver-utils.
|
|
40
|
+
(See https://git.coolaj86.com/coolaj86/semver-utils.js#semverutils-parse-semverstring)
|
|
41
|
+
@returns One of the valid target values (specified in the table above).
|
|
42
|
+
*/`)}
|
|
43
|
+
${chalk_1.default.cyan('target')}: (dependencyName, [{ semver, version, operator, major, minor, patch, release, build }]) ${chalk_1.default.cyan('=>')} {
|
|
44
|
+
${chalk_1.default.red('if')} (major ${chalk_1.default.red('===')} ${chalk_1.default.blue('0')}) ${chalk_1.default.red('return')} ${chalk_1.default.yellow('\'minor\'')}
|
|
45
|
+
${chalk_1.default.red('return')} ${chalk_1.default.yellow('\'latest\'')}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
`;
|
|
32
49
|
};
|
|
33
50
|
// store CLI options separately from bin file so that they can be used to build type definitions
|
|
34
51
|
const cliOptions = [
|
|
@@ -150,13 +167,13 @@ As a comparison: without using the --peer option, ncu will suggest the latest ve
|
|
|
150
167
|
short: 'f',
|
|
151
168
|
arg: 'matches',
|
|
152
169
|
description: 'Include only package names matching the given string, wildcard, glob, comma-or-space-delimited list, or /regex/.',
|
|
153
|
-
type: 'string | string[] | RegExp',
|
|
170
|
+
type: 'string | string[] | RegExp | RegExp[] | Function',
|
|
154
171
|
},
|
|
155
172
|
{
|
|
156
173
|
long: 'filterVersion',
|
|
157
174
|
arg: 'matches',
|
|
158
175
|
description: 'Filter on package version using comma-or-space-delimited list, or /regex/.',
|
|
159
|
-
type: 'string | string[] | RegExp',
|
|
176
|
+
type: 'string | string[] | RegExp | RegExp[] | Function',
|
|
160
177
|
},
|
|
161
178
|
{
|
|
162
179
|
long: 'format',
|
|
@@ -259,13 +276,13 @@ As a comparison: without using the --peer option, ncu will suggest the latest ve
|
|
|
259
276
|
short: 'x',
|
|
260
277
|
arg: 'matches',
|
|
261
278
|
description: 'Exclude packages matching the given string, wildcard, glob, comma-or-space-delimited list, or /regex/.',
|
|
262
|
-
type: 'string | string[] | RegExp | RegExp[]',
|
|
279
|
+
type: 'string | string[] | RegExp | RegExp[] | Function',
|
|
263
280
|
},
|
|
264
281
|
{
|
|
265
282
|
long: 'rejectVersion',
|
|
266
283
|
arg: 'matches',
|
|
267
284
|
description: 'Exclude package.json versions using comma-or-space-delimited list, or /regex/.',
|
|
268
|
-
type: 'string | string[] | RegExp | RegExp[]',
|
|
285
|
+
type: 'string | string[] | RegExp | RegExp[] | Function',
|
|
269
286
|
},
|
|
270
287
|
{
|
|
271
288
|
long: 'removeRange',
|
|
@@ -295,6 +312,7 @@ As a comparison: without using the --peer option, ncu will suggest the latest ve
|
|
|
295
312
|
arg: 'value',
|
|
296
313
|
description: 'Target version to upgrade to: latest, newest, greatest, minor, patch. Run "ncu --help --target" for details.` (default: "latest")',
|
|
297
314
|
help: getHelpTargetTable(),
|
|
315
|
+
type: 'string | TargetFunction',
|
|
298
316
|
},
|
|
299
317
|
{
|
|
300
318
|
long: 'timeout',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-options.js","sourceRoot":"","sources":["../../src/cli-options.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,0DAA6B;AAC7B,kDAAyB;AACzB,2CAA+C;AAc/C;;;;;;IAMI;AACJ,MAAM,kBAAkB,GAAG,GAAW,EAAE;IACtC,2CAA2C;IAE3C,MAAM,KAAK,GAAG,IAAI,mBAAK,CAAC;QACtB,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;KAC7B,CAAC,CAAA;IAEF,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE;sBACJ,CAAC,CAAC,CAAA;IACtB,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;;wCAEgB,CAAC,CAAC,CAAA;IACxC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,yEAAyE,CAAC,CAAC,CAAA;IAChG,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;6DACqC,CAAC,CAAC,CAAA;IAC7D,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,mFAAmF,CAAC,CAAC,CAAA;IAE1G,OAAO,
|
|
1
|
+
{"version":3,"file":"cli-options.js","sourceRoot":"","sources":["../../src/cli-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FilterRejectPattern, Maybe } from '../types';
|
|
2
2
|
/**
|
|
3
3
|
* Composes a filter function from filter, reject, filterVersion, and rejectVersion patterns.
|
|
4
4
|
*
|
|
5
|
-
* @param filter
|
|
6
|
-
* @param reject
|
|
7
|
-
* @param filterVersion
|
|
8
|
-
* @param rejectVersion
|
|
5
|
+
* @param [filter]
|
|
6
|
+
* @param [reject]
|
|
7
|
+
* @param [filterVersion]
|
|
8
|
+
* @param [rejectVersion]
|
|
9
9
|
*/
|
|
10
|
-
declare function filterAndReject(filter: Maybe<
|
|
10
|
+
declare function filterAndReject(filter: Maybe<FilterRejectPattern>, reject: Maybe<FilterRejectPattern>, filterVersion: Maybe<FilterRejectPattern>, rejectVersion: Maybe<FilterRejectPattern>): (...args: any[]) => boolean;
|
|
11
11
|
export default filterAndReject;
|
|
@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const lodash_1 = __importDefault(require("lodash"));
|
|
7
7
|
const fp_and_or_1 = require("fp-and-or");
|
|
8
8
|
const minimatch_1 = __importDefault(require("minimatch"));
|
|
9
|
+
const semver_utils_1 = require("semver-utils");
|
|
9
10
|
/**
|
|
10
11
|
* Creates a filter function from a given filter string. Supports
|
|
11
12
|
* strings, wildcards, comma-or-space-delimited lists, and regexes.
|
|
12
13
|
*
|
|
13
|
-
* @param [
|
|
14
|
+
* @param [filterPattern]
|
|
14
15
|
* @returns
|
|
15
16
|
*/
|
|
16
17
|
function composeFilter(filterPattern) {
|
|
@@ -24,21 +25,25 @@ function composeFilter(filterPattern) {
|
|
|
24
25
|
// RegExp string
|
|
25
26
|
if (filterPattern[0] === '/' && filterPattern[filterPattern.length - 1] === '/') {
|
|
26
27
|
const regexp = new RegExp(filterPattern.slice(1, -1));
|
|
27
|
-
predicate = (
|
|
28
|
+
predicate = (dependencyName) => regexp.test(dependencyName);
|
|
28
29
|
}
|
|
29
30
|
// glob string
|
|
30
31
|
else {
|
|
31
32
|
const patterns = filterPattern.split(/[\s,]+/);
|
|
32
|
-
predicate = (
|
|
33
|
+
predicate = (dependencyName) => patterns.some(pattern => (0, minimatch_1.default)(dependencyName, pattern));
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
// array
|
|
36
37
|
else if (Array.isArray(filterPattern)) {
|
|
37
|
-
predicate = (
|
|
38
|
+
predicate = (dependencyName, versionSpec) => filterPattern.some((subpattern) => composeFilter(subpattern)(dependencyName, versionSpec));
|
|
38
39
|
}
|
|
39
40
|
// raw RegExp
|
|
40
41
|
else if (filterPattern instanceof RegExp) {
|
|
41
|
-
predicate = (
|
|
42
|
+
predicate = (dependencyName) => filterPattern.test(dependencyName);
|
|
43
|
+
}
|
|
44
|
+
// function
|
|
45
|
+
else if (typeof filterPattern === 'function') {
|
|
46
|
+
predicate = (dependencyName, versionSpec) => filterPattern(dependencyName, (0, semver_utils_1.parseRange)(versionSpec !== null && versionSpec !== void 0 ? versionSpec : dependencyName));
|
|
42
47
|
}
|
|
43
48
|
else {
|
|
44
49
|
throw new TypeError('Invalid filter. Must be a RegExp, array, or comma-or-space-delimited list.');
|
|
@@ -49,17 +54,17 @@ function composeFilter(filterPattern) {
|
|
|
49
54
|
/**
|
|
50
55
|
* Composes a filter function from filter, reject, filterVersion, and rejectVersion patterns.
|
|
51
56
|
*
|
|
52
|
-
* @param filter
|
|
53
|
-
* @param reject
|
|
54
|
-
* @param filterVersion
|
|
55
|
-
* @param rejectVersion
|
|
57
|
+
* @param [filter]
|
|
58
|
+
* @param [reject]
|
|
59
|
+
* @param [filterVersion]
|
|
60
|
+
* @param [rejectVersion]
|
|
56
61
|
*/
|
|
57
62
|
function filterAndReject(filter, reject, filterVersion, rejectVersion) {
|
|
58
63
|
return (0, fp_and_or_1.and)(
|
|
59
64
|
// filter dep
|
|
60
|
-
(
|
|
65
|
+
(dependencyName, version) => (0, fp_and_or_1.and)(filter ? composeFilter(filter) : lodash_1.default.identity, reject ? lodash_1.default.negate(composeFilter(reject)) : lodash_1.default.identity)(dependencyName, version),
|
|
61
66
|
// filter version
|
|
62
|
-
(
|
|
67
|
+
(dependencyName, version) => (0, fp_and_or_1.and)(filterVersion ? composeFilter(filterVersion) : lodash_1.default.identity, rejectVersion ? lodash_1.default.negate(composeFilter(rejectVersion)) : lodash_1.default.identity)(version));
|
|
63
68
|
}
|
|
64
69
|
exports.default = filterAndReject;
|
|
65
70
|
//# sourceMappingURL=filterAndReject.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterAndReject.js","sourceRoot":"","sources":["../../../src/lib/filterAndReject.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,yCAA+B;AAC/B,0DAAiC;
|
|
1
|
+
{"version":3,"file":"filterAndReject.js","sourceRoot":"","sources":["../../../src/lib/filterAndReject.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,8 @@ declare function mergeOptions(rawOptions1: Options | null, rawOptions2: Options
|
|
|
17
17
|
doctorTest?: string | undefined;
|
|
18
18
|
enginesNode?: boolean | undefined;
|
|
19
19
|
errorLevel?: number | undefined;
|
|
20
|
-
filter?:
|
|
21
|
-
filterVersion?:
|
|
20
|
+
filter?: import("../types").FilterRejectPattern | undefined;
|
|
21
|
+
filterVersion?: import("../types").FilterRejectPattern | undefined;
|
|
22
22
|
format?: string[] | undefined;
|
|
23
23
|
global?: boolean | undefined;
|
|
24
24
|
greatest?: boolean | undefined;
|
|
@@ -38,13 +38,13 @@ declare function mergeOptions(rawOptions1: Options | null, rawOptions2: Options
|
|
|
38
38
|
pre?: boolean | undefined;
|
|
39
39
|
prefix?: string | undefined;
|
|
40
40
|
registry?: string | undefined;
|
|
41
|
-
reject?:
|
|
42
|
-
rejectVersion?:
|
|
41
|
+
reject?: import("../types").FilterRejectPattern | undefined;
|
|
42
|
+
rejectVersion?: import("../types").FilterRejectPattern | undefined;
|
|
43
43
|
removeRange?: boolean | undefined;
|
|
44
44
|
retry?: number | undefined;
|
|
45
45
|
semverLevel?: string | undefined;
|
|
46
46
|
silent?: boolean | undefined;
|
|
47
|
-
target?:
|
|
47
|
+
target?: import("../types").Target | undefined;
|
|
48
48
|
timeout?: number | undefined;
|
|
49
49
|
upgrade?: boolean | undefined;
|
|
50
50
|
args?: any[] | undefined;
|
|
@@ -6,5 +6,5 @@ import { Index, Options, VersionSpec } from '../types';
|
|
|
6
6
|
* @param [options={}] Options. Default: { target: 'latest' }.
|
|
7
7
|
* @returns Promised {packageName: version} collection
|
|
8
8
|
*/
|
|
9
|
-
declare function queryVersions(packageMap: Index<VersionSpec>, options?: Options): Promise<
|
|
9
|
+
declare function queryVersions(packageMap: Index<VersionSpec>, options?: Options): Promise<Index<R>>;
|
|
10
10
|
export default queryVersions;
|
|
@@ -8,6 +8,7 @@ const cint_1 = __importDefault(require("cint"));
|
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const p_map_1 = __importDefault(require("p-map"));
|
|
10
10
|
const progress_1 = __importDefault(require("progress"));
|
|
11
|
+
const semver_utils_1 = require("semver-utils");
|
|
11
12
|
const constants_1 = require("../constants");
|
|
12
13
|
const getPackageManager_1 = __importDefault(require("./getPackageManager"));
|
|
13
14
|
const package_managers_1 = __importDefault(require("../package-managers"));
|
|
@@ -28,13 +29,6 @@ async function queryVersions(packageMap, options = {}) {
|
|
|
28
29
|
bar = new progress_1.default('[:bar] :current/:total :percent', { total: packageList.length, width: 20 });
|
|
29
30
|
bar.render();
|
|
30
31
|
}
|
|
31
|
-
// set the getPackageVersion function from options.target
|
|
32
|
-
// TODO: Remove "as GetVersion" and fix types
|
|
33
|
-
const getPackageVersion = packageManager[target];
|
|
34
|
-
if (!getPackageVersion) {
|
|
35
|
-
const packageManagerSupportedVersionTargets = constants_1.supportedVersionTargets.filter(t => t in packageManager);
|
|
36
|
-
return Promise.reject(new Error(`Unsupported target "${target}" for ${options.packageManager || 'npm'}. Supported version targets are: ${packageManagerSupportedVersionTargets.join(', ')}`));
|
|
37
|
-
}
|
|
38
32
|
/**
|
|
39
33
|
* Ignore 404 errors from getPackageVersion by having them return `null`
|
|
40
34
|
* instead of rejecting.
|
|
@@ -46,15 +40,16 @@ async function queryVersions(packageMap, options = {}) {
|
|
|
46
40
|
var _a;
|
|
47
41
|
const npmAlias = (0, version_util_1.parseNpmAlias)(packageMap[dep]);
|
|
48
42
|
const [name, version] = npmAlias || [dep, packageMap[dep]];
|
|
43
|
+
const targetResult = typeof target === 'string' ? target : target(name, (0, semver_utils_1.parseRange)(version));
|
|
49
44
|
let versionNew = null;
|
|
50
45
|
// use gitTags package manager for git urls
|
|
51
46
|
if ((0, version_util_1.isGithubUrl)(packageMap[dep])) {
|
|
52
47
|
// override packageManager and getPackageVersion just for this dependency
|
|
53
48
|
const packageManager = package_managers_1.default.gitTags;
|
|
54
|
-
const getPackageVersion = packageManager[
|
|
49
|
+
const getPackageVersion = packageManager[targetResult];
|
|
55
50
|
if (!getPackageVersion) {
|
|
56
51
|
const packageManagerSupportedVersionTargets = constants_1.supportedVersionTargets.filter(t => t in packageManager);
|
|
57
|
-
return Promise.reject(new Error(`Unsupported target "${
|
|
52
|
+
return Promise.reject(new Error(`Unsupported target "${targetResult}" for github urls. Supported version targets are: ${packageManagerSupportedVersionTargets.join(', ')}`));
|
|
58
53
|
}
|
|
59
54
|
versionNew = await getPackageVersion(name, version, {
|
|
60
55
|
...options,
|
|
@@ -63,6 +58,13 @@ async function queryVersions(packageMap, options = {}) {
|
|
|
63
58
|
});
|
|
64
59
|
}
|
|
65
60
|
else {
|
|
61
|
+
// set the getPackageVersion function from options.target
|
|
62
|
+
// TODO: Remove "as GetVersion" and fix types
|
|
63
|
+
const getPackageVersion = packageManager[targetResult];
|
|
64
|
+
if (!getPackageVersion) {
|
|
65
|
+
const packageManagerSupportedVersionTargets = constants_1.supportedVersionTargets.filter(t => t in packageManager);
|
|
66
|
+
return Promise.reject(new Error(`Unsupported target "${targetResult}" for ${options.packageManager || 'npm'}. Supported version targets are: ${packageManagerSupportedVersionTargets.join(', ')}`));
|
|
67
|
+
}
|
|
66
68
|
try {
|
|
67
69
|
versionNew = await getPackageVersion(name, version, {
|
|
68
70
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryVersions.js","sourceRoot":"","sources":["../../../src/lib/queryVersions.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,gDAAuB;AACvB,kDAAyB;AACzB,kDAAwB;AACxB,wDAAkC;AAClC,4CAAsD;AACtD,4EAAmD;AACnD,2EAAiD;AACjD,kDAAmF;AAGnF;;;;;;GAMG;AACH,KAAK,UAAU,aAAa,CAAC,UAA8B,EAAE,UAAmB,EAAE;IAEhF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAA;IACzC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC3C,MAAM,cAAc,GAAG,IAAA,2BAAiB,EAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAEhE,IAAI,GAAgB,CAAA;IACpB,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9G,GAAG,GAAG,IAAI,kBAAW,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;QAClG,GAAG,CAAC,MAAM,EAAE,CAAA;KACb;IAED
|
|
1
|
+
{"version":3,"file":"queryVersions.js","sourceRoot":"","sources":["../../../src/lib/queryVersions.ts"],"names":[],"mappings":"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"}
|
package/build/src/logging.js
CHANGED
|
@@ -111,6 +111,7 @@ function printUpgrades(options, { current, latest, upgraded, numUpgraded, total,
|
|
|
111
111
|
print(options, '');
|
|
112
112
|
// print everything is up-to-date
|
|
113
113
|
const smiley = chalk.green.bold(':)');
|
|
114
|
+
const target = typeof options.target === 'string' ? options.target : 'target';
|
|
114
115
|
if (numUpgraded === 0 && total === 0) {
|
|
115
116
|
if (Object.keys(current).length === 0) {
|
|
116
117
|
print(options, 'No dependencies.');
|
|
@@ -122,7 +123,7 @@ function printUpgrades(options, { current, latest, upgraded, numUpgraded, total,
|
|
|
122
123
|
print(options, `All global packages are up-to-date ${smiley}`);
|
|
123
124
|
}
|
|
124
125
|
else {
|
|
125
|
-
print(options, `All dependencies match the ${
|
|
126
|
+
print(options, `All dependencies match the ${target} package versions ${smiley}`);
|
|
126
127
|
}
|
|
127
128
|
}
|
|
128
129
|
else if (numUpgraded === 0 && total > 0) {
|
package/build/src/logging.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/logging.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/logging.ts"],"names":[],"mappings":"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"}
|
package/build/src/types.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SemVer } from 'semver-utils';
|
|
1
2
|
/** A very generic object. */
|
|
2
3
|
export declare type Index<T = any> = {
|
|
3
4
|
[key: string]: T;
|
|
@@ -20,7 +21,10 @@ export interface PackageManager {
|
|
|
20
21
|
export declare type Version = string;
|
|
21
22
|
export declare type VersionSpec = string;
|
|
22
23
|
export declare type VersionLevel = 'major' | 'minor' | 'patch';
|
|
23
|
-
export declare type
|
|
24
|
+
export declare type FilterFunction = (packageName: string, versionRange: SemVer[]) => boolean;
|
|
25
|
+
export declare type FilterRejectPattern = string | string[] | RegExp | RegExp[] | FilterFunction;
|
|
26
|
+
export declare type TargetFunction = (packageName: string, versionRange: SemVer[]) => string;
|
|
27
|
+
export declare type Target = string | TargetFunction;
|
|
24
28
|
export interface Packument {
|
|
25
29
|
name: string;
|
|
26
30
|
deprecated?: boolean;
|
|
@@ -116,13 +120,13 @@ export interface RunOptions {
|
|
|
116
120
|
*/
|
|
117
121
|
errorLevel?: number;
|
|
118
122
|
/**
|
|
119
|
-
* Include only package names matching the given string, wildcard, glob, comma-or-space-delimited list, or
|
|
123
|
+
* Include only package names matching the given string, wildcard, glob, comma-or-space-delimited list, /regex/ or function that returns true.
|
|
120
124
|
*/
|
|
121
|
-
filter?:
|
|
125
|
+
filter?: FilterRejectPattern;
|
|
122
126
|
/**
|
|
123
|
-
* Filter on package version using comma-or-space-delimited list, or
|
|
127
|
+
* Filter on package version using comma-or-space-delimited list, /regex/ or function that returns true.
|
|
124
128
|
*/
|
|
125
|
-
filterVersion?:
|
|
129
|
+
filterVersion?: FilterRejectPattern;
|
|
126
130
|
/**
|
|
127
131
|
* Enable additional output data, string or comma-delimited list: ownerChanged, repo. ownerChanged: shows if the package owner changed between versions. repo: infers and displays links to source code repository. (default: [])
|
|
128
132
|
*/
|
|
@@ -206,13 +210,13 @@ export interface RunOptions {
|
|
|
206
210
|
*/
|
|
207
211
|
registry?: string;
|
|
208
212
|
/**
|
|
209
|
-
* Exclude packages matching the given string, wildcard, glob, comma-or-space-delimited list, or
|
|
213
|
+
* Exclude packages matching the given string, wildcard, glob, comma-or-space-delimited list, /regex/ or function that returns true.
|
|
210
214
|
*/
|
|
211
|
-
reject?:
|
|
215
|
+
reject?: FilterRejectPattern;
|
|
212
216
|
/**
|
|
213
|
-
* Exclude package.json versions using comma-or-space-delimited list, or
|
|
217
|
+
* Exclude package.json versions using comma-or-space-delimited list, /regex/ or function that returns true.
|
|
214
218
|
*/
|
|
215
|
-
rejectVersion?:
|
|
219
|
+
rejectVersion?: FilterRejectPattern;
|
|
216
220
|
/**
|
|
217
221
|
* Remove version ranges from the final package version.
|
|
218
222
|
*/
|
|
@@ -232,9 +236,9 @@ export interface RunOptions {
|
|
|
232
236
|
*/
|
|
233
237
|
silent?: boolean;
|
|
234
238
|
/**
|
|
235
|
-
* Target version to upgrade to: latest, newest, greatest, minor, patch. Run "ncu --help --target" for details.` (default: "latest")
|
|
239
|
+
* Target function that returns version to upgrade to: latest, newest, greatest, minor, patch. Run "ncu --help --target" for details.` (default: "latest")
|
|
236
240
|
*/
|
|
237
|
-
target?:
|
|
241
|
+
target?: Target;
|
|
238
242
|
/**
|
|
239
243
|
* Global timeout in milliseconds. (default: no global timeout and 30 seconds per npm-registry-fetch).
|
|
240
244
|
*/
|