@git.zone/cli 6.7.3 → 6.9.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/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/mod_release/helpers.npmartifact.d.ts +8 -4
- package/dist_ts/mod_release/helpers.npmartifact.js +51 -9
- package/dist_ts/mod_release/helpers.releasepreparation.d.ts +21 -0
- package/dist_ts/mod_release/helpers.releasepreparation.js +196 -0
- package/dist_ts/mod_release/helpers.releasepublication.d.ts +2 -1
- package/dist_ts/mod_release/helpers.releasepublication.js +5 -3
- package/dist_ts/mod_release/index.d.ts +4 -0
- package/dist_ts/mod_release/index.js +133 -11
- package/package.json +4 -4
- package/readme.md +57 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/mod_release/helpers.npmartifact.ts +88 -12
- package/ts/mod_release/helpers.releasepreparation.ts +308 -0
- package/ts/mod_release/helpers.releasepublication.ts +6 -0
- package/ts/mod_release/index.ts +191 -10
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '6.
|
|
6
|
+
version: '6.9.0',
|
|
7
7
|
description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxlQUFlO0lBQ3JCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFdBQVcsRUFBRSwrTEFBK0w7Q0FDN00sQ0FBQSJ9
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import * as plugins from "./mod.plugins.js";
|
|
2
2
|
import { type IReleaseArtifact } from "./classes.releasejournal.js";
|
|
3
|
-
declare const supportedPnpmVersions: readonly ["11.25.0", "12.1.0", "12.2.1", "12.3.4"];
|
|
3
|
+
declare const supportedPnpmVersions: readonly ["11.25.0", "12.1.0", "12.2.1", "12.3.0", "12.3.4"];
|
|
4
|
+
export declare function assertNpmPackageName(value: unknown): asserts value is string;
|
|
4
5
|
export interface IPnpmReleaseCapability {
|
|
5
|
-
version: (typeof supportedPnpmVersions)[number];
|
|
6
|
+
readonly version: (typeof supportedPnpmVersions)[number];
|
|
6
7
|
}
|
|
8
|
+
export declare const buildQualifiedPnpmArgs: (capabilityArg: IPnpmReleaseCapability | undefined, argsArg: readonly string[]) => string[];
|
|
7
9
|
export type TNpmArtifactProbeStatus = "absent" | "exact" | "conflict" | "inconclusive";
|
|
8
10
|
export interface INpmArtifactProbeResult {
|
|
9
11
|
status: TNpmArtifactProbeStatus;
|
|
@@ -22,13 +24,15 @@ export declare const assertNoLegacyNpmPublisher: (cwdArg: string) => Promise<voi
|
|
|
22
24
|
export declare const normalizeNpmRegistryUrl: (valueArg: string) => string;
|
|
23
25
|
export declare const hashReleaseDestination: (valueArg: string) => string;
|
|
24
26
|
export declare const calculateNpmArtifact: (artifactPathArg: string, packageNameArg: string, versionArg: string) => Promise<IReleaseArtifact>;
|
|
25
|
-
export declare const packNpmArtifact: (smartshellArg: plugins.smartshell.Smartshell, cwdArg: string, destinationDirectoryArg: string, expectedVersionArg: string, fileArg?: string) => Promise<IReleaseArtifact>;
|
|
27
|
+
export declare const packNpmArtifact: (smartshellArg: plugins.smartshell.Smartshell, cwdArg: string, destinationDirectoryArg: string, expectedVersionArg: string, capabilityArg: IPnpmReleaseCapability | undefined, fileArg?: string) => Promise<IReleaseArtifact>;
|
|
26
28
|
export declare const verifyStoredNpmArtifact: (artifactPathArg: string, expectedArtifactArg: IReleaseArtifact) => Promise<void>;
|
|
27
29
|
export declare const buildPnpmPublishArgs: (artifactPathArg: string, registryArg: string) => string[];
|
|
28
|
-
export declare const publishNpmArtifact: (smartshellArg: plugins.smartshell.Smartshell, cwdArg: string, artifactPathArg: string, registryArg: string) => Promise<{
|
|
30
|
+
export declare const publishNpmArtifact: (smartshellArg: plugins.smartshell.Smartshell, cwdArg: string, artifactPathArg: string, registryArg: string, capabilityArg: IPnpmReleaseCapability | undefined) => Promise<{
|
|
29
31
|
exitCode: number;
|
|
30
32
|
output: string;
|
|
31
33
|
}>;
|
|
34
|
+
/** Recovery without an original artifact must never adopt a published version. */
|
|
35
|
+
export declare const assertNpmVersionAbsent: (registryArg: string, packageNameArg: string, versionArg: string, optionsArg?: INpmArtifactProbeOptions) => Promise<void>;
|
|
32
36
|
export declare const probeAnonymousNpmArtifact: (registryArg: string, artifactArg: IReleaseArtifact, tagArg?: string, optionsArg?: INpmArtifactProbeOptions) => Promise<INpmArtifactProbeResult>;
|
|
33
37
|
export declare const waitForAnonymousNpmArtifact: (registryArg: string, artifactArg: IReleaseArtifact, tagArg?: string, optionsArg?: INpmArtifactProbeOptions) => Promise<INpmArtifactProbeResult>;
|
|
34
38
|
export {};
|
|
@@ -5,6 +5,7 @@ const supportedPnpmVersions = [
|
|
|
5
5
|
"11.25.0",
|
|
6
6
|
"12.1.0",
|
|
7
7
|
"12.2.1",
|
|
8
|
+
"12.3.0",
|
|
8
9
|
"12.3.4",
|
|
9
10
|
];
|
|
10
11
|
const pnpmHelpRequirements = {
|
|
@@ -45,6 +46,19 @@ const pnpmHelpRequirements = {
|
|
|
45
46
|
"[possible values: public, restricted]",
|
|
46
47
|
],
|
|
47
48
|
},
|
|
49
|
+
"12.3.0": {
|
|
50
|
+
pack: ["Usage: pnpm pack [OPTIONS]", "--out <OUT>", "--json"],
|
|
51
|
+
publish: [
|
|
52
|
+
"Usage: pnpm publish [OPTIONS] [PACKAGE]",
|
|
53
|
+
"Tarball or directory to publish",
|
|
54
|
+
"--no-git-checks",
|
|
55
|
+
"--ignore-scripts",
|
|
56
|
+
"--json",
|
|
57
|
+
"--tag <TAG>",
|
|
58
|
+
"--access <ACCESS>",
|
|
59
|
+
"[possible values: public, restricted]",
|
|
60
|
+
],
|
|
61
|
+
},
|
|
48
62
|
"12.3.4": {
|
|
49
63
|
pack: ["Usage: pnpm pack [OPTIONS]", "--out <OUT>", "--json"],
|
|
50
64
|
publish: [
|
|
@@ -64,6 +78,18 @@ const capabilityCommandTimeoutMs = 30_000;
|
|
|
64
78
|
const packCommandTimeoutMs = 10 * 60_000;
|
|
65
79
|
const publishCommandTimeoutMs = 5 * 60_000;
|
|
66
80
|
const packageNameRegex = /^(?:@[a-z0-9][a-z0-9._-]*\/[a-z0-9][a-z0-9._-]*|[a-z0-9][a-z0-9._-]*)$/;
|
|
81
|
+
export function assertNpmPackageName(value) {
|
|
82
|
+
if (typeof value !== "string" || !packageNameRegex.test(value)) {
|
|
83
|
+
throw new Error("Invalid release package name.");
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
export const buildQualifiedPnpmArgs = (capabilityArg, argsArg) => {
|
|
87
|
+
if (!capabilityArg ||
|
|
88
|
+
!supportedPnpmVersions.includes(capabilityArg.version)) {
|
|
89
|
+
throw new Error("npm release commands require a qualified pnpm invocation.");
|
|
90
|
+
}
|
|
91
|
+
return ["with", capabilityArg.version, ...argsArg];
|
|
92
|
+
};
|
|
67
93
|
const readPackageIdentity = async (cwdArg) => {
|
|
68
94
|
let packageJson;
|
|
69
95
|
try {
|
|
@@ -106,17 +132,18 @@ export const assertPnpmReleaseCapability = async (smartshellArg, cwdArg) => {
|
|
|
106
132
|
throw new Error(`Exact release packaging requires a verified pnpm version (${supportedPnpmVersions.join(", ")}); resolved ${version || "unknown"}.`);
|
|
107
133
|
}
|
|
108
134
|
const requirements = pnpmHelpRequirements[supportedVersion];
|
|
109
|
-
const
|
|
135
|
+
const capability = Object.freeze({ version: supportedVersion });
|
|
136
|
+
const packHelp = await smartshellArg.execSpawn("pnpm", buildQualifiedPnpmArgs(capability, ["pack", "--help"]), {
|
|
110
137
|
cwd: cwdArg,
|
|
111
138
|
silent: true,
|
|
112
139
|
timeout: capabilityCommandTimeoutMs,
|
|
113
140
|
timeoutKillGraceMs: 5_000,
|
|
114
141
|
});
|
|
115
142
|
if (packHelp.exitCode !== 0) {
|
|
116
|
-
throw new Error("Unable to inspect pnpm pack capabilities.");
|
|
143
|
+
throw new Error("Unable to inspect the selected pnpm pack capabilities. Exact release commands require standalone pnpm with support; Corepack launchers are unsupported.");
|
|
117
144
|
}
|
|
118
145
|
requireHelpFragments(packHelp.combinedOutput, requirements.pack, "pack");
|
|
119
|
-
const publishHelp = await smartshellArg.execSpawn("pnpm", ["publish", "--help"], {
|
|
146
|
+
const publishHelp = await smartshellArg.execSpawn("pnpm", buildQualifiedPnpmArgs(capability, ["publish", "--help"]), {
|
|
120
147
|
cwd: cwdArg,
|
|
121
148
|
silent: true,
|
|
122
149
|
timeout: capabilityCommandTimeoutMs,
|
|
@@ -126,7 +153,7 @@ export const assertPnpmReleaseCapability = async (smartshellArg, cwdArg) => {
|
|
|
126
153
|
throw new Error("Unable to inspect pnpm publish capabilities.");
|
|
127
154
|
}
|
|
128
155
|
requireHelpFragments(publishHelp.combinedOutput, requirements.publish, "publish");
|
|
129
|
-
return
|
|
156
|
+
return capability;
|
|
130
157
|
};
|
|
131
158
|
/**
|
|
132
159
|
* Development documents must never reach a published tarball.
|
|
@@ -250,7 +277,7 @@ const syncFile = async (filePathArg) => {
|
|
|
250
277
|
await handle.close();
|
|
251
278
|
}
|
|
252
279
|
};
|
|
253
|
-
export const packNpmArtifact = async (smartshellArg, cwdArg, destinationDirectoryArg, expectedVersionArg, fileArg = releaseArtifactFileName) => {
|
|
280
|
+
export const packNpmArtifact = async (smartshellArg, cwdArg, destinationDirectoryArg, expectedVersionArg, capabilityArg, fileArg = releaseArtifactFileName) => {
|
|
254
281
|
if (fileArg !== releaseArtifactFileName &&
|
|
255
282
|
!/^package\.[0-9a-f]{64}\.tgz$/.test(fileArg)) {
|
|
256
283
|
throw new Error("Invalid release artifact filename.");
|
|
@@ -260,7 +287,12 @@ export const packNpmArtifact = async (smartshellArg, cwdArg, destinationDirector
|
|
|
260
287
|
throw new Error(`package.json version ${identity.version} does not match release ${expectedVersionArg}.`);
|
|
261
288
|
}
|
|
262
289
|
const artifactPath = plugins.path.join(destinationDirectoryArg, fileArg);
|
|
263
|
-
const result = await smartshellArg.execSpawn("pnpm",
|
|
290
|
+
const result = await smartshellArg.execSpawn("pnpm", buildQualifiedPnpmArgs(capabilityArg, [
|
|
291
|
+
"pack",
|
|
292
|
+
"--out",
|
|
293
|
+
artifactPath,
|
|
294
|
+
"--json",
|
|
295
|
+
]), {
|
|
264
296
|
cwd: cwdArg,
|
|
265
297
|
timeout: packCommandTimeoutMs,
|
|
266
298
|
timeoutKillGraceMs: 5_000,
|
|
@@ -316,8 +348,8 @@ export const buildPnpmPublishArgs = (artifactPathArg, registryArg) => [
|
|
|
316
348
|
"--ignore-scripts",
|
|
317
349
|
"--json",
|
|
318
350
|
];
|
|
319
|
-
export const publishNpmArtifact = async (smartshellArg, cwdArg, artifactPathArg, registryArg) => {
|
|
320
|
-
const result = await smartshellArg.execSpawn("pnpm", buildPnpmPublishArgs(artifactPathArg, registryArg), {
|
|
351
|
+
export const publishNpmArtifact = async (smartshellArg, cwdArg, artifactPathArg, registryArg, capabilityArg) => {
|
|
352
|
+
const result = await smartshellArg.execSpawn("pnpm", buildQualifiedPnpmArgs(capabilityArg, buildPnpmPublishArgs(artifactPathArg, registryArg)), {
|
|
321
353
|
cwd: cwdArg,
|
|
322
354
|
timeout: publishCommandTimeoutMs,
|
|
323
355
|
timeoutKillGraceMs: 5_000,
|
|
@@ -339,6 +371,16 @@ const cancelResponseBody = (responseArg) => {
|
|
|
339
371
|
void responseArg.body.cancel().catch(() => { });
|
|
340
372
|
}
|
|
341
373
|
};
|
|
374
|
+
/** Recovery without an original artifact must never adopt a published version. */
|
|
375
|
+
export const assertNpmVersionAbsent = async (registryArg, packageNameArg, versionArg, optionsArg = {}) => {
|
|
376
|
+
const registry = normalizeNpmRegistryUrl(registryArg);
|
|
377
|
+
assertNpmPackageName(packageNameArg);
|
|
378
|
+
const response = await fetchWithoutRedirects(new URL(`${registry}/${encodeURIComponent(packageNameArg)}/${encodeURIComponent(versionArg)}`), "application/json", optionsArg);
|
|
379
|
+
cancelResponseBody(response);
|
|
380
|
+
if (response.status !== 404) {
|
|
381
|
+
throw new Error(`Cannot prove ${packageNameArg}@${versionArg} is unpublished at ${registry} (HTTP ${response.status}).`);
|
|
382
|
+
}
|
|
383
|
+
};
|
|
342
384
|
const readBoundedResponse = async (responseArg, maximumSizeArg, contextArg) => {
|
|
343
385
|
const contentLength = responseArg.headers.get("content-length");
|
|
344
386
|
if (contentLength &&
|
|
@@ -463,4 +505,4 @@ export const waitForAnonymousNpmArtifact = async (registryArg, artifactArg, tagA
|
|
|
463
505
|
}
|
|
464
506
|
return lastResult;
|
|
465
507
|
};
|
|
466
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.npmartifact.js","sourceRoot":"","sources":["../../../ts/mod_release/helpers.npmartifact.ts"],"names":[],"mappings":"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"}
|
|
508
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.npmartifact.js","sourceRoot":"","sources":["../../../ts/mod_release/helpers.npmartifact.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import type { IResolvedReleaseWorkflow } from "../helpers.workflow.js";
|
|
3
|
+
import { ReleaseJournalStore } from "./classes.releasejournal.js";
|
|
4
|
+
import { type IReleaseBranchContext } from "./helpers.releasebranch.js";
|
|
5
|
+
interface IRecoveryRefs {
|
|
6
|
+
mainOid: string;
|
|
7
|
+
tagOid: string;
|
|
8
|
+
}
|
|
9
|
+
export interface IReleasePreparationRecovery {
|
|
10
|
+
smartshell: plugins.smartshell.Smartshell;
|
|
11
|
+
workflow: IResolvedReleaseWorkflow;
|
|
12
|
+
branch: IReleaseBranchContext;
|
|
13
|
+
refs: IRecoveryRefs;
|
|
14
|
+
version: string;
|
|
15
|
+
store: ReleaseJournalStore;
|
|
16
|
+
}
|
|
17
|
+
export declare const assertPackageReleaseRecovery: (options: IReleasePreparationRecovery) => Promise<string>;
|
|
18
|
+
export declare const assertRecoveryUnpublished: (options: IReleasePreparationRecovery, packageName: string) => Promise<void>;
|
|
19
|
+
/** Build and seal one unpublished, already tagged package without changing refs. */
|
|
20
|
+
export declare const withReleasePreparationRecovery: <T>(options: IReleasePreparationRecovery, ensureState: () => Promise<void>, prepare: (checkout: string, ensureCheckout: () => Promise<void>) => Promise<T>) => Promise<T>;
|
|
21
|
+
export {};
|
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import { readPendingChangelog } from "../helpers.changelog.js";
|
|
3
|
+
import { InterProcessLock } from "../mod_services/classes.interprocesslock.js";
|
|
4
|
+
import { ReleaseJournalStore } from "./classes.releasejournal.js";
|
|
5
|
+
import { releaseGitEnv, } from "./helpers.releasebranch.js";
|
|
6
|
+
import { assertNpmVersionAbsent, assertNpmPackageName, hashReleaseDestination, } from "./helpers.npmartifact.js";
|
|
7
|
+
import { canonicalReleaseJson } from "./helpers.tsdockerprotocol.js";
|
|
8
|
+
const git = async (options, args, cwd = options.branch.sourceCwd) => {
|
|
9
|
+
const result = await options.smartshell.execSpawn("git", args, {
|
|
10
|
+
cwd,
|
|
11
|
+
env: releaseGitEnv,
|
|
12
|
+
silent: true,
|
|
13
|
+
timeout: 60_000,
|
|
14
|
+
timeoutKillGraceMs: 5_000,
|
|
15
|
+
});
|
|
16
|
+
if (result.exitCode !== 0)
|
|
17
|
+
throw new Error(`Release recovery Git validation failed: ${args[0]}.`);
|
|
18
|
+
return result.stdout.trim();
|
|
19
|
+
};
|
|
20
|
+
export const assertPackageReleaseRecovery = async (options) => {
|
|
21
|
+
const { workflow, branch, version } = options;
|
|
22
|
+
if (workflow.targets.length !== 2 ||
|
|
23
|
+
!workflow.targets.includes("git") ||
|
|
24
|
+
!workflow.targets.includes("npm") ||
|
|
25
|
+
workflow.npmPackageSource !== "root" ||
|
|
26
|
+
!workflow.pushBranch ||
|
|
27
|
+
!workflow.pushTags ||
|
|
28
|
+
branch.sourceBranch !== "main" ||
|
|
29
|
+
!branch.pushUrl ||
|
|
30
|
+
!branch.remoteMainOid) {
|
|
31
|
+
throw new Error("Release recover requires configured Git and root npm targets from clean main.");
|
|
32
|
+
}
|
|
33
|
+
const manifest = JSON.parse(await plugins.fs.readFile(plugins.path.join(branch.sourceCwd, "package.json"), "utf8"));
|
|
34
|
+
if (manifest.version !== version || typeof manifest.name !== "string") {
|
|
35
|
+
throw new Error("Recovery package identity does not match the existing release version.");
|
|
36
|
+
}
|
|
37
|
+
assertNpmPackageName(manifest.name);
|
|
38
|
+
const pending = await readPendingChangelog(plugins.path.join(branch.sourceCwd, workflow.changelogFile), workflow.changelogPendingSection);
|
|
39
|
+
const changelog = await plugins.fs.readFile(plugins.path.join(branch.sourceCwd, workflow.changelogFile), "utf8");
|
|
40
|
+
const headings = changelog
|
|
41
|
+
.split(/\r?\n/)
|
|
42
|
+
.filter((line) => /^##\s/.test(line) && line !== `## ${workflow.changelogPendingSection}`);
|
|
43
|
+
if (!pending.isEmpty ||
|
|
44
|
+
!new RegExp(`^## \\d{4}-\\d{2}-\\d{2} - ${version.replace(/\./g, "\\.")}\\s*$`).test(headings[0] ?? "")) {
|
|
45
|
+
throw new Error("Recovery requires the completed changelog section for this version and no Pending changes.");
|
|
46
|
+
}
|
|
47
|
+
if ((await git(options, [
|
|
48
|
+
"show",
|
|
49
|
+
"-s",
|
|
50
|
+
"--format=%s",
|
|
51
|
+
options.refs.mainOid,
|
|
52
|
+
])) !== `v${version}` ||
|
|
53
|
+
(await git(options, [
|
|
54
|
+
"rev-list",
|
|
55
|
+
"--parents",
|
|
56
|
+
"-n",
|
|
57
|
+
"1",
|
|
58
|
+
options.refs.mainOid,
|
|
59
|
+
])).split(" ").length !== 2) {
|
|
60
|
+
throw new Error("Recovery requires an existing non-merge release commit.");
|
|
61
|
+
}
|
|
62
|
+
if (await git(options, [
|
|
63
|
+
"diff",
|
|
64
|
+
`${options.refs.mainOid}^`,
|
|
65
|
+
options.refs.mainOid,
|
|
66
|
+
"--",
|
|
67
|
+
".smartconfig.json",
|
|
68
|
+
])) {
|
|
69
|
+
throw new Error("Release configuration changed inside the release metadata commit.");
|
|
70
|
+
}
|
|
71
|
+
return manifest.name;
|
|
72
|
+
};
|
|
73
|
+
export const assertRecoveryUnpublished = async (options, packageName) => {
|
|
74
|
+
const output = await git(options, [
|
|
75
|
+
"ls-remote",
|
|
76
|
+
options.branch.pushUrl,
|
|
77
|
+
`refs/tags/v${options.version}`,
|
|
78
|
+
`refs/tags/v${options.version}^{}`,
|
|
79
|
+
]);
|
|
80
|
+
if (output)
|
|
81
|
+
throw new Error("Recovery cannot adopt an existing remote release tag. Use its original journal.");
|
|
82
|
+
for (const registry of options.workflow.npmRegistries)
|
|
83
|
+
await assertNpmVersionAbsent(registry, packageName, options.version);
|
|
84
|
+
};
|
|
85
|
+
const preparationBinding = (options) => ({
|
|
86
|
+
kind: "gitzone-package-release-preparation",
|
|
87
|
+
schemaVersion: 1,
|
|
88
|
+
version: options.version,
|
|
89
|
+
...options.refs,
|
|
90
|
+
destinationHash: hashReleaseDestination(options.branch.pushUrl),
|
|
91
|
+
expectedRemoteMainOid: options.branch.remoteMainOid,
|
|
92
|
+
// Capture resolved configuration, including build/test commands, so retries
|
|
93
|
+
// cannot silently prepare a different release.
|
|
94
|
+
workflow: JSON.parse(JSON.stringify({ ...options.workflow, confirmation: "auto" })),
|
|
95
|
+
});
|
|
96
|
+
const bindPreparation = async (path, expected) => {
|
|
97
|
+
try {
|
|
98
|
+
const stat = await plugins.fs.lstat(path);
|
|
99
|
+
if (!stat.isFile() ||
|
|
100
|
+
stat.isSymbolicLink() ||
|
|
101
|
+
stat.size > 128 * 1024 ||
|
|
102
|
+
(await plugins.fs.readFile(path, "utf8")) !== expected) {
|
|
103
|
+
throw new Error("Release recovery identity or configuration differs from its original preparation.");
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
catch (error) {
|
|
107
|
+
if (error.code !== "ENOENT")
|
|
108
|
+
throw error;
|
|
109
|
+
const handle = await plugins.fs.open(path, "wx", 0o600);
|
|
110
|
+
try {
|
|
111
|
+
await handle.writeFile(expected, "utf8");
|
|
112
|
+
await handle.sync();
|
|
113
|
+
}
|
|
114
|
+
finally {
|
|
115
|
+
await handle.close();
|
|
116
|
+
}
|
|
117
|
+
const directory = await plugins.fs.open(plugins.path.dirname(path), "r");
|
|
118
|
+
try {
|
|
119
|
+
await directory.sync();
|
|
120
|
+
}
|
|
121
|
+
finally {
|
|
122
|
+
await directory.close();
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
/** Build and seal one unpublished, already tagged package without changing refs. */
|
|
127
|
+
export const withReleasePreparationRecovery = async (options, ensureState, prepare) => {
|
|
128
|
+
if (!options.branch.planAncestryVerified) {
|
|
129
|
+
throw new Error("Release recovery requires verified remote ancestry before preparation.");
|
|
130
|
+
}
|
|
131
|
+
const directory = options.store.getReleaseDirectory(options.version);
|
|
132
|
+
return new InterProcessLock({
|
|
133
|
+
lockPath: `${directory}.prepare.lock`,
|
|
134
|
+
description: `Release v${options.version} preparation`,
|
|
135
|
+
}).runExclusive(async () => {
|
|
136
|
+
await ensureState();
|
|
137
|
+
try {
|
|
138
|
+
await plugins.fs.lstat(directory);
|
|
139
|
+
throw new Error("Release journal already exists. Use release resume; do not rebuild its artifact.");
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
if (error.code !== "ENOENT")
|
|
143
|
+
throw error;
|
|
144
|
+
}
|
|
145
|
+
await bindPreparation(`${directory}.preparation.json`, `${canonicalReleaseJson(preparationBinding(options))}\n`);
|
|
146
|
+
const root = await plugins.fs.mkdtemp(plugins.path.join(plugins.os.tmpdir(), "gitzone-release-prepare-"));
|
|
147
|
+
const checkout = plugins.path.join(root, "source");
|
|
148
|
+
let added = false;
|
|
149
|
+
try {
|
|
150
|
+
await git(options, [
|
|
151
|
+
"worktree",
|
|
152
|
+
"add",
|
|
153
|
+
"--detach",
|
|
154
|
+
checkout,
|
|
155
|
+
options.refs.mainOid,
|
|
156
|
+
]);
|
|
157
|
+
added = true;
|
|
158
|
+
const install = await options.smartshell.execSpawn("pnpm", ["install", "--frozen-lockfile"], {
|
|
159
|
+
cwd: checkout,
|
|
160
|
+
timeout: 10 * 60_000,
|
|
161
|
+
timeoutKillGraceMs: 5_000,
|
|
162
|
+
});
|
|
163
|
+
if (install.exitCode !== 0)
|
|
164
|
+
throw new Error("Release recovery dependency installation failed.");
|
|
165
|
+
if (options.workflow.runTests)
|
|
166
|
+
await run(options, checkout, options.workflow.testCommand, "tests");
|
|
167
|
+
if (options.workflow.runBuild)
|
|
168
|
+
await run(options, checkout, options.workflow.buildCommand, "build");
|
|
169
|
+
await assertCheckout(options, checkout);
|
|
170
|
+
await ensureState();
|
|
171
|
+
const result = await prepare(checkout, () => assertCheckout(options, checkout));
|
|
172
|
+
await assertCheckout(options, checkout);
|
|
173
|
+
return result;
|
|
174
|
+
}
|
|
175
|
+
finally {
|
|
176
|
+
// This path is a uniquely owned disposable checkout, never the user's
|
|
177
|
+
// source tree or runtime data. Keep registration evidence if cleanup fails.
|
|
178
|
+
if (added)
|
|
179
|
+
await git(options, ["worktree", "remove", "--force", checkout]);
|
|
180
|
+
await plugins.fs.rm(root, { recursive: true, force: true });
|
|
181
|
+
}
|
|
182
|
+
});
|
|
183
|
+
};
|
|
184
|
+
const run = async (options, cwd, command, phase) => {
|
|
185
|
+
const result = await options.smartshell.exec(command, { cwd });
|
|
186
|
+
if (result.exitCode !== 0)
|
|
187
|
+
throw new Error(`Release recovery ${phase} failed.`);
|
|
188
|
+
};
|
|
189
|
+
const assertCheckout = async (options, checkout) => {
|
|
190
|
+
if ((await git(options, ["rev-parse", "HEAD"], checkout)) !==
|
|
191
|
+
options.refs.mainOid ||
|
|
192
|
+
(await git(options, ["status", "--porcelain", "--untracked-files=all"], checkout))) {
|
|
193
|
+
throw new Error("Release recovery build changed its exact tracked source.");
|
|
194
|
+
}
|
|
195
|
+
};
|
|
196
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.releasepreparation.js","sourceRoot":"","sources":["../../../ts/mod_release/helpers.releasepreparation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EACL,aAAa,GAEd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAgBrE,MAAM,GAAG,GAAG,KAAK,EACf,OAAoC,EACpC,IAAc,EACd,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAC9B,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE;QAC7D,GAAG;QACH,GAAG,EAAE,aAAa;QAClB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,MAAM;QACf,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACzE,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAC/C,OAAoC,EACnB,EAAE;IACnB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC9C,IACE,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAC7B,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;QACjC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;QACjC,QAAQ,CAAC,gBAAgB,KAAK,MAAM;QACpC,CAAC,QAAQ,CAAC,UAAU;QACpB,CAAC,QAAQ,CAAC,QAAQ;QAClB,MAAM,CAAC,YAAY,KAAK,MAAM;QAC9B,CAAC,MAAM,CAAC,OAAO;QACf,CAAC,MAAM,CAAC,aAAa,EACrB,CAAC;QACD,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CACvB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,cAAc,CAAC,EACnD,MAAM,CACP,CACF,CAAC;IACF,IAAI,QAAQ,CAAC,OAAO,KAAK,OAAO,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtE,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;IACJ,CAAC;IACD,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,oBAAoB,CACxC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,aAAa,CAAC,EAC3D,QAAQ,CAAC,uBAAuB,CACjC,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CACzC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,aAAa,CAAC,EAC3D,MAAM,CACP,CAAC;IACF,MAAM,QAAQ,GAAG,SAAS;SACvB,KAAK,CAAC,OAAO,CAAC;SACd,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CACP,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,MAAM,QAAQ,CAAC,uBAAuB,EAAE,CAC1E,CAAC;IACJ,IACE,CAAC,OAAO,CAAC,OAAO;QAChB,CAAC,IAAI,MAAM,CACT,8BAA8B,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CACnE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EACzB,CAAC;QACD,MAAM,IAAI,KAAK,CACb,4FAA4F,CAC7F,CAAC;IACJ,CAAC;IACD,IACE,CAAC,MAAM,GAAG,CAAC,OAAO,EAAE;QAClB,MAAM;QACN,IAAI;QACJ,aAAa;QACb,OAAO,CAAC,IAAI,CAAC,OAAO;KACrB,CAAC,CAAC,KAAK,IAAI,OAAO,EAAE;QACrB,CACE,MAAM,GAAG,CAAC,OAAO,EAAE;YACjB,UAAU;YACV,WAAW;YACX,IAAI;YACJ,GAAG;YACH,OAAO,CAAC,IAAI,CAAC,OAAO;SACrB,CAAC,CACH,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EACzB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,IACE,MAAM,GAAG,CAAC,OAAO,EAAE;QACjB,MAAM;QACN,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG;QAC1B,OAAO,CAAC,IAAI,CAAC,OAAO;QACpB,IAAI;QACJ,mBAAmB;KACpB,CAAC,EACF,CAAC;QACD,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAC;IACJ,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,OAAoC,EACpC,WAAmB,EACJ,EAAE;IACjB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,OAAO,EAAE;QAChC,WAAW;QACX,OAAO,CAAC,MAAM,CAAC,OAAQ;QACvB,cAAc,OAAO,CAAC,OAAO,EAAE;QAC/B,cAAc,OAAO,CAAC,OAAO,KAAK;KACnC,CAAC,CAAC;IACH,IAAI,MAAM;QACR,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAC;IACJ,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa;QACnD,MAAM,sBAAsB,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAoC,EAAE,EAAE,CAAC,CAAC;IACpE,IAAI,EAAE,qCAAqC;IAC3C,aAAa,EAAE,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC,OAAO;IACxB,GAAG,OAAO,CAAC,IAAI;IACf,eAAe,EAAE,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,OAAQ,CAAC;IAChE,qBAAqB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa;IACnD,4EAA4E;IAC5E,+CAA+C;IAC/C,QAAQ,EAAE,IAAI,CAAC,KAAK,CAClB,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAC9D;CACF,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,KAAK,EAC3B,IAAY,EACZ,QAAgB,EACD,EAAE;IACjB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,IACE,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,IAAI,CAAC,cAAc,EAAE;YACrB,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI;YACtB,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,QAAQ,EACtD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,mFAAmF,CACpF,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,MAAM,KAAK,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACxD,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACzC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACzE,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;QACzB,CAAC;gBAAS,CAAC;YACT,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,oFAAoF;AACpF,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EACjD,OAAoC,EACpC,WAAgC,EAChC,OAGe,EACH,EAAE;IACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE,OAAO,IAAI,gBAAgB,CAAC;QAC1B,QAAQ,EAAE,GAAG,SAAS,eAAe;QACrC,WAAW,EAAE,YAAY,OAAO,CAAC,OAAO,cAAc;KACvD,CAAC,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;QACzB,MAAM,WAAW,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAClC,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;QACtE,CAAC;QACD,MAAM,eAAe,CACnB,GAAG,SAAS,mBAAmB,EAC/B,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,CACzD,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,OAAO,CACnC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CACnE,CAAC;QACF,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACnD,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,OAAO,EAAE;gBACjB,UAAU;gBACV,KAAK;gBACL,UAAU;gBACV,QAAQ;gBACR,OAAO,CAAC,IAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YACH,KAAK,GAAG,IAAI,CAAC;YACb,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAChD,MAAM,EACN,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAChC;gBACE,GAAG,EAAE,QAAQ;gBACb,OAAO,EAAE,EAAE,GAAG,MAAM;gBACpB,kBAAkB,EAAE,KAAK;aAC1B,CACF,CAAC;YACF,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAC3B,MAAM,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YACtE,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAC3B,MAAM,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACxC,MAAM,WAAW,EAAE,CAAC;YACpB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,CAC1C,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAClC,CAAC;YACF,MAAM,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;QAChB,CAAC;gBAAS,CAAC;YACT,sEAAsE;YACtE,4EAA4E;YAC5E,IAAI,KAAK;gBACP,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;YAClE,MAAM,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,KAAK,EACf,OAAoC,EACpC,GAAW,EACX,OAAe,EACf,KAAa,EACb,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/D,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,UAAU,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,KAAK,EAC1B,OAAoC,EACpC,QAAgB,EAChB,EAAE;IACF,IACE,CAAC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;QACnD,OAAO,CAAC,IAAI,CAAC,OAAO;QACtB,CAAC,MAAM,GAAG,CACR,OAAO,EACP,CAAC,QAAQ,EAAE,aAAa,EAAE,uBAAuB,CAAC,EAClD,QAAQ,CACT,CAAC,EACF,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as plugins from "./mod.plugins.js";
|
|
2
2
|
import { ReleaseJournalStore, type TReleaseJournal } from "./classes.releasejournal.js";
|
|
3
|
-
import { type INpmArtifactProbeOptions } from "./helpers.npmartifact.js";
|
|
3
|
+
import { type IPnpmReleaseCapability, type INpmArtifactProbeOptions } from "./helpers.npmartifact.js";
|
|
4
4
|
import { type ITsdockerReleaseClient } from "./helpers.tsdockerprotocol.js";
|
|
5
5
|
export interface IBuildReleaseGitPushArgsOptions {
|
|
6
6
|
destination: string;
|
|
@@ -13,6 +13,7 @@ export interface IBuildReleaseGitPushArgsOptions {
|
|
|
13
13
|
}
|
|
14
14
|
export declare function buildReleaseGitPushArgs(optionsArg: IBuildReleaseGitPushArgsOptions): string[];
|
|
15
15
|
export interface IReleasePublicationOptions {
|
|
16
|
+
pnpmCapability?: IPnpmReleaseCapability;
|
|
16
17
|
smartshell: plugins.smartshell.Smartshell;
|
|
17
18
|
cwd: string;
|
|
18
19
|
store: ReleaseJournalStore;
|