@git.zone/cli 10.0.0 → 11.0.1
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 +5 -3
- package/assets/templates/cli/cli.ts.js +1 -1
- package/assets/templates/npm/.package.json +4 -6
- package/assets/templates/npm/test/test.ts +1 -1
- package/assets/templates/service/.package.json +3 -6
- package/assets/templates/wcc/.package.json +3 -6
- package/assets/templates/wcc_update/html/index.html +2 -2
- package/assets/templates/website/.package.json +3 -6
- package/assets/templates/website/npmextra.json +3 -1
- package/assets/templates/website_update/html/index.html +4 -4
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/helpers.packagefiles.js +2 -2
- package/dist_ts/helpers.tssea.d.ts +2 -2
- package/dist_ts/helpers.tssea.js +2 -2
- package/dist_ts/mod_commit/mod.plugins.d.ts +1 -1
- package/dist_ts/mod_commit/mod.plugins.js +2 -2
- package/dist_ts/mod_deprecate/helpers.deprecation.js +4 -2
- package/dist_ts/mod_format/formatters/assets.formatter.js +2 -2
- package/dist_ts/mod_format/formatters/templates.formatter.d.ts +3 -2
- package/dist_ts/mod_format/formatters/templates.formatter.js +61 -14
- package/dist_ts/mod_format/formatters/tsconfig.formatter.js +2 -2
- package/dist_ts/mod_tools/index.js +3 -8
- package/dist_ts/plugins.d.ts +1 -1
- package/dist_ts/plugins.js +2 -2
- package/package.json +6 -11
- package/readme.md +13 -9
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/helpers.packagefiles.ts +1 -1
- package/ts/helpers.tssea.ts +4 -4
- package/ts/mod_commit/mod.plugins.ts +1 -1
- package/ts/mod_deprecate/helpers.deprecation.ts +3 -1
- package/ts/mod_format/formatters/assets.formatter.ts +1 -1
- package/ts/mod_format/formatters/templates.formatter.ts +80 -14
- package/ts/mod_format/formatters/tsconfig.formatter.ts +1 -1
- package/ts/mod_tools/index.ts +2 -7
- package/ts/plugins.ts +1 -1
|
@@ -3,40 +3,76 @@ import * as plugins from '../mod.plugins.js';
|
|
|
3
3
|
import * as paths from '../../paths.js';
|
|
4
4
|
import { ScafTemplate } from '../../mod_template/classes.scaftemplate.js';
|
|
5
5
|
import { logger, logVerbose } from '../../gitzone.logging.js';
|
|
6
|
+
/**
|
|
7
|
+
* Module values the templates link as `https://<value>/…`: a host with an
|
|
8
|
+
* optional port and path, never a whole URL or a trailing slash.
|
|
9
|
+
*/
|
|
10
|
+
const templateHostKeys = ['assetbrokerUrl', 'legalUrl'];
|
|
11
|
+
const templateHostPattern = /^[a-z0-9]([a-z0-9.-]*[a-z0-9])?(:\d{1,5})?(\/[^\s/?#]+)*$/i;
|
|
12
|
+
/**
|
|
13
|
+
* The module values the templates render with. A blank value, or a host value
|
|
14
|
+
* that is not a bare host, is left out, so a template that uses it reports it
|
|
15
|
+
* as unsatisfied; the reason is kept for that report.
|
|
16
|
+
*/
|
|
17
|
+
const getTemplateModuleVariables = (moduleArg) => {
|
|
18
|
+
const module = {};
|
|
19
|
+
const unusableReasons = new Map();
|
|
20
|
+
for (const [key, value] of Object.entries(moduleArg ?? {})) {
|
|
21
|
+
if (value === undefined || value === null) {
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
24
|
+
if (typeof value === 'string' && value.trim() === '') {
|
|
25
|
+
unusableReasons.set(`module.${key}`, 'is empty');
|
|
26
|
+
}
|
|
27
|
+
else if (templateHostKeys.includes(key) &&
|
|
28
|
+
!(typeof value === 'string' && templateHostPattern.test(value))) {
|
|
29
|
+
unusableReasons.set(`module.${key}`, `is ${JSON.stringify(value)}, not a host (host[:port][/path], without a scheme or a trailing slash)`);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
module[key] = value;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return { module, unusableReasons };
|
|
36
|
+
};
|
|
6
37
|
export class TemplatesFormatter extends BaseFormatter {
|
|
7
|
-
|
|
38
|
+
templateWarnings = [];
|
|
8
39
|
get name() {
|
|
9
40
|
return 'templates';
|
|
10
41
|
}
|
|
11
42
|
async validate() {
|
|
12
|
-
return this.
|
|
43
|
+
return this.templateWarnings;
|
|
13
44
|
}
|
|
14
45
|
/**
|
|
15
|
-
* Render a template directory
|
|
46
|
+
* Render a template directory into a map of path → content. Templates read
|
|
47
|
+
* `module` and `projectType` from the `@git.zone/cli` configuration.
|
|
16
48
|
*/
|
|
17
49
|
async renderTemplate(templateName) {
|
|
18
50
|
const templateDir = plugins.path.join(paths.templatesDir, templateName);
|
|
19
51
|
const scafTemplate = new ScafTemplate(templateDir);
|
|
20
52
|
await scafTemplate.readTemplateFromDir();
|
|
21
53
|
const gitzoneData = this.project.gitzoneConfig?.data;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
54
|
+
const { module, unusableReasons } = getTemplateModuleVariables(gitzoneData?.module);
|
|
55
|
+
await scafTemplate.supplyVariables({
|
|
56
|
+
module,
|
|
57
|
+
projectType: gitzoneData?.projectType,
|
|
58
|
+
});
|
|
59
|
+
if (scafTemplate.missingVariables.length > 0) {
|
|
60
|
+
return {
|
|
61
|
+
unsatisfiedReasons: scafTemplate.missingVariables.map((variableArg) => `@git.zone/cli.${variableArg} ${unusableReasons.get(variableArg) ?? 'is not set'}`),
|
|
62
|
+
};
|
|
27
63
|
}
|
|
28
64
|
const renderedFiles = await scafTemplate.renderToMemory();
|
|
29
65
|
const fileMap = new Map();
|
|
30
66
|
for (const file of renderedFiles) {
|
|
31
67
|
fileMap.set(file.path, file.contents.toString());
|
|
32
68
|
}
|
|
33
|
-
return fileMap;
|
|
69
|
+
return { files: fileMap };
|
|
34
70
|
}
|
|
35
71
|
async analyze() {
|
|
36
72
|
const changes = [];
|
|
37
73
|
const project = this.project;
|
|
38
74
|
const projectType = project.gitzoneConfig?.data?.projectType;
|
|
39
|
-
this.
|
|
75
|
+
this.templateWarnings = [];
|
|
40
76
|
// VSCode template - for all projects
|
|
41
77
|
const vscodeChanges = await this.analyzeTemplate('vscode', [
|
|
42
78
|
{
|
|
@@ -153,15 +189,26 @@ export class TemplatesFormatter extends BaseFormatter {
|
|
|
153
189
|
logVerbose(`Template ${templateName} not found`);
|
|
154
190
|
return changes;
|
|
155
191
|
}
|
|
156
|
-
let
|
|
192
|
+
let rendered;
|
|
157
193
|
try {
|
|
158
|
-
|
|
194
|
+
rendered = await this.renderTemplate(templateName);
|
|
159
195
|
}
|
|
160
196
|
catch (error) {
|
|
161
197
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
162
198
|
logVerbose(`Failed to render template ${templateName}: ${errorMessage}`);
|
|
163
199
|
return changes;
|
|
164
200
|
}
|
|
201
|
+
// An unrendered variable would be written as an empty string (a page
|
|
202
|
+
// linking `https:///fonts/fonts.css`), so the plan carries an error instead,
|
|
203
|
+
// which also keeps `gitzone format --write` from writing anything.
|
|
204
|
+
if ('unsatisfiedReasons' in rendered) {
|
|
205
|
+
const destPaths = files.map((fileArg) => fileArg.destPath).join(', ');
|
|
206
|
+
const message = `The ${templateName} template cannot render ${destPaths} from .smartconfig.json: ${rendered.unsatisfiedReasons.join('; ')}.`;
|
|
207
|
+
this.templateWarnings.push({ level: 'error', message, module: this.name });
|
|
208
|
+
logVerbose(message);
|
|
209
|
+
return changes;
|
|
210
|
+
}
|
|
211
|
+
const renderedFiles = rendered.files;
|
|
165
212
|
for (const file of files) {
|
|
166
213
|
// Look up by templatePath first, then destPath (frontmatter may rename files)
|
|
167
214
|
const processedContent = renderedFiles.get(file.templatePath)
|
|
@@ -186,7 +233,7 @@ export class TemplatesFormatter extends BaseFormatter {
|
|
|
186
233
|
// where the decision is made: in the plan the user confirms.
|
|
187
234
|
if (outcome.replacedReason) {
|
|
188
235
|
const replacementMessage = `${file.destPath} is replaced by the ${templateName} template instead of merged, because ${outcome.replacedReason}. Top-level keys only this project declares are lost.`;
|
|
189
|
-
this.
|
|
236
|
+
this.templateWarnings.push({
|
|
190
237
|
level: 'warning',
|
|
191
238
|
message: replacementMessage,
|
|
192
239
|
module: this.name,
|
|
@@ -218,4 +265,4 @@ export class TemplatesFormatter extends BaseFormatter {
|
|
|
218
265
|
logger.log('info', `Applied template to ${change.path}`);
|
|
219
266
|
}
|
|
220
267
|
}
|
|
221
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"templates.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/templates.formatter.ts"],"names":[],"mappings":"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"}
|
|
268
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"templates.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/templates.formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ export class TsconfigFormatter extends BaseFormatter {
|
|
|
32
32
|
// Get module paths from tspublish, merging with existing custom paths
|
|
33
33
|
const tspublishPaths = {};
|
|
34
34
|
try {
|
|
35
|
-
const tsPublishMod = await import('@git.zone/
|
|
35
|
+
const tsPublishMod = await import('@git.zone/tsrepo/publish');
|
|
36
36
|
const tsPublishInstance = new tsPublishMod.TsPublish();
|
|
37
37
|
const publishModules = await tsPublishInstance.getModuleSubDirs(paths.cwd);
|
|
38
38
|
for (const publishModule of Object.keys(publishModules)) {
|
|
@@ -72,4 +72,4 @@ export class TsconfigFormatter extends BaseFormatter {
|
|
|
72
72
|
logger.log('info', 'Updated tsconfig.json');
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHNjb25maWcuZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvbW9kX2Zvcm1hdC9mb3JtYXR0ZXJzL3RzY29uZmlnLmZvcm1hdHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFNUQsT0FBTyxLQUFLLE9BQU8sTUFBTSxtQkFBbUIsQ0FBQztBQUM3QyxPQUFPLEtBQUssS0FBSyxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUQsTUFBTSxPQUFPLGlCQUFrQixTQUFRLGFBQWE7SUFDbEQsSUFBSSxJQUFJO1FBQ04sT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPO1FBQ1gsTUFBTSxPQUFPLEdBQXFCLEVBQUUsQ0FBQztRQUNyQyxNQUFNLFlBQVksR0FBRyxlQUFlLENBQUM7UUFFckMsdUJBQXVCO1FBQ3ZCLE1BQU0sTUFBTSxHQUFHLE1BQU0sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDakUsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osVUFBVSxDQUFDLHdDQUF3QyxDQUFDLENBQUM7WUFDckQsT0FBTyxPQUFPLENBQUM7UUFDakIsQ0FBQztRQUVELHVCQUF1QjtRQUN2QixNQUFNLGNBQWMsR0FBRyxDQUFDLE1BQU0sT0FBTyxDQUFDLE9BQU87YUFDMUMsSUFBSSxDQUFDLFlBQVksQ0FBQzthQUNsQixRQUFRLENBQUMsTUFBTSxDQUFDO2FBQ2hCLElBQUksRUFBRSxDQUFXLENBQUM7UUFFckIsZ0NBQWdDO1FBQ2hDLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDbEQsY0FBYyxDQUFDLGVBQWUsR0FBRyxjQUFjLENBQUMsZUFBZSxJQUFJLEVBQUUsQ0FBQztRQUN0RSxjQUFjLENBQUMsZUFBZSxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUM7UUFDN0MsTUFBTSxhQUFhLEdBQUcsY0FBYyxDQUFDLGVBQWUsQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ2pFLGdFQUFnRTtRQUNoRSx1RUFBdUU7UUFDdkUsZUFBZTtRQUNmLE9BQU8sYUFBYSxDQUFDLFNBQVMsQ0FBQztRQUUvQixzRUFBc0U7UUFDdEUsTUFBTSxjQUFjLEdBQTZCLEVBQUUsQ0FBQztRQUNwRCxJQUFJLENBQUM7WUFDSCxNQUFNLFlBQVksR0FBRyxNQUFNLE1BQU0sQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO1lBQzlELE1BQU0saUJBQWlCLEdBQUcsSUFBSSxZQUFZLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDdkQsTUFBTSxjQUFjLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7WUFFM0UsS0FBSyxNQUFNLGFBQWEsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7Z0JBQ3hELE1BQU0sYUFBYSxHQUFHLGNBQWMsQ0FBQyxhQUFhLENBQUMsQ0FBQztnQkFDcEQsNkRBQTZEO2dCQUM3RCx1REFBdUQ7Z0JBQ3ZELElBQUksT0FBTyxhQUFhLENBQUMsSUFBSSxLQUFLLFFBQVEsSUFBSSxhQUFhLENBQUMsSUFBSSxLQUFLLEVBQUUsRUFBRSxDQUFDO29CQUN4RSxTQUFTO2dCQUNYLENBQUM7Z0JBQ0QsY0FBYyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsR0FBRztvQkFDbkMsS0FBSyxhQUFhLFdBQVc7aUJBQzlCLENBQUM7WUFDSixDQUFDO1FBQ0gsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixNQUFNLFlBQVksR0FBRyxLQUFLLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDNUUsVUFBVSxDQUFDLG9DQUFvQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO1FBQ2pFLENBQUM7UUFFRCxjQUFjLENBQUMsZUFBZSxDQUFDLEtBQUssR0FBRyxFQUFFLEdBQUcsYUFBYSxFQUFFLEdBQUcsY0FBYyxFQUFFLENBQUM7UUFFL0UsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBRTNELHFDQUFxQztRQUNyQyxJQUFJLFVBQVUsS0FBSyxjQUFjLEVBQUUsQ0FBQztZQUNsQyxPQUFPLENBQUMsSUFBSSxDQUFDO2dCQUNYLElBQUksRUFBRSxRQUFRO2dCQUNkLElBQUksRUFBRSxZQUFZO2dCQUNsQixNQUFNLEVBQUUsSUFBSSxDQUFDLElBQUk7Z0JBQ2pCLFdBQVcsRUFBRSx5Q0FBeUM7Z0JBQ3RELE9BQU8sRUFBRSxVQUFVO2FBQ3BCLENBQUMsQ0FBQztRQUNMLENBQUM7UUFFRCxPQUFPLE9BQU8sQ0FBQztJQUNqQixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUFzQjtRQUN0QyxJQUFJLE1BQU0sQ0FBQyxJQUFJLEtBQUssUUFBUSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU87WUFBRSxPQUFPO1FBRXhELE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNuRCxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSx1QkFBdUIsQ0FBQyxDQUFDO0lBQzlDLENBQUM7Q0FDRiJ9
|
|
@@ -5,16 +5,11 @@ import { ask } from "../helpers.prompts.js";
|
|
|
5
5
|
import { PackageManagerUtil, } from "./classes.packagemanager.js";
|
|
6
6
|
export const GITZONE_PACKAGES = [
|
|
7
7
|
"@git.zone/cli",
|
|
8
|
-
"@git.zone/
|
|
9
|
-
"@git.zone/
|
|
10
|
-
"@git.zone/tstest",
|
|
11
|
-
"@git.zone/tspublish",
|
|
12
|
-
"@git.zone/tsbundle",
|
|
8
|
+
"@git.zone/tsrepo",
|
|
9
|
+
"@git.zone/rsrepo",
|
|
13
10
|
"@git.zone/tsdocker",
|
|
14
11
|
"@git.zone/tsdeploy",
|
|
15
12
|
"@git.zone/tsview",
|
|
16
|
-
"@git.zone/tswatch",
|
|
17
|
-
"@git.zone/tsrust",
|
|
18
13
|
];
|
|
19
14
|
export const run = async (argvArg = {}) => {
|
|
20
15
|
const mode = await getCliMode(argvArg);
|
|
@@ -404,4 +399,4 @@ export function showHelp(mode) {
|
|
|
404
399
|
console.log(" gitzone tools install");
|
|
405
400
|
console.log("");
|
|
406
401
|
}
|
|
407
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/mod_tools/index.ts"],"names":[],"mappings":"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"}
|
|
402
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/mod_tools/index.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -24,7 +24,7 @@ import { SmartFs } from '@push.rocks/smartfs';
|
|
|
24
24
|
import * as objectstorage from '@lossless.org/client/objectstorage';
|
|
25
25
|
import * as s3 from '@aws-sdk/client-s3';
|
|
26
26
|
import * as tsdockerReleaseProtocol from '@git.zone/tsdocker/dist_ts/classes.releaseprotocol.js';
|
|
27
|
-
import * as tspublish from '@git.zone/
|
|
27
|
+
import * as tspublish from '@git.zone/tsrepo/publish';
|
|
28
28
|
export type { IReleaseCapabilitiesResult, IReleaseCleanupResult, IReleaseDestinationEvidence, IReleaseProbeResult, IReleasePromotionContext, IReleasePromotionResult, IReleaseQualificationRequest, IReleaseQualificationResult, IReleaseValidationResult, TReleaseAliasPolicy, TReleasePromotionEvidence, TReleaseProtocolCommand, TReleaseProtocolFeature, } from '@git.zone/tsdocker/dist_ts/interfaces/index.js';
|
|
29
29
|
export declare const smartfs: SmartFs;
|
|
30
30
|
export declare const loadDcrouterApi: () => Promise<typeof import("@serve.zone/dcrouter-apiclient")>;
|
package/dist_ts/plugins.js
CHANGED
|
@@ -25,9 +25,9 @@ import { SmartFs, SmartFsProviderNode } from '@push.rocks/smartfs';
|
|
|
25
25
|
import * as objectstorage from '@lossless.org/client/objectstorage';
|
|
26
26
|
import * as s3 from '@aws-sdk/client-s3';
|
|
27
27
|
import * as tsdockerReleaseProtocol from '@git.zone/tsdocker/dist_ts/classes.releaseprotocol.js';
|
|
28
|
-
import * as tspublish from '@git.zone/
|
|
28
|
+
import * as tspublish from '@git.zone/tsrepo/publish';
|
|
29
29
|
// Create smartfs instance for filesystem operations
|
|
30
30
|
export const smartfs = new SmartFs(new SmartFsProviderNode());
|
|
31
31
|
export const loadDcrouterApi = () => import('@serve.zone/dcrouter-apiclient');
|
|
32
32
|
export { smartlog, smartlogDestinationLocal, smartconfig, path, os, fs, fsConstants, crypto, fsSync, childProcess, tty, nodeModule, nodeUrl, projectinfo, smartconsole, smartpath, smartpromise, smartupdate, smartshell, smartnetwork, smartfile, smartarchive, objectstorage, s3, tsdockerReleaseProtocol, tspublish, };
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssd0JBQXdCLE1BQU0sd0NBQXdDLENBQUM7QUFDbkYsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEtBQUssRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUM5QixPQUFPLEtBQUssRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxTQUFTLElBQUksV0FBVyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ25ELE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxNQUFNLE1BQU0sU0FBUyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxZQUFZLE1BQU0sb0JBQW9CLENBQUM7QUFDbkQsT0FBTyxLQUFLLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFDaEMsT0FBTyxLQUFLLFVBQVUsTUFBTSxhQUFhLENBQUM7QUFDMUMsT0FBTyxLQUFLLE9BQU8sTUFBTSxVQUFVLENBQUM7QUFDcEMsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRW5FLHNCQUFzQjtBQUN0QixPQUFPLEtBQUssYUFBYSxNQUFNLG9DQUFvQyxDQUFDO0FBRXBFLE9BQU8sS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDekMsT0FBTyxLQUFLLHVCQUF1QixNQUFNLHVEQUF1RCxDQUFDO0FBQ2pHLE9BQU8sS0FBSyxTQUFTLE1BQU0sMEJBQTBCLENBQUM7QUFrQnRELG9EQUFvRDtBQUNwRCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxtQkFBbUIsRUFBRSxDQUFDLENBQUM7QUFFOUQsTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO0FBSTlFLE9BQU8sRUFDTCxRQUFRLEVBQ1Isd0JBQXdCLEVBQ3hCLFdBQVcsRUFDWCxJQUFJLEVBQ0osRUFBRSxFQUNGLEVBQUUsRUFDRixXQUFXLEVBQ1gsTUFBTSxFQUNOLE1BQU0sRUFDTixZQUFZLEVBQ1osR0FBRyxFQUNILFVBQVUsRUFDVixPQUFPLEVBQ1AsV0FBVyxFQUNYLFlBQVksRUFDWixTQUFTLEVBQ1QsWUFBWSxFQUNaLFdBQVcsRUFDWCxVQUFVLEVBQ1YsWUFBWSxFQUNaLFNBQVMsRUFDVCxZQUFZLEVBQ1osYUFBYSxFQUNiLEVBQUUsRUFDRix1QkFBdUIsRUFDdkIsU0FBUyxHQUNWLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/cli",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "11.0.1",
|
|
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",
|
|
@@ -40,18 +40,13 @@
|
|
|
40
40
|
"homepage": "https://code.foss.global/git.zone/cli#README",
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@api.global/typedrequest": "^8.2.0",
|
|
43
|
-
"@git.zone/tsbuild": "^6.0.2",
|
|
44
43
|
"@git.zone/tspack": "^1.4.2",
|
|
45
|
-
"@
|
|
46
|
-
"@git.zone/tssea": "^1.2.1",
|
|
47
|
-
"@git.zone/tstest": "^8.0.0",
|
|
48
|
-
"@types/node": "^26.6.4"
|
|
44
|
+
"@types/node": "^26.6.5"
|
|
49
45
|
},
|
|
50
46
|
"dependencies": {
|
|
51
47
|
"@aws-sdk/client-s3": "3.1095.0",
|
|
52
|
-
"@git.zone/tsdoc": "^3.0.2",
|
|
53
48
|
"@git.zone/tsdocker": "3.12.0",
|
|
54
|
-
"@git.zone/
|
|
49
|
+
"@git.zone/tsrepo": "^1.1.0",
|
|
55
50
|
"@lossless.org/client": "1.5.1",
|
|
56
51
|
"@push.rocks/early": "^4.0.4",
|
|
57
52
|
"@push.rocks/projectinfo": "^5.1.0",
|
|
@@ -98,8 +93,8 @@
|
|
|
98
93
|
],
|
|
99
94
|
"scripts": {
|
|
100
95
|
"test": "pnpm run testUnit",
|
|
101
|
-
"testUnit": "
|
|
102
|
-
"build": "
|
|
103
|
-
"buildDocs": "
|
|
96
|
+
"testUnit": "tsrepo test 'test/test.*.node.ts'",
|
|
97
|
+
"build": "tsrepo build tsfolders",
|
|
98
|
+
"buildDocs": "tsrepo docs"
|
|
104
99
|
}
|
|
105
100
|
}
|
package/readme.md
CHANGED
|
@@ -83,6 +83,8 @@ gitzone tools update -y
|
|
|
83
83
|
gitzone tools install
|
|
84
84
|
```
|
|
85
85
|
|
|
86
|
+
The managed tools include `@git.zone/tsrepo` and `@git.zone/rsrepo`, not the retired single tools they replace (tsbuild, tstest, tsbundle, tswatch, tsdoc, tspublish, tsrust), which `gitzone tools` neither installs nor updates; a global rsrepo is the engine a Rust project's release finds on the PATH when its package.json does not declare one.
|
|
87
|
+
|
|
86
88
|
`gitzone tools update` checks `@git.zone/cli` first. If the CLI itself needs an update, it updates `@git.zone/cli` and asks you to rerun the command before updating the rest of the toolchain.
|
|
87
89
|
|
|
88
90
|
## Commit Workflow
|
|
@@ -724,7 +726,7 @@ The pnpm release tests cover known command dialects and dynamic version qualific
|
|
|
724
726
|
and qualify actual packaging and script-free tarball publication with the active
|
|
725
727
|
version. Run `testUnit` with each maturity-eligible standalone version and a matching
|
|
726
728
|
project pin in an isolated checkout. For a focused matrix, invoke the project-local
|
|
727
|
-
`
|
|
729
|
+
`tsrepo test` on `test/test.pnpmrelease.node.ts` from a disposable directory whose
|
|
728
730
|
`package.json` pins that row. Do not wrap these invocations in another `pnpm with`:
|
|
729
731
|
pnpm rejects nested use. Keep the normal release-age policy for every row.
|
|
730
732
|
|
|
@@ -1842,7 +1844,7 @@ Then fix the package and release again. `gitzone config doctor` validates
|
|
|
1842
1844
|
|
|
1843
1845
|
### Managed Assets
|
|
1844
1846
|
|
|
1845
|
-
Projects can opt into generated, updateable repository assets through `@git.zone/cli.assets`. The kind `binaryCli` manages installer scripts, npm binary wrappers, postinstall downloaders, and Gitea release workflows for CLI executables that [`@git.zone/
|
|
1847
|
+
Projects can opt into generated, updateable repository assets through `@git.zone/cli.assets`. The kind `binaryCli` manages installer scripts, npm binary wrappers, postinstall downloaders, and Gitea release workflows for CLI executables that `tsrepo sea` from [`@git.zone/tsrepo`](https://code.foss.global/git.zone/tsrepo) builds as Node.js single executable applications.
|
|
1846
1848
|
|
|
1847
1849
|
```json
|
|
1848
1850
|
{
|
|
@@ -1900,12 +1902,12 @@ Projects can opt into generated, updateable repository assets through `@git.zone
|
|
|
1900
1902
|
}
|
|
1901
1903
|
```
|
|
1902
1904
|
|
|
1903
|
-
The executables come from the project's
|
|
1905
|
+
The executables come from the project's SEA configuration; GitZone keeps no target list of its own. The project declares `@git.zone/tsrepo` ^1.0.0 in `dependencies` or `devDependencies` and has it installed (`pnpm install --save-dev @git.zone/tsrepo`, then `pnpm install`); GitZone reads the configuration through `@git.zone/tsrepo/sea/config` from the project's own install, so the project's tsrepo version interprets its own configuration and GitZone has no runtime dependency on it. tsrepo's configuration rule applies: `@git.zone/tsrepo.sea`, else the legacy `@git.zone/tssea` section, and both at once is an error. A project still on the deprecated `@git.zone/tssea` (^1.1.0, without tsrepo) is read through `@git.zone/tssea/config`; it must move to tsrepo as the tsrepo readme's "Migrating from the single tools" describes, or set `releaseWorkflow.compileCommand` to its tssea build, because the default `compileCommand` runs tsrepo; `gitzone format` and `gitzone config doctor` say which step is missing, and they refuse an installed tssea outside ^1.1.0 and an `outDir` outside the project.
|
|
1904
1906
|
|
|
1905
1907
|
- **Asset names:** each target's `name` is the executable's file name and its release asset name, used exactly as given. A Windows name carries its `.exe`. The installer maps `uname` to `linux` or `macos` and `x64` or `arm64`; the npm wrapper maps `process.platform:process.arch`; both download `releases/download/<version>/<name>`.
|
|
1906
1908
|
- **Windows:** `install.sh` installs on Linux and macOS only. Under Git Bash, MSYS2 or Cygwin it stops before any download, also with `--dry-run`, and names the release's Windows executables (`releases/download/<version or latest>/<name>`) and `SHA256SUMS.txt` to check them against: there it has no root user for its `sudo bash` usage, no systemd, and its `binDir` lies inside the Git installation, outside the Windows `PATH`. The npm wrapper does install on Windows.
|
|
1907
1909
|
- **Runtime dependencies:** the executables carry the bundled application, and the npm wrapper and postinstall use Node.js built-ins only, so neither needs the project's `dependencies`. npm and pnpm still install every package listed there for each user of the npm package. Keep packages that are only bundled into the executable in `devDependencies`; `releaseWorkflow.installCommand` installs both, so the build is unaffected. GitZone does not move them for you.
|
|
1908
|
-
- **Release workflow:** `releaseWorkflow.installCommand` (default `pnpm install --frozen-lockfile --ignore-scripts`) installs the dependencies and `releaseWorkflow.compileCommand` (default `pnpm exec
|
|
1910
|
+
- **Release workflow:** `releaseWorkflow.installCommand` (default `pnpm install --frozen-lockfile --ignore-scripts`) installs the dependencies and `releaseWorkflow.compileCommand` (default `pnpm exec tsrepo bundle && pnpm exec tsrepo sea build`, the `@git.zone/tsrepo` bundle and SEA build) builds; set either when the project needs another command, for example `pnpm exec tsbundle && pnpm exec tssea build` in a project not yet moved from tsbundle and tssea to tsrepo. The workflow sets up Node.js 22, the runtime of its tooling (`tsrepo sea` runs on Node.js 22 or later and builds and smoke-runs every executable with the `nodeVersion` it pins, never with the Node.js that runs it; a `compileCommand` that runs the project's own code runs it on Node.js 22), installs dependencies, checks that the `package.json` version equals the tag, builds, and then checksums and uploads exactly the configured executables, the notice files `tsrepo sea` writes next to each, the staged installer (when the installer is enabled), the extra release assets and `SHA256SUMS.txt`. A missing file or a Gitea API error fails the job, and nothing else in the output directory is uploaded. A published asset is never replaced: when the release already has an asset of the same name, the job fails before uploading anything and names each such asset; delete them in Gitea before rerunning. An asset list that is not a JSON array of named assets fails the job as well, never counting as "no such asset". With `packNpmArtifact` it also packs and uploads the npm tarball.
|
|
1909
1911
|
- **Extra release assets:** `releaseWorkflow.extraAssets` lists further repository files the release publishes, such as an uninstaller or the changelog: exact `/`-separated paths whose segments consist of letters, digits, `.`, `_` and `-` and start with a letter or digit (no globs, no `..`, no leading `/` or `./`, no backslash). Each file is published under its last path segment, which must differ from every other release asset (the executables, their notice files, the name of an enabled installer, `SHA256SUMS.txt`, and with `packNpmArtifact` any `.tgz` name); a path inside the tssea output directory is refused, since extras are repository files, not build outputs. After the build and before the release is created, the workflow checks that every extra is a regular file whose real path lies inside the checkout, then stages them; any failure ends the job with no release and no upload. Extras are listed in `SHA256SUMS.txt` and uploaded like every other asset. `installer.extraFiles` names the extras (by asset name) that `install.sh` installs into `installDir` beside the executable; each must be tracked by Git, and the installer applies the file's mode from the Git index (`100755` installs as `0755`, everything else as `0644`), so a committed mode change shows as asset drift in `gitzone format check`. A name must not be the executable's file name (`binary.installFileName`, default `cliName`). Only `install.sh` installs extras, in binary and in source mode; the npm postinstall installs none, so a program that uses such a file must cope with its absence in an npm install.
|
|
1910
1912
|
- **Release notes:** the release description is the tag's section of `changelog.md`, the `## <date> - <version>` heading `gitzone release` writes, up to the next `## ` heading. Generic notes with the install command are used only when the changelog has no section for the version. The workflow extracts it with the managed `scripts/gitzone-binary-release.mjs`, which the release workflow template also writes.
|
|
1911
1913
|
- **Old releases:** `releaseWorkflow.keepReleases` (default 0) is how many published releases stay. With N above 0, the workflow deletes, after this release's assets are uploaded, every published Gitea release older than the newest N (by creation time) together with its assets. Tags are never deleted, drafts are neither counted nor deleted, and the release of the running tag always stays. 0 keeps every release; a value that is not a non-negative integer fails `gitzone format`. A Gitea API error fails the job.
|
|
@@ -2103,7 +2105,7 @@ gitzone format fix
|
|
|
2103
2105
|
|
|
2104
2106
|
Formatters include cleanup, smartconfig normalization, dependency license checks, package metadata normalization, template updates, `.gitignore`, TypeScript config, Prettier, README existence checks, and configured copy operations.
|
|
2105
2107
|
|
|
2106
|
-
The `packagejson` formatter writes the `files` list of `package.json`. It ships the `ts/` and `ts_web/` sources without their `tsconfig.json`:
|
|
2108
|
+
The `packagejson` formatter writes the `files` list of `package.json`. It ships the `ts/` and `ts_web/` sources without their `tsconfig.json`: `tsrepo build` (formerly `tsbuild`) reads a folder's compiler options from `<folder>/tsconfig.json`, which extends the root `tsconfig.json`, and the package does not ship the root file. The list therefore ends with `!ts/tsconfig.json` and `!ts_web/tsconfig.json`; pnpm 10 and 12 apply an exclusion only after the entries that include the file.
|
|
2107
2109
|
|
|
2108
2110
|
The owner npm scopes are an exported constant, so no repository keeps a hand-copied list:
|
|
2109
2111
|
|
|
@@ -2114,7 +2116,7 @@ import { ownerNpmScopes } from '@git.zone/cli';
|
|
|
2114
2116
|
|
|
2115
2117
|
`--only`, `--skip` and `@git.zone/cli.format.modules.only`/`skip` accept the module names `cleanup`, `smartconfig`, `license`, `packagejson`, `templates`, `assets`, `gitignore`, `tsconfig`, `prettier`, `readme`, `copy` and `rustfmt`; any other name is refused with that list. `gitzone format --write` writes nothing while the plan carries an error.
|
|
2116
2118
|
|
|
2117
|
-
The template formatter owns `.vscode/settings.json` and `.vscode/launch.json` in every project, and the Gitea workflows, CLI entry points and HTML entry files of the project types that declare them. Workflow and entry files are written from the template as a whole. The formatter never creates or changes a `Dockerfile` or `.dockerignore`: they describe the project's own image. `gitzone template service` and `gitzone template website` scaffold a first pnpm-based Dockerfile.
|
|
2119
|
+
The template formatter owns `.vscode/settings.json` and `.vscode/launch.json` in every project, and the Gitea workflows, CLI entry points and HTML entry files of the project types that declare them. Workflow and entry files are written from the template as a whole. The `html/index.html` of a website loads its fonts from `https://<module.assetbrokerUrl>/fonts/fonts.css` and links `https://<module.legalUrl>` and its `/privacy` page; a wcc project's page loads the same fonts. Both keys live under `@git.zone/cli.module` in `.smartconfig.json` and hold a host (`host[:port][/path]`, without `https://` or a trailing slash), for example `"assetbrokerUrl": "assetbroker.example.com"`. When a page needs a key that is missing, empty or not a host, the plan carries an error that names it, and the page is left alone. The formatter never creates or changes a `Dockerfile` or `.dockerignore`: they describe the project's own image. `gitzone template service` and `gitzone template website` scaffold a first pnpm-based Dockerfile.
|
|
2118
2120
|
|
|
2119
2121
|
The Gitea workflows verify and never publish. npm and wcc projects get `default_nottags.yaml` and `default_tags.yaml`, service and website projects `docker_nottags.yaml` and `docker_tags.yaml`. Each runs in `code.foss.global/host.today/ht-docker-node:latest`: a pinned checkout that keeps no credentials, then `pnpm --version`, `pnpm install --frozen-lockfile`, `pnpm build`, `pnpm test` and `pnpm audit --prod --audit-level=high --registry=https://registry.npmjs.org`. The audit fails the workflow when a production dependency has a high or critical advisory; development dependencies do not ship and are not audited. It asks registry.npmjs.org because a private registry may not serve the advisory endpoint, and it runs last, so a newly published advisory never hides a test result. pnpm 12 skips an advisory you have reviewed and accepted when `pnpm-workspace.yaml` lists its GHSA ID under `auditConfig.ignoreGhsas`. No setup action installs pnpm: the image's pnpm switches to the version that `package.json` pins in `packageManager`, pnpm 10 included, so the printed version is the one that installs, builds, tests and audits. The switch downloads that version from the npm registry, so the runner needs registry access, which the install needs anyway. They use no secrets and build no images; a tag workflow verifies the tagged commit, and `gitzone release` publishes packages and images. The two `.vscode` files are merged at the top level instead: every key the template declares is refreshed, and every other top-level key — an editor setting only your project has, such as `deno.enable` — is kept. Two limits follow from that. A key the template itself declares is taken as a whole, so an array such as `json.schemas` or `configurations` is replaced rather than unioned, and a merged file is re-serialized with two-space indentation, so a project that keeps its own key loses hand-made formatting in those two files. A `.vscode` file that is not valid JSON cannot be merged and is replaced by the template as a whole. That never happens silently: the plan line reads `Replace .vscode/settings.json: the current file is not valid JSON (…)` instead of the usual `Apply template …`, and the run prints a warning that keys only your project declares are lost. Both appear in `gitzone format`, `gitzone format check` and `gitzone format plan --json`, so you see them before confirming a write.
|
|
2120
2122
|
|
|
@@ -2699,7 +2701,7 @@ gitzone template wcc
|
|
|
2699
2701
|
gitzone template rust
|
|
2700
2702
|
```
|
|
2701
2703
|
|
|
2702
|
-
Templates are rendered through SmartScaf and then can be normalized with `gitzone format`. The `rust` template scaffolds a Cargo workspace for `@git.zone/rsrepo` and gitzone releases; see [Rust workspaces and the cargo target](#rust-workspaces-and-the-cargo-target). It runs `cargo generate-lockfile` after writing the files, so commit the resulting `Cargo.lock`.
|
|
2704
|
+
Templates are rendered through SmartScaf and then can be normalized with `gitzone format`. The TypeScript templates (`npm`, `service`, `website`, `wcc`) develop with `@git.zone/tsrepo`: they declare it as their one development tool and call `tsrepo build`, `tsrepo test`, `tsrepo bundle`, `tsrepo watch` and `tsrepo docs` instead of tsbuild, tstest, tsbundle, tswatch and tsdoc (`tsrepo watch` asks for its preset, such as `website` or `element`, on the first run and stores it in `.smartconfig.json`); test files import `tap` from `@git.zone/tsrepo/tapbundle`, and a scaffolded `cli.ts.js` runs through `@git.zone/tsrepo/run`. The `rust` template scaffolds a Cargo workspace for `@git.zone/rsrepo` and gitzone releases; see [Rust workspaces and the cargo target](#rust-workspaces-and-the-cargo-target). It runs `cargo generate-lockfile` after writing the files, so commit the resulting `Cargo.lock`.
|
|
2703
2705
|
|
|
2704
2706
|
## Meta Repositories
|
|
2705
2707
|
|
|
@@ -2765,7 +2767,9 @@ names the replacement. A package without an honest successor is deprecated
|
|
|
2765
2767
|
without `--replacement`; `--message` is then required and should say what
|
|
2766
2768
|
users do instead, and the plan shows `replacement: none` (`--json`:
|
|
2767
2769
|
`"replacement": null`). Interactive mode accepts an empty replacement and then
|
|
2768
|
-
asks for the message. Deprecation applies to every version
|
|
2770
|
+
asks for the message. Deprecation applies to every version, prereleases
|
|
2771
|
+
included: GitZone passes `pnpm deprecate` the bare package name, never a range
|
|
2772
|
+
such as `*`, which would skip prereleases. GitZone verifies
|
|
2769
2773
|
that the old package exists on all registries, and that the replacement, when
|
|
2770
2774
|
named, has an active latest version there, before issuing any change, invokes
|
|
2771
2775
|
`pnpm deprecate` with literal arguments, and verifies the old versions' metadata
|
|
@@ -2781,7 +2785,7 @@ deprecations are not submitted again. `--json` prints the plan without changing
|
|
|
2781
2785
|
## Developing GitZone
|
|
2782
2786
|
|
|
2783
2787
|
From this repository, `cli.ts.js` runs the TypeScript sources through the
|
|
2784
|
-
project's `@git.zone/
|
|
2788
|
+
project's `@git.zone/tsrepo/run`. `cli.js` runs the built `dist_ts` output. Child
|
|
2785
2789
|
GitZone processes retain the same entry point as their parent.
|
|
2786
2790
|
|
|
2787
2791
|
After committing and verifying a CLI correction on clean, integrated `main`,
|
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
|
+
version: '11.0.1',
|
|
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
|
}
|
|
@@ -80,7 +80,7 @@ export const getPackageFileSets = (
|
|
|
80
80
|
binary.push(assets.npmWrapper.postinstallFile || "scripts/install-binary.js");
|
|
81
81
|
}
|
|
82
82
|
return {
|
|
83
|
-
//
|
|
83
|
+
// `tsrepo build` reads a folder's compiler options from <folder>/tsconfig.json,
|
|
84
84
|
// which extends the root tsconfig.json. The package does not ship the root file,
|
|
85
85
|
// so a shipped folder file would extend a file that is not there.
|
|
86
86
|
source: {
|
package/ts/helpers.tssea.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type { ITsseaOutputs, resolveOutputs } from '@git.zone/
|
|
1
|
+
import type { ITsseaOutputs, resolveOutputs } from '@git.zone/tsrepo/sea/config';
|
|
2
2
|
import * as plugins from './plugins.js';
|
|
3
3
|
import { isPlainObject } from './helpers.objects.js';
|
|
4
4
|
import { readTsrepoToolSection, tsrepoNamespace } from './helpers.toolconfig.js';
|
|
5
5
|
|
|
6
|
-
export type { ITsseaOutput, ITsseaOutputs } from '@git.zone/
|
|
6
|
+
export type { ITsseaOutput, ITsseaOutputs } from '@git.zone/tsrepo/sea/config';
|
|
7
7
|
|
|
8
8
|
/** The tssea package whose `./config` export resolves a project's executables. */
|
|
9
9
|
export const tsseaPackageName = '@git.zone/tssea';
|
|
@@ -17,7 +17,7 @@ export const supportedTsseaRange = '^1.1.0';
|
|
|
17
17
|
*/
|
|
18
18
|
export const supportedTsrepoRange = '^1.0.0';
|
|
19
19
|
|
|
20
|
-
/** The `./config` module of the project's tssea; loaded at run time from the project, typed from the CLI's
|
|
20
|
+
/** The `./config` module of the project's tssea; loaded at run time from the project, typed from the CLI's own tsrepo. */
|
|
21
21
|
interface ITsseaConfigModule {
|
|
22
22
|
resolveOutputs: typeof resolveOutputs;
|
|
23
23
|
}
|
|
@@ -106,7 +106,7 @@ export const resolveProjectTsseaOutputs = async (
|
|
|
106
106
|
: undefined;
|
|
107
107
|
if (!provider) {
|
|
108
108
|
throw new Error(
|
|
109
|
-
`binaryCli builds with ${
|
|
109
|
+
`binaryCli builds with ${tsrepoNamespace} (or the deprecated ${tsseaPackageName}); \`pnpm install --save-dev ${tsrepoNamespace}\`, then rerun.`,
|
|
110
110
|
);
|
|
111
111
|
}
|
|
112
112
|
const { packageName, range } = provider;
|
|
@@ -4,6 +4,6 @@ import * as smartfile from "@push.rocks/smartfile";
|
|
|
4
4
|
import * as smartshell from "@push.rocks/smartshell";
|
|
5
5
|
|
|
6
6
|
// Manual commits must not load or initialize the AI dependency chain.
|
|
7
|
-
export const loadTsdoc = () => import("@git.zone/
|
|
7
|
+
export const loadTsdoc = () => import("@git.zone/tsrepo/docs");
|
|
8
8
|
|
|
9
9
|
export { smartfile, smartshell };
|
|
@@ -193,11 +193,13 @@ export const executeDeprecation = async (
|
|
|
193
193
|
continue;
|
|
194
194
|
}
|
|
195
195
|
logger.log("info", `Deprecating ${plan.packageName} on ${registry}.`);
|
|
196
|
+
// A bare package name selects every version in one metadata write; a range
|
|
197
|
+
// such as `*` would skip prereleases like `1.0.0-beta.0`.
|
|
196
198
|
const result = await shell.execSpawn(
|
|
197
199
|
"pnpm",
|
|
198
200
|
[
|
|
199
201
|
"deprecate",
|
|
200
|
-
|
|
202
|
+
plan.packageName,
|
|
201
203
|
plan.message,
|
|
202
204
|
"--registry",
|
|
203
205
|
registry,
|
|
@@ -434,7 +434,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
434
434
|
enabled: releaseWorkflow.enabled !== false,
|
|
435
435
|
file: releaseWorkflow.file || '.gitea/workflows/release.yml',
|
|
436
436
|
installCommand: releaseWorkflow.installCommand || 'pnpm install --frozen-lockfile --ignore-scripts',
|
|
437
|
-
compileCommand: releaseWorkflow.compileCommand || 'pnpm exec
|
|
437
|
+
compileCommand: releaseWorkflow.compileCommand || 'pnpm exec tsrepo bundle && pnpm exec tsrepo sea build',
|
|
438
438
|
packNpmArtifact: releaseWorkflow.packNpmArtifact === true,
|
|
439
439
|
includeInstallerAsset,
|
|
440
440
|
releaseFileNames,
|