@storm-software/cloudflare-tools 0.63.25 → 0.63.27
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 +16 -0
- package/README.md +1 -1
- package/dist/{chunk-PUKUSS7F.mjs → chunk-3M2F4JUW.mjs} +3 -3
- package/dist/{chunk-VKJE4IV6.mjs → chunk-446Z4I2E.mjs} +11 -8
- package/dist/{chunk-AG2PERXB.mjs → chunk-4FMFQGIC.mjs} +2 -2
- package/dist/{chunk-IPQFZI7C.mjs → chunk-6AC4HGUU.mjs} +35 -3
- package/dist/{chunk-HKXGZZ4U.js → chunk-6SVJXZBV.js} +138 -135
- package/dist/{chunk-46LEVY35.js → chunk-AVDLSZLA.js} +77 -45
- package/dist/{chunk-VI7OHBFH.js → chunk-CCIXQ6JW.js} +16 -16
- package/dist/{chunk-DTL2T3BP.js → chunk-G2NJAIMM.js} +3 -3
- package/dist/{chunk-SJE3AZ5R.mjs → chunk-MB2PUV2U.mjs} +1 -1
- package/dist/{chunk-5ENKRUAU.js → chunk-N5LTPQ53.js} +89 -78
- package/dist/{chunk-2WZ5MDJJ.js → chunk-NK6XHZKN.js} +12 -12
- package/dist/{chunk-IMASMF4S.js → chunk-NTPBAB34.js} +2 -2
- package/dist/{chunk-EPBMBQ4K.mjs → chunk-OKD45PFS.mjs} +3 -3
- package/dist/{chunk-E2ZPWAPC.mjs → chunk-ZNYU5YAQ.mjs} +14 -3
- package/dist/executors.js +5 -5
- package/dist/executors.mjs +5 -5
- package/dist/generators.js +5 -5
- package/dist/generators.mjs +4 -4
- package/dist/index.js +8 -8
- package/dist/index.mjs +7 -7
- package/dist/src/executors/cloudflare-publish/executor.js +3 -3
- package/dist/src/executors/cloudflare-publish/executor.mjs +3 -3
- package/dist/src/executors/r2-upload-publish/executor.js +5 -5
- package/dist/src/executors/r2-upload-publish/executor.mjs +4 -4
- package/dist/src/executors/serve/executor.js +4 -4
- package/dist/src/executors/serve/executor.mjs +3 -3
- package/dist/src/generators/init/generator.js +2 -2
- package/dist/src/generators/init/generator.mjs +1 -1
- package/dist/src/generators/worker/generator.js +5 -5
- package/dist/src/generators/worker/generator.mjs +4 -4
- package/dist/src/utils/index.js +3 -3
- package/dist/src/utils/index.mjs +2 -2
- package/dist/src/utils/r2-bucket-helpers.js +3 -3
- package/dist/src/utils/r2-bucket-helpers.mjs +2 -2
- package/package.json +2 -2
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _chunkN5LTPQ53js = require('./chunk-N5LTPQ53.js');
|
|
19
19
|
|
|
20
20
|
// ../config-tools/src/create-storm-config.ts
|
|
21
21
|
var _defu = require('defu'); var _defu2 = _interopRequireDefault(_defu);
|
|
@@ -24,7 +24,7 @@ var _defu = require('defu'); var _defu2 = _interopRequireDefault(_defu);
|
|
|
24
24
|
var _c12 = require('c12');
|
|
25
25
|
|
|
26
26
|
var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
27
|
-
const workspacePath = filePath ||
|
|
27
|
+
const workspacePath = filePath || _chunkN5LTPQ53js.findWorkspaceRoot.call(void 0, filePath);
|
|
28
28
|
const configs = await Promise.all([
|
|
29
29
|
_c12.loadConfig.call(void 0, {
|
|
30
30
|
cwd: workspacePath,
|
|
@@ -33,7 +33,7 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
33
33
|
envName: _optionalChain([fileName, 'optionalAccess', _ => _.toUpperCase, 'call', _2 => _2()]),
|
|
34
34
|
jitiOptions: {
|
|
35
35
|
debug: false,
|
|
36
|
-
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false :
|
|
36
|
+
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : _chunkN5LTPQ53js.joinPaths.call(void 0,
|
|
37
37
|
process.env.STORM_CACHE_DIR || "node_modules/.cache/storm",
|
|
38
38
|
"jiti"
|
|
39
39
|
)
|
|
@@ -47,7 +47,7 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
47
47
|
envName: _optionalChain([fileName, 'optionalAccess', _3 => _3.toUpperCase, 'call', _4 => _4()]),
|
|
48
48
|
jitiOptions: {
|
|
49
49
|
debug: false,
|
|
50
|
-
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false :
|
|
50
|
+
fsCache: process.env.STORM_SKIP_CACHE === "true" ? false : _chunkN5LTPQ53js.joinPaths.call(void 0,
|
|
51
51
|
process.env.STORM_CACHE_DIR || "node_modules/.cache/storm",
|
|
52
52
|
"jiti"
|
|
53
53
|
)
|
|
@@ -59,12 +59,12 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
|
|
|
59
59
|
return _defu2.default.call(void 0, _nullishCoalesce(configs[0], () => ( {})), _nullishCoalesce(configs[1], () => ( {})));
|
|
60
60
|
};
|
|
61
61
|
var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
62
|
-
const workspacePath = filePath ? filePath :
|
|
62
|
+
const workspacePath = filePath ? filePath : _chunkN5LTPQ53js.findWorkspaceRoot.call(void 0, filePath);
|
|
63
63
|
const result = await getConfigFileByName("storm-workspace", workspacePath);
|
|
64
64
|
let config = result.config;
|
|
65
65
|
const configFile = result.configFile;
|
|
66
66
|
if (config && configFile && Object.keys(config).length > 0 && !config.skipConfigLogging) {
|
|
67
|
-
|
|
67
|
+
_chunkN5LTPQ53js.writeTrace.call(void 0,
|
|
68
68
|
`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`,
|
|
69
69
|
{
|
|
70
70
|
logLevel: "all"
|
|
@@ -80,7 +80,7 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
|
|
|
80
80
|
for (const result2 of results) {
|
|
81
81
|
if (_optionalChain([result2, 'optionalAccess', _5 => _5.config]) && _optionalChain([result2, 'optionalAccess', _6 => _6.configFile]) && Object.keys(result2.config).length > 0) {
|
|
82
82
|
if (!config.skipConfigLogging && !result2.config.skipConfigLogging) {
|
|
83
|
-
|
|
83
|
+
_chunkN5LTPQ53js.writeTrace.call(void 0,
|
|
84
84
|
`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`,
|
|
85
85
|
{
|
|
86
86
|
logLevel: "all"
|
|
@@ -139,7 +139,13 @@ var getConfigEnv = () => {
|
|
|
139
139
|
medium: process.env[`${prefix}ACCOUNT_MEDIUM`] || void 0,
|
|
140
140
|
github: process.env[`${prefix}ACCOUNT_GITHUB`] || void 0
|
|
141
141
|
},
|
|
142
|
-
organization: process.env[`${prefix}ORGANIZATION`] ||
|
|
142
|
+
organization: process.env[`${prefix}ORG`] || process.env[`${prefix}ORGANIZATION`] || process.env[`${prefix}ORG_NAME`] || process.env[`${prefix}ORGANIZATION_NAME`] ? process.env[`${prefix}ORG_DESCRIPTION`] || process.env[`${prefix}ORGANIZATION_DESCRIPTION`] || process.env[`${prefix}ORG_URL`] || process.env[`${prefix}ORGANIZATION_URL`] || process.env[`${prefix}ORG_LOGO`] || process.env[`${prefix}ORGANIZATION_LOGO`] ? {
|
|
143
|
+
name: process.env[`${prefix}ORG`] || process.env[`${prefix}ORGANIZATION`] || process.env[`${prefix}ORG_NAME`] || process.env[`${prefix}ORGANIZATION_NAME`],
|
|
144
|
+
description: process.env[`${prefix}ORG_DESCRIPTION`] || process.env[`${prefix}ORGANIZATION_DESCRIPTION`] || void 0,
|
|
145
|
+
url: process.env[`${prefix}ORG_URL`] || process.env[`${prefix}ORGANIZATION_URL`] || void 0,
|
|
146
|
+
logo: process.env[`${prefix}ORG_LOGO`] || process.env[`${prefix}ORGANIZATION_LOGO`] || void 0,
|
|
147
|
+
icon: process.env[`${prefix}ORG_ICON`] || process.env[`${prefix}ORGANIZATION_ICON`] || void 0
|
|
148
|
+
} : process.env[`${prefix}ORG`] || process.env[`${prefix}ORGANIZATION`] || process.env[`${prefix}ORG_NAME`] || process.env[`${prefix}ORGANIZATION_NAME`] : void 0,
|
|
143
149
|
packageManager: process.env[`${prefix}PACKAGE_MANAGER`] || void 0,
|
|
144
150
|
license: process.env[`${prefix}LICENSE`] || void 0,
|
|
145
151
|
homepage: process.env[`${prefix}HOMEPAGE`] || void 0,
|
|
@@ -150,15 +156,15 @@ var getConfigEnv = () => {
|
|
|
150
156
|
support: process.env[`${prefix}SUPPORT`] || void 0,
|
|
151
157
|
timezone: process.env[`${prefix}TIMEZONE`] || process.env.TZ || void 0,
|
|
152
158
|
locale: process.env[`${prefix}LOCALE`] || process.env.LOCALE || void 0,
|
|
153
|
-
configFile: process.env[`${prefix}CONFIG_FILE`] ?
|
|
154
|
-
workspaceRoot: process.env[`${prefix}WORKSPACE_ROOT`] ?
|
|
159
|
+
configFile: process.env[`${prefix}CONFIG_FILE`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}CONFIG_FILE`]) : void 0,
|
|
160
|
+
workspaceRoot: process.env[`${prefix}WORKSPACE_ROOT`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}WORKSPACE_ROOT`]) : void 0,
|
|
155
161
|
directories: {
|
|
156
|
-
cache: process.env[`${prefix}CACHE_DIR`] ?
|
|
157
|
-
data: process.env[`${prefix}DATA_DIR`] ?
|
|
158
|
-
config: process.env[`${prefix}CONFIG_DIR`] ?
|
|
159
|
-
temp: process.env[`${prefix}TEMP_DIR`] ?
|
|
160
|
-
log: process.env[`${prefix}LOG_DIR`] ?
|
|
161
|
-
build: process.env[`${prefix}BUILD_DIR`] ?
|
|
162
|
+
cache: process.env[`${prefix}CACHE_DIR`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}CACHE_DIR`]) : process.env[`${prefix}CACHE_DIRECTORY`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}CACHE_DIRECTORY`]) : void 0,
|
|
163
|
+
data: process.env[`${prefix}DATA_DIR`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}DATA_DIR`]) : process.env[`${prefix}DATA_DIRECTORY`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}DATA_DIRECTORY`]) : void 0,
|
|
164
|
+
config: process.env[`${prefix}CONFIG_DIR`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}CONFIG_DIR`]) : process.env[`${prefix}CONFIG_DIRECTORY`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}CONFIG_DIRECTORY`]) : void 0,
|
|
165
|
+
temp: process.env[`${prefix}TEMP_DIR`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}TEMP_DIR`]) : process.env[`${prefix}TEMP_DIRECTORY`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}TEMP_DIRECTORY`]) : void 0,
|
|
166
|
+
log: process.env[`${prefix}LOG_DIR`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}LOG_DIR`]) : process.env[`${prefix}LOG_DIRECTORY`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}LOG_DIRECTORY`]) : void 0,
|
|
167
|
+
build: process.env[`${prefix}BUILD_DIR`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}BUILD_DIR`]) : process.env[`${prefix}BUILD_DIRECTORY`] ? _chunkN5LTPQ53js.correctPaths.call(void 0, process.env[`${prefix}BUILD_DIRECTORY`]) : void 0
|
|
162
168
|
},
|
|
163
169
|
skipCache: process.env[`${prefix}SKIP_CACHE`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CACHE`]) : void 0,
|
|
164
170
|
mode: (_nullishCoalesce(_nullishCoalesce(process.env[`${prefix}MODE`], () => ( process.env.NODE_ENV)), () => ( process.env.ENVIRONMENT))) || void 0,
|
|
@@ -183,13 +189,13 @@ var getConfigEnv = () => {
|
|
|
183
189
|
},
|
|
184
190
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
185
191
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
186
|
-
) ?
|
|
192
|
+
) ? _chunkN5LTPQ53js.getLogLevelLabel.call(void 0,
|
|
187
193
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
188
194
|
) : process.env[`${prefix}LOG_LEVEL`] : void 0,
|
|
189
195
|
skipConfigLogging: process.env[`${prefix}SKIP_CONFIG_LOGGING`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CONFIG_LOGGING`]) : void 0
|
|
190
196
|
};
|
|
191
197
|
const themeNames = Object.keys(process.env).filter(
|
|
192
|
-
(envKey) => envKey.startsWith(`${prefix}COLOR_`) &&
|
|
198
|
+
(envKey) => envKey.startsWith(`${prefix}COLOR_`) && _chunkN5LTPQ53js.COLOR_KEYS.every(
|
|
193
199
|
(colorKey) => !envKey.startsWith(`${prefix}COLOR_LIGHT_${colorKey}`) && !envKey.startsWith(`${prefix}COLOR_DARK_${colorKey}`)
|
|
194
200
|
)
|
|
195
201
|
);
|
|
@@ -200,16 +206,16 @@ var getConfigEnv = () => {
|
|
|
200
206
|
},
|
|
201
207
|
{}
|
|
202
208
|
) : getThemeColorConfigEnv(prefix);
|
|
203
|
-
if (config.docs ===
|
|
204
|
-
if (config.homepage ===
|
|
205
|
-
config.docs = `${
|
|
209
|
+
if (config.docs === _chunkN5LTPQ53js.STORM_DEFAULT_DOCS) {
|
|
210
|
+
if (config.homepage === _chunkN5LTPQ53js.STORM_DEFAULT_HOMEPAGE) {
|
|
211
|
+
config.docs = `${_chunkN5LTPQ53js.STORM_DEFAULT_HOMEPAGE}/projects/${config.name}/docs`;
|
|
206
212
|
} else {
|
|
207
213
|
config.docs = `${config.homepage}/docs`;
|
|
208
214
|
}
|
|
209
215
|
}
|
|
210
|
-
if (config.licensing ===
|
|
211
|
-
if (config.homepage ===
|
|
212
|
-
config.licensing = `${
|
|
216
|
+
if (config.licensing === _chunkN5LTPQ53js.STORM_DEFAULT_LICENSING) {
|
|
217
|
+
if (config.homepage === _chunkN5LTPQ53js.STORM_DEFAULT_HOMEPAGE) {
|
|
218
|
+
config.licensing = `${_chunkN5LTPQ53js.STORM_DEFAULT_HOMEPAGE}/projects/${config.name}/licensing`;
|
|
213
219
|
} else {
|
|
214
220
|
config.licensing = `${config.homepage}/docs`;
|
|
215
221
|
}
|
|
@@ -346,7 +352,33 @@ var setConfigEnv = (config) => {
|
|
|
346
352
|
}
|
|
347
353
|
}
|
|
348
354
|
if (config.organization) {
|
|
349
|
-
|
|
355
|
+
if (typeof config.organization === "string") {
|
|
356
|
+
process.env[`${prefix}ORG`] = config.organization;
|
|
357
|
+
process.env[`${prefix}ORG_NAME`] = config.organization;
|
|
358
|
+
process.env[`${prefix}ORGANIZATION`] = config.organization;
|
|
359
|
+
process.env[`${prefix}ORGANIZATION_NAME`] = config.organization;
|
|
360
|
+
} else {
|
|
361
|
+
process.env[`${prefix}ORG`] = config.organization.name;
|
|
362
|
+
process.env[`${prefix}ORG_NAME`] = config.organization.name;
|
|
363
|
+
process.env[`${prefix}ORGANIZATION`] = config.organization.name;
|
|
364
|
+
process.env[`${prefix}ORGANIZATION_NAME`] = config.organization.name;
|
|
365
|
+
if (config.organization.url) {
|
|
366
|
+
process.env[`${prefix}ORG_URL`] = config.organization.url;
|
|
367
|
+
process.env[`${prefix}ORGANIZATION_URL`] = config.organization.url;
|
|
368
|
+
}
|
|
369
|
+
if (config.organization.description) {
|
|
370
|
+
process.env[`${prefix}ORG_DESCRIPTION`] = config.organization.description;
|
|
371
|
+
process.env[`${prefix}ORGANIZATION_DESCRIPTION`] = config.organization.description;
|
|
372
|
+
}
|
|
373
|
+
if (config.organization.logo) {
|
|
374
|
+
process.env[`${prefix}ORG_LOGO`] = config.organization.logo;
|
|
375
|
+
process.env[`${prefix}ORGANIZATION_LOGO`] = config.organization.logo;
|
|
376
|
+
}
|
|
377
|
+
if (config.organization.icon) {
|
|
378
|
+
process.env[`${prefix}ORG_ICON`] = config.organization.icon;
|
|
379
|
+
process.env[`${prefix}ORGANIZATION_ICON`] = config.organization.icon;
|
|
380
|
+
}
|
|
381
|
+
}
|
|
350
382
|
}
|
|
351
383
|
if (config.packageManager) {
|
|
352
384
|
process.env[`${prefix}PACKAGE_MANAGER`] = config.packageManager;
|
|
@@ -384,40 +416,40 @@ var setConfigEnv = (config) => {
|
|
|
384
416
|
process.env.LANG = config.locale ? `${config.locale.replaceAll("-", "_")}.UTF-8` : "en_US.UTF-8";
|
|
385
417
|
}
|
|
386
418
|
if (config.configFile) {
|
|
387
|
-
process.env[`${prefix}CONFIG_FILE`] =
|
|
419
|
+
process.env[`${prefix}CONFIG_FILE`] = _chunkN5LTPQ53js.correctPaths.call(void 0, config.configFile);
|
|
388
420
|
}
|
|
389
421
|
if (config.workspaceRoot) {
|
|
390
|
-
process.env[`${prefix}WORKSPACE_ROOT`] =
|
|
391
|
-
process.env.NX_WORKSPACE_ROOT =
|
|
392
|
-
process.env.NX_WORKSPACE_ROOT_PATH =
|
|
422
|
+
process.env[`${prefix}WORKSPACE_ROOT`] = _chunkN5LTPQ53js.correctPaths.call(void 0, config.workspaceRoot);
|
|
423
|
+
process.env.NX_WORKSPACE_ROOT = _chunkN5LTPQ53js.correctPaths.call(void 0, config.workspaceRoot);
|
|
424
|
+
process.env.NX_WORKSPACE_ROOT_PATH = _chunkN5LTPQ53js.correctPaths.call(void 0, config.workspaceRoot);
|
|
393
425
|
}
|
|
394
426
|
if (config.directories) {
|
|
395
427
|
if (!config.skipCache && config.directories.cache) {
|
|
396
|
-
process.env[`${prefix}CACHE_DIR`] =
|
|
428
|
+
process.env[`${prefix}CACHE_DIR`] = _chunkN5LTPQ53js.correctPaths.call(void 0,
|
|
397
429
|
config.directories.cache
|
|
398
430
|
);
|
|
399
431
|
process.env[`${prefix}CACHE_DIRECTORY`] = process.env[`${prefix}CACHE_DIR`];
|
|
400
432
|
}
|
|
401
433
|
if (config.directories.data) {
|
|
402
|
-
process.env[`${prefix}DATA_DIR`] =
|
|
434
|
+
process.env[`${prefix}DATA_DIR`] = _chunkN5LTPQ53js.correctPaths.call(void 0, config.directories.data);
|
|
403
435
|
process.env[`${prefix}DATA_DIRECTORY`] = process.env[`${prefix}DATA_DIR`];
|
|
404
436
|
}
|
|
405
437
|
if (config.directories.config) {
|
|
406
|
-
process.env[`${prefix}CONFIG_DIR`] =
|
|
438
|
+
process.env[`${prefix}CONFIG_DIR`] = _chunkN5LTPQ53js.correctPaths.call(void 0,
|
|
407
439
|
config.directories.config
|
|
408
440
|
);
|
|
409
441
|
process.env[`${prefix}CONFIG_DIRECTORY`] = process.env[`${prefix}CONFIG_DIR`];
|
|
410
442
|
}
|
|
411
443
|
if (config.directories.temp) {
|
|
412
|
-
process.env[`${prefix}TEMP_DIR`] =
|
|
444
|
+
process.env[`${prefix}TEMP_DIR`] = _chunkN5LTPQ53js.correctPaths.call(void 0, config.directories.temp);
|
|
413
445
|
process.env[`${prefix}TEMP_DIRECTORY`] = process.env[`${prefix}TEMP_DIR`];
|
|
414
446
|
}
|
|
415
447
|
if (config.directories.log) {
|
|
416
|
-
process.env[`${prefix}LOG_DIR`] =
|
|
448
|
+
process.env[`${prefix}LOG_DIR`] = _chunkN5LTPQ53js.correctPaths.call(void 0, config.directories.log);
|
|
417
449
|
process.env[`${prefix}LOG_DIRECTORY`] = process.env[`${prefix}LOG_DIR`];
|
|
418
450
|
}
|
|
419
451
|
if (config.directories.build) {
|
|
420
|
-
process.env[`${prefix}BUILD_DIR`] =
|
|
452
|
+
process.env[`${prefix}BUILD_DIR`] = _chunkN5LTPQ53js.correctPaths.call(void 0,
|
|
421
453
|
config.directories.build
|
|
422
454
|
);
|
|
423
455
|
process.env[`${prefix}BUILD_DIRECTORY`] = process.env[`${prefix}BUILD_DIR`];
|
|
@@ -484,9 +516,9 @@ var setConfigEnv = (config) => {
|
|
|
484
516
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
485
517
|
process.env.LOG_LEVEL = String(config.logLevel);
|
|
486
518
|
process.env.NX_VERBOSE_LOGGING = String(
|
|
487
|
-
|
|
519
|
+
_chunkN5LTPQ53js.getLogLevel.call(void 0, config.logLevel) >= _chunkN5LTPQ53js.LogLevel.DEBUG ? true : false
|
|
488
520
|
);
|
|
489
|
-
process.env.RUST_BACKTRACE =
|
|
521
|
+
process.env.RUST_BACKTRACE = _chunkN5LTPQ53js.getLogLevel.call(void 0, config.logLevel) >= _chunkN5LTPQ53js.LogLevel.DEBUG ? "full" : "none";
|
|
490
522
|
}
|
|
491
523
|
if (config.skipConfigLogging !== void 0) {
|
|
492
524
|
process.env[`${prefix}SKIP_CONFIG_LOGGING`] = String(
|
|
@@ -606,13 +638,13 @@ var createStormWorkspaceConfig = async (extensionName, schema, workspaceRoot, sk
|
|
|
606
638
|
if (!_optionalChain([_static_cache, 'optionalAccess', _29 => _29.data]) || !_optionalChain([_static_cache, 'optionalAccess', _30 => _30.timestamp]) || _static_cache.timestamp < Date.now() - 8e3) {
|
|
607
639
|
let _workspaceRoot = workspaceRoot;
|
|
608
640
|
if (!_workspaceRoot) {
|
|
609
|
-
_workspaceRoot =
|
|
641
|
+
_workspaceRoot = _chunkN5LTPQ53js.findWorkspaceRoot.call(void 0, );
|
|
610
642
|
}
|
|
611
643
|
const configEnv = getConfigEnv();
|
|
612
644
|
const configFile = await getConfigFile(_workspaceRoot);
|
|
613
645
|
if (!configFile) {
|
|
614
646
|
if (!skipLogs) {
|
|
615
|
-
|
|
647
|
+
_chunkN5LTPQ53js.writeWarning.call(void 0,
|
|
616
648
|
"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",
|
|
617
649
|
{ logLevel: "all" }
|
|
618
650
|
);
|
|
@@ -621,9 +653,9 @@ var createStormWorkspaceConfig = async (extensionName, schema, workspaceRoot, sk
|
|
|
621
653
|
return void 0;
|
|
622
654
|
}
|
|
623
655
|
}
|
|
624
|
-
const defaultConfig = await
|
|
625
|
-
result =
|
|
626
|
-
await
|
|
656
|
+
const defaultConfig = await _chunkN5LTPQ53js.getPackageJsonConfig.call(void 0, _workspaceRoot);
|
|
657
|
+
result = _chunkN5LTPQ53js.applyDefaultConfig.call(void 0,
|
|
658
|
+
await _chunkN5LTPQ53js.stormWorkspaceConfigSchema.parseAsync(
|
|
627
659
|
_defu2.default.call(void 0, configEnv, configFile, defaultConfig)
|
|
628
660
|
)
|
|
629
661
|
);
|
|
@@ -665,9 +697,9 @@ var loadStormWorkspaceConfig = async (workspaceRoot, skipLogs = false) => {
|
|
|
665
697
|
);
|
|
666
698
|
setConfigEnv(config);
|
|
667
699
|
if (!skipLogs && !config.skipConfigLogging) {
|
|
668
|
-
|
|
700
|
+
_chunkN5LTPQ53js.writeTrace.call(void 0,
|
|
669
701
|
`\u2699\uFE0F Using Storm Workspace configuration:
|
|
670
|
-
${
|
|
702
|
+
${_chunkN5LTPQ53js.formatLogMessage.call(void 0, config)}`,
|
|
671
703
|
config
|
|
672
704
|
);
|
|
673
705
|
}
|
|
@@ -681,7 +713,7 @@ var getConfig = (workspaceRoot, skipLogs = false) => {
|
|
|
681
713
|
var getWorkspaceConfig = (skipLogs = true, options = {}) => {
|
|
682
714
|
let workspaceRoot = options.workspaceRoot;
|
|
683
715
|
if (!workspaceRoot) {
|
|
684
|
-
workspaceRoot =
|
|
716
|
+
workspaceRoot = _chunkN5LTPQ53js.findWorkspaceRoot.call(void 0, options.cwd);
|
|
685
717
|
}
|
|
686
718
|
return getConfig(workspaceRoot, skipLogs);
|
|
687
719
|
};
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
var
|
|
4
|
+
var _chunkG2NJAIMMjs = require('./chunk-G2NJAIMM.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
var _chunkKTFMIXUNjs = require('./chunk-KTFMIXUN.js');
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _chunkAVDLSZLAjs = require('./chunk-AVDLSZLA.js');
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _chunkN5LTPQ53js = require('./chunk-N5LTPQ53.js');
|
|
19
19
|
|
|
20
20
|
// src/executors/r2-upload-publish/executor.ts
|
|
21
21
|
var _clients3 = require('@aws-sdk/client-s3');
|
|
@@ -39,8 +39,8 @@ async function runExecutor(options, context) {
|
|
|
39
39
|
throw new Error("The executor requires projectsConfigurations.");
|
|
40
40
|
}
|
|
41
41
|
try {
|
|
42
|
-
const workspaceRoot =
|
|
43
|
-
const config = await
|
|
42
|
+
const workspaceRoot = _chunkN5LTPQ53js.findWorkspaceRoot.call(void 0, );
|
|
43
|
+
const config = await _chunkAVDLSZLAjs.getConfig.call(void 0, workspaceRoot);
|
|
44
44
|
const sourceRoot = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.sourceRoot]), () => ( workspaceRoot));
|
|
45
45
|
const projectName = _nullishCoalesce(_optionalChain([context, 'access', _11 => _11.projectsConfigurations, 'access', _12 => _12.projects, 'access', _13 => _13[context.projectName], 'optionalAccess', _14 => _14.name]), () => ( context.projectName));
|
|
46
46
|
const projectDetails = _chunkKTFMIXUNjs.getPackageInfo.call(void 0,
|
|
@@ -79,7 +79,7 @@ async function runExecutor(options, context) {
|
|
|
79
79
|
"The executor failed because the project graph is not available. Please run the build command again."
|
|
80
80
|
);
|
|
81
81
|
}
|
|
82
|
-
|
|
82
|
+
_chunkN5LTPQ53js.writeInfo.call(void 0,
|
|
83
83
|
`Publishing ${context.projectName} to the Storm Registry at ${endpoint}`
|
|
84
84
|
);
|
|
85
85
|
const s3Client = new (0, _clients3.S3)({
|
|
@@ -91,12 +91,12 @@ async function runExecutor(options, context) {
|
|
|
91
91
|
}
|
|
92
92
|
});
|
|
93
93
|
const version = _optionalChain([projectDetails, 'access', _18 => _18.content, 'optionalAccess', _19 => _19.version]);
|
|
94
|
-
|
|
94
|
+
_chunkN5LTPQ53js.writeInfo.call(void 0, `Generated component version: ${version}`);
|
|
95
95
|
const files = await _glob.glob.call(void 0, _devkit.joinPathFragments.call(void 0, sourceRoot, "**/*"), {
|
|
96
96
|
ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
|
|
97
97
|
});
|
|
98
98
|
const projectPath = `registry/${context.projectName}`;
|
|
99
|
-
const internalDependencies = await
|
|
99
|
+
const internalDependencies = await _chunkG2NJAIMMjs.getInternalDependencies.call(void 0,
|
|
100
100
|
context.projectName,
|
|
101
101
|
projectGraph
|
|
102
102
|
);
|
|
@@ -109,14 +109,14 @@ async function runExecutor(options, context) {
|
|
|
109
109
|
return ret;
|
|
110
110
|
}, _nullishCoalesce(projectDetails.content.dependencies, () => ( {})));
|
|
111
111
|
const release = _nullishCoalesce(options.tag, () => ( _child_process.execSync.call(void 0, "npm config get tag").toString().trim()));
|
|
112
|
-
|
|
112
|
+
_chunkN5LTPQ53js.writeInfo.call(void 0, `Clearing out existing items in ${projectPath}`);
|
|
113
113
|
if (!isDryRun) {
|
|
114
114
|
const response = await s3Client.listObjects({
|
|
115
115
|
Bucket: options.bucketId,
|
|
116
116
|
Prefix: projectPath
|
|
117
117
|
});
|
|
118
118
|
if (_optionalChain([response, 'optionalAccess', _20 => _20.Contents]) && response.Contents.length > 0) {
|
|
119
|
-
|
|
119
|
+
_chunkN5LTPQ53js.writeDebug.call(void 0,
|
|
120
120
|
`Deleting the following existing items from the component registry: ${response.Contents.map((item) => item.Key).join(", ")}`
|
|
121
121
|
);
|
|
122
122
|
await Promise.all(
|
|
@@ -135,12 +135,12 @@ async function runExecutor(options, context) {
|
|
|
135
135
|
)
|
|
136
136
|
);
|
|
137
137
|
} else {
|
|
138
|
-
|
|
138
|
+
_chunkN5LTPQ53js.writeDebug.call(void 0,
|
|
139
139
|
`No existing items to delete in the component registry path ${projectPath}`
|
|
140
140
|
);
|
|
141
141
|
}
|
|
142
142
|
} else {
|
|
143
|
-
|
|
143
|
+
_chunkN5LTPQ53js.writeWarning.call(void 0, "[Dry run]: skipping upload to the Cyclone Registry.");
|
|
144
144
|
}
|
|
145
145
|
const meta = {
|
|
146
146
|
name: context.projectName,
|
|
@@ -158,9 +158,9 @@ async function runExecutor(options, context) {
|
|
|
158
158
|
meta.devDependencies = projectDetails.content.devDependencies;
|
|
159
159
|
}
|
|
160
160
|
const metaJson = JSON.stringify(meta);
|
|
161
|
-
|
|
161
|
+
_chunkN5LTPQ53js.writeInfo.call(void 0, `Generating meta.json file:
|
|
162
162
|
${metaJson}`);
|
|
163
|
-
await
|
|
163
|
+
await _chunkG2NJAIMMjs.r2UploadFile.call(void 0,
|
|
164
164
|
s3Client,
|
|
165
165
|
options.bucketId,
|
|
166
166
|
projectPath,
|
|
@@ -174,7 +174,7 @@ ${metaJson}`);
|
|
|
174
174
|
files.map((file) => {
|
|
175
175
|
const fileName = file.replaceAll("\\", "/").replace(sourceRoot.replaceAll("\\", "/"), "");
|
|
176
176
|
return _promises.readFile.call(void 0, file, { encoding: "utf8" }).then(
|
|
177
|
-
(fileContent) =>
|
|
177
|
+
(fileContent) => _chunkG2NJAIMMjs.r2UploadFile.call(void 0,
|
|
178
178
|
s3Client,
|
|
179
179
|
options.bucketId,
|
|
180
180
|
projectPath,
|
|
@@ -187,7 +187,7 @@ ${metaJson}`);
|
|
|
187
187
|
);
|
|
188
188
|
})
|
|
189
189
|
);
|
|
190
|
-
|
|
190
|
+
_chunkN5LTPQ53js.writeSuccess.call(void 0,
|
|
191
191
|
`Successfully uploaded the ${projectName} component to the Cyclone Registry`,
|
|
192
192
|
config
|
|
193
193
|
);
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
var
|
|
4
|
+
var _chunkN5LTPQ53js = require('./chunk-N5LTPQ53.js');
|
|
5
5
|
|
|
6
6
|
// src/utils/r2-bucket-helpers.ts
|
|
7
7
|
var _crypto = require('crypto');
|
|
8
8
|
var r2UploadFile = async (client, bucketName, projectPath, fileName, version, fileContent, contentType = "text/plain", isDryRun = false) => {
|
|
9
9
|
const checksum = _crypto.createHash.call(void 0, "sha256").update(fileContent).digest("base64");
|
|
10
10
|
const fileKey = `${projectPath}/${fileName.startsWith("/") ? fileName.substring(1) : fileName}`;
|
|
11
|
-
|
|
11
|
+
_chunkN5LTPQ53js.writeDebug.call(void 0, `Uploading file: ${fileKey}`);
|
|
12
12
|
if (!isDryRun) {
|
|
13
13
|
await client.putObject({
|
|
14
14
|
Bucket: bucketName,
|
|
@@ -21,7 +21,7 @@ var r2UploadFile = async (client, bucketName, projectPath, fileName, version, fi
|
|
|
21
21
|
}
|
|
22
22
|
});
|
|
23
23
|
} else {
|
|
24
|
-
|
|
24
|
+
_chunkN5LTPQ53js.writeWarning.call(void 0, "[Dry run]: skipping upload to the Cyclone Registry.");
|
|
25
25
|
}
|
|
26
26
|
};
|
|
27
27
|
var getInternalDependencies = (projectName, graph) => {
|