npm-check-updates 13.0.3 → 13.1.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 +6 -9
- package/build/package.json +19 -15
- package/build/src/bin/cli.js +3 -9
- package/build/src/bin/cli.js.map +1 -1
- package/build/src/cli-options.d.ts +1 -1
- package/build/src/cli-options.js +27 -16
- package/build/src/cli-options.js.map +1 -1
- package/build/src/index.js +32 -9
- package/build/src/index.js.map +1 -1
- package/build/src/lib/doctor.js +14 -10
- package/build/src/lib/doctor.js.map +1 -1
- package/build/src/lib/figgy-pudding/index.js +9 -10
- package/build/src/lib/figgy-pudding/index.js.map +1 -1
- package/build/src/lib/filterAndReject.js.map +1 -1
- package/build/src/lib/findPackage.js.map +1 -1
- package/build/src/lib/getCurrentDependencies.js +2 -4
- package/build/src/lib/getCurrentDependencies.js.map +1 -1
- package/build/src/lib/getIgnoredUpgrades.js +14 -4
- package/build/src/lib/getIgnoredUpgrades.js.map +1 -1
- package/build/src/lib/getInstalledPackages.js +5 -1
- package/build/src/lib/getInstalledPackages.js.map +1 -1
- package/build/src/lib/getNcuRc.js +12 -10
- package/build/src/lib/getNcuRc.js.map +1 -1
- package/build/src/lib/getPackageFileName.js +3 -2
- package/build/src/lib/getPackageFileName.js.map +1 -1
- package/build/src/lib/getPackageManager.js +7 -5
- package/build/src/lib/getPackageManager.js.map +1 -1
- package/build/src/lib/getPeerDependencies.js.map +1 -1
- package/build/src/lib/getPreferredWildcard.js +1 -1
- package/build/src/lib/getPreferredWildcard.js.map +1 -1
- package/build/src/lib/getRepoUrl.js +8 -4
- package/build/src/lib/getRepoUrl.js.map +1 -1
- package/build/src/lib/initOptions.js +13 -12
- package/build/src/lib/initOptions.js.map +1 -1
- package/build/src/lib/isUpgradeable.js +2 -2
- package/build/src/lib/isUpgradeable.js.map +1 -1
- package/build/src/lib/keyValueBy.d.ts +5 -0
- package/build/src/lib/keyValueBy.js +20 -0
- package/build/src/lib/keyValueBy.js.map +1 -0
- package/build/src/lib/libnpmconfig/index.js +8 -11
- package/build/src/lib/libnpmconfig/index.js.map +1 -1
- package/build/src/lib/mergeOptions.js +1 -1
- package/build/src/lib/mergeOptions.js.map +1 -1
- package/build/src/lib/programError.js.map +1 -1
- package/build/src/lib/queryVersions.d.ts +2 -2
- package/build/src/lib/queryVersions.js +20 -16
- package/build/src/lib/queryVersions.js.map +1 -1
- package/build/src/lib/runGlobal.js +16 -5
- package/build/src/lib/runGlobal.js.map +1 -1
- package/build/src/lib/runLocal.js +19 -13
- package/build/src/lib/runLocal.js.map +1 -1
- package/build/src/lib/upgradeDependencies.js +5 -3
- package/build/src/lib/upgradeDependencies.js.map +1 -1
- package/build/src/lib/upgradePackageData.js +1 -1
- package/build/src/lib/upgradePackageData.js.map +1 -1
- package/build/src/lib/upgradePackageDefinitions.d.ts +2 -2
- package/build/src/lib/upgradePackageDefinitions.js +11 -5
- package/build/src/lib/upgradePackageDefinitions.js.map +1 -1
- package/build/src/logging.d.ts +2 -1
- package/build/src/logging.js +52 -18
- package/build/src/logging.js.map +1 -1
- package/build/src/package-managers/filters.js.map +1 -1
- package/build/src/package-managers/gitTags.js +8 -16
- package/build/src/package-managers/gitTags.js.map +1 -1
- package/build/src/package-managers/npm.d.ts +1 -1
- package/build/src/package-managers/npm.js +43 -39
- package/build/src/package-managers/npm.js.map +1 -1
- package/build/src/package-managers/yarn.d.ts +1 -1
- package/build/src/package-managers/yarn.js +26 -25
- package/build/src/package-managers/yarn.js.map +1 -1
- package/build/src/types.d.ts +4 -0
- package/build/src/version-util.js +36 -48
- package/build/src/version-util.js.map +1 -1
- package/package.json +19 -15
package/README.md
CHANGED
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
[](https://github.com/raineorshine/npm-check-updates/actions?query=workflow%3ATests+branch%3Amain)
|
|
5
5
|
[](https://coveralls.io/github/raineorshine/npm-check-updates?branch=main)
|
|
6
6
|
|
|
7
|
-
**npm-check-updates upgrades your package.json dependencies to the
|
|
7
|
+
**npm-check-updates upgrades your package.json dependencies to the _latest_ versions, ignoring specified versions.**
|
|
8
8
|
|
|
9
|
-
- maintains existing semantic versioning
|
|
10
|
-
-
|
|
9
|
+
- maintains existing semantic versioning _policies_, i.e. `"express": "^4.0.0"` to `"express": "^5.0.0"`.
|
|
10
|
+
- _only_ modifies package.json file. Run `npm install` to update your installed packages and package-lock.json.
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
|
|
@@ -51,7 +51,7 @@ Run ncu -u to upgrade package.json
|
|
|
51
51
|
|
|
52
52
|
Upgrade a project's package file:
|
|
53
53
|
|
|
54
|
-
> **Make sure your package file is in version control and all changes have been committed. This
|
|
54
|
+
> **Make sure your package file is in version control and all changes have been committed. This _will_ overwrite your package file.**
|
|
55
55
|
|
|
56
56
|
```sh
|
|
57
57
|
$ ncu -u
|
|
@@ -195,7 +195,7 @@ ncu "/^(?!react-).*$/" # windows
|
|
|
195
195
|
-r, --registry <url> Third-party npm registry.
|
|
196
196
|
-x, --reject <matches> Exclude packages matching the given string,
|
|
197
197
|
wildcard, glob, comma-or-space-delimited list,
|
|
198
|
-
or /regex/.
|
|
198
|
+
or /regex/. (default: [])
|
|
199
199
|
--rejectVersion <matches> Exclude package.json versions using
|
|
200
200
|
comma-or-space-delimited list, or /regex/.
|
|
201
201
|
--removeRange Remove version ranges from the final package
|
|
@@ -269,10 +269,7 @@ For example, `.ncurc.json`:
|
|
|
269
269
|
{
|
|
270
270
|
"upgrade": true,
|
|
271
271
|
"filter": "express",
|
|
272
|
-
"reject": [
|
|
273
|
-
"@types/estree",
|
|
274
|
-
"ts-node"
|
|
275
|
-
]
|
|
272
|
+
"reject": ["@types/estree", "ts-node"]
|
|
276
273
|
}
|
|
277
274
|
```
|
|
278
275
|
|
package/build/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "npm-check-updates",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.1.1",
|
|
4
4
|
"author": "Tomas Junnonen <tomas1@gmail.com>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"contributors": [
|
|
@@ -27,14 +27,16 @@
|
|
|
27
27
|
"main": "build/src/index.js",
|
|
28
28
|
"scripts": {
|
|
29
29
|
"build": "npm run build:ts && npm run build:readme",
|
|
30
|
-
"build:ts": "tsc
|
|
30
|
+
"build:ts": "tsc",
|
|
31
31
|
"build:readme": "node scripts/buildReadme.js",
|
|
32
32
|
"lint": "cross-env FORCE_COLOR=1 npm-run-all --parallel --aggregate-output lint:*",
|
|
33
33
|
"lint:lockfile": "lockfile-lint",
|
|
34
34
|
"lint:markdown": "markdownlint \"**/*.md\" --ignore node_modules --ignore build --config .markdownlint.js",
|
|
35
35
|
"lint:src": "eslint --cache --cache-location node_modules/.cache/.eslintcache --ignore-path .gitignore --report-unused-disable-directives .",
|
|
36
36
|
"c8": "c8",
|
|
37
|
+
"prepare": "husky install",
|
|
37
38
|
"prepublishOnly": "npm run build",
|
|
39
|
+
"prettier": "prettier .",
|
|
38
40
|
"test": "npm run test:src && npm run test:timeout",
|
|
39
41
|
"test:src": "mocha test src/test test/package-managers/npm test/package-managers/yarn",
|
|
40
42
|
"test:timeout": "mocha --exit test/timeout",
|
|
@@ -56,7 +58,7 @@
|
|
|
56
58
|
"chalk": "^4.1.2",
|
|
57
59
|
"cint": "^8.2.1",
|
|
58
60
|
"cli-table": "^0.3.11",
|
|
59
|
-
"commander": "^9.
|
|
61
|
+
"commander": "^9.3.0",
|
|
60
62
|
"fast-memoize": "^2.5.2",
|
|
61
63
|
"find-up": "5.0.0",
|
|
62
64
|
"fp-and-or": "^0.1.3",
|
|
@@ -66,9 +68,9 @@
|
|
|
66
68
|
"json-parse-helpfulerror": "^1.0.3",
|
|
67
69
|
"jsonlines": "^0.1.1",
|
|
68
70
|
"lodash": "^4.17.21",
|
|
69
|
-
"minimatch": "^5.0
|
|
71
|
+
"minimatch": "^5.1.0",
|
|
70
72
|
"p-map": "^4.0.0",
|
|
71
|
-
"pacote": "^13.
|
|
73
|
+
"pacote": "^13.5.0",
|
|
72
74
|
"parse-github-url": "^1.0.2",
|
|
73
75
|
"progress": "^2.0.3",
|
|
74
76
|
"prompts": "^2.4.2",
|
|
@@ -80,7 +82,7 @@
|
|
|
80
82
|
"source-map-support": "^0.5.21",
|
|
81
83
|
"spawn-please": "^1.0.0",
|
|
82
84
|
"update-notifier": "^5.1.0",
|
|
83
|
-
"yaml": "^2.1.
|
|
85
|
+
"yaml": "^2.1.1"
|
|
84
86
|
},
|
|
85
87
|
"devDependencies": {
|
|
86
88
|
"@types/chai": "^4.3.1",
|
|
@@ -89,11 +91,11 @@
|
|
|
89
91
|
"@types/cli-table": "^0.3.0",
|
|
90
92
|
"@types/hosted-git-info": "^3.0.2",
|
|
91
93
|
"@types/json-parse-helpfulerror": "^1.0.1",
|
|
92
|
-
"@types/jsonlines": "^0.1.
|
|
94
|
+
"@types/jsonlines": "^0.1.2",
|
|
93
95
|
"@types/lodash": "^4.14.182",
|
|
94
96
|
"@types/minimatch": "^3.0.5",
|
|
95
97
|
"@types/mocha": "^9.1.1",
|
|
96
|
-
"@types/node": "^17.0.
|
|
98
|
+
"@types/node": "^17.0.38",
|
|
97
99
|
"@types/pacote": "^11.1.3",
|
|
98
100
|
"@types/parse-github-url": "^1.0.0",
|
|
99
101
|
"@types/progress": "^2.0.5",
|
|
@@ -103,19 +105,20 @@
|
|
|
103
105
|
"@types/semver": "^7.3.9",
|
|
104
106
|
"@types/semver-utils": "^1.1.1",
|
|
105
107
|
"@types/update-notifier": "^5.1.0",
|
|
106
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
107
|
-
"@typescript-eslint/parser": "^5.
|
|
108
|
-
"c8": "^7.11.
|
|
108
|
+
"@typescript-eslint/eslint-plugin": "^5.27.0",
|
|
109
|
+
"@typescript-eslint/parser": "^5.27.0",
|
|
110
|
+
"c8": "^7.11.3",
|
|
109
111
|
"chai": "^4.3.6",
|
|
110
112
|
"chai-as-promised": "^7.1.1",
|
|
111
113
|
"chai-string": "^1.5.0",
|
|
112
114
|
"cross-env": "^7.0.3",
|
|
113
|
-
"eslint": "^8.
|
|
115
|
+
"eslint": "^8.16.0",
|
|
116
|
+
"eslint-config-prettier": "^8.5.0",
|
|
114
117
|
"eslint-config-raine": "^0.3.0",
|
|
115
118
|
"eslint-config-standard": "^17.0.0",
|
|
116
119
|
"eslint-plugin-fp": "^2.3.0",
|
|
117
120
|
"eslint-plugin-import": "^2.26.0",
|
|
118
|
-
"eslint-plugin-jsdoc": "^39.3.
|
|
121
|
+
"eslint-plugin-jsdoc": "^39.3.2",
|
|
119
122
|
"eslint-plugin-node": "^11.1.0",
|
|
120
123
|
"eslint-plugin-promise": "^6.0.0",
|
|
121
124
|
"husky": "^8.0.1",
|
|
@@ -123,10 +126,11 @@
|
|
|
123
126
|
"markdownlint-cli": "^0.31.1",
|
|
124
127
|
"mocha": "^10.0.0",
|
|
125
128
|
"npm-run-all": "^4.1.5",
|
|
129
|
+
"prettier": "2.6.2",
|
|
126
130
|
"should": "^13.2.3",
|
|
127
131
|
"strip-ansi": "^6.0.1",
|
|
128
|
-
"ts-node": "^10.
|
|
129
|
-
"typescript": "^4.
|
|
132
|
+
"ts-node": "^10.8.0",
|
|
133
|
+
"typescript": "^4.7.2",
|
|
130
134
|
"yarn": "^1.22.18"
|
|
131
135
|
},
|
|
132
136
|
"files": [
|
package/build/src/bin/cli.js
CHANGED
|
@@ -90,21 +90,15 @@ const rcResult = !programOpts.global && (!process.env.NCU_TESTS || configFilePat
|
|
|
90
90
|
? (0, getNcuRc_1.default)({ configFileName, configFilePath, packageFile })
|
|
91
91
|
: null;
|
|
92
92
|
// insert config arguments into command line arguments so they can all be parsed by commander
|
|
93
|
-
const combinedArguments = [
|
|
94
|
-
...process.argv.slice(0, 2),
|
|
95
|
-
...(rcResult === null || rcResult === void 0 ? void 0 : rcResult.args) || [],
|
|
96
|
-
...process.argv.slice(2),
|
|
97
|
-
];
|
|
93
|
+
const combinedArguments = [...process.argv.slice(0, 2), ...((rcResult === null || rcResult === void 0 ? void 0 : rcResult.args) || []), ...process.argv.slice(2)];
|
|
98
94
|
commander_1.program.parse(combinedArguments);
|
|
99
95
|
programOpts = commander_1.program.opts();
|
|
100
96
|
// filter out undefined program options and combine cli options with config file options
|
|
101
97
|
const options = {
|
|
102
|
-
...rcResult && Object.keys(rcResult.config).length > 0
|
|
103
|
-
? { rcConfigPath: rcResult.filePath }
|
|
104
|
-
: null,
|
|
98
|
+
...(rcResult && Object.keys(rcResult.config).length > 0 ? { rcConfigPath: rcResult.filePath } : null),
|
|
105
99
|
...lodash_1.default.pickBy(commander_1.program.opts(), value => value !== undefined),
|
|
106
100
|
args: commander_1.program.args,
|
|
107
|
-
...programOpts.filter ? { filter: programOpts.filter } : null,
|
|
101
|
+
...(programOpts.filter ? { filter: programOpts.filter } : null),
|
|
108
102
|
};
|
|
109
103
|
// NOTE: Options handling and defaults go in initOptions in index.js
|
|
110
104
|
(0, index_1.default)(options, { cli: true });
|
package/build/src/bin/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/bin/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAAmC;AACnC,oDAAsB;AACtB,sEAA4C;AAC5C,qDAA0B;AAC1B,sEAAoC;AACpC,8DAA0D;AAC1D,+DAAsC;AAEtC,8EAA8E;AAC9E,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,EAAE,GAAG,EAAH,sBAAG,EAAE,CAAC,CAAA;AACxC,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,sBAAG,CAAC,OAAO,EAAE;IAC7D,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;CAClD;AAED,uCAAuC;AACvC,+DAA+D;AAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AACrC,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;IACpD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAA;IAC3D,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACxB,MAAM,MAAM,GAAG,2BAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC1C,IAAI,MAAM,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;YAC1C,IAAI,MAAM,CAAC,KAAK,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,eAAe,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;aAC3C;YACD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE;gBACnG,OAAO,CAAC,GAAG,CAAC,YAAY,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;aAC1C;YACD,IAAI,MAAM,CAAC,IAAI,EAAE;gBACf,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;aAChC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/bin/cli.ts"],"names":[],"mappings":"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"}
|
package/build/src/cli-options.js
CHANGED
|
@@ -20,14 +20,23 @@ const getHelpTargetTable = () => {
|
|
|
20
20
|
const table = new cli_table_1.default({
|
|
21
21
|
colAligns: ['right', 'left'],
|
|
22
22
|
});
|
|
23
|
-
table.push([
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
table.push([
|
|
24
|
+
'greatest',
|
|
25
|
+
`Upgrade to the highest version number, regardless of release date or tag.
|
|
26
|
+
Includes prereleases.`,
|
|
27
|
+
]);
|
|
28
|
+
table.push([
|
|
29
|
+
'latest',
|
|
30
|
+
`Upgrade to whatever the package's "latest" git tag points to. It's usually the
|
|
26
31
|
non-prerelease version with the highest version number, but is ultimately decided
|
|
27
|
-
by each project's maintainers. Default
|
|
32
|
+
by each project's maintainers. Default.`,
|
|
33
|
+
]);
|
|
28
34
|
table.push(['minor', 'Upgrade to the highest minor version without bumping the major version.']);
|
|
29
|
-
table.push([
|
|
30
|
-
|
|
35
|
+
table.push([
|
|
36
|
+
'newest',
|
|
37
|
+
`Upgrade to the version with the most recent publish date, even if there are
|
|
38
|
+
other version numbers that are higher. Includes prereleases.`,
|
|
39
|
+
]);
|
|
31
40
|
table.push(['patch', `Upgrade to the highest patch version without bumping the minor or major versions.`]);
|
|
32
41
|
return `Set the target version that is upgraded to. (default: "latest")
|
|
33
42
|
|
|
@@ -42,8 +51,8 @@ You can also specify a custom function in your .ncurc.js file, or when importing
|
|
|
42
51
|
@returns One of the valid target values (specified in the table above).
|
|
43
52
|
*/`)}
|
|
44
53
|
${chalk_1.default.cyan('target')}: (dependencyName, [{ semver, version, operator, major, minor, patch, release, build }]) ${chalk_1.default.cyan('=>')} {
|
|
45
|
-
${chalk_1.default.red('if')} (major ${chalk_1.default.red('===')} ${chalk_1.default.blue('0')}) ${chalk_1.default.red('return')} ${chalk_1.default.yellow('
|
|
46
|
-
${chalk_1.default.red('return')} ${chalk_1.default.yellow('
|
|
54
|
+
${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'")}
|
|
55
|
+
${chalk_1.default.red('return')} ${chalk_1.default.yellow("'latest'")}
|
|
47
56
|
}
|
|
48
57
|
|
|
49
58
|
`;
|
|
@@ -85,7 +94,7 @@ const cliOptions = [
|
|
|
85
94
|
long: 'dep',
|
|
86
95
|
arg: 'value',
|
|
87
96
|
description: 'Check one or more sections of dependencies only: dev, optional, peer, prod, bundle (comma-delimited).',
|
|
88
|
-
default: 'prod,dev,bundle,optional'
|
|
97
|
+
default: 'prod,dev,bundle,optional',
|
|
89
98
|
},
|
|
90
99
|
{
|
|
91
100
|
long: 'deprecated',
|
|
@@ -134,7 +143,7 @@ const cliOptions = [
|
|
|
134
143
|
long: 'format',
|
|
135
144
|
arg: 'value',
|
|
136
145
|
description: '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.',
|
|
137
|
-
parse: value => typeof value === 'string' ? value.split(',') : value,
|
|
146
|
+
parse: value => (typeof value === 'string' ? value.split(',') : value),
|
|
138
147
|
default: [],
|
|
139
148
|
type: 'string[]',
|
|
140
149
|
},
|
|
@@ -172,7 +181,7 @@ const cliOptions = [
|
|
|
172
181
|
{
|
|
173
182
|
long: 'mergeConfig',
|
|
174
183
|
description: `Merges nested configs with the root config file for --deep or --packageFile options. (default: false)`,
|
|
175
|
-
type: 'boolean'
|
|
184
|
+
type: 'boolean',
|
|
176
185
|
},
|
|
177
186
|
{
|
|
178
187
|
long: 'minimal',
|
|
@@ -235,7 +244,7 @@ As a comparison: without using the --peer option, ncu will suggest the latest ve
|
|
|
235
244
|
|
|
236
245
|
ncu-test-peer-update 1.0.0 → 1.${chalk_1.default.cyan('1.0')}
|
|
237
246
|
ncu-test-return-version 1.0.0 → ${chalk_1.default.red('2.0.0')}
|
|
238
|
-
|
|
247
|
+
`,
|
|
239
248
|
},
|
|
240
249
|
{
|
|
241
250
|
long: 'pre',
|
|
@@ -261,6 +270,8 @@ As a comparison: without using the --peer option, ncu will suggest the latest ve
|
|
|
261
270
|
arg: 'matches',
|
|
262
271
|
description: 'Exclude packages matching the given string, wildcard, glob, comma-or-space-delimited list, or /regex/.',
|
|
263
272
|
type: 'string | string[] | RegExp | RegExp[] | Function',
|
|
273
|
+
parse: (s, p) => p.concat([s]),
|
|
274
|
+
default: [],
|
|
264
275
|
},
|
|
265
276
|
{
|
|
266
277
|
long: 'rejectVersion',
|
|
@@ -270,7 +281,7 @@ As a comparison: without using the --peer option, ncu will suggest the latest ve
|
|
|
270
281
|
},
|
|
271
282
|
{
|
|
272
283
|
long: 'removeRange',
|
|
273
|
-
description: 'Remove version ranges from the final package version.'
|
|
284
|
+
description: 'Remove version ranges from the final package version.',
|
|
274
285
|
},
|
|
275
286
|
{
|
|
276
287
|
long: 'retry',
|
|
@@ -282,7 +293,7 @@ As a comparison: without using the --peer option, ncu will suggest the latest ve
|
|
|
282
293
|
{
|
|
283
294
|
long: 'silent',
|
|
284
295
|
short: 's',
|
|
285
|
-
description:
|
|
296
|
+
description: "Don't output anything (--loglevel silent).",
|
|
286
297
|
},
|
|
287
298
|
{
|
|
288
299
|
long: 'target',
|
|
@@ -306,8 +317,8 @@ As a comparison: without using the --peer option, ncu will suggest the latest ve
|
|
|
306
317
|
// put cliOptions into an object for O(1) lookups
|
|
307
318
|
exports.cliOptionsMap = cliOptions.reduce((accum, option) => ({
|
|
308
319
|
...accum,
|
|
309
|
-
...option.short ? { [option.short]: option } : null,
|
|
310
|
-
...option.long ? { [option.long]: option } : null,
|
|
320
|
+
...(option.short ? { [option.short]: option } : null),
|
|
321
|
+
...(option.long ? { [option.long]: option } : null),
|
|
311
322
|
}), {});
|
|
312
323
|
const cliOptionsSorted = lodash_1.default.sortBy(cliOptions, 'long');
|
|
313
324
|
exports.default = cliOptionsSorted;
|
|
@@ -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;AAe/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,
|
|
1
|
+
{"version":3,"file":"cli-options.js","sourceRoot":"","sources":["../../src/cli-options.ts"],"names":[],"mappings":"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"}
|
package/build/src/index.js
CHANGED
|
@@ -25,6 +25,28 @@ const runLocal_1 = __importDefault(require("./lib/runLocal"));
|
|
|
25
25
|
process.on('unhandledRejection', err => {
|
|
26
26
|
throw err;
|
|
27
27
|
});
|
|
28
|
+
/**
|
|
29
|
+
* Volta is a tool for managing JavaScript tooling like Node and npm. Volta has
|
|
30
|
+
* its own system for installing global packages which circumvents npm, so
|
|
31
|
+
* commands like `npm ls -g` do not accurately reflect what is installed.
|
|
32
|
+
*
|
|
33
|
+
* The ability to use `npm ls -g` is tracked in this Volta issue: https://github.com/volta-cli/volta/issues/1012
|
|
34
|
+
*/
|
|
35
|
+
function checkIfVolta(options) {
|
|
36
|
+
var _a;
|
|
37
|
+
// The first check is for macOS/Linux and the second check is for Windows
|
|
38
|
+
if (options.global && (!!process.env.VOLTA_HOME || ((_a = process.env.PATH) === null || _a === void 0 ? void 0 : _a.includes('\\Volta')))) {
|
|
39
|
+
const message = 'It appears you are using Volta. `npm-check-updates --global` ' +
|
|
40
|
+
'cannot be used with Volta because Volta has its own system for ' +
|
|
41
|
+
'managing global packages which circumvents npm.\n\n' +
|
|
42
|
+
'If you are still receiving this message after uninstalling Volta, ' +
|
|
43
|
+
'ensure your PATH does not contain an entry for Volta and your ' +
|
|
44
|
+
'shell profile does not define VOLTA_HOME. You may need to reboot ' +
|
|
45
|
+
'for changes to your shell profile to take effect.';
|
|
46
|
+
(0, logging_1.print)(options, message, 'error');
|
|
47
|
+
process.exit(1);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
28
50
|
/** Main entry point.
|
|
29
51
|
*
|
|
30
52
|
* @returns Promise<
|
|
@@ -36,6 +58,7 @@ process.on('unhandledRejection', err => {
|
|
|
36
58
|
async function run(runOptions = {}, { cli } = {}) {
|
|
37
59
|
const chalk = runOptions.color ? new chalk_1.default.Instance({ level: 1 }) : chalk_1.default;
|
|
38
60
|
const options = (0, initOptions_1.default)(runOptions, { cli });
|
|
61
|
+
checkIfVolta(options);
|
|
39
62
|
(0, logging_1.print)(options, 'Initializing', 'verbose');
|
|
40
63
|
if (options.packageManager === 'npm' && !options.prefix) {
|
|
41
64
|
options.prefix = await package_managers_1.default.npm.defaultPrefix(options);
|
|
@@ -46,9 +69,7 @@ async function run(runOptions = {}, { cli } = {}) {
|
|
|
46
69
|
let timeout;
|
|
47
70
|
let timeoutPromise = new Promise(() => null);
|
|
48
71
|
if (options.timeout) {
|
|
49
|
-
const timeoutMs = lodash_1.default.isString(options.timeout)
|
|
50
|
-
? Number.parseInt(options.timeout, 10)
|
|
51
|
-
: options.timeout;
|
|
72
|
+
const timeoutMs = lodash_1.default.isString(options.timeout) ? Number.parseInt(options.timeout, 10) : options.timeout;
|
|
52
73
|
timeoutPromise = new Promise((resolve, reject) => {
|
|
53
74
|
timeout = setTimeout(() => {
|
|
54
75
|
// must catch the error and reject explicitly since we are in a setTimeout
|
|
@@ -57,7 +78,9 @@ async function run(runOptions = {}, { cli } = {}) {
|
|
|
57
78
|
try {
|
|
58
79
|
(0, programError_1.default)(options, chalk.red(error));
|
|
59
80
|
}
|
|
60
|
-
catch (e) {
|
|
81
|
+
catch (e) {
|
|
82
|
+
/* noop */
|
|
83
|
+
}
|
|
61
84
|
}, timeoutMs);
|
|
62
85
|
});
|
|
63
86
|
}
|
|
@@ -65,10 +88,9 @@ async function run(runOptions = {}, { cli } = {}) {
|
|
|
65
88
|
async function runUpgrades() {
|
|
66
89
|
const defaultPackageFilename = (0, getPackageFileName_1.default)(options);
|
|
67
90
|
const pkgs = globby_1.default.sync(options.cwd
|
|
68
|
-
? path_1.default.resolve(options.cwd.replace(/^~/, os_1.default.homedir()), defaultPackageFilename)
|
|
69
|
-
.replace(/\\/g, '/') // convert Windows path to *nix path for globby
|
|
91
|
+
? path_1.default.resolve(options.cwd.replace(/^~/, os_1.default.homedir()), defaultPackageFilename).replace(/\\/g, '/') // convert Windows path to *nix path for globby
|
|
70
92
|
: defaultPackageFilename, {
|
|
71
|
-
ignore: ['**/node_modules/**']
|
|
93
|
+
ignore: ['**/node_modules/**'],
|
|
72
94
|
});
|
|
73
95
|
options.deep = options.deep || pkgs.length > 1;
|
|
74
96
|
let analysis;
|
|
@@ -97,10 +119,11 @@ async function run(runOptions = {}, { cli } = {}) {
|
|
|
97
119
|
...packages,
|
|
98
120
|
// index by relative path if cwd was specified
|
|
99
121
|
[pkgOptions.cwd
|
|
100
|
-
? path_1.default
|
|
122
|
+
? path_1.default
|
|
123
|
+
.relative(path_1.default.resolve(pkgOptions.cwd), pkgFile)
|
|
101
124
|
// convert Windows path to *nix path for consistency
|
|
102
125
|
.replace(/\\/g, '/')
|
|
103
|
-
: pkgFile]: await (0, runLocal_1.default)(pkgOptions, pkgData, pkgFile)
|
|
126
|
+
: pkgFile]: await (0, runLocal_1.default)(pkgOptions, pkgData, pkgFile),
|
|
104
127
|
};
|
|
105
128
|
}, Promise.resolve({}));
|
|
106
129
|
if (options.json) {
|
package/build/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,oDAA2B;AAC3B,oDAAsB;AACtB,kDAAyB;AACzB,0EAAgD;AAChD,2CAA4C;AAC5C,uCAA4C;AAC5C,oEAA2C;AAC3C,0DAAiC;AACjC,8DAAqC;AACrC,kFAAyD;AACzD,sEAA6C;AAC7C,oEAA2C;AAC3C,sEAA6C;AAC7C,gEAAuC;AACvC,8DAAqC;AAGrC,6EAA6E;AAC7E,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,CAAC,EAAE;IACrC,MAAM,GAAG,CAAA;AACX,CAAC,CAAC,CAAA;AAEF;;;;;;;GAOG;AACI,KAAK,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/build/src/lib/doctor.js
CHANGED
|
@@ -20,7 +20,7 @@ const npm = (args, options, print) => {
|
|
|
20
20
|
const spawnOptions = {
|
|
21
21
|
cwd: options.cwd || process.cwd(),
|
|
22
22
|
env: { ...process.env, CI: '1' },
|
|
23
|
-
...options
|
|
23
|
+
...options,
|
|
24
24
|
};
|
|
25
25
|
return (options.packageManager === 'yarn' ? yarn_1.default : npm_1.default)(args, options, spawnOptions);
|
|
26
26
|
};
|
|
@@ -88,12 +88,11 @@ const doctor = async (run, options) => {
|
|
|
88
88
|
try {
|
|
89
89
|
lockFile = fs_1.default.readFileSync(lockFileName, 'utf-8');
|
|
90
90
|
}
|
|
91
|
-
catch (e) {
|
|
92
|
-
}
|
|
91
|
+
catch (e) { }
|
|
93
92
|
// make sure current tests pass before we begin
|
|
94
93
|
try {
|
|
95
94
|
await runTests({
|
|
96
|
-
stderr: (data) => console.error(chalk.red(data.toString()))
|
|
95
|
+
stderr: (data) => console.error(chalk.red(data.toString())),
|
|
97
96
|
});
|
|
98
97
|
}
|
|
99
98
|
catch (e) {
|
|
@@ -102,12 +101,16 @@ const doctor = async (run, options) => {
|
|
|
102
101
|
console.log(`Upgrading all dependencies and re-running tests`);
|
|
103
102
|
// upgrade all dependencies
|
|
104
103
|
// save upgrades for later in case we need to iterate
|
|
105
|
-
console.log(chalk.blue('ncu ' +
|
|
106
|
-
|
|
104
|
+
console.log(chalk.blue('ncu ' +
|
|
105
|
+
process.argv
|
|
106
|
+
.slice(2)
|
|
107
|
+
.filter(arg => arg !== '--doctor')
|
|
108
|
+
.join(' ')));
|
|
109
|
+
const upgrades = (await run({
|
|
107
110
|
...options,
|
|
108
111
|
silent: true,
|
|
109
112
|
doctor: false, // --doctor triggers the initial call to doctor, but the internal call executes npm-check-updates normally in order to upgrade the dependencies
|
|
110
|
-
});
|
|
113
|
+
}));
|
|
111
114
|
if (Object.keys(upgrades || {}).length === 0) {
|
|
112
115
|
console.log('All dependencies are up-to-date ' + chalk.green.bold(':)'));
|
|
113
116
|
return;
|
|
@@ -123,7 +126,7 @@ const doctor = async (run, options) => {
|
|
|
123
126
|
current: allDependencies,
|
|
124
127
|
upgraded: upgrades,
|
|
125
128
|
numUpgraded,
|
|
126
|
-
total: numUpgraded
|
|
129
|
+
total: numUpgraded,
|
|
127
130
|
});
|
|
128
131
|
console.log('\nAll dependencies upgraded and installed ' + chalk.green(':)'));
|
|
129
132
|
}
|
|
@@ -142,9 +145,10 @@ const doctor = async (run, options) => {
|
|
|
142
145
|
let lastPkgFile = pkgFile;
|
|
143
146
|
await runInstall();
|
|
144
147
|
// iterate upgrades
|
|
145
|
-
|
|
148
|
+
// eslint-disable-next-line fp/no-loops
|
|
149
|
+
for (const [name, version] of Object.entries(upgrades)) {
|
|
146
150
|
// install single dependency
|
|
147
|
-
await npm([...options.packageManager === 'yarn' ? ['add'] : ['install', '--no-save'], `${name}@${version}`], { packageManager: options.packageManager }, true);
|
|
151
|
+
await npm([...(options.packageManager === 'yarn' ? ['add'] : ['install', '--no-save']), `${name}@${version}`], { packageManager: options.packageManager }, true);
|
|
148
152
|
try {
|
|
149
153
|
await runTests();
|
|
150
154
|
console.log(` ${chalk.green('✓')} ${name} ${allDependencies[name]} → ${version}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/lib/doctor.ts"],"names":[],"mappings":";;;;;AAAA,4CAAmB;AACnB,kDAAyB;AACzB,oDAA2B;AAC3B,8EAAqD;AACrD,wCAA0C;AAC1C,gEAAgC;AAChC,oEAAgD;AAChD,kEAA8C;AAK9C,kCAAkC;AAClC,MAAM,GAAG,GAAG,CAAC,IAAc,EAAE,OAA+B,EAAE,KAAe,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/lib/doctor.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ class FiggyPudding {
|
|
|
10
10
|
if (realSpec) {
|
|
11
11
|
const aliasArr = realSpec.aliases || [];
|
|
12
12
|
aliasArr.push(alias, key);
|
|
13
|
-
realSpec.aliases = [...
|
|
13
|
+
realSpec.aliases = [...new Set(aliasArr)];
|
|
14
14
|
this.__specs[alias] = realSpec;
|
|
15
15
|
}
|
|
16
16
|
else {
|
|
@@ -19,13 +19,15 @@ class FiggyPudding {
|
|
|
19
19
|
}
|
|
20
20
|
});
|
|
21
21
|
this.__opts = opts || {};
|
|
22
|
-
this.__providers = reverse(
|
|
22
|
+
this.__providers = reverse(providers.filter(x => x != null && typeof x === 'object'));
|
|
23
23
|
this.__isFiggyPudding = true;
|
|
24
24
|
}
|
|
25
25
|
get(key) {
|
|
26
26
|
return pudGet(this, key, true);
|
|
27
27
|
}
|
|
28
|
-
get [Symbol.toStringTag]() {
|
|
28
|
+
get [Symbol.toStringTag]() {
|
|
29
|
+
return 'FiggyPudding';
|
|
30
|
+
}
|
|
29
31
|
forEach(fn, thisArg = this) {
|
|
30
32
|
for (let [key, value] of this.entries()) {
|
|
31
33
|
fn.call(thisArg, value, key, this);
|
|
@@ -78,7 +80,7 @@ class FiggyPudding {
|
|
|
78
80
|
try {
|
|
79
81
|
const util = require('util');
|
|
80
82
|
FiggyPudding.prototype[util.inspect.custom] = function (depth, opts) {
|
|
81
|
-
return
|
|
83
|
+
return this[Symbol.toStringTag] + ' ' + util.inspect(this.toJSON(), opts);
|
|
82
84
|
};
|
|
83
85
|
}
|
|
84
86
|
catch (e) { }
|
|
@@ -146,16 +148,13 @@ const proxyHandler = {
|
|
|
146
148
|
return Object.keys(obj.__specs);
|
|
147
149
|
},
|
|
148
150
|
get(obj, prop) {
|
|
149
|
-
if (typeof prop === 'symbol' ||
|
|
150
|
-
prop.slice(0, 2) === '__' ||
|
|
151
|
-
prop in FiggyPudding.prototype) {
|
|
151
|
+
if (typeof prop === 'symbol' || prop.slice(0, 2) === '__' || prop in FiggyPudding.prototype) {
|
|
152
152
|
return obj[prop];
|
|
153
153
|
}
|
|
154
154
|
return obj.get(prop);
|
|
155
155
|
},
|
|
156
156
|
set(obj, prop, value) {
|
|
157
|
-
if (typeof prop === 'symbol' ||
|
|
158
|
-
prop.slice(0, 2) === '__') {
|
|
157
|
+
if (typeof prop === 'symbol' || prop.slice(0, 2) === '__') {
|
|
159
158
|
obj[prop] = value;
|
|
160
159
|
return true;
|
|
161
160
|
}
|
|
@@ -165,7 +164,7 @@ const proxyHandler = {
|
|
|
165
164
|
},
|
|
166
165
|
deleteProperty() {
|
|
167
166
|
throw new Error('figgyPudding options cannot be deleted. Use .concat() and shadow them instead.');
|
|
168
|
-
}
|
|
167
|
+
},
|
|
169
168
|
};
|
|
170
169
|
module.exports = figgyPudding;
|
|
171
170
|
function figgyPudding(specs, opts) {
|