@storm-software/cloudflare-tools 0.71.235 → 0.71.242
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 +78 -0
- package/README.md +1 -1
- package/dist/{chunk-MIPARIGF.mjs → chunk-3GUCTXXT.mjs} +3 -3
- package/dist/{chunk-7BBXRCAA.mjs → chunk-4HEOMMTX.mjs} +3 -3
- package/dist/{chunk-TXSHBEGN.js → chunk-7NFFNXFN.js} +12 -12
- package/dist/{chunk-2S4EPFWW.js → chunk-AF4CHUYX.js} +5 -5
- package/dist/{chunk-62X6T4SY.js → chunk-BASIQFOW.js} +6 -6
- package/dist/{chunk-7Z3A2OAB.mjs → chunk-BGMLQBUW.mjs} +1 -1
- package/dist/{chunk-5MAMLVMV.mjs → chunk-BJQFVPGK.mjs} +3 -1
- package/dist/{chunk-3E2GFJMN.mjs → chunk-E2KDBKFZ.mjs} +8 -8
- package/dist/{chunk-YWFXWCTG.mjs → chunk-EI77CIK7.mjs} +1 -1
- package/dist/chunk-FLA2SYPV.js +231 -0
- package/dist/{chunk-IZL2M4L5.js → chunk-GLKR5BOA.js} +5 -5
- package/dist/{chunk-FXP4SY7V.js → chunk-GRVOVEJP.js} +5 -5
- package/dist/{chunk-WYBCLRR7.mjs → chunk-KNN4W7QC.mjs} +2 -2
- package/dist/{chunk-IZGBGYWL.mjs → chunk-MVEHOKMY.mjs} +2 -2
- package/dist/{chunk-GHTZXW75.js → chunk-TMHLSIZ5.js} +1 -1
- package/dist/chunk-WTWLKDV7.mjs +231 -0
- package/dist/{chunk-67JJGDCQ.mjs → chunk-YCOA7IKG.mjs} +6 -6
- package/dist/{chunk-PGTHXO6M.js → chunk-YRUROEEP.js} +3 -1
- package/dist/executors.js +3 -3
- package/dist/executors.mjs +5 -5
- package/dist/generators.js +4 -4
- package/dist/generators.mjs +4 -4
- package/dist/index.js +6 -6
- package/dist/index.mjs +7 -7
- package/dist/src/executors/cloudflare-publish/executor.js +2 -2
- package/dist/src/executors/cloudflare-publish/executor.mjs +4 -4
- package/dist/src/executors/r2-upload-publish/executor.js +3 -3
- package/dist/src/executors/r2-upload-publish/executor.mjs +3 -3
- package/dist/src/executors/r2-upload-publish/untyped.mjs +1 -1
- package/dist/src/executors/serve/executor.js +3 -3
- 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 +2 -2
- package/dist/src/generators/worker/generator.js +4 -4
- package/dist/src/generators/worker/generator.mjs +4 -4
- package/dist/src/plugins/index.mjs +1 -1
- package/dist/src/utils/http-handler.mjs +1 -1
- package/dist/src/utils/index.mjs +1 -1
- package/dist/src/utils/r2-bucket-helpers.mjs +1 -1
- package/package.json +9 -9
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,84 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - Cloudflare Tools
|
|
4
4
|
|
|
5
|
+
## [0.71.242](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.242) (07/13/2026)
|
|
6
|
+
|
|
7
|
+
### Miscellaneous
|
|
8
|
+
|
|
9
|
+
- **devenv-modules:** Update devenv modules inputs ([d71083ab0](https://github.com/storm-software/storm-ops/commit/d71083ab0))
|
|
10
|
+
- **bun-tools:** Display full error details during update ([f1c4902a7](https://github.com/storm-software/storm-ops/commit/f1c4902a7))
|
|
11
|
+
|
|
12
|
+
### Updated Dependencies
|
|
13
|
+
|
|
14
|
+
- Updated **config** to **v1.138.36**
|
|
15
|
+
- Updated **config-tools** to **v1.190.99**
|
|
16
|
+
- Updated **workspace-tools** to **v1.296.79**
|
|
17
|
+
|
|
18
|
+
## [0.71.241](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.241) (07/13/2026)
|
|
19
|
+
|
|
20
|
+
### Updated Dependencies
|
|
21
|
+
|
|
22
|
+
- Updated **config** to **v1.138.35**
|
|
23
|
+
- Updated **config-tools** to **v1.190.98**
|
|
24
|
+
- Updated **workspace-tools** to **v1.296.78**
|
|
25
|
+
|
|
26
|
+
## [0.71.240](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.240) (07/13/2026)
|
|
27
|
+
|
|
28
|
+
### Miscellaneous
|
|
29
|
+
|
|
30
|
+
- **tools-scripts:** Resolve linting issue with `package.json` dependencies order ([140a5f835](https://github.com/storm-software/storm-ops/commit/140a5f835))
|
|
31
|
+
|
|
32
|
+
### Updated Dependencies
|
|
33
|
+
|
|
34
|
+
- Updated **config** to **v1.138.34**
|
|
35
|
+
- Updated **config-tools** to **v1.190.97**
|
|
36
|
+
- Updated **workspace-tools** to **v1.296.77**
|
|
37
|
+
|
|
38
|
+
## [0.71.239](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.239) (07/13/2026)
|
|
39
|
+
|
|
40
|
+
### Updated Dependencies
|
|
41
|
+
|
|
42
|
+
- Updated **config** to **v1.138.33**
|
|
43
|
+
- Updated **config-tools** to **v1.190.96**
|
|
44
|
+
- Updated **workspace-tools** to **v1.296.76**
|
|
45
|
+
|
|
46
|
+
## [0.71.238](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.238) (07/13/2026)
|
|
47
|
+
|
|
48
|
+
### Updated Dependencies
|
|
49
|
+
|
|
50
|
+
- Updated **config** to **v1.138.32**
|
|
51
|
+
- Updated **config-tools** to **v1.190.95**
|
|
52
|
+
- Updated **workspace-tools** to **v1.296.75**
|
|
53
|
+
|
|
54
|
+
## [0.71.237](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.237) (07/13/2026)
|
|
55
|
+
|
|
56
|
+
### Miscellaneous
|
|
57
|
+
|
|
58
|
+
- **monorepo:** Update `devenv.yaml` to use NixOS package versions ([91e9ced1a](https://github.com/storm-software/storm-ops/commit/91e9ced1a))
|
|
59
|
+
- **monorepo:** Regenerate workspace's devenv modules ([3055cb5fa](https://github.com/storm-software/storm-ops/commit/3055cb5fa))
|
|
60
|
+
|
|
61
|
+
### Features
|
|
62
|
+
|
|
63
|
+
- **bun-tools:** Added `bun-tools` package and `bun` devenv module ([714817800](https://github.com/storm-software/storm-ops/commit/714817800))
|
|
64
|
+
|
|
65
|
+
### Updated Dependencies
|
|
66
|
+
|
|
67
|
+
- Updated **config** to **v1.138.31**
|
|
68
|
+
- Updated **config-tools** to **v1.190.94**
|
|
69
|
+
- Updated **workspace-tools** to **v1.296.74**
|
|
70
|
+
|
|
71
|
+
## [0.71.236](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.236) (07/12/2026)
|
|
72
|
+
|
|
73
|
+
### Features
|
|
74
|
+
|
|
75
|
+
- **bun-tools:** Added `bun-tools` package and `bun` devenv module ([714817800](https://github.com/storm-software/storm-ops/commit/714817800))
|
|
76
|
+
|
|
77
|
+
### Updated Dependencies
|
|
78
|
+
|
|
79
|
+
- Updated **config** to **v1.138.30**
|
|
80
|
+
- Updated **config-tools** to **v1.190.93**
|
|
81
|
+
- Updated **workspace-tools** to **v1.296.73**
|
|
82
|
+
|
|
5
83
|
## [0.71.235](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.235) (07/10/2026)
|
|
6
84
|
|
|
7
85
|
### Miscellaneous
|
package/README.md
CHANGED
|
@@ -27,7 +27,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
|
|
|
27
27
|
|
|
28
28
|
<h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
|
|
29
29
|
|
|
30
|
-
[](https://prettier.io/) [](http://nx.dev/) [](https://nextjs.org/) [](http://commitizen.github.io/cz-cli/)  [](https://fumadocs.vercel.app/) 
|
|
31
31
|
|
|
32
32
|
<!-- prettier-ignore-start -->
|
|
33
33
|
<!-- markdownlint-disable -->
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
generator_default
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-YCOA7IKG.mjs";
|
|
4
4
|
import {
|
|
5
5
|
findWorkspaceRoot,
|
|
6
6
|
getConfig
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-BJQFVPGK.mjs";
|
|
8
8
|
import {
|
|
9
9
|
brandIcon,
|
|
10
10
|
getStopwatch,
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
} from "./chunk-K4H5ZMYA.mjs";
|
|
17
17
|
import {
|
|
18
18
|
__dirname
|
|
19
|
-
} from "./chunk-
|
|
19
|
+
} from "./chunk-EI77CIK7.mjs";
|
|
20
20
|
|
|
21
21
|
// src/generators/worker/generator.ts
|
|
22
22
|
import {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
generator_default
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-MVEHOKMY.mjs";
|
|
4
4
|
import {
|
|
5
5
|
findWorkspaceRoot,
|
|
6
6
|
getConfig
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-BJQFVPGK.mjs";
|
|
8
8
|
import {
|
|
9
9
|
brandIcon,
|
|
10
10
|
getStopwatch,
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
} from "./chunk-K4H5ZMYA.mjs";
|
|
17
17
|
import {
|
|
18
18
|
__dirname
|
|
19
|
-
} from "./chunk-
|
|
19
|
+
} from "./chunk-EI77CIK7.mjs";
|
|
20
20
|
|
|
21
21
|
// src/generators/worker/generator.ts
|
|
22
22
|
import {
|
|
@@ -7,7 +7,7 @@ var _chunkNCVDTA5Mjs = require('./chunk-NCVDTA5M.js');
|
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _chunkYRUROEEPjs = require('./chunk-YRUROEEP.js');
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
|
|
@@ -64,7 +64,7 @@ var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
|
64
64
|
if (result.includes("{workspaceRoot}")) {
|
|
65
65
|
result = result.replaceAll(
|
|
66
66
|
"{workspaceRoot}",
|
|
67
|
-
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _3 => _3.config, 'optionalAccess', _4 => _4.workspaceRoot]))), () => (
|
|
67
|
+
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _3 => _3.config, 'optionalAccess', _4 => _4.workspaceRoot]))), () => ( _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, )))
|
|
68
68
|
);
|
|
69
69
|
}
|
|
70
70
|
return result;
|
|
@@ -113,7 +113,7 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
113
113
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
114
114
|
);
|
|
115
115
|
}
|
|
116
|
-
const workspaceRoot2 =
|
|
116
|
+
const workspaceRoot2 = _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, );
|
|
117
117
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot2;
|
|
118
118
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot2;
|
|
119
119
|
const projectName = context.projectName;
|
|
@@ -132,7 +132,7 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
132
132
|
`,
|
|
133
133
|
config
|
|
134
134
|
);
|
|
135
|
-
config = await
|
|
135
|
+
config = await _chunkYRUROEEPjs.getConfig.call(void 0, workspaceRoot2);
|
|
136
136
|
}
|
|
137
137
|
if (_optionalChain([executorOptions, 'optionalAccess', _7 => _7.hooks, 'optionalAccess', _8 => _8.applyDefaultOptions])) {
|
|
138
138
|
_chunkAWKQRM2Hjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
@@ -911,7 +911,7 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
911
911
|
return packageJson;
|
|
912
912
|
};
|
|
913
913
|
var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceRoot, projectName, includeSrc = false, packageJson) => {
|
|
914
|
-
const workspaceRoot2 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot :
|
|
914
|
+
const workspaceRoot2 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot : _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, );
|
|
915
915
|
const workspacePackageJsonContent = await _promises.readFile.call(void 0,
|
|
916
916
|
_chunkAWKQRM2Hjs.joinPaths.call(void 0, workspaceRoot2, "package.json"),
|
|
917
917
|
"utf8"
|
|
@@ -1043,11 +1043,11 @@ function toTSDownFormat(format3) {
|
|
|
1043
1043
|
// ../tsdown/src/build.ts
|
|
1044
1044
|
var resolveOptions = async (userOptions) => {
|
|
1045
1045
|
const options = getDefaultOptions(userOptions);
|
|
1046
|
-
const workspaceRoot2 =
|
|
1046
|
+
const workspaceRoot2 = _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, options.projectRoot);
|
|
1047
1047
|
if (!workspaceRoot2) {
|
|
1048
1048
|
throw new Error("Cannot find Nx workspace root");
|
|
1049
1049
|
}
|
|
1050
|
-
const workspaceConfig = await
|
|
1050
|
+
const workspaceConfig = await _chunkYRUROEEPjs.getWorkspaceConfig.call(void 0, options.debug === true, {
|
|
1051
1051
|
workspaceRoot: workspaceRoot2
|
|
1052
1052
|
});
|
|
1053
1053
|
_chunkAWKQRM2Hjs.writeDebug.call(void 0, " \u2699\uFE0F Resolving build options", workspaceConfig);
|
|
@@ -1476,14 +1476,14 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
|
|
|
1476
1476
|
`,
|
|
1477
1477
|
config
|
|
1478
1478
|
);
|
|
1479
|
-
const workspaceRoot2 =
|
|
1479
|
+
const workspaceRoot2 = _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, );
|
|
1480
1480
|
if (!generatorOptions.skipReadingConfig) {
|
|
1481
1481
|
_chunkAWKQRM2Hjs.writeDebug.call(void 0,
|
|
1482
1482
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
1483
1483
|
- workspaceRoot: ${workspaceRoot2}`,
|
|
1484
1484
|
config
|
|
1485
1485
|
);
|
|
1486
|
-
config = await
|
|
1486
|
+
config = await _chunkYRUROEEPjs.getConfig.call(void 0, workspaceRoot2);
|
|
1487
1487
|
}
|
|
1488
1488
|
if (_optionalChain([generatorOptions, 'optionalAccess', _124 => _124.hooks, 'optionalAccess', _125 => _125.applyDefaultOptions])) {
|
|
1489
1489
|
_chunkAWKQRM2Hjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
@@ -1942,9 +1942,9 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
1942
1942
|
`Determining the Storm Workspace Configuration JSON Schema...`,
|
|
1943
1943
|
config
|
|
1944
1944
|
);
|
|
1945
|
-
const jsonSchema = z.toJSONSchema(
|
|
1945
|
+
const jsonSchema = z.toJSONSchema(_chunkYRUROEEPjs.workspaceConfigSchema, {
|
|
1946
1946
|
target: "draft-7",
|
|
1947
|
-
metadata:
|
|
1947
|
+
metadata: _chunkYRUROEEPjs.schemaRegistry
|
|
1948
1948
|
});
|
|
1949
1949
|
jsonSchema.$id ??= "https://public.storm-cdn.com/schemas/storm-workspace.schema.json";
|
|
1950
1950
|
jsonSchema.title ??= "Storm Workspace Configuration JSON Schema";
|
|
@@ -1956,7 +1956,7 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
1956
1956
|
);
|
|
1957
1957
|
}
|
|
1958
1958
|
const outputPath = options.outputFile.replaceAll("{workspaceRoot}", "").replaceAll(
|
|
1959
|
-
_nullishCoalesce(_optionalChain([config, 'optionalAccess', _164 => _164.workspaceRoot]), () => (
|
|
1959
|
+
_nullishCoalesce(_optionalChain([config, 'optionalAccess', _164 => _164.workspaceRoot]), () => ( _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, ))),
|
|
1960
1960
|
options.outputFile.startsWith("./") ? "" : "./"
|
|
1961
1961
|
);
|
|
1962
1962
|
_chunkAWKQRM2Hjs.writeTrace.call(void 0,
|
|
@@ -1,10 +1,10 @@
|
|
|
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
|
-
var
|
|
3
|
+
var _chunkGRVOVEJPjs = require('./chunk-GRVOVEJP.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkYRUROEEPjs = require('./chunk-YRUROEEP.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
@@ -49,8 +49,8 @@ async function applicationGenerator(tree, schema) {
|
|
|
49
49
|
const stopwatch = _chunkAWKQRM2Hjs.getStopwatch.call(void 0, "Storm Worker generator");
|
|
50
50
|
let config;
|
|
51
51
|
try {
|
|
52
|
-
const workspaceRoot =
|
|
53
|
-
config = await
|
|
52
|
+
const workspaceRoot = _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, );
|
|
53
|
+
config = await _chunkYRUROEEPjs.getConfig.call(void 0, workspaceRoot);
|
|
54
54
|
_chunkAWKQRM2Hjs.writeInfo.call(void 0,
|
|
55
55
|
`${_chunkAWKQRM2Hjs.brandIcon.call(void 0, config)} Running the Storm Worker generator...
|
|
56
56
|
|
|
@@ -70,7 +70,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
|
|
|
70
70
|
const options = await normalizeOptions(tree, schema, config);
|
|
71
71
|
const tasks = [];
|
|
72
72
|
tasks.push(
|
|
73
|
-
await
|
|
73
|
+
await _chunkGRVOVEJPjs.generator_default.call(void 0, tree, {
|
|
74
74
|
...options,
|
|
75
75
|
skipFormat: true
|
|
76
76
|
})
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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
|
-
var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.js');
|
|
4
3
|
|
|
4
|
+
var _chunkNCVDTA5Mjs = require('./chunk-NCVDTA5M.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
|
|
8
|
-
var
|
|
8
|
+
var _chunkYRUROEEPjs = require('./chunk-YRUROEEP.js');
|
|
9
9
|
|
|
10
10
|
|
|
11
|
+
var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.js');
|
|
11
12
|
|
|
12
|
-
var _chunkNCVDTA5Mjs = require('./chunk-NCVDTA5M.js');
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _chunkCLCKX6UNjs = require('./chunk-CLCKX6UN.js');
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
|
|
@@ -53,8 +53,8 @@ async function runExecutor(options, context) {
|
|
|
53
53
|
throw new Error("The executor requires projectsConfigurations.");
|
|
54
54
|
}
|
|
55
55
|
try {
|
|
56
|
-
const workspaceRoot =
|
|
57
|
-
const config = await
|
|
56
|
+
const workspaceRoot = _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, );
|
|
57
|
+
const config = await _chunkYRUROEEPjs.getConfig.call(void 0, workspaceRoot);
|
|
58
58
|
const projectName = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.name]), () => ( context.projectName));
|
|
59
59
|
const projectDetails = _chunkNCVDTA5Mjs.getPackageInfo.call(void 0,
|
|
60
60
|
context.projectsConfigurations.projects[context.projectName]
|
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
import {
|
|
2
|
+
createCliOptions,
|
|
3
|
+
getPackageInfo
|
|
4
|
+
} from "./chunk-ZXLMDNFQ.mjs";
|
|
5
|
+
import {
|
|
6
|
+
findWorkspaceRoot,
|
|
7
|
+
getConfig
|
|
8
|
+
} from "./chunk-BJQFVPGK.mjs";
|
|
1
9
|
import {
|
|
2
10
|
createHttpHandler
|
|
3
11
|
} from "./chunk-SWYYMID7.mjs";
|
|
@@ -6,14 +14,6 @@ import {
|
|
|
6
14
|
getInternalDependencies,
|
|
7
15
|
uploadFile
|
|
8
16
|
} from "./chunk-BY7MA3SM.mjs";
|
|
9
|
-
import {
|
|
10
|
-
createCliOptions,
|
|
11
|
-
getPackageInfo
|
|
12
|
-
} from "./chunk-ZXLMDNFQ.mjs";
|
|
13
|
-
import {
|
|
14
|
-
findWorkspaceRoot,
|
|
15
|
-
getConfig
|
|
16
|
-
} from "./chunk-5MAMLVMV.mjs";
|
|
17
17
|
import {
|
|
18
18
|
correctPaths,
|
|
19
19
|
joinPaths,
|
|
@@ -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=a9def7e06ce25c19654987ab91979289197bf4d3e7e124c514a4487c3e8d68c6__013dfaa35f53e8dc29d1eaf39ccb82b7/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);
|
|
@@ -0,0 +1,231 @@
|
|
|
1
|
+
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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
|
+
|
|
3
|
+
var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.js');
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
var _chunkCLCKX6UNjs = require('./chunk-CLCKX6UN.js');
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
var _chunkNCVDTA5Mjs = require('./chunk-NCVDTA5M.js');
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
var _chunkYRUROEEPjs = require('./chunk-YRUROEEP.js');
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
var _chunkAWKQRM2Hjs = require('./chunk-AWKQRM2H.js');
|
|
25
|
+
|
|
26
|
+
// src/executors/r2-upload-publish/executor.ts
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
var _clients3 = require('@aws-sdk/client-s3');
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
var _devkit = require('@nx/devkit');
|
|
36
|
+
var _glob = require('glob');
|
|
37
|
+
var _mimetypes = require('mime-types'); var _mimetypes2 = _interopRequireDefault(_mimetypes);
|
|
38
|
+
var _child_process = require('child_process');
|
|
39
|
+
var _fs = require('fs');
|
|
40
|
+
var _promises = require('fs/promises');
|
|
41
|
+
async function runExecutor(options, context) {
|
|
42
|
+
const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
|
|
43
|
+
if (!context.projectName) {
|
|
44
|
+
throw new Error("The executor requires a projectName.");
|
|
45
|
+
}
|
|
46
|
+
if (!options.path) {
|
|
47
|
+
throw new Error("The executor requires the `path` option to upload.");
|
|
48
|
+
}
|
|
49
|
+
console.info(
|
|
50
|
+
`\u{1F680} Running Storm Cloudflare Publish executor on the ${context.projectName} worker`
|
|
51
|
+
);
|
|
52
|
+
if (!context.projectName || !_optionalChain([context, 'access', _ => _.projectsConfigurations, 'optionalAccess', _2 => _2.projects]) || !context.projectsConfigurations.projects[context.projectName] || !_optionalChain([context, 'access', _3 => _3.projectsConfigurations, 'access', _4 => _4.projects, 'access', _5 => _5[context.projectName], 'optionalAccess', _6 => _6.root])) {
|
|
53
|
+
throw new Error("The executor requires projectsConfigurations.");
|
|
54
|
+
}
|
|
55
|
+
try {
|
|
56
|
+
const workspaceRoot = _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, );
|
|
57
|
+
const config = await _chunkYRUROEEPjs.getConfig.call(void 0, workspaceRoot);
|
|
58
|
+
const projectName = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.name]), () => ( context.projectName));
|
|
59
|
+
const projectDetails = _chunkNCVDTA5Mjs.getPackageInfo.call(void 0,
|
|
60
|
+
context.projectsConfigurations.projects[context.projectName]
|
|
61
|
+
);
|
|
62
|
+
const bucketId = options.bucketId;
|
|
63
|
+
const bucketPath = options.bucketPath || "/";
|
|
64
|
+
if (!bucketId) {
|
|
65
|
+
throw new Error("The executor requires a bucketId.");
|
|
66
|
+
}
|
|
67
|
+
const args = _chunkNCVDTA5Mjs.createCliOptions.call(void 0, { ...options });
|
|
68
|
+
if (isDryRun) {
|
|
69
|
+
args.push("--dry-run");
|
|
70
|
+
}
|
|
71
|
+
const cloudflareAccountId = process.env.CLOUDFLARE_ACCOUNT_ID || process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
|
|
72
|
+
if (!_optionalChain([options, 'optionalAccess', _11 => _11.registry]) && !cloudflareAccountId) {
|
|
73
|
+
throw new Error(
|
|
74
|
+
"The registry option and `CLOUDFLARE_ACCOUNT_ID` (or `STORM_BOT_CLOUDFLARE_ACCOUNT`) environment variable are not set. Please set one of these values to upload to the Cloudflare R2 bucket."
|
|
75
|
+
);
|
|
76
|
+
}
|
|
77
|
+
if (!process.env.STORM_BOT_ACCESS_KEY_ID && !process.env.ACCESS_KEY_ID && !process.env.CLOUDFLARE_ACCESS_KEY_ID && !process.env.AWS_ACCESS_KEY_ID || !process.env.STORM_BOT_SECRET_ACCESS_KEY && !process.env.CLOUDFLARE_SECRET_ACCESS_KEY && !process.env.SECRET_ACCESS_KEY && !process.env.AWS_SECRET_ACCESS_KEY) {
|
|
78
|
+
throw new Error(
|
|
79
|
+
"The `ACCESS_KEY_ID` (or `STORM_BOT_ACCESS_KEY_ID`) and `SECRET_ACCESS_KEY` (or `STORM_BOT_SECRET_ACCESS_KEY`) environment variables are not set. Please set these environment variables to upload to the Cloudflare R2 bucket."
|
|
80
|
+
);
|
|
81
|
+
}
|
|
82
|
+
const registry = _optionalChain([options, 'optionalAccess', _12 => _12.registry]) ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
|
|
83
|
+
let projectGraph;
|
|
84
|
+
try {
|
|
85
|
+
projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
|
|
86
|
+
} catch (e) {
|
|
87
|
+
await _devkit.createProjectGraphAsync.call(void 0, );
|
|
88
|
+
projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
|
|
89
|
+
}
|
|
90
|
+
if (!projectGraph) {
|
|
91
|
+
throw new Error(
|
|
92
|
+
"The executor failed because the project graph is not available. Please run the build command again."
|
|
93
|
+
);
|
|
94
|
+
}
|
|
95
|
+
_chunkAWKQRM2Hjs.writeDebug.call(void 0,
|
|
96
|
+
`Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
|
|
97
|
+
);
|
|
98
|
+
const client = new (0, _clients3.S3Client)({
|
|
99
|
+
region: "auto",
|
|
100
|
+
endpoint: registry,
|
|
101
|
+
credentials: {
|
|
102
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
103
|
+
accessKeyId: process.env.STORM_BOT_ACCESS_KEY_ID || process.env.CLOUDFLARE_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID || process.env.ACCESS_KEY_ID,
|
|
104
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
105
|
+
secretAccessKey: process.env.STORM_BOT_SECRET_ACCESS_KEY || process.env.CLOUDFLARE_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY || process.env.SECRET_ACCESS_KEY
|
|
106
|
+
},
|
|
107
|
+
requestHandler: _chunkKUGEZPUOjs.createHttpHandler.call(void 0, )
|
|
108
|
+
});
|
|
109
|
+
const version = _optionalChain([projectDetails, 'optionalAccess', _13 => _13.content, 'optionalAccess', _14 => _14.version]);
|
|
110
|
+
if (version) {
|
|
111
|
+
_chunkAWKQRM2Hjs.writeDebug.call(void 0, `Starting upload version ${version}`);
|
|
112
|
+
}
|
|
113
|
+
const basePath = options.path;
|
|
114
|
+
const files = await _glob.glob.call(void 0, _chunkAWKQRM2Hjs.joinPaths.call(void 0, basePath, "**/*"), {
|
|
115
|
+
ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
|
|
116
|
+
});
|
|
117
|
+
const internalDependencies = await _chunkCLCKX6UNjs.getInternalDependencies.call(void 0,
|
|
118
|
+
context.projectName,
|
|
119
|
+
projectGraph
|
|
120
|
+
);
|
|
121
|
+
const dependencies = internalDependencies.filter(
|
|
122
|
+
(projectNode) => !projectNode.data.tags || projectNode.data.tags.every((tag) => tag.toLowerCase() !== "component")
|
|
123
|
+
).reduce((ret, dep) => {
|
|
124
|
+
if (!ret[dep.name]) {
|
|
125
|
+
ret[dep.name] = "latest";
|
|
126
|
+
}
|
|
127
|
+
return ret;
|
|
128
|
+
}, _nullishCoalesce(_optionalChain([projectDetails, 'optionalAccess', _15 => _15.content, 'access', _16 => _16.dependencies]), () => ( {})));
|
|
129
|
+
const release = _nullishCoalesce(options.tag, () => ( _child_process.execSync.call(void 0, "npm config get tag").toString().trim()));
|
|
130
|
+
if (options.clean === true) {
|
|
131
|
+
_chunkAWKQRM2Hjs.writeDebug.call(void 0, `Clearing out existing items in ${bucketPath}`);
|
|
132
|
+
if (!isDryRun) {
|
|
133
|
+
const response = await client.send(
|
|
134
|
+
new (0, _clients3.ListObjectsCommand)({
|
|
135
|
+
Bucket: bucketId,
|
|
136
|
+
Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
|
|
137
|
+
})
|
|
138
|
+
);
|
|
139
|
+
if (_optionalChain([response, 'optionalAccess', _17 => _17.Contents]) && response.Contents.length > 0) {
|
|
140
|
+
_chunkAWKQRM2Hjs.writeTrace.call(void 0,
|
|
141
|
+
`Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
|
|
142
|
+
);
|
|
143
|
+
await client.send(
|
|
144
|
+
new (0, _clients3.DeleteObjectsCommand)({
|
|
145
|
+
Bucket: bucketId,
|
|
146
|
+
Delete: {
|
|
147
|
+
Objects: response.Contents.map((item) => ({
|
|
148
|
+
Key: item.Key
|
|
149
|
+
})),
|
|
150
|
+
Quiet: false
|
|
151
|
+
}
|
|
152
|
+
})
|
|
153
|
+
);
|
|
154
|
+
} else {
|
|
155
|
+
_chunkAWKQRM2Hjs.writeDebug.call(void 0,
|
|
156
|
+
`No existing items to delete in the R2 bucket path ${bucketPath}`
|
|
157
|
+
);
|
|
158
|
+
}
|
|
159
|
+
} else {
|
|
160
|
+
_chunkAWKQRM2Hjs.writeWarning.call(void 0, "[Dry run]: Skipping R2 bucket clean.");
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
if (options.writeMetaJson === true) {
|
|
164
|
+
const meta = {
|
|
165
|
+
name: context.projectName,
|
|
166
|
+
version,
|
|
167
|
+
release,
|
|
168
|
+
description: _optionalChain([projectDetails, 'optionalAccess', _18 => _18.content, 'optionalAccess', _19 => _19.description]),
|
|
169
|
+
tags: _optionalChain([projectDetails, 'optionalAccess', _20 => _20.content, 'optionalAccess', _21 => _21.keywords]),
|
|
170
|
+
dependencies,
|
|
171
|
+
devDependencies: null,
|
|
172
|
+
internalDependencies: internalDependencies.filter(
|
|
173
|
+
(projectNode) => projectNode.data.tags && projectNode.data.tags.some(
|
|
174
|
+
(tag) => tag.toLowerCase() === "component"
|
|
175
|
+
)
|
|
176
|
+
).map((dep) => dep.name)
|
|
177
|
+
};
|
|
178
|
+
if (_optionalChain([projectDetails, 'optionalAccess', _22 => _22.type]) === "package.json") {
|
|
179
|
+
meta.devDependencies = _optionalChain([projectDetails, 'optionalAccess', _23 => _23.content, 'optionalAccess', _24 => _24.devDependencies]);
|
|
180
|
+
}
|
|
181
|
+
await _chunkCLCKX6UNjs.uploadFile.call(void 0,
|
|
182
|
+
client,
|
|
183
|
+
bucketId,
|
|
184
|
+
bucketPath,
|
|
185
|
+
"meta.json",
|
|
186
|
+
version,
|
|
187
|
+
JSON.stringify(meta),
|
|
188
|
+
"application/json",
|
|
189
|
+
isDryRun
|
|
190
|
+
);
|
|
191
|
+
}
|
|
192
|
+
await Promise.all(
|
|
193
|
+
files.map(async (file) => {
|
|
194
|
+
if (_optionalChain([_fs.statSync.call(void 0, file, {
|
|
195
|
+
throwIfNoEntry: false
|
|
196
|
+
}), 'optionalAccess', _25 => _25.isFile, 'call', _26 => _26()])) {
|
|
197
|
+
const name = _chunkAWKQRM2Hjs.correctPaths.call(void 0, file).replace(_chunkAWKQRM2Hjs.correctPaths.call(void 0, basePath), "");
|
|
198
|
+
const type = _mimetypes2.default.lookup(name) || "application/octet-stream";
|
|
199
|
+
await _chunkCLCKX6UNjs.uploadFile.call(void 0,
|
|
200
|
+
client,
|
|
201
|
+
bucketId,
|
|
202
|
+
bucketPath,
|
|
203
|
+
name,
|
|
204
|
+
version,
|
|
205
|
+
await _promises.readFile.call(void 0, file, _chunkCLCKX6UNjs.getEncoding.call(void 0, type)),
|
|
206
|
+
type,
|
|
207
|
+
isDryRun
|
|
208
|
+
);
|
|
209
|
+
}
|
|
210
|
+
})
|
|
211
|
+
);
|
|
212
|
+
_chunkAWKQRM2Hjs.writeSuccess.call(void 0,
|
|
213
|
+
`Successfully uploaded the ${projectName} project to the Cloudflare R2 bucket.`,
|
|
214
|
+
config
|
|
215
|
+
);
|
|
216
|
+
return {
|
|
217
|
+
success: true
|
|
218
|
+
};
|
|
219
|
+
} catch (error) {
|
|
220
|
+
console.error("Failed to publish to Cloudflare R2 bucket");
|
|
221
|
+
console.error(error);
|
|
222
|
+
console.log("");
|
|
223
|
+
return {
|
|
224
|
+
success: false
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
|
|
230
|
+
|
|
231
|
+
exports.runExecutor = runExecutor;
|
|
@@ -1,10 +1,10 @@
|
|
|
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
|
-
var
|
|
3
|
+
var _chunkTMHLSIZ5js = require('./chunk-TMHLSIZ5.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkYRUROEEPjs = require('./chunk-YRUROEEP.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
@@ -49,8 +49,8 @@ async function applicationGenerator(tree, schema) {
|
|
|
49
49
|
const stopwatch = _chunkAWKQRM2Hjs.getStopwatch.call(void 0, "Storm Worker generator");
|
|
50
50
|
let config;
|
|
51
51
|
try {
|
|
52
|
-
const workspaceRoot =
|
|
53
|
-
config = await
|
|
52
|
+
const workspaceRoot = _chunkYRUROEEPjs.findWorkspaceRoot.call(void 0, );
|
|
53
|
+
config = await _chunkYRUROEEPjs.getConfig.call(void 0, workspaceRoot);
|
|
54
54
|
_chunkAWKQRM2Hjs.writeInfo.call(void 0,
|
|
55
55
|
`${_chunkAWKQRM2Hjs.brandIcon.call(void 0, config)} Running the Storm Worker generator...
|
|
56
56
|
|
|
@@ -70,7 +70,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
|
|
|
70
70
|
const options = await normalizeOptions(tree, schema, config);
|
|
71
71
|
const tasks = [];
|
|
72
72
|
tasks.push(
|
|
73
|
-
await
|
|
73
|
+
await _chunkTMHLSIZ5js.generator_default.call(void 0, tree, {
|
|
74
74
|
...options,
|
|
75
75
|
skipFormat: true
|
|
76
76
|
})
|