@git.zone/cli 9.0.1 → 9.1.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/assets/templates/asset_binary_installer/install.sh +236 -25
- package/assets/templates/asset_binary_postinstall/bin/wrapper.js +64 -15
- package/assets/templates/asset_binary_postinstall/scripts/install-binary.js +68 -30
- package/assets/templates/asset_binary_release_gitea/.gitea/workflows/release.yml +24 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/helpers.managedassets.d.ts +35 -0
- package/dist_ts/helpers.managedassets.js +105 -3
- package/dist_ts/mod_config/index.js +27 -2
- package/dist_ts/mod_format/formatters/assets.formatter.js +23 -8
- package/package.json +2 -2
- package/readme.md +10 -5
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/helpers.managedassets.ts +149 -2
- package/ts/mod_config/index.ts +25 -0
- package/ts/mod_format/formatters/assets.formatter.ts +26 -4
|
@@ -5,7 +5,7 @@ import { ScafTemplate } from '../../mod_template/classes.scaftemplate.js';
|
|
|
5
5
|
import { logger, logVerbose } from '../../gitzone.logging.js';
|
|
6
6
|
import { getCliConfigValue, readSmartconfigFile } from '../../helpers.smartconfig.js';
|
|
7
7
|
import { getSealedReleaseConfigError } from '../../helpers.sealedrelease.js';
|
|
8
|
-
import { assertManagedAssetsCurrent, managedAssetKinds, readBinaryBuild, } from '../../helpers.managedassets.js';
|
|
8
|
+
import { assertManagedAssetsCurrent, managedAssetKinds, readBinaryBuild, readBinaryExtras, } from '../../helpers.managedassets.js';
|
|
9
9
|
const isPlainObject = (value) => {
|
|
10
10
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
11
11
|
};
|
|
@@ -247,9 +247,20 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
247
247
|
: { outDir: '', targets: [] };
|
|
248
248
|
const binaryTargets = binaryBuild.targets;
|
|
249
249
|
const binaryConfig = isPlainObject(assetsConfig.binary) ? assetsConfig.binary : {};
|
|
250
|
-
const
|
|
250
|
+
const installFileName = binaryConfig.installFileName || cliName;
|
|
251
|
+
const installerAssetName = plugins.path.basename((isPlainObject(assetsConfig.installer) && assetsConfig.installer.file) || 'install.sh');
|
|
252
|
+
const extras = assetsConfig.kind === 'binaryCli'
|
|
253
|
+
? await readBinaryExtras(assetsConfig, {
|
|
254
|
+
projectDir: paths.cwd,
|
|
255
|
+
binaryBuild,
|
|
256
|
+
installerAssetName,
|
|
257
|
+
installFileName,
|
|
258
|
+
packNpmArtifact: isPlainObject(assetsConfig.releaseWorkflow) && assetsConfig.releaseWorkflow.packNpmArtifact === true,
|
|
259
|
+
})
|
|
260
|
+
: { assets: [], installed: [] };
|
|
261
|
+
const installerConfig = this.normalizeInstallerConfig(assetsConfig, cliName, repository, extras);
|
|
251
262
|
const npmWrapperConfig = this.normalizeNpmWrapperConfig(assetsConfig, cliName);
|
|
252
|
-
const releaseWorkflowConfig = this.normalizeReleaseWorkflowConfig(assetsConfig, binaryBuild, installerConfig);
|
|
263
|
+
const releaseWorkflowConfig = this.normalizeReleaseWorkflowConfig(assetsConfig, binaryBuild, installerConfig, extras);
|
|
253
264
|
return {
|
|
254
265
|
module: moduleConfig,
|
|
255
266
|
projectType: this.project.gitzoneConfig?.data?.projectType,
|
|
@@ -264,7 +275,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
264
275
|
binary: {
|
|
265
276
|
...binaryConfig,
|
|
266
277
|
outDir: binaryBuild.outDir,
|
|
267
|
-
installFileName
|
|
278
|
+
installFileName,
|
|
268
279
|
targets: binaryTargets,
|
|
269
280
|
supportedPlatformText: binaryTargets.map((target) => target.label).join(', '),
|
|
270
281
|
hasTargets: binaryTargets.length > 0,
|
|
@@ -274,7 +285,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
274
285
|
releaseWorkflow: releaseWorkflowConfig,
|
|
275
286
|
};
|
|
276
287
|
}
|
|
277
|
-
normalizeInstallerConfig(assetsConfig, cliName, repository) {
|
|
288
|
+
normalizeInstallerConfig(assetsConfig, cliName, repository, extrasArg) {
|
|
278
289
|
const installer = isPlainObject(assetsConfig.installer) ? assetsConfig.installer : {};
|
|
279
290
|
const modes = isPlainObject(installer.modes) ? installer.modes : {};
|
|
280
291
|
const source = isPlainObject(modes.source) ? modes.source : {};
|
|
@@ -325,6 +336,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
325
336
|
primaryPreservePath: preservePaths[0],
|
|
326
337
|
hasPreservePaths: preservePaths.length > 0,
|
|
327
338
|
successHints,
|
|
339
|
+
extraFiles: extrasArg.installed,
|
|
328
340
|
};
|
|
329
341
|
}
|
|
330
342
|
normalizeNpmWrapperConfig(assetsConfig, cliName) {
|
|
@@ -337,7 +349,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
337
349
|
binariesDir: npmWrapper.binariesDir || 'dist/binaries',
|
|
338
350
|
};
|
|
339
351
|
}
|
|
340
|
-
normalizeReleaseWorkflowConfig(assetsConfig, binaryBuild, installerConfig) {
|
|
352
|
+
normalizeReleaseWorkflowConfig(assetsConfig, binaryBuild, installerConfig, extrasArg) {
|
|
341
353
|
const releaseWorkflow = isPlainObject(assetsConfig.releaseWorkflow) ? assetsConfig.releaseWorkflow : {};
|
|
342
354
|
const includeInstallerAsset = typeof releaseWorkflow.includeInstallerAsset === 'boolean'
|
|
343
355
|
? releaseWorkflow.includeInstallerAsset
|
|
@@ -348,18 +360,21 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
348
360
|
if (includeInstallerAsset) {
|
|
349
361
|
releaseFileNames.push(installerConfig.releaseAssetName);
|
|
350
362
|
}
|
|
363
|
+
releaseFileNames.push(...extrasArg.assets.map((assetArg) => assetArg.name));
|
|
351
364
|
return {
|
|
352
365
|
...releaseWorkflow,
|
|
353
366
|
enabled: releaseWorkflow.enabled !== false,
|
|
354
367
|
file: releaseWorkflow.file || '.gitea/workflows/release.yml',
|
|
355
|
-
installCommand: releaseWorkflow.installCommand || 'pnpm install --ignore-scripts',
|
|
368
|
+
installCommand: releaseWorkflow.installCommand || 'pnpm install --frozen-lockfile --ignore-scripts',
|
|
356
369
|
compileCommand: releaseWorkflow.compileCommand || 'pnpm exec tsbundle && pnpm exec tssea build',
|
|
357
370
|
packNpmArtifact: releaseWorkflow.packNpmArtifact === true,
|
|
358
371
|
includeInstallerAsset,
|
|
359
372
|
releaseFileNames,
|
|
373
|
+
extraAssets: extrasArg.assets,
|
|
374
|
+
hasExtraAssets: extrasArg.assets.length > 0,
|
|
360
375
|
keepReleases: releaseWorkflow.keepReleases ?? 0,
|
|
361
376
|
binaryOutDir: binaryBuild.outDir,
|
|
362
377
|
};
|
|
363
378
|
}
|
|
364
379
|
}
|
|
365
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/assets.formatter.ts"],"names":[],"mappings":"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"}
|
|
380
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.formatter.js","sourceRoot":"","sources":["../../../../ts/mod_format/formatters/assets.formatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,gBAAgB,GAGjB,MAAM,gCAAgC,CAAC;AAexC,MAAM,aAAa,GAAG,CAAC,KAAc,EAAgC,EAAE;IACrE,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,KAAK,EAAE,QAAgB,EAAgC,EAAE;IAC5E,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACrD,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAW,CAAC;IACzF,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAE,QAAQ,GAAa,EAAE,EAAY,EAAE;IAC9E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7C,SAAS;QACX,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,YAAiC,EAAE,YAAiC,EAAE,EAAE;IACnG,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IACzF,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,YAAY,CAAC,OAAO,IAAI,kBAAkB,CAAC;IAC3E,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxG,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,IAAI,MAAM,CAAC;IAC3C,MAAM,OAAO,GAAG,WAAW,IAAI,IAAI,IAAI,EAAE,CAAC;IAC1C,OAAO;QACL,IAAI;QACJ,IAAI;QACJ,MAAM;QACN,OAAO;QACP,UAAU,EAAE,WAAW,IAAI,iBAAiB,IAAI,EAAE;QAClD,MAAM,EAAE,GAAG,OAAO,MAAM;KACzB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,YAAiC,EAAE,OAAe,EAAyB,EAAE;IACxG,IAAI,YAAY,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAC1C,OAAO,CAAC;gBACN,QAAQ,EAAE,4BAA4B;gBACtC,KAAK,EAAE;oBACL,EAAE,IAAI,EAAE,8BAA8B,EAAE,EAAE,EAAE,8BAA8B,EAAE;oBAC5E,EAAE,IAAI,EAAE,oCAAoC,EAAE,EAAE,EAAE,oCAAoC,EAAE;oBACxF,EAAE,IAAI,EAAE,iCAAiC,EAAE,EAAE,EAAE,iCAAiC,EAAE;oBAClF,EAAE,IAAI,EAAE,+BAA+B,EAAE,EAAE,EAAE,+BAA+B,EAAE;iBAC/E;aACF,CAAC,CAAC;IACL,CAAC;IACD,IAAI,YAAY,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAA0B,EAAE,CAAC;IAC1C,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5F,MAAM,gBAAgB,GAAG,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/F,MAAM,qBAAqB,GAAG,aAAa,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9G,IAAI,eAAe,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC;YACX,QAAQ,EAAE,wBAAwB;YAClC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,eAAe,CAAC,IAAI,IAAI,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SACxF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,gBAAgB,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC;YACX,QAAQ,EAAE,0BAA0B;YACpC,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,2BAA2B;oBACjC,EAAE,EAAE,gBAAgB,CAAC,eAAe,IAAI,2BAA2B;oBACnE,IAAI,EAAE,MAAM;iBACb;gBACD;oBACE,IAAI,EAAE,gBAAgB;oBACtB,EAAE,EAAE,gBAAgB,CAAC,OAAO,IAAI,OAAO,OAAO,aAAa;oBAC3D,IAAI,EAAE,MAAM;iBACb;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,qBAAqB,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC;YACX,QAAQ,EAAE,4BAA4B;YACtC,KAAK,EAAE;gBACL,EAAE,IAAI,EAAE,8BAA8B,EAAE,EAAE,EAAE,qBAAqB,CAAC,IAAI,IAAI,8BAA8B,EAAE;gBAC1G,EAAE,IAAI,EAAE,oCAAoC,EAAE,EAAE,EAAE,oCAAoC,EAAE;aACzF;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,OAAO,eAAgB,SAAQ,aAAa;IAChD,IAAI,IAAI;QACN,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAkC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACnG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YACnE,UAAU,CAAC,gDAAgD,CAAC,CAAC;YAC7D,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,0BAA0B,CAAC,YAAY,CAAC,CAAC;QAEzC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAqB,EAAE,CAAC;QAErC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;gBAC5B,SAAS;YACX,CAAC;YACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE;gBAC9D,GAAG,UAAU;gBACb,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC;aAC3B,CAAC,CAAC;YAEH,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;gBACrC,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC3E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC1B,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,wBAAwB,CAAC,CAAC;gBACxF,CAAC;gBAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;gBAChE,MAAM,cAAc,GAAG,UAAU;oBAC/B,CAAC,CAAE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAY;oBAC3E,CAAC,CAAC,EAAE,CAAC;gBACP,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzD,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACjF,MAAM,kBAAkB,GAAG,OAAO,KAAK,cAAc,CAAC;gBACtD,MAAM,eAAe,GAAG,cAAc,KAAK,SAAS,IAAI,WAAW,KAAK,cAAc,CAAC;gBAEvF,IAAI,kBAAkB,IAAI,eAAe,EAAE,CAAC;oBAC1C,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;wBACtC,IAAI,EAAE,IAAI,CAAC,EAAE;wBACb,MAAM,EAAE,IAAI,CAAC,IAAI;wBACjB,WAAW,EAAE,uBAAuB,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE;wBACjE,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;wBACjD,IAAI,EAAE,cAAc;qBACrB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAkC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACnG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YACnE,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,IAAI,YAAY,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAC1C,MAAM,KAAK,GAAG,2BAA2B,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YACtE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9E,CAAC;QACD,IAAI,YAAY,CAAC,IAAI,KAAK,SAAS,IAAI,CAAE,iBAAwC,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9G,OAAO;gBACL;oBACE,KAAK,EAAE,OAAO;oBACd,MAAM,EAAE,IAAI,CAAC,IAAI;oBACjB,OAAO,EAAE,mCAAmC,YAAY,CAAC,IAAI,SAAS,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;iBACxG;aACF,CAAC;QACJ,CAAC;QACD,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QACxG,MAAM,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;QAClD,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,YAAY,IAAI,CAAC,CAAC,EAAE,CAAC;YAC7F,OAAO;gBACL;oBACE,KAAK,EAAE,OAAO;oBACd,MAAM,EAAE,IAAI,CAAC,IAAI;oBACjB,OAAO,EAAE,4FAA4F,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;iBACpI;aACF,CAAC;QACJ,CAAC;QACD,MAAM,SAAS,GAAG,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,IAAI,SAAS,CAAC,YAAY,IAAI,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9F,OAAO;gBACL;oBACE,KAAK,EAAE,OAAO;oBACd,MAAM,EAAE,IAAI,CAAC,IAAI;oBACjB,OAAO,EAAE,uCAAuC,SAAS,CAAC,YAAY,EAAE;iBACzE;aACF,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAsB;QACtC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpC,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBACjC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAClE,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBACvB,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAEO,kBAAkB,CAAC,YAAiC,EAAE,OAAe;QAC3E,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YACxC,OAAO,YAAY,CAAC,OAAO;iBACxB,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC;iBAC7E,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACf,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBACvE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;oBAC/B,CAAC,CAAC,KAAK,CAAC,KAAK;yBACR,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC;yBACrG,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBACvE,CAAC,CAAC,EAAE;aACP,CAAC,CAAC,CAAC;QACR,CAAC;QACD,OAAO,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,YAAoB,EAAE,SAA8B;QAC/E,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACxE,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,KAAK,CAAC,0CAA0C,YAAY,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,YAAY,CAAC,mBAAmB,EAAE,CAAC;QACzC,MAAM,YAAY,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE9C,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;QAC1D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC1C,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,YAAiC;QAC7D,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;QACrF,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC;QACpE,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,YAAY,CAAC,OAAO,IAAI,KAAK,CAAC;QAC5G,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,mBAAmB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACnE,MAAM,cAAc,GAAI,YAAoB,CAAC,cAAc,IAAI,YAAY,CAAC,cAAc,CAAC;QAC3F,MAAM,WAAW,GACf,YAAY,CAAC,IAAI,KAAK,WAAW;YAC/B,CAAC,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAClC,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC;QAC1C,MAAM,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,MAAM,eAAe,GAAG,YAAY,CAAC,eAAe,IAAI,OAAO,CAAC;QAChE,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAC9C,CAAC,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,YAAY,CACvF,CAAC;QACF,MAAM,MAAM,GACV,YAAY,CAAC,IAAI,KAAK,WAAW;YAC/B,CAAC,CAAC,MAAM,gBAAgB,CAAC,YAAY,EAAE;gBACnC,UAAU,EAAE,KAAK,CAAC,GAAG;gBACrB,WAAW;gBACX,kBAAkB;gBAClB,eAAe;gBACf,eAAe,EAAE,aAAa,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,YAAY,CAAC,eAAe,CAAC,eAAe,KAAK,IAAI;aACtH,CAAC;YACJ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,IAAI,CAAC,wBAAwB,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QACjG,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/E,MAAM,qBAAqB,GAAG,IAAI,CAAC,8BAA8B,CAAC,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;QAEtH,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW;YAC1D,WAAW;YACX,MAAM,EAAE,YAAY;YACpB,OAAO;YACP,YAAY,EAAE,OAAO,CAAC,WAAW,EAAE;YACnC,WAAW;YACX,WAAW,EAAE,YAAY,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,IAAI,cAAc,IAAI,OAAO;YACtF,eAAe,EAAE,WAAW,CAAC,OAAO,IAAI,OAAO;YAC/C,UAAU;YACV,MAAM,EAAE;gBACN,GAAG,YAAY;gBACf,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,eAAe;gBACf,OAAO,EAAE,aAAa;gBACtB,qBAAqB,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC7E,UAAU,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC;aACrC;YACD,SAAS,EAAE,eAAe;YAC1B,UAAU,EAAE,gBAAgB;YAC5B,eAAe,EAAE,qBAAqB;SACvC,CAAC;IACJ,CAAC;IAEO,wBAAwB,CAC9B,YAAiC,EACjC,OAAe,EACf,UAA+B,EAC/B,SAAwB;QAExB,MAAM,SAAS,GAAG,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,MAAM,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,IAAI,YAAY,CAAC;QAC5C,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,IAAI,WAAW,CAAC;QAC3D,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QAC9F,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACtG,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,iBAAiB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,iBAAiB,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,GAAG,OAAO,YAAY,EAAE,GAAG,OAAO,SAAS,CAAC,CAAC,CAAC;QAC9G,MAAM,mBAAmB,GAAG,GAAG,UAAU,CAAC,OAAO,eAAe,UAAU,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QAC5F,MAAM,sBAAsB,GAAG,GAAG,UAAU,CAAC,OAAO,gCAAgC,gBAAgB,EAAE,CAAC;QACvG,MAAM,sBAAsB,GAAG,GAAG,UAAU,CAAC,OAAO,+BAA+B,gBAAgB,EAAE,CAAC;QAEtG,OAAO;YACL,GAAG,SAAS;YACZ,OAAO,EAAE,SAAS,CAAC,OAAO,KAAK,KAAK;YACpC,IAAI;YACJ,YAAY;YACZ,gBAAgB;YAChB,gBAAgB,EAAE,YAAY,KAAK,cAAc,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB;YAChG,sBAAsB,EAAE,YAAY,KAAK,cAAc,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB;YACtG,UAAU,EAAE,SAAS,CAAC,UAAU,IAAI,QAAQ,OAAO,EAAE;YACrD,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,gBAAgB;YAC5C,WAAW,EAAE,KAAK,CAAC,OAAO,IAAI,QAAQ;YACtC,gBAAgB;YAChB,aAAa,EAAE,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC;YACjD,MAAM,EAAE;gBACN,GAAG,MAAM;gBACT,OAAO,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI;gBAChC,QAAQ,EAAE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC5C,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,QAAQ;gBACzC,eAAe,EAAE,iBAAiB,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAChH,eAAe,EAAE,MAAM,CAAC,QAAQ,IAAI,QAAQ,MAAM,CAAC,UAAU,IAAI,QAAQ,YAAY;aACtF;YACD,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,WAAW;gBACX,iBAAiB;gBACjB,oBAAoB,EAAE,iBAAiB,CAAC,MAAM,GAAG,CAAC;gBAClD,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,OAAO;gBAC7D,iBAAiB,EAAE,OAAO,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;aAC1G;YACD,UAAU;YACV,aAAa;YACb,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAC;YACrC,gBAAgB,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC;YAC1C,YAAY;YACZ,UAAU,EAAE,SAAS,CAAC,SAAS;SAChC,CAAC;IACJ,CAAC;IAEO,yBAAyB,CAAC,YAAiC,EAAE,OAAe;QAClF,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,OAAO;YACL,GAAG,UAAU;YACb,OAAO,EAAE,UAAU,CAAC,OAAO,KAAK,IAAI;YACpC,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,OAAO,OAAO,aAAa;YAC1D,eAAe,EAAE,UAAU,CAAC,eAAe,IAAI,2BAA2B;YAC1E,WAAW,EAAE,UAAU,CAAC,WAAW,IAAI,eAAe;SACvD,CAAC;IACJ,CAAC;IAEO,8BAA8B,CACpC,YAAiC,EACjC,WAAyB,EACzB,eAAoC,EACpC,SAAwB;QAExB,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QACxG,MAAM,qBAAqB,GACzB,OAAO,eAAe,CAAC,qBAAqB,KAAK,SAAS;YACxD,CAAC,CAAC,eAAe,CAAC,qBAAqB;YACvC,CAAC,CAAC,eAAe,CAAC,OAAO,KAAK,KAAK,IAAI,eAAe,CAAC,YAAY,KAAK,cAAc,CAAC;QAC3F,4EAA4E;QAC5E,2EAA2E;QAC3E,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;QACvG,IAAI,qBAAqB,EAAE,CAAC;YAC1B,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAC1D,CAAC;QACD,gBAAgB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5E,OAAO;YACL,GAAG,eAAe;YAClB,OAAO,EAAE,eAAe,CAAC,OAAO,KAAK,KAAK;YAC1C,IAAI,EAAE,eAAe,CAAC,IAAI,IAAI,8BAA8B;YAC5D,cAAc,EAAE,eAAe,CAAC,cAAc,IAAI,iDAAiD;YACnG,cAAc,EAAE,eAAe,CAAC,cAAc,IAAI,6CAA6C;YAC/F,eAAe,EAAE,eAAe,CAAC,eAAe,KAAK,IAAI;YACzD,qBAAqB;YACrB,gBAAgB;YAChB,WAAW,EAAE,SAAS,CAAC,MAAM;YAC7B,cAAc,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;YAC3C,YAAY,EAAE,eAAe,CAAC,YAAY,IAAI,CAAC;YAC/C,YAAY,EAAE,WAAW,CAAC,MAAM;SACjC,CAAC;IACJ,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/cli",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "9.0
|
|
4
|
+
"version": "9.1.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",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"@git.zone/tsbuild": "^6.0.2",
|
|
44
44
|
"@git.zone/tspack": "^1.4.2",
|
|
45
45
|
"@git.zone/tsrun": "^3.0.3",
|
|
46
|
-
"@git.zone/tssea": "^1.1
|
|
46
|
+
"@git.zone/tssea": "^1.2.1",
|
|
47
47
|
"@git.zone/tstest": "^8.0.0",
|
|
48
48
|
"@types/node": "^26.6.4"
|
|
49
49
|
},
|
package/readme.md
CHANGED
|
@@ -1708,10 +1708,11 @@ Projects can opt into generated, updateable repository assets through `@git.zone
|
|
|
1708
1708
|
The executables come from the project's `@git.zone/tssea` configuration; GitZone keeps no target list of its own. It reads that configuration through `@git.zone/tssea/config` from the project's own install, so the project's tssea version interprets its own configuration and GitZone has no runtime dependency on tssea. The project must declare `@git.zone/tssea` ^1.1.0 in `dependencies` or `devDependencies` and have it installed (`pnpm install --save-dev @git.zone/tssea`, then `pnpm install`); `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.
|
|
1709
1709
|
|
|
1710
1710
|
- **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`, `macos` or `windows` and `x64` or `arm64`; the npm wrapper maps `process.platform:process.arch`; both download `releases/download/<version>/<name>`.
|
|
1711
|
-
- **Release workflow:** `releaseWorkflow.installCommand` (default `pnpm install --ignore-scripts`) installs the dependencies and `releaseWorkflow.compileCommand` (default `pnpm exec tsbundle && pnpm exec tssea build`, tssea's documented build) builds; set either when the project needs another command. The workflow sets up Node.js, installs dependencies, checks that the `package.json` version equals the tag, builds, and then checksums and uploads exactly the configured executables, the notice files tssea writes next to each, the staged installer (with `installer.distribution: "releaseAsset"`) 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. With `packNpmArtifact` it also packs and uploads the npm tarball.
|
|
1711
|
+
- **Release workflow:** `releaseWorkflow.installCommand` (default `pnpm install --frozen-lockfile --ignore-scripts`) installs the dependencies and `releaseWorkflow.compileCommand` (default `pnpm exec tsbundle && pnpm exec tssea build`, tssea's documented build) builds; set either when the project needs another command. The workflow sets up Node.js, installs dependencies, checks that the `package.json` version equals the tag, builds, and then checksums and uploads exactly the configured executables, the notice files tssea writes next to each, the staged installer (with `installer.distribution: "releaseAsset"`), 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. With `packNpmArtifact` it also packs and uploads the npm tarball.
|
|
1712
|
+
- **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 installer's name, `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.
|
|
1712
1713
|
- **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.
|
|
1713
1714
|
- **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.
|
|
1714
|
-
- **npm postinstall:** with `npmWrapper.enabled`, the postinstall downloads `releases/download/v<version>/<name>` for the running platform, where `<version>` is the `version` in the package's own `package.json`. It runs only when the package is installed as a dependency, that is when its directory lies inside a `node_modules` directory (npm, pnpm, Yarn and Bun install every package, local or global, there). In the project's own checkout, for development or a release build, it skips the download, because that version is not released yet and the project builds its binaries itself. The release asset is the only source, and it is verified like the installer does: the postinstall reads the release's `SHA256SUMS.txt`, downloads next to the target, and moves
|
|
1715
|
+
- **npm postinstall:** with `npmWrapper.enabled`, the postinstall downloads `releases/download/v<version>/<name>` for the running platform, where `<version>` is the `version` in the package's own `package.json`. It runs only when the package is installed as a dependency, that is when its directory lies inside a `node_modules` directory (npm, pnpm, Yarn and Bun install every package, local or global, there). In the project's own checkout, for development or a release build, it skips the download, because that version is not released yet and the project builds its binaries itself. The release asset is the only source, and it is verified like the installer does: the postinstall reads the release's `SHA256SUMS.txt`, downloads the binary and its notice files next to the target, and moves them into place under their release asset names only when every SHA-256 matches; a mismatch, a missing entry, a missing file or missing checksums fail and install nothing. An existing binary is not downloaded again, but missing notice files are. It follows 301, 302, 303, 307 and 308 redirects (relative locations included) up to 10 hops and only to HTTPS, and gives up after 30 s without data or 15 minutes per file. Every failure stops the install with the URL, the version and the cause. The wrapper in `bin/` runs the binary as a child process and, on Linux and macOS, forwards SIGTERM and SIGHUP to it while it runs. SIGINT is forwarded only when the wrapper has no controlling terminal (opening `/dev/tty` fails with `ENXIO`: under `setsid`, `docker run` without `-t`, or a `detached: true` spawn). With a terminal, a Ctrl+C reaches the binary directly through the process group, so the wrapper ignores SIGINT until the binary ends; a parent's `child.kill('SIGINT')` on the wrapper is then ignored as well, because Node does not name the sender: send SIGTERM, or spawn the wrapper with `detached: true`. The wrapper passes on the binary's exit status, and when a signal ended the binary it ends with the same signal (or 128 + its number if Node ignores it). The wrapper is the entry point for `pnpm add -g` and `npx`; under systemd or another supervisor, point the service at the installed native binary instead. A wrapper run as a systemd main process should use `KillMode=mixed`: with the default `control-group`, systemd sends SIGTERM to the binary as well and the wrapper forwards another. For the same reason, signal the wrapper's pid, not its process group: without a terminal, a group-wide SIGINT (`tini -g`, `KillSignal=SIGINT`, `kill -INT -<pgid>`) also reaches the binary twice.
|
|
1715
1716
|
|
|
1716
1717
|
`@git.zone/cli.schemaVersion` remains the CLI config schema. `@git.zone/cli.assets.schemaVersion` is scoped to the managed asset model.
|
|
1717
1718
|
|
|
@@ -1731,11 +1732,15 @@ Set `installer.service.removeLegacyUnits` to a list of systemd unit names when a
|
|
|
1731
1732
|
|
|
1732
1733
|
`installer.versionSelection` lists the ways a user picks the version (default `["latest", "version"]`): with neither flag the installer takes the newest Gitea release, `--version vX.Y.Z` a given tag, and adding `"major"` enables `--major N`, the newest release of that major.
|
|
1733
1734
|
|
|
1735
|
+
A version is a SemVer 2.0 version with an optional `v` (`v1.2.3`, `1.2.3`, `v1.2.3-beta.1`, `1.2.3+build.5`); the installer adds the `v` of the release tag, so `--version 1.2.3` installs `v1.2.3`. `--version latest` is the same as no `--version`. The tag the releases API names for the newest release, or for `--major N`, must have the same form. Anything else fails before the installer builds a download URL. Every download uses `curl` with HTTPS only (also on redirects), at most 10 redirects, and the postinstall's limits: 30 s to connect or without data, 15 minutes per transfer. The npm postinstall likewise refuses a `package.json` version that is not SemVer.
|
|
1736
|
+
|
|
1737
|
+
`install.sh --dry-run` resolves and checks the version like an installation, then checks the release without root and without touching the system: it downloads `SHA256SUMS.txt`, checks that it lists every file the installation downloads (the platform's executable, its notice files and the `installer.extraFiles`), and requests the first byte of each, printing `<HTTP status> <URL>` per file. It exits 0 when every file answers 200 or 206 and has its checksum entry, and 1 otherwise. In source mode it prints the clone URL and tag.
|
|
1738
|
+
|
|
1734
1739
|
The installer installs and updates in this order, and an update that fails leaves the previous installation running:
|
|
1735
1740
|
|
|
1736
|
-
1. **Verify before touching anything.** In binary mode it downloads the platform's asset and `SHA256SUMS.txt` of the same release, refuses a digest
|
|
1741
|
+
1. **Verify before touching anything.** In binary mode it downloads the platform's asset, the third-party notice files tssea wrote for it (`<name>.third-party-notices.txt` and `.json`, the target's `noticeFiles`) and `SHA256SUMS.txt` of the same release, refuses a file the release lacks or whose digest differs or is missing (with `sha256sum` or `shasum`; neither present is an error), and runs the new binary with `--version`. In source mode (`installer.modes.source`) it clones the tag and runs `commands` and `validate`. Any failure here exits non-zero with the running installation and service untouched.
|
|
1737
1742
|
2. **Stop and move aside.** It stops the running `installer.service.detectNames` units and moves `installDir` to `installDir.previous.<pid>`; it never overwrites the old installation in place. Data under `installer.preservePaths` lives outside `installDir` and is not touched.
|
|
1738
|
-
3. **Install and check.** It installs the binary (or the source build, where every `executableFiles` entry must exist) into `installDir`, links it into `binDir`, creates `ensureDirs`, and runs the installed CLI with `--version`.
|
|
1743
|
+
3. **Install and check.** It installs the binary with its notice files and `installer.extraFiles`, which keep their release asset names (or the source build, where every `executableFiles` entry must exist), into `installDir`, links it into `binDir`, creates `ensureDirs`, and runs the installed CLI with `--version`.
|
|
1739
1744
|
4. **Restart.** If a service was running, it runs `installer.service.refreshCommand` (when set) and restarts `installer.service.restartName`.
|
|
1740
1745
|
5. **Clean up.** Only after the restart succeeded it deletes the moved-aside installation.
|
|
1741
1746
|
|
|
@@ -1750,7 +1755,7 @@ GitZone 9 refuses the removed keys with an error that names the replacement:
|
|
|
1750
1755
|
| `kind: "denoBinaryCli"` | `kind: "binaryCli"` |
|
|
1751
1756
|
| `@git.zone/tsdeno.compileTargets` | `@git.zone/tssea.targets` (see "Migrating from tsdeno" in the tssea readme); keep each `name`, and write the `.exe` of a Windows name |
|
|
1752
1757
|
| `binary.targets`, `binary.outDir` | `@git.zone/tssea.targets`, `@git.zone/tssea.outDir` |
|
|
1753
|
-
| `releaseWorkflow.assetGlobs`, `releaseWorkflow.include` |
|
|
1758
|
+
| `releaseWorkflow.assetGlobs`, `releaseWorkflow.include` | `releaseWorkflow.extraAssets` for further repository files (exact paths, no globs); the executables and their notice files are always released |
|
|
1754
1759
|
| `releaseAssets` | `releaseWorkflow` |
|
|
1755
1760
|
| `rawBranch`, `repository.rawBranch` | `repository.branch` |
|
|
1756
1761
|
| `installer.delivery` | `installer.distribution` |
|
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: '9.0
|
|
6
|
+
version: '9.1.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
|
}
|
|
@@ -109,6 +109,153 @@ export const readBinaryBuild = async (
|
|
|
109
109
|
};
|
|
110
110
|
};
|
|
111
111
|
|
|
112
|
+
/** A repository file a `binaryCli` release publishes besides the executables (`releaseWorkflow.extraAssets`). */
|
|
113
|
+
export interface IBinaryExtraAsset {
|
|
114
|
+
/** The path inside the repository, `/`-separated. */
|
|
115
|
+
path: string;
|
|
116
|
+
/** The release asset name: the path's last segment. */
|
|
117
|
+
name: string;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/** An extra release asset the installer puts beside the executable (`installer.extraFiles`). */
|
|
121
|
+
export interface IBinaryExtraFile extends IBinaryExtraAsset {
|
|
122
|
+
/** The file's mode in the Git index: `0755` for an executable (100755), `0644` otherwise. */
|
|
123
|
+
mode: '0755' | '0644';
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
export interface IBinaryExtras {
|
|
127
|
+
/** Every extra release asset, in configuration order. */
|
|
128
|
+
assets: IBinaryExtraAsset[];
|
|
129
|
+
/** The extra release assets the installer installs, in configuration order. */
|
|
130
|
+
installed: IBinaryExtraFile[];
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/** What an extra release asset's name must not take, besides the other extras. */
|
|
134
|
+
export interface IBinaryExtrasContext {
|
|
135
|
+
projectDir: string;
|
|
136
|
+
binaryBuild: IBinaryBuild;
|
|
137
|
+
/** The installer's release asset name. */
|
|
138
|
+
installerAssetName: string;
|
|
139
|
+
/** The executable's file name in the installation directory. */
|
|
140
|
+
installFileName: string;
|
|
141
|
+
/** Whether the release also uploads the packed npm tarball. */
|
|
142
|
+
packNpmArtifact: boolean;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/** One path segment: letters, digits, `.`, `_` and `-`, starting with a letter or digit. */
|
|
146
|
+
const safePathSegment = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
|
|
147
|
+
|
|
148
|
+
/** The mode of a regular file in the Git index of the project, or the reason it has none. */
|
|
149
|
+
const readGitIndexMode = async (projectDirArg: string, pathArg: string): Promise<IBinaryExtraFile['mode']> => {
|
|
150
|
+
const smartshell = new plugins.smartshell.Smartshell({ executor: 'bash' });
|
|
151
|
+
const result = await smartshell.execSpawn('git', ['ls-files', '--stage', '-z', '--', pathArg], {
|
|
152
|
+
cwd: projectDirArg,
|
|
153
|
+
env: { ...process.env, GIT_OPTIONAL_LOCKS: '0' },
|
|
154
|
+
silent: true,
|
|
155
|
+
timeout: 60_000,
|
|
156
|
+
timeoutKillGraceMs: 5_000,
|
|
157
|
+
});
|
|
158
|
+
if (result.exitCode !== 0) {
|
|
159
|
+
throw new Error(
|
|
160
|
+
`@git.zone/cli.assets.installer.extraFiles: could not read the Git index for ${pathArg}: ${result.stderr.trim() || `git ls-files exited ${result.exitCode}`}`,
|
|
161
|
+
);
|
|
162
|
+
}
|
|
163
|
+
const entries = result.stdout
|
|
164
|
+
.split('\0')
|
|
165
|
+
.filter(Boolean)
|
|
166
|
+
.map((entryArg) => /^(\d{6}) [0-9a-f]+ \d+\t(.*)$/s.exec(entryArg))
|
|
167
|
+
.filter((matchArg): matchArg is RegExpExecArray => matchArg !== null && matchArg[2] === pathArg);
|
|
168
|
+
if (entries.length === 0) {
|
|
169
|
+
throw new Error(
|
|
170
|
+
`@git.zone/cli.assets.installer.extraFiles installs ${pathArg}, which Git does not track: commit it, since the installer takes the file's mode from the Git index.`,
|
|
171
|
+
);
|
|
172
|
+
}
|
|
173
|
+
switch (entries[0][1]) {
|
|
174
|
+
case '100755':
|
|
175
|
+
return '0755';
|
|
176
|
+
case '100644':
|
|
177
|
+
return '0644';
|
|
178
|
+
default:
|
|
179
|
+
throw new Error(
|
|
180
|
+
`@git.zone/cli.assets.installer.extraFiles installs ${pathArg}, which Git tracks as mode ${entries[0][1]}, not as a regular file.`,
|
|
181
|
+
);
|
|
182
|
+
}
|
|
183
|
+
};
|
|
184
|
+
|
|
185
|
+
/**
|
|
186
|
+
* The extra release assets of a `binaryCli` configuration (`releaseWorkflow.extraAssets`, exact repository
|
|
187
|
+
* file paths) and those the installer installs beside the executable (`installer.extraFiles`, their names),
|
|
188
|
+
* with each installed file's mode from the Git index. Throws on the first invalid entry.
|
|
189
|
+
*/
|
|
190
|
+
export const readBinaryExtras = async (assetsArg: Record<string, unknown>, contextArg: IBinaryExtrasContext): Promise<IBinaryExtras> => {
|
|
191
|
+
const releaseWorkflow = isPlainObject(assetsArg.releaseWorkflow) ? assetsArg.releaseWorkflow : {};
|
|
192
|
+
const installer = isPlainObject(assetsArg.installer) ? assetsArg.installer : {};
|
|
193
|
+
const readList = (valueArg: unknown, keyArg: string, whatArg: string): string[] => {
|
|
194
|
+
if (valueArg === undefined) return [];
|
|
195
|
+
if (!Array.isArray(valueArg) || !valueArg.every((itemArg) => typeof itemArg === 'string')) {
|
|
196
|
+
throw new Error(`@git.zone/cli.assets.${keyArg} must be a list of ${whatArg}, got ${JSON.stringify(valueArg)}.`);
|
|
197
|
+
}
|
|
198
|
+
return valueArg;
|
|
199
|
+
};
|
|
200
|
+
const paths = readList(releaseWorkflow.extraAssets, 'releaseWorkflow.extraAssets', 'repository file paths');
|
|
201
|
+
const installedNames = readList(installer.extraFiles, 'installer.extraFiles', 'releaseWorkflow.extraAssets names');
|
|
202
|
+
|
|
203
|
+
const outDir = contextArg.binaryBuild.outDir;
|
|
204
|
+
const reserved = new Map<string, string>([['SHA256SUMS.txt', 'the release checksums']]);
|
|
205
|
+
reserved.set(contextArg.installerAssetName, 'the installer');
|
|
206
|
+
for (const target of contextArg.binaryBuild.targets) {
|
|
207
|
+
reserved.set(target.name, `the ${target.target} executable`);
|
|
208
|
+
for (const noticeFile of target.noticeFiles) {
|
|
209
|
+
reserved.set(noticeFile, `a notice file of ${target.name}`);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
const assets: IBinaryExtraAsset[] = [];
|
|
213
|
+
for (const path of paths) {
|
|
214
|
+
const where = `@git.zone/cli.assets.releaseWorkflow.extraAssets entry ${JSON.stringify(path)}`;
|
|
215
|
+
if (!path.split('/').every((segmentArg) => safePathSegment.test(segmentArg))) {
|
|
216
|
+
throw new Error(
|
|
217
|
+
`${where} is not an exact repository file path: use /-separated names of letters, digits, '.', '_' and '-' that start with a letter or digit (no globs, no '..', no leading '/' or './', no backslash).`,
|
|
218
|
+
);
|
|
219
|
+
}
|
|
220
|
+
if (path === outDir || path.startsWith(`${outDir}/`)) {
|
|
221
|
+
throw new Error(`${where} lies in the @git.zone/tssea output directory ${outDir}: extra release assets are repository files, not build outputs.`);
|
|
222
|
+
}
|
|
223
|
+
const name = path.split('/').pop()!;
|
|
224
|
+
const sameName = assets.find((assetArg) => assetArg.name === name);
|
|
225
|
+
if (sameName) {
|
|
226
|
+
throw new Error(`${where} has the release asset name ${name}, as ${JSON.stringify(sameName.path)} does.`);
|
|
227
|
+
}
|
|
228
|
+
if (reserved.has(name)) {
|
|
229
|
+
throw new Error(`${where} has the release asset name ${name}, which ${reserved.get(name)} already uses.`);
|
|
230
|
+
}
|
|
231
|
+
if (contextArg.packNpmArtifact && name.endsWith('.tgz')) {
|
|
232
|
+
throw new Error(`${where} ends in .tgz, the name of the npm tarball packNpmArtifact uploads.`);
|
|
233
|
+
}
|
|
234
|
+
assets.push({ path, name });
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
const installed: IBinaryExtraFile[] = [];
|
|
238
|
+
for (const name of installedNames) {
|
|
239
|
+
const where = `@git.zone/cli.assets.installer.extraFiles entry ${JSON.stringify(name)}`;
|
|
240
|
+
const asset = assets.find((assetArg) => assetArg.name === name);
|
|
241
|
+
if (!asset) {
|
|
242
|
+
throw new Error(`${where} is not the name of a releaseWorkflow.extraAssets file.`);
|
|
243
|
+
}
|
|
244
|
+
if (installed.some((fileArg) => fileArg.name === name)) {
|
|
245
|
+
throw new Error(`${where} is listed twice.`);
|
|
246
|
+
}
|
|
247
|
+
if (name === contextArg.installFileName) {
|
|
248
|
+
throw new Error(`${where} would replace the executable ${name} in the installation directory.`);
|
|
249
|
+
}
|
|
250
|
+
const stats = await plugins.fs.lstat(plugins.path.join(contextArg.projectDir, asset.path)).catch(() => null);
|
|
251
|
+
if (!stats?.isFile()) {
|
|
252
|
+
throw new Error(`${where} installs ${asset.path}, which is not a regular file in the project.`);
|
|
253
|
+
}
|
|
254
|
+
installed.push({ ...asset, mode: await readGitIndexMode(contextArg.projectDir, asset.path) });
|
|
255
|
+
}
|
|
256
|
+
return { assets, installed };
|
|
257
|
+
};
|
|
258
|
+
|
|
112
259
|
const removedIn = 'was removed in @git.zone/cli 9';
|
|
113
260
|
|
|
114
261
|
/** The value at a key path inside `@git.zone/cli.assets`; undefined when any segment is missing. */
|
|
@@ -149,11 +296,11 @@ const removedBinaryCliKeys: ReadonlyArray<{ path: string[]; replacement: string
|
|
|
149
296
|
},
|
|
150
297
|
{
|
|
151
298
|
path: ['releaseWorkflow', 'assetGlobs'],
|
|
152
|
-
replacement: '
|
|
299
|
+
replacement: 'list further release files in @git.zone/cli.assets.releaseWorkflow.extraAssets (exact repository files, no globs)',
|
|
153
300
|
},
|
|
154
301
|
{
|
|
155
302
|
path: ['releaseWorkflow', 'include'],
|
|
156
|
-
replacement: '
|
|
303
|
+
replacement: 'list further release files in @git.zone/cli.assets.releaseWorkflow.extraAssets (exact repository files, no globs)',
|
|
157
304
|
},
|
|
158
305
|
];
|
|
159
306
|
|
package/ts/mod_config/index.ts
CHANGED
|
@@ -46,6 +46,7 @@ import {
|
|
|
46
46
|
import { getSealedReleaseConfigError } from "../helpers.sealedrelease.js";
|
|
47
47
|
import {
|
|
48
48
|
getManagedAssetsMigrationErrors,
|
|
49
|
+
readBinaryExtras,
|
|
49
50
|
managedAssetKinds,
|
|
50
51
|
readBinaryBuild,
|
|
51
52
|
} from "../helpers.managedassets.js";
|
|
@@ -2278,6 +2279,30 @@ async function validateAssetsConfig(
|
|
|
2278
2279
|
level: "ok",
|
|
2279
2280
|
message: `Managed assets release ${binaryBuild.targets.length} @git.zone/tssea executable(s) from ${binaryBuild.outDir}`,
|
|
2280
2281
|
});
|
|
2282
|
+
try {
|
|
2283
|
+
const binary = isPlainObject(rawAssetsConfig.binary) ? rawAssetsConfig.binary : {};
|
|
2284
|
+
const installer = isPlainObject(rawAssetsConfig.installer) ? rawAssetsConfig.installer : {};
|
|
2285
|
+
const releaseWorkflow = isPlainObject(rawAssetsConfig.releaseWorkflow) ? rawAssetsConfig.releaseWorkflow : {};
|
|
2286
|
+
const extras = await readBinaryExtras(rawAssetsConfig, {
|
|
2287
|
+
projectDir: process.cwd(),
|
|
2288
|
+
binaryBuild,
|
|
2289
|
+
installerAssetName: plugins.path.basename(typeof installer.file === "string" && installer.file ? installer.file : "install.sh"),
|
|
2290
|
+
installFileName: typeof binary.installFileName === "string" && binary.installFileName ? binary.installFileName : String(cliName),
|
|
2291
|
+
packNpmArtifact: releaseWorkflow.packNpmArtifact === true,
|
|
2292
|
+
});
|
|
2293
|
+
if (extras.assets.length > 0) {
|
|
2294
|
+
findings.push({
|
|
2295
|
+
level: "ok",
|
|
2296
|
+
message: `Managed assets release ${extras.assets.length} extra file(s); the installer installs ${extras.installed.length} of them`,
|
|
2297
|
+
});
|
|
2298
|
+
}
|
|
2299
|
+
} catch (error) {
|
|
2300
|
+
findings.push({
|
|
2301
|
+
level: "error",
|
|
2302
|
+
message: error instanceof Error ? error.message : String(error),
|
|
2303
|
+
fix: "Correct releaseWorkflow.extraAssets or installer.extraFiles as the message says.",
|
|
2304
|
+
});
|
|
2305
|
+
}
|
|
2281
2306
|
} catch (error) {
|
|
2282
2307
|
findings.push({
|
|
2283
2308
|
level: "error",
|
|
@@ -10,7 +10,9 @@ import {
|
|
|
10
10
|
assertManagedAssetsCurrent,
|
|
11
11
|
managedAssetKinds,
|
|
12
12
|
readBinaryBuild,
|
|
13
|
+
readBinaryExtras,
|
|
13
14
|
type IBinaryBuild,
|
|
15
|
+
type IBinaryExtras,
|
|
14
16
|
} from '../../helpers.managedassets.js';
|
|
15
17
|
|
|
16
18
|
interface IAssetFileMapping {
|
|
@@ -290,9 +292,23 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
290
292
|
: { outDir: '', targets: [] };
|
|
291
293
|
const binaryTargets = binaryBuild.targets;
|
|
292
294
|
const binaryConfig = isPlainObject(assetsConfig.binary) ? assetsConfig.binary : {};
|
|
293
|
-
const
|
|
295
|
+
const installFileName = binaryConfig.installFileName || cliName;
|
|
296
|
+
const installerAssetName = plugins.path.basename(
|
|
297
|
+
(isPlainObject(assetsConfig.installer) && assetsConfig.installer.file) || 'install.sh',
|
|
298
|
+
);
|
|
299
|
+
const extras: IBinaryExtras =
|
|
300
|
+
assetsConfig.kind === 'binaryCli'
|
|
301
|
+
? await readBinaryExtras(assetsConfig, {
|
|
302
|
+
projectDir: paths.cwd,
|
|
303
|
+
binaryBuild,
|
|
304
|
+
installerAssetName,
|
|
305
|
+
installFileName,
|
|
306
|
+
packNpmArtifact: isPlainObject(assetsConfig.releaseWorkflow) && assetsConfig.releaseWorkflow.packNpmArtifact === true,
|
|
307
|
+
})
|
|
308
|
+
: { assets: [], installed: [] };
|
|
309
|
+
const installerConfig = this.normalizeInstallerConfig(assetsConfig, cliName, repository, extras);
|
|
294
310
|
const npmWrapperConfig = this.normalizeNpmWrapperConfig(assetsConfig, cliName);
|
|
295
|
-
const releaseWorkflowConfig = this.normalizeReleaseWorkflowConfig(assetsConfig, binaryBuild, installerConfig);
|
|
311
|
+
const releaseWorkflowConfig = this.normalizeReleaseWorkflowConfig(assetsConfig, binaryBuild, installerConfig, extras);
|
|
296
312
|
|
|
297
313
|
return {
|
|
298
314
|
module: moduleConfig,
|
|
@@ -308,7 +324,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
308
324
|
binary: {
|
|
309
325
|
...binaryConfig,
|
|
310
326
|
outDir: binaryBuild.outDir,
|
|
311
|
-
installFileName
|
|
327
|
+
installFileName,
|
|
312
328
|
targets: binaryTargets,
|
|
313
329
|
supportedPlatformText: binaryTargets.map((target) => target.label).join(', '),
|
|
314
330
|
hasTargets: binaryTargets.length > 0,
|
|
@@ -323,6 +339,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
323
339
|
assetsConfig: Record<string, any>,
|
|
324
340
|
cliName: string,
|
|
325
341
|
repository: Record<string, any>,
|
|
342
|
+
extrasArg: IBinaryExtras,
|
|
326
343
|
): Record<string, any> {
|
|
327
344
|
const installer = isPlainObject(assetsConfig.installer) ? assetsConfig.installer : {};
|
|
328
345
|
const modes = isPlainObject(installer.modes) ? installer.modes : {};
|
|
@@ -375,6 +392,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
375
392
|
primaryPreservePath: preservePaths[0],
|
|
376
393
|
hasPreservePaths: preservePaths.length > 0,
|
|
377
394
|
successHints,
|
|
395
|
+
extraFiles: extrasArg.installed,
|
|
378
396
|
};
|
|
379
397
|
}
|
|
380
398
|
|
|
@@ -393,6 +411,7 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
393
411
|
assetsConfig: Record<string, any>,
|
|
394
412
|
binaryBuild: IBinaryBuild,
|
|
395
413
|
installerConfig: Record<string, any>,
|
|
414
|
+
extrasArg: IBinaryExtras,
|
|
396
415
|
): Record<string, any> {
|
|
397
416
|
const releaseWorkflow = isPlainObject(assetsConfig.releaseWorkflow) ? assetsConfig.releaseWorkflow : {};
|
|
398
417
|
const includeInstallerAsset =
|
|
@@ -405,15 +424,18 @@ export class AssetsFormatter extends BaseFormatter {
|
|
|
405
424
|
if (includeInstallerAsset) {
|
|
406
425
|
releaseFileNames.push(installerConfig.releaseAssetName);
|
|
407
426
|
}
|
|
427
|
+
releaseFileNames.push(...extrasArg.assets.map((assetArg) => assetArg.name));
|
|
408
428
|
return {
|
|
409
429
|
...releaseWorkflow,
|
|
410
430
|
enabled: releaseWorkflow.enabled !== false,
|
|
411
431
|
file: releaseWorkflow.file || '.gitea/workflows/release.yml',
|
|
412
|
-
installCommand: releaseWorkflow.installCommand || 'pnpm install --ignore-scripts',
|
|
432
|
+
installCommand: releaseWorkflow.installCommand || 'pnpm install --frozen-lockfile --ignore-scripts',
|
|
413
433
|
compileCommand: releaseWorkflow.compileCommand || 'pnpm exec tsbundle && pnpm exec tssea build',
|
|
414
434
|
packNpmArtifact: releaseWorkflow.packNpmArtifact === true,
|
|
415
435
|
includeInstallerAsset,
|
|
416
436
|
releaseFileNames,
|
|
437
|
+
extraAssets: extrasArg.assets,
|
|
438
|
+
hasExtraAssets: extrasArg.assets.length > 0,
|
|
417
439
|
keepReleases: releaseWorkflow.keepReleases ?? 0,
|
|
418
440
|
binaryOutDir: binaryBuild.outDir,
|
|
419
441
|
};
|