@storm-software/git-tools 2.55.0 → 2.56.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/CHANGELOG.md +7 -0
- package/README.md +1 -1
- package/bin/git.js +29 -22
- package/bin/post-checkout.js +23 -16
- package/bin/post-commit.js +23 -16
- package/bin/post-merge.js +23 -16
- package/bin/pre-commit.js +23 -16
- package/bin/pre-install.js +23 -16
- package/bin/pre-push.js +23 -16
- package/bin/prepare.js +23 -16
- package/bin/version-warning.js +23 -16
- package/package.json +2 -2
- package/src/cli/index.js +29 -22
- package/src/commit/index.js +9 -8
- package/src/commitizen/index.js +3 -2
- package/src/index.js +29 -22
- package/src/release/index.js +3 -2
package/CHANGELOG.md
CHANGED
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 -->
|
package/bin/git.js
CHANGED
|
@@ -230814,7 +230814,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
230814
230814
|
github: RegistryUrlConfigSchema,
|
|
230815
230815
|
npm: RegistryUrlConfigSchema,
|
|
230816
230816
|
cargo: RegistryUrlConfigSchema,
|
|
230817
|
-
cyclone: RegistryUrlConfigSchema
|
|
230817
|
+
cyclone: RegistryUrlConfigSchema,
|
|
230818
|
+
container: RegistryUrlConfigSchema
|
|
230818
230819
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
230819
230820
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
230820
230821
|
MultiThemeColorConfigSchema
|
|
@@ -231082,7 +231083,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
231082
231083
|
|
|
231083
231084
|
// packages/config-tools/src/utilities/logger.ts
|
|
231084
231085
|
var getLogFn = (logLevel = LogLevel.INFO, config2 = {}) => {
|
|
231085
|
-
|
|
231086
|
+
const _chalk = getChalk();
|
|
231086
231087
|
const colors = !config2.colors?.dark && !config2.colors?.["base"] && !config2.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config2.colors?.dark && typeof config2.colors.dark === "string" ? config2.colors : config2.colors?.["base"]?.dark && typeof config2.colors["base"].dark === "string" ? config2.colors["base"].dark : config2.colors?.["base"] ? config2.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
231087
231088
|
const configLogLevel = config2.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
231088
231089
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -231264,10 +231265,9 @@ var getConfigFileByName = async (fileName, filePath, options8 = {}) => {
|
|
|
231264
231265
|
};
|
|
231265
231266
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
231266
231267
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
231267
|
-
|
|
231268
|
-
|
|
231269
|
-
|
|
231270
|
-
);
|
|
231268
|
+
const result2 = await getConfigFileByName("storm", workspacePath);
|
|
231269
|
+
let config2 = result2.config;
|
|
231270
|
+
const configFile = result2.configFile;
|
|
231271
231271
|
if (config2 && Object.keys(config2).length > 0) {
|
|
231272
231272
|
writeTrace(
|
|
231273
231273
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -231282,15 +231282,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
231282
231282
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
231283
231283
|
)
|
|
231284
231284
|
);
|
|
231285
|
-
for (const
|
|
231286
|
-
if (
|
|
231285
|
+
for (const result3 of results) {
|
|
231286
|
+
if (result3?.config && Object.keys(result3.config).length > 0) {
|
|
231287
231287
|
writeTrace(
|
|
231288
|
-
`Found additional configuration file "${
|
|
231288
|
+
`Found additional configuration file "${result3.configFile}" at "${workspacePath}"`,
|
|
231289
231289
|
{
|
|
231290
231290
|
logLevel: "all"
|
|
231291
231291
|
}
|
|
231292
231292
|
);
|
|
231293
|
-
config2 = (0, import_deepmerge.default)(
|
|
231293
|
+
config2 = (0, import_deepmerge.default)(result3.config ?? {}, config2 ?? {});
|
|
231294
231294
|
}
|
|
231295
231295
|
}
|
|
231296
231296
|
}
|
|
@@ -231348,7 +231348,8 @@ var getConfigEnv = () => {
|
|
|
231348
231348
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
231349
231349
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
231350
231350
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
231351
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
231351
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
231352
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
231352
231353
|
},
|
|
231353
231354
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
231354
231355
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -231599,6 +231600,11 @@ var setConfigEnv = (config2) => {
|
|
|
231599
231600
|
config2.registry.cyclone
|
|
231600
231601
|
);
|
|
231601
231602
|
}
|
|
231603
|
+
if (config2.registry.container) {
|
|
231604
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
231605
|
+
config2.registry.cyclone
|
|
231606
|
+
);
|
|
231607
|
+
}
|
|
231602
231608
|
}
|
|
231603
231609
|
if (config2.logLevel) {
|
|
231604
231610
|
process.env[`${prefix}LOG_LEVEL`] = String(config2.logLevel);
|
|
@@ -231714,7 +231720,7 @@ var loadStormConfig = async (workspaceRoot3) => {
|
|
|
231714
231720
|
if (!_workspaceRoot) {
|
|
231715
231721
|
_workspaceRoot = findWorkspaceRoot();
|
|
231716
231722
|
}
|
|
231717
|
-
|
|
231723
|
+
const configFile = await getConfigFile(
|
|
231718
231724
|
_workspaceRoot
|
|
231719
231725
|
);
|
|
231720
231726
|
if (!configFile) {
|
|
@@ -231738,10 +231744,11 @@ var loadStormConfig = async (workspaceRoot3) => {
|
|
|
231738
231744
|
_workspaceRoot
|
|
231739
231745
|
);
|
|
231740
231746
|
setConfigEnv(config2);
|
|
231741
|
-
|
|
231742
|
-
|
|
231743
|
-
|
|
231744
|
-
|
|
231747
|
+
writeTrace(
|
|
231748
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
231749
|
+
${formatLogMessage(config2)}`,
|
|
231750
|
+
config2
|
|
231751
|
+
);
|
|
231745
231752
|
return config2;
|
|
231746
231753
|
};
|
|
231747
231754
|
|
|
@@ -232264,12 +232271,12 @@ var runCommit = async (commitConfig = "@storm-software/git-tools/commit/config.j
|
|
|
232264
232271
|
const message = formatCommitMessage(await commitPrompt(state));
|
|
232265
232272
|
const commitMsgFile = join4(getGitDir(), "COMMIT_EDITMSG");
|
|
232266
232273
|
const shellescape = await Promise.resolve().then(() => __toESM(require_shell_escape(), 1));
|
|
232267
|
-
const
|
|
232268
|
-
|
|
232269
|
-
"
|
|
232270
|
-
|
|
232271
|
-
|
|
232272
|
-
|
|
232274
|
+
const commandItems = ["git", "commit"];
|
|
232275
|
+
if (Boolean(process.env.CI) !== true) {
|
|
232276
|
+
commandItems.push("-S");
|
|
232277
|
+
}
|
|
232278
|
+
commandItems.push(...["--file", commitMsgFile]);
|
|
232279
|
+
const command = shellescape.default();
|
|
232273
232280
|
if (dryRun) {
|
|
232274
232281
|
console.log("Will execute command:");
|
|
232275
232282
|
console.log(command.replace(commitMsgFile, ".git/COMMIT_EDITMSG"));
|
package/bin/post-checkout.js
CHANGED
|
@@ -67131,7 +67131,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
67131
67131
|
github: RegistryUrlConfigSchema,
|
|
67132
67132
|
npm: RegistryUrlConfigSchema,
|
|
67133
67133
|
cargo: RegistryUrlConfigSchema,
|
|
67134
|
-
cyclone: RegistryUrlConfigSchema
|
|
67134
|
+
cyclone: RegistryUrlConfigSchema,
|
|
67135
|
+
container: RegistryUrlConfigSchema
|
|
67135
67136
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
67136
67137
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
67137
67138
|
MultiThemeColorConfigSchema
|
|
@@ -67399,7 +67400,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
67399
67400
|
|
|
67400
67401
|
// packages/config-tools/src/utilities/logger.ts
|
|
67401
67402
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
67402
|
-
|
|
67403
|
+
const _chalk = getChalk();
|
|
67403
67404
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
67404
67405
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
67405
67406
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -67596,10 +67597,9 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
67596
67597
|
};
|
|
67597
67598
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
67598
67599
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
67599
|
-
|
|
67600
|
-
|
|
67601
|
-
|
|
67602
|
-
);
|
|
67600
|
+
const result = await getConfigFileByName("storm", workspacePath);
|
|
67601
|
+
let config = result.config;
|
|
67602
|
+
const configFile = result.configFile;
|
|
67603
67603
|
if (config && Object.keys(config).length > 0) {
|
|
67604
67604
|
writeTrace(
|
|
67605
67605
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -67614,15 +67614,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
67614
67614
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
67615
67615
|
)
|
|
67616
67616
|
);
|
|
67617
|
-
for (const
|
|
67618
|
-
if (
|
|
67617
|
+
for (const result2 of results) {
|
|
67618
|
+
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
67619
67619
|
writeTrace(
|
|
67620
|
-
`Found additional configuration file "${
|
|
67620
|
+
`Found additional configuration file "${result2.configFile}" at "${workspacePath}"`,
|
|
67621
67621
|
{
|
|
67622
67622
|
logLevel: "all"
|
|
67623
67623
|
}
|
|
67624
67624
|
);
|
|
67625
|
-
config = (0, import_deepmerge.default)(
|
|
67625
|
+
config = (0, import_deepmerge.default)(result2.config ?? {}, config ?? {});
|
|
67626
67626
|
}
|
|
67627
67627
|
}
|
|
67628
67628
|
}
|
|
@@ -67680,7 +67680,8 @@ var getConfigEnv = () => {
|
|
|
67680
67680
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
67681
67681
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
67682
67682
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
67683
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
67683
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
67684
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
67684
67685
|
},
|
|
67685
67686
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
67686
67687
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -67931,6 +67932,11 @@ var setConfigEnv = (config) => {
|
|
|
67931
67932
|
config.registry.cyclone
|
|
67932
67933
|
);
|
|
67933
67934
|
}
|
|
67935
|
+
if (config.registry.container) {
|
|
67936
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
67937
|
+
config.registry.cyclone
|
|
67938
|
+
);
|
|
67939
|
+
}
|
|
67934
67940
|
}
|
|
67935
67941
|
if (config.logLevel) {
|
|
67936
67942
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
@@ -68046,7 +68052,7 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68046
68052
|
if (!_workspaceRoot) {
|
|
68047
68053
|
_workspaceRoot = findWorkspaceRoot();
|
|
68048
68054
|
}
|
|
68049
|
-
|
|
68055
|
+
const configFile = await getConfigFile(
|
|
68050
68056
|
_workspaceRoot
|
|
68051
68057
|
);
|
|
68052
68058
|
if (!configFile) {
|
|
@@ -68070,10 +68076,11 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68070
68076
|
_workspaceRoot
|
|
68071
68077
|
);
|
|
68072
68078
|
setConfigEnv(config);
|
|
68073
|
-
|
|
68074
|
-
|
|
68075
|
-
|
|
68076
|
-
|
|
68079
|
+
writeTrace(
|
|
68080
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
68081
|
+
${formatLogMessage(config)}`,
|
|
68082
|
+
config
|
|
68083
|
+
);
|
|
68077
68084
|
return config;
|
|
68078
68085
|
};
|
|
68079
68086
|
|
package/bin/post-commit.js
CHANGED
|
@@ -67131,7 +67131,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
67131
67131
|
github: RegistryUrlConfigSchema,
|
|
67132
67132
|
npm: RegistryUrlConfigSchema,
|
|
67133
67133
|
cargo: RegistryUrlConfigSchema,
|
|
67134
|
-
cyclone: RegistryUrlConfigSchema
|
|
67134
|
+
cyclone: RegistryUrlConfigSchema,
|
|
67135
|
+
container: RegistryUrlConfigSchema
|
|
67135
67136
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
67136
67137
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
67137
67138
|
MultiThemeColorConfigSchema
|
|
@@ -67399,7 +67400,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
67399
67400
|
|
|
67400
67401
|
// packages/config-tools/src/utilities/logger.ts
|
|
67401
67402
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
67402
|
-
|
|
67403
|
+
const _chalk = getChalk();
|
|
67403
67404
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
67404
67405
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
67405
67406
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -67596,10 +67597,9 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
67596
67597
|
};
|
|
67597
67598
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
67598
67599
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
67599
|
-
|
|
67600
|
-
|
|
67601
|
-
|
|
67602
|
-
);
|
|
67600
|
+
const result = await getConfigFileByName("storm", workspacePath);
|
|
67601
|
+
let config = result.config;
|
|
67602
|
+
const configFile = result.configFile;
|
|
67603
67603
|
if (config && Object.keys(config).length > 0) {
|
|
67604
67604
|
writeTrace(
|
|
67605
67605
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -67614,15 +67614,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
67614
67614
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
67615
67615
|
)
|
|
67616
67616
|
);
|
|
67617
|
-
for (const
|
|
67618
|
-
if (
|
|
67617
|
+
for (const result2 of results) {
|
|
67618
|
+
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
67619
67619
|
writeTrace(
|
|
67620
|
-
`Found additional configuration file "${
|
|
67620
|
+
`Found additional configuration file "${result2.configFile}" at "${workspacePath}"`,
|
|
67621
67621
|
{
|
|
67622
67622
|
logLevel: "all"
|
|
67623
67623
|
}
|
|
67624
67624
|
);
|
|
67625
|
-
config = (0, import_deepmerge.default)(
|
|
67625
|
+
config = (0, import_deepmerge.default)(result2.config ?? {}, config ?? {});
|
|
67626
67626
|
}
|
|
67627
67627
|
}
|
|
67628
67628
|
}
|
|
@@ -67680,7 +67680,8 @@ var getConfigEnv = () => {
|
|
|
67680
67680
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
67681
67681
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
67682
67682
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
67683
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
67683
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
67684
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
67684
67685
|
},
|
|
67685
67686
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
67686
67687
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -67931,6 +67932,11 @@ var setConfigEnv = (config) => {
|
|
|
67931
67932
|
config.registry.cyclone
|
|
67932
67933
|
);
|
|
67933
67934
|
}
|
|
67935
|
+
if (config.registry.container) {
|
|
67936
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
67937
|
+
config.registry.cyclone
|
|
67938
|
+
);
|
|
67939
|
+
}
|
|
67934
67940
|
}
|
|
67935
67941
|
if (config.logLevel) {
|
|
67936
67942
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
@@ -68046,7 +68052,7 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68046
68052
|
if (!_workspaceRoot) {
|
|
68047
68053
|
_workspaceRoot = findWorkspaceRoot();
|
|
68048
68054
|
}
|
|
68049
|
-
|
|
68055
|
+
const configFile = await getConfigFile(
|
|
68050
68056
|
_workspaceRoot
|
|
68051
68057
|
);
|
|
68052
68058
|
if (!configFile) {
|
|
@@ -68070,10 +68076,11 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68070
68076
|
_workspaceRoot
|
|
68071
68077
|
);
|
|
68072
68078
|
setConfigEnv(config);
|
|
68073
|
-
|
|
68074
|
-
|
|
68075
|
-
|
|
68076
|
-
|
|
68079
|
+
writeTrace(
|
|
68080
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
68081
|
+
${formatLogMessage(config)}`,
|
|
68082
|
+
config
|
|
68083
|
+
);
|
|
68077
68084
|
return config;
|
|
68078
68085
|
};
|
|
68079
68086
|
|
package/bin/post-merge.js
CHANGED
|
@@ -67131,7 +67131,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
67131
67131
|
github: RegistryUrlConfigSchema,
|
|
67132
67132
|
npm: RegistryUrlConfigSchema,
|
|
67133
67133
|
cargo: RegistryUrlConfigSchema,
|
|
67134
|
-
cyclone: RegistryUrlConfigSchema
|
|
67134
|
+
cyclone: RegistryUrlConfigSchema,
|
|
67135
|
+
container: RegistryUrlConfigSchema
|
|
67135
67136
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
67136
67137
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
67137
67138
|
MultiThemeColorConfigSchema
|
|
@@ -67399,7 +67400,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
67399
67400
|
|
|
67400
67401
|
// packages/config-tools/src/utilities/logger.ts
|
|
67401
67402
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
67402
|
-
|
|
67403
|
+
const _chalk = getChalk();
|
|
67403
67404
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
67404
67405
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
67405
67406
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -67596,10 +67597,9 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
67596
67597
|
};
|
|
67597
67598
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
67598
67599
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
67599
|
-
|
|
67600
|
-
|
|
67601
|
-
|
|
67602
|
-
);
|
|
67600
|
+
const result = await getConfigFileByName("storm", workspacePath);
|
|
67601
|
+
let config = result.config;
|
|
67602
|
+
const configFile = result.configFile;
|
|
67603
67603
|
if (config && Object.keys(config).length > 0) {
|
|
67604
67604
|
writeTrace(
|
|
67605
67605
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -67614,15 +67614,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
67614
67614
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
67615
67615
|
)
|
|
67616
67616
|
);
|
|
67617
|
-
for (const
|
|
67618
|
-
if (
|
|
67617
|
+
for (const result2 of results) {
|
|
67618
|
+
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
67619
67619
|
writeTrace(
|
|
67620
|
-
`Found additional configuration file "${
|
|
67620
|
+
`Found additional configuration file "${result2.configFile}" at "${workspacePath}"`,
|
|
67621
67621
|
{
|
|
67622
67622
|
logLevel: "all"
|
|
67623
67623
|
}
|
|
67624
67624
|
);
|
|
67625
|
-
config = (0, import_deepmerge.default)(
|
|
67625
|
+
config = (0, import_deepmerge.default)(result2.config ?? {}, config ?? {});
|
|
67626
67626
|
}
|
|
67627
67627
|
}
|
|
67628
67628
|
}
|
|
@@ -67680,7 +67680,8 @@ var getConfigEnv = () => {
|
|
|
67680
67680
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
67681
67681
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
67682
67682
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
67683
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
67683
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
67684
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
67684
67685
|
},
|
|
67685
67686
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
67686
67687
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -67931,6 +67932,11 @@ var setConfigEnv = (config) => {
|
|
|
67931
67932
|
config.registry.cyclone
|
|
67932
67933
|
);
|
|
67933
67934
|
}
|
|
67935
|
+
if (config.registry.container) {
|
|
67936
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
67937
|
+
config.registry.cyclone
|
|
67938
|
+
);
|
|
67939
|
+
}
|
|
67934
67940
|
}
|
|
67935
67941
|
if (config.logLevel) {
|
|
67936
67942
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
@@ -68046,7 +68052,7 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68046
68052
|
if (!_workspaceRoot) {
|
|
68047
68053
|
_workspaceRoot = findWorkspaceRoot();
|
|
68048
68054
|
}
|
|
68049
|
-
|
|
68055
|
+
const configFile = await getConfigFile(
|
|
68050
68056
|
_workspaceRoot
|
|
68051
68057
|
);
|
|
68052
68058
|
if (!configFile) {
|
|
@@ -68070,10 +68076,11 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68070
68076
|
_workspaceRoot
|
|
68071
68077
|
);
|
|
68072
68078
|
setConfigEnv(config);
|
|
68073
|
-
|
|
68074
|
-
|
|
68075
|
-
|
|
68076
|
-
|
|
68079
|
+
writeTrace(
|
|
68080
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
68081
|
+
${formatLogMessage(config)}`,
|
|
68082
|
+
config
|
|
68083
|
+
);
|
|
68077
68084
|
return config;
|
|
68078
68085
|
};
|
|
68079
68086
|
|
package/bin/pre-commit.js
CHANGED
|
@@ -67131,7 +67131,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
67131
67131
|
github: RegistryUrlConfigSchema,
|
|
67132
67132
|
npm: RegistryUrlConfigSchema,
|
|
67133
67133
|
cargo: RegistryUrlConfigSchema,
|
|
67134
|
-
cyclone: RegistryUrlConfigSchema
|
|
67134
|
+
cyclone: RegistryUrlConfigSchema,
|
|
67135
|
+
container: RegistryUrlConfigSchema
|
|
67135
67136
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
67136
67137
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
67137
67138
|
MultiThemeColorConfigSchema
|
|
@@ -67399,7 +67400,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
67399
67400
|
|
|
67400
67401
|
// packages/config-tools/src/utilities/logger.ts
|
|
67401
67402
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
67402
|
-
|
|
67403
|
+
const _chalk = getChalk();
|
|
67403
67404
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
67404
67405
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
67405
67406
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -67580,10 +67581,9 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
67580
67581
|
};
|
|
67581
67582
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
67582
67583
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
67583
|
-
|
|
67584
|
-
|
|
67585
|
-
|
|
67586
|
-
);
|
|
67584
|
+
const result = await getConfigFileByName("storm", workspacePath);
|
|
67585
|
+
let config = result.config;
|
|
67586
|
+
const configFile = result.configFile;
|
|
67587
67587
|
if (config && Object.keys(config).length > 0) {
|
|
67588
67588
|
writeTrace(
|
|
67589
67589
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -67598,15 +67598,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
67598
67598
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
67599
67599
|
)
|
|
67600
67600
|
);
|
|
67601
|
-
for (const
|
|
67602
|
-
if (
|
|
67601
|
+
for (const result2 of results) {
|
|
67602
|
+
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
67603
67603
|
writeTrace(
|
|
67604
|
-
`Found additional configuration file "${
|
|
67604
|
+
`Found additional configuration file "${result2.configFile}" at "${workspacePath}"`,
|
|
67605
67605
|
{
|
|
67606
67606
|
logLevel: "all"
|
|
67607
67607
|
}
|
|
67608
67608
|
);
|
|
67609
|
-
config = (0, import_deepmerge.default)(
|
|
67609
|
+
config = (0, import_deepmerge.default)(result2.config ?? {}, config ?? {});
|
|
67610
67610
|
}
|
|
67611
67611
|
}
|
|
67612
67612
|
}
|
|
@@ -67664,7 +67664,8 @@ var getConfigEnv = () => {
|
|
|
67664
67664
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
67665
67665
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
67666
67666
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
67667
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
67667
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
67668
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
67668
67669
|
},
|
|
67669
67670
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
67670
67671
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -67915,6 +67916,11 @@ var setConfigEnv = (config) => {
|
|
|
67915
67916
|
config.registry.cyclone
|
|
67916
67917
|
);
|
|
67917
67918
|
}
|
|
67919
|
+
if (config.registry.container) {
|
|
67920
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
67921
|
+
config.registry.cyclone
|
|
67922
|
+
);
|
|
67923
|
+
}
|
|
67918
67924
|
}
|
|
67919
67925
|
if (config.logLevel) {
|
|
67920
67926
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
@@ -68030,7 +68036,7 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68030
68036
|
if (!_workspaceRoot) {
|
|
68031
68037
|
_workspaceRoot = findWorkspaceRoot();
|
|
68032
68038
|
}
|
|
68033
|
-
|
|
68039
|
+
const configFile = await getConfigFile(
|
|
68034
68040
|
_workspaceRoot
|
|
68035
68041
|
);
|
|
68036
68042
|
if (!configFile) {
|
|
@@ -68054,10 +68060,11 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68054
68060
|
_workspaceRoot
|
|
68055
68061
|
);
|
|
68056
68062
|
setConfigEnv(config);
|
|
68057
|
-
|
|
68058
|
-
|
|
68059
|
-
|
|
68060
|
-
|
|
68063
|
+
writeTrace(
|
|
68064
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
68065
|
+
${formatLogMessage(config)}`,
|
|
68066
|
+
config
|
|
68067
|
+
);
|
|
68061
68068
|
return config;
|
|
68062
68069
|
};
|
|
68063
68070
|
|
package/bin/pre-install.js
CHANGED
|
@@ -67131,7 +67131,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
67131
67131
|
github: RegistryUrlConfigSchema,
|
|
67132
67132
|
npm: RegistryUrlConfigSchema,
|
|
67133
67133
|
cargo: RegistryUrlConfigSchema,
|
|
67134
|
-
cyclone: RegistryUrlConfigSchema
|
|
67134
|
+
cyclone: RegistryUrlConfigSchema,
|
|
67135
|
+
container: RegistryUrlConfigSchema
|
|
67135
67136
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
67136
67137
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
67137
67138
|
MultiThemeColorConfigSchema
|
|
@@ -67399,7 +67400,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
67399
67400
|
|
|
67400
67401
|
// packages/config-tools/src/utilities/logger.ts
|
|
67401
67402
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
67402
|
-
|
|
67403
|
+
const _chalk = getChalk();
|
|
67403
67404
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
67404
67405
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
67405
67406
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -67596,10 +67597,9 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
67596
67597
|
};
|
|
67597
67598
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
67598
67599
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
67599
|
-
|
|
67600
|
-
|
|
67601
|
-
|
|
67602
|
-
);
|
|
67600
|
+
const result = await getConfigFileByName("storm", workspacePath);
|
|
67601
|
+
let config = result.config;
|
|
67602
|
+
const configFile = result.configFile;
|
|
67603
67603
|
if (config && Object.keys(config).length > 0) {
|
|
67604
67604
|
writeTrace(
|
|
67605
67605
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -67614,15 +67614,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
67614
67614
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
67615
67615
|
)
|
|
67616
67616
|
);
|
|
67617
|
-
for (const
|
|
67618
|
-
if (
|
|
67617
|
+
for (const result2 of results) {
|
|
67618
|
+
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
67619
67619
|
writeTrace(
|
|
67620
|
-
`Found additional configuration file "${
|
|
67620
|
+
`Found additional configuration file "${result2.configFile}" at "${workspacePath}"`,
|
|
67621
67621
|
{
|
|
67622
67622
|
logLevel: "all"
|
|
67623
67623
|
}
|
|
67624
67624
|
);
|
|
67625
|
-
config = (0, import_deepmerge.default)(
|
|
67625
|
+
config = (0, import_deepmerge.default)(result2.config ?? {}, config ?? {});
|
|
67626
67626
|
}
|
|
67627
67627
|
}
|
|
67628
67628
|
}
|
|
@@ -67680,7 +67680,8 @@ var getConfigEnv = () => {
|
|
|
67680
67680
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
67681
67681
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
67682
67682
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
67683
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
67683
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
67684
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
67684
67685
|
},
|
|
67685
67686
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
67686
67687
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -67931,6 +67932,11 @@ var setConfigEnv = (config) => {
|
|
|
67931
67932
|
config.registry.cyclone
|
|
67932
67933
|
);
|
|
67933
67934
|
}
|
|
67935
|
+
if (config.registry.container) {
|
|
67936
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
67937
|
+
config.registry.cyclone
|
|
67938
|
+
);
|
|
67939
|
+
}
|
|
67934
67940
|
}
|
|
67935
67941
|
if (config.logLevel) {
|
|
67936
67942
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
@@ -68046,7 +68052,7 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68046
68052
|
if (!_workspaceRoot) {
|
|
68047
68053
|
_workspaceRoot = findWorkspaceRoot();
|
|
68048
68054
|
}
|
|
68049
|
-
|
|
68055
|
+
const configFile = await getConfigFile(
|
|
68050
68056
|
_workspaceRoot
|
|
68051
68057
|
);
|
|
68052
68058
|
if (!configFile) {
|
|
@@ -68070,10 +68076,11 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68070
68076
|
_workspaceRoot
|
|
68071
68077
|
);
|
|
68072
68078
|
setConfigEnv(config);
|
|
68073
|
-
|
|
68074
|
-
|
|
68075
|
-
|
|
68076
|
-
|
|
68079
|
+
writeTrace(
|
|
68080
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
68081
|
+
${formatLogMessage(config)}`,
|
|
68082
|
+
config
|
|
68083
|
+
);
|
|
68077
68084
|
return config;
|
|
68078
68085
|
};
|
|
68079
68086
|
|
package/bin/pre-push.js
CHANGED
|
@@ -67136,7 +67136,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
67136
67136
|
github: RegistryUrlConfigSchema,
|
|
67137
67137
|
npm: RegistryUrlConfigSchema,
|
|
67138
67138
|
cargo: RegistryUrlConfigSchema,
|
|
67139
|
-
cyclone: RegistryUrlConfigSchema
|
|
67139
|
+
cyclone: RegistryUrlConfigSchema,
|
|
67140
|
+
container: RegistryUrlConfigSchema
|
|
67140
67141
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
67141
67142
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
67142
67143
|
MultiThemeColorConfigSchema
|
|
@@ -67404,7 +67405,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
67404
67405
|
|
|
67405
67406
|
// packages/config-tools/src/utilities/logger.ts
|
|
67406
67407
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
67407
|
-
|
|
67408
|
+
const _chalk = getChalk();
|
|
67408
67409
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
67409
67410
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
67410
67411
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -67601,10 +67602,9 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
67601
67602
|
};
|
|
67602
67603
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
67603
67604
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
67604
|
-
|
|
67605
|
-
|
|
67606
|
-
|
|
67607
|
-
);
|
|
67605
|
+
const result = await getConfigFileByName("storm", workspacePath);
|
|
67606
|
+
let config = result.config;
|
|
67607
|
+
const configFile = result.configFile;
|
|
67608
67608
|
if (config && Object.keys(config).length > 0) {
|
|
67609
67609
|
writeTrace(
|
|
67610
67610
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -67619,15 +67619,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
67619
67619
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
67620
67620
|
)
|
|
67621
67621
|
);
|
|
67622
|
-
for (const
|
|
67623
|
-
if (
|
|
67622
|
+
for (const result2 of results) {
|
|
67623
|
+
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
67624
67624
|
writeTrace(
|
|
67625
|
-
`Found additional configuration file "${
|
|
67625
|
+
`Found additional configuration file "${result2.configFile}" at "${workspacePath}"`,
|
|
67626
67626
|
{
|
|
67627
67627
|
logLevel: "all"
|
|
67628
67628
|
}
|
|
67629
67629
|
);
|
|
67630
|
-
config = (0, import_deepmerge.default)(
|
|
67630
|
+
config = (0, import_deepmerge.default)(result2.config ?? {}, config ?? {});
|
|
67631
67631
|
}
|
|
67632
67632
|
}
|
|
67633
67633
|
}
|
|
@@ -67685,7 +67685,8 @@ var getConfigEnv = () => {
|
|
|
67685
67685
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
67686
67686
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
67687
67687
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
67688
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
67688
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
67689
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
67689
67690
|
},
|
|
67690
67691
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
67691
67692
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -67936,6 +67937,11 @@ var setConfigEnv = (config) => {
|
|
|
67936
67937
|
config.registry.cyclone
|
|
67937
67938
|
);
|
|
67938
67939
|
}
|
|
67940
|
+
if (config.registry.container) {
|
|
67941
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
67942
|
+
config.registry.cyclone
|
|
67943
|
+
);
|
|
67944
|
+
}
|
|
67939
67945
|
}
|
|
67940
67946
|
if (config.logLevel) {
|
|
67941
67947
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
@@ -68051,7 +68057,7 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68051
68057
|
if (!_workspaceRoot) {
|
|
68052
68058
|
_workspaceRoot = findWorkspaceRoot();
|
|
68053
68059
|
}
|
|
68054
|
-
|
|
68060
|
+
const configFile = await getConfigFile(
|
|
68055
68061
|
_workspaceRoot
|
|
68056
68062
|
);
|
|
68057
68063
|
if (!configFile) {
|
|
@@ -68075,10 +68081,11 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68075
68081
|
_workspaceRoot
|
|
68076
68082
|
);
|
|
68077
68083
|
setConfigEnv(config);
|
|
68078
|
-
|
|
68079
|
-
|
|
68080
|
-
|
|
68081
|
-
|
|
68084
|
+
writeTrace(
|
|
68085
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
68086
|
+
${formatLogMessage(config)}`,
|
|
68087
|
+
config
|
|
68088
|
+
);
|
|
68082
68089
|
return config;
|
|
68083
68090
|
};
|
|
68084
68091
|
|
package/bin/prepare.js
CHANGED
|
@@ -67131,7 +67131,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
67131
67131
|
github: RegistryUrlConfigSchema,
|
|
67132
67132
|
npm: RegistryUrlConfigSchema,
|
|
67133
67133
|
cargo: RegistryUrlConfigSchema,
|
|
67134
|
-
cyclone: RegistryUrlConfigSchema
|
|
67134
|
+
cyclone: RegistryUrlConfigSchema,
|
|
67135
|
+
container: RegistryUrlConfigSchema
|
|
67135
67136
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
67136
67137
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
67137
67138
|
MultiThemeColorConfigSchema
|
|
@@ -67399,7 +67400,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
67399
67400
|
|
|
67400
67401
|
// packages/config-tools/src/utilities/logger.ts
|
|
67401
67402
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
67402
|
-
|
|
67403
|
+
const _chalk = getChalk();
|
|
67403
67404
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
67404
67405
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
67405
67406
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -67596,10 +67597,9 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
67596
67597
|
};
|
|
67597
67598
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
67598
67599
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
67599
|
-
|
|
67600
|
-
|
|
67601
|
-
|
|
67602
|
-
);
|
|
67600
|
+
const result = await getConfigFileByName("storm", workspacePath);
|
|
67601
|
+
let config = result.config;
|
|
67602
|
+
const configFile = result.configFile;
|
|
67603
67603
|
if (config && Object.keys(config).length > 0) {
|
|
67604
67604
|
writeTrace(
|
|
67605
67605
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -67614,15 +67614,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
67614
67614
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
67615
67615
|
)
|
|
67616
67616
|
);
|
|
67617
|
-
for (const
|
|
67618
|
-
if (
|
|
67617
|
+
for (const result2 of results) {
|
|
67618
|
+
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
67619
67619
|
writeTrace(
|
|
67620
|
-
`Found additional configuration file "${
|
|
67620
|
+
`Found additional configuration file "${result2.configFile}" at "${workspacePath}"`,
|
|
67621
67621
|
{
|
|
67622
67622
|
logLevel: "all"
|
|
67623
67623
|
}
|
|
67624
67624
|
);
|
|
67625
|
-
config = (0, import_deepmerge.default)(
|
|
67625
|
+
config = (0, import_deepmerge.default)(result2.config ?? {}, config ?? {});
|
|
67626
67626
|
}
|
|
67627
67627
|
}
|
|
67628
67628
|
}
|
|
@@ -67680,7 +67680,8 @@ var getConfigEnv = () => {
|
|
|
67680
67680
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
67681
67681
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
67682
67682
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
67683
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
67683
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
67684
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
67684
67685
|
},
|
|
67685
67686
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
67686
67687
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -67931,6 +67932,11 @@ var setConfigEnv = (config) => {
|
|
|
67931
67932
|
config.registry.cyclone
|
|
67932
67933
|
);
|
|
67933
67934
|
}
|
|
67935
|
+
if (config.registry.container) {
|
|
67936
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
67937
|
+
config.registry.cyclone
|
|
67938
|
+
);
|
|
67939
|
+
}
|
|
67934
67940
|
}
|
|
67935
67941
|
if (config.logLevel) {
|
|
67936
67942
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
@@ -68046,7 +68052,7 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68046
68052
|
if (!_workspaceRoot) {
|
|
68047
68053
|
_workspaceRoot = findWorkspaceRoot();
|
|
68048
68054
|
}
|
|
68049
|
-
|
|
68055
|
+
const configFile = await getConfigFile(
|
|
68050
68056
|
_workspaceRoot
|
|
68051
68057
|
);
|
|
68052
68058
|
if (!configFile) {
|
|
@@ -68070,10 +68076,11 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68070
68076
|
_workspaceRoot
|
|
68071
68077
|
);
|
|
68072
68078
|
setConfigEnv(config);
|
|
68073
|
-
|
|
68074
|
-
|
|
68075
|
-
|
|
68076
|
-
|
|
68079
|
+
writeTrace(
|
|
68080
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
68081
|
+
${formatLogMessage(config)}`,
|
|
68082
|
+
config
|
|
68083
|
+
);
|
|
68077
68084
|
return config;
|
|
68078
68085
|
};
|
|
68079
68086
|
|
package/bin/version-warning.js
CHANGED
|
@@ -67131,7 +67131,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
67131
67131
|
github: RegistryUrlConfigSchema,
|
|
67132
67132
|
npm: RegistryUrlConfigSchema,
|
|
67133
67133
|
cargo: RegistryUrlConfigSchema,
|
|
67134
|
-
cyclone: RegistryUrlConfigSchema
|
|
67134
|
+
cyclone: RegistryUrlConfigSchema,
|
|
67135
|
+
container: RegistryUrlConfigSchema
|
|
67135
67136
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
67136
67137
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
67137
67138
|
MultiThemeColorConfigSchema
|
|
@@ -67399,7 +67400,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
67399
67400
|
|
|
67400
67401
|
// packages/config-tools/src/utilities/logger.ts
|
|
67401
67402
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
67402
|
-
|
|
67403
|
+
const _chalk = getChalk();
|
|
67403
67404
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
67404
67405
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
67405
67406
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -67575,10 +67576,9 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
67575
67576
|
};
|
|
67576
67577
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
67577
67578
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
67578
|
-
|
|
67579
|
-
|
|
67580
|
-
|
|
67581
|
-
);
|
|
67579
|
+
const result = await getConfigFileByName("storm", workspacePath);
|
|
67580
|
+
let config = result.config;
|
|
67581
|
+
const configFile = result.configFile;
|
|
67582
67582
|
if (config && Object.keys(config).length > 0) {
|
|
67583
67583
|
writeTrace(
|
|
67584
67584
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -67593,15 +67593,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
67593
67593
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
67594
67594
|
)
|
|
67595
67595
|
);
|
|
67596
|
-
for (const
|
|
67597
|
-
if (
|
|
67596
|
+
for (const result2 of results) {
|
|
67597
|
+
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
67598
67598
|
writeTrace(
|
|
67599
|
-
`Found additional configuration file "${
|
|
67599
|
+
`Found additional configuration file "${result2.configFile}" at "${workspacePath}"`,
|
|
67600
67600
|
{
|
|
67601
67601
|
logLevel: "all"
|
|
67602
67602
|
}
|
|
67603
67603
|
);
|
|
67604
|
-
config = (0, import_deepmerge.default)(
|
|
67604
|
+
config = (0, import_deepmerge.default)(result2.config ?? {}, config ?? {});
|
|
67605
67605
|
}
|
|
67606
67606
|
}
|
|
67607
67607
|
}
|
|
@@ -67659,7 +67659,8 @@ var getConfigEnv = () => {
|
|
|
67659
67659
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
67660
67660
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
67661
67661
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
67662
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
67662
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
67663
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
67663
67664
|
},
|
|
67664
67665
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
67665
67666
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -67910,6 +67911,11 @@ var setConfigEnv = (config) => {
|
|
|
67910
67911
|
config.registry.cyclone
|
|
67911
67912
|
);
|
|
67912
67913
|
}
|
|
67914
|
+
if (config.registry.container) {
|
|
67915
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
67916
|
+
config.registry.cyclone
|
|
67917
|
+
);
|
|
67918
|
+
}
|
|
67913
67919
|
}
|
|
67914
67920
|
if (config.logLevel) {
|
|
67915
67921
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
@@ -68025,7 +68031,7 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68025
68031
|
if (!_workspaceRoot) {
|
|
68026
68032
|
_workspaceRoot = findWorkspaceRoot();
|
|
68027
68033
|
}
|
|
68028
|
-
|
|
68034
|
+
const configFile = await getConfigFile(
|
|
68029
68035
|
_workspaceRoot
|
|
68030
68036
|
);
|
|
68031
68037
|
if (!configFile) {
|
|
@@ -68049,10 +68055,11 @@ var loadStormConfig = async (workspaceRoot) => {
|
|
|
68049
68055
|
_workspaceRoot
|
|
68050
68056
|
);
|
|
68051
68057
|
setConfigEnv(config);
|
|
68052
|
-
|
|
68053
|
-
|
|
68054
|
-
|
|
68055
|
-
|
|
68058
|
+
writeTrace(
|
|
68059
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
68060
|
+
${formatLogMessage(config)}`,
|
|
68061
|
+
config
|
|
68062
|
+
);
|
|
68056
68063
|
return config;
|
|
68057
68064
|
};
|
|
68058
68065
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storm-software/git-tools",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.56.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "⚡ A package containing various git tools used in Storm workspaces.",
|
|
6
6
|
"repository": {
|
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
"htmlparser2": "9.1.0",
|
|
71
71
|
"inquirer": "9.2.23",
|
|
72
72
|
"jsonc-parser": "3.2.1",
|
|
73
|
-
"nx": "^19.6.
|
|
73
|
+
"nx": "^19.6.4",
|
|
74
74
|
"prettier": "3.3.2",
|
|
75
75
|
"semver": "7.6.2",
|
|
76
76
|
"tsconfig-paths": "4.2.0",
|
package/src/cli/index.js
CHANGED
|
@@ -226652,7 +226652,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
226652
226652
|
github: RegistryUrlConfigSchema,
|
|
226653
226653
|
npm: RegistryUrlConfigSchema,
|
|
226654
226654
|
cargo: RegistryUrlConfigSchema,
|
|
226655
|
-
cyclone: RegistryUrlConfigSchema
|
|
226655
|
+
cyclone: RegistryUrlConfigSchema,
|
|
226656
|
+
container: RegistryUrlConfigSchema
|
|
226656
226657
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
226657
226658
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
226658
226659
|
MultiThemeColorConfigSchema
|
|
@@ -226920,7 +226921,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
226920
226921
|
|
|
226921
226922
|
// packages/config-tools/src/utilities/logger.ts
|
|
226922
226923
|
var getLogFn = (logLevel = LogLevel.INFO, config2 = {}) => {
|
|
226923
|
-
|
|
226924
|
+
const _chalk = getChalk();
|
|
226924
226925
|
const colors = !config2.colors?.dark && !config2.colors?.["base"] && !config2.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config2.colors?.dark && typeof config2.colors.dark === "string" ? config2.colors : config2.colors?.["base"]?.dark && typeof config2.colors["base"].dark === "string" ? config2.colors["base"].dark : config2.colors?.["base"] ? config2.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
226925
226926
|
const configLogLevel = config2.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
226926
226927
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -227059,10 +227060,9 @@ var getConfigFileByName = async (fileName, filePath, options8 = {}) => {
|
|
|
227059
227060
|
};
|
|
227060
227061
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
227061
227062
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
227062
|
-
|
|
227063
|
-
|
|
227064
|
-
|
|
227065
|
-
);
|
|
227063
|
+
const result2 = await getConfigFileByName("storm", workspacePath);
|
|
227064
|
+
let config2 = result2.config;
|
|
227065
|
+
const configFile = result2.configFile;
|
|
227066
227066
|
if (config2 && Object.keys(config2).length > 0) {
|
|
227067
227067
|
writeTrace(
|
|
227068
227068
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -227077,15 +227077,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
227077
227077
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
227078
227078
|
)
|
|
227079
227079
|
);
|
|
227080
|
-
for (const
|
|
227081
|
-
if (
|
|
227080
|
+
for (const result3 of results) {
|
|
227081
|
+
if (result3?.config && Object.keys(result3.config).length > 0) {
|
|
227082
227082
|
writeTrace(
|
|
227083
|
-
`Found additional configuration file "${
|
|
227083
|
+
`Found additional configuration file "${result3.configFile}" at "${workspacePath}"`,
|
|
227084
227084
|
{
|
|
227085
227085
|
logLevel: "all"
|
|
227086
227086
|
}
|
|
227087
227087
|
);
|
|
227088
|
-
config2 = (0, import_deepmerge.default)(
|
|
227088
|
+
config2 = (0, import_deepmerge.default)(result3.config ?? {}, config2 ?? {});
|
|
227089
227089
|
}
|
|
227090
227090
|
}
|
|
227091
227091
|
}
|
|
@@ -227143,7 +227143,8 @@ var getConfigEnv = () => {
|
|
|
227143
227143
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
227144
227144
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
227145
227145
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
227146
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
227146
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
227147
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
227147
227148
|
},
|
|
227148
227149
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
227149
227150
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -227394,6 +227395,11 @@ var setConfigEnv = (config2) => {
|
|
|
227394
227395
|
config2.registry.cyclone
|
|
227395
227396
|
);
|
|
227396
227397
|
}
|
|
227398
|
+
if (config2.registry.container) {
|
|
227399
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
227400
|
+
config2.registry.cyclone
|
|
227401
|
+
);
|
|
227402
|
+
}
|
|
227397
227403
|
}
|
|
227398
227404
|
if (config2.logLevel) {
|
|
227399
227405
|
process.env[`${prefix}LOG_LEVEL`] = String(config2.logLevel);
|
|
@@ -227509,7 +227515,7 @@ var loadStormConfig = async (workspaceRoot3) => {
|
|
|
227509
227515
|
if (!_workspaceRoot) {
|
|
227510
227516
|
_workspaceRoot = findWorkspaceRoot();
|
|
227511
227517
|
}
|
|
227512
|
-
|
|
227518
|
+
const configFile = await getConfigFile(
|
|
227513
227519
|
_workspaceRoot
|
|
227514
227520
|
);
|
|
227515
227521
|
if (!configFile) {
|
|
@@ -227533,10 +227539,11 @@ var loadStormConfig = async (workspaceRoot3) => {
|
|
|
227533
227539
|
_workspaceRoot
|
|
227534
227540
|
);
|
|
227535
227541
|
setConfigEnv(config2);
|
|
227536
|
-
|
|
227537
|
-
|
|
227538
|
-
|
|
227539
|
-
|
|
227542
|
+
writeTrace(
|
|
227543
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
227544
|
+
${formatLogMessage(config2)}`,
|
|
227545
|
+
config2
|
|
227546
|
+
);
|
|
227540
227547
|
return config2;
|
|
227541
227548
|
};
|
|
227542
227549
|
|
|
@@ -228054,12 +228061,12 @@ var runCommit = async (commitConfig = "@storm-software/git-tools/commit/config.j
|
|
|
228054
228061
|
const message = formatCommitMessage(await commitPrompt(state));
|
|
228055
228062
|
const commitMsgFile = join4(getGitDir(), "COMMIT_EDITMSG");
|
|
228056
228063
|
const shellescape = await Promise.resolve().then(() => __toESM(require_shell_escape(), 1));
|
|
228057
|
-
const
|
|
228058
|
-
|
|
228059
|
-
"
|
|
228060
|
-
|
|
228061
|
-
|
|
228062
|
-
|
|
228064
|
+
const commandItems = ["git", "commit"];
|
|
228065
|
+
if (Boolean(process.env.CI) !== true) {
|
|
228066
|
+
commandItems.push("-S");
|
|
228067
|
+
}
|
|
228068
|
+
commandItems.push(...["--file", commitMsgFile]);
|
|
228069
|
+
const command = shellescape.default();
|
|
228063
228070
|
if (dryRun) {
|
|
228064
228071
|
console.log("Will execute command:");
|
|
228065
228072
|
console.log(command.replace(commitMsgFile, ".git/COMMIT_EDITMSG"));
|
package/src/commit/index.js
CHANGED
|
@@ -37375,7 +37375,8 @@ var RegistryConfigSchema = z.object({
|
|
|
37375
37375
|
github: RegistryUrlConfigSchema,
|
|
37376
37376
|
npm: RegistryUrlConfigSchema,
|
|
37377
37377
|
cargo: RegistryUrlConfigSchema,
|
|
37378
|
-
cyclone: RegistryUrlConfigSchema
|
|
37378
|
+
cyclone: RegistryUrlConfigSchema,
|
|
37379
|
+
container: RegistryUrlConfigSchema
|
|
37379
37380
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
37380
37381
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
37381
37382
|
MultiThemeColorConfigSchema
|
|
@@ -37546,7 +37547,7 @@ var getLogLevel = (label) => {
|
|
|
37546
37547
|
|
|
37547
37548
|
// packages/config-tools/src/utilities/logger.ts
|
|
37548
37549
|
var getLogFn = (logLevel = LogLevel.INFO, config2 = {}) => {
|
|
37549
|
-
|
|
37550
|
+
const _chalk = getChalk();
|
|
37550
37551
|
const colors = !config2.colors?.dark && !config2.colors?.["base"] && !config2.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config2.colors?.dark && typeof config2.colors.dark === "string" ? config2.colors : config2.colors?.["base"]?.dark && typeof config2.colors["base"].dark === "string" ? config2.colors["base"].dark : config2.colors?.["base"] ? config2.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
37551
37552
|
const configLogLevel = config2.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
37552
37553
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -38083,12 +38084,12 @@ var runCommit = async (commitConfig = "@storm-software/git-tools/commit/config.j
|
|
|
38083
38084
|
const message = formatCommitMessage(await commitPrompt(state));
|
|
38084
38085
|
const commitMsgFile = join(getGitDir(), "COMMIT_EDITMSG");
|
|
38085
38086
|
const shellescape = await Promise.resolve().then(() => __toESM(require_shell_escape(), 1));
|
|
38086
|
-
const
|
|
38087
|
-
|
|
38088
|
-
"
|
|
38089
|
-
|
|
38090
|
-
|
|
38091
|
-
|
|
38087
|
+
const commandItems = ["git", "commit"];
|
|
38088
|
+
if (Boolean(process.env.CI) !== true) {
|
|
38089
|
+
commandItems.push("-S");
|
|
38090
|
+
}
|
|
38091
|
+
commandItems.push(...["--file", commitMsgFile]);
|
|
38092
|
+
const command = shellescape.default();
|
|
38092
38093
|
if (dryRun) {
|
|
38093
38094
|
console.log("Will execute command:");
|
|
38094
38095
|
console.log(command.replace(commitMsgFile, ".git/COMMIT_EDITMSG"));
|
package/src/commitizen/index.js
CHANGED
|
@@ -37322,7 +37322,8 @@ var RegistryConfigSchema = z.object({
|
|
|
37322
37322
|
github: RegistryUrlConfigSchema,
|
|
37323
37323
|
npm: RegistryUrlConfigSchema,
|
|
37324
37324
|
cargo: RegistryUrlConfigSchema,
|
|
37325
|
-
cyclone: RegistryUrlConfigSchema
|
|
37325
|
+
cyclone: RegistryUrlConfigSchema,
|
|
37326
|
+
container: RegistryUrlConfigSchema
|
|
37326
37327
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
37327
37328
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
37328
37329
|
MultiThemeColorConfigSchema
|
|
@@ -37493,7 +37494,7 @@ var getLogLevel = (label) => {
|
|
|
37493
37494
|
|
|
37494
37495
|
// packages/config-tools/src/utilities/logger.ts
|
|
37495
37496
|
var getLogFn = (logLevel = LogLevel.INFO, config2 = {}) => {
|
|
37496
|
-
|
|
37497
|
+
const _chalk = getChalk();
|
|
37497
37498
|
const colors = !config2.colors?.dark && !config2.colors?.["base"] && !config2.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config2.colors?.dark && typeof config2.colors.dark === "string" ? config2.colors : config2.colors?.["base"]?.dark && typeof config2.colors["base"].dark === "string" ? config2.colors["base"].dark : config2.colors?.["base"] ? config2.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
37498
37499
|
const configLogLevel = config2.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
37499
37500
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
package/src/index.js
CHANGED
|
@@ -226652,7 +226652,8 @@ var RegistryConfigSchema = z2.object({
|
|
|
226652
226652
|
github: RegistryUrlConfigSchema,
|
|
226653
226653
|
npm: RegistryUrlConfigSchema,
|
|
226654
226654
|
cargo: RegistryUrlConfigSchema,
|
|
226655
|
-
cyclone: RegistryUrlConfigSchema
|
|
226655
|
+
cyclone: RegistryUrlConfigSchema,
|
|
226656
|
+
container: RegistryUrlConfigSchema
|
|
226656
226657
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
226657
226658
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
226658
226659
|
MultiThemeColorConfigSchema
|
|
@@ -226920,7 +226921,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
226920
226921
|
|
|
226921
226922
|
// packages/config-tools/src/utilities/logger.ts
|
|
226922
226923
|
var getLogFn = (logLevel = LogLevel.INFO, config2 = {}) => {
|
|
226923
|
-
|
|
226924
|
+
const _chalk = getChalk();
|
|
226924
226925
|
const colors = !config2.colors?.dark && !config2.colors?.["base"] && !config2.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config2.colors?.dark && typeof config2.colors.dark === "string" ? config2.colors : config2.colors?.["base"]?.dark && typeof config2.colors["base"].dark === "string" ? config2.colors["base"].dark : config2.colors?.["base"] ? config2.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
226925
226926
|
const configLogLevel = config2.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
226926
226927
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
@@ -227059,10 +227060,9 @@ var getConfigFileByName = async (fileName, filePath, options8 = {}) => {
|
|
|
227059
227060
|
};
|
|
227060
227061
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
227061
227062
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
227062
|
-
|
|
227063
|
-
|
|
227064
|
-
|
|
227065
|
-
);
|
|
227063
|
+
const result2 = await getConfigFileByName("storm", workspacePath);
|
|
227064
|
+
let config2 = result2.config;
|
|
227065
|
+
const configFile = result2.configFile;
|
|
227066
227066
|
if (config2 && Object.keys(config2).length > 0) {
|
|
227067
227067
|
writeTrace(
|
|
227068
227068
|
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
@@ -227077,15 +227077,15 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
227077
227077
|
(fileName) => getConfigFileByName(fileName, workspacePath)
|
|
227078
227078
|
)
|
|
227079
227079
|
);
|
|
227080
|
-
for (const
|
|
227081
|
-
if (
|
|
227080
|
+
for (const result3 of results) {
|
|
227081
|
+
if (result3?.config && Object.keys(result3.config).length > 0) {
|
|
227082
227082
|
writeTrace(
|
|
227083
|
-
`Found additional configuration file "${
|
|
227083
|
+
`Found additional configuration file "${result3.configFile}" at "${workspacePath}"`,
|
|
227084
227084
|
{
|
|
227085
227085
|
logLevel: "all"
|
|
227086
227086
|
}
|
|
227087
227087
|
);
|
|
227088
|
-
config2 = (0, import_deepmerge.default)(
|
|
227088
|
+
config2 = (0, import_deepmerge.default)(result3.config ?? {}, config2 ?? {});
|
|
227089
227089
|
}
|
|
227090
227090
|
}
|
|
227091
227091
|
}
|
|
@@ -227143,7 +227143,8 @@ var getConfigEnv = () => {
|
|
|
227143
227143
|
github: process.env[`${prefix}REGISTRY_GITHUB`],
|
|
227144
227144
|
npm: process.env[`${prefix}REGISTRY_NPM`],
|
|
227145
227145
|
cargo: process.env[`${prefix}REGISTRY_CARGO`],
|
|
227146
|
-
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
|
|
227146
|
+
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`],
|
|
227147
|
+
container: process.env[`${prefix}REGISTRY_CONTAINER`]
|
|
227147
227148
|
},
|
|
227148
227149
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
227149
227150
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
@@ -227394,6 +227395,11 @@ var setConfigEnv = (config2) => {
|
|
|
227394
227395
|
config2.registry.cyclone
|
|
227395
227396
|
);
|
|
227396
227397
|
}
|
|
227398
|
+
if (config2.registry.container) {
|
|
227399
|
+
process.env[`${prefix}REGISTRY_CONTAINER`] = String(
|
|
227400
|
+
config2.registry.cyclone
|
|
227401
|
+
);
|
|
227402
|
+
}
|
|
227397
227403
|
}
|
|
227398
227404
|
if (config2.logLevel) {
|
|
227399
227405
|
process.env[`${prefix}LOG_LEVEL`] = String(config2.logLevel);
|
|
@@ -227509,7 +227515,7 @@ var loadStormConfig = async (workspaceRoot3) => {
|
|
|
227509
227515
|
if (!_workspaceRoot) {
|
|
227510
227516
|
_workspaceRoot = findWorkspaceRoot();
|
|
227511
227517
|
}
|
|
227512
|
-
|
|
227518
|
+
const configFile = await getConfigFile(
|
|
227513
227519
|
_workspaceRoot
|
|
227514
227520
|
);
|
|
227515
227521
|
if (!configFile) {
|
|
@@ -227533,10 +227539,11 @@ var loadStormConfig = async (workspaceRoot3) => {
|
|
|
227533
227539
|
_workspaceRoot
|
|
227534
227540
|
);
|
|
227535
227541
|
setConfigEnv(config2);
|
|
227536
|
-
|
|
227537
|
-
|
|
227538
|
-
|
|
227539
|
-
|
|
227542
|
+
writeTrace(
|
|
227543
|
+
`\u2699\uFE0F Using Storm configuration:
|
|
227544
|
+
${formatLogMessage(config2)}`,
|
|
227545
|
+
config2
|
|
227546
|
+
);
|
|
227540
227547
|
return config2;
|
|
227541
227548
|
};
|
|
227542
227549
|
|
|
@@ -228156,12 +228163,12 @@ var runCommit = async (commitConfig = "@storm-software/git-tools/commit/config.j
|
|
|
228156
228163
|
const message = formatCommitMessage(await commitPrompt(state));
|
|
228157
228164
|
const commitMsgFile = join4(getGitDir(), "COMMIT_EDITMSG");
|
|
228158
228165
|
const shellescape = await Promise.resolve().then(() => __toESM(require_shell_escape(), 1));
|
|
228159
|
-
const
|
|
228160
|
-
|
|
228161
|
-
"
|
|
228162
|
-
|
|
228163
|
-
|
|
228164
|
-
|
|
228166
|
+
const commandItems = ["git", "commit"];
|
|
228167
|
+
if (Boolean(process.env.CI) !== true) {
|
|
228168
|
+
commandItems.push("-S");
|
|
228169
|
+
}
|
|
228170
|
+
commandItems.push(...["--file", commitMsgFile]);
|
|
228171
|
+
const command = shellescape.default();
|
|
228165
228172
|
if (dryRun) {
|
|
228166
228173
|
console.log("Will execute command:");
|
|
228167
228174
|
console.log(command.replace(commitMsgFile, ".git/COMMIT_EDITMSG"));
|
package/src/release/index.js
CHANGED
|
@@ -5779,7 +5779,8 @@ var RegistryConfigSchema = z.object({
|
|
|
5779
5779
|
github: RegistryUrlConfigSchema,
|
|
5780
5780
|
npm: RegistryUrlConfigSchema,
|
|
5781
5781
|
cargo: RegistryUrlConfigSchema,
|
|
5782
|
-
cyclone: RegistryUrlConfigSchema
|
|
5782
|
+
cyclone: RegistryUrlConfigSchema,
|
|
5783
|
+
container: RegistryUrlConfigSchema
|
|
5783
5784
|
}).default({}).describe("A list of remote registry URLs used by Storm Software");
|
|
5784
5785
|
var ColorConfigSchema = SingleThemeColorConfigSchema.or(
|
|
5785
5786
|
MultiThemeColorConfigSchema
|
|
@@ -5950,7 +5951,7 @@ var getLogLevel = (label) => {
|
|
|
5950
5951
|
|
|
5951
5952
|
// packages/config-tools/src/utilities/logger.ts
|
|
5952
5953
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
5953
|
-
|
|
5954
|
+
const _chalk = getChalk();
|
|
5954
5955
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
5955
5956
|
const configLogLevel = config.logLevel ?? process.env?.STORM_LOG_LEVEL ?? LogLevelLabel.INFO;
|
|
5956
5957
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|