@salesforce/plugin-trust 1.0.7 → 1.0.11
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/CHANGELOG.md +23 -0
- package/README.md +1 -1
- package/lib/commands/plugins/trust/verify.js +4 -3
- package/lib/commands/plugins/trust/verify.js.map +1 -1
- package/lib/hooks/verifyInstallSignature.js +3 -2
- package/lib/hooks/verifyInstallSignature.js.map +1 -1
- package/lib/lib/installationVerification.d.ts +1 -0
- package/lib/lib/installationVerification.js +10 -7
- package/lib/lib/installationVerification.js.map +1 -1
- package/lib/lib/npmCommand.d.ts +28 -4
- package/lib/lib/npmCommand.js +128 -15
- package/lib/lib/npmCommand.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +7 -5
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,29 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [1.0.11](https://github.com/salesforcecli/plugin-trust/compare/v1.0.10...v1.0.11) (2021-11-03)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* poll `npm pack` until tarball is available ([#185](https://github.com/salesforcecli/plugin-trust/issues/185)) ([001c1ab](https://github.com/salesforcecli/plugin-trust/commit/001c1ab3c79277bf411bc3e4459396e859e5672c))
|
|
11
|
+
|
|
12
|
+
### [1.0.10](https://github.com/salesforcecli/plugin-trust/compare/v1.0.9...v1.0.10) (2021-10-12)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* update dependencies ([094ea03](https://github.com/salesforcecli/plugin-trust/commit/094ea03c1f99333b75008376d8be1494e3a794ea))
|
|
18
|
+
|
|
19
|
+
### [1.0.9](https://github.com/salesforcecli/plugin-trust/compare/v1.0.8...v1.0.9) (2021-10-12)
|
|
20
|
+
|
|
21
|
+
### [1.0.8](https://github.com/salesforcecli/plugin-trust/compare/v1.0.7...v1.0.8) (2021-09-24)
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
### Bug Fixes
|
|
25
|
+
|
|
26
|
+
* verify fails if node not installed ([#167](https://github.com/salesforcecli/plugin-trust/issues/167)) ([0393b90](https://github.com/salesforcecli/plugin-trust/commit/0393b906a30e8858816625517eda5db69377c178)), closes [#168](https://github.com/salesforcecli/plugin-trust/issues/168)
|
|
27
|
+
|
|
5
28
|
### [1.0.7](https://github.com/salesforcecli/plugin-trust/compare/v1.0.6...v1.0.7) (2021-09-17)
|
|
6
29
|
|
|
7
30
|
|
package/README.md
CHANGED
|
@@ -118,5 +118,5 @@ EXAMPLES
|
|
|
118
118
|
sfdx plugins:trust:verify --npm @scope/npmName
|
|
119
119
|
```
|
|
120
120
|
|
|
121
|
-
_See code: [src/commands/plugins/trust/verify.ts](https://github.com/salesforcecli/plugin-trust/blob/v1.0.
|
|
121
|
+
_See code: [src/commands/plugins/trust/verify.ts](https://github.com/salesforcecli/plugin-trust/blob/v1.0.10/src/commands/plugins/trust/verify.ts)_
|
|
122
122
|
<!-- commandsstop -->
|
|
@@ -22,9 +22,10 @@ class Verify extends command_1.SfdxCommand {
|
|
|
22
22
|
this.logger.debug(`running verify command for npm: ${npmName.name}`);
|
|
23
23
|
const vConfig = new installationVerification_1.VerificationConfig();
|
|
24
24
|
const configContext = {
|
|
25
|
-
cacheDir: ts_types_1.get(this.config, '
|
|
26
|
-
configDir: ts_types_1.get(this.config, '
|
|
27
|
-
dataDir: ts_types_1.get(this.config, 'dataDir'),
|
|
25
|
+
cacheDir: (0, ts_types_1.get)(this.config, 'cacheDir'),
|
|
26
|
+
configDir: (0, ts_types_1.get)(this.config, 'configDir'),
|
|
27
|
+
dataDir: (0, ts_types_1.get)(this.config, 'dataDir'),
|
|
28
|
+
cliRoot: (0, ts_types_1.get)(this.config, 'root'),
|
|
28
29
|
};
|
|
29
30
|
this.logger.debug(`cacheDir: ${configContext.cacheDir}`);
|
|
30
31
|
this.logger.debug(`configDir: ${configContext.configDir}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/commands/plugins/trust/verify.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,mDAA2C;AAC3C,iDAAsE;AACtE,2CAAuD;AACvD,oFAAoH;AACpH,kDAA+C;AAE/C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,0BAA0B,EAAE,QAAQ,CAAC,CAAC;AAO7E,MAAa,MAAO,SAAQ,qBAAW;IAiB9B,KAAK,CAAC,GAAG;QACd,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAE/C,MAAM,OAAO,GAAY,iBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAErE,MAAM,OAAO,GAAG,IAAI,6CAAkB,EAAE,CAAC;QAEzC,MAAM,aAAa,GAAkB;YACnC,QAAQ,EAAE,cAAG,
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/commands/plugins/trust/verify.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,12 +46,13 @@ const hook = async function (options) {
|
|
|
46
46
|
cacheDir: options.config.cacheDir,
|
|
47
47
|
configDir: options.config.configDir,
|
|
48
48
|
dataDir: options.config.dataDir,
|
|
49
|
+
cliRoot: options.config.root,
|
|
49
50
|
};
|
|
50
51
|
const vConfig = VerificationConfigBuilder.build(npmName, configContext);
|
|
51
52
|
logger.debug('finished building the VerificationConfigBuilder');
|
|
52
53
|
try {
|
|
53
54
|
logger.debug('doing verification');
|
|
54
|
-
await installationVerification_1.doInstallationCodeSigningVerification(configContext, { plugin: plugin.name, tag: plugin.tag }, vConfig);
|
|
55
|
+
await (0, installationVerification_1.doInstallationCodeSigningVerification)(configContext, { plugin: plugin.name, tag: plugin.tag }, vConfig);
|
|
55
56
|
cli_ux_1.cli.log('Finished digital signature check.');
|
|
56
57
|
}
|
|
57
58
|
catch (error) {
|
|
@@ -61,7 +62,7 @@ const hook = async function (options) {
|
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
64
|
else {
|
|
64
|
-
await installationVerification_1.doPrompt(VerificationConfigBuilder.buildForRepo());
|
|
65
|
+
await (0, installationVerification_1.doPrompt)(VerificationConfigBuilder.buildForRepo());
|
|
65
66
|
}
|
|
66
67
|
};
|
|
67
68
|
exports.hook = hook;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyInstallSignature.js","sourceRoot":"","sources":["../../src/hooks/verifyInstallSignature.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,2CAAqD;AACrD,mCAA6B;AAC7B,8EAMyC;AAEzC,4CAAyC;AAEzC;;GAEG;AACH,MAAa,yBAAyB;IAC7B,MAAM,CAAC,KAAK,CAAC,OAAgB,EAAE,aAA4B;QAChE,MAAM,OAAO,GAAG,IAAI,6CAAkB,EAAE,CAAC;QACzC,OAAO,CAAC,QAAQ,GAAG,IAAI,mDAAwB,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAErG,OAAO,CAAC,GAAG,GAAG,YAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAG,CAA0B,CAAC;QACzD,mEAAmE;QACnE,OAAO,CAAC,MAAM,GAAG,YAAG,CAAC,MAAM,CAAC,IAAI,CAAC,YAAG,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IACM,MAAM,CAAC,YAAY;QACxB,MAAM,OAAO,GAAG,IAAI,6CAAkB,EAAE,CAAC;QACzC,mEAAmE;QACnE,OAAO,CAAC,MAAM,GAAG,YAAG,CAAC,MAAM,CAAC,IAAI,CAAC,YAAG,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAhBD,8DAgBC;AAEM,MAAM,IAAI,GAA2B,KAAK,WAAW,OAAO;IACjE,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;QACnD,MAAM,MAAM,GAAG,MAAM,aAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,iBAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAExE,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,QAAQ,CAAC;QAErC,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACjC,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,MAAM,aAAa,GAAkB;YACnC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ;YACjC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS;YACnC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"verifyInstallSignature.js","sourceRoot":"","sources":["../../src/hooks/verifyInstallSignature.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ function validSalesforceHostname(url) {
|
|
|
47
47
|
if (!url) {
|
|
48
48
|
return false;
|
|
49
49
|
}
|
|
50
|
-
const parsedUrl = url_1.parse(url);
|
|
50
|
+
const parsedUrl = (0, url_1.parse)(url);
|
|
51
51
|
if (process.env.SFDX_ALLOW_ALL_SALESFORCE_CERTSIG_HOSTING === 'true') {
|
|
52
52
|
return parsedUrl.hostname && /(\.salesforce\.com)$/.test(parsedUrl.hostname);
|
|
53
53
|
}
|
|
@@ -117,8 +117,8 @@ class InstallationVerification {
|
|
|
117
117
|
// why? dependency injection is better than sinon
|
|
118
118
|
this.requestImpl = requestImpl ? requestImpl : request;
|
|
119
119
|
this.fsImpl = fsImpl ? fsImpl : core_1.fs;
|
|
120
|
-
this.readFileAsync = util_1.promisify(this.fsImpl.readFile);
|
|
121
|
-
this.unlinkAsync = util_1.promisify(this.fsImpl.unlink);
|
|
120
|
+
this.readFileAsync = (0, util_1.promisify)(this.fsImpl.readFile);
|
|
121
|
+
this.unlinkAsync = (0, util_1.promisify)(this.fsImpl.unlink);
|
|
122
122
|
}
|
|
123
123
|
/**
|
|
124
124
|
* setter for the cli engine config
|
|
@@ -243,7 +243,10 @@ class InstallationVerification {
|
|
|
243
243
|
// Make sure the cache path exists.
|
|
244
244
|
try {
|
|
245
245
|
await core_1.fs.mkdirp(this.getCachePath());
|
|
246
|
-
new npmCommand_1.NpmModule(npmMeta.moduleName, npmMeta.version
|
|
246
|
+
const npmModule = new npmCommand_1.NpmModule(npmMeta.moduleName, npmMeta.version, this.config.cliRoot);
|
|
247
|
+
await npmModule.fetchTarball((0, exports.getNpmRegistry)().href, {
|
|
248
|
+
cwd: this.getCachePath(),
|
|
249
|
+
});
|
|
247
250
|
const tarBallFile = core_1.fs
|
|
248
251
|
.readdirSync(this.getCachePath(), { withFileTypes: true })
|
|
249
252
|
.find((entry) => entry.isFile() && entry.name.includes(npmMeta.version));
|
|
@@ -251,7 +254,7 @@ class InstallationVerification {
|
|
|
251
254
|
}
|
|
252
255
|
catch (err) {
|
|
253
256
|
logger.debug(err);
|
|
254
|
-
throw
|
|
257
|
+
throw err;
|
|
255
258
|
}
|
|
256
259
|
return npmMeta;
|
|
257
260
|
}
|
|
@@ -268,7 +271,7 @@ class InstallationVerification {
|
|
|
268
271
|
*/
|
|
269
272
|
async retrieveNpmMeta() {
|
|
270
273
|
const logger = await this.getLogger();
|
|
271
|
-
const npmRegistry = exports.getNpmRegistry();
|
|
274
|
+
const npmRegistry = (0, exports.getNpmRegistry)();
|
|
272
275
|
logger.debug(`retrieveNpmMeta | npmRegistry: ${npmRegistry.href}`);
|
|
273
276
|
logger.debug(`retrieveNpmMeta | this.pluginNpmName.name: ${this.pluginNpmName.name}`);
|
|
274
277
|
logger.debug(`retrieveNpmMeta | this.pluginNpmName.scope: ${this.pluginNpmName.scope}`);
|
|
@@ -276,7 +279,7 @@ class InstallationVerification {
|
|
|
276
279
|
const npmShowModule = this.pluginNpmName.scope
|
|
277
280
|
? `@${this.pluginNpmName.scope}/${this.pluginNpmName.name}`
|
|
278
281
|
: this.pluginNpmName.name;
|
|
279
|
-
const npmModule = new npmCommand_1.NpmModule(npmShowModule, this.pluginNpmName.tag);
|
|
282
|
+
const npmModule = new npmCommand_1.NpmModule(npmShowModule, this.pluginNpmName.tag, this.config.cliRoot);
|
|
280
283
|
const npmMetadata = npmModule.show(npmRegistry.href);
|
|
281
284
|
logger.debug('retrieveNpmMeta | Found npm meta information.');
|
|
282
285
|
if (!npmMetadata.versions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installationVerification.js","sourceRoot":"","sources":["../../src/lib/installationVerification.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"installationVerification.js","sourceRoot":"","sources":["../../src/lib/installationVerification.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,4DAA4D;AAC5D,sDAAsD;AACtD,+DAA+D;AAC/D,wDAAwD;AAExD,6BAA6B;AAC7B,mCAAkC;AAClC,6BAAiE;AACjE,+BAAkD;AAClD,iCAAiC;AACjC,2CAAyD;AACzD,mCAAmC;AACnC,kDAAuD;AAGvD,MAAM,YAAY,GAAG,YAAY,CAAC;AACrB,QAAA,mBAAmB,GAAG,8BAA8B,CAAC;AACrD,QAAA,gBAAgB,GAAG,6BAA6B,CAAC;AAc9D,MAAa,gBAAgB;IAK3B,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAW,YAAY,CAAC,KAAe;QACrC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAW,eAAe,CAAC,KAAe;QACxC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAW,eAAe,CAAC,KAAe;QACxC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;CACF;AA5BD,4CA4BC;AAED,SAAgB,uBAAuB,CAAC,GAAkB;IACxD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,KAAK,CAAC;KACd;IACD,MAAM,SAAS,GAAuB,IAAA,WAAQ,EAAC,GAAG,CAAC,CAAC;IAEpD,IAAI,OAAO,CAAC,GAAG,CAAC,yCAAyC,KAAK,MAAM,EAAE;QACpE,OAAO,SAAS,CAAC,QAAQ,IAAI,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;KAC9E;SAAM;QACL,OAAO,SAAS,CAAC,QAAQ,KAAK,QAAQ,IAAI,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,QAAQ,KAAK,0BAA0B,CAAC;KACnH;AACH,CAAC;AAXD,0DAWC;AAED,SAAS,WAAW,CAAC,MAAgB;IACnC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,GAAG,IAAI,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;oBAC/B,OAAO,MAAM,CAAC,IAAI,gBAAS,CAAC,sCAAsC,EAAE,kBAAkB,CAAC,CAAC,CAAC;iBAC1F;gBACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,MAAM,CAAC,gBAAkC;IAC7D,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IAElD,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE5C,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YAC3C,qDAAqD;YACrD,IAAI,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChC,gBAAgB,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;gBAC5D,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;YAEH,gBAAgB,CAAC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBAC9C,IAAI,SAAS,CAAC,UAAU,KAAK,CAAC,EAAE;oBAC9B,OAAO,MAAM,CAAC,IAAI,gBAAS,CAAC,+CAA+C,EAAE,kBAAkB,CAAC,CAAC,CAAC;iBACnG;qBAAM;oBACL,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;oBACrF,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAC,CAAC;YAEH,gBAAgB,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACnD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAChD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhCD,wBAgCC;AAEM,MAAM,cAAc,GAAG,GAAQ,EAAE;IACtC,OAAO,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,wBAAgB,CAAC,CAAC;AACpE,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AAEF;;GAEG;AACH,MAAa,wBAAwB;IAkBnC,YAAmB,WAAsB,EAAE,MAAgB;QACzD,iDAAiD;QACjD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;QACvD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAE,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,IAAA,gBAAa,EAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,WAAW,GAAG,IAAA,gBAAa,EAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACI,SAAS,CAAC,OAAuB;QACtC,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;YACtB,OAAO,IAAI,CAAC;SACb;QACD,MAAM,IAAI,gBAAS,CAAC,sCAAsC,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC;IAED;;;;OAIG;IACI,gBAAgB,CAAC,WAAiC;QACvD,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC;YACjC,OAAO,IAAI,CAAC;SACb;QACD,MAAM,IAAI,gBAAS,CAAC,+BAA+B,EAAE,cAAc,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAM;QACjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAErD,MAAM,CAAC,KAAK,CAAC,wEAAwE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACjH,MAAM,IAAI,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEnG,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QACvE,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QAEvE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;aAC7G,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC;iBAC9C,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,MAAM,CAAC,KAAK,CAAC,8CAA8C,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;gBACvF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,CAAC,IAAI,KAAK,6BAA6B,EAAE;gBAC5C,MAAM,IAAI,gBAAS,CACjB,2FAA2F,EAC3F,gBAAgB,CACjB,CAAC;aACH;YACD,MAAM,CAAC,CAAC;QACV,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,2BAAmB,CAAC,CAAC;QACjF,MAAM,CAAC,KAAK,CAAC,sCAAsC,mBAAmB,EAAE,CAAC,CAAC;QAC1E,IAAI,WAAmB,CAAC;QACxB,IAAI;YACF,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;YAC5D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC/C,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;YAC/D,OAAO,cAAc,IAAI,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;iBAAM;gBACL,MAAM,GAAG,CAAC;aACX;SACF;IACH,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,GAAW;QAClC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,GAAU,EAAE,QAAiC,EAAE,YAAY,EAAE,EAAE;gBACpF,IAAI,GAAG,EAAE;oBACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACpB;qBAAM;oBACL,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;wBAC3C,0CAA0C;wBAC1C,OAAO,OAAO,CACZ,IAAI,iBAAQ,CAAC;4BACX,IAAI;gCACF,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gCACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BAClB,CAAC;yBACF,CAAC,CACH,CAAC;qBACH;yBAAM;wBACL,OAAO,MAAM,CACX,IAAI,gBAAS,CACX,oBAAoB,GAAG,6BAA6B;wBAClD,4EAA4E;wBAC3E,QAAmC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,WAC/D,GAAG,EACH,qBAAqB,CACtB,CACF,CAAC;qBACH;iBACF;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,WAAW;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAQ,IAAI,SAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtD,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,kCAAkC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE5E,MAAM,WAAW,GAAW,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxE,MAAM,CAAC,KAAK,CAAC,8BAA8B,WAAW,EAAE,CAAC,CAAC;QAE1D,mCAAmC;QACnC,IAAI;YACF,MAAM,SAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC1F,MAAM,SAAS,CAAC,YAAY,CAAC,IAAA,sBAAc,GAAE,CAAC,IAAI,EAAE;gBAClD,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE;aACzB,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,SAAE;iBACnB,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;iBACzD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3E,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;SAC7E;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,GAAG,CAAC;SACX;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,uCAAuC;IAC/B,aAAa;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;IAC/B,CAAC;IAED,qDAAqD;IAC7C,YAAY;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,eAAe;QAC3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,IAAA,sBAAc,GAAE,CAAC;QAErC,MAAM,CAAC,KAAK,CAAC,kCAAkC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACnE,MAAM,CAAC,KAAK,CAAC,8CAA8C,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;QACtF,MAAM,CAAC,KAAK,CAAC,+CAA+C,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;QACxF,MAAM,CAAC,KAAK,CAAC,6CAA6C,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAEpF,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK;YAC5C,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE;YAC3D,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;QAE5B,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5F,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;QAC9D,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;YACzB,MAAM,IAAI,gBAAS,CACjB,+BAA+B,IAAI,CAAC,aAAa,CAAC,IAAI,qCAAqC,EAC3F,oBAAoB,CACrB,CAAC;SACH;QAED,iCAAiC;QACjC,IAAI,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAE/F,MAAM,CAAC,KAAK,CAAC,oCAAoC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAElF,+FAA+F;QAC/F,IAAI,CAAC,aAAa,EAAE;YAClB,mBAAmB;YACnB,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,CAAC,+BAA+B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACxE,IAAI,QAAQ,EAAE;gBACZ,MAAM,aAAa,GAAW,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAC/D,MAAM,CAAC,KAAK,CAAC,oCAAoC,aAAa,EAAE,CAAC,CAAC;gBAElE,sDAAsD;gBACtD,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC5E,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,aAAa,CAAC,CAAC;oBAClF,MAAM,CAAC,KAAK,CAAC,oCAAoC,aAAa,EAAE,CAAC,CAAC;iBACnE;qBAAM;oBACL,MAAM,IAAI,gBAAS,CACjB,gBAAgB,IAAI,CAAC,aAAa,CAAC,GAAG,8BAA8B,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAC7F,gBAAgB,CACjB,CAAC;iBACH;aACF;iBAAM;gBACL,MAAM,IAAI,gBAAS,CAAC,wCAAwC,EAAE,qBAAqB,CAAC,CAAC;aACtF;SACF;QAED,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,aAAa,CAAC;QAE1C,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;YACrB,MAAM,IAAI,gBAAS,CAAC,mDAAmD,EAAE,WAAW,CAAC,CAAC;SACvF;aAAM;YACL,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBAC3D,MAAM,IAAI,gBAAS,CACjB,4DAA4D,WAAW,CAAC,IAAI,CAAC,YAAY,GAAG,EAC5F,gBAAgB,CACjB,CAAC;aACH;iBAAM;gBACL,MAAM,CAAC,KAAK,CAAC,sDAAsD,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;gBACpG,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC;aAChE;YAED,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBAC3D,MAAM,IAAI,gBAAS,CACjB,4DAA4D,WAAW,CAAC,IAAI,CAAC,YAAY,GAAG,EAC5F,gBAAgB,CACjB,CAAC;aACH;iBAAM;gBACL,MAAM,CAAC,KAAK,CAAC,sDAAsD,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;gBACpG,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC;aAChE;YAED,SAAS,CAAC,OAAO,CAAC,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;YACxD,MAAM,CAAC,KAAK,CAAC,sCAAsC,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;YAEnF,OAAO,SAAS,CAAC,OAAO,CAAC;SAC1B;IACH,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,GAAG,MAAM,aAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC9D;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF;AA9RD,4DA8RC;AAED,MAAa,kBAAkB;IAK7B,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAW,QAAQ,CAAC,KAAe;QACjC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAW,GAAG,CAAC,KAAgC;QAC7C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,IAAW,MAAM;QACf,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAW,MAAM,CAAC,KAA2C;QAC3D,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC5B,CAAC;CACF;AA5BD,gDA4BC;AAEM,KAAK,UAAU,QAAQ,CAAC,OAA2B;IACxD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,MAAM,CACzC,yGAAyG,CAC1G,CAAC;IACF,QAAQ,cAAc,CAAC,WAAW,EAAE,EAAE;QACpC,KAAK,GAAG;YACN,OAAO;QACT;YACE,MAAM,IAAI,gBAAS,CAAC,4CAA4C,EAAE,2BAA2B,CAAC,CAAC;KAClG;AACH,CAAC;AAVD,4BAUC;AAEM,KAAK,UAAU,qCAAqC,CACzD,MAAqB,EACrB,MAAuC,EACvC,kBAAsC;IAEtC,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,gBAAS,CACjB,gGAAgG,EAChG,oCAAoC,CACrC,CAAC;SACH;QACD,kBAAkB,CAAC,GAAG,CAAC,gDAAgD,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;KAC1F;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE;YAC5B,IAAI,MAAM,kBAAkB,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE;gBACrD,kBAAkB,CAAC,GAAG,CAAC,eAAe,MAAM,CAAC,MAAM,mDAAmD,CAAC,CAAC;gBACxG,OAAO;aACR;iBAAM;gBACL,OAAO,MAAM,QAAQ,CAAC,kBAAkB,CAAC,CAAC;aAC3C;SACF;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,IAAI,GAAG,CAAC,IAAI,KAAK,oBAAoB,EAAE;YAC7E,MAAM,IAAI,gBAAS,CAAC,GAAG,CAAC,OAAO,IAAI,4CAA4C,CAAC,CAAC;SAClF;QACD,MAAM,gBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC3B;AACH,CAAC;AA3BD,sFA2BC"}
|
package/lib/lib/npmCommand.d.ts
CHANGED
|
@@ -25,22 +25,46 @@ export declare type NpmShowResults = {
|
|
|
25
25
|
declare type NpmCommandOptions = shelljs.ExecOptions & {
|
|
26
26
|
json?: boolean;
|
|
27
27
|
registry?: string;
|
|
28
|
+
cliRoot?: string;
|
|
28
29
|
};
|
|
29
|
-
declare type NpmCommandResult =
|
|
30
|
-
[name: string]: string;
|
|
31
|
-
};
|
|
30
|
+
declare type NpmCommandResult = shelljs.ShellString;
|
|
32
31
|
export declare class NpmCommand {
|
|
33
32
|
private static npmPkgPath;
|
|
34
33
|
static runNpmCmd(cmd: string, options?: NpmCommandOptions): NpmCommandResult;
|
|
35
34
|
private static npmPackagePath;
|
|
35
|
+
/**
|
|
36
|
+
* Returns the path to the npm-cli.js file in this package's node_modules
|
|
37
|
+
*
|
|
38
|
+
* @private
|
|
39
|
+
*/
|
|
36
40
|
private static npmCli;
|
|
41
|
+
/**
|
|
42
|
+
* Locate node executable and return its absolute path
|
|
43
|
+
* First it tries to locate the node executable on the root path passed in
|
|
44
|
+
* If not found then tries to use whatver 'node' resolves to on the user's PATH
|
|
45
|
+
* If found return absolute path to the executable
|
|
46
|
+
* If the node executable cannot be found, an error is thrown
|
|
47
|
+
*
|
|
48
|
+
* @private
|
|
49
|
+
*/
|
|
50
|
+
private static findNode;
|
|
51
|
+
/**
|
|
52
|
+
* Finds the bin directory in the sfdx installation root path
|
|
53
|
+
*
|
|
54
|
+
* @param sfdxPath
|
|
55
|
+
* @private
|
|
56
|
+
*/
|
|
57
|
+
private static findSfdxBinDirs;
|
|
37
58
|
}
|
|
38
59
|
export declare class NpmModule {
|
|
39
60
|
private module;
|
|
40
61
|
private version;
|
|
62
|
+
private cliRoot;
|
|
41
63
|
npmMeta: NpmMeta;
|
|
42
|
-
constructor(module: string, version?: string);
|
|
64
|
+
constructor(module: string, version?: string, cliRoot?: string);
|
|
43
65
|
show(registry: string): NpmShowResults;
|
|
44
66
|
pack(registry: string, options?: shelljs.ExecOptions): void;
|
|
67
|
+
fetchTarball(registry: string, options?: shelljs.ExecOptions): Promise<void>;
|
|
68
|
+
pollForAvailability(checkFn: () => void): Promise<void>;
|
|
45
69
|
}
|
|
46
70
|
export {};
|
package/lib/lib/npmCommand.js
CHANGED
|
@@ -8,58 +8,171 @@
|
|
|
8
8
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.NpmModule = exports.NpmCommand = void 0;
|
|
11
|
+
const os_1 = require("os");
|
|
11
12
|
const path = require("path");
|
|
12
|
-
const shelljs = require("shelljs");
|
|
13
13
|
const npm_run_path_1 = require("npm-run-path");
|
|
14
|
+
const shelljs = require("shelljs");
|
|
14
15
|
const core_1 = require("@salesforce/core");
|
|
16
|
+
const command_1 = require("@salesforce/command");
|
|
17
|
+
const kit_1 = require("@salesforce/kit");
|
|
15
18
|
class NpmCommand {
|
|
16
19
|
static runNpmCmd(cmd, options = {}) {
|
|
20
|
+
const nodeExecutable = NpmCommand.findNode(options.cliRoot);
|
|
17
21
|
const npmCli = NpmCommand.npmCli();
|
|
18
|
-
const
|
|
19
|
-
const
|
|
22
|
+
const command = `"${nodeExecutable}" "${npmCli}" ${cmd} --registry=${options.registry}`;
|
|
23
|
+
const npmCmdResult = shelljs.exec(command, {
|
|
20
24
|
...options,
|
|
21
25
|
silent: true,
|
|
22
|
-
fatal: true,
|
|
23
26
|
async: false,
|
|
24
27
|
env: npm_run_path_1.default.env({ env: process.env }),
|
|
25
28
|
});
|
|
26
|
-
if (
|
|
27
|
-
throw new core_1.SfdxError(
|
|
28
|
-
}
|
|
29
|
-
try {
|
|
30
|
-
return JSON.parse(npmShowResult.stdout);
|
|
31
|
-
}
|
|
32
|
-
catch (error) {
|
|
33
|
-
throw new core_1.SfdxError(error, 'ShellParseError');
|
|
29
|
+
if (npmCmdResult.code !== 0) {
|
|
30
|
+
throw new core_1.SfdxError(npmCmdResult.stderr, 'ShellExecError');
|
|
34
31
|
}
|
|
32
|
+
return npmCmdResult;
|
|
35
33
|
}
|
|
36
34
|
static npmPackagePath() {
|
|
37
35
|
return this.npmPkgPath;
|
|
38
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Returns the path to the npm-cli.js file in this package's node_modules
|
|
39
|
+
*
|
|
40
|
+
* @private
|
|
41
|
+
*/
|
|
39
42
|
static npmCli() {
|
|
40
43
|
const pkgPath = NpmCommand.npmPackagePath();
|
|
41
44
|
const pkgJson = core_1.fs.readJsonSync(pkgPath);
|
|
42
45
|
const prjPath = pkgPath.substring(0, pkgPath.lastIndexOf(path.sep));
|
|
43
46
|
return path.join(prjPath, pkgJson.bin['npm']);
|
|
44
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* Locate node executable and return its absolute path
|
|
50
|
+
* First it tries to locate the node executable on the root path passed in
|
|
51
|
+
* If not found then tries to use whatver 'node' resolves to on the user's PATH
|
|
52
|
+
* If found return absolute path to the executable
|
|
53
|
+
* If the node executable cannot be found, an error is thrown
|
|
54
|
+
*
|
|
55
|
+
* @private
|
|
56
|
+
*/
|
|
57
|
+
static findNode(root = undefined) {
|
|
58
|
+
const isExecutable = (filepath) => {
|
|
59
|
+
if ((0, os_1.type)() === 'Windows_NT')
|
|
60
|
+
return filepath.endsWith('node.exe');
|
|
61
|
+
try {
|
|
62
|
+
if (filepath.endsWith('node')) {
|
|
63
|
+
// This checks if the filepath is executable on Mac or Linux, if it is not it errors.
|
|
64
|
+
core_1.fs.accessSync(filepath, core_1.fs.constants.X_OK);
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
return false;
|
|
72
|
+
};
|
|
73
|
+
if (root) {
|
|
74
|
+
const sfdxBinDirs = NpmCommand.findSfdxBinDirs(root);
|
|
75
|
+
if (sfdxBinDirs.length > 0) {
|
|
76
|
+
// Find the node executable
|
|
77
|
+
const node = shelljs.find(sfdxBinDirs).filter((file) => isExecutable(file))[0];
|
|
78
|
+
if (node) {
|
|
79
|
+
return core_1.fs.realpathSync(node);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
// Check to see if node is installed
|
|
84
|
+
const nodeShellString = shelljs.which('node');
|
|
85
|
+
if ((nodeShellString === null || nodeShellString === void 0 ? void 0 : nodeShellString.code) === 0 && (nodeShellString === null || nodeShellString === void 0 ? void 0 : nodeShellString.stdout))
|
|
86
|
+
return nodeShellString.stdout;
|
|
87
|
+
throw new core_1.SfdxError('Cannot locate node executable.', 'CannotFindNodeExecutable');
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Finds the bin directory in the sfdx installation root path
|
|
91
|
+
*
|
|
92
|
+
* @param sfdxPath
|
|
93
|
+
* @private
|
|
94
|
+
*/
|
|
95
|
+
static findSfdxBinDirs(sfdxPath) {
|
|
96
|
+
return sfdxPath
|
|
97
|
+
? [path.join(sfdxPath, 'bin'), path.join(sfdxPath, 'client', 'bin')].filter((p) => core_1.fs.existsSync(p))
|
|
98
|
+
: [];
|
|
99
|
+
}
|
|
45
100
|
}
|
|
46
101
|
exports.NpmCommand = NpmCommand;
|
|
47
102
|
NpmCommand.npmPkgPath = require.resolve('npm/package.json');
|
|
48
103
|
class NpmModule {
|
|
49
|
-
constructor(module, version = 'latest') {
|
|
104
|
+
constructor(module, version = 'latest', cliRoot = undefined) {
|
|
50
105
|
this.module = module;
|
|
51
106
|
this.version = version;
|
|
107
|
+
this.cliRoot = cliRoot;
|
|
52
108
|
this.npmMeta = {
|
|
53
109
|
moduleName: module,
|
|
54
110
|
};
|
|
55
111
|
}
|
|
56
112
|
show(registry) {
|
|
57
|
-
|
|
113
|
+
const showCmd = NpmCommand.runNpmCmd(`show ${this.module}@${this.version} --json`, {
|
|
114
|
+
registry,
|
|
115
|
+
cliRoot: this.cliRoot,
|
|
116
|
+
});
|
|
117
|
+
// `npm show` doesn't return exit code 1 when it fails to get a specific package version
|
|
118
|
+
// If `stdout` is empty then no info was found in the registry.
|
|
119
|
+
if (showCmd.stdout === '') {
|
|
120
|
+
throw new core_1.SfdxError(`Failed to find ${this.module}@${this.version} in the registry`, 'NpmError');
|
|
121
|
+
}
|
|
122
|
+
try {
|
|
123
|
+
return JSON.parse(showCmd.stdout);
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
throw new core_1.SfdxError(error, 'ShellParseError');
|
|
127
|
+
}
|
|
58
128
|
}
|
|
59
129
|
pack(registry, options) {
|
|
60
|
-
|
|
130
|
+
try {
|
|
131
|
+
NpmCommand.runNpmCmd(`pack ${this.module}@${this.version}`, {
|
|
132
|
+
...options,
|
|
133
|
+
registry,
|
|
134
|
+
cliRoot: this.cliRoot,
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
catch (err) {
|
|
138
|
+
const sfdxErr = core_1.SfdxError.wrap(err);
|
|
139
|
+
throw new core_1.SfdxError(`Failed to fetch tarball from the registry: \n${sfdxErr.message}`, 'NpmError');
|
|
140
|
+
}
|
|
61
141
|
return;
|
|
62
142
|
}
|
|
143
|
+
async fetchTarball(registry, options) {
|
|
144
|
+
await this.pollForAvailability(() => {
|
|
145
|
+
this.pack(registry, options);
|
|
146
|
+
});
|
|
147
|
+
this.pack(registry, options);
|
|
148
|
+
}
|
|
149
|
+
async pollForAvailability(checkFn) {
|
|
150
|
+
const ux = await command_1.UX.create();
|
|
151
|
+
const isNonTTY = process.env.CI !== undefined || process.env.CIRCLECI !== undefined;
|
|
152
|
+
let found = false;
|
|
153
|
+
let attempts = 0;
|
|
154
|
+
const maxAttempts = 300;
|
|
155
|
+
const start = isNonTTY ? (msg) => ux.log(msg) : (msg) => ux.startSpinner(msg);
|
|
156
|
+
const update = isNonTTY ? (msg) => ux.log(msg) : (msg) => ux.setSpinnerStatus(msg);
|
|
157
|
+
const stop = isNonTTY ? (msg) => ux.log(msg) : (msg) => ux.stopSpinner(msg);
|
|
158
|
+
start('Polling for new version(s) to become available on npm');
|
|
159
|
+
while (!found && attempts < maxAttempts) {
|
|
160
|
+
attempts += 1;
|
|
161
|
+
update(`attempt: ${attempts} of ${maxAttempts}`);
|
|
162
|
+
try {
|
|
163
|
+
checkFn();
|
|
164
|
+
found = true;
|
|
165
|
+
}
|
|
166
|
+
catch (error) {
|
|
167
|
+
if (attempts === maxAttempts) {
|
|
168
|
+
throw error;
|
|
169
|
+
}
|
|
170
|
+
found = false;
|
|
171
|
+
}
|
|
172
|
+
await (0, kit_1.sleep)(1000);
|
|
173
|
+
}
|
|
174
|
+
stop(attempts >= maxAttempts ? 'failed' : 'done');
|
|
175
|
+
}
|
|
63
176
|
}
|
|
64
177
|
exports.NpmModule = NpmModule;
|
|
65
178
|
//# sourceMappingURL=npmCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npmCommand.js","sourceRoot":"","sources":["../../src/lib/npmCommand.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AACH,sDAAsD;;;AAEtD,
|
|
1
|
+
{"version":3,"file":"npmCommand.js","sourceRoot":"","sources":["../../src/lib/npmCommand.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AACH,sDAAsD;;;AAEtD,2BAAoC;AACpC,6BAA6B;AAE7B,+CAAsC;AACtC,mCAAmC;AAEnC,2CAAiD;AACjD,iDAAyC;AACzC,yCAAwC;AAyCxC,MAAa,UAAU;IAGd,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,UAAU,EAAuB;QACpE,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,cAAc,MAAM,MAAM,KAAK,GAAG,eAAe,OAAO,CAAC,QAAQ,EAAE,CAAC;QACxF,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;YACzC,GAAG,OAAO;YACV,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,sBAAU,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;SAC1C,CAAC,CAAC;QACH,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE;YAC3B,MAAM,IAAI,gBAAS,CAAC,YAAY,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;SAC5D;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,MAAM,CAAC,cAAc;QAC3B,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,MAAM;QACnB,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,SAAE,CAAC,YAAY,CAAC,OAAO,CAAe,CAAC;QACvD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;;;OAQG;IACK,MAAM,CAAC,QAAQ,CAAC,OAAe,SAAS;QAC9C,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAW,EAAE;YACjD,IAAI,IAAA,SAAM,GAAE,KAAK,YAAY;gBAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAEpE,IAAI;gBACF,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBAC7B,qFAAqF;oBACrF,SAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBAC3C,OAAO,IAAI,CAAC;iBACb;aACF;YAAC,MAAM;gBACN,OAAO,KAAK,CAAC;aACd;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,IAAI,IAAI,EAAE;YACR,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1B,2BAA2B;gBAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/E,IAAI,IAAI,EAAE;oBACR,OAAO,SAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBAC9B;aACF;SACF;QAED,oCAAoC;QACpC,MAAM,eAAe,GAAwB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnE,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,MAAK,CAAC,KAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,CAAA;YAAE,OAAO,eAAe,CAAC,MAAM,CAAC;QAE1F,MAAM,IAAI,gBAAS,CAAC,gCAAgC,EAAE,0BAA0B,CAAC,CAAC;IACpF,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,eAAe,CAAC,QAAgB;QAC7C,OAAO,QAAQ;YACb,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACpG,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;;AAzFH,gCA0FC;AAzFgB,qBAAU,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;AA2FlE,MAAa,SAAS;IAEpB,YAA2B,MAAc,EAAU,UAAkB,QAAQ,EAAU,UAAkB,SAAS;QAAvF,WAAM,GAAN,MAAM,CAAQ;QAAU,YAAO,GAAP,OAAO,CAAmB;QAAU,YAAO,GAAP,OAAO,CAAoB;QAChH,IAAI,CAAC,OAAO,GAAG;YACb,UAAU,EAAE,MAAM;SACnB,CAAC;IACJ,CAAC;IAEM,IAAI,CAAC,QAAgB;QAC1B,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,SAAS,EAAE;YACjF,QAAQ;YACR,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QAEH,wFAAwF;QACxF,+DAA+D;QAC/D,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,EAAE;YACzB,MAAM,IAAI,gBAAS,CAAC,kBAAkB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,kBAAkB,EAAE,UAAU,CAAC,CAAC;SAClG;QAED,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAmB,CAAC;SACrD;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,gBAAS,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;SAC/C;IACH,CAAC;IAEM,IAAI,CAAC,QAAgB,EAAE,OAA6B;QACzD,IAAI;YACF,UAAU,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;gBAC1D,GAAG,OAAO;gBACV,QAAQ;gBACR,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;SACJ;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,OAAO,GAAG,gBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,IAAI,gBAAS,CAAC,gDAAgD,OAAO,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,CAAC;SACpG;QACD,OAAO;IACT,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,QAAgB,EAAE,OAA6B;QACvE,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,OAAmB;QAClD,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC;QACpF,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,WAAW,GAAG,GAAG,CAAC;QAExB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAW,EAAM,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAW,EAAQ,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxG,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAW,EAAM,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAW,EAAQ,EAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC7G,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAW,EAAM,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAW,EAAQ,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAEtG,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC/D,OAAO,CAAC,KAAK,IAAI,QAAQ,GAAG,WAAW,EAAE;YACvC,QAAQ,IAAI,CAAC,CAAC;YACd,MAAM,CAAC,YAAY,QAAQ,OAAO,WAAW,EAAE,CAAC,CAAC;YAEjD,IAAI;gBACF,OAAO,EAAE,CAAC;gBACV,KAAK,GAAG,IAAI,CAAC;aACd;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,QAAQ,KAAK,WAAW,EAAE;oBAC5B,MAAM,KAAK,CAAC;iBACb;gBACD,KAAK,GAAG,KAAK,CAAC;aACf;YAED,MAAM,IAAA,WAAK,EAAC,IAAI,CAAC,CAAC;SACnB;QACD,IAAI,CAAC,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;CACF;AA9ED,8BA8EC"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"1.0.
|
|
1
|
+
{"version":"1.0.11","commands":{"plugins:trust:verify":{"id":"plugins:trust:verify","description":"validate a digital signature for a npm package","usage":"<%= command.id %> -n <string> [-r <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"@salesforce/plugin-trust","pluginType":"core","aliases":[],"examples":["sfdx plugins:trust:verify --npm @scope/npmName --registry http://my.repo.org:4874","sfdx plugins:trust:verify --npm @scope/npmName"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"npm":{"name":"npm","type":"option","char":"n","description":"Specify the npm name. This can include a tag/version","required":true},"registry":{"name":"registry","type":"option","char":"r","description":"The registry name. the behavior is the same as npm","required":false}},"args":[]}}}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-trust",
|
|
3
3
|
"description": "validate a digital signature for a npm package",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.11",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bin": {
|
|
7
7
|
"sf-trust": "bin/run"
|
|
@@ -26,6 +26,7 @@
|
|
|
26
26
|
"@salesforce/prettier-config": "^0.0.2",
|
|
27
27
|
"@salesforce/ts-sinon": "1.3.21",
|
|
28
28
|
"@types/shelljs": "^0.8.9",
|
|
29
|
+
"@types/sinon-chai": "^3.2.5",
|
|
29
30
|
"@typescript-eslint/eslint-plugin": "^4.2.0",
|
|
30
31
|
"@typescript-eslint/parser": "^4.2.0",
|
|
31
32
|
"chai": "^4.2.0",
|
|
@@ -36,7 +37,7 @@
|
|
|
36
37
|
"eslint-config-salesforce-license": "^0.1.6",
|
|
37
38
|
"eslint-config-salesforce-typescript": "^0.2.7",
|
|
38
39
|
"eslint-plugin-header": "^3.1.1",
|
|
39
|
-
"eslint-plugin-import": "
|
|
40
|
+
"eslint-plugin-import": "2.25.2",
|
|
40
41
|
"eslint-plugin-jsdoc": "^35.1.2",
|
|
41
42
|
"eslint-plugin-prettier": "^3.4.0",
|
|
42
43
|
"husky": "^4.3.8",
|
|
@@ -47,6 +48,7 @@
|
|
|
47
48
|
"pretty-quick": "^3.1.0",
|
|
48
49
|
"shx": "0.3.3",
|
|
49
50
|
"sinon": "10.0.0",
|
|
51
|
+
"sinon-chai": "^3.7.0",
|
|
50
52
|
"ts-node": "^10.0.0",
|
|
51
53
|
"typescript": "^4.1.3"
|
|
52
54
|
},
|
|
@@ -114,7 +116,7 @@
|
|
|
114
116
|
"test": "sf-test",
|
|
115
117
|
"test:command-reference": "./bin/run commandreference:generate --erroronwarnings",
|
|
116
118
|
"test:deprecation-policy": "./bin/run snapshot:compare",
|
|
117
|
-
"test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000
|
|
119
|
+
"test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000",
|
|
118
120
|
"version": "oclif-dev readme"
|
|
119
121
|
},
|
|
120
122
|
"husky": {
|
|
@@ -128,7 +130,7 @@
|
|
|
128
130
|
"access": "public"
|
|
129
131
|
},
|
|
130
132
|
"sfdx": {
|
|
131
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/1.0.
|
|
132
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/1.0.
|
|
133
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/1.0.11.crt",
|
|
134
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-trust/1.0.11.sig"
|
|
133
135
|
}
|
|
134
136
|
}
|