@salesforce/plugin-release-management 2.13.1 → 3.0.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/CHANGELOG.md +23 -0
- package/README.md +300 -321
- package/bin/dev +10 -4
- package/bin/run +3 -2
- package/lib/amazonS3.js +8 -8
- package/lib/amazonS3.js.map +1 -1
- package/lib/circleCiEnvvars.js +3 -3
- package/lib/circleCiEnvvars.js.map +1 -1
- package/lib/codeSigning/packAndSign.js +10 -17
- package/lib/codeSigning/packAndSign.js.map +1 -1
- package/lib/commands/channel/promote.js +9 -15
- package/lib/commands/channel/promote.js.map +1 -1
- package/lib/commands/circleci/envvar/create.js.map +1 -1
- package/lib/commands/circleci/envvar/update.js.map +1 -1
- package/lib/commands/cli/install/test.js +45 -36
- package/lib/commands/cli/install/test.js.map +1 -1
- package/lib/commands/cli/latestrc/build.d.ts +1 -0
- package/lib/commands/cli/latestrc/build.js +26 -12
- package/lib/commands/cli/latestrc/build.js.map +1 -1
- package/lib/commands/cli/releasenotes.js +6 -11
- package/lib/commands/cli/releasenotes.js.map +1 -1
- package/lib/commands/cli/schemas/collect.js +12 -7
- package/lib/commands/cli/schemas/collect.js.map +1 -1
- package/lib/commands/cli/schemas/compare.js +14 -7
- package/lib/commands/cli/schemas/compare.js.map +1 -1
- package/lib/commands/cli/tarballs/prepare.js +1 -1
- package/lib/commands/cli/tarballs/prepare.js.map +1 -1
- package/lib/commands/cli/tarballs/smoke.js +1 -1
- package/lib/commands/cli/tarballs/smoke.js.map +1 -1
- package/lib/commands/cli/tarballs/verify.js +44 -22
- package/lib/commands/cli/tarballs/verify.js.map +1 -1
- package/lib/commands/cli/versions/inspect.js +18 -7
- package/lib/commands/cli/versions/inspect.js.map +1 -1
- package/lib/commands/dependabot/automerge.js +3 -6
- package/lib/commands/dependabot/automerge.js.map +1 -1
- package/lib/commands/npm/dependencies/pin.js +4 -6
- package/lib/commands/npm/dependencies/pin.js.map +1 -1
- package/lib/commands/npm/package/promote.js +3 -7
- package/lib/commands/npm/package/promote.js.map +1 -1
- package/lib/commands/npm/package/release.js +4 -8
- package/lib/commands/npm/package/release.js.map +1 -1
- package/lib/commands/npm/release/validate.js +3 -5
- package/lib/commands/npm/release/validate.js.map +1 -1
- package/lib/commands/repositories/index.js +3 -3
- package/lib/commands/repositories/index.js.map +1 -1
- package/lib/commands/typescript/update.js +23 -26
- package/lib/commands/typescript/update.js.map +1 -1
- package/lib/dependabot.js +6 -4
- package/lib/dependabot.js.map +1 -1
- package/lib/dependencies.d.ts +1 -1
- package/lib/inspectCommits.d.ts +1 -1
- package/lib/inspectCommits.js +3 -7
- package/lib/inspectCommits.js.map +1 -1
- package/lib/package.d.ts +12 -1
- package/lib/package.js +101 -28
- package/lib/package.js.map +1 -1
- package/lib/pluginCommand.js +8 -9
- package/lib/pluginCommand.js.map +1 -1
- package/lib/registry.js +14 -11
- package/lib/registry.js.map +1 -1
- package/lib/repository.d.ts +2 -23
- package/lib/repository.js +15 -168
- package/lib/repository.js.map +1 -1
- package/messages/channel.promote.json +0 -1
- package/messages/cli.latestrc.build.json +7 -0
- package/messages/npm.package.promote.json +0 -1
- package/messages/npm.package.release.json +1 -2
- package/messages/trust.sign.json +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +15 -24
- package/lib/commands/npm/lerna/release.d.ts +0 -13
- package/lib/commands/npm/lerna/release.js +0 -144
- package/lib/commands/npm/lerna/release.js.map +0 -1
- package/messages/npm.lerna.release.json +0 -14
|
@@ -8,17 +8,25 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const path = require("path");
|
|
10
10
|
const os = require("os");
|
|
11
|
+
const fs = require("fs/promises");
|
|
11
12
|
const shelljs_1 = require("shelljs");
|
|
12
|
-
const
|
|
13
|
+
const core_1 = require("@oclif/core");
|
|
13
14
|
const command_1 = require("@salesforce/command");
|
|
14
|
-
const
|
|
15
|
+
const core_2 = require("@salesforce/core");
|
|
15
16
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
16
17
|
const got_1 = require("got");
|
|
17
18
|
const chalk = require("chalk");
|
|
18
19
|
const types_1 = require("../../../types");
|
|
19
20
|
const amazonS3_1 = require("../../../amazonS3");
|
|
20
|
-
|
|
21
|
-
const messages =
|
|
21
|
+
core_2.Messages.importMessagesDirectory(__dirname);
|
|
22
|
+
const messages = core_2.Messages.load('@salesforce/plugin-release-management', 'cli.install.test', [
|
|
23
|
+
'description',
|
|
24
|
+
'examples',
|
|
25
|
+
'cliFlag',
|
|
26
|
+
'methodFlag',
|
|
27
|
+
'channelFlag',
|
|
28
|
+
'outputFileFlag',
|
|
29
|
+
]);
|
|
22
30
|
var Method;
|
|
23
31
|
(function (Method) {
|
|
24
32
|
let Type;
|
|
@@ -34,7 +42,7 @@ var Method;
|
|
|
34
42
|
async execute() {
|
|
35
43
|
const { service, available } = await this.ping();
|
|
36
44
|
if (!available) {
|
|
37
|
-
|
|
45
|
+
core_1.CliUx.ux.warn(`${service} is not currently available.`);
|
|
38
46
|
const results = {
|
|
39
47
|
[this.options.method]: {},
|
|
40
48
|
};
|
|
@@ -63,7 +71,7 @@ var Method;
|
|
|
63
71
|
}
|
|
64
72
|
logResult(cli, success) {
|
|
65
73
|
const msg = success ? chalk.green('true') : chalk.red('false');
|
|
66
|
-
|
|
74
|
+
core_1.CliUx.ux.log(`${chalk.bold(`${cli} Success`)}: ${msg}`);
|
|
67
75
|
}
|
|
68
76
|
getTargets() {
|
|
69
77
|
return Base.TEST_TARGETS[this.options.cli];
|
|
@@ -124,7 +132,7 @@ class Tarball extends Method.Base {
|
|
|
124
132
|
results[tarball][cli] = false;
|
|
125
133
|
}
|
|
126
134
|
}
|
|
127
|
-
|
|
135
|
+
core_1.CliUx.ux.log();
|
|
128
136
|
}
|
|
129
137
|
return results;
|
|
130
138
|
}
|
|
@@ -143,24 +151,22 @@ class Tarball extends Method.Base {
|
|
|
143
151
|
}
|
|
144
152
|
async extract(file) {
|
|
145
153
|
const dir = path.join(this.options.directory, path.basename(file).replace(/\./g, '-'));
|
|
146
|
-
await
|
|
154
|
+
await fs.mkdir(dir, { recursive: true });
|
|
147
155
|
return new Promise((resolve, reject) => {
|
|
148
|
-
|
|
156
|
+
core_1.CliUx.ux.action.start(`Unpacking ${chalk.cyan(path.basename(file))} to ${dir}`);
|
|
149
157
|
const cmd = process.platform === 'win32'
|
|
150
158
|
? `tar -xf ${file} -C ${dir} --strip-components 1 --exclude node_modules/.bin`
|
|
151
159
|
: `tar -xf ${file} -C ${dir} --strip-components 1`;
|
|
152
160
|
const opts = process.platform === 'win32' ? { shell: 'powershell.exe' } : {};
|
|
153
161
|
(0, shelljs_1.exec)(cmd, { ...opts, silent: true }, (code, stdout, stderr) => {
|
|
154
162
|
if (code === 0) {
|
|
155
|
-
|
|
156
|
-
|
|
163
|
+
core_1.CliUx.ux.action.stop();
|
|
164
|
+
core_1.CliUx.ux.log(stdout);
|
|
157
165
|
resolve(dir);
|
|
158
166
|
}
|
|
159
167
|
else {
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
cli_ux_1.cli.log('stdout:', stdout);
|
|
163
|
-
cli_ux_1.cli.log('stderr:', stderr);
|
|
168
|
+
core_1.CliUx.ux.log('stdout:', stdout);
|
|
169
|
+
core_1.CliUx.ux.log('stderr:', stderr);
|
|
164
170
|
reject();
|
|
165
171
|
}
|
|
166
172
|
});
|
|
@@ -170,7 +176,7 @@ class Tarball extends Method.Base {
|
|
|
170
176
|
const results = {};
|
|
171
177
|
for (const cli of this.getTargets()) {
|
|
172
178
|
const executable = path.join(directory, 'bin', cli);
|
|
173
|
-
|
|
179
|
+
core_1.CliUx.ux.log(`Testing ${chalk.cyan(executable)}`);
|
|
174
180
|
const result = process.platform === 'win32' ? (0, shelljs_1.exec)(`cmd /c "${executable}.cmd" --version`) : (0, shelljs_1.exec)(`${executable} --version`);
|
|
175
181
|
results[cli] = result.code === 0;
|
|
176
182
|
}
|
|
@@ -215,22 +221,22 @@ class Npm extends Method.Base {
|
|
|
215
221
|
for (const [cli, success] of Object.entries(testResults)) {
|
|
216
222
|
this.logResult(cli, success);
|
|
217
223
|
}
|
|
218
|
-
|
|
224
|
+
core_1.CliUx.ux.log();
|
|
219
225
|
return { [this.package]: testResults };
|
|
220
226
|
}
|
|
221
227
|
async install() {
|
|
222
|
-
|
|
228
|
+
core_1.CliUx.ux.action.start(`Installing: ${chalk.cyan(this.package)}`);
|
|
223
229
|
return new Promise((resolve, reject) => {
|
|
224
230
|
(0, shelljs_1.exec)(`npm install ${this.package}`, { silent: true, cwd: this.options.directory }, (code, stdout, stderr) => {
|
|
225
231
|
if (code === 0) {
|
|
226
|
-
|
|
227
|
-
|
|
232
|
+
core_1.CliUx.ux.action.stop();
|
|
233
|
+
core_1.CliUx.ux.log(stdout);
|
|
228
234
|
resolve();
|
|
229
235
|
}
|
|
230
236
|
else {
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
237
|
+
core_1.CliUx.ux.action.stop('Failed');
|
|
238
|
+
core_1.CliUx.ux.log(stdout);
|
|
239
|
+
core_1.CliUx.ux.log(stderr);
|
|
234
240
|
reject();
|
|
235
241
|
}
|
|
236
242
|
});
|
|
@@ -239,7 +245,7 @@ class Npm extends Method.Base {
|
|
|
239
245
|
test() {
|
|
240
246
|
const results = {};
|
|
241
247
|
const executable = path.join(this.options.directory, 'node_modules', '.bin', this.options.cli);
|
|
242
|
-
|
|
248
|
+
core_1.CliUx.ux.log(`Testing ${chalk.cyan(executable)}`);
|
|
243
249
|
const result = process.platform === 'win32' ? (0, shelljs_1.exec)(`cmd /c "${executable}" --version`) : (0, shelljs_1.exec)(`${executable} --version`);
|
|
244
250
|
results[this.options.cli] = result.code === 0;
|
|
245
251
|
return results;
|
|
@@ -273,7 +279,7 @@ class Installer extends Method.Base {
|
|
|
273
279
|
results[url][cli] = false;
|
|
274
280
|
}
|
|
275
281
|
}
|
|
276
|
-
|
|
282
|
+
core_1.CliUx.ux.log();
|
|
277
283
|
return results;
|
|
278
284
|
}
|
|
279
285
|
async win32() {
|
|
@@ -285,7 +291,7 @@ class Installer extends Method.Base {
|
|
|
285
291
|
await this.s3.download(url, location);
|
|
286
292
|
const installLocation = `C:\\install-test\\${this.options.cli}\\${exe.includes('x86') ? 'x86' : 'x64'}`;
|
|
287
293
|
const cmd = `Start-Process -Wait -FilePath "${location}" -ArgumentList "/S", "/D=${installLocation}" -PassThru`;
|
|
288
|
-
|
|
294
|
+
core_1.CliUx.ux.log(`Installing ${chalk.cyan(exe)} to ${installLocation}...`);
|
|
289
295
|
const result = (0, shelljs_1.exec)(cmd, { shell: 'powershell.exe' });
|
|
290
296
|
if (result.code === 0) {
|
|
291
297
|
const testResults = this.win32Test(installLocation);
|
|
@@ -315,7 +321,7 @@ class Installer extends Method.Base {
|
|
|
315
321
|
const results = {};
|
|
316
322
|
for (const cli of this.getTargets()) {
|
|
317
323
|
const binaryPath = path.join(installLocation, 'bin', `${cli}.cmd`);
|
|
318
|
-
|
|
324
|
+
core_1.CliUx.ux.log(`Testing ${chalk.cyan(binaryPath)}`);
|
|
319
325
|
const result = (0, shelljs_1.exec)(`cmd /c "${binaryPath}" --version`);
|
|
320
326
|
results[cli] =
|
|
321
327
|
result.code === 0 && binaryPath.includes('x86')
|
|
@@ -328,7 +334,7 @@ class Installer extends Method.Base {
|
|
|
328
334
|
const results = {};
|
|
329
335
|
for (const cli of this.getTargets()) {
|
|
330
336
|
const binaryPath = `/usr/local/bin/${cli}`;
|
|
331
|
-
|
|
337
|
+
core_1.CliUx.ux.log(`Testing ${chalk.cyan(binaryPath)}`);
|
|
332
338
|
const result = (0, shelljs_1.exec)(`${binaryPath} --version`);
|
|
333
339
|
results[cli] = result.code === 0;
|
|
334
340
|
}
|
|
@@ -337,14 +343,13 @@ class Installer extends Method.Base {
|
|
|
337
343
|
}
|
|
338
344
|
class Test extends command_1.SfdxCommand {
|
|
339
345
|
async run() {
|
|
340
|
-
var _a;
|
|
341
346
|
const cli = (0, ts_types_1.ensure)(this.flags.cli);
|
|
342
347
|
const method = (0, ts_types_1.ensure)(this.flags.method);
|
|
343
348
|
const channel = (0, ts_types_1.ensure)(this.flags.channel);
|
|
344
349
|
const outputFile = (0, ts_types_1.ensure)(this.flags['output-file']);
|
|
345
350
|
const directory = await this.makeWorkingDir(cli, channel, method);
|
|
346
|
-
|
|
347
|
-
|
|
351
|
+
core_1.CliUx.ux.log(`Working Directory: ${directory}`);
|
|
352
|
+
core_1.CliUx.ux.log();
|
|
348
353
|
let results = {};
|
|
349
354
|
switch (method) {
|
|
350
355
|
case 'tarball': {
|
|
@@ -370,20 +375,24 @@ class Test extends command_1.SfdxCommand {
|
|
|
370
375
|
.some((r) => !r);
|
|
371
376
|
if (hasFailures)
|
|
372
377
|
process.exitCode = 1;
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
378
|
+
const fileData = JSON.stringify({ status: process.exitCode ?? 0, results }, null, 2);
|
|
379
|
+
await fs.writeFile(outputFile, fileData, {
|
|
380
|
+
encoding: 'utf8',
|
|
381
|
+
mode: '600',
|
|
382
|
+
});
|
|
383
|
+
core_1.CliUx.ux.styledJSON(results);
|
|
384
|
+
core_1.CliUx.ux.log(`Results written to ${outputFile}`);
|
|
376
385
|
}
|
|
377
386
|
async makeWorkingDir(cli, channel, method) {
|
|
378
387
|
const tmpDir = path.join(os.tmpdir(), 'cli-install-test', cli, channel, method);
|
|
379
388
|
// ensure that we are starting with a clean directory
|
|
380
389
|
try {
|
|
381
|
-
await
|
|
390
|
+
await fs.rm(tmpDir, { recursive: true, force: true });
|
|
382
391
|
}
|
|
383
392
|
catch {
|
|
384
393
|
// error means that folder doesn't exist which is okay
|
|
385
394
|
}
|
|
386
|
-
await
|
|
395
|
+
await fs.mkdir(tmpDir, { recursive: true });
|
|
387
396
|
return tmpDir;
|
|
388
397
|
}
|
|
389
398
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/commands/cli/install/test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/commands/cli/install/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { FlagsConfig, SfdxCommand } from '@salesforce/command';
|
|
2
2
|
export default class build extends SfdxCommand {
|
|
3
3
|
static readonly description: string;
|
|
4
|
+
static readonly examples: string[];
|
|
4
5
|
static readonly flagsConfig: FlagsConfig;
|
|
5
6
|
run(): Promise<void>;
|
|
6
7
|
private exec;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
2
|
/*
|
|
4
3
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
5
4
|
* All rights reserved.
|
|
6
5
|
* Licensed under the BSD 3-Clause license.
|
|
7
6
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
8
7
|
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
const os = require("os");
|
|
9
10
|
const command_1 = require("@salesforce/command");
|
|
10
11
|
const shelljs_1 = require("shelljs");
|
|
11
12
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
@@ -18,14 +19,13 @@ core_2.Messages.importMessagesDirectory(__dirname);
|
|
|
18
19
|
const messages = core_2.Messages.loadMessages('@salesforce/plugin-release-management', 'cli.latestrc.build');
|
|
19
20
|
class build extends command_1.SfdxCommand {
|
|
20
21
|
async run() {
|
|
21
|
-
var _a;
|
|
22
22
|
let auth;
|
|
23
23
|
const pushChangesToGitHub = !this.flags['build-only'];
|
|
24
24
|
if (pushChangesToGitHub) {
|
|
25
|
-
auth = (0, ts_types_1.ensureString)(
|
|
25
|
+
auth = (0, ts_types_1.ensureString)(new kit_1.Env().getString('GH_TOKEN') ?? new kit_1.Env().getString('GITHUB_TOKEN'), 'The GH_TOKEN env var is required to push changes to GitHub. Use the --build-only flag to skip GitHub operations (a manual push will then be needed)');
|
|
26
26
|
}
|
|
27
27
|
// get the current version and implement the patch version for a default rc build
|
|
28
|
-
const repo = await repository_1.
|
|
28
|
+
const repo = await repository_1.PackageRepo.create({ ux: this.ux });
|
|
29
29
|
const nextRCVersion = repo.package.getNextRCVersion(this.flags.rctag, this.flags.patch);
|
|
30
30
|
repo.nextVersion = nextRCVersion;
|
|
31
31
|
this.ux.log(`starting on main and will checkout ${repo.nextVersion}`);
|
|
@@ -37,15 +37,25 @@ class build extends command_1.SfdxCommand {
|
|
|
37
37
|
this.ux.log(`setting the version to ${nextRCVersion}`);
|
|
38
38
|
repo.package.setNextVersion(nextRCVersion);
|
|
39
39
|
repo.package.packageJson.version = nextRCVersion;
|
|
40
|
-
|
|
41
|
-
if (
|
|
42
|
-
this.ux.log(
|
|
43
|
-
repo.package.
|
|
40
|
+
const only = this.flags.only;
|
|
41
|
+
if (only) {
|
|
42
|
+
this.ux.log(`bumping the following dependencies only: ${only.join(', ')}`);
|
|
43
|
+
const bumped = repo.package.bumpDependencyVersions(only);
|
|
44
|
+
if (!bumped.length) {
|
|
45
|
+
throw new core_2.SfError('No version changes made. Confirm you are passing the correct dependency and version to --only.');
|
|
46
|
+
}
|
|
44
47
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
this.
|
|
48
|
-
|
|
48
|
+
else {
|
|
49
|
+
// bump resolution deps
|
|
50
|
+
if (this.flags.resolutions) {
|
|
51
|
+
this.ux.log('bumping resolutions in the package.json to their "latest"');
|
|
52
|
+
repo.package.bumpResolutions('latest');
|
|
53
|
+
}
|
|
54
|
+
// pin the pinned dependencies
|
|
55
|
+
if (this.flags['pinned-deps']) {
|
|
56
|
+
this.ux.log('pinning dependencies in pinnedDependencies to "latest-rc"');
|
|
57
|
+
repo.package.pinDependencyVersions('latest-rc');
|
|
58
|
+
}
|
|
49
59
|
}
|
|
50
60
|
repo.package.writePackageJson();
|
|
51
61
|
this.exec('yarn install');
|
|
@@ -89,6 +99,7 @@ class build extends command_1.SfdxCommand {
|
|
|
89
99
|
}
|
|
90
100
|
exports.default = build;
|
|
91
101
|
build.description = messages.getMessage('description');
|
|
102
|
+
build.examples = messages.getMessage('examples').split(os.EOL);
|
|
92
103
|
build.flagsConfig = {
|
|
93
104
|
rctag: command_1.flags.string({
|
|
94
105
|
description: messages.getMessage('flags.rctag'),
|
|
@@ -103,6 +114,9 @@ build.flagsConfig = {
|
|
|
103
114
|
default: true,
|
|
104
115
|
allowNo: true,
|
|
105
116
|
}),
|
|
117
|
+
only: command_1.flags.array({
|
|
118
|
+
description: messages.getMessage('flags.only'),
|
|
119
|
+
}),
|
|
106
120
|
'pinned-deps': command_1.flags.boolean({
|
|
107
121
|
description: messages.getMessage('flags.pinnedDeps'),
|
|
108
122
|
default: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../src/commands/cli/latestrc/build.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../src/commands/cli/latestrc/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,12 +28,11 @@ class ReleaseNotes extends command_1.SfdxCommand {
|
|
|
28
28
|
this.usernames = {};
|
|
29
29
|
}
|
|
30
30
|
async run() {
|
|
31
|
-
var _a;
|
|
32
31
|
const auth = (0, ts_types_1.ensureString)(new kit_1.Env().getString('GH_TOKEN'), 'GH_TOKEN is required to be set in the environment');
|
|
33
32
|
this.octokit = new core_1.Octokit({ auth });
|
|
34
33
|
const cli = (0, ts_types_1.ensure)(this.flags.cli);
|
|
35
34
|
const fullName = cli === types_1.CLI.SF ? '@salesforce/cli' : 'sfdx-cli';
|
|
36
|
-
const npmPackage = this.getNpmPackage(fullName,
|
|
35
|
+
const npmPackage = this.getNpmPackage(fullName, this.flags.since ?? 'latest');
|
|
37
36
|
const latestrc = this.getNpmPackage(fullName, 'latest-rc');
|
|
38
37
|
const oldPlugins = this.normalizePlugins(npmPackage);
|
|
39
38
|
const newPlugins = this.normalizePlugins(latestrc);
|
|
@@ -83,8 +82,7 @@ class ReleaseNotes extends command_1.SfdxCommand {
|
|
|
83
82
|
return JSON.parse(result.stdout);
|
|
84
83
|
}
|
|
85
84
|
normalizePlugins(npmPackage) {
|
|
86
|
-
|
|
87
|
-
const plugins = (_b = (_a = npmPackage.oclif) === null || _a === void 0 ? void 0 : _a.plugins) !== null && _b !== void 0 ? _b : [];
|
|
85
|
+
const plugins = npmPackage.oclif?.plugins ?? [];
|
|
88
86
|
const normalized = { [npmPackage.name]: npmPackage.version };
|
|
89
87
|
plugins.forEach((p) => {
|
|
90
88
|
const version = (0, package_1.parsePackageVersion)(npmPackage.dependencies[p]);
|
|
@@ -121,20 +119,18 @@ class ReleaseNotes extends command_1.SfdxCommand {
|
|
|
121
119
|
return { removed, added, upgraded, downgraded, unchanged };
|
|
122
120
|
}
|
|
123
121
|
async getNameOfUser(username) {
|
|
124
|
-
var _a, _b;
|
|
125
122
|
if (this.usernames[username])
|
|
126
123
|
return this.usernames[username];
|
|
127
124
|
const { data } = await this.octokit.request('GET /users/{username}', { username });
|
|
128
|
-
const name = (
|
|
125
|
+
const name = (data.name ?? data.login ?? username);
|
|
129
126
|
this.usernames[username] = name;
|
|
130
127
|
return name;
|
|
131
128
|
}
|
|
132
129
|
async getPullsForPlugin(plugin, publishDate) {
|
|
133
|
-
var _a;
|
|
134
130
|
const npmPackage = this.getNpmPackage(plugin);
|
|
135
|
-
const homepage =
|
|
131
|
+
const homepage = npmPackage.homepage ?? (npmPackage.name === 'salesforce-alm' ? 'salesforcecli/toolbelt' : null);
|
|
136
132
|
if (!homepage) {
|
|
137
|
-
throw new core_2.
|
|
133
|
+
throw new core_2.SfError(`No github url found for ${npmPackage.name}`, 'GitUrlNotFound');
|
|
138
134
|
}
|
|
139
135
|
const [owner, repo] = homepage.replace('https://github.com/', '').replace(/#(.*)/g, '').split('/');
|
|
140
136
|
const pullRequests = await this.octokit.request('GET /repos/{owner}/{repo}/pulls', {
|
|
@@ -150,7 +146,6 @@ class ReleaseNotes extends command_1.SfdxCommand {
|
|
|
150
146
|
return pr.merged_at && pr.merged_at > publishDate && !pr.user.login.includes('dependabot');
|
|
151
147
|
})
|
|
152
148
|
.map(async (pr) => {
|
|
153
|
-
var _a;
|
|
154
149
|
const username = await this.getNameOfUser(pr.user.login);
|
|
155
150
|
const author = pr.user.login === username ? username : `${username} (${pr.user.login})`;
|
|
156
151
|
return {
|
|
@@ -159,7 +154,7 @@ class ReleaseNotes extends command_1.SfdxCommand {
|
|
|
159
154
|
mergedInto: pr.base.ref,
|
|
160
155
|
link: pr.html_url,
|
|
161
156
|
title: pr.title,
|
|
162
|
-
description: (
|
|
157
|
+
description: (pr.body ?? '').trim(),
|
|
163
158
|
plugin,
|
|
164
159
|
};
|
|
165
160
|
})));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"releasenotes.js","sourceRoot":"","sources":["../../../src/commands/cli/releasenotes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,mDAA4D;AAC5D,yCAAsC;AACtC,wCAAwC;AACxC,iCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"releasenotes.js","sourceRoot":"","sources":["../../../src/commands/cli/releasenotes.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,18 +9,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.SchemaUtils = void 0;
|
|
10
10
|
const path = require("path");
|
|
11
11
|
const os = require("os");
|
|
12
|
+
const fs = require("fs/promises");
|
|
12
13
|
const assert = require("assert");
|
|
13
14
|
const command_1 = require("@salesforce/command");
|
|
14
15
|
const core_1 = require("@salesforce/core");
|
|
15
16
|
const shelljs_1 = require("shelljs");
|
|
16
17
|
const fg = require("fast-glob");
|
|
18
|
+
const kit_1 = require("@salesforce/kit");
|
|
17
19
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
18
|
-
const messages = core_1.Messages.
|
|
20
|
+
const messages = core_1.Messages.load('@salesforce/plugin-release-management', 'cli.schemas.collect', [
|
|
21
|
+
'description',
|
|
22
|
+
'examples',
|
|
23
|
+
]);
|
|
19
24
|
class SchemaUtils {
|
|
20
25
|
static async getLatestSchemaFiles() {
|
|
21
|
-
|
|
22
|
-
const pjson = (
|
|
23
|
-
const globs = (
|
|
26
|
+
const fileData = await fs.readFile(path.join(process.cwd(), 'package.json'), 'utf-8');
|
|
27
|
+
const pjson = (0, kit_1.parseJsonMap)(fileData, path.join(process.cwd(), 'package.json'));
|
|
28
|
+
const globs = (pjson.oclif?.plugins || []).map((plugin) => {
|
|
24
29
|
const normalized = plugin.replace(/\\/g, '/');
|
|
25
30
|
return `node_modules/${normalized}/schemas/**/*.json`; // We need to use / for path sep since fg only works with Unix paths
|
|
26
31
|
});
|
|
@@ -64,14 +69,14 @@ class Collect extends command_1.SfdxCommand {
|
|
|
64
69
|
}
|
|
65
70
|
}
|
|
66
71
|
const outputDir = path.join(process.cwd(), 'schemas');
|
|
67
|
-
await
|
|
72
|
+
await fs.mkdir(outputDir, { recursive: true });
|
|
68
73
|
for (const [plugin, files] of Array.from(schemaFilesByPlugin.entries())) {
|
|
69
74
|
const pluginOutputDir = path.join(outputDir, plugin);
|
|
70
|
-
await
|
|
75
|
+
await fs.mkdir(pluginOutputDir, { recursive: true });
|
|
71
76
|
for (const file of files) {
|
|
72
77
|
if (file.split(path.sep).includes('hooks')) {
|
|
73
78
|
const hooksOutputDir = path.join(pluginOutputDir, 'hooks');
|
|
74
|
-
await
|
|
79
|
+
await fs.mkdir(hooksOutputDir, { recursive: true });
|
|
75
80
|
(0, shelljs_1.cp)('-f', file, path.join(hooksOutputDir, path.basename(file)));
|
|
76
81
|
}
|
|
77
82
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../../src/commands/cli/schemas/collect.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6BAA6B;AAC7B,yBAAyB;AACzB,iCAAiC;AACjC,iDAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../../src/commands/cli/schemas/collect.ts"],"names":[],"mappings":"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"}
|