@storm-software/cloudflare-tools 0.63.48 → 0.63.50
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 +35 -0
- package/README.md +1 -1
- package/dist/{chunk-EGOX3ATY.js → chunk-2C5JON46.js} +12 -12
- package/dist/{chunk-IFBO5YTL.mjs → chunk-4EESYLWN.mjs} +3 -3
- package/dist/{chunk-NHG6EZHS.js → chunk-57WTY3UY.js} +3 -3
- package/dist/{chunk-4BNYLCUN.mjs → chunk-ADVG6LVE.mjs} +1 -1
- package/dist/{chunk-MKPMUQLP.js → chunk-AOAXSMD4.js} +118 -118
- package/dist/{chunk-YBEYUZYA.mjs → chunk-AZSS2TUS.mjs} +8 -4
- package/dist/{chunk-AE2T23TV.mjs → chunk-BRPTGDS4.mjs} +1 -1
- package/dist/{chunk-PYRV5ZYJ.js → chunk-G4O5CA24.js} +2 -2
- package/dist/{chunk-Q5D3SQSD.js → chunk-KDRIR55G.js} +10 -6
- package/dist/{chunk-DADPPALG.mjs → chunk-OWO7A5PU.mjs} +1 -1
- package/dist/{chunk-SNPJFGSK.mjs → chunk-Q5XL7K7Z.mjs} +3 -3
- package/dist/{chunk-GQNUZ2XY.js → chunk-UOEUE2GI.js} +44 -44
- package/dist/{chunk-SRLYXDLP.mjs → chunk-VBHMOQDO.mjs} +3 -3
- package/dist/{chunk-FGLRV4K6.mjs → chunk-VXMND3YT.mjs} +4 -4
- package/dist/{chunk-YDKLGL5J.mjs → chunk-WHJIOTPA.mjs} +1 -1
- package/dist/{chunk-CBV5OIDF.js → chunk-X2ML265T.js} +16 -16
- package/dist/executors.js +5 -5
- package/dist/executors.mjs +7 -7
- package/dist/generators.js +5 -5
- package/dist/generators.mjs +5 -5
- package/dist/index.js +8 -8
- package/dist/index.mjs +9 -9
- package/dist/src/executors/cloudflare-publish/executor.js +3 -3
- package/dist/src/executors/cloudflare-publish/executor.mjs +5 -5
- package/dist/src/executors/r2-upload-publish/executor.js +5 -5
- package/dist/src/executors/r2-upload-publish/executor.mjs +5 -5
- package/dist/src/executors/serve/executor.js +4 -4
- package/dist/src/executors/serve/executor.mjs +4 -4
- 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 +13 -13
|
@@ -621,16 +621,20 @@ import chalk from "chalk";
|
|
|
621
621
|
var chalkDefault = {
|
|
622
622
|
hex: (_) => (message) => message,
|
|
623
623
|
bgHex: (_) => ({
|
|
624
|
-
whiteBright: (message) => message
|
|
624
|
+
whiteBright: (message) => message,
|
|
625
|
+
white: (message) => message
|
|
625
626
|
}),
|
|
627
|
+
white: (message) => message,
|
|
626
628
|
whiteBright: (message) => message,
|
|
627
629
|
gray: (message) => message,
|
|
628
630
|
bold: {
|
|
629
631
|
hex: (_) => (message) => message,
|
|
630
632
|
bgHex: (_) => ({
|
|
631
|
-
whiteBright: (message) => message
|
|
633
|
+
whiteBright: (message) => message,
|
|
634
|
+
white: (message) => message
|
|
632
635
|
}),
|
|
633
|
-
whiteBright: (message) => message
|
|
636
|
+
whiteBright: (message) => message,
|
|
637
|
+
white: (message) => message
|
|
634
638
|
},
|
|
635
639
|
dim: {
|
|
636
640
|
hex: (_) => (message) => message,
|
|
@@ -639,7 +643,7 @@ var chalkDefault = {
|
|
|
639
643
|
};
|
|
640
644
|
var getChalk = () => {
|
|
641
645
|
let _chalk = chalk;
|
|
642
|
-
if (!_chalk?.hex || !_chalk?.bold?.hex || !_chalk?.bgHex || !_chalk?.whiteBright) {
|
|
646
|
+
if (!_chalk?.hex || !_chalk?.bold?.hex || !_chalk?.bgHex || !_chalk?.whiteBright || !_chalk?.white) {
|
|
643
647
|
_chalk = chalkDefault;
|
|
644
648
|
}
|
|
645
649
|
return _chalk;
|
|
@@ -7,7 +7,7 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
|
|
|
7
7
|
"package.json"(exports, module) {
|
|
8
8
|
module.exports = {
|
|
9
9
|
name: "@storm-software/cloudflare-tools",
|
|
10
|
-
version: "0.63.
|
|
10
|
+
version: "0.63.49",
|
|
11
11
|
description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
|
|
12
12
|
repository: {
|
|
13
13
|
type: "github",
|
|
@@ -175,7 +175,7 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
|
|
|
175
175
|
nx: "catalog:",
|
|
176
176
|
tsup: "catalog:",
|
|
177
177
|
untyped: "catalog:",
|
|
178
|
-
wrangler: "^4.
|
|
178
|
+
wrangler: "^4.27.0"
|
|
179
179
|
},
|
|
180
180
|
publishConfig: {
|
|
181
181
|
access: "public"
|
|
@@ -621,16 +621,20 @@ var _chalk2 = require('chalk'); var _chalk3 = _interopRequireDefault(_chalk2);
|
|
|
621
621
|
var chalkDefault = {
|
|
622
622
|
hex: (_) => (message) => message,
|
|
623
623
|
bgHex: (_) => ({
|
|
624
|
-
whiteBright: (message) => message
|
|
624
|
+
whiteBright: (message) => message,
|
|
625
|
+
white: (message) => message
|
|
625
626
|
}),
|
|
627
|
+
white: (message) => message,
|
|
626
628
|
whiteBright: (message) => message,
|
|
627
629
|
gray: (message) => message,
|
|
628
630
|
bold: {
|
|
629
631
|
hex: (_) => (message) => message,
|
|
630
632
|
bgHex: (_) => ({
|
|
631
|
-
whiteBright: (message) => message
|
|
633
|
+
whiteBright: (message) => message,
|
|
634
|
+
white: (message) => message
|
|
632
635
|
}),
|
|
633
|
-
whiteBright: (message) => message
|
|
636
|
+
whiteBright: (message) => message,
|
|
637
|
+
white: (message) => message
|
|
634
638
|
},
|
|
635
639
|
dim: {
|
|
636
640
|
hex: (_) => (message) => message,
|
|
@@ -639,7 +643,7 @@ var chalkDefault = {
|
|
|
639
643
|
};
|
|
640
644
|
var getChalk = () => {
|
|
641
645
|
let _chalk = _chalk3.default;
|
|
642
|
-
if (!_optionalChain([_chalk, 'optionalAccess', _6 => _6.hex]) || !_optionalChain([_chalk, 'optionalAccess', _7 => _7.bold, 'optionalAccess', _8 => _8.hex]) || !_optionalChain([_chalk, 'optionalAccess', _9 => _9.bgHex]) || !_optionalChain([_chalk, 'optionalAccess', _10 => _10.whiteBright])) {
|
|
646
|
+
if (!_optionalChain([_chalk, 'optionalAccess', _6 => _6.hex]) || !_optionalChain([_chalk, 'optionalAccess', _7 => _7.bold, 'optionalAccess', _8 => _8.hex]) || !_optionalChain([_chalk, 'optionalAccess', _9 => _9.bgHex]) || !_optionalChain([_chalk, 'optionalAccess', _10 => _10.whiteBright]) || !_optionalChain([_chalk, 'optionalAccess', _11 => _11.white])) {
|
|
643
647
|
_chalk = chalkDefault;
|
|
644
648
|
}
|
|
645
649
|
return _chalk;
|
|
@@ -727,7 +731,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
|
|
|
727
731
|
|
|
728
732
|
// ../config-tools/src/logger/console.ts
|
|
729
733
|
var getLogFn = (logLevel = LogLevel.INFO, config = {}, _chalk = getChalk()) => {
|
|
730
|
-
const colors = !_optionalChain([config, 'access',
|
|
734
|
+
const colors = !_optionalChain([config, 'access', _12 => _12.colors, 'optionalAccess', _13 => _13.dark]) && !_optionalChain([config, 'access', _14 => _14.colors, 'optionalAccess', _15 => _15["base"]]) && !_optionalChain([config, 'access', _16 => _16.colors, 'optionalAccess', _17 => _17["base"], 'optionalAccess', _18 => _18.dark]) ? DEFAULT_COLOR_CONFIG : _optionalChain([config, 'access', _19 => _19.colors, 'optionalAccess', _20 => _20.dark]) && typeof config.colors.dark === "string" ? config.colors : _optionalChain([config, 'access', _21 => _21.colors, 'optionalAccess', _22 => _22["base"], 'optionalAccess', _23 => _23.dark]) && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : _optionalChain([config, 'access', _24 => _24.colors, 'optionalAccess', _25 => _25["base"]]) ? _optionalChain([config, 'access', _26 => _26.colors, 'optionalAccess', _27 => _27["base"]]) : DEFAULT_COLOR_CONFIG;
|
|
731
735
|
const configLogLevel = config.logLevel || process.env.STORM_LOG_LEVEL || LogLevelLabel.INFO;
|
|
732
736
|
if (logLevel > getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT || getLogLevel(configLogLevel) <= LogLevel.SILENT) {
|
|
733
737
|
return (_) => {
|
|
@@ -843,7 +847,7 @@ ${Object.keys(message).filter((key) => !skip.includes(key)).map(
|
|
|
843
847
|
};
|
|
844
848
|
var _isFunction = (value) => {
|
|
845
849
|
try {
|
|
846
|
-
return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess',
|
|
850
|
+
return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess', _28 => _28.constructor]) && _optionalChain([value, 'optionalAccess', _29 => _29.call]) && _optionalChain([value, 'optionalAccess', _30 => _30.apply]));
|
|
847
851
|
} catch (e) {
|
|
848
852
|
return false;
|
|
849
853
|
}
|
|
@@ -9,7 +9,7 @@ var __commonJS = (cb, mod) => function __require2() {
|
|
|
9
9
|
return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
|
|
10
10
|
};
|
|
11
11
|
|
|
12
|
-
// ../../node_modules/.pnpm/tsup@8.4.0_patch_hash=
|
|
12
|
+
// ../../node_modules/.pnpm/tsup@8.4.0_patch_hash=751a554d775c3572381af4e7e5fa22eeda6dd6856012fb1cf521d6806eb2dc74__bcd916ddd444853d973467efe4fe5e78/node_modules/tsup/assets/esm_shims.js
|
|
13
13
|
import { fileURLToPath } from "url";
|
|
14
14
|
import path from "path";
|
|
15
15
|
var getFilename = () => fileURLToPath(import.meta.url);
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getInternalDependencies,
|
|
3
3
|
r2UploadFile
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-BRPTGDS4.mjs";
|
|
5
5
|
import {
|
|
6
6
|
createCliOptions,
|
|
7
7
|
getPackageInfo
|
|
8
8
|
} from "./chunk-PH3DHY4Q.mjs";
|
|
9
9
|
import {
|
|
10
10
|
getConfig
|
|
11
|
-
} from "./chunk-
|
|
11
|
+
} from "./chunk-ADVG6LVE.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-AZSS2TUS.mjs";
|
|
19
19
|
|
|
20
20
|
// src/executors/r2-upload-publish/executor.ts
|
|
21
21
|
import { S3 } from "@aws-sdk/client-s3";
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _chunkKDRIR55Gjs = require('./chunk-KDRIR55G.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 || _chunkKDRIR55Gjs.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 : _chunkKDRIR55Gjs.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 : _chunkKDRIR55Gjs.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 : _chunkKDRIR55Gjs.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
|
+
_chunkKDRIR55Gjs.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
|
+
_chunkKDRIR55Gjs.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"
|
|
@@ -156,15 +156,15 @@ var getConfigEnv = () => {
|
|
|
156
156
|
support: process.env[`${prefix}SUPPORT`] || void 0,
|
|
157
157
|
timezone: process.env[`${prefix}TIMEZONE`] || process.env.TZ || void 0,
|
|
158
158
|
locale: process.env[`${prefix}LOCALE`] || process.env.LOCALE || void 0,
|
|
159
|
-
configFile: process.env[`${prefix}CONFIG_FILE`] ?
|
|
160
|
-
workspaceRoot: process.env[`${prefix}WORKSPACE_ROOT`] ?
|
|
159
|
+
configFile: process.env[`${prefix}CONFIG_FILE`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}CONFIG_FILE`]) : void 0,
|
|
160
|
+
workspaceRoot: process.env[`${prefix}WORKSPACE_ROOT`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}WORKSPACE_ROOT`]) : void 0,
|
|
161
161
|
directories: {
|
|
162
|
-
cache: process.env[`${prefix}CACHE_DIR`] ?
|
|
163
|
-
data: process.env[`${prefix}DATA_DIR`] ?
|
|
164
|
-
config: process.env[`${prefix}CONFIG_DIR`] ?
|
|
165
|
-
temp: process.env[`${prefix}TEMP_DIR`] ?
|
|
166
|
-
log: process.env[`${prefix}LOG_DIR`] ?
|
|
167
|
-
build: process.env[`${prefix}BUILD_DIR`] ?
|
|
162
|
+
cache: process.env[`${prefix}CACHE_DIR`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}CACHE_DIR`]) : process.env[`${prefix}CACHE_DIRECTORY`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}CACHE_DIRECTORY`]) : void 0,
|
|
163
|
+
data: process.env[`${prefix}DATA_DIR`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}DATA_DIR`]) : process.env[`${prefix}DATA_DIRECTORY`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}DATA_DIRECTORY`]) : void 0,
|
|
164
|
+
config: process.env[`${prefix}CONFIG_DIR`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}CONFIG_DIR`]) : process.env[`${prefix}CONFIG_DIRECTORY`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}CONFIG_DIRECTORY`]) : void 0,
|
|
165
|
+
temp: process.env[`${prefix}TEMP_DIR`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}TEMP_DIR`]) : process.env[`${prefix}TEMP_DIRECTORY`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}TEMP_DIRECTORY`]) : void 0,
|
|
166
|
+
log: process.env[`${prefix}LOG_DIR`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}LOG_DIR`]) : process.env[`${prefix}LOG_DIRECTORY`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}LOG_DIRECTORY`]) : void 0,
|
|
167
|
+
build: process.env[`${prefix}BUILD_DIR`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}BUILD_DIR`]) : process.env[`${prefix}BUILD_DIRECTORY`] ? _chunkKDRIR55Gjs.correctPaths.call(void 0, process.env[`${prefix}BUILD_DIRECTORY`]) : void 0
|
|
168
168
|
},
|
|
169
169
|
skipCache: process.env[`${prefix}SKIP_CACHE`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CACHE`]) : void 0,
|
|
170
170
|
mode: (_nullishCoalesce(_nullishCoalesce(process.env[`${prefix}MODE`], () => ( process.env.NODE_ENV)), () => ( process.env.ENVIRONMENT))) || void 0,
|
|
@@ -188,13 +188,13 @@ var getConfigEnv = () => {
|
|
|
188
188
|
},
|
|
189
189
|
logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
|
|
190
190
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
191
|
-
) ?
|
|
191
|
+
) ? _chunkKDRIR55Gjs.getLogLevelLabel.call(void 0,
|
|
192
192
|
Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
|
|
193
193
|
) : process.env[`${prefix}LOG_LEVEL`] : void 0,
|
|
194
194
|
skipConfigLogging: process.env[`${prefix}SKIP_CONFIG_LOGGING`] !== void 0 ? Boolean(process.env[`${prefix}SKIP_CONFIG_LOGGING`]) : void 0
|
|
195
195
|
};
|
|
196
196
|
const themeNames = Object.keys(process.env).filter(
|
|
197
|
-
(envKey) => envKey.startsWith(`${prefix}COLOR_`) &&
|
|
197
|
+
(envKey) => envKey.startsWith(`${prefix}COLOR_`) && _chunkKDRIR55Gjs.COLOR_KEYS.every(
|
|
198
198
|
(colorKey) => !envKey.startsWith(`${prefix}COLOR_LIGHT_${colorKey}`) && !envKey.startsWith(`${prefix}COLOR_DARK_${colorKey}`)
|
|
199
199
|
)
|
|
200
200
|
);
|
|
@@ -205,16 +205,16 @@ var getConfigEnv = () => {
|
|
|
205
205
|
},
|
|
206
206
|
{}
|
|
207
207
|
) : getThemeColorConfigEnv(prefix);
|
|
208
|
-
if (config.docs ===
|
|
209
|
-
if (config.homepage ===
|
|
210
|
-
config.docs = `${
|
|
208
|
+
if (config.docs === _chunkKDRIR55Gjs.STORM_DEFAULT_DOCS) {
|
|
209
|
+
if (config.homepage === _chunkKDRIR55Gjs.STORM_DEFAULT_HOMEPAGE) {
|
|
210
|
+
config.docs = `${_chunkKDRIR55Gjs.STORM_DEFAULT_HOMEPAGE}/projects/${config.name}/docs`;
|
|
211
211
|
} else {
|
|
212
212
|
config.docs = `${config.homepage}/docs`;
|
|
213
213
|
}
|
|
214
214
|
}
|
|
215
|
-
if (config.licensing ===
|
|
216
|
-
if (config.homepage ===
|
|
217
|
-
config.licensing = `${
|
|
215
|
+
if (config.licensing === _chunkKDRIR55Gjs.STORM_DEFAULT_LICENSING) {
|
|
216
|
+
if (config.homepage === _chunkKDRIR55Gjs.STORM_DEFAULT_HOMEPAGE) {
|
|
217
|
+
config.licensing = `${_chunkKDRIR55Gjs.STORM_DEFAULT_HOMEPAGE}/projects/${config.name}/licensing`;
|
|
218
218
|
} else {
|
|
219
219
|
config.licensing = `${config.homepage}/docs`;
|
|
220
220
|
}
|
|
@@ -415,40 +415,40 @@ var setConfigEnv = (config) => {
|
|
|
415
415
|
process.env.LANG = config.locale ? `${config.locale.replaceAll("-", "_")}.UTF-8` : "en_US.UTF-8";
|
|
416
416
|
}
|
|
417
417
|
if (config.configFile) {
|
|
418
|
-
process.env[`${prefix}CONFIG_FILE`] =
|
|
418
|
+
process.env[`${prefix}CONFIG_FILE`] = _chunkKDRIR55Gjs.correctPaths.call(void 0, config.configFile);
|
|
419
419
|
}
|
|
420
420
|
if (config.workspaceRoot) {
|
|
421
|
-
process.env[`${prefix}WORKSPACE_ROOT`] =
|
|
422
|
-
process.env.NX_WORKSPACE_ROOT =
|
|
423
|
-
process.env.NX_WORKSPACE_ROOT_PATH =
|
|
421
|
+
process.env[`${prefix}WORKSPACE_ROOT`] = _chunkKDRIR55Gjs.correctPaths.call(void 0, config.workspaceRoot);
|
|
422
|
+
process.env.NX_WORKSPACE_ROOT = _chunkKDRIR55Gjs.correctPaths.call(void 0, config.workspaceRoot);
|
|
423
|
+
process.env.NX_WORKSPACE_ROOT_PATH = _chunkKDRIR55Gjs.correctPaths.call(void 0, config.workspaceRoot);
|
|
424
424
|
}
|
|
425
425
|
if (config.directories) {
|
|
426
426
|
if (!config.skipCache && config.directories.cache) {
|
|
427
|
-
process.env[`${prefix}CACHE_DIR`] =
|
|
427
|
+
process.env[`${prefix}CACHE_DIR`] = _chunkKDRIR55Gjs.correctPaths.call(void 0,
|
|
428
428
|
config.directories.cache
|
|
429
429
|
);
|
|
430
430
|
process.env[`${prefix}CACHE_DIRECTORY`] = process.env[`${prefix}CACHE_DIR`];
|
|
431
431
|
}
|
|
432
432
|
if (config.directories.data) {
|
|
433
|
-
process.env[`${prefix}DATA_DIR`] =
|
|
433
|
+
process.env[`${prefix}DATA_DIR`] = _chunkKDRIR55Gjs.correctPaths.call(void 0, config.directories.data);
|
|
434
434
|
process.env[`${prefix}DATA_DIRECTORY`] = process.env[`${prefix}DATA_DIR`];
|
|
435
435
|
}
|
|
436
436
|
if (config.directories.config) {
|
|
437
|
-
process.env[`${prefix}CONFIG_DIR`] =
|
|
437
|
+
process.env[`${prefix}CONFIG_DIR`] = _chunkKDRIR55Gjs.correctPaths.call(void 0,
|
|
438
438
|
config.directories.config
|
|
439
439
|
);
|
|
440
440
|
process.env[`${prefix}CONFIG_DIRECTORY`] = process.env[`${prefix}CONFIG_DIR`];
|
|
441
441
|
}
|
|
442
442
|
if (config.directories.temp) {
|
|
443
|
-
process.env[`${prefix}TEMP_DIR`] =
|
|
443
|
+
process.env[`${prefix}TEMP_DIR`] = _chunkKDRIR55Gjs.correctPaths.call(void 0, config.directories.temp);
|
|
444
444
|
process.env[`${prefix}TEMP_DIRECTORY`] = process.env[`${prefix}TEMP_DIR`];
|
|
445
445
|
}
|
|
446
446
|
if (config.directories.log) {
|
|
447
|
-
process.env[`${prefix}LOG_DIR`] =
|
|
447
|
+
process.env[`${prefix}LOG_DIR`] = _chunkKDRIR55Gjs.correctPaths.call(void 0, config.directories.log);
|
|
448
448
|
process.env[`${prefix}LOG_DIRECTORY`] = process.env[`${prefix}LOG_DIR`];
|
|
449
449
|
}
|
|
450
450
|
if (config.directories.build) {
|
|
451
|
-
process.env[`${prefix}BUILD_DIR`] =
|
|
451
|
+
process.env[`${prefix}BUILD_DIR`] = _chunkKDRIR55Gjs.correctPaths.call(void 0,
|
|
452
452
|
config.directories.build
|
|
453
453
|
);
|
|
454
454
|
process.env[`${prefix}BUILD_DIRECTORY`] = process.env[`${prefix}BUILD_DIR`];
|
|
@@ -510,9 +510,9 @@ var setConfigEnv = (config) => {
|
|
|
510
510
|
process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
|
|
511
511
|
process.env.LOG_LEVEL = String(config.logLevel);
|
|
512
512
|
process.env.NX_VERBOSE_LOGGING = String(
|
|
513
|
-
|
|
513
|
+
_chunkKDRIR55Gjs.getLogLevel.call(void 0, config.logLevel) >= _chunkKDRIR55Gjs.LogLevel.DEBUG ? true : false
|
|
514
514
|
);
|
|
515
|
-
process.env.RUST_BACKTRACE =
|
|
515
|
+
process.env.RUST_BACKTRACE = _chunkKDRIR55Gjs.getLogLevel.call(void 0, config.logLevel) >= _chunkKDRIR55Gjs.LogLevel.DEBUG ? "full" : "none";
|
|
516
516
|
}
|
|
517
517
|
if (config.skipConfigLogging !== void 0) {
|
|
518
518
|
process.env[`${prefix}SKIP_CONFIG_LOGGING`] = String(
|
|
@@ -632,13 +632,13 @@ var createStormWorkspaceConfig = async (extensionName, schema, workspaceRoot, sk
|
|
|
632
632
|
if (!_optionalChain([_static_cache, 'optionalAccess', _29 => _29.data]) || !_optionalChain([_static_cache, 'optionalAccess', _30 => _30.timestamp]) || _static_cache.timestamp < Date.now() - 8e3) {
|
|
633
633
|
let _workspaceRoot = workspaceRoot;
|
|
634
634
|
if (!_workspaceRoot) {
|
|
635
|
-
_workspaceRoot =
|
|
635
|
+
_workspaceRoot = _chunkKDRIR55Gjs.findWorkspaceRoot.call(void 0, );
|
|
636
636
|
}
|
|
637
637
|
const configEnv = getConfigEnv();
|
|
638
638
|
const configFile = await getConfigFile(_workspaceRoot);
|
|
639
639
|
if (!configFile) {
|
|
640
640
|
if (!skipLogs) {
|
|
641
|
-
|
|
641
|
+
_chunkKDRIR55Gjs.writeWarning.call(void 0,
|
|
642
642
|
"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",
|
|
643
643
|
{ logLevel: "all" }
|
|
644
644
|
);
|
|
@@ -647,22 +647,22 @@ var createStormWorkspaceConfig = async (extensionName, schema, workspaceRoot, sk
|
|
|
647
647
|
return void 0;
|
|
648
648
|
}
|
|
649
649
|
}
|
|
650
|
-
const defaultConfig = await
|
|
650
|
+
const defaultConfig = await _chunkKDRIR55Gjs.getPackageJsonConfig.call(void 0, _workspaceRoot);
|
|
651
651
|
const configInput = _defu2.default.call(void 0,
|
|
652
652
|
configEnv,
|
|
653
653
|
configFile,
|
|
654
654
|
defaultConfig
|
|
655
655
|
);
|
|
656
656
|
try {
|
|
657
|
-
result =
|
|
658
|
-
await
|
|
657
|
+
result = _chunkKDRIR55Gjs.applyDefaultConfig.call(void 0,
|
|
658
|
+
await _chunkKDRIR55Gjs.stormWorkspaceConfigSchema.parseAsync(configInput)
|
|
659
659
|
);
|
|
660
660
|
result.workspaceRoot ??= _workspaceRoot;
|
|
661
661
|
} catch (error) {
|
|
662
662
|
throw new Error(
|
|
663
663
|
`Failed to parse Storm Workspace configuration${_optionalChain([error, 'optionalAccess', _31 => _31.message]) ? `: ${error.message}` : ""}
|
|
664
664
|
|
|
665
|
-
Please ensure your configuration file is valid JSON and matches the expected schema. The current workspace configuration input is: ${
|
|
665
|
+
Please ensure your configuration file is valid JSON and matches the expected schema. The current workspace configuration input is: ${_chunkKDRIR55Gjs.formatLogMessage.call(void 0,
|
|
666
666
|
configInput
|
|
667
667
|
)}`,
|
|
668
668
|
{
|
|
@@ -707,9 +707,9 @@ var loadStormWorkspaceConfig = async (workspaceRoot, skipLogs = false) => {
|
|
|
707
707
|
);
|
|
708
708
|
setConfigEnv(config);
|
|
709
709
|
if (!skipLogs && !config.skipConfigLogging) {
|
|
710
|
-
|
|
710
|
+
_chunkKDRIR55Gjs.writeTrace.call(void 0,
|
|
711
711
|
`\u2699\uFE0F Using Storm Workspace configuration:
|
|
712
|
-
${
|
|
712
|
+
${_chunkKDRIR55Gjs.formatLogMessage.call(void 0, config)}`,
|
|
713
713
|
config
|
|
714
714
|
);
|
|
715
715
|
}
|
|
@@ -723,7 +723,7 @@ var getConfig = (workspaceRoot, skipLogs = false) => {
|
|
|
723
723
|
var getWorkspaceConfig = (skipLogs = true, options = {}) => {
|
|
724
724
|
let workspaceRoot = options.workspaceRoot;
|
|
725
725
|
if (!workspaceRoot) {
|
|
726
|
-
workspaceRoot =
|
|
726
|
+
workspaceRoot = _chunkKDRIR55Gjs.findWorkspaceRoot.call(void 0, options.cwd);
|
|
727
727
|
}
|
|
728
728
|
return getConfig(workspaceRoot, skipLogs);
|
|
729
729
|
};
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
2
|
__commonJS
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-OWO7A5PU.mjs";
|
|
4
4
|
|
|
5
5
|
// package.json
|
|
6
6
|
var require_package = __commonJS({
|
|
7
7
|
"package.json"(exports, module) {
|
|
8
8
|
module.exports = {
|
|
9
9
|
name: "@storm-software/cloudflare-tools",
|
|
10
|
-
version: "0.63.
|
|
10
|
+
version: "0.63.49",
|
|
11
11
|
description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
|
|
12
12
|
repository: {
|
|
13
13
|
type: "github",
|
|
@@ -175,7 +175,7 @@ var require_package = __commonJS({
|
|
|
175
175
|
nx: "catalog:",
|
|
176
176
|
tsup: "catalog:",
|
|
177
177
|
untyped: "catalog:",
|
|
178
|
-
wrangler: "^4.
|
|
178
|
+
wrangler: "^4.27.0"
|
|
179
179
|
},
|
|
180
180
|
publishConfig: {
|
|
181
181
|
access: "public"
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import {
|
|
2
2
|
generator_default
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-VBHMOQDO.mjs";
|
|
4
4
|
import {
|
|
5
5
|
getConfig
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-ADVG6LVE.mjs";
|
|
7
7
|
import {
|
|
8
8
|
findWorkspaceRoot,
|
|
9
9
|
getStopwatch,
|
|
@@ -12,10 +12,10 @@ import {
|
|
|
12
12
|
writeFatal,
|
|
13
13
|
writeInfo,
|
|
14
14
|
writeTrace
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-AZSS2TUS.mjs";
|
|
16
16
|
import {
|
|
17
17
|
__dirname
|
|
18
|
-
} from "./chunk-
|
|
18
|
+
} from "./chunk-OWO7A5PU.mjs";
|
|
19
19
|
|
|
20
20
|
// src/generators/worker/generator.ts
|
|
21
21
|
import {
|
|
@@ -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 _chunk57WTY3UYjs = require('./chunk-57WTY3UY.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
var _chunkNU34IEWNjs = require('./chunk-NU34IEWN.js');
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _chunkUOEUE2GIjs = require('./chunk-UOEUE2GI.js');
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _chunkKDRIR55Gjs = require('./chunk-KDRIR55G.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 = _chunkKDRIR55Gjs.findWorkspaceRoot.call(void 0, );
|
|
43
|
+
const config = await _chunkUOEUE2GIjs.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 = _chunkNU34IEWNjs.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
|
+
_chunkKDRIR55Gjs.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
|
+
_chunkKDRIR55Gjs.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 _chunk57WTY3UYjs.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
|
+
_chunkKDRIR55Gjs.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
|
+
_chunkKDRIR55Gjs.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
|
+
_chunkKDRIR55Gjs.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
|
+
_chunkKDRIR55Gjs.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
|
+
_chunkKDRIR55Gjs.writeInfo.call(void 0, `Generating meta.json file:
|
|
162
162
|
${metaJson}`);
|
|
163
|
-
await
|
|
163
|
+
await _chunk57WTY3UYjs.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) => _chunk57WTY3UYjs.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
|
+
_chunkKDRIR55Gjs.writeSuccess.call(void 0,
|
|
191
191
|
`Successfully uploaded the ${projectName} component to the Cyclone Registry`,
|
|
192
192
|
config
|
|
193
193
|
);
|
package/dist/executors.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";require('./chunk-XO66D74Z.js');
|
|
2
2
|
require('./chunk-IRORGRVZ.js');
|
|
3
|
-
require('./chunk-
|
|
4
|
-
require('./chunk-
|
|
5
|
-
require('./chunk-
|
|
3
|
+
require('./chunk-AOAXSMD4.js');
|
|
4
|
+
require('./chunk-X2ML265T.js');
|
|
5
|
+
require('./chunk-57WTY3UY.js');
|
|
6
6
|
require('./chunk-NU34IEWN.js');
|
|
7
|
-
require('./chunk-
|
|
8
|
-
require('./chunk-
|
|
7
|
+
require('./chunk-UOEUE2GI.js');
|
|
8
|
+
require('./chunk-KDRIR55G.js');
|
|
9
9
|
require('./chunk-MCKGQKYU.js');
|
package/dist/executors.mjs
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import "./chunk-YSCEY447.mjs";
|
|
2
|
-
import "./chunk-
|
|
3
|
-
import "./chunk-
|
|
4
|
-
import "./chunk-
|
|
5
|
-
import "./chunk-
|
|
2
|
+
import "./chunk-WHJIOTPA.mjs";
|
|
3
|
+
import "./chunk-4EESYLWN.mjs";
|
|
4
|
+
import "./chunk-Q5XL7K7Z.mjs";
|
|
5
|
+
import "./chunk-BRPTGDS4.mjs";
|
|
6
6
|
import "./chunk-PH3DHY4Q.mjs";
|
|
7
|
-
import "./chunk-
|
|
8
|
-
import "./chunk-
|
|
9
|
-
import "./chunk-
|
|
7
|
+
import "./chunk-ADVG6LVE.mjs";
|
|
8
|
+
import "./chunk-AZSS2TUS.mjs";
|
|
9
|
+
import "./chunk-OWO7A5PU.mjs";
|