@storm-software/cloudflare-tools 0.55.18 → 0.55.20
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 +12 -0
- package/README.md +1 -1
- package/dist/{chunk-JYGVCUHY.mjs → chunk-AHEAMC5D.mjs} +5 -5
- package/dist/{chunk-OO2KFXL5.js → chunk-BRNE2OJC.js} +52 -46
- package/dist/{chunk-UYVVVI5O.mjs → chunk-C7LFNTNE.mjs} +40 -26
- package/dist/{chunk-EY654AX3.mjs → chunk-IMI2SM4Q.mjs} +27 -16
- package/dist/{chunk-XU6MTFCV.mjs → chunk-KFNKJP2U.mjs} +1 -1
- package/dist/{chunk-FUEYDPCD.mjs → chunk-LH3QKSDK.mjs} +2 -2
- package/dist/{chunk-CH4HU3UC.mjs → chunk-LI7SJBJ3.mjs} +17 -11
- package/dist/{chunk-23PVXPM6.js → chunk-MUNYIY4Y.js} +16 -16
- package/dist/{chunk-7GVMKVE6.mjs → chunk-PAM7JMC5.mjs} +2 -2
- package/dist/{chunk-QEWY5YJA.mjs → chunk-PDHMNSTI.mjs} +2 -2
- package/dist/{chunk-7HA6AB2O.mjs → chunk-Q3FTEAPJ.mjs} +4 -4
- package/dist/{chunk-NHQOBOKU.js → chunk-QSA4HY26.js} +1 -1
- package/dist/{chunk-KD2ZJ3N4.js → chunk-QYKOXH3J.js} +12 -12
- package/dist/{chunk-57JETFC4.js → chunk-T4IWTHDS.js} +3 -3
- package/dist/{chunk-FNE7DP2D.js → chunk-X6VJDRKI.js} +26 -15
- package/dist/{chunk-A7FFSBE6.mjs → chunk-Y3XZCCPP.mjs} +1 -1
- package/dist/{chunk-TWSVFCGJ.js → chunk-ZO73VQJ6.js} +229 -215
- package/dist/executors.js +5 -5
- package/dist/executors.mjs +8 -8
- package/dist/generators.js +5 -5
- package/dist/generators.mjs +5 -5
- package/dist/index.js +8 -8
- package/dist/index.mjs +10 -10
- package/dist/src/executors/cloudflare-publish/executor.js +3 -3
- package/dist/src/executors/cloudflare-publish/executor.mjs +6 -6
- package/dist/src/executors/r2-upload-publish/executor.js +5 -5
- package/dist/src/executors/r2-upload-publish/executor.mjs +6 -6
- package/dist/src/executors/serve/executor.d.mts +3 -0
- package/dist/src/executors/serve/executor.d.ts +3 -0
- package/dist/src/executors/serve/executor.js +4 -4
- package/dist/src/executors/serve/executor.mjs +5 -5
- package/dist/src/generators/init/generator.js +2 -2
- package/dist/src/generators/init/generator.mjs +2 -2
- package/dist/src/generators/worker/generator.js +5 -5
- package/dist/src/generators/worker/generator.mjs +5 -5
- package/dist/src/utils/index.js +3 -3
- package/dist/src/utils/index.mjs +3 -3
- package/dist/src/utils/r2-bucket-helpers.js +3 -3
- package/dist/src/utils/r2-bucket-helpers.mjs +3 -3
- package/dist/tsup.config.mjs +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## 0.55.20 (2025-02-01)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous
|
|
4
|
+
|
|
5
|
+
- **monorepo:** Regenerate README markdown files ([af5c80fa](https://github.com/storm-software/storm-ops/commit/af5c80fa))
|
|
6
|
+
|
|
7
|
+
## 0.55.19 (2025-01-29)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous
|
|
10
|
+
|
|
11
|
+
- **monorepo:** Regenerate README markdown files ([a1b6717d](https://github.com/storm-software/storm-ops/commit/a1b6717d))
|
|
12
|
+
|
|
1
13
|
## 0.55.18 (2025-01-29)
|
|
2
14
|
|
|
3
15
|
### 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,24 +1,24 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getInternalDependencies,
|
|
3
3
|
r2UploadFile
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-PAM7JMC5.mjs";
|
|
5
5
|
import {
|
|
6
6
|
createCliOptions,
|
|
7
7
|
getPackageInfo
|
|
8
|
-
} from "./chunk-
|
|
8
|
+
} from "./chunk-KFNKJP2U.mjs";
|
|
9
9
|
import {
|
|
10
10
|
getConfig
|
|
11
|
-
} from "./chunk-
|
|
11
|
+
} from "./chunk-LI7SJBJ3.mjs";
|
|
12
12
|
import {
|
|
13
13
|
findWorkspaceRoot,
|
|
14
14
|
writeDebug,
|
|
15
15
|
writeInfo,
|
|
16
16
|
writeSuccess,
|
|
17
17
|
writeWarning
|
|
18
|
-
} from "./chunk-
|
|
18
|
+
} from "./chunk-IMI2SM4Q.mjs";
|
|
19
19
|
import {
|
|
20
20
|
__name
|
|
21
|
-
} from "./chunk-
|
|
21
|
+
} from "./chunk-Y3XZCCPP.mjs";
|
|
22
22
|
|
|
23
23
|
// src/executors/r2-upload-publish/executor.ts
|
|
24
24
|
import { S3 } from "@aws-sdk/client-s3";
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
|
|
17
|
-
var
|
|
17
|
+
var _chunkX6VJDRKIjs = require('./chunk-X6VJDRKI.js');
|
|
18
18
|
|
|
19
19
|
|
|
20
20
|
var _chunkJ5SB6L2Ljs = require('./chunk-J5SB6L2L.js');
|
|
@@ -26,7 +26,7 @@ var _defu = require('defu'); var _defu2 = _interopRequireDefault(_defu);
|
|
|
26
26
|
var _c12 = require('c12');
|
|
27
27
|
|
|
28
28
|
var getConfigFileByName = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, async (fileName, filePath, options = {}) => {
|
|
29
|
-
const workspacePath = filePath ||
|
|
29
|
+
const workspacePath = filePath || _chunkX6VJDRKIjs.findWorkspaceRoot.call(void 0, filePath);
|
|
30
30
|
const configs = await Promise.all([
|
|
31
31
|
_c12.loadConfig.call(void 0, {
|
|
32
32
|
cwd: workspacePath,
|
|
@@ -35,7 +35,7 @@ var getConfigFileByName = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, a
|
|
|
35
35
|
envName: _optionalChain([fileName, 'optionalAccess', _ => _.toUpperCase, 'call', _2 => _2()]),
|
|
36
36
|
jitiOptions: {
|
|
37
37
|
debug: false,
|
|
38
|
-
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false :
|
|
38
|
+
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : _chunkX6VJDRKIjs.joinPaths.call(void 0, process.env.STORM_CACHE_DIR || "node_modules/.cache/storm", "jiti")
|
|
39
39
|
},
|
|
40
40
|
...options
|
|
41
41
|
}),
|
|
@@ -46,7 +46,7 @@ var getConfigFileByName = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, a
|
|
|
46
46
|
envName: _optionalChain([fileName, 'optionalAccess', _3 => _3.toUpperCase, 'call', _4 => _4()]),
|
|
47
47
|
jitiOptions: {
|
|
48
48
|
debug: false,
|
|
49
|
-
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false :
|
|
49
|
+
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : _chunkX6VJDRKIjs.joinPaths.call(void 0, process.env.STORM_CACHE_DIR || "node_modules/.cache/storm", "jiti")
|
|
50
50
|
},
|
|
51
51
|
configFile: fileName,
|
|
52
52
|
...options
|
|
@@ -55,12 +55,12 @@ var getConfigFileByName = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, a
|
|
|
55
55
|
return _defu2.default.call(void 0, _nullishCoalesce(configs[0], () => ( {})), _nullishCoalesce(configs[1], () => ( {})));
|
|
56
56
|
}, "getConfigFileByName");
|
|
57
57
|
var getConfigFile = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, async (filePath, additionalFileNames = []) => {
|
|
58
|
-
const workspacePath = filePath ? filePath :
|
|
59
|
-
const result = await getConfigFileByName("storm", workspacePath);
|
|
58
|
+
const workspacePath = filePath ? filePath : _chunkX6VJDRKIjs.findWorkspaceRoot.call(void 0, filePath);
|
|
59
|
+
const result = await getConfigFileByName("storm-workspace", workspacePath);
|
|
60
60
|
let config = result.config;
|
|
61
61
|
const configFile = result.configFile;
|
|
62
|
-
if (config && configFile && Object.keys(config).length > 0) {
|
|
63
|
-
|
|
62
|
+
if (config && configFile && Object.keys(config).length > 0 && !config.skipConfigLogging) {
|
|
63
|
+
_chunkX6VJDRKIjs.writeTrace.call(void 0, `Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`, {
|
|
64
64
|
logLevel: "all"
|
|
65
65
|
});
|
|
66
66
|
}
|
|
@@ -68,9 +68,11 @@ var getConfigFile = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, async (
|
|
|
68
68
|
const results = await Promise.all(additionalFileNames.map((fileName) => getConfigFileByName(fileName, workspacePath)));
|
|
69
69
|
for (const result2 of results) {
|
|
70
70
|
if (_optionalChain([result2, 'optionalAccess', _5 => _5.config]) && _optionalChain([result2, 'optionalAccess', _6 => _6.configFile]) && Object.keys(result2.config).length > 0) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
71
|
+
if (!config.skipConfigLogging && !result2.config.skipConfigLogging) {
|
|
72
|
+
_chunkX6VJDRKIjs.writeTrace.call(void 0, `Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`, {
|
|
73
|
+
logLevel: "all"
|
|
74
|
+
});
|
|
75
|
+
}
|
|
74
76
|
config = _defu2.default.call(void 0, _nullishCoalesce(result2.config, () => ( {})), _nullishCoalesce(config, () => ( {})));
|
|
75
77
|
}
|
|
76
78
|
}
|
|
@@ -112,15 +114,15 @@ var getConfigEnv = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, () => {
|
|
|
112
114
|
licensing: process.env[`${prefix}LICENSING`] || void 0,
|
|
113
115
|
timezone: process.env[`${prefix}TIMEZONE`] || process.env.TZ || void 0,
|
|
114
116
|
locale: process.env[`${prefix}LOCALE`] || process.env.LOCALE || void 0,
|
|
115
|
-
configFile: process.env[`${prefix}CONFIG_FILE`] ?
|
|
116
|
-
workspaceRoot: process.env[`${prefix}WORKSPACE_ROOT`] ?
|
|
117
|
+
configFile: process.env[`${prefix}CONFIG_FILE`] ? _chunkX6VJDRKIjs.correctPaths.call(void 0, process.env[`${prefix}CONFIG_FILE`]) : void 0,
|
|
118
|
+
workspaceRoot: process.env[`${prefix}WORKSPACE_ROOT`] ? _chunkX6VJDRKIjs.correctPaths.call(void 0, process.env[`${prefix}WORKSPACE_ROOT`]) : void 0,
|
|
117
119
|
directories: {
|
|
118
|
-
cache: process.env[`${prefix}CACHE_DIR`] ?
|
|
119
|
-
data: process.env[`${prefix}DATA_DIR`] ?
|
|
120
|
-
config: process.env[`${prefix}CONFIG_DIR`] ?
|
|
121
|
-
temp: process.env[`${prefix}TEMP_DIR`] ?
|
|
122
|
-
log: process.env[`${prefix}LOG_DIR`] ?
|
|
123
|
-
build: process.env[`${prefix}BUILD_DIR`] ?
|
|
120
|
+
cache: process.env[`${prefix}CACHE_DIR`] ? _chunkX6VJDRKIjs.correctPaths.call(void 0, process.env[`${prefix}CACHE_DIR`]) : void 0,
|
|
121
|
+
data: process.env[`${prefix}DATA_DIR`] ? _chunkX6VJDRKIjs.correctPaths.call(void 0, process.env[`${prefix}DATA_DIR`]) : void 0,
|
|
122
|
+
config: process.env[`${prefix}CONFIG_DIR`] ? _chunkX6VJDRKIjs.correctPaths.call(void 0, process.env[`${prefix}CONFIG_DIR`]) : void 0,
|
|
123
|
+
temp: process.env[`${prefix}TEMP_DIR`] ? _chunkX6VJDRKIjs.correctPaths.call(void 0, process.env[`${prefix}TEMP_DIR`]) : void 0,
|
|
124
|
+
log: process.env[`${prefix}LOG_DIR`] ? _chunkX6VJDRKIjs.correctPaths.call(void 0, process.env[`${prefix}LOG_DIR`]) : void 0,
|
|
125
|
+
build: process.env[`${prefix}BUILD_DIR`] ? _chunkX6VJDRKIjs.correctPaths.call(void 0, process.env[`${prefix}BUILD_DIR`]) : void 0
|
|
124
126
|
},
|
|
125
127
|
skipCache: process.env[`${prefix}SKIP_CACHE`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CACHE`]) : void 0,
|
|
126
128
|
env: (_nullishCoalesce(_nullishCoalesce(process.env[`${prefix}ENV`], () => ( process.env.NODE_ENV)), () => ( process.env.ENVIRONMENT))) || void 0,
|
|
@@ -143,23 +145,24 @@ var getConfigEnv = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, () => {
|
|
|
143
145
|
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`] || void 0,
|
|
144
146
|
container: process.env[`${prefix}REGISTRY_CONTAINER`] || void 0
|
|
145
147
|
},
|
|
146
|
-
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ?
|
|
148
|
+
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ? _chunkX6VJDRKIjs.getLogLevelLabel.call(void 0, Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) : process.env[`${prefix}LOG_LEVEL`] : void 0,
|
|
149
|
+
skipConfigLogging: process.env[`${prefix}SKIP_CONFIG_LOGGING`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CONFIG_LOGGING`]) : void 0
|
|
147
150
|
};
|
|
148
|
-
const themeNames = Object.keys(process.env).filter((envKey) => envKey.startsWith(`${prefix}COLOR_`) &&
|
|
151
|
+
const themeNames = Object.keys(process.env).filter((envKey) => envKey.startsWith(`${prefix}COLOR_`) && _chunkX6VJDRKIjs.COLOR_KEYS.every((colorKey) => !envKey.startsWith(`${prefix}COLOR_LIGHT_${colorKey}`) && !envKey.startsWith(`${prefix}COLOR_DARK_${colorKey}`)));
|
|
149
152
|
config.colors = themeNames.length > 0 ? themeNames.reduce((ret, themeName) => {
|
|
150
153
|
ret[themeName] = getThemeColorConfigEnv(prefix, themeName);
|
|
151
154
|
return ret;
|
|
152
155
|
}, {}) : getThemeColorConfigEnv(prefix);
|
|
153
|
-
if (config.docs ===
|
|
154
|
-
if (config.homepage ===
|
|
155
|
-
config.docs = `${
|
|
156
|
+
if (config.docs === _chunkX6VJDRKIjs.STORM_DEFAULT_DOCS) {
|
|
157
|
+
if (config.homepage === _chunkX6VJDRKIjs.STORM_DEFAULT_HOMEPAGE) {
|
|
158
|
+
config.docs = `${_chunkX6VJDRKIjs.STORM_DEFAULT_HOMEPAGE}/projects/${config.name}/docs`;
|
|
156
159
|
} else {
|
|
157
160
|
config.docs = `${config.homepage}/docs`;
|
|
158
161
|
}
|
|
159
162
|
}
|
|
160
|
-
if (config.licensing ===
|
|
161
|
-
if (config.homepage ===
|
|
162
|
-
config.licensing = `${
|
|
163
|
+
if (config.licensing === _chunkX6VJDRKIjs.STORM_DEFAULT_LICENSING) {
|
|
164
|
+
if (config.homepage === _chunkX6VJDRKIjs.STORM_DEFAULT_HOMEPAGE) {
|
|
165
|
+
config.licensing = `${_chunkX6VJDRKIjs.STORM_DEFAULT_HOMEPAGE}/projects/${config.name}/licensing`;
|
|
163
166
|
} else {
|
|
164
167
|
config.licensing = `${config.homepage}/docs`;
|
|
165
168
|
}
|
|
@@ -297,31 +300,31 @@ var setConfigEnv = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, (config)
|
|
|
297
300
|
process.env.LANG = config.locale ? `${config.locale.replaceAll("-", "_")}.UTF-8` : "en_US.UTF-8";
|
|
298
301
|
}
|
|
299
302
|
if (config.configFile) {
|
|
300
|
-
process.env[`${prefix}CONFIG_FILE`] =
|
|
303
|
+
process.env[`${prefix}CONFIG_FILE`] = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.configFile);
|
|
301
304
|
}
|
|
302
305
|
if (config.workspaceRoot) {
|
|
303
|
-
process.env[`${prefix}WORKSPACE_ROOT`] =
|
|
304
|
-
process.env.NX_WORKSPACE_ROOT =
|
|
305
|
-
process.env.NX_WORKSPACE_ROOT_PATH =
|
|
306
|
+
process.env[`${prefix}WORKSPACE_ROOT`] = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.workspaceRoot);
|
|
307
|
+
process.env.NX_WORKSPACE_ROOT = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.workspaceRoot);
|
|
308
|
+
process.env.NX_WORKSPACE_ROOT_PATH = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.workspaceRoot);
|
|
306
309
|
}
|
|
307
310
|
if (config.directories) {
|
|
308
311
|
if (!config.skipCache && config.directories.cache) {
|
|
309
|
-
process.env[`${prefix}CACHE_DIR`] =
|
|
312
|
+
process.env[`${prefix}CACHE_DIR`] = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.directories.cache);
|
|
310
313
|
}
|
|
311
314
|
if (config.directories.data) {
|
|
312
|
-
process.env[`${prefix}DATA_DIR`] =
|
|
315
|
+
process.env[`${prefix}DATA_DIR`] = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.directories.data);
|
|
313
316
|
}
|
|
314
317
|
if (config.directories.config) {
|
|
315
|
-
process.env[`${prefix}CONFIG_DIR`] =
|
|
318
|
+
process.env[`${prefix}CONFIG_DIR`] = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.directories.config);
|
|
316
319
|
}
|
|
317
320
|
if (config.directories.temp) {
|
|
318
|
-
process.env[`${prefix}TEMP_DIR`] =
|
|
321
|
+
process.env[`${prefix}TEMP_DIR`] = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.directories.temp);
|
|
319
322
|
}
|
|
320
323
|
if (config.directories.log) {
|
|
321
|
-
process.env[`${prefix}LOG_DIR`] =
|
|
324
|
+
process.env[`${prefix}LOG_DIR`] = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.directories.log);
|
|
322
325
|
}
|
|
323
326
|
if (config.directories.build) {
|
|
324
|
-
process.env[`${prefix}BUILD_DIR`] =
|
|
327
|
+
process.env[`${prefix}BUILD_DIR`] = _chunkX6VJDRKIjs.correctPaths.call(void 0, config.directories.build);
|
|
325
328
|
}
|
|
326
329
|
}
|
|
327
330
|
if (config.skipCache !== void 0) {
|
|
@@ -375,8 +378,11 @@ var setConfigEnv = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, (config)
|
|
|
375
378
|
if (config.logLevel) {
|
|
376
379
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
377
380
|
process.env.LOG_LEVEL = String(config.logLevel);
|
|
378
|
-
process.env.NX_VERBOSE_LOGGING = String(
|
|
379
|
-
process.env.RUST_BACKTRACE =
|
|
381
|
+
process.env.NX_VERBOSE_LOGGING = String(_chunkX6VJDRKIjs.getLogLevel.call(void 0, config.logLevel) >= _chunkX6VJDRKIjs.LogLevel.DEBUG ? true : false);
|
|
382
|
+
process.env.RUST_BACKTRACE = _chunkX6VJDRKIjs.getLogLevel.call(void 0, config.logLevel) >= _chunkX6VJDRKIjs.LogLevel.DEBUG ? "full" : "none";
|
|
383
|
+
}
|
|
384
|
+
if (config.skipConfigLogging !== void 0) {
|
|
385
|
+
process.env[`${prefix}SKIP_CONFIG_LOGGING`] = String(config.skipConfigLogging);
|
|
380
386
|
}
|
|
381
387
|
process.env[`${prefix}CONFIG`] = JSON.stringify(config);
|
|
382
388
|
for (const key of Object.keys(_nullishCoalesce(config.extensions, () => ( {})))) {
|
|
@@ -489,17 +495,17 @@ var createStormConfig = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, asy
|
|
|
489
495
|
if (!_optionalChain([_static_cache, 'optionalAccess', _29 => _29.data]) || !_optionalChain([_static_cache, 'optionalAccess', _30 => _30.timestamp]) || _static_cache.timestamp < Date.now() - 8e3) {
|
|
490
496
|
let _workspaceRoot = workspaceRoot;
|
|
491
497
|
if (!_workspaceRoot) {
|
|
492
|
-
_workspaceRoot =
|
|
498
|
+
_workspaceRoot = _chunkX6VJDRKIjs.findWorkspaceRoot.call(void 0, );
|
|
493
499
|
}
|
|
494
500
|
const configEnv = getConfigEnv();
|
|
495
|
-
const defaultConfig = await
|
|
501
|
+
const defaultConfig = await _chunkX6VJDRKIjs.getDefaultConfig.call(void 0, _workspaceRoot);
|
|
496
502
|
const configFile = await getConfigFile(_workspaceRoot);
|
|
497
503
|
if (!configFile && !skipLogs) {
|
|
498
|
-
|
|
504
|
+
_chunkX6VJDRKIjs.writeWarning.call(void 0, "No Storm Workspace configuration file found in the current repository. Please ensure this is the expected behavior - you can add a `storm-workspace.json` file to the root of your workspace if it is not.\n", {
|
|
499
505
|
logLevel: "all"
|
|
500
506
|
});
|
|
501
507
|
}
|
|
502
|
-
result = await
|
|
508
|
+
result = await _chunkX6VJDRKIjs.StormConfigSchema.parseAsync(_defu2.default.call(void 0, configEnv, configFile, defaultConfig));
|
|
503
509
|
result.workspaceRoot ??= _workspaceRoot;
|
|
504
510
|
} else {
|
|
505
511
|
result = _static_cache.data;
|
|
@@ -533,9 +539,9 @@ var createConfigExtension = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0,
|
|
|
533
539
|
var loadStormConfig = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, async (workspaceRoot, skipLogs = false) => {
|
|
534
540
|
const config = await createStormConfig(void 0, void 0, workspaceRoot, skipLogs);
|
|
535
541
|
setConfigEnv(config);
|
|
536
|
-
if (!skipLogs) {
|
|
537
|
-
|
|
538
|
-
${
|
|
542
|
+
if (!skipLogs && !config.skipConfigLogging) {
|
|
543
|
+
_chunkX6VJDRKIjs.writeTrace.call(void 0, `\u2699\uFE0F Using Storm Workspace configuration:
|
|
544
|
+
${_chunkX6VJDRKIjs.formatLogMessage.call(void 0, config)}`, config);
|
|
539
545
|
}
|
|
540
546
|
return config;
|
|
541
547
|
}, "loadStormConfig");
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
ProjectTagConstants,
|
|
3
3
|
addProjectTag
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-KFNKJP2U.mjs";
|
|
5
5
|
import {
|
|
6
6
|
getConfig
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-LI7SJBJ3.mjs";
|
|
8
8
|
import {
|
|
9
9
|
StormConfigSchema,
|
|
10
10
|
correctPaths,
|
|
@@ -20,12 +20,12 @@ import {
|
|
|
20
20
|
writeSuccess,
|
|
21
21
|
writeTrace,
|
|
22
22
|
writeWarning
|
|
23
|
-
} from "./chunk-
|
|
23
|
+
} from "./chunk-IMI2SM4Q.mjs";
|
|
24
24
|
import {
|
|
25
25
|
__dirname,
|
|
26
26
|
__name,
|
|
27
27
|
__require
|
|
28
|
-
} from "./chunk-
|
|
28
|
+
} from "./chunk-Y3XZCCPP.mjs";
|
|
29
29
|
|
|
30
30
|
// ../config-tools/src/utilities/apply-workspace-tokens.ts
|
|
31
31
|
var applyWorkspaceBaseTokens = /* @__PURE__ */ __name(async (option, tokenParams) => {
|
|
@@ -423,7 +423,7 @@ import https from "node:https";
|
|
|
423
423
|
var LARGE_BUFFER2 = 1024 * 1e6;
|
|
424
424
|
|
|
425
425
|
// ../esbuild/src/build.ts
|
|
426
|
-
import { createProjectGraphAsync, readProjectsConfigurationFromProjectGraph, writeJsonFile } from "@nx/devkit";
|
|
426
|
+
import { createProjectGraphAsync, readProjectsConfigurationFromProjectGraph as readProjectsConfigurationFromProjectGraph2, writeJsonFile } from "@nx/devkit";
|
|
427
427
|
|
|
428
428
|
// ../build-tools/src/config.ts
|
|
429
429
|
var DEFAULT_COMPILED_BANNER = `
|
|
@@ -507,11 +507,12 @@ ${footer && typeof footer === "string" ? footer.startsWith("//") ? footer : `//
|
|
|
507
507
|
// ../build-tools/src/utilities/generate-package-json.ts
|
|
508
508
|
import { calculateProjectBuildableDependencies } from "@nx/js/src/utils/buildable-libs-utils";
|
|
509
509
|
import { Glob } from "glob";
|
|
510
|
-
import { existsSync } from "node:fs";
|
|
510
|
+
import { existsSync, readFileSync as readFileSync2 } from "node:fs";
|
|
511
511
|
import { readFile as readFile2 } from "node:fs/promises";
|
|
512
|
-
import { readCachedProjectGraph } from "nx/src/project-graph/project-graph";
|
|
512
|
+
import { readCachedProjectGraph, readProjectsConfigurationFromProjectGraph } from "nx/src/project-graph/project-graph";
|
|
513
513
|
var addPackageDependencies = /* @__PURE__ */ __name(async (workspaceRoot3, projectRoot, projectName, packageJson) => {
|
|
514
|
-
const
|
|
514
|
+
const projectGraph = readCachedProjectGraph();
|
|
515
|
+
const projectDependencies = calculateProjectBuildableDependencies(void 0, projectGraph, workspaceRoot3, projectName, process.env.NX_TASK_TARGET_TARGET || "build", process.env.NX_TASK_TARGET_CONFIGURATION || "production", true);
|
|
515
516
|
const localPackages = [];
|
|
516
517
|
for (const project of projectDependencies.dependencies.filter((dep) => dep.node.type === "lib" && dep.node.data.root !== projectRoot && dep.node.data.root !== workspaceRoot3)) {
|
|
517
518
|
const projectNode = project.node;
|
|
@@ -528,26 +529,38 @@ var addPackageDependencies = /* @__PURE__ */ __name(async (workspaceRoot3, proje
|
|
|
528
529
|
}
|
|
529
530
|
if (localPackages.length > 0) {
|
|
530
531
|
writeTrace(`\u{1F4E6} Adding local packages to package.json: ${localPackages.map((p) => p.name).join(", ")}`);
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
532
|
+
const projectJsonFile = await readFile2(joinPaths(projectRoot, "project.json"), "utf8");
|
|
533
|
+
const projectJson = JSON.parse(projectJsonFile);
|
|
534
|
+
const projectName2 = projectJson.name;
|
|
535
|
+
const projectConfigurations = readProjectsConfigurationFromProjectGraph(projectGraph);
|
|
536
|
+
if (!projectConfigurations?.projects?.[projectName2]) {
|
|
537
|
+
throw new Error("The Build process failed because the project does not have a valid configuration in the project.json file. Check if the file exists in the root of the project.");
|
|
538
|
+
}
|
|
539
|
+
const implicitDependencies = projectConfigurations.projects?.[projectName2].implicitDependencies?.reduce((ret, dep) => {
|
|
540
|
+
if (projectConfigurations.projects?.[dep]) {
|
|
541
|
+
const depPackageJsonPath = joinPaths(workspaceRoot3, projectConfigurations.projects[dep].root, "package.json");
|
|
542
|
+
if (existsSync(depPackageJsonPath)) {
|
|
543
|
+
const depPackageJsonContent = readFileSync2(depPackageJsonPath, "utf8");
|
|
544
|
+
const depPackageJson = JSON.parse(depPackageJsonContent);
|
|
545
|
+
if (depPackageJson.private !== true && !ret.includes(depPackageJson.name)) {
|
|
546
|
+
ret.push(depPackageJson.name);
|
|
547
|
+
}
|
|
548
|
+
}
|
|
534
549
|
}
|
|
535
550
|
return ret;
|
|
536
|
-
},
|
|
537
|
-
packageJson.
|
|
538
|
-
if (!ret[localPackage.name]) {
|
|
539
|
-
ret[localPackage.name] = {
|
|
540
|
-
optional: false
|
|
541
|
-
};
|
|
551
|
+
}, []);
|
|
552
|
+
packageJson.dependencies = localPackages.reduce((ret, localPackage) => {
|
|
553
|
+
if (!ret[localPackage.name] && !implicitDependencies?.includes(localPackage.name)) {
|
|
554
|
+
ret[localPackage.name] = `>=${localPackage.version || "0.0.1"}`;
|
|
542
555
|
}
|
|
543
556
|
return ret;
|
|
544
|
-
}, packageJson.
|
|
557
|
+
}, packageJson.dependencies ?? {});
|
|
545
558
|
packageJson.devDependencies = localPackages.reduce((ret, localPackage) => {
|
|
546
|
-
if (!ret[localPackage.name]) {
|
|
559
|
+
if (!ret[localPackage.name] && implicitDependencies?.includes(localPackage.name)) {
|
|
547
560
|
ret[localPackage.name] = localPackage.version || "0.0.1";
|
|
548
561
|
}
|
|
549
562
|
return ret;
|
|
550
|
-
}, packageJson.
|
|
563
|
+
}, packageJson.devDependencies ?? {});
|
|
551
564
|
} else {
|
|
552
565
|
writeTrace("\u{1F4E6} No local packages dependencies to add to package.json");
|
|
553
566
|
}
|
|
@@ -1375,7 +1388,7 @@ var resolveOptions = /* @__PURE__ */ __name(async (userOptions) => {
|
|
|
1375
1388
|
const projectJsonFile = await hf.readFile(projectJsonPath, "utf8");
|
|
1376
1389
|
const projectJson = JSON.parse(projectJsonFile);
|
|
1377
1390
|
const projectName = projectJson.name;
|
|
1378
|
-
const projectConfigurations =
|
|
1391
|
+
const projectConfigurations = readProjectsConfigurationFromProjectGraph2(projectGraph);
|
|
1379
1392
|
if (!projectConfigurations?.projects?.[projectName]) {
|
|
1380
1393
|
throw new Error("The Build process failed because the project does not have a valid configuration in the project.json file. Check if the file exists in the root of the project.");
|
|
1381
1394
|
}
|
|
@@ -1743,7 +1756,7 @@ var executor_default7 = withRunExecutor("Size-Limit Performance Test Executor",
|
|
|
1743
1756
|
});
|
|
1744
1757
|
|
|
1745
1758
|
// ../tsdown/src/build.ts
|
|
1746
|
-
import { createProjectGraphAsync as createProjectGraphAsync2, readProjectsConfigurationFromProjectGraph as
|
|
1759
|
+
import { createProjectGraphAsync as createProjectGraphAsync2, readProjectsConfigurationFromProjectGraph as readProjectsConfigurationFromProjectGraph3, writeJsonFile as writeJsonFile2 } from "@nx/devkit";
|
|
1747
1760
|
import defu3 from "defu";
|
|
1748
1761
|
import { existsSync as existsSync6 } from "node:fs";
|
|
1749
1762
|
import hf2 from "node:fs/promises";
|
|
@@ -1802,7 +1815,7 @@ var resolveOptions2 = /* @__PURE__ */ __name(async (userOptions) => {
|
|
|
1802
1815
|
const projectJsonFile = await hf2.readFile(projectJsonPath, "utf8");
|
|
1803
1816
|
const projectJson = JSON.parse(projectJsonFile);
|
|
1804
1817
|
const projectName = projectJson.name;
|
|
1805
|
-
const projectConfigurations =
|
|
1818
|
+
const projectConfigurations = readProjectsConfigurationFromProjectGraph3(projectGraph);
|
|
1806
1819
|
if (!projectConfigurations?.projects?.[projectName]) {
|
|
1807
1820
|
throw new Error("The Build process failed because the project does not have a valid configuration in the project.json file. Check if the file exists in the root of the project.");
|
|
1808
1821
|
}
|
|
@@ -2482,7 +2495,8 @@ async function normalizeOptions(tree, options, config) {
|
|
|
2482
2495
|
projectRoot,
|
|
2483
2496
|
parsedTags: options.tags ? options.tags.split(",").map((s) => s.trim()) : [],
|
|
2484
2497
|
importPath: normalizedImportPath,
|
|
2485
|
-
rootProject
|
|
2498
|
+
rootProject,
|
|
2499
|
+
shouldUseSwcJest: false
|
|
2486
2500
|
};
|
|
2487
2501
|
}
|
|
2488
2502
|
__name(normalizeOptions, "normalizeOptions");
|
|
@@ -2561,8 +2575,8 @@ var generator_default = withRunGenerator("TypeScript Library Creator (Browser Pl
|
|
|
2561
2575
|
import { formatFiles as formatFiles3, writeJson as writeJson2 } from "@nx/devkit";
|
|
2562
2576
|
import { zodToJsonSchema } from "zod-to-json-schema";
|
|
2563
2577
|
async function configSchemaGeneratorFn(tree, options, config) {
|
|
2564
|
-
writeInfo("\u{1F4E6} Running Storm Configuration JSON Schema generator", config);
|
|
2565
|
-
writeTrace(`Determining the Storm Configuration JSON Schema...`, config);
|
|
2578
|
+
writeInfo("\u{1F4E6} Running Storm Workspace Configuration JSON Schema generator", config);
|
|
2579
|
+
writeTrace(`Determining the Storm Workspace Configuration JSON Schema...`, config);
|
|
2566
2580
|
const jsonSchema = zodToJsonSchema(StormConfigSchema, {
|
|
2567
2581
|
name: "StormWorkspaceConfiguration"
|
|
2568
2582
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
__name
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-Y3XZCCPP.mjs";
|
|
4
4
|
|
|
5
5
|
// ../config-tools/src/utilities/correct-paths.ts
|
|
6
6
|
var _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
|
|
@@ -134,14 +134,17 @@ import { existsSync } from "node:fs";
|
|
|
134
134
|
import { join } from "node:path";
|
|
135
135
|
var MAX_PATH_SEARCH_DEPTH = 30;
|
|
136
136
|
var depth = 0;
|
|
137
|
-
function findFolderUp(startPath, endFileNames) {
|
|
137
|
+
function findFolderUp(startPath, endFileNames = [], endDirectoryNames = []) {
|
|
138
138
|
const _startPath = startPath ?? process.cwd();
|
|
139
|
+
if (endDirectoryNames.some((endDirName) => existsSync(join(_startPath, endDirName)))) {
|
|
140
|
+
return _startPath;
|
|
141
|
+
}
|
|
139
142
|
if (endFileNames.some((endFileName) => existsSync(join(_startPath, endFileName)))) {
|
|
140
143
|
return _startPath;
|
|
141
144
|
}
|
|
142
145
|
if (_startPath !== "/" && depth++ < MAX_PATH_SEARCH_DEPTH) {
|
|
143
146
|
const parent = join(_startPath, "..");
|
|
144
|
-
return findFolderUp(parent, endFileNames);
|
|
147
|
+
return findFolderUp(parent, endFileNames, endDirectoryNames);
|
|
145
148
|
}
|
|
146
149
|
return void 0;
|
|
147
150
|
}
|
|
@@ -149,17 +152,17 @@ __name(findFolderUp, "findFolderUp");
|
|
|
149
152
|
|
|
150
153
|
// ../config-tools/src/utilities/find-workspace-root.ts
|
|
151
154
|
var rootFiles = [
|
|
152
|
-
"storm.json",
|
|
153
|
-
"storm.json",
|
|
154
|
-
"storm.yaml",
|
|
155
|
-
"storm.yml",
|
|
156
|
-
"storm.js",
|
|
157
|
-
"storm.ts",
|
|
158
|
-
".storm.json",
|
|
159
|
-
".storm.yaml",
|
|
160
|
-
".storm.yml",
|
|
161
|
-
".storm.js",
|
|
162
|
-
".storm.ts",
|
|
155
|
+
"storm-workspace.json",
|
|
156
|
+
"storm-workspace.json",
|
|
157
|
+
"storm-workspace.yaml",
|
|
158
|
+
"storm-workspace.yml",
|
|
159
|
+
"storm-workspace.js",
|
|
160
|
+
"storm-workspace.ts",
|
|
161
|
+
".storm-workspace.json",
|
|
162
|
+
".storm-workspace.yaml",
|
|
163
|
+
".storm-workspace.yml",
|
|
164
|
+
".storm-workspace.js",
|
|
165
|
+
".storm-workspace.ts",
|
|
163
166
|
"lerna.json",
|
|
164
167
|
"nx.json",
|
|
165
168
|
"turbo.json",
|
|
@@ -183,11 +186,18 @@ var rootFiles = [
|
|
|
183
186
|
"pnpm-lock.yml",
|
|
184
187
|
"bun.lockb"
|
|
185
188
|
];
|
|
189
|
+
var rootDirectories = [
|
|
190
|
+
".storm-workspace",
|
|
191
|
+
".nx",
|
|
192
|
+
".github",
|
|
193
|
+
".vscode",
|
|
194
|
+
".verdaccio"
|
|
195
|
+
];
|
|
186
196
|
function findWorkspaceRootSafe(pathInsideMonorepo) {
|
|
187
197
|
if (process.env.STORM_WORKSPACE_ROOT || process.env.NX_WORKSPACE_ROOT_PATH) {
|
|
188
198
|
return correctPaths(process.env.STORM_WORKSPACE_ROOT ?? process.env.NX_WORKSPACE_ROOT_PATH);
|
|
189
199
|
}
|
|
190
|
-
return correctPaths(findFolderUp(pathInsideMonorepo ?? process.cwd(), rootFiles));
|
|
200
|
+
return correctPaths(findFolderUp(pathInsideMonorepo ?? process.cwd(), rootFiles, rootDirectories));
|
|
191
201
|
}
|
|
192
202
|
__name(findWorkspaceRootSafe, "findWorkspaceRootSafe");
|
|
193
203
|
function findWorkspaceRoot(pathInsideMonorepo) {
|
|
@@ -329,7 +339,7 @@ var WorkspaceDirectoryConfigSchema = z.object({
|
|
|
329
339
|
build: z.string().trim().default("dist").describe("The directory used to store the workspace's distributable files after a build (relative to the workspace root)")
|
|
330
340
|
}).describe("Various directories used by the workspace to store data, cache, and configuration files");
|
|
331
341
|
var StormConfigSchema = z.object({
|
|
332
|
-
$schema: z.string().trim().default("https://cdn.jsdelivr.net/npm/@storm-software/config/schemas/storm.schema.json").optional().nullish().describe("The URL to the JSON schema file that describes the Storm configuration file"),
|
|
342
|
+
$schema: z.string().trim().default("https://cdn.jsdelivr.net/npm/@storm-software/config/schemas/storm-workspace.schema.json").optional().nullish().describe("The URL to the JSON schema file that describes the Storm configuration file"),
|
|
333
343
|
extends: ExtendsSchema.optional(),
|
|
334
344
|
name: z.string().trim().toLowerCase().optional().describe("The name of the service/package/scope using this configuration"),
|
|
335
345
|
namespace: z.string().trim().toLowerCase().optional().describe("The namespace of the package"),
|
|
@@ -371,6 +381,7 @@ var StormConfigSchema = z.object({
|
|
|
371
381
|
"trace",
|
|
372
382
|
"all"
|
|
373
383
|
]).default("info").describe("The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."),
|
|
384
|
+
skipConfigLogging: z.boolean().optional().describe("Should the logging of the current Storm Workspace configuration be skipped?"),
|
|
374
385
|
registry: RegistryConfigSchema,
|
|
375
386
|
configFile: z.string().trim().nullable().default(null).describe("The filepath of the Storm config. When this field is null, no config file was found in the current workspace."),
|
|
376
387
|
colors: ColorConfigSchema.or(ColorConfigMapSchema).describe("Storm theme config values used for styling various package elements"),
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import {
|
|
2
2
|
__commonJS,
|
|
3
3
|
__name
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-Y3XZCCPP.mjs";
|
|
5
5
|
|
|
6
6
|
// package.json
|
|
7
7
|
var require_package = __commonJS({
|
|
8
8
|
"package.json"(exports, module) {
|
|
9
9
|
module.exports = {
|
|
10
10
|
name: "@storm-software/cloudflare-tools",
|
|
11
|
-
version: "0.55.
|
|
11
|
+
version: "0.55.20",
|
|
12
12
|
description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
|
|
13
13
|
repository: {
|
|
14
14
|
type: "github",
|
|
@@ -14,10 +14,10 @@ import {
|
|
|
14
14
|
joinPaths,
|
|
15
15
|
writeTrace,
|
|
16
16
|
writeWarning
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-IMI2SM4Q.mjs";
|
|
18
18
|
import {
|
|
19
19
|
__name
|
|
20
|
-
} from "./chunk-
|
|
20
|
+
} from "./chunk-Y3XZCCPP.mjs";
|
|
21
21
|
|
|
22
22
|
// ../config-tools/src/create-storm-config.ts
|
|
23
23
|
import defu2 from "defu";
|
|
@@ -56,10 +56,10 @@ var getConfigFileByName = /* @__PURE__ */ __name(async (fileName, filePath, opti
|
|
|
56
56
|
}, "getConfigFileByName");
|
|
57
57
|
var getConfigFile = /* @__PURE__ */ __name(async (filePath, additionalFileNames = []) => {
|
|
58
58
|
const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
|
|
59
|
-
const result = await getConfigFileByName("storm", workspacePath);
|
|
59
|
+
const result = await getConfigFileByName("storm-workspace", workspacePath);
|
|
60
60
|
let config = result.config;
|
|
61
61
|
const configFile = result.configFile;
|
|
62
|
-
if (config && configFile && Object.keys(config).length > 0) {
|
|
62
|
+
if (config && configFile && Object.keys(config).length > 0 && !config.skipConfigLogging) {
|
|
63
63
|
writeTrace(`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`, {
|
|
64
64
|
logLevel: "all"
|
|
65
65
|
});
|
|
@@ -68,9 +68,11 @@ var getConfigFile = /* @__PURE__ */ __name(async (filePath, additionalFileNames
|
|
|
68
68
|
const results = await Promise.all(additionalFileNames.map((fileName) => getConfigFileByName(fileName, workspacePath)));
|
|
69
69
|
for (const result2 of results) {
|
|
70
70
|
if (result2?.config && result2?.configFile && Object.keys(result2.config).length > 0) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
71
|
+
if (!config.skipConfigLogging && !result2.config.skipConfigLogging) {
|
|
72
|
+
writeTrace(`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`, {
|
|
73
|
+
logLevel: "all"
|
|
74
|
+
});
|
|
75
|
+
}
|
|
74
76
|
config = defu(result2.config ?? {}, config ?? {});
|
|
75
77
|
}
|
|
76
78
|
}
|
|
@@ -143,7 +145,8 @@ var getConfigEnv = /* @__PURE__ */ __name(() => {
|
|
|
143
145
|
cyclone: process.env[`${prefix}REGISTRY_CYCLONE`] || void 0,
|
|
144
146
|
container: process.env[`${prefix}REGISTRY_CONTAINER`] || void 0
|
|
145
147
|
},
|
|
146
|
-
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ? getLogLevelLabel(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) : process.env[`${prefix}LOG_LEVEL`] : void 0
|
|
148
|
+
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) ? getLogLevelLabel(Number.parseInt(process.env[`${prefix}LOG_LEVEL`])) : process.env[`${prefix}LOG_LEVEL`] : void 0,
|
|
149
|
+
skipConfigLogging: process.env[`${prefix}SKIP_CONFIG_LOGGING`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CONFIG_LOGGING`]) : void 0
|
|
147
150
|
};
|
|
148
151
|
const themeNames = Object.keys(process.env).filter((envKey) => envKey.startsWith(`${prefix}COLOR_`) && COLOR_KEYS.every((colorKey) => !envKey.startsWith(`${prefix}COLOR_LIGHT_${colorKey}`) && !envKey.startsWith(`${prefix}COLOR_DARK_${colorKey}`)));
|
|
149
152
|
config.colors = themeNames.length > 0 ? themeNames.reduce((ret, themeName) => {
|
|
@@ -378,6 +381,9 @@ var setConfigEnv = /* @__PURE__ */ __name((config) => {
|
|
|
378
381
|
process.env.NX_VERBOSE_LOGGING = String(getLogLevel(config.logLevel) >= LogLevel.DEBUG ? true : false);
|
|
379
382
|
process.env.RUST_BACKTRACE = getLogLevel(config.logLevel) >= LogLevel.DEBUG ? "full" : "none";
|
|
380
383
|
}
|
|
384
|
+
if (config.skipConfigLogging !== void 0) {
|
|
385
|
+
process.env[`${prefix}SKIP_CONFIG_LOGGING`] = String(config.skipConfigLogging);
|
|
386
|
+
}
|
|
381
387
|
process.env[`${prefix}CONFIG`] = JSON.stringify(config);
|
|
382
388
|
for (const key of Object.keys(config.extensions ?? {})) {
|
|
383
389
|
config.extensions[key] && Object.keys(config.extensions[key]) && setExtensionEnv(key, config.extensions[key]);
|
|
@@ -495,7 +501,7 @@ var createStormConfig = /* @__PURE__ */ __name(async (extensionName, schema, wor
|
|
|
495
501
|
const defaultConfig = await getDefaultConfig(_workspaceRoot);
|
|
496
502
|
const configFile = await getConfigFile(_workspaceRoot);
|
|
497
503
|
if (!configFile && !skipLogs) {
|
|
498
|
-
writeWarning("No Storm
|
|
504
|
+
writeWarning("No Storm Workspace configuration file found in the current repository. Please ensure this is the expected behavior - you can add a `storm-workspace.json` file to the root of your workspace if it is not.\n", {
|
|
499
505
|
logLevel: "all"
|
|
500
506
|
});
|
|
501
507
|
}
|
|
@@ -533,8 +539,8 @@ var createConfigExtension = /* @__PURE__ */ __name((extensionName, schema) => {
|
|
|
533
539
|
var loadStormConfig = /* @__PURE__ */ __name(async (workspaceRoot, skipLogs = false) => {
|
|
534
540
|
const config = await createStormConfig(void 0, void 0, workspaceRoot, skipLogs);
|
|
535
541
|
setConfigEnv(config);
|
|
536
|
-
if (!skipLogs) {
|
|
537
|
-
writeTrace(`\u2699\uFE0F Using Storm configuration:
|
|
542
|
+
if (!skipLogs && !config.skipConfigLogging) {
|
|
543
|
+
writeTrace(`\u2699\uFE0F Using Storm Workspace configuration:
|
|
538
544
|
${formatLogMessage(config)}`, config);
|
|
539
545
|
}
|
|
540
546
|
return config;
|