@storm-software/k8s-tools 0.31.7 → 0.31.9
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/CHANGELOG.md +28 -0
- package/README.md +1 -1
- package/dist/{chunk-VUSHSK4P.mjs → chunk-5JOB6OGJ.mjs} +3 -3
- package/dist/{chunk-MDGD27YL.mjs → chunk-5UXGPT7W.mjs} +1 -1
- package/dist/{chunk-VREITNWP.mjs → chunk-6WL6MFX5.mjs} +2 -2
- package/dist/{chunk-UMIKY6NS.mjs → chunk-74JECYT4.mjs} +1 -1
- package/dist/{chunk-UWVOFPSW.js → chunk-A4CVK7EX.js} +72 -30
- package/dist/{chunk-MKWEGZBN.mjs → chunk-BAOKCCVA.mjs} +2 -2
- package/dist/{chunk-RGCWOU4G.mjs → chunk-BZYA2PUG.mjs} +1 -1
- package/dist/{chunk-QC45ZBCD.js → chunk-CHQFLPKG.js} +6 -6
- package/dist/{chunk-SICCVKOX.mjs → chunk-EYSVKEFF.mjs} +3 -3
- package/dist/{chunk-MWMS7P7U.mjs → chunk-GNTJL5JP.mjs} +59 -17
- package/dist/{chunk-B5PZBLQ3.mjs → chunk-HJWOJTON.mjs} +1 -1
- package/dist/{chunk-A7ARE63F.js → chunk-KA6YY6JO.js} +25 -25
- package/dist/{chunk-DD5DCADP.js → chunk-KPRFECY6.js} +2 -2
- package/dist/{chunk-O2NTRG6T.mjs → chunk-NOKCVPQ2.mjs} +2 -2
- package/dist/{chunk-NMNRCEUZ.js → chunk-OHXHL4YW.js} +4 -4
- package/dist/{chunk-GQUK4O4E.js → chunk-PYDP65I4.js} +4 -4
- package/dist/{chunk-SDL2IMN3.mjs → chunk-TAGMMOA3.mjs} +1 -1
- package/dist/{chunk-2SIDLIM5.js → chunk-VTHDYUIX.js} +19 -19
- package/dist/{chunk-NHN57PGK.js → chunk-W5JY447S.js} +3 -3
- package/dist/executors.js +5 -5
- package/dist/executors.mjs +6 -6
- package/dist/generators.js +6 -6
- package/dist/generators.mjs +6 -6
- package/dist/index.js +9 -9
- package/dist/index.mjs +11 -11
- package/dist/src/executors/container-publish/executor.js +4 -4
- package/dist/src/executors/container-publish/executor.mjs +4 -4
- package/dist/src/executors/helm-package/executor.js +4 -4
- package/dist/src/executors/helm-package/executor.mjs +5 -5
- package/dist/src/generators/helm-chart/generator.js +5 -5
- package/dist/src/generators/helm-chart/generator.mjs +5 -5
- package/dist/src/generators/helm-dependency/generator.js +5 -5
- package/dist/src/generators/helm-dependency/generator.mjs +5 -5
- package/dist/src/plugins/docker/index.js +3 -3
- package/dist/src/plugins/docker/index.mjs +3 -3
- package/dist/src/types.mjs +1 -1
- package/dist/src/utils/client.mjs +2 -2
- package/dist/src/utils/ensure-init.mjs +1 -1
- package/dist/src/utils/index.mjs +3 -3
- package/dist/src/utils/prettier.mjs +2 -2
- package/dist/tsup.config.mjs +1 -1
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,34 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - K8s Tools
|
|
4
4
|
|
|
5
|
+
## [0.31.8](https://github.com/storm-software/storm-ops/releases/tag/k8s-tools%400.31.8) (2025-05-13)
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
- **workspace-tools:** Add back `groupPreVersionCommand` build configuration
|
|
10
|
+
|
|
11
|
+
### Updated Dependencies
|
|
12
|
+
|
|
13
|
+
- Updated workspace-tools to 1.273.9
|
|
14
|
+
- Updated workspace-tools to 1.273.9
|
|
15
|
+
- Updated config-tools to 1.169.8
|
|
16
|
+
- Updated config-tools to 1.169.8
|
|
17
|
+
|
|
18
|
+
## [0.31.7](https://github.com/storm-software/storm-ops/releases/tag/k8s-tools%400.31.7) (2025-05-13)
|
|
19
|
+
|
|
20
|
+
### Miscellaneous
|
|
21
|
+
|
|
22
|
+
- **monorepo:** Regenerate README markdown files
|
|
23
|
+
|
|
24
|
+
### Updated Dependencies
|
|
25
|
+
|
|
26
|
+
- Updated workspace-tools to 1.273.7
|
|
27
|
+
- Updated workspace-tools to 1.273.7
|
|
28
|
+
- Updated config-tools to 1.169.7
|
|
29
|
+
- Updated config-tools to 1.169.7
|
|
30
|
+
- Updated config to 1.119.7
|
|
31
|
+
- Updated config to 1.119.7
|
|
32
|
+
|
|
5
33
|
## [0.31.6](https://github.com/storm-software/storm-ops/releases/tag/k8s-tools%400.31.6) (2025-05-09)
|
|
6
34
|
|
|
7
35
|
### Miscellaneous
|
package/README.md
CHANGED
|
@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
|
|
|
21
21
|
|
|
22
22
|
<h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
|
|
23
23
|
|
|
24
|
-
[](https://prettier.io/) [](http://nx.dev/) [](https://nextjs.org/) [](http://commitizen.github.io/cz-cli/)  [](https://fumadocs.vercel.app/) 
|
|
25
25
|
|
|
26
26
|
<!-- prettier-ignore-start -->
|
|
27
27
|
<!-- markdownlint-disable -->
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
2
|
withRunGenerator
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-6WL6MFX5.mjs";
|
|
4
4
|
import {
|
|
5
5
|
writeDebug
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-GNTJL5JP.mjs";
|
|
7
7
|
import {
|
|
8
8
|
__dirname
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-74JECYT4.mjs";
|
|
10
10
|
|
|
11
11
|
// src/generators/helm-chart/generator.ts
|
|
12
12
|
import {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
applyWorkspaceBaseTokens,
|
|
3
3
|
applyWorkspaceTokens
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-5UXGPT7W.mjs";
|
|
5
5
|
import {
|
|
6
6
|
findWorkspaceRoot,
|
|
7
7
|
getConfig,
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
writeInfo,
|
|
13
13
|
writeSuccess,
|
|
14
14
|
writeTrace
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-GNTJL5JP.mjs";
|
|
16
16
|
|
|
17
17
|
// ../workspace-tools/src/base/base-generator.ts
|
|
18
18
|
var withRunGenerator = (name, generatorFn, generatorOptions = {
|
|
@@ -15,7 +15,7 @@ var __decorateClass = (decorators, target, key, kind) => {
|
|
|
15
15
|
return result;
|
|
16
16
|
};
|
|
17
17
|
|
|
18
|
-
// ../../node_modules/.pnpm/tsup@8.4.0_patch_hash=
|
|
18
|
+
// ../../node_modules/.pnpm/tsup@8.4.0_patch_hash=751a554d775c3572381af4e7e5fa22eeda6dd6856012fb1cf521d6806eb2dc74__23d29aaa007764500c48e48a9770b339/node_modules/tsup/assets/esm_shims.js
|
|
19
19
|
import { fileURLToPath } from "url";
|
|
20
20
|
import path from "path";
|
|
21
21
|
var getFilename = () => fileURLToPath(import.meta.url);
|
|
@@ -243,10 +243,10 @@ var LogLevelLabel = {
|
|
|
243
243
|
};
|
|
244
244
|
|
|
245
245
|
// ../config/src/constants.ts
|
|
246
|
-
var STORM_DEFAULT_DOCS = "https://
|
|
246
|
+
var STORM_DEFAULT_DOCS = "https://stormsoftware.com/docs";
|
|
247
247
|
var STORM_DEFAULT_HOMEPAGE = "https://stormsoftware.com";
|
|
248
248
|
var STORM_DEFAULT_CONTACT = "https://stormsoftware.com/contact";
|
|
249
|
-
var STORM_DEFAULT_LICENSING = "https://
|
|
249
|
+
var STORM_DEFAULT_LICENSING = "https://stormsoftware.com/license";
|
|
250
250
|
var STORM_DEFAULT_LICENSE = "Apache-2.0";
|
|
251
251
|
var STORM_DEFAULT_RELEASE_BANNER = "https://public.storm-cdn.com/brand-banner.png";
|
|
252
252
|
var STORM_DEFAULT_ACCOUNT_TWITTER = "StormSoftwareHQ";
|
|
@@ -420,10 +420,13 @@ var stormWorkspaceConfigSchema = _zod2.default.object({
|
|
|
420
420
|
organization: _zod2.default.string().trim().default("storm-software").describe("The organization of the workspace"),
|
|
421
421
|
repository: _zod2.default.string().trim().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
|
|
422
422
|
license: _zod2.default.string().trim().default("Apache-2.0").describe("The license type of the package"),
|
|
423
|
-
homepage: _zod2.default.string().trim().url().
|
|
424
|
-
docs: _zod2.default.string().trim().url().
|
|
425
|
-
licensing: _zod2.default.string().trim().url().
|
|
426
|
-
contact: _zod2.default.string().trim().url().
|
|
423
|
+
homepage: _zod2.default.string().trim().url().optional().describe("The homepage of the workspace"),
|
|
424
|
+
docs: _zod2.default.string().trim().url().optional().describe("The documentation site for the workspace"),
|
|
425
|
+
licensing: _zod2.default.string().trim().url().optional().describe("The licensing site for the workspace"),
|
|
426
|
+
contact: _zod2.default.string().trim().url().optional().describe("The contact site for the workspace"),
|
|
427
|
+
support: _zod2.default.string().trim().url().optional().describe(
|
|
428
|
+
"The support site for the workspace. If not provided, this is defaulted to the `contact` config value"
|
|
429
|
+
),
|
|
427
430
|
branch: _zod2.default.string().trim().default("main").describe("The branch of the workspace"),
|
|
428
431
|
preid: _zod2.default.string().optional().describe("A tag specifying the version pre-release identifier"),
|
|
429
432
|
owner: _zod2.default.string().trim().default("@storm-software/admin").describe("The owner of the package"),
|
|
@@ -522,9 +525,10 @@ var DEFAULT_COLOR_CONFIG = {
|
|
|
522
525
|
negative: "#dc2626"
|
|
523
526
|
}
|
|
524
527
|
};
|
|
525
|
-
|
|
528
|
+
async function getPackageJsonConfig(root) {
|
|
526
529
|
let license = STORM_DEFAULT_LICENSE;
|
|
527
|
-
let homepage =
|
|
530
|
+
let homepage = void 0;
|
|
531
|
+
let support = void 0;
|
|
528
532
|
let name = void 0;
|
|
529
533
|
let namespace = void 0;
|
|
530
534
|
let repository = void 0;
|
|
@@ -555,6 +559,13 @@ var getDefaultConfig = async (root) => {
|
|
|
555
559
|
if (packageJson.homepage) {
|
|
556
560
|
homepage = packageJson.homepage;
|
|
557
561
|
}
|
|
562
|
+
if (packageJson.bugs) {
|
|
563
|
+
if (typeof packageJson.bugs === "string") {
|
|
564
|
+
support = packageJson.bugs;
|
|
565
|
+
} else if (packageJson.bugs.url) {
|
|
566
|
+
support = packageJson.bugs.url;
|
|
567
|
+
}
|
|
568
|
+
}
|
|
558
569
|
}
|
|
559
570
|
}
|
|
560
571
|
return {
|
|
@@ -564,13 +575,38 @@ var getDefaultConfig = async (root) => {
|
|
|
564
575
|
repository,
|
|
565
576
|
license,
|
|
566
577
|
homepage,
|
|
567
|
-
|
|
568
|
-
licensing: `${homepage || STORM_DEFAULT_HOMEPAGE}/license`,
|
|
569
|
-
error: {
|
|
570
|
-
url: `${homepage || STORM_DEFAULT_HOMEPAGE}/errors`
|
|
571
|
-
}
|
|
578
|
+
support
|
|
572
579
|
};
|
|
573
|
-
}
|
|
580
|
+
}
|
|
581
|
+
function applyDefaultConfig(config) {
|
|
582
|
+
if (!config.support && config.contact) {
|
|
583
|
+
config.support = config.contact;
|
|
584
|
+
}
|
|
585
|
+
if (!config.contact && config.support) {
|
|
586
|
+
config.contact = config.support;
|
|
587
|
+
}
|
|
588
|
+
if (config.homepage) {
|
|
589
|
+
if (!config.docs) {
|
|
590
|
+
config.docs = `${config.homepage}/docs`;
|
|
591
|
+
}
|
|
592
|
+
if (!config.license) {
|
|
593
|
+
config.license = `${config.homepage}/license`;
|
|
594
|
+
}
|
|
595
|
+
if (!config.support) {
|
|
596
|
+
config.support = `${config.homepage}/support`;
|
|
597
|
+
}
|
|
598
|
+
if (!config.contact) {
|
|
599
|
+
config.contact = `${config.homepage}/contact`;
|
|
600
|
+
}
|
|
601
|
+
if (!_optionalChain([config, 'access', _2 => _2.error, 'optionalAccess', _3 => _3.codesFile]) || !_optionalChain([config, 'optionalAccess', _4 => _4.error, 'optionalAccess', _5 => _5.url])) {
|
|
602
|
+
config.error ??= { codesFile: STORM_DEFAULT_ERROR_CODES_FILE };
|
|
603
|
+
if (config.homepage) {
|
|
604
|
+
config.error.url ??= `${config.homepage}/errors`;
|
|
605
|
+
}
|
|
606
|
+
}
|
|
607
|
+
}
|
|
608
|
+
return config;
|
|
609
|
+
}
|
|
574
610
|
|
|
575
611
|
// ../config-tools/src/logger/chalk.ts
|
|
576
612
|
var _chalk2 = require('chalk'); var _chalk3 = _interopRequireDefault(_chalk2);
|
|
@@ -595,7 +631,7 @@ var chalkDefault = {
|
|
|
595
631
|
};
|
|
596
632
|
var getChalk = () => {
|
|
597
633
|
let _chalk = _chalk3.default;
|
|
598
|
-
if (!_optionalChain([_chalk, 'optionalAccess',
|
|
634
|
+
if (!_optionalChain([_chalk, 'optionalAccess', _6 => _6.hex]) || !_optionalChain([_chalk, 'optionalAccess', _7 => _7.bold, 'optionalAccess', _8 => _8.hex]) || !_optionalChain([_chalk, 'optionalAccess', _9 => _9.bgHex]) || !_optionalChain([_chalk, 'optionalAccess', _10 => _10.whiteBright])) {
|
|
599
635
|
_chalk = chalkDefault;
|
|
600
636
|
}
|
|
601
637
|
return _chalk;
|
|
@@ -683,7 +719,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
683
719
|
|
|
684
720
|
// ../config-tools/src/logger/console.ts
|
|
685
721
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}, _chalk = getChalk()) => {
|
|
686
|
-
const colors = !_optionalChain([config, 'access',
|
|
722
|
+
const colors = !_optionalChain([config, 'access', _11 => _11.colors, 'optionalAccess', _12 => _12.dark]) && !_optionalChain([config, 'access', _13 => _13.colors, 'optionalAccess', _14 => _14["base"]]) && !_optionalChain([config, 'access', _15 => _15.colors, 'optionalAccess', _16 => _16["base"], 'optionalAccess', _17 => _17.dark]) ? DEFAULT_COLOR_CONFIG : _optionalChain([config, 'access', _18 => _18.colors, 'optionalAccess', _19 => _19.dark]) && typeof config.colors.dark === "string" ? config.colors : _optionalChain([config, 'access', _20 => _20.colors, 'optionalAccess', _21 => _21["base"], 'optionalAccess', _22 => _22.dark]) && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : _optionalChain([config, 'access', _23 => _23.colors, 'optionalAccess', _24 => _24["base"]]) ? _optionalChain([config, 'access', _25 => _25.colors, 'optionalAccess', _26 => _26["base"]]) : DEFAULT_COLOR_CONFIG;
|
|
687
723
|
const configLogLevel = config.logLevel || process.env.STORM_LOG_LEVEL || LogLevelLabel.INFO;
|
|
688
724
|
if (logLevel > getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT || getLogLevel(configLogLevel) <= LogLevel.SILENT) {
|
|
689
725
|
return (_) => {
|
|
@@ -799,7 +835,7 @@ ${Object.keys(message).filter((key) => !skip.includes(key)).map(
|
|
|
799
835
|
};
|
|
800
836
|
var _isFunction = (value) => {
|
|
801
837
|
try {
|
|
802
|
-
return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess',
|
|
838
|
+
return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess', _27 => _27.constructor]) && _optionalChain([value, 'optionalAccess', _28 => _28.call]) && _optionalChain([value, 'optionalAccess', _29 => _29.apply]));
|
|
803
839
|
} catch (e) {
|
|
804
840
|
return false;
|
|
805
841
|
}
|
|
@@ -818,7 +854,7 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
818
854
|
cwd: workspacePath,
|
|
819
855
|
packageJson: true,
|
|
820
856
|
name: fileName,
|
|
821
|
-
envName: _optionalChain([fileName, 'optionalAccess',
|
|
857
|
+
envName: _optionalChain([fileName, 'optionalAccess', _30 => _30.toUpperCase, 'call', _31 => _31()]),
|
|
822
858
|
jitiOptions: {
|
|
823
859
|
debug: false,
|
|
824
860
|
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : joinPaths(
|
|
@@ -832,7 +868,7 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
832
868
|
cwd: workspacePath,
|
|
833
869
|
packageJson: true,
|
|
834
870
|
name: fileName,
|
|
835
|
-
envName: _optionalChain([fileName, 'optionalAccess',
|
|
871
|
+
envName: _optionalChain([fileName, 'optionalAccess', _32 => _32.toUpperCase, 'call', _33 => _33()]),
|
|
836
872
|
jitiOptions: {
|
|
837
873
|
debug: false,
|
|
838
874
|
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : joinPaths(
|
|
@@ -866,7 +902,7 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
866
902
|
)
|
|
867
903
|
);
|
|
868
904
|
for (const result2 of results) {
|
|
869
|
-
if (_optionalChain([result2, 'optionalAccess',
|
|
905
|
+
if (_optionalChain([result2, 'optionalAccess', _34 => _34.config]) && _optionalChain([result2, 'optionalAccess', _35 => _35.configFile]) && Object.keys(result2.config).length > 0) {
|
|
870
906
|
if (!config.skipConfigLogging && !result2.config.skipConfigLogging) {
|
|
871
907
|
writeTrace(
|
|
872
908
|
`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`,
|
|
@@ -934,6 +970,7 @@ var getConfigEnv = () => {
|
|
|
934
970
|
docs: process.env[`${prefix}DOCS`] || void 0,
|
|
935
971
|
licensing: process.env[`${prefix}LICENSING`] || void 0,
|
|
936
972
|
contact: process.env[`${prefix}CONTACT`] || void 0,
|
|
973
|
+
support: process.env[`${prefix}SUPPORT`] || void 0,
|
|
937
974
|
timezone: process.env[`${prefix}TIMEZONE`] || process.env.TZ || void 0,
|
|
938
975
|
locale: process.env[`${prefix}LOCALE`] || process.env.LOCALE || void 0,
|
|
939
976
|
configFile: process.env[`${prefix}CONFIG_FILE`] ? correctPaths(process.env[`${prefix}CONFIG_FILE`]) : void 0,
|
|
@@ -1065,16 +1102,16 @@ var getBaseThemeColorConfigEnv = (prefix) => {
|
|
|
1065
1102
|
var setExtensionEnv = (extensionName, extension) => {
|
|
1066
1103
|
for (const key of Object.keys(_nullishCoalesce(extension, () => ( {})))) {
|
|
1067
1104
|
if (extension[key]) {
|
|
1068
|
-
const result = _nullishCoalesce(_optionalChain([key, 'optionalAccess',
|
|
1105
|
+
const result = _nullishCoalesce(_optionalChain([key, 'optionalAccess', _36 => _36.replace, 'call', _37 => _37(
|
|
1069
1106
|
/([A-Z])+/g,
|
|
1070
|
-
(input) => input ? _optionalChain([input, 'access',
|
|
1071
|
-
), 'access',
|
|
1107
|
+
(input) => input ? _optionalChain([input, 'access', _38 => _38[0], 'optionalAccess', _39 => _39.toUpperCase, 'call', _40 => _40()]) + input.slice(1) : ""
|
|
1108
|
+
), 'access', _41 => _41.split, 'call', _42 => _42(/(?=[A-Z])|[.\-\s_]/), 'access', _43 => _43.map, 'call', _44 => _44((x) => x.toLowerCase())]), () => ( []));
|
|
1072
1109
|
let extensionKey;
|
|
1073
1110
|
if (result.length === 0) {
|
|
1074
1111
|
return;
|
|
1075
1112
|
}
|
|
1076
1113
|
if (result.length === 1) {
|
|
1077
|
-
extensionKey = _nullishCoalesce(_optionalChain([result, 'access',
|
|
1114
|
+
extensionKey = _nullishCoalesce(_optionalChain([result, 'access', _45 => _45[0], 'optionalAccess', _46 => _46.toUpperCase, 'call', _47 => _47()]), () => ( ""));
|
|
1078
1115
|
} else {
|
|
1079
1116
|
extensionKey = result.reduce((ret, part) => {
|
|
1080
1117
|
return `${ret}_${part.toLowerCase()}`;
|
|
@@ -1152,6 +1189,9 @@ var setConfigEnv = (config) => {
|
|
|
1152
1189
|
if (config.contact) {
|
|
1153
1190
|
process.env[`${prefix}CONTACT`] = config.contact;
|
|
1154
1191
|
}
|
|
1192
|
+
if (config.support) {
|
|
1193
|
+
process.env[`${prefix}SUPPORT`] = config.support;
|
|
1194
|
+
}
|
|
1155
1195
|
if (config.timezone) {
|
|
1156
1196
|
process.env[`${prefix}TIMEZONE`] = config.timezone;
|
|
1157
1197
|
process.env.TZ = config.timezone;
|
|
@@ -1215,7 +1255,7 @@ var setConfigEnv = (config) => {
|
|
|
1215
1255
|
process.env.NODE_ENV = config.mode;
|
|
1216
1256
|
process.env.ENVIRONMENT = config.mode;
|
|
1217
1257
|
}
|
|
1218
|
-
if (_optionalChain([config, 'access',
|
|
1258
|
+
if (_optionalChain([config, 'access', _48 => _48.colors, 'optionalAccess', _49 => _49.base, 'optionalAccess', _50 => _50.light]) || _optionalChain([config, 'access', _51 => _51.colors, 'optionalAccess', _52 => _52.base, 'optionalAccess', _53 => _53.dark])) {
|
|
1219
1259
|
for (const key of Object.keys(config.colors)) {
|
|
1220
1260
|
setThemeColorConfigEnv(`${prefix}COLOR_${key}_`, config.colors[key]);
|
|
1221
1261
|
}
|
|
@@ -1281,7 +1321,7 @@ var setConfigEnv = (config) => {
|
|
|
1281
1321
|
}
|
|
1282
1322
|
};
|
|
1283
1323
|
var setThemeColorConfigEnv = (prefix, config) => {
|
|
1284
|
-
return _optionalChain([config, 'optionalAccess',
|
|
1324
|
+
return _optionalChain([config, 'optionalAccess', _54 => _54.light, 'optionalAccess', _55 => _55.brand]) || _optionalChain([config, 'optionalAccess', _56 => _56.dark, 'optionalAccess', _57 => _57.brand]) ? setMultiThemeColorConfigEnv(prefix, config) : setSingleThemeColorConfigEnv(prefix, config);
|
|
1285
1325
|
};
|
|
1286
1326
|
var setSingleThemeColorConfigEnv = (prefix, config) => {
|
|
1287
1327
|
if (config.dark) {
|
|
@@ -1383,7 +1423,7 @@ var _extension_cache = /* @__PURE__ */ new WeakMap();
|
|
|
1383
1423
|
var _static_cache = void 0;
|
|
1384
1424
|
var createStormWorkspaceConfig = async (extensionName, schema, workspaceRoot, skipLogs = false, useDefault = true) => {
|
|
1385
1425
|
let result;
|
|
1386
|
-
if (!_optionalChain([_static_cache, 'optionalAccess',
|
|
1426
|
+
if (!_optionalChain([_static_cache, 'optionalAccess', _58 => _58.data]) || !_optionalChain([_static_cache, 'optionalAccess', _59 => _59.timestamp]) || _static_cache.timestamp < Date.now() - 8e3) {
|
|
1387
1427
|
let _workspaceRoot = workspaceRoot;
|
|
1388
1428
|
if (!_workspaceRoot) {
|
|
1389
1429
|
_workspaceRoot = findWorkspaceRoot();
|
|
@@ -1401,9 +1441,11 @@ var createStormWorkspaceConfig = async (extensionName, schema, workspaceRoot, sk
|
|
|
1401
1441
|
return void 0;
|
|
1402
1442
|
}
|
|
1403
1443
|
}
|
|
1404
|
-
const defaultConfig = await
|
|
1405
|
-
result =
|
|
1406
|
-
|
|
1444
|
+
const defaultConfig = await getPackageJsonConfig(_workspaceRoot);
|
|
1445
|
+
result = applyDefaultConfig(
|
|
1446
|
+
await stormWorkspaceConfigSchema.parseAsync(
|
|
1447
|
+
_defu2.default.call(void 0, configEnv, configFile, defaultConfig)
|
|
1448
|
+
)
|
|
1407
1449
|
);
|
|
1408
1450
|
result.workspaceRoot ??= _workspaceRoot;
|
|
1409
1451
|
} else {
|
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
var _chunkXZP5ZUYNjs = require('./chunk-XZP5ZUYN.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _chunkKPRFECY6js = require('./chunk-KPRFECY6.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _chunkA4CVK7EXjs = require('./chunk-A4CVK7EX.js');
|
|
11
11
|
|
|
12
12
|
// src/executors/container-publish/executor.ts
|
|
13
13
|
|
|
@@ -64,7 +64,7 @@ var applyWorkspaceExecutorTokens = async (option, tokenizerOptions) => {
|
|
|
64
64
|
if (result.includes("{workspaceRoot}")) {
|
|
65
65
|
result = result.replaceAll(
|
|
66
66
|
"{workspaceRoot}",
|
|
67
|
-
_nullishCoalesce(tokenizerOptions.workspaceRoot, () => (
|
|
67
|
+
_nullishCoalesce(tokenizerOptions.workspaceRoot, () => ( _chunkA4CVK7EXjs.findWorkspaceRoot.call(void 0, )))
|
|
68
68
|
);
|
|
69
69
|
}
|
|
70
70
|
return result;
|
|
@@ -80,8 +80,8 @@ async function* publishExecutor(options, context) {
|
|
|
80
80
|
console.info(
|
|
81
81
|
`\u{1F680} Running Storm Container Registry Publish executor on the ${context.projectName} crate`
|
|
82
82
|
);
|
|
83
|
-
const workspaceRoot =
|
|
84
|
-
const config = await
|
|
83
|
+
const workspaceRoot = _chunkA4CVK7EXjs.findWorkspaceRoot.call(void 0, );
|
|
84
|
+
const config = await _chunkA4CVK7EXjs.getConfig.call(void 0, workspaceRoot);
|
|
85
85
|
const projectConfig = _optionalChain([context, 'access', _2 => _2.projectsConfigurations, 'optionalAccess', _3 => _3.projects, 'access', _4 => _4[context.projectName]]);
|
|
86
86
|
if (!projectConfig) {
|
|
87
87
|
throw new Error(
|
|
@@ -92,7 +92,7 @@ async function* publishExecutor(options, context) {
|
|
|
92
92
|
const sourceRoot = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _6 => _6.sourceRoot]), () => ( workspaceRoot));
|
|
93
93
|
const projectName = _nullishCoalesce(_optionalChain([projectConfig, 'optionalAccess', _7 => _7.name]), () => ( context.projectName));
|
|
94
94
|
config.workspaceRoot = workspaceRoot;
|
|
95
|
-
const tokenized = await
|
|
95
|
+
const tokenized = await _chunkKPRFECY6js.applyWorkspaceTokens.call(void 0,
|
|
96
96
|
options,
|
|
97
97
|
{
|
|
98
98
|
config,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
applyWorkspaceProjectTokens,
|
|
3
3
|
applyWorkspaceTokens
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-5UXGPT7W.mjs";
|
|
5
5
|
import {
|
|
6
6
|
findWorkspaceRoot,
|
|
7
7
|
formatLogMessage,
|
|
@@ -14,10 +14,10 @@ import {
|
|
|
14
14
|
writeSuccess,
|
|
15
15
|
writeTrace,
|
|
16
16
|
writeWarning
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-GNTJL5JP.mjs";
|
|
18
18
|
import {
|
|
19
19
|
createHelmClient
|
|
20
|
-
} from "./chunk-
|
|
20
|
+
} from "./chunk-TAGMMOA3.mjs";
|
|
21
21
|
|
|
22
22
|
// ../workspace-tools/src/base/base-executor.ts
|
|
23
23
|
import { defu } from "defu";
|
|
@@ -243,10 +243,10 @@ var LogLevelLabel = {
|
|
|
243
243
|
};
|
|
244
244
|
|
|
245
245
|
// ../config/src/constants.ts
|
|
246
|
-
var STORM_DEFAULT_DOCS = "https://
|
|
246
|
+
var STORM_DEFAULT_DOCS = "https://stormsoftware.com/docs";
|
|
247
247
|
var STORM_DEFAULT_HOMEPAGE = "https://stormsoftware.com";
|
|
248
248
|
var STORM_DEFAULT_CONTACT = "https://stormsoftware.com/contact";
|
|
249
|
-
var STORM_DEFAULT_LICENSING = "https://
|
|
249
|
+
var STORM_DEFAULT_LICENSING = "https://stormsoftware.com/license";
|
|
250
250
|
var STORM_DEFAULT_LICENSE = "Apache-2.0";
|
|
251
251
|
var STORM_DEFAULT_RELEASE_BANNER = "https://public.storm-cdn.com/brand-banner.png";
|
|
252
252
|
var STORM_DEFAULT_ACCOUNT_TWITTER = "StormSoftwareHQ";
|
|
@@ -420,10 +420,13 @@ var stormWorkspaceConfigSchema = z.object({
|
|
|
420
420
|
organization: z.string().trim().default("storm-software").describe("The organization of the workspace"),
|
|
421
421
|
repository: z.string().trim().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
|
|
422
422
|
license: z.string().trim().default("Apache-2.0").describe("The license type of the package"),
|
|
423
|
-
homepage: z.string().trim().url().
|
|
424
|
-
docs: z.string().trim().url().
|
|
425
|
-
licensing: z.string().trim().url().
|
|
426
|
-
contact: z.string().trim().url().
|
|
423
|
+
homepage: z.string().trim().url().optional().describe("The homepage of the workspace"),
|
|
424
|
+
docs: z.string().trim().url().optional().describe("The documentation site for the workspace"),
|
|
425
|
+
licensing: z.string().trim().url().optional().describe("The licensing site for the workspace"),
|
|
426
|
+
contact: z.string().trim().url().optional().describe("The contact site for the workspace"),
|
|
427
|
+
support: z.string().trim().url().optional().describe(
|
|
428
|
+
"The support site for the workspace. If not provided, this is defaulted to the `contact` config value"
|
|
429
|
+
),
|
|
427
430
|
branch: z.string().trim().default("main").describe("The branch of the workspace"),
|
|
428
431
|
preid: z.string().optional().describe("A tag specifying the version pre-release identifier"),
|
|
429
432
|
owner: z.string().trim().default("@storm-software/admin").describe("The owner of the package"),
|
|
@@ -522,9 +525,10 @@ var DEFAULT_COLOR_CONFIG = {
|
|
|
522
525
|
negative: "#dc2626"
|
|
523
526
|
}
|
|
524
527
|
};
|
|
525
|
-
|
|
528
|
+
async function getPackageJsonConfig(root) {
|
|
526
529
|
let license = STORM_DEFAULT_LICENSE;
|
|
527
|
-
let homepage =
|
|
530
|
+
let homepage = void 0;
|
|
531
|
+
let support = void 0;
|
|
528
532
|
let name = void 0;
|
|
529
533
|
let namespace = void 0;
|
|
530
534
|
let repository = void 0;
|
|
@@ -555,6 +559,13 @@ var getDefaultConfig = async (root) => {
|
|
|
555
559
|
if (packageJson.homepage) {
|
|
556
560
|
homepage = packageJson.homepage;
|
|
557
561
|
}
|
|
562
|
+
if (packageJson.bugs) {
|
|
563
|
+
if (typeof packageJson.bugs === "string") {
|
|
564
|
+
support = packageJson.bugs;
|
|
565
|
+
} else if (packageJson.bugs.url) {
|
|
566
|
+
support = packageJson.bugs.url;
|
|
567
|
+
}
|
|
568
|
+
}
|
|
558
569
|
}
|
|
559
570
|
}
|
|
560
571
|
return {
|
|
@@ -564,13 +575,38 @@ var getDefaultConfig = async (root) => {
|
|
|
564
575
|
repository,
|
|
565
576
|
license,
|
|
566
577
|
homepage,
|
|
567
|
-
|
|
568
|
-
licensing: `${homepage || STORM_DEFAULT_HOMEPAGE}/license`,
|
|
569
|
-
error: {
|
|
570
|
-
url: `${homepage || STORM_DEFAULT_HOMEPAGE}/errors`
|
|
571
|
-
}
|
|
578
|
+
support
|
|
572
579
|
};
|
|
573
|
-
}
|
|
580
|
+
}
|
|
581
|
+
function applyDefaultConfig(config) {
|
|
582
|
+
if (!config.support && config.contact) {
|
|
583
|
+
config.support = config.contact;
|
|
584
|
+
}
|
|
585
|
+
if (!config.contact && config.support) {
|
|
586
|
+
config.contact = config.support;
|
|
587
|
+
}
|
|
588
|
+
if (config.homepage) {
|
|
589
|
+
if (!config.docs) {
|
|
590
|
+
config.docs = `${config.homepage}/docs`;
|
|
591
|
+
}
|
|
592
|
+
if (!config.license) {
|
|
593
|
+
config.license = `${config.homepage}/license`;
|
|
594
|
+
}
|
|
595
|
+
if (!config.support) {
|
|
596
|
+
config.support = `${config.homepage}/support`;
|
|
597
|
+
}
|
|
598
|
+
if (!config.contact) {
|
|
599
|
+
config.contact = `${config.homepage}/contact`;
|
|
600
|
+
}
|
|
601
|
+
if (!config.error?.codesFile || !config?.error?.url) {
|
|
602
|
+
config.error ??= { codesFile: STORM_DEFAULT_ERROR_CODES_FILE };
|
|
603
|
+
if (config.homepage) {
|
|
604
|
+
config.error.url ??= `${config.homepage}/errors`;
|
|
605
|
+
}
|
|
606
|
+
}
|
|
607
|
+
}
|
|
608
|
+
return config;
|
|
609
|
+
}
|
|
574
610
|
|
|
575
611
|
// ../config-tools/src/logger/chalk.ts
|
|
576
612
|
import chalk from "chalk";
|
|
@@ -934,6 +970,7 @@ var getConfigEnv = () => {
|
|
|
934
970
|
docs: process.env[`${prefix}DOCS`] || void 0,
|
|
935
971
|
licensing: process.env[`${prefix}LICENSING`] || void 0,
|
|
936
972
|
contact: process.env[`${prefix}CONTACT`] || void 0,
|
|
973
|
+
support: process.env[`${prefix}SUPPORT`] || void 0,
|
|
937
974
|
timezone: process.env[`${prefix}TIMEZONE`] || process.env.TZ || void 0,
|
|
938
975
|
locale: process.env[`${prefix}LOCALE`] || process.env.LOCALE || void 0,
|
|
939
976
|
configFile: process.env[`${prefix}CONFIG_FILE`] ? correctPaths(process.env[`${prefix}CONFIG_FILE`]) : void 0,
|
|
@@ -1152,6 +1189,9 @@ var setConfigEnv = (config) => {
|
|
|
1152
1189
|
if (config.contact) {
|
|
1153
1190
|
process.env[`${prefix}CONTACT`] = config.contact;
|
|
1154
1191
|
}
|
|
1192
|
+
if (config.support) {
|
|
1193
|
+
process.env[`${prefix}SUPPORT`] = config.support;
|
|
1194
|
+
}
|
|
1155
1195
|
if (config.timezone) {
|
|
1156
1196
|
process.env[`${prefix}TIMEZONE`] = config.timezone;
|
|
1157
1197
|
process.env.TZ = config.timezone;
|
|
@@ -1401,9 +1441,11 @@ var createStormWorkspaceConfig = async (extensionName, schema, workspaceRoot, sk
|
|
|
1401
1441
|
return void 0;
|
|
1402
1442
|
}
|
|
1403
1443
|
}
|
|
1404
|
-
const defaultConfig = await
|
|
1405
|
-
result =
|
|
1406
|
-
|
|
1444
|
+
const defaultConfig = await getPackageJsonConfig(_workspaceRoot);
|
|
1445
|
+
result = applyDefaultConfig(
|
|
1446
|
+
await stormWorkspaceConfigSchema.parseAsync(
|
|
1447
|
+
defu2(configEnv, configFile, defaultConfig)
|
|
1448
|
+
)
|
|
1407
1449
|
);
|
|
1408
1450
|
result.workspaceRoot ??= _workspaceRoot;
|
|
1409
1451
|
} else {
|