@packtory/cli 0.0.66 → 0.0.67
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/command-line-interface/runner/changelog-destinations.js +46 -40
- package/command-line-interface/runner/changelog-destinations.js.map +1 -1
- package/command-line-interface/runner/changelog-handler.js +25 -25
- package/command-line-interface/runner/changelog-handler.js.map +1 -1
- package/command-line-interface/runner/github-release-client.js +15 -15
- package/command-line-interface/runner/github-release-client.js.map +1 -1
- package/command-line-interface/runner/github-release-notes.js +9 -9
- package/command-line-interface/runner/github-release-notes.js.map +1 -1
- package/command-line-interface/runner/pack-handler.js +2 -2
- package/command-line-interface/runner/pack-handler.js.map +1 -1
- package/command-line-interface/runner/preview-handler.js +18 -18
- package/command-line-interface/runner/preview-handler.js.map +1 -1
- package/command-line-interface/runner/publish-handler.js +5 -5
- package/command-line-interface/runner/publish-handler.js.map +1 -1
- package/command-line-interface/runner/release-diff-handler.js +9 -9
- package/command-line-interface/runner/release-diff-handler.js.map +1 -1
- package/command-line-interface/runner/release-handler.js +43 -40
- package/command-line-interface/runner/release-handler.js.map +1 -1
- package/command-line-interface/runner/release-preparation.js +24 -24
- package/command-line-interface/runner/release-preparation.js.map +1 -1
- package/package.json +3 -3
- package/packages/command-line-interface/pull-request-label-versioning.js +9 -9
- package/packages/command-line-interface/pull-request-label-versioning.js.map +1 -1
- package/packtory/packtory-changelog.js +3 -1
- package/packtory/packtory-changelog.js.map +1 -1
- package/sbom.cdx.json +15 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview-handler.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/preview-handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAwB,MAAM,0CAA0C,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EACH,gCAAgC,EAChC,qBAAqB,EACxB,MAAM,6DAA6D,CAAC;AAGrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAgB5D,KAAK,UAAU,kBAAkB,CAC7B,
|
|
1
|
+
{"version":3,"file":"preview-handler.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/preview-handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAwB,MAAM,0CAA0C,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EACH,gCAAgC,EAChC,qBAAqB,EACxB,MAAM,6DAA6D,CAAC;AAGrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAgB5D,KAAK,UAAU,kBAAkB,CAC7B,YAA8G,EAC9G,QAAyB;IAEzB,MAAM,QAAQ,GAAG,YAAY,CAAC,uBAAuB,EAAE,CAAC;IACxD,MAAM,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/E,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;AACL,CAAC;AAED,KAAK,UAAU,mBAAmB,CAC9B,YAAoE,EACpE,QAAyB;IAEzB,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACvB,MAAM,YAAY,CAAC,UAAU,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnE,CAAC;SAAM,CAAC;QACJ,YAAY,CAAC,GAAG,CAAC,gCAAgC,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3E,CAAC;AACL,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,YAAwC,EAAE,QAAyB;IAC7F,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAC1B,MAAM,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACjD,OAAO;IACX,CAAC;IACD,MAAM,mBAAmB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AACtD,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,YAAwC;IAC3D,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IAC9E,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/G,eAAe,CAAC,OAAO,EAAE,CAAC;IAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,iBAAiB,EAAE,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC;QACxC,MAAM;QACN,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,IAAI;QACZ,WAAW;KACd,CAAC,CAAC;IACH,MAAM,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,YAAwC;IAC5E,IAAI,CAAC;QACD,OAAO,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;YAAS,CAAC;QACP,YAAY,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;IAC3C,CAAC;AACL,CAAC"}
|
|
@@ -18,8 +18,8 @@ async function reportOutcome(log, fileManager, outcome, flags) {
|
|
|
18
18
|
});
|
|
19
19
|
return exitCode;
|
|
20
20
|
}
|
|
21
|
-
async function publish(
|
|
22
|
-
const { log, packtory, spinnerRenderer, configLoader, fileManager, flags } =
|
|
21
|
+
async function publish(dependencies) {
|
|
22
|
+
const { log, packtory, spinnerRenderer, configLoader, fileManager, flags } = dependencies;
|
|
23
23
|
const outcome = await packtory.buildAndPublishAll(await configLoader.load(), {
|
|
24
24
|
dryRun: !flags.noDryRun,
|
|
25
25
|
stage: flags.stage,
|
|
@@ -28,11 +28,11 @@ async function publish(deps) {
|
|
|
28
28
|
spinnerRenderer.stopAll();
|
|
29
29
|
return reportOutcome(log, fileManager, outcome, flags);
|
|
30
30
|
}
|
|
31
|
-
export async function runPublishHandler(
|
|
32
|
-
const { log, spinnerRenderer, flags } =
|
|
31
|
+
export async function runPublishHandler(dependencies) {
|
|
32
|
+
const { log, spinnerRenderer, flags } = dependencies;
|
|
33
33
|
let shouldStopSpinners = true;
|
|
34
34
|
try {
|
|
35
|
-
const exitCode = await publish(
|
|
35
|
+
const exitCode = await publish(dependencies);
|
|
36
36
|
shouldStopSpinners = false;
|
|
37
37
|
return exitCode;
|
|
38
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-handler.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/publish-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAczE,KAAK,UAAU,aAAa,CACxB,GAAW,EACX,
|
|
1
|
+
{"version":3,"file":"publish-handler.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/publish-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAczE,KAAK,UAAU,aAAa,CACxB,GAAW,EACX,WAAsD,EACtD,OAAqB,EACrB,KAA0C;IAE1C,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,QAAQ,GAAG,CAAC,CAAC;QACb,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACJ,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,YAAY,CAAC;QACf,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ;QACvB,WAAW;QACX,KAAK;QACL,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE;QAC3B,MAAM,EAAE,OAAO,CAAC,MAAM;KACzB,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,YAAwC;IAC3D,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC;IAC1F,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,MAAM,YAAY,CAAC,IAAI,EAAE,EAAE;QACzE,MAAM,EAAE,CAAC,KAAK,CAAC,QAAQ;QACvB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,aAAa,EAAE,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU;KACtD,CAAC,CAAC;IACH,eAAe,CAAC,OAAO,EAAE,CAAC;IAC1B,OAAO,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,YAAwC;IAC5E,MAAM,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC;IACrD,IAAI,kBAAkB,GAAG,IAAI,CAAC;IAC9B,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7C,kBAAkB,GAAG,KAAK,CAAC;QAC3B,OAAO,QAAQ,CAAC;IACpB,CAAC;YAAS,CAAC;QACP,IAAI,kBAAkB,EAAE,CAAC;YACrB,eAAe,CAAC,OAAO,EAAE,CAAC;QAC9B,CAAC;QACD,eAAe,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;AACL,CAAC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { succeededResultsFrom } from "packtory/packtory/partial-result.js";
|
|
2
2
|
import { buildReleaseDiffDocument } from "../../report/release-diff/release-diff-document.js";
|
|
3
3
|
import { renderFailureOnlyTerminalReleaseDiff, renderTerminalReleaseDiff } from "../../report/terminal-renderer/terminal-release-diff-renderer.js";
|
|
4
|
-
async function renderDocument(
|
|
4
|
+
async function renderDocument(dependencies, document) {
|
|
5
5
|
if (document.previewable) {
|
|
6
|
-
await
|
|
6
|
+
await dependencies.pageOutput(renderTerminalReleaseDiff(document));
|
|
7
7
|
return;
|
|
8
8
|
}
|
|
9
|
-
|
|
9
|
+
dependencies.log(renderFailureOnlyTerminalReleaseDiff(document).trimEnd());
|
|
10
10
|
}
|
|
11
|
-
async function releaseDiff(
|
|
12
|
-
const { packtory, spinnerRenderer, configLoader } =
|
|
11
|
+
async function releaseDiff(dependencies) {
|
|
12
|
+
const { packtory, spinnerRenderer, configLoader } = dependencies;
|
|
13
13
|
const config = await configLoader.load();
|
|
14
14
|
const outcome = await packtory.diffAgainstLatestPublished(config);
|
|
15
15
|
spinnerRenderer.stopAll();
|
|
@@ -18,15 +18,15 @@ async function releaseDiff(deps) {
|
|
|
18
18
|
result: outcome.result,
|
|
19
19
|
packages: succeededResultsFrom(outcome.result)
|
|
20
20
|
});
|
|
21
|
-
await renderDocument(
|
|
21
|
+
await renderDocument(dependencies, document);
|
|
22
22
|
return outcome.result.isErr ? 1 : 0;
|
|
23
23
|
}
|
|
24
|
-
export async function runReleaseDiffHandler(
|
|
24
|
+
export async function runReleaseDiffHandler(dependencies) {
|
|
25
25
|
try {
|
|
26
|
-
return await releaseDiff(
|
|
26
|
+
return await releaseDiff(dependencies);
|
|
27
27
|
}
|
|
28
28
|
finally {
|
|
29
|
-
|
|
29
|
+
dependencies.spinnerRenderer.stopAll();
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
//# sourceMappingURL=release-diff-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-diff-handler.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/release-diff-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,wBAAwB,EAA4B,MAAM,oDAAoD,CAAC;AACxH,OAAO,EACH,oCAAoC,EACpC,yBAAyB,EAC5B,MAAM,kEAAkE,CAAC;AAc1E,KAAK,UAAU,cAAc,CACzB,
|
|
1
|
+
{"version":3,"file":"release-diff-handler.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/release-diff-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,wBAAwB,EAA4B,MAAM,oDAAoD,CAAC;AACxH,OAAO,EACH,oCAAoC,EACpC,yBAAyB,EAC5B,MAAM,kEAAkE,CAAC;AAc1E,KAAK,UAAU,cAAc,CACzB,YAAwE,EACxE,QAA6B;IAE7B,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;QACvB,MAAM,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnE,OAAO;IACX,CAAC;IACD,YAAY,CAAC,GAAG,CAAC,oCAAoC,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,YAA4C;IACnE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,YAAY,CAAC;IACjE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;IAClE,eAAe,CAAC,OAAO,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAG,wBAAwB,CAAC;QACtC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE;QAC3B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC;KACjD,CAAC,CAAC;IACH,MAAM,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,YAA4C;IACpF,IAAI,CAAC;QACD,OAAO,MAAM,WAAW,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;YAAS,CAAC;QACP,YAAY,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;IAC3C,CAAC;AACL,CAAC"}
|
|
@@ -96,22 +96,22 @@ function printReleasePlan(log, packages) {
|
|
|
96
96
|
}
|
|
97
97
|
log(['Release plan:', ...changedPackages.map(formatPlanPackage)].join('\n'));
|
|
98
98
|
}
|
|
99
|
-
function readGitHubToken(
|
|
100
|
-
return
|
|
99
|
+
function readGitHubToken(dependencies) {
|
|
100
|
+
return dependencies.readEnvironmentVariable('GH_TOKEN') ?? dependencies.readEnvironmentVariable('GITHUB_TOKEN');
|
|
101
101
|
}
|
|
102
|
-
async function publishTargets(
|
|
102
|
+
async function publishTargets(dependencies, planned, changedTargets) {
|
|
103
103
|
if (changedTargets.length === 0) {
|
|
104
104
|
return [];
|
|
105
105
|
}
|
|
106
106
|
const changedTargetsByName = mapTargetsByName(changedTargets);
|
|
107
|
-
const outcome = await
|
|
107
|
+
const outcome = await dependencies.packtory.buildAndPublishAll(planned.config, {
|
|
108
108
|
dryRun: false,
|
|
109
109
|
stage: false,
|
|
110
110
|
collectReport: false
|
|
111
111
|
});
|
|
112
|
-
|
|
112
|
+
dependencies.spinnerRenderer.stopAll();
|
|
113
113
|
if (outcome.result.isErr) {
|
|
114
|
-
printPublishFailure(
|
|
114
|
+
printPublishFailure(dependencies.log, outcome.result.error, false);
|
|
115
115
|
return undefined;
|
|
116
116
|
}
|
|
117
117
|
return outcome.result.value.flatMap(function (result) {
|
|
@@ -129,12 +129,15 @@ async function publishTargets(deps, planned, changedTargets) {
|
|
|
129
129
|
];
|
|
130
130
|
});
|
|
131
131
|
}
|
|
132
|
-
async function createGitHubClientAsync(
|
|
133
|
-
const token = readGitHubToken(
|
|
132
|
+
async function createGitHubClientAsync(dependencies) {
|
|
133
|
+
const token = readGitHubToken(dependencies);
|
|
134
134
|
if (token === undefined) {
|
|
135
135
|
throw new Error('GH_TOKEN or GITHUB_TOKEN must be set to create release tags or GitHub releases');
|
|
136
136
|
}
|
|
137
|
-
return
|
|
137
|
+
return dependencies.createGitHubReleaseClient({
|
|
138
|
+
...parseGitHubRepositoryParts(await dependencies.readPackageInfo()),
|
|
139
|
+
token
|
|
140
|
+
});
|
|
138
141
|
}
|
|
139
142
|
async function ensureTags(client, targets) {
|
|
140
143
|
for (const target of targets) {
|
|
@@ -145,9 +148,9 @@ async function ensureTags(client, targets) {
|
|
|
145
148
|
});
|
|
146
149
|
}
|
|
147
150
|
}
|
|
148
|
-
async function createGitHubReleases(
|
|
149
|
-
const changelog = await generateRequiredChangelog(
|
|
150
|
-
const releaseNotesByPackageName = await collectGitHubReleaseNotes(
|
|
151
|
+
async function createGitHubReleases(dependencies, client, planned, targets) {
|
|
152
|
+
const changelog = await generateRequiredChangelog(dependencies, planned.config, planned.packages);
|
|
153
|
+
const releaseNotesByPackageName = await collectGitHubReleaseNotes(dependencies, changelog.config, targets, changelog.changelog);
|
|
151
154
|
for (const target of targets) {
|
|
152
155
|
await client.createReleaseIfMissing({
|
|
153
156
|
tagName: target.tagName,
|
|
@@ -156,72 +159,72 @@ async function createGitHubReleases(deps, client, planned, targets) {
|
|
|
156
159
|
});
|
|
157
160
|
}
|
|
158
161
|
}
|
|
159
|
-
function reportFlagIssues(
|
|
160
|
-
const issues = collectFlagIssues(
|
|
162
|
+
function reportFlagIssues(dependencies) {
|
|
163
|
+
const issues = collectFlagIssues(dependencies.flags);
|
|
161
164
|
if (issues.length > 0) {
|
|
162
|
-
|
|
165
|
+
dependencies.log(issues.join('\n'));
|
|
163
166
|
return 1;
|
|
164
167
|
}
|
|
165
168
|
return undefined;
|
|
166
169
|
}
|
|
167
|
-
function resolvePlannedReleaseExitCode(
|
|
168
|
-
if (!hasAction(
|
|
169
|
-
printReleasePlan(
|
|
170
|
+
function resolvePlannedReleaseExitCode(dependencies, packages) {
|
|
171
|
+
if (!hasAction(dependencies.flags)) {
|
|
172
|
+
printReleasePlan(dependencies.log, packages);
|
|
170
173
|
return 0;
|
|
171
174
|
}
|
|
172
|
-
if (!hasReleaseWork(
|
|
173
|
-
|
|
175
|
+
if (!hasReleaseWork(dependencies.flags, packages)) {
|
|
176
|
+
dependencies.log('No packages need release.');
|
|
174
177
|
return 0;
|
|
175
178
|
}
|
|
176
179
|
return undefined;
|
|
177
180
|
}
|
|
178
|
-
async function finishReleaseActions(
|
|
181
|
+
async function finishReleaseActions(dependencies, planned, publishedTargets) {
|
|
179
182
|
const releaseTargets = mergeTargets(publishedTargets, selectCurrentHeadPublishedTargets(planned.packages));
|
|
180
183
|
if (releaseTargets.length === 0) {
|
|
181
184
|
return;
|
|
182
185
|
}
|
|
183
|
-
if (!
|
|
186
|
+
if (!dependencies.flags.tag && !dependencies.flags.githubRelease) {
|
|
184
187
|
return;
|
|
185
188
|
}
|
|
186
|
-
const client = await createGitHubClientAsync(
|
|
189
|
+
const client = await createGitHubClientAsync(dependencies);
|
|
187
190
|
await ensureTags(client, releaseTargets);
|
|
188
|
-
if (
|
|
189
|
-
await createGitHubReleases(
|
|
191
|
+
if (dependencies.flags.githubRelease) {
|
|
192
|
+
await createGitHubReleases(dependencies, client, planned, releaseTargets);
|
|
190
193
|
}
|
|
191
194
|
}
|
|
192
|
-
async function runMutatingRelease(
|
|
195
|
+
async function runMutatingRelease(dependencies, planned) {
|
|
193
196
|
const changedTargets = selectChangedTargets(planned.packages);
|
|
194
|
-
assertTagRule(
|
|
195
|
-
const publishedTargets = await publishTargets(
|
|
197
|
+
assertTagRule(dependencies.flags, changedTargets);
|
|
198
|
+
const publishedTargets = await publishTargets(dependencies, planned, changedTargets);
|
|
196
199
|
if (publishedTargets === undefined) {
|
|
197
200
|
return 1;
|
|
198
201
|
}
|
|
199
|
-
await finishReleaseActions(
|
|
200
|
-
|
|
202
|
+
await finishReleaseActions(dependencies, planned, publishedTargets);
|
|
203
|
+
dependencies.log(releaseCompletedMessage);
|
|
201
204
|
return 0;
|
|
202
205
|
}
|
|
203
|
-
async function runRelease(
|
|
204
|
-
const flagExitCode = reportFlagIssues(
|
|
206
|
+
async function runRelease(dependencies) {
|
|
207
|
+
const flagExitCode = reportFlagIssues(dependencies);
|
|
205
208
|
if (flagExitCode !== undefined) {
|
|
206
209
|
return flagExitCode;
|
|
207
210
|
}
|
|
208
|
-
const planned = await loadPlannedRelease(
|
|
211
|
+
const planned = await loadPlannedRelease(dependencies);
|
|
209
212
|
if (planned === undefined) {
|
|
210
213
|
return 1;
|
|
211
214
|
}
|
|
212
|
-
return resolvePlannedReleaseExitCode(
|
|
215
|
+
return resolvePlannedReleaseExitCode(dependencies, planned.packages) ?? runMutatingRelease(dependencies, planned);
|
|
213
216
|
}
|
|
214
|
-
function stopSpinnersAndReturn(
|
|
215
|
-
|
|
217
|
+
function stopSpinnersAndReturn(dependencies, exitCode) {
|
|
218
|
+
dependencies.spinnerRenderer.stopAll();
|
|
216
219
|
return exitCode;
|
|
217
220
|
}
|
|
218
|
-
export async function runReleaseHandler(
|
|
221
|
+
export async function runReleaseHandler(dependencies) {
|
|
219
222
|
try {
|
|
220
|
-
return stopSpinnersAndReturn(
|
|
223
|
+
return stopSpinnersAndReturn(dependencies, await runRelease(dependencies));
|
|
221
224
|
}
|
|
222
225
|
catch (error) {
|
|
223
|
-
|
|
224
|
-
return stopSpinnersAndReturn(
|
|
226
|
+
dependencies.log(formatReleaseHandlerError(error));
|
|
227
|
+
return stopSpinnersAndReturn(dependencies, 1);
|
|
225
228
|
}
|
|
226
229
|
}
|
|
227
230
|
//# sourceMappingURL=release-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-handler.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/release-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"release-handler.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/release-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACjG,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EACH,yBAAyB,EACzB,kBAAkB,EAGrB,MAAM,0BAA0B,CAAC;AAuClC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AAErD,SAAS,yBAAyB,CAAC,KAAc;IAC7C,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,SAAS,CAAC,KAAmB;IAClC,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,aAAa,CAAC;AAC3E,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAmB;IACzC,OAAO,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;AACpC,CAAC;AAED,SAAS,oCAAoC,CAAC,KAAmB;IAC7D,OAAO,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,qCAAqC,CAAC,KAAmB;IAC9D,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;AAC/C,CAAC;AAED,MAAM,SAAS,GAAwB;IACnC,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,uBAAuB,EAAE;IAC9D,EAAE,MAAM,EAAE,oCAAoC,EAAE,OAAO,EAAE,wCAAwC,EAAE;IACnG,EAAE,MAAM,EAAE,qCAAqC,EAAE,OAAO,EAAE,qCAAqC,EAAE;CACpG,CAAC;AAEF,SAAS,iBAAiB,CAAC,KAAmB;IAC1C,OAAO,SAAS,CAAC,OAAO,CAAC,UAAU,IAAI;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAE,IAAI,CAAC,OAAO,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,qBAAqB,CAAC,WAA+B;IAC1D,OAAO;QACH,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,OAAO,EAAE,WAAW,CAAC,WAAW;QAChC,OAAO,EAAE,GAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,WAAW,EAAE;QACzD,UAAU,EAAE,WAAW,CAAC,cAAc;KACzC,CAAC;AACN,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAqB;IAC5C,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,CAAC,OAAO,2BAA2B,CAAC,CAAC;IACzF,CAAC;IACD,OAAO,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAuC;IACjE,OAAO,QAAQ;SACV,MAAM,CAAC,UAAU,WAAW;QACzB,OAAO,WAAW,CAAC,OAAO,CAAC;IAC/B,CAAC,CAAC;SACD,GAAG,CAAC,qBAAqB,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,iCAAiC,CAAC,QAAuC;IAC9E,OAAO,QAAQ;SACV,MAAM,CAAC,UAAU,WAAW;QACzB,OAAO,CACH,WAAW,CAAC,cAAc,KAAK,SAAS;YACxC,WAAW,CAAC,sBAAsB,EAAE,OAAO,KAAK,WAAW,CAAC,cAAc,CAC7E,CAAC;IACN,CAAC,CAAC;SACD,GAAG,CAAC,qBAAqB,CAAC;SAC1B,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAiC;IACvD,OAAO,IAAI,GAAG,CACV,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM;QACxB,OAAO,CAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAE,CAAC;IACnC,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CACjB,GAAG,YAA4D;IAE/D,MAAM,aAAa,GAAG,IAAI,GAAG,CACzB,YAAY,CAAC,OAAO,CAAC,UAAU,OAAO;QAClC,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM;YAC/B,OAAO,CAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAW,CAAC;QAC5C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CACL,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,aAAa,CAAC,KAAmB,EAAE,cAAwC;IAChF,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,sFAAsF,CAAC,CAAC;IAC5G,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,KAAmB,EAAE,QAAuC;IAChF,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,IAAI,iCAAiC,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACxG,CAAC;AAED,SAAS,iBAAiB,CAAC,WAA+B;IACtD,MAAM,eAAe,GAAG,WAAW,CAAC,eAAe,IAAI,aAAa,CAAC;IACrE,OAAO,KAAK,WAAW,CAAC,IAAI,KAAK,eAAe,OAAO,WAAW,CAAC,WAAW,KAAK,WAAW,CAAC,aAAa,GAAG,CAAC;AACpH,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW,EAAE,QAAuC;IAC1E,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,WAAW;QACzD,OAAO,WAAW,CAAC,OAAO,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACjC,OAAO;IACX,CAAC;IACD,GAAG,CAAC,CAAE,eAAe,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,eAAe,CACpB,YAAyE;IAEzE,OAAO,YAAY,CAAC,uBAAuB,CAAC,UAAU,CAAC,IAAI,YAAY,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC;AACpH,CAAC;AAED,KAAK,UAAU,cAAc,CACzB,YAAwC,EACxC,OAAuB,EACvB,cAAwC;IAExC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,CAAC;IACd,CAAC;IACD,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,EAAE;QAC3E,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,KAAK;QACZ,aAAa,EAAE,KAAK;KACvB,CAAC,CAAC;IACH,YAAY,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;IACvC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,mBAAmB,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnE,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,MAAM;QAChD,MAAM,aAAa,GAAG,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAC;QACd,CAAC;QACD,OAAO;YACH,iBAAiB,CAAC;gBACd,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;gBACxB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO;gBAC9B,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;gBACzD,UAAU,EAAE,aAAa,CAAC,UAAU;aACvC,CAAC;SACL,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,YAAwC;IAC3E,MAAM,KAAK,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,YAAY,CAAC,yBAAyB,CAAC;QAC1C,GAAG,0BAA0B,CAAC,MAAM,YAAY,CAAC,eAAe,EAAE,CAAC;QACnE,KAAK;KACR,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,MAA2B,EAAE,OAA0C;IAC7F,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,CAAC,kBAAkB,CAAC;YAC5B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,UAAU,EAAE,MAAM,CAAC,UAAU;SAChC,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED,KAAK,UAAU,oBAAoB,CAC/B,YAAwC,EACxC,MAA2B,EAC3B,OAAuB,EACvB,OAA0C;IAE1C,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClG,MAAM,yBAAyB,GAAG,MAAM,yBAAyB,CAC7D,YAAY,EACZ,SAAS,CAAC,MAAM,EAChB,OAAO,EACP,SAAS,CAAC,SAAS,CACtB,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,CAAC,sBAAsB,CAAC;YAChC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,IAAI,EAAE,MAAM,CAAC,OAAO;YACpB,IAAI,EAAE,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,MAAM,CAAC;SACxF,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,YAAwC;IAC9D,MAAM,MAAM,GAAG,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACrD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACpC,OAAO,CAAC,CAAC;IACb,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,6BAA6B,CAClC,YAAwC,EACxC,QAAuC;IAEvC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACjC,gBAAgB,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC7C,OAAO,CAAC,CAAC;IACb,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;QAChD,YAAY,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;QAC9C,OAAO,CAAC,CAAC;IACb,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,oBAAoB,CAC/B,YAAwC,EACxC,OAAuB,EACvB,gBAAmD;IAEnD,MAAM,cAAc,GAAG,YAAY,CAAC,gBAAgB,EAAE,iCAAiC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3G,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO;IACX,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC/D,OAAO;IACX,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,UAAU,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACzC,IAAI,YAAY,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QACnC,MAAM,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC;AACL,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,YAAwC,EAAE,OAAuB;IAC/F,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9D,aAAa,CAAC,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IACrF,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,CAAC;IACb,CAAC;IACD,MAAM,oBAAoB,CAAC,YAAY,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;IACpE,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAC1C,OAAO,CAAC,CAAC;AACb,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,YAAwC;IAC9D,MAAM,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACpD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,YAAY,CAAC;IACxB,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACvD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC;IACb,CAAC;IACD,OAAO,6BAA6B,CAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AACtH,CAAC;AAED,SAAS,qBAAqB,CAAC,YAAwC,EAAE,QAAgB;IACrF,YAAY,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;IACvC,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,YAAwC;IAC5E,IAAI,CAAC;QACD,OAAO,qBAAqB,CAAC,YAAY,EAAE,MAAM,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/E,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,YAAY,CAAC,GAAG,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;QACnD,OAAO,qBAAqB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;AACL,CAAC"}
|
|
@@ -2,28 +2,28 @@ import { generateChangelogOutputs } from "../../packtory/packtory-changelog.js";
|
|
|
2
2
|
import { collectGeneratedAttributionPaths, createChangelogGenerationOptions, parseValidConfig, buildConfiguredChangelogFiles } from "./changelog-destinations.js";
|
|
3
3
|
import { formatGitHubRepositoryName } from "./github-repository.js";
|
|
4
4
|
import { printReleasePlanFailure } from "./release-plan-result-printing.js";
|
|
5
|
-
function readGitHubToken(
|
|
6
|
-
return
|
|
5
|
+
function readGitHubToken(dependencies) {
|
|
6
|
+
return dependencies.readEnvironmentVariable('GH_TOKEN') ?? dependencies.readEnvironmentVariable('GITHUB_TOKEN');
|
|
7
7
|
}
|
|
8
|
-
function createEngine(
|
|
9
|
-
return
|
|
10
|
-
githubToken: readGitHubToken(
|
|
11
|
-
workingDirectory:
|
|
8
|
+
function createEngine(dependencies, config) {
|
|
9
|
+
return dependencies.createPrLogEngine({
|
|
10
|
+
githubToken: readGitHubToken(dependencies),
|
|
11
|
+
workingDirectory: dependencies.workingDirectory,
|
|
12
12
|
config
|
|
13
13
|
});
|
|
14
14
|
}
|
|
15
|
-
async function planRelease(
|
|
16
|
-
const outcome = await
|
|
17
|
-
|
|
15
|
+
async function planRelease(dependencies, config) {
|
|
16
|
+
const outcome = await dependencies.packtory.planReleaseAgainstLatestPublished(config);
|
|
17
|
+
dependencies.spinnerRenderer.stopAll();
|
|
18
18
|
if (outcome.result.isErr) {
|
|
19
|
-
printReleasePlanFailure(
|
|
19
|
+
printReleasePlanFailure(dependencies.log, outcome.result.error);
|
|
20
20
|
return undefined;
|
|
21
21
|
}
|
|
22
22
|
return outcome.result.value.packages;
|
|
23
23
|
}
|
|
24
|
-
export async function loadPlannedRelease(
|
|
25
|
-
const config = await
|
|
26
|
-
const packages = await planRelease(
|
|
24
|
+
export async function loadPlannedRelease(dependencies) {
|
|
25
|
+
const config = await dependencies.configLoader.load();
|
|
26
|
+
const packages = await planRelease(dependencies, config);
|
|
27
27
|
if (packages === undefined) {
|
|
28
28
|
return undefined;
|
|
29
29
|
}
|
|
@@ -36,25 +36,25 @@ function parseRequiredChangelogConfig(config) {
|
|
|
36
36
|
}
|
|
37
37
|
return validConfig;
|
|
38
38
|
}
|
|
39
|
-
async function generateReleaseChangelog(
|
|
40
|
-
const packageInfo = await
|
|
39
|
+
async function generateReleaseChangelog(dependencies, config, packages) {
|
|
40
|
+
const packageInfo = await dependencies.readPackageInfo();
|
|
41
41
|
const generationOptions = createChangelogGenerationOptions(config);
|
|
42
|
-
const engine = createEngine(
|
|
42
|
+
const engine = createEngine(dependencies, generationOptions.prLogConfig);
|
|
43
43
|
const changelog = await generateChangelogOutputs({
|
|
44
44
|
packages,
|
|
45
45
|
prLogEngine: engine,
|
|
46
46
|
explicitBaseRef: generationOptions.explicitBaseRef,
|
|
47
47
|
githubRepo: formatGitHubRepositoryName(packageInfo),
|
|
48
|
-
ignoredAttributionPaths: collectGeneratedAttributionPaths(
|
|
49
|
-
currentDate:
|
|
48
|
+
ignoredAttributionPaths: collectGeneratedAttributionPaths(dependencies, config),
|
|
49
|
+
currentDate: dependencies.currentDate(),
|
|
50
50
|
packageTagFormat: generationOptions.packageTagFormat,
|
|
51
51
|
prLogConfig: generationOptions.prLogConfig,
|
|
52
52
|
targetScopedLabelPattern: generationOptions.targetScopedLabelPattern
|
|
53
53
|
});
|
|
54
54
|
return { changelog, config, engine };
|
|
55
55
|
}
|
|
56
|
-
export async function generateRequiredChangelog(
|
|
57
|
-
return generateReleaseChangelog(
|
|
56
|
+
export async function generateRequiredChangelog(dependencies, config, packages) {
|
|
57
|
+
return generateReleaseChangelog(dependencies, parseRequiredChangelogConfig(config), packages);
|
|
58
58
|
}
|
|
59
59
|
function formatEmptyChangelogMessage(changelog) {
|
|
60
60
|
const packageNames = changelog.packageNamesWithoutChangelogEntries;
|
|
@@ -78,14 +78,14 @@ function reportUnwrittenChangelogs(log, changelog, writtenPaths, requireWrittenC
|
|
|
78
78
|
}
|
|
79
79
|
log(message);
|
|
80
80
|
}
|
|
81
|
-
export async function prepareReleaseChangelogs(
|
|
81
|
+
export async function prepareReleaseChangelogs(dependencies, planned, requireWrittenChangelog) {
|
|
82
82
|
const validConfig = parseRequiredChangelogConfig(planned.config);
|
|
83
|
-
const changelog = await generateReleaseChangelog(
|
|
84
|
-
const writtenFiles = await buildConfiguredChangelogFiles(
|
|
83
|
+
const changelog = await generateReleaseChangelog(dependencies, validConfig, planned.packages);
|
|
84
|
+
const writtenFiles = await buildConfiguredChangelogFiles(dependencies, changelog.config, changelog.engine, changelog.changelog);
|
|
85
85
|
const writtenPaths = writtenFiles.map(function (file) {
|
|
86
86
|
return file.filePath;
|
|
87
87
|
});
|
|
88
|
-
reportUnwrittenChangelogs(
|
|
88
|
+
reportUnwrittenChangelogs(dependencies.log, changelog.changelog, writtenPaths, requireWrittenChangelog);
|
|
89
89
|
return { changelog, writtenFiles, writtenPaths };
|
|
90
90
|
}
|
|
91
91
|
//# sourceMappingURL=release-preparation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-preparation.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/release-preparation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAA2B,MAAM,sCAAsC,CAAC;AACzG,OAAO,EACH,gCAAgC,EAChC,gCAAgC,EAChC,gBAAgB,EAChB,6BAA6B,EAEhC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AA8B5E,SAAS,eAAe,
|
|
1
|
+
{"version":3,"file":"release-preparation.js","sourceRoot":"","sources":["../../../../../source/command-line-interface/runner/release-preparation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,11 +13,11 @@
|
|
|
13
13
|
"@octokit/core": "7.0.6",
|
|
14
14
|
"@octokit/plugin-paginate-rest": "14.0.0",
|
|
15
15
|
"@octokit/plugin-rest-endpoint-methods": "17.0.0",
|
|
16
|
-
"@pr-log/core": "0.0.
|
|
16
|
+
"@pr-log/core": "0.0.4",
|
|
17
17
|
"cmd-ts": "0.15.0",
|
|
18
18
|
"diff": "9.0.0",
|
|
19
19
|
"open": "11.0.0",
|
|
20
|
-
"packtory": "0.0.
|
|
20
|
+
"packtory": "0.0.61",
|
|
21
21
|
"remeda": "2.39.0",
|
|
22
22
|
"semver": "7.8.5",
|
|
23
23
|
"ts-pattern": "5.9.0",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"./packages/command-line-interface/spinner-worker.entry-point.js"
|
|
56
56
|
],
|
|
57
57
|
"type": "module",
|
|
58
|
-
"version": "0.0.
|
|
58
|
+
"version": "0.0.67"
|
|
59
59
|
}
|
|
@@ -4,13 +4,13 @@ import { createPrLogConfig } from "../../command-line-interface/runner/changelog
|
|
|
4
4
|
function orderedVersionBumpLevels() {
|
|
5
5
|
return ['major', 'minor', 'patch'];
|
|
6
6
|
}
|
|
7
|
-
function readGitHubToken(
|
|
8
|
-
return
|
|
7
|
+
function readGitHubToken(dependencies) {
|
|
8
|
+
return dependencies.readEnvironmentVariable('GH_TOKEN') ?? dependencies.readEnvironmentVariable('GITHUB_TOKEN');
|
|
9
9
|
}
|
|
10
|
-
function createEngine(
|
|
11
|
-
return
|
|
12
|
-
githubToken: readGitHubToken(
|
|
13
|
-
workingDirectory:
|
|
10
|
+
function createEngine(dependencies, config) {
|
|
11
|
+
return dependencies.createPrLogEngine({
|
|
12
|
+
githubToken: readGitHubToken(dependencies),
|
|
13
|
+
workingDirectory: dependencies.workingDirectory,
|
|
14
14
|
config
|
|
15
15
|
});
|
|
16
16
|
}
|
|
@@ -35,12 +35,12 @@ function selectNextVersion(currentVersion, pullRequests, versionBumps) {
|
|
|
35
35
|
const versionBumpLevel = selectVersionBumpLevel(pullRequests, versionBumps);
|
|
36
36
|
return versionBumpLevel === undefined ? currentVersion : incrementVersion(currentVersion, versionBumpLevel);
|
|
37
37
|
}
|
|
38
|
-
export function createPullRequestLabelVersionSourceResolver(
|
|
38
|
+
export function createPullRequestLabelVersionSourceResolver(dependencies) {
|
|
39
39
|
async function collectLabeledPullRequests(input, packtoryConfig) {
|
|
40
|
-
const packageInfo = await
|
|
40
|
+
const packageInfo = await dependencies.readPackageInfo();
|
|
41
41
|
const githubRepo = formatGitHubRepositoryName(packageInfo);
|
|
42
42
|
const prLogConfig = createPrLogConfig(packtoryConfig.changelog);
|
|
43
|
-
const prLogEngine = createEngine(
|
|
43
|
+
const prLogEngine = createEngine(dependencies, prLogConfig);
|
|
44
44
|
const baseRef = await prLogEngine.resolveChangelogBaseRef({
|
|
45
45
|
packageName: input.packageName,
|
|
46
46
|
previousVersion: input.currentVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-request-label-versioning.js","sourceRoot":"","sources":["../../../../../source/packages/command-line-interface/pull-request-label-versioning.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAK5B,OAAO,EAAE,0BAA0B,EAAE,MAAM,0DAA0D,CAAC;AACtG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gEAAgE,CAAC;AAanG,SAAS,wBAAwB;IAC7B,OAAO,CAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAE,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,
|
|
1
|
+
{"version":3,"file":"pull-request-label-versioning.js","sourceRoot":"","sources":["../../../../../source/packages/command-line-interface/pull-request-label-versioning.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,9 @@ function selectManifestDependencyPullRequests(packagePlan, pullRequests, changed
|
|
|
44
44
|
return pullRequests.filter(function (pullRequest) {
|
|
45
45
|
const changedFiles = changedFilesByPullRequest.get(pullRequest.id);
|
|
46
46
|
return (changedFiles !== undefined &&
|
|
47
|
-
changedFiles.some(
|
|
47
|
+
changedFiles.some(function (changedFile) {
|
|
48
|
+
return isPackageManifestInputPath(changedFile.path);
|
|
49
|
+
}) &&
|
|
48
50
|
packagePlan.changelogDependencyNames.some(function (dependencyName) {
|
|
49
51
|
return pullRequestTitleMentionsDependency(pullRequest, dependencyName);
|
|
50
52
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packtory-changelog.js","sourceRoot":"","sources":["../../../../source/packtory/packtory-changelog.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"packtory-changelog.js","sourceRoot":"","sources":["../../../../source/packtory/packtory-changelog.ts"],"names":[],"mappings":"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"}
|