@salesforce/plugin-release-management 2.14.0 → 3.0.2
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 +18 -0
- package/README.md +293 -324
- 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 +8 -13
- 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 -35
- package/lib/commands/cli/install/test.js.map +1 -1
- package/lib/commands/cli/latestrc/build.js +2 -2
- package/lib/commands/cli/latestrc/build.js.map +1 -1
- package/lib/commands/cli/releasenotes.js +1 -1
- package/lib/commands/cli/releasenotes.js.map +1 -1
- package/lib/commands/cli/schemas/collect.js +11 -5
- 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/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 +20 -12
- package/lib/commands/cli/versions/inspect.js.map +1 -1
- package/lib/commands/dependabot/automerge.js +2 -4
- 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 +5 -2
- 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.js +16 -10
- package/lib/package.js.map +1 -1
- package/lib/pluginCommand.js +6 -6
- package/lib/pluginCommand.js.map +1 -1
- package/lib/registry.js +9 -4
- package/lib/registry.js.map +1 -1
- package/lib/repository.d.ts +2 -23
- package/lib/repository.js +12 -163
- package/lib/repository.js.map +1 -1
- package/messages/channel.promote.json +0 -1
- 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 +16 -25
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/repositories/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2BAAyB;AACzB,iDAA+D;AAC/D,2CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/repositories/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2BAAyB;AACzB,iDAA+D;AAC/D,2CAA4C;AAC5C,sCAAoC;AACpC,qDAA+E;AAE/E,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uCAAuC,EAAE,cAAc,CAAC,CAAC;AAEhG,MAAqB,YAAa,SAAQ,qBAAW;IAU5C,KAAK,CAAC,GAAG;QACd,MAAM,YAAY,GAAG,MAAM,IAAA,wCAAyB,GAAE,CAAC;QAEvD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YACpB,YAAK,CAAC,EAAE,CAAC,KAAK,CACZ,YAAY,EACZ;gBACE,YAAY,EAAE,EAAE;gBAChB,IAAI,EAAE,EAAE;gBACR,GAAG,EAAE,EAAE;gBACP,QAAQ,EAAE;oBACR,GAAG,EAAE,CAAC,GAAmB,EAAU,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrG,QAAQ,EAAE,IAAI;iBACf;aACF,EACD;gBACE,mEAAmE;gBACnE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC9B,GAAG,IAAI,CAAC,KAAK,EAAE,eAAe;aAC/B,CACF,CAAC;SACH;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;;AAjCH,+BAkCC;AAjCwB,wBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,qBAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,QAAG,CAAC,CAAC;AAE7E,mEAAmE;AAC5C,wBAAW,GAAgB;IAChD,8DAA8D;IAC9D,GAAI,YAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAU;CACnC,CAAC"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const path = require("path");
|
|
10
|
+
const fs = require("fs/promises");
|
|
10
11
|
const command_1 = require("@salesforce/command");
|
|
11
12
|
const core_1 = require("@salesforce/core");
|
|
12
13
|
const shelljs_1 = require("shelljs");
|
|
@@ -14,18 +15,22 @@ const kit_1 = require("@salesforce/kit");
|
|
|
14
15
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
15
16
|
const repository_1 = require("../../repository");
|
|
16
17
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
17
|
-
const messages = core_1.Messages.
|
|
18
|
+
const messages = core_1.Messages.load('@salesforce/plugin-release-management', 'typescript.update', [
|
|
19
|
+
'description',
|
|
20
|
+
'typescriptVersion',
|
|
21
|
+
'esTarget',
|
|
22
|
+
'InvalidTargetVersion',
|
|
23
|
+
'InvalidTypescriptVersion',
|
|
24
|
+
]);
|
|
18
25
|
class Update extends command_1.SfdxCommand {
|
|
19
26
|
async run() {
|
|
20
27
|
this.typescriptPkg = this.retrieveTsPackage();
|
|
21
28
|
this.validateEsTarget();
|
|
22
29
|
this.validateTsVersion();
|
|
23
|
-
this.repo =
|
|
24
|
-
|
|
25
|
-
: await repository_1.SinglePackageRepo.create({ ux: this.ux });
|
|
26
|
-
this.packages = await this.getPackages();
|
|
30
|
+
this.repo = await repository_1.PackageRepo.create({ ux: this.ux });
|
|
31
|
+
this.packages = this.getPackages();
|
|
27
32
|
this.ux.warn('This is for testing new versions only. To update the version you must go through dev-scripts.');
|
|
28
|
-
|
|
33
|
+
this.updateTsVersion();
|
|
29
34
|
await this.updateEsTarget();
|
|
30
35
|
try {
|
|
31
36
|
this.repo.install();
|
|
@@ -37,25 +42,29 @@ class Update extends command_1.SfdxCommand {
|
|
|
37
42
|
this.repo.revertUnstagedChanges();
|
|
38
43
|
}
|
|
39
44
|
}
|
|
40
|
-
|
|
41
|
-
return
|
|
45
|
+
getPackages() {
|
|
46
|
+
return [this.repo.package];
|
|
42
47
|
}
|
|
43
48
|
async updateEsTargetConfig(packagePath) {
|
|
44
49
|
const tsConfigPath = path.join(packagePath, 'tsconfig.json');
|
|
45
|
-
const tsConfigString = await
|
|
50
|
+
const tsConfigString = await fs.readFile(tsConfigPath, 'utf-8');
|
|
46
51
|
// strip out any comments that might be in the tsconfig.json
|
|
47
52
|
const commentRegex = new RegExp(/(\/\/.*)/, 'gi');
|
|
48
53
|
const tsConfig = JSON.parse(tsConfigString.replace(commentRegex, ''));
|
|
49
54
|
(0, kit_1.set)((0, ts_types_1.asObject)(tsConfig), 'compilerOptions.target', this.flags.target);
|
|
50
55
|
this.ux.log(`Updating tsconfig target at ${tsConfigPath} to:`, this.flags.target);
|
|
51
|
-
|
|
56
|
+
const fileData = JSON.stringify(tsConfig, null, 2);
|
|
57
|
+
await fs.writeFile(tsConfigPath, fileData, {
|
|
58
|
+
encoding: 'utf8',
|
|
59
|
+
mode: '600',
|
|
60
|
+
});
|
|
52
61
|
}
|
|
53
62
|
async updateEsTarget() {
|
|
54
63
|
for (const pkg of this.packages) {
|
|
55
64
|
await this.updateEsTargetConfig(pkg.location);
|
|
56
65
|
}
|
|
57
66
|
}
|
|
58
|
-
|
|
67
|
+
updateTsVersion() {
|
|
59
68
|
const newVersion = this.determineNextTsVersion();
|
|
60
69
|
for (const pkg of this.packages) {
|
|
61
70
|
if (pkg.packageJson.devDependencies['typescript']) {
|
|
@@ -72,16 +81,6 @@ class Update extends command_1.SfdxCommand {
|
|
|
72
81
|
}
|
|
73
82
|
pkg.writePackageJson(pkg.location);
|
|
74
83
|
}
|
|
75
|
-
if (this.repo instanceof repository_1.LernaRepo) {
|
|
76
|
-
const pkgJson = (await core_1.fs.readJson('package.json'));
|
|
77
|
-
// If the install script runs sf-lerna-install, the install will fail because the typescript version
|
|
78
|
-
// won't match the expected version. So in that case, we delete the prepare script so that we
|
|
79
|
-
// get a successful install
|
|
80
|
-
if (pkgJson.scripts['install'] === 'sf-lerna-install') {
|
|
81
|
-
delete pkgJson.scripts['install'];
|
|
82
|
-
await core_1.fs.writeJson('package.json', pkgJson);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
84
|
}
|
|
86
85
|
determineNextTsVersion() {
|
|
87
86
|
return this.flags.version === 'latest' || !this.flags.version
|
|
@@ -94,7 +93,7 @@ class Update extends command_1.SfdxCommand {
|
|
|
94
93
|
return JSON.parse(result.stdout);
|
|
95
94
|
}
|
|
96
95
|
else {
|
|
97
|
-
throw new core_1.
|
|
96
|
+
throw new core_1.SfError('Could not find typescript on the npm registry', 'TypescriptNotFound');
|
|
98
97
|
}
|
|
99
98
|
}
|
|
100
99
|
validateEsTarget() {
|
|
@@ -102,15 +101,13 @@ class Update extends command_1.SfdxCommand {
|
|
|
102
101
|
return true;
|
|
103
102
|
if (/ES[0-9]{4}/g.test(this.flags.target))
|
|
104
103
|
return true;
|
|
105
|
-
throw core_1.
|
|
106
|
-
this.flags.target,
|
|
107
|
-
]);
|
|
104
|
+
throw new core_1.SfError(messages.getMessage('InvalidTargetVersion'), 'InvalidTargetVersion', [this.flags.target]);
|
|
108
105
|
}
|
|
109
106
|
validateTsVersion() {
|
|
110
107
|
if (this.flags.version === 'latest')
|
|
111
108
|
return true;
|
|
112
109
|
if (this.flags.version && !this.typescriptPkg.versions.includes(this.flags.version)) {
|
|
113
|
-
throw core_1.
|
|
110
|
+
throw new core_1.SfError(messages.getMessage('InvalidTypescriptVersion'), 'InvalidTypescriptVersion', [
|
|
114
111
|
this.flags.version,
|
|
115
112
|
]);
|
|
116
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/typescript/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,6BAA6B;AAC7B,iDAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/typescript/update.ts"],"names":[],"mappings":"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"}
|
package/lib/dependabot.js
CHANGED
|
@@ -7,12 +7,14 @@ exports.getOwnerAndRepo = exports.maxVersionBumpFlag = exports.meetsVersionCrite
|
|
|
7
7
|
* Licensed under the BSD 3-Clause license.
|
|
8
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
9
|
*/
|
|
10
|
+
const fs = require("fs");
|
|
10
11
|
const semver_1 = require("semver");
|
|
11
12
|
const command_1 = require("@salesforce/command");
|
|
12
13
|
const core_1 = require("@salesforce/core");
|
|
14
|
+
const kit_1 = require("@salesforce/kit");
|
|
13
15
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
14
16
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
15
|
-
const messages = core_1.Messages.
|
|
17
|
+
const messages = core_1.Messages.load('@salesforce/plugin-release-management', 'dependabot.consolidate', ['maxVersionBump']);
|
|
16
18
|
const meetsVersionCriteria = (title, maxVersionBump) => {
|
|
17
19
|
const versionsRegex = /[0-9]+.[0-9]+.[0-9]+/g;
|
|
18
20
|
const [from, to] = title.match(versionsRegex);
|
|
@@ -34,7 +36,8 @@ exports.maxVersionBumpFlag = command_1.flags.enum({
|
|
|
34
36
|
required: true,
|
|
35
37
|
});
|
|
36
38
|
const getOwnerAndRepo = async (ownerFlag, repoFlag) => {
|
|
37
|
-
const
|
|
39
|
+
const fileData = await fs.promises.readFile('package.json', 'utf8');
|
|
40
|
+
const pkgJson = (0, kit_1.parseJson)(fileData, 'package.json', false);
|
|
38
41
|
if (pkgJson.repository && (0, ts_types_1.isString)(pkgJson.repository)) {
|
|
39
42
|
const [owner, repo] = pkgJson.repository?.split('/');
|
|
40
43
|
return { owner, repo };
|
package/lib/dependabot.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependabot.js","sourceRoot":"","sources":["../src/dependabot.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAA2C;AAC3C,iDAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"dependabot.js","sourceRoot":"","sources":["../src/dependabot.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,mCAA2C;AAC3C,iDAA4C;AAC5C,2CAA4C;AAC5C,yCAA4C;AAC5C,mDAA8D;AAK9D,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,uCAAuC,EAAE,wBAAwB,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAE/G,MAAM,oBAAoB,GAAG,CAAC,KAAa,EAAE,cAAwB,EAAW,EAAE;IACvF,MAAM,aAAa,GAAG,uBAAuB,CAAC;IAC9C,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAE9C,MAAM,QAAQ,GAAG,IAAA,aAAI,EAAC,IAAI,EAAE,EAAE,CAAa,CAAC;IAC5C,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAe;QAChD,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,CAAe;QACvC,KAAK,EAAE,CAAC,OAAO,CAAe;KAC/B,CAAC;IAEF,MAAM,YAAY,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;IAClD,OAAO,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACzC,CAAC,CAAC;AAbW,QAAA,oBAAoB,wBAa/B;AAEW,QAAA,kBAAkB,GAAG,eAAK,CAAC,IAAI,CAAC;IAC3C,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC;IAClD,IAAI,EAAE,GAAG;IACT,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC;IACpC,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,IAAI;CACf,CAAC,CAAC;AAEI,MAAM,eAAe,GAAG,KAAK,EAClC,SAAiB,EACjB,QAAgB,EAC0B,EAAE;IAC5C,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,IAAA,eAAS,EAAC,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAgB,CAAC;IAC1E,IAAI,OAAO,CAAC,UAAU,IAAI,IAAA,mBAAQ,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACtD,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACrD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;KACxB;SAAM;QACL,OAAO;YACL,KAAK,EAAE,IAAA,uBAAY,EAAC,SAAS,EAAE,2BAA2B,CAAC;YAC3D,IAAI,EAAE,IAAA,uBAAY,EAAC,QAAQ,EAAE,+BAA+B,CAAC;SAC9D,CAAC;KACH;AACH,CAAC,CAAC;AAfW,QAAA,eAAe,mBAe1B"}
|
package/lib/dependencies.d.ts
CHANGED
package/lib/inspectCommits.d.ts
CHANGED
|
@@ -20,4 +20,4 @@ export interface CommitInspection {
|
|
|
20
20
|
* We, however, don't want to publish a new version for chore, docs, etc. So we analyze
|
|
21
21
|
* the commits to see if any of them indicate that a new release should be published.
|
|
22
22
|
*/
|
|
23
|
-
export declare function inspectCommits(pkg: Package
|
|
23
|
+
export declare function inspectCommits(pkg: Package): Promise<CommitInspection>;
|
package/lib/inspectCommits.js
CHANGED
|
@@ -20,21 +20,17 @@ const conventionalChangelogPresetLoader = require("conventional-changelog-preset
|
|
|
20
20
|
* We, however, don't want to publish a new version for chore, docs, etc. So we analyze
|
|
21
21
|
* the commits to see if any of them indicate that a new release should be published.
|
|
22
22
|
*/
|
|
23
|
-
async function inspectCommits(pkg
|
|
23
|
+
async function inspectCommits(pkg) {
|
|
24
24
|
const skippableCommitTypes = ['chore', 'style', 'docs', 'ci', 'test'];
|
|
25
25
|
// find the latest git tag so that we can get all the commits that have happened since
|
|
26
26
|
const tags = (0, shelljs_1.exec)('git fetch --tags && git tag', { silent: true }).stdout.split(os.EOL);
|
|
27
|
-
const latestTag =
|
|
28
|
-
? tags.find((tag) => tag.includes(`${pkg.name}@${pkg.npmPackage.version}`)) || ''
|
|
29
|
-
: tags.find((tag) => tag.includes(pkg.npmPackage.version));
|
|
27
|
+
const latestTag = tags.find((tag) => tag.includes(pkg.npmPackage.version));
|
|
30
28
|
// import the default commit parser configuration
|
|
31
29
|
const defaultConfigPath = require.resolve('conventional-changelog-conventionalcommits');
|
|
32
30
|
const configuration = await conventionalChangelogPresetLoader({ name: defaultConfigPath });
|
|
33
31
|
const commits = await new Promise((resolve) => {
|
|
34
32
|
const DELIMITER = 'SPLIT';
|
|
35
|
-
const gitLogCommand =
|
|
36
|
-
? `git log --format=%B%n-hash-%n%H%n${DELIMITER} ${latestTag}..HEAD --no-merges -- ${pkg.location}`
|
|
37
|
-
: `git log --format=%B%n-hash-%n%H%n${DELIMITER} ${latestTag}..HEAD --no-merges`;
|
|
33
|
+
const gitLogCommand = `git log --format=%B%n-hash-%n%H%n${DELIMITER} ${latestTag}..HEAD --no-merges`;
|
|
38
34
|
const gitLog = (0, shelljs_1.exec)(gitLogCommand, { silent: true })
|
|
39
35
|
.stdout.split(`${DELIMITER}${os.EOL}`)
|
|
40
36
|
.filter((c) => !!c);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectCommits.js","sourceRoot":"","sources":["../src/inspectCommits.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,mCAAkC;AAClC,qCAA+B;AAC/B,yEAAyE;AACzE,0FAA0F;AAkB1F;;;;;;;GAOG;AACI,KAAK,UAAU,cAAc,CAAC,GAAY
|
|
1
|
+
{"version":3,"file":"inspectCommits.js","sourceRoot":"","sources":["../src/inspectCommits.ts"],"names":[],"mappings":"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"}
|
package/lib/package.js
CHANGED
|
@@ -7,11 +7,12 @@ exports.Package = exports.parsePackageVersion = exports.parseAliasedPackageName
|
|
|
7
7
|
* Licensed under the BSD 3-Clause license.
|
|
8
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
9
|
*/
|
|
10
|
+
const fs = require("fs");
|
|
10
11
|
const path = require("path");
|
|
11
12
|
const semver = require("semver");
|
|
12
|
-
const
|
|
13
|
+
const core_1 = require("@oclif/core");
|
|
13
14
|
const shelljs_1 = require("shelljs");
|
|
14
|
-
const
|
|
15
|
+
const core_2 = require("@salesforce/core");
|
|
15
16
|
const kit_1 = require("@salesforce/kit");
|
|
16
17
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
17
18
|
const registry_1 = require("./registry");
|
|
@@ -32,7 +33,8 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
32
33
|
}
|
|
33
34
|
async readPackageJson() {
|
|
34
35
|
const pkgJsonPath = this.location ? path.join(this.location, 'package.json') : 'package.json';
|
|
35
|
-
|
|
36
|
+
const fileData = await fs.promises.readFile(pkgJsonPath, 'utf8');
|
|
37
|
+
return (0, kit_1.parseJson)(fileData, pkgJsonPath, false);
|
|
36
38
|
}
|
|
37
39
|
/**
|
|
38
40
|
* Retrieve the npm package info using `npm view`
|
|
@@ -82,7 +84,11 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
82
84
|
}
|
|
83
85
|
writePackageJson(rootDir) {
|
|
84
86
|
const pkgJsonPath = rootDir ? path.join(rootDir, 'package.json') : 'package.json';
|
|
85
|
-
|
|
87
|
+
const fileData = JSON.stringify(this.packageJson, null, 2);
|
|
88
|
+
fs.writeFileSync(pkgJsonPath, fileData, {
|
|
89
|
+
encoding: 'utf8',
|
|
90
|
+
mode: '600',
|
|
91
|
+
});
|
|
86
92
|
}
|
|
87
93
|
getDistTags(name) {
|
|
88
94
|
const result = (0, shelljs_1.exec)(`npm view ${name} dist-tags ${this.registry.getRegistryParameter()} --json`, {
|
|
@@ -92,7 +98,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
92
98
|
}
|
|
93
99
|
bumpResolutions(tag) {
|
|
94
100
|
if (!this.packageJson.resolutions) {
|
|
95
|
-
throw new
|
|
101
|
+
throw new core_2.SfError('Bumping resolutions requires property "resolutions" to be present in package.json');
|
|
96
102
|
}
|
|
97
103
|
Object.keys(this.packageJson.resolutions).map((key) => {
|
|
98
104
|
const versions = this.getDistTags(key);
|
|
@@ -138,7 +144,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
138
144
|
};
|
|
139
145
|
}
|
|
140
146
|
}
|
|
141
|
-
|
|
147
|
+
core_1.CliUx.ux.error(`${name} was not found in the dependencies section of the package.json`);
|
|
142
148
|
}
|
|
143
149
|
bumpDependencyVersions(targetDependencies) {
|
|
144
150
|
return targetDependencies
|
|
@@ -181,7 +187,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
181
187
|
pinDependencyVersions(targetTag) {
|
|
182
188
|
// get the list of dependencies to hardcode
|
|
183
189
|
if (!this.packageJson.pinnedDependencies) {
|
|
184
|
-
throw new
|
|
190
|
+
throw new core_2.SfError('Pinning package dependencies requires property "pinnedDependencies" to be present in package.json');
|
|
185
191
|
}
|
|
186
192
|
const { pinnedDependencies, dependencies } = this.packageJson;
|
|
187
193
|
const deps = pinnedDependencies
|
|
@@ -190,7 +196,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
190
196
|
const [tag] = tagRegex.exec(d) || [];
|
|
191
197
|
const name = tag ? d.replace(new RegExp(`@${tag}$`), '') : d;
|
|
192
198
|
if (!dependencies[name]) {
|
|
193
|
-
|
|
199
|
+
core_1.CliUx.ux.warn(`${name} was not found in the dependencies section of your package.json. Skipping...`);
|
|
194
200
|
return;
|
|
195
201
|
}
|
|
196
202
|
const version = dependencies[name];
|
|
@@ -226,7 +232,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
226
232
|
// include a latest-rc version for a single plugin but everything else we want latest.
|
|
227
233
|
let version;
|
|
228
234
|
if (semver.gt(dep.version, versions[tag])) {
|
|
229
|
-
|
|
235
|
+
core_1.CliUx.ux.warn(`${dep.name} is currently pinned at ${dep.version} which is higher than ${tag} (${versions[tag]}). Assuming that this is intentional...`);
|
|
230
236
|
version = dep.version;
|
|
231
237
|
tag = (0, kit_1.findKey)(versions, (v) => v === version);
|
|
232
238
|
}
|
|
@@ -256,7 +262,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
256
262
|
return !!(0, ts_types_1.get)(this.packageJson, `scripts.${scriptName}`, null);
|
|
257
263
|
}
|
|
258
264
|
async init() {
|
|
259
|
-
this.logger = await
|
|
265
|
+
this.logger = await core_2.Logger.child(this.constructor.name);
|
|
260
266
|
this.packageJson = await this.readPackageJson();
|
|
261
267
|
this.name = this.packageJson.name;
|
|
262
268
|
this.npmPackage = this.retrieveNpmPackage() || this.createDefaultNpmPackage();
|
package/lib/package.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,6BAA6B;AAC7B,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"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"}
|
package/lib/pluginCommand.js
CHANGED
|
@@ -43,7 +43,7 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
43
43
|
});
|
|
44
44
|
if (results.code !== 0) {
|
|
45
45
|
this.logger.debug(`Plugin command ${command} failed`, results.stderr);
|
|
46
|
-
throw new core_1.
|
|
46
|
+
throw new core_1.SfError(results.stderr, 'ShellExecError');
|
|
47
47
|
}
|
|
48
48
|
this.logger.debug(`Plugin command ${command} succeeded`, results);
|
|
49
49
|
try {
|
|
@@ -55,9 +55,9 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
catch (error) {
|
|
58
|
-
const
|
|
59
|
-
this.logger.debug(`Plugin command ${command} threw eception`,
|
|
60
|
-
throw
|
|
58
|
+
const sfError = new core_1.SfError(error, 'JsonParseError');
|
|
59
|
+
this.logger.debug(`Plugin command ${command} threw eception`, sfError);
|
|
60
|
+
throw sfError;
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
packagePath() {
|
|
@@ -72,7 +72,7 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
72
72
|
const pkgPath = this.packagePath();
|
|
73
73
|
const prjPath = pkgPath.substring(0, pkgPath.lastIndexOf(path.sep));
|
|
74
74
|
if (!this.pkg.bin[this.options.commandBin]) {
|
|
75
|
-
const sfdxError = new core_1.
|
|
75
|
+
const sfdxError = new core_1.SfError(`Could not locate commandBin ${this.options.commandBin} in package at path ${pkgPath}`);
|
|
76
76
|
this.logger.debug(sfdxError);
|
|
77
77
|
throw sfdxError;
|
|
78
78
|
}
|
|
@@ -117,7 +117,7 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
117
117
|
const nodeShellString = shelljs.which('node');
|
|
118
118
|
if (nodeShellString?.code === 0 && nodeShellString?.stdout)
|
|
119
119
|
return nodeShellString.stdout;
|
|
120
|
-
throw new core_1.
|
|
120
|
+
throw new core_1.SfError('Cannot locate node executable.', 'CannotFindNodeExecutable');
|
|
121
121
|
}
|
|
122
122
|
/**
|
|
123
123
|
* Finds the bin directory in the sfdx installation root path
|
package/lib/pluginCommand.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pluginCommand.js","sourceRoot":"","sources":["../src/pluginCommand.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AACH,sDAAsD;;;AAEtD,2BAAoC;AACpC,6BAA6B;AAE7B,yBAAyB;AACzB,+CAAsC;AACtC,mCAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"pluginCommand.js","sourceRoot":"","sources":["../src/pluginCommand.ts"],"names":[],"mappings":"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"}
|
package/lib/registry.js
CHANGED
|
@@ -10,6 +10,7 @@ exports.Registry = void 0;
|
|
|
10
10
|
const url_1 = require("url");
|
|
11
11
|
const path = require("path");
|
|
12
12
|
const os = require("os");
|
|
13
|
+
const fs = require("fs/promises");
|
|
13
14
|
const shelljs_1 = require("shelljs");
|
|
14
15
|
const core_1 = require("@salesforce/core");
|
|
15
16
|
const kit_1 = require("@salesforce/kit");
|
|
@@ -60,7 +61,7 @@ class Registry {
|
|
|
60
61
|
*/
|
|
61
62
|
async setNpmAuth(packageDirectory) {
|
|
62
63
|
if (!this.authToken) {
|
|
63
|
-
throw new core_1.
|
|
64
|
+
throw new core_1.SfError('auth token has not been set');
|
|
64
65
|
}
|
|
65
66
|
let npmrc = await this.readNpmrc(packageDirectory);
|
|
66
67
|
const normalizedRegistry = this.normalizeRegistryUrl();
|
|
@@ -97,16 +98,20 @@ class Registry {
|
|
|
97
98
|
}
|
|
98
99
|
}
|
|
99
100
|
async readNpmrc(packageDir) {
|
|
100
|
-
|
|
101
|
+
try {
|
|
102
|
+
// check that `.npmrc` exists
|
|
103
|
+
await fs.access(path.join(packageDir, '.npmrc'));
|
|
104
|
+
}
|
|
105
|
+
catch (err) {
|
|
101
106
|
return [];
|
|
102
107
|
}
|
|
103
|
-
const npmrc = await
|
|
108
|
+
const npmrc = await fs.readFile(path.join(packageDir, '.npmrc'), 'utf8');
|
|
104
109
|
const npmrcLines = npmrc.split(os.EOL);
|
|
105
110
|
return [...new Set(npmrcLines).values()].filter((line) => line?.length);
|
|
106
111
|
}
|
|
107
112
|
async writeNpmrc(packageDir, npmrc) {
|
|
108
113
|
const npmrcLines = [...new Set(npmrc).values()].filter((line) => line?.length);
|
|
109
|
-
await
|
|
114
|
+
await fs.writeFile(path.join(packageDir, '.npmrc'), npmrcLines.join(os.EOL), 'utf8');
|
|
110
115
|
}
|
|
111
116
|
normalizeRegistryUrl() {
|
|
112
117
|
const registryDomain = new url_1.URL(this.registryUrl);
|
package/lib/registry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6BAA0B;AAC1B,6BAA6B;AAC7B,yBAAyB;AACzB,qCAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"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"}
|
package/lib/repository.d.ts
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
import { AnyJson } from '@salesforce/ts-types';
|
|
2
1
|
import { UX } from '@salesforce/command';
|
|
3
2
|
import { ShellString } from 'shelljs';
|
|
4
3
|
import { AsyncOptionalCreatable, Env } from '@salesforce/kit';
|
|
5
4
|
import { Package, VersionValidation } from './package';
|
|
6
5
|
import { Registry } from './registry';
|
|
7
6
|
import { SigningResponse } from './codeSigning/SimplifiedSigning';
|
|
8
|
-
export declare type LernaJson = {
|
|
9
|
-
packages?: string[];
|
|
10
|
-
} & AnyJson;
|
|
11
7
|
interface PrepareOpts {
|
|
12
8
|
dryrun?: boolean;
|
|
13
9
|
githubRelease?: boolean;
|
|
@@ -25,7 +21,6 @@ export interface PackageInfo {
|
|
|
25
21
|
registryParam: string;
|
|
26
22
|
}
|
|
27
23
|
declare type PollFunction = () => boolean;
|
|
28
|
-
export declare function isMonoRepo(): Promise<boolean>;
|
|
29
24
|
export declare type RepositoryOptions = {
|
|
30
25
|
ux: UX;
|
|
31
26
|
useprerelease?: string;
|
|
@@ -60,7 +55,7 @@ declare abstract class Repository extends AsyncOptionalCreatable<RepositoryOptio
|
|
|
60
55
|
* We, however, don't want to publish a new version for chore, docs, etc. So we analyze
|
|
61
56
|
* the commits to see if any of them indicate that a new release should be published.
|
|
62
57
|
*/
|
|
63
|
-
protected isReleasable(pkg: Package
|
|
58
|
+
protected isReleasable(pkg: Package): Promise<boolean>;
|
|
64
59
|
abstract getSuccessMessage(): string;
|
|
65
60
|
abstract validate(): VersionValidation | VersionValidation[];
|
|
66
61
|
abstract prepare(options: PrepareOpts): void;
|
|
@@ -70,23 +65,7 @@ declare abstract class Repository extends AsyncOptionalCreatable<RepositoryOptio
|
|
|
70
65
|
abstract waitForAvailability(): Promise<boolean>;
|
|
71
66
|
protected abstract init(): Promise<void>;
|
|
72
67
|
}
|
|
73
|
-
export declare class
|
|
74
|
-
packages: Package[];
|
|
75
|
-
private logger;
|
|
76
|
-
constructor(options: RepositoryOptions);
|
|
77
|
-
static getPackages(): Promise<Package[]>;
|
|
78
|
-
static getPackagePaths(): Promise<string[]>;
|
|
79
|
-
validate(): VersionValidation[];
|
|
80
|
-
prepare(opts?: PrepareOpts): void;
|
|
81
|
-
sign(packageNames: string[]): Promise<SigningResponse[]>;
|
|
82
|
-
publish(opts?: PublishOpts): Promise<void>;
|
|
83
|
-
waitForAvailability(): Promise<boolean>;
|
|
84
|
-
getPkgInfo(packageNames: string[]): PackageInfo[];
|
|
85
|
-
getSuccessMessage(): string;
|
|
86
|
-
protected init(): Promise<void>;
|
|
87
|
-
private determineNextVersionByPackage;
|
|
88
|
-
}
|
|
89
|
-
export declare class SinglePackageRepo extends Repository {
|
|
68
|
+
export declare class PackageRepo extends Repository {
|
|
90
69
|
name: string;
|
|
91
70
|
nextVersion: string;
|
|
92
71
|
package: Package;
|