@git.zone/cli 6.1.3 → 6.3.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/.smartconfig.json +1 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/mod_release/helpers.npmartifact.d.ts +2 -2
- package/dist_ts/mod_release/helpers.npmartifact.js +48 -14
- package/package.json +2 -2
- package/readme.hints.md +3 -2
- package/readme.md +2 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/mod_release/helpers.npmartifact.ts +54 -16
- /package/{license → license.md} +0 -0
package/.smartconfig.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"npmGlobalTools": []
|
|
4
4
|
},
|
|
5
5
|
"@git.zone/tsdoc": {
|
|
6
|
-
"legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
|
|
6
|
+
"legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license.md) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
|
|
7
7
|
},
|
|
8
8
|
"@git.zone/cli": {
|
|
9
9
|
"schemaVersion": 2,
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '6.
|
|
6
|
+
version: '6.3.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,8 +1,8 @@
|
|
|
1
1
|
import * as plugins from "./mod.plugins.js";
|
|
2
2
|
import { type IReleaseArtifact } from "./classes.releasejournal.js";
|
|
3
|
-
declare const
|
|
3
|
+
declare const supportedPnpmVersions: readonly ["11.25.0", "12.1.0", "12.3.4"];
|
|
4
4
|
export interface IPnpmReleaseCapability {
|
|
5
|
-
version: typeof
|
|
5
|
+
version: (typeof supportedPnpmVersions)[number];
|
|
6
6
|
}
|
|
7
7
|
export type TNpmArtifactProbeStatus = "absent" | "exact" | "conflict" | "inconclusive";
|
|
8
8
|
export interface INpmArtifactProbeResult {
|
|
@@ -1,7 +1,46 @@
|
|
|
1
1
|
import * as plugins from "./mod.plugins.js";
|
|
2
2
|
import { releaseArtifactFileName, } from "./classes.releasejournal.js";
|
|
3
3
|
import { assertCredentialFreeGitPushDestination } from "./helpers.releasebranch.js";
|
|
4
|
-
const
|
|
4
|
+
const supportedPnpmVersions = ["11.25.0", "12.1.0", "12.3.4"];
|
|
5
|
+
const pnpmHelpRequirements = {
|
|
6
|
+
"11.25.0": {
|
|
7
|
+
pack: ["--out <path>", "--json"],
|
|
8
|
+
publish: [
|
|
9
|
+
"publish [<tarball>|<dir>]",
|
|
10
|
+
"--no-git-checks",
|
|
11
|
+
"--ignore-scripts",
|
|
12
|
+
"--json",
|
|
13
|
+
"--tag <tag>",
|
|
14
|
+
"--access <public|restricted>",
|
|
15
|
+
],
|
|
16
|
+
},
|
|
17
|
+
"12.1.0": {
|
|
18
|
+
pack: ["Usage: pnpm pack [OPTIONS]", "--out <OUT>", "--json"],
|
|
19
|
+
publish: [
|
|
20
|
+
"Usage: pnpm publish [OPTIONS] [PACKAGE]",
|
|
21
|
+
"Tarball or directory to publish",
|
|
22
|
+
"--no-git-checks",
|
|
23
|
+
"--ignore-scripts",
|
|
24
|
+
"--json",
|
|
25
|
+
"--tag <TAG>",
|
|
26
|
+
"--access <ACCESS>",
|
|
27
|
+
"[possible values: public, restricted]",
|
|
28
|
+
],
|
|
29
|
+
},
|
|
30
|
+
"12.3.4": {
|
|
31
|
+
pack: ["Usage: pnpm pack [OPTIONS]", "--out <OUT>", "--json"],
|
|
32
|
+
publish: [
|
|
33
|
+
"Usage: pnpm publish [OPTIONS] [PACKAGE]",
|
|
34
|
+
"Tarball or directory to publish",
|
|
35
|
+
"--no-git-checks",
|
|
36
|
+
"--ignore-scripts",
|
|
37
|
+
"--json",
|
|
38
|
+
"--tag <TAG>",
|
|
39
|
+
"--access <ACCESS>",
|
|
40
|
+
"[possible values: public, restricted]",
|
|
41
|
+
],
|
|
42
|
+
},
|
|
43
|
+
};
|
|
5
44
|
const maximumMetadataResponseBytes = 8 * 1024 * 1024;
|
|
6
45
|
const capabilityCommandTimeoutMs = 30_000;
|
|
7
46
|
const packCommandTimeoutMs = 10 * 60_000;
|
|
@@ -44,9 +83,11 @@ export const assertPnpmReleaseCapability = async (smartshellArg, cwdArg) => {
|
|
|
44
83
|
timeoutKillGraceMs: 5_000,
|
|
45
84
|
});
|
|
46
85
|
const version = versionResult.stdout.trim();
|
|
47
|
-
|
|
48
|
-
|
|
86
|
+
const supportedVersion = supportedPnpmVersions.find((candidateArg) => candidateArg === version);
|
|
87
|
+
if (versionResult.exitCode !== 0 || !supportedVersion) {
|
|
88
|
+
throw new Error(`Exact release packaging requires a verified pnpm version (${supportedPnpmVersions.join(", ")}); resolved ${version || "unknown"}.`);
|
|
49
89
|
}
|
|
90
|
+
const requirements = pnpmHelpRequirements[supportedVersion];
|
|
50
91
|
const packHelp = await smartshellArg.execSpawn("pnpm", ["pack", "--help"], {
|
|
51
92
|
cwd: cwdArg,
|
|
52
93
|
silent: true,
|
|
@@ -56,7 +97,7 @@ export const assertPnpmReleaseCapability = async (smartshellArg, cwdArg) => {
|
|
|
56
97
|
if (packHelp.exitCode !== 0) {
|
|
57
98
|
throw new Error("Unable to inspect pnpm pack capabilities.");
|
|
58
99
|
}
|
|
59
|
-
requireHelpFragments(packHelp.combinedOutput,
|
|
100
|
+
requireHelpFragments(packHelp.combinedOutput, requirements.pack, "pack");
|
|
60
101
|
const publishHelp = await smartshellArg.execSpawn("pnpm", ["publish", "--help"], {
|
|
61
102
|
cwd: cwdArg,
|
|
62
103
|
silent: true,
|
|
@@ -66,15 +107,8 @@ export const assertPnpmReleaseCapability = async (smartshellArg, cwdArg) => {
|
|
|
66
107
|
if (publishHelp.exitCode !== 0) {
|
|
67
108
|
throw new Error("Unable to inspect pnpm publish capabilities.");
|
|
68
109
|
}
|
|
69
|
-
requireHelpFragments(publishHelp.combinedOutput,
|
|
70
|
-
|
|
71
|
-
"--no-git-checks",
|
|
72
|
-
"--ignore-scripts",
|
|
73
|
-
"--json",
|
|
74
|
-
"--tag <tag>",
|
|
75
|
-
"--access <public|restricted>",
|
|
76
|
-
], "publish");
|
|
77
|
-
return { version: supportedPnpmVersion };
|
|
110
|
+
requireHelpFragments(publishHelp.combinedOutput, requirements.publish, "publish");
|
|
111
|
+
return { version: supportedVersion };
|
|
78
112
|
};
|
|
79
113
|
const legacyPublishWorkflowPaths = [
|
|
80
114
|
".gitea/workflows/default_tags.yaml",
|
|
@@ -357,4 +391,4 @@ export const waitForAnonymousNpmArtifact = async (registryArg, artifactArg, tagA
|
|
|
357
391
|
}
|
|
358
392
|
return lastResult;
|
|
359
393
|
};
|
|
360
|
-
//# 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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"}
|
|
394
|
+
//# 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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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/cli",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "6.
|
|
4
|
+
"version": "6.3.0",
|
|
5
5
|
"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.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"@git.zone/tsbuild": "^4.4.2",
|
|
43
43
|
"@git.zone/tsrun": "^2.0.6",
|
|
44
44
|
"@git.zone/tstest": "^4.0.0",
|
|
45
|
-
"@types/node": "
|
|
45
|
+
"@types/node": "26.4.0"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@aws-sdk/client-s3": "3.1095.0",
|
package/readme.hints.md
CHANGED
|
@@ -166,8 +166,9 @@ version, changelog, commit, tag, build, and pack failures before that point, as
|
|
|
166
166
|
well as the pre-release `--merge` integration push, require explicit operator
|
|
167
167
|
reconciliation; they are not represented as publication attempts.
|
|
168
168
|
|
|
169
|
-
Schema 1 supports Git and public npm;
|
|
170
|
-
|
|
169
|
+
Schema 1 supports Git and public npm; npm publication requires resolved pnpm
|
|
170
|
+
11.25.0, 12.1.0, or 12.3.4 and its qualified pack/publish contract, while
|
|
171
|
+
Git-only journals do not. Schema 2 adds Docker qualification,
|
|
171
172
|
ordered promotion, and cleanup. Docker releases
|
|
172
173
|
cannot use `--merge` because its pre-release push would violate qualification
|
|
173
174
|
ordering, and `release.targets.docker.noBuild` must remain false because
|
package/readme.md
CHANGED
|
@@ -206,7 +206,7 @@ Release flags:
|
|
|
206
206
|
|
|
207
207
|
### Exact artifacts and release journals
|
|
208
208
|
|
|
209
|
-
Journal schema 1 supports Git and public npm publication. Schema 2 adds Docker qualification, promotion, and cleanup evidence without changing the storage path or schema-1 parsing and resume behavior. Fresh and resumed npm publication requires
|
|
209
|
+
Journal schema 1 supports Git and public npm publication. Schema 2 adds Docker qualification, promotion, and cleanup evidence without changing the storage path or schema-1 parsing and resume behavior. Fresh and resumed npm publication requires a qualified exact `pnpm` version: `11.25.0`, `12.1.0`, or `12.3.4`. GitZone checks that version's pack/publish command contract; other versions and missing required capabilities fail before publication. Registries must be unique canonical credential-free HTTP(S) URLs, and `release.targets.npm.accessLevel` must be `public` so verification does not depend on publisher credentials.
|
|
210
210
|
|
|
211
211
|
A selected Git target requires a canonical remote name and exactly one resolved push URL. Before any remote contact, including during `--plan`, GitZone rejects HTTP(S) usernames or passwords, embedded passwords, query strings, fragments, and unsupported protocols. Canonical local paths and SSH destinations may retain their required SSH username.
|
|
212
212
|
|
|
@@ -870,7 +870,7 @@ gitzone config show --json
|
|
|
870
870
|
|
|
871
871
|
## License and Legal Information
|
|
872
872
|
|
|
873
|
-
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license) file.
|
|
873
|
+
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license.md) file.
|
|
874
874
|
|
|
875
875
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
|
876
876
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/cli',
|
|
6
|
-
version: '6.
|
|
6
|
+
version: '6.3.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
|
}
|
|
@@ -5,7 +5,46 @@ import {
|
|
|
5
5
|
} from "./classes.releasejournal.js";
|
|
6
6
|
import { assertCredentialFreeGitPushDestination } from "./helpers.releasebranch.js";
|
|
7
7
|
|
|
8
|
-
const
|
|
8
|
+
const supportedPnpmVersions = ["11.25.0", "12.1.0", "12.3.4"] as const;
|
|
9
|
+
const pnpmHelpRequirements = {
|
|
10
|
+
"11.25.0": {
|
|
11
|
+
pack: ["--out <path>", "--json"],
|
|
12
|
+
publish: [
|
|
13
|
+
"publish [<tarball>|<dir>]",
|
|
14
|
+
"--no-git-checks",
|
|
15
|
+
"--ignore-scripts",
|
|
16
|
+
"--json",
|
|
17
|
+
"--tag <tag>",
|
|
18
|
+
"--access <public|restricted>",
|
|
19
|
+
],
|
|
20
|
+
},
|
|
21
|
+
"12.1.0": {
|
|
22
|
+
pack: ["Usage: pnpm pack [OPTIONS]", "--out <OUT>", "--json"],
|
|
23
|
+
publish: [
|
|
24
|
+
"Usage: pnpm publish [OPTIONS] [PACKAGE]",
|
|
25
|
+
"Tarball or directory to publish",
|
|
26
|
+
"--no-git-checks",
|
|
27
|
+
"--ignore-scripts",
|
|
28
|
+
"--json",
|
|
29
|
+
"--tag <TAG>",
|
|
30
|
+
"--access <ACCESS>",
|
|
31
|
+
"[possible values: public, restricted]",
|
|
32
|
+
],
|
|
33
|
+
},
|
|
34
|
+
"12.3.4": {
|
|
35
|
+
pack: ["Usage: pnpm pack [OPTIONS]", "--out <OUT>", "--json"],
|
|
36
|
+
publish: [
|
|
37
|
+
"Usage: pnpm publish [OPTIONS] [PACKAGE]",
|
|
38
|
+
"Tarball or directory to publish",
|
|
39
|
+
"--no-git-checks",
|
|
40
|
+
"--ignore-scripts",
|
|
41
|
+
"--json",
|
|
42
|
+
"--tag <TAG>",
|
|
43
|
+
"--access <ACCESS>",
|
|
44
|
+
"[possible values: public, restricted]",
|
|
45
|
+
],
|
|
46
|
+
},
|
|
47
|
+
} as const;
|
|
9
48
|
const maximumMetadataResponseBytes = 8 * 1024 * 1024;
|
|
10
49
|
const capabilityCommandTimeoutMs = 30_000;
|
|
11
50
|
const packCommandTimeoutMs = 10 * 60_000;
|
|
@@ -13,7 +52,7 @@ const publishCommandTimeoutMs = 5 * 60_000;
|
|
|
13
52
|
const packageNameRegex = /^(?:@[a-z0-9][a-z0-9._-]*\/[a-z0-9][a-z0-9._-]*|[a-z0-9][a-z0-9._-]*)$/;
|
|
14
53
|
|
|
15
54
|
export interface IPnpmReleaseCapability {
|
|
16
|
-
version: typeof
|
|
55
|
+
version: (typeof supportedPnpmVersions)[number];
|
|
17
56
|
}
|
|
18
57
|
|
|
19
58
|
export type TNpmArtifactProbeStatus =
|
|
@@ -72,10 +111,12 @@ const readPackageIdentity = async (
|
|
|
72
111
|
|
|
73
112
|
const requireHelpFragments = (
|
|
74
113
|
outputArg: string,
|
|
75
|
-
fragmentsArg: string[],
|
|
114
|
+
fragmentsArg: readonly string[],
|
|
76
115
|
commandArg: string,
|
|
77
116
|
): void => {
|
|
78
|
-
const missing = fragmentsArg.filter(
|
|
117
|
+
const missing = fragmentsArg.filter(
|
|
118
|
+
(fragmentArg) => !outputArg.includes(fragmentArg),
|
|
119
|
+
);
|
|
79
120
|
if (missing.length > 0) {
|
|
80
121
|
throw new Error(
|
|
81
122
|
`pnpm ${commandArg} is missing required exact-release capabilities: ${missing.join(", ")}.`,
|
|
@@ -94,11 +135,15 @@ export const assertPnpmReleaseCapability = async (
|
|
|
94
135
|
timeoutKillGraceMs: 5_000,
|
|
95
136
|
});
|
|
96
137
|
const version = versionResult.stdout.trim();
|
|
97
|
-
|
|
138
|
+
const supportedVersion = supportedPnpmVersions.find(
|
|
139
|
+
(candidateArg) => candidateArg === version,
|
|
140
|
+
);
|
|
141
|
+
if (versionResult.exitCode !== 0 || !supportedVersion) {
|
|
98
142
|
throw new Error(
|
|
99
|
-
`Exact release packaging requires
|
|
143
|
+
`Exact release packaging requires a verified pnpm version (${supportedPnpmVersions.join(", ")}); resolved ${version || "unknown"}.`,
|
|
100
144
|
);
|
|
101
145
|
}
|
|
146
|
+
const requirements = pnpmHelpRequirements[supportedVersion];
|
|
102
147
|
|
|
103
148
|
const packHelp = await smartshellArg.execSpawn("pnpm", ["pack", "--help"], {
|
|
104
149
|
cwd: cwdArg,
|
|
@@ -109,7 +154,7 @@ export const assertPnpmReleaseCapability = async (
|
|
|
109
154
|
if (packHelp.exitCode !== 0) {
|
|
110
155
|
throw new Error("Unable to inspect pnpm pack capabilities.");
|
|
111
156
|
}
|
|
112
|
-
requireHelpFragments(packHelp.combinedOutput,
|
|
157
|
+
requireHelpFragments(packHelp.combinedOutput, requirements.pack, "pack");
|
|
113
158
|
|
|
114
159
|
const publishHelp = await smartshellArg.execSpawn(
|
|
115
160
|
"pnpm",
|
|
@@ -126,17 +171,10 @@ export const assertPnpmReleaseCapability = async (
|
|
|
126
171
|
}
|
|
127
172
|
requireHelpFragments(
|
|
128
173
|
publishHelp.combinedOutput,
|
|
129
|
-
|
|
130
|
-
"publish [<tarball>|<dir>]",
|
|
131
|
-
"--no-git-checks",
|
|
132
|
-
"--ignore-scripts",
|
|
133
|
-
"--json",
|
|
134
|
-
"--tag <tag>",
|
|
135
|
-
"--access <public|restricted>",
|
|
136
|
-
],
|
|
174
|
+
requirements.publish,
|
|
137
175
|
"publish",
|
|
138
176
|
);
|
|
139
|
-
return { version:
|
|
177
|
+
return { version: supportedVersion };
|
|
140
178
|
};
|
|
141
179
|
|
|
142
180
|
const legacyPublishWorkflowPaths = [
|
/package/{license → license.md}
RENAMED
|
File without changes
|