@salesforce/plugin-release-management 2.13.0 → 3.0.0
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 +17 -0
- package/bin/dev.cmd +3 -0
- 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 +17 -6
- 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 +18 -9
- 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 +96 -23
- 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 +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
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,10 +36,10 @@ exports.maxVersionBumpFlag = command_1.flags.enum({
|
|
|
34
36
|
required: true,
|
|
35
37
|
});
|
|
36
38
|
const getOwnerAndRepo = async (ownerFlag, repoFlag) => {
|
|
37
|
-
|
|
38
|
-
const pkgJson = (
|
|
39
|
+
const fileData = await fs.promises.readFile('package.json', 'utf8');
|
|
40
|
+
const pkgJson = (0, kit_1.parseJson)(fileData, 'package.json', false);
|
|
39
41
|
if (pkgJson.repository && (0, ts_types_1.isString)(pkgJson.repository)) {
|
|
40
|
-
const [owner, repo] =
|
|
42
|
+
const [owner, repo] = pkgJson.repository?.split('/');
|
|
41
43
|
return { owner, repo };
|
|
42
44
|
}
|
|
43
45
|
else {
|
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.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AsyncOptionalCreatable } from '@salesforce/kit';
|
|
2
|
-
import { AnyJson } from '@salesforce/ts-types';
|
|
2
|
+
import { AnyJson, Nullable } from '@salesforce/ts-types';
|
|
3
3
|
export declare type PackageJson = {
|
|
4
4
|
name: string;
|
|
5
5
|
version: string;
|
|
@@ -38,6 +38,13 @@ export interface VersionValidation {
|
|
|
38
38
|
valid: boolean;
|
|
39
39
|
name: string;
|
|
40
40
|
}
|
|
41
|
+
interface DependencyInfo {
|
|
42
|
+
dependencyName: string;
|
|
43
|
+
packageName: string;
|
|
44
|
+
alias: Nullable<string>;
|
|
45
|
+
currentVersion?: string;
|
|
46
|
+
finalVersion?: string;
|
|
47
|
+
}
|
|
41
48
|
export declare function parseAliasedPackageName(alias: string): string;
|
|
42
49
|
export declare function parsePackageVersion(alias: string): string;
|
|
43
50
|
export declare class Package extends AsyncOptionalCreatable {
|
|
@@ -62,7 +69,10 @@ export declare class Package extends AsyncOptionalCreatable {
|
|
|
62
69
|
getNextVersion(): string;
|
|
63
70
|
nextVersionIsAvailable(): boolean;
|
|
64
71
|
writePackageJson(rootDir?: string): void;
|
|
72
|
+
getDistTags(name: string): Record<string, string>;
|
|
65
73
|
bumpResolutions(tag: string): void;
|
|
74
|
+
getDependencyInfo(name: string, dependencies: Record<string, string>): DependencyInfo;
|
|
75
|
+
bumpDependencyVersions(targetDependencies: string[]): DependencyInfo[];
|
|
66
76
|
getNextRCVersion(tag: string, isPatch?: boolean): string;
|
|
67
77
|
pinDependencyVersions(targetTag: string): ChangedPackageVersions;
|
|
68
78
|
/**
|
|
@@ -74,3 +84,4 @@ export declare class Package extends AsyncOptionalCreatable {
|
|
|
74
84
|
protected init(): Promise<void>;
|
|
75
85
|
private createDefaultNpmPackage;
|
|
76
86
|
}
|
|
87
|
+
export {};
|
package/lib/package.js
CHANGED
|
@@ -7,6 +7,7 @@ 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
13
|
const cli_ux_1 = require("cli-ux");
|
|
@@ -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`
|
|
@@ -48,9 +50,8 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
48
50
|
return result.stdout ? JSON.parse(result.stdout) : null;
|
|
49
51
|
}
|
|
50
52
|
validateNextVersion() {
|
|
51
|
-
|
|
52
|
-
const
|
|
53
|
-
const currentVersion = (_b = this.npmPackage.version) !== null && _b !== void 0 ? _b : null;
|
|
53
|
+
const nextVersionExists = (this.npmPackage.versions ?? []).includes(this.nextVersion);
|
|
54
|
+
const currentVersion = this.npmPackage.version ?? null;
|
|
54
55
|
if (!nextVersionExists) {
|
|
55
56
|
this.logger.debug(`${this.npmPackage.name}@${this.nextVersion} does not exist in the registry. Proceeding...`);
|
|
56
57
|
return {
|
|
@@ -83,25 +84,101 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
83
84
|
}
|
|
84
85
|
writePackageJson(rootDir) {
|
|
85
86
|
const pkgJsonPath = rootDir ? path.join(rootDir, 'package.json') : 'package.json';
|
|
86
|
-
|
|
87
|
+
const fileData = JSON.stringify(this.packageJson, null, 2);
|
|
88
|
+
fs.writeFileSync(pkgJsonPath, fileData, {
|
|
89
|
+
encoding: 'utf8',
|
|
90
|
+
mode: '600',
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
getDistTags(name) {
|
|
94
|
+
const result = (0, shelljs_1.exec)(`npm view ${name} dist-tags ${this.registry.getRegistryParameter()} --json`, {
|
|
95
|
+
silent: true,
|
|
96
|
+
});
|
|
97
|
+
return JSON.parse(result.stdout);
|
|
87
98
|
}
|
|
88
99
|
bumpResolutions(tag) {
|
|
89
100
|
if (!this.packageJson.resolutions) {
|
|
90
|
-
throw new core_1.
|
|
101
|
+
throw new core_1.SfError('Bumping resolutions requires property "resolutions" to be present in package.json');
|
|
91
102
|
}
|
|
92
103
|
Object.keys(this.packageJson.resolutions).map((key) => {
|
|
93
|
-
const
|
|
94
|
-
silent: true,
|
|
95
|
-
});
|
|
96
|
-
const versions = JSON.parse(result.stdout);
|
|
104
|
+
const versions = this.getDistTags(key);
|
|
97
105
|
this.packageJson.resolutions[key] = versions[tag];
|
|
98
106
|
});
|
|
99
107
|
}
|
|
108
|
+
// Lookup dependency info by package name or npm alias
|
|
109
|
+
// Examples: @salesforce/plugin-info or @sf/info
|
|
110
|
+
// Pass in the dependencies you want to search through (dependencies, devDependencies, resolutions, etc)
|
|
111
|
+
getDependencyInfo(name, dependencies) {
|
|
112
|
+
for (const [key, value] of Object.entries(dependencies)) {
|
|
113
|
+
if (key === name) {
|
|
114
|
+
if (value.startsWith('npm:')) {
|
|
115
|
+
// npm alias was passed in as name, so we need to parse package name and version
|
|
116
|
+
// e.g. passed in: "@sf/login"
|
|
117
|
+
// dependency: "@sf/login": "npm:@salesforce/plugin-login@1.1.1"
|
|
118
|
+
return {
|
|
119
|
+
dependencyName: key,
|
|
120
|
+
packageName: parseAliasedPackageName(value),
|
|
121
|
+
alias: value,
|
|
122
|
+
currentVersion: parsePackageVersion(value),
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
// package name was passed, so we can use key and value directly
|
|
127
|
+
return {
|
|
128
|
+
dependencyName: key,
|
|
129
|
+
packageName: key,
|
|
130
|
+
alias: null,
|
|
131
|
+
currentVersion: value,
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
if (value.startsWith(`npm:${name}`)) {
|
|
136
|
+
// package name was passed in as name, but an alias is used for the dependency
|
|
137
|
+
// e.g. passed in: "@salesforce/plugin-login"
|
|
138
|
+
// dependency: "@sf/login": "npm:@salesforce/plugin-login@1.1.1"
|
|
139
|
+
return {
|
|
140
|
+
dependencyName: key,
|
|
141
|
+
packageName: name,
|
|
142
|
+
alias: value,
|
|
143
|
+
currentVersion: parsePackageVersion(value),
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
cli_ux_1.cli.error(`${name} was not found in the dependencies section of the package.json`);
|
|
148
|
+
}
|
|
149
|
+
bumpDependencyVersions(targetDependencies) {
|
|
150
|
+
return targetDependencies
|
|
151
|
+
.map((dep) => {
|
|
152
|
+
// regex for npm package with optional namespace and version
|
|
153
|
+
// https://regex101.com/r/HmIu3N/1
|
|
154
|
+
const npmPackageRegex = /^((?:@[^/]+\/)?[^@/]+)(?:@([^@/]+))?$/;
|
|
155
|
+
const [, name, version] = npmPackageRegex.exec(dep);
|
|
156
|
+
// We will look for packages in dependencies and resolutions
|
|
157
|
+
const { dependencies, resolutions } = this.packageJson;
|
|
158
|
+
// find dependency in package.json (could be an npm alias)
|
|
159
|
+
const depInfo = this.getDependencyInfo(name, { ...dependencies, ...resolutions });
|
|
160
|
+
// if a version is not provided, we'll look up the "latest" version
|
|
161
|
+
depInfo.finalVersion = version ?? this.getDistTags(depInfo.packageName).latest;
|
|
162
|
+
// return if version did not change
|
|
163
|
+
if (depInfo.currentVersion === depInfo.finalVersion)
|
|
164
|
+
return;
|
|
165
|
+
// override final version if npm alias is used
|
|
166
|
+
if (depInfo.alias) {
|
|
167
|
+
depInfo.finalVersion = `npm:${depInfo.packageName}@${depInfo.finalVersion}`;
|
|
168
|
+
}
|
|
169
|
+
// update dependency (or resolution) in package.json
|
|
170
|
+
if (dependencies[depInfo.dependencyName]) {
|
|
171
|
+
this.packageJson.dependencies[depInfo.dependencyName] = depInfo.finalVersion;
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
this.packageJson.resolutions[depInfo.dependencyName] = depInfo.finalVersion;
|
|
175
|
+
}
|
|
176
|
+
return depInfo;
|
|
177
|
+
})
|
|
178
|
+
.filter(Boolean); // remove falsy values, in this case the `undefined` if version did not change
|
|
179
|
+
}
|
|
100
180
|
getNextRCVersion(tag, isPatch = false) {
|
|
101
|
-
const
|
|
102
|
-
silent: true,
|
|
103
|
-
});
|
|
104
|
-
const versions = JSON.parse(result.stdout);
|
|
181
|
+
const versions = this.getDistTags(this.packageJson.name);
|
|
105
182
|
const version = semver.parse(versions[tag]);
|
|
106
183
|
return isPatch
|
|
107
184
|
? `${version.major}.${version.minor}.${version.patch + 1}`
|
|
@@ -110,7 +187,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
110
187
|
pinDependencyVersions(targetTag) {
|
|
111
188
|
// get the list of dependencies to hardcode
|
|
112
189
|
if (!this.packageJson.pinnedDependencies) {
|
|
113
|
-
throw new core_1.
|
|
190
|
+
throw new core_1.SfError('Pinning package dependencies requires property "pinnedDependencies" to be present in package.json');
|
|
114
191
|
}
|
|
115
192
|
const { pinnedDependencies, dependencies } = this.packageJson;
|
|
116
193
|
const deps = pinnedDependencies
|
|
@@ -144,10 +221,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
144
221
|
const pinnedPackages = [];
|
|
145
222
|
deps.forEach((dep) => {
|
|
146
223
|
// get the 'release' tag version or the version specified by the passed in tag
|
|
147
|
-
const
|
|
148
|
-
silent: true,
|
|
149
|
-
});
|
|
150
|
-
const versions = JSON.parse(result.stdout);
|
|
224
|
+
const versions = this.getDistTags(dep.name);
|
|
151
225
|
let tag = dep.tag;
|
|
152
226
|
// if tag is 'latest-rc' and there's no latest-rc release for a package, default to latest
|
|
153
227
|
if (!versions[tag]) {
|
|
@@ -167,10 +241,10 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
167
241
|
}
|
|
168
242
|
// insert the new hardcoded versions into the dependencies in the project's package.json
|
|
169
243
|
if (dep.alias) {
|
|
170
|
-
this.packageJson
|
|
244
|
+
this.packageJson.dependencies[dep.alias] = `npm:${dep.name}@${version}`;
|
|
171
245
|
}
|
|
172
246
|
else {
|
|
173
|
-
this.packageJson
|
|
247
|
+
this.packageJson.dependencies[dep.name] = version;
|
|
174
248
|
}
|
|
175
249
|
// accumulate information to return
|
|
176
250
|
pinnedPackages.push({ name: dep.name, version, tag, alias: dep.alias });
|
|
@@ -182,8 +256,7 @@ class Package extends kit_1.AsyncOptionalCreatable {
|
|
|
182
256
|
* published to the registry
|
|
183
257
|
*/
|
|
184
258
|
nextVersionIsHardcoded() {
|
|
185
|
-
|
|
186
|
-
return !((_a = this.npmPackage.versions) !== null && _a !== void 0 ? _a : []).includes(this.packageJson.version);
|
|
259
|
+
return !(this.npmPackage.versions ?? []).includes(this.packageJson.version);
|
|
187
260
|
}
|
|
188
261
|
hasScript(scriptName) {
|
|
189
262
|
return !!(0, ts_types_1.get)(this.packageJson, `scripts.${scriptName}`, null);
|
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,mCAA6B;AAC7B,qCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"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"}
|
package/lib/pluginCommand.js
CHANGED
|
@@ -28,7 +28,6 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
28
28
|
this.bin = this.getBin();
|
|
29
29
|
}
|
|
30
30
|
runPluginCmd(options) {
|
|
31
|
-
var _a;
|
|
32
31
|
const command = `"${this.nodeExecutable}" "${this.bin}" ${options.command} ${options.parameters
|
|
33
32
|
.map((p) => `"${p}"`)
|
|
34
33
|
.join(' ')}`;
|
|
@@ -44,11 +43,11 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
44
43
|
});
|
|
45
44
|
if (results.code !== 0) {
|
|
46
45
|
this.logger.debug(`Plugin command ${command} failed`, results.stderr);
|
|
47
|
-
throw new core_1.
|
|
46
|
+
throw new core_1.SfError(results.stderr, 'ShellExecError');
|
|
48
47
|
}
|
|
49
48
|
this.logger.debug(`Plugin command ${command} succeeded`, results);
|
|
50
49
|
try {
|
|
51
|
-
if (
|
|
50
|
+
if (options.parameters?.includes('--json')) {
|
|
52
51
|
return JSON.parse(results.stdout);
|
|
53
52
|
}
|
|
54
53
|
else {
|
|
@@ -56,9 +55,9 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
56
55
|
}
|
|
57
56
|
}
|
|
58
57
|
catch (error) {
|
|
59
|
-
const
|
|
60
|
-
this.logger.debug(`Plugin command ${command} threw eception`,
|
|
61
|
-
throw
|
|
58
|
+
const sfError = new core_1.SfError(error, 'JsonParseError');
|
|
59
|
+
this.logger.debug(`Plugin command ${command} threw eception`, sfError);
|
|
60
|
+
throw sfError;
|
|
62
61
|
}
|
|
63
62
|
}
|
|
64
63
|
packagePath() {
|
|
@@ -73,7 +72,7 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
73
72
|
const pkgPath = this.packagePath();
|
|
74
73
|
const prjPath = pkgPath.substring(0, pkgPath.lastIndexOf(path.sep));
|
|
75
74
|
if (!this.pkg.bin[this.options.commandBin]) {
|
|
76
|
-
const sfdxError = new core_1.
|
|
75
|
+
const sfdxError = new core_1.SfError(`Could not locate commandBin ${this.options.commandBin} in package at path ${pkgPath}`);
|
|
77
76
|
this.logger.debug(sfdxError);
|
|
78
77
|
throw sfdxError;
|
|
79
78
|
}
|
|
@@ -116,9 +115,9 @@ class PluginCommand extends kit_1.AsyncCreatable {
|
|
|
116
115
|
}
|
|
117
116
|
// Check to see if node is installed
|
|
118
117
|
const nodeShellString = shelljs.which('node');
|
|
119
|
-
if (
|
|
118
|
+
if (nodeShellString?.code === 0 && nodeShellString?.stdout)
|
|
120
119
|
return nodeShellString.stdout;
|
|
121
|
-
throw new core_1.
|
|
120
|
+
throw new core_1.SfError('Cannot locate node executable.', 'CannotFindNodeExecutable');
|
|
122
121
|
}
|
|
123
122
|
/**
|
|
124
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,28 +98,30 @@ 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
|
-
return [...new Set(npmrcLines).values()].filter((line) => line
|
|
110
|
+
return [...new Set(npmrcLines).values()].filter((line) => line?.length);
|
|
106
111
|
}
|
|
107
112
|
async writeNpmrc(packageDir, npmrc) {
|
|
108
|
-
const npmrcLines = [...new Set(npmrc).values()].filter((line) => line
|
|
109
|
-
await
|
|
113
|
+
const npmrcLines = [...new Set(npmrc).values()].filter((line) => line?.length);
|
|
114
|
+
await fs.writeFile(path.join(packageDir, '.npmrc'), npmrcLines.join(os.EOL), 'utf8');
|
|
110
115
|
}
|
|
111
116
|
normalizeRegistryUrl() {
|
|
112
|
-
var _a;
|
|
113
117
|
const registryDomain = new url_1.URL(this.registryUrl);
|
|
114
|
-
const pathPart =
|
|
118
|
+
const pathPart = registryDomain.pathname?.length ? `${registryDomain.pathname.replace(/\/$/, '')}` : '';
|
|
115
119
|
return `//${registryDomain.host}${pathPart}/`;
|
|
116
120
|
}
|
|
117
121
|
init() {
|
|
118
|
-
var _a, _b;
|
|
119
122
|
this.env = new kit_1.Env();
|
|
120
|
-
this.registryUrl =
|
|
121
|
-
this.authToken =
|
|
123
|
+
this.registryUrl = this.env.getString('NPM_REGISTRY') ?? this.registryUrl;
|
|
124
|
+
this.authToken = this.env.getString('NPM_TOKEN') ?? this.authToken;
|
|
122
125
|
}
|
|
123
126
|
}
|
|
124
127
|
exports.Registry = Registry;
|
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;
|