@storm-software/cloudflare-tools 0.70.47 → 0.70.49
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 +21 -0
- package/README.md +1 -1
- package/dist/{chunk-3FG5TMRX.mjs → chunk-2B7ISOXH.mjs} +6 -6
- package/dist/{chunk-XFCVGJUC.mjs → chunk-3JEOBMM5.mjs} +1 -1
- package/dist/{chunk-QZBZ35UW.js → chunk-6KHWP2MO.js} +2 -2
- package/dist/{chunk-FMEUIW3K.mjs → chunk-BIFOD6C3.mjs} +1 -1
- package/dist/{chunk-J3O7J4OF.js → chunk-D4JUMEIC.js} +5 -5
- package/dist/chunk-IH7ZJRS7.js +262 -0
- package/dist/{chunk-FTGG6SNM.mjs → chunk-JEMQ2Y24.mjs} +2 -2
- package/dist/chunk-KSZZYFCQ.js +209 -0
- package/dist/chunk-S3HIZ32I.mjs +209 -0
- package/dist/{chunk-I4HGWOGD.mjs → chunk-UEJFDB6Y.mjs} +1 -1
- package/dist/chunk-Y5VPR2KX.mjs +265 -0
- package/dist/executors.js +2 -2
- package/dist/executors.mjs +3 -3
- package/dist/generators.js +3 -3
- package/dist/generators.mjs +3 -3
- package/dist/index.js +6 -6
- package/dist/index.mjs +6 -6
- package/dist/src/executors/cloudflare-publish/executor.mjs +3 -3
- package/dist/src/executors/r2-upload-publish/executor.mjs +1 -1
- package/dist/src/executors/serve/executor.mjs +2 -2
- 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 +3 -3
- package/dist/src/generators/worker/generator.mjs +3 -3
- package/dist/src/utils/index.mjs +1 -1
- package/dist/src/utils/r2-bucket-helpers.mjs +1 -1
- package/dist/tsup.config.mjs +1 -1
- package/package.json +11 -11
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,27 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - Cloudflare Tools
|
|
4
4
|
|
|
5
|
+
## [0.70.48](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.70.48) (11/20/2025)
|
|
6
|
+
|
|
7
|
+
### Miscellaneous
|
|
8
|
+
|
|
9
|
+
- **monorepo:** Regenerate README markdown files
|
|
10
|
+
([f12d8e2f7](https://github.com/storm-software/storm-ops/commit/f12d8e2f7))
|
|
11
|
+
|
|
12
|
+
### Updated Dependencies
|
|
13
|
+
|
|
14
|
+
- Updated **workspace-tools** to **v1.293.18**
|
|
15
|
+
- Updated **config-tools** to **v1.188.48**
|
|
16
|
+
- Updated **config** to **v1.134.48**
|
|
17
|
+
|
|
18
|
+
## [0.70.47](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.70.47) (11/20/2025)
|
|
19
|
+
|
|
20
|
+
### Updated Dependencies
|
|
21
|
+
|
|
22
|
+
- Updated **workspace-tools** to **v1.293.17**
|
|
23
|
+
- Updated **config-tools** to **v1.188.47**
|
|
24
|
+
- Updated **config** to **v1.134.47**
|
|
25
|
+
|
|
5
26
|
## [0.70.46](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.70.46) (11/19/2025)
|
|
6
27
|
|
|
7
28
|
### Miscellaneous
|
package/README.md
CHANGED
|
@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
|
|
|
21
21
|
|
|
22
22
|
<h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
|
|
23
23
|
|
|
24
|
-
[](https://prettier.io/) [](http://nx.dev/) [](https://nextjs.org/) [](http://commitizen.github.io/cz-cli/)  [](https://fumadocs.vercel.app/) 
|
|
25
25
|
|
|
26
26
|
<!-- prettier-ignore-start -->
|
|
27
27
|
<!-- markdownlint-disable -->
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
2
|
__commonJS
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-UEJFDB6Y.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.70.
|
|
10
|
+
version: "0.70.48",
|
|
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",
|
|
@@ -136,9 +136,9 @@ var require_package = __commonJS({
|
|
|
136
136
|
"@nx/js": "catalog:",
|
|
137
137
|
"@nx/node": "catalog:",
|
|
138
138
|
"@nx/web": "catalog:",
|
|
139
|
-
"@storm-software/config": "1.134.
|
|
140
|
-
"@storm-software/config-tools": "1.188.
|
|
141
|
-
"@storm-software/workspace-tools": "1.293.
|
|
139
|
+
"@storm-software/config": "1.134.48",
|
|
140
|
+
"@storm-software/config-tools": "1.188.48",
|
|
141
|
+
"@storm-software/workspace-tools": "1.293.18",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -176,7 +176,7 @@ var require_package = __commonJS({
|
|
|
176
176
|
nx: "catalog:",
|
|
177
177
|
tsup: "catalog:",
|
|
178
178
|
untyped: "catalog:",
|
|
179
|
-
wrangler: "^4.
|
|
179
|
+
wrangler: "^4.50.0"
|
|
180
180
|
},
|
|
181
181
|
publishConfig: {
|
|
182
182
|
access: "public"
|
|
@@ -26,7 +26,7 @@ import {
|
|
|
26
26
|
} from "./chunk-6MATO2MJ.mjs";
|
|
27
27
|
import {
|
|
28
28
|
__dirname
|
|
29
|
-
} from "./chunk-
|
|
29
|
+
} from "./chunk-UEJFDB6Y.mjs";
|
|
30
30
|
|
|
31
31
|
// ../config-tools/src/utilities/apply-workspace-tokens.ts
|
|
32
32
|
var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
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 _chunkD4JUMEICjs = require('./chunk-D4JUMEIC.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
@@ -66,7 +66,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
|
|
|
66
66
|
const options = await normalizeOptions(tree, schema, config);
|
|
67
67
|
const tasks = [];
|
|
68
68
|
tasks.push(
|
|
69
|
-
await
|
|
69
|
+
await _chunkD4JUMEICjs.generator_default.call(void 0, tree, {
|
|
70
70
|
...options,
|
|
71
71
|
skipFormat: true
|
|
72
72
|
})
|
|
@@ -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.70.
|
|
10
|
+
version: "0.70.48",
|
|
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",
|
|
@@ -136,9 +136,9 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
|
|
|
136
136
|
"@nx/js": "catalog:",
|
|
137
137
|
"@nx/node": "catalog:",
|
|
138
138
|
"@nx/web": "catalog:",
|
|
139
|
-
"@storm-software/config": "1.134.
|
|
140
|
-
"@storm-software/config-tools": "1.188.
|
|
141
|
-
"@storm-software/workspace-tools": "1.293.
|
|
139
|
+
"@storm-software/config": "1.134.48",
|
|
140
|
+
"@storm-software/config-tools": "1.188.48",
|
|
141
|
+
"@storm-software/workspace-tools": "1.293.18",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -176,7 +176,7 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
|
|
|
176
176
|
nx: "catalog:",
|
|
177
177
|
tsup: "catalog:",
|
|
178
178
|
untyped: "catalog:",
|
|
179
|
-
wrangler: "^4.
|
|
179
|
+
wrangler: "^4.50.0"
|
|
180
180
|
},
|
|
181
181
|
publishConfig: {
|
|
182
182
|
access: "public"
|
|
@@ -0,0 +1,262 @@
|
|
|
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
|
+
|
|
3
|
+
|
|
4
|
+
var _chunkEQXEFXCVjs = require('./chunk-EQXEFXCV.js');
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
var _chunk4BWM53AAjs = require('./chunk-4BWM53AA.js');
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
var _chunkD4JUMEICjs = require('./chunk-D4JUMEIC.js');
|
|
16
|
+
|
|
17
|
+
// src/generators/worker/generator.ts
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
var _devkit = require('@nx/devkit');
|
|
30
|
+
var _projectnameandrootutils = require('@nx/devkit/src/generators/project-name-and-root-utils');
|
|
31
|
+
var _node = require('@nx/node');
|
|
32
|
+
var _versions = require('@nx/node/src/utils/versions');
|
|
33
|
+
var _path = require('path');
|
|
34
|
+
|
|
35
|
+
// src/generators/worker/libs/get-account-id.ts
|
|
36
|
+
function getAccountId(accountId) {
|
|
37
|
+
return `account_id = "${accountId}"`;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
// src/generators/worker/libs/vitest-imports.ts
|
|
41
|
+
var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
|
|
42
|
+
|
|
43
|
+
// src/generators/worker/libs/vitest-script.ts
|
|
44
|
+
var vitestScript = `"test": "vitest run"`;
|
|
45
|
+
|
|
46
|
+
// src/generators/worker/generator.ts
|
|
47
|
+
async function applicationGenerator(tree, schema) {
|
|
48
|
+
const stopwatch = _chunk4BWM53AAjs.getStopwatch.call(void 0, "Storm Worker generator");
|
|
49
|
+
let config;
|
|
50
|
+
try {
|
|
51
|
+
_chunk4BWM53AAjs.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
|
|
52
|
+
|
|
53
|
+
`, config);
|
|
54
|
+
const workspaceRoot = _chunkEQXEFXCVjs.findWorkspaceRoot.call(void 0, );
|
|
55
|
+
_chunk4BWM53AAjs.writeDebug.call(void 0,
|
|
56
|
+
`Loading the Storm Config from environment variables and storm.json file...
|
|
57
|
+
- workspaceRoot: ${workspaceRoot}`,
|
|
58
|
+
config
|
|
59
|
+
);
|
|
60
|
+
config = await _chunkEQXEFXCVjs.getConfig.call(void 0, workspaceRoot);
|
|
61
|
+
_chunk4BWM53AAjs.writeTrace.call(void 0,
|
|
62
|
+
`Loaded Storm config into env:
|
|
63
|
+
${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
|
|
64
|
+
config
|
|
65
|
+
);
|
|
66
|
+
const options = await normalizeOptions(tree, schema, config);
|
|
67
|
+
const tasks = [];
|
|
68
|
+
tasks.push(
|
|
69
|
+
await _chunkD4JUMEICjs.generator_default.call(void 0, tree, {
|
|
70
|
+
...options,
|
|
71
|
+
skipFormat: true
|
|
72
|
+
})
|
|
73
|
+
);
|
|
74
|
+
tasks.push(
|
|
75
|
+
await _node.applicationGenerator.call(void 0, tree, {
|
|
76
|
+
...options,
|
|
77
|
+
framework: "none",
|
|
78
|
+
skipFormat: true,
|
|
79
|
+
unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
|
|
80
|
+
e2eTestRunner: "none",
|
|
81
|
+
name: schema.name
|
|
82
|
+
})
|
|
83
|
+
);
|
|
84
|
+
if (options.unitTestRunner === "vitest") {
|
|
85
|
+
const { vitestGenerator, createOrEditViteConfig } = _devkit.ensurePackage.call(void 0,
|
|
86
|
+
"@nx/vite",
|
|
87
|
+
_versions.nxVersion
|
|
88
|
+
);
|
|
89
|
+
const vitestTask = await vitestGenerator(tree, {
|
|
90
|
+
project: options.name,
|
|
91
|
+
uiFramework: "none",
|
|
92
|
+
coverageProvider: "v8",
|
|
93
|
+
skipFormat: true,
|
|
94
|
+
testEnvironment: "node"
|
|
95
|
+
});
|
|
96
|
+
tasks.push(vitestTask);
|
|
97
|
+
createOrEditViteConfig(
|
|
98
|
+
tree,
|
|
99
|
+
{
|
|
100
|
+
project: options.name,
|
|
101
|
+
includeLib: false,
|
|
102
|
+
includeVitest: true,
|
|
103
|
+
testEnvironment: "node"
|
|
104
|
+
},
|
|
105
|
+
true
|
|
106
|
+
);
|
|
107
|
+
}
|
|
108
|
+
addCloudflareFiles(tree, options);
|
|
109
|
+
updateTsAppConfig(tree, options);
|
|
110
|
+
addTargets(tree, options);
|
|
111
|
+
if (options.unitTestRunner === "none") {
|
|
112
|
+
removeTestFiles(tree, options);
|
|
113
|
+
}
|
|
114
|
+
if (!options.skipFormat) {
|
|
115
|
+
await _devkit.formatFiles.call(void 0, tree);
|
|
116
|
+
}
|
|
117
|
+
if (options.template === "hono") {
|
|
118
|
+
tasks.push(() => {
|
|
119
|
+
const packageJsonPath = _devkit.joinPathFragments.call(void 0,
|
|
120
|
+
_nullishCoalesce(options.directory, () => ( "")),
|
|
121
|
+
"package.json"
|
|
122
|
+
);
|
|
123
|
+
if (tree.exists(packageJsonPath)) {
|
|
124
|
+
_devkit.updateJson.call(void 0, tree, packageJsonPath, (json) => ({
|
|
125
|
+
...json,
|
|
126
|
+
dependencies: {
|
|
127
|
+
hono: "4.4.0",
|
|
128
|
+
..._optionalChain([json, 'optionalAccess', _ => _.dependencies])
|
|
129
|
+
}
|
|
130
|
+
}));
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
return _devkit.runTasksInSerial.call(void 0, ...tasks);
|
|
135
|
+
} catch (error) {
|
|
136
|
+
return () => {
|
|
137
|
+
_chunk4BWM53AAjs.writeFatal.call(void 0,
|
|
138
|
+
"A fatal error occurred while running the generator - the process was forced to terminate",
|
|
139
|
+
config
|
|
140
|
+
);
|
|
141
|
+
_chunk4BWM53AAjs.writeError.call(void 0,
|
|
142
|
+
`An exception was thrown in the generator's process
|
|
143
|
+
- Details: ${error.message}
|
|
144
|
+
- Stacktrace: ${error.stack}`,
|
|
145
|
+
config
|
|
146
|
+
);
|
|
147
|
+
};
|
|
148
|
+
} finally {
|
|
149
|
+
stopwatch();
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
function updateTsAppConfig(tree, options) {
|
|
153
|
+
_devkit.updateJson.call(void 0, tree, _path.join.call(void 0, options.appProjectRoot, "tsconfig.app.json"), (json) => {
|
|
154
|
+
json.compilerOptions = {
|
|
155
|
+
...json.compilerOptions,
|
|
156
|
+
esModuleInterop: true,
|
|
157
|
+
target: "es2021",
|
|
158
|
+
lib: ["es2021"],
|
|
159
|
+
module: "es2022",
|
|
160
|
+
moduleResolution: "node",
|
|
161
|
+
resolveJsonModule: true,
|
|
162
|
+
allowJs: true,
|
|
163
|
+
checkJs: false,
|
|
164
|
+
noEmit: true,
|
|
165
|
+
isolatedModules: true,
|
|
166
|
+
allowSyntheticDefaultImports: true,
|
|
167
|
+
forceConsistentCasingInFileNames: true,
|
|
168
|
+
strict: true,
|
|
169
|
+
skipLibCheck: true
|
|
170
|
+
};
|
|
171
|
+
json.compilerOptions.types = [
|
|
172
|
+
...json.compilerOptions.types,
|
|
173
|
+
"@cloudflare/workers-types"
|
|
174
|
+
];
|
|
175
|
+
return json;
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
function addCloudflareFiles(tree, options) {
|
|
179
|
+
tree.delete(_path.join.call(void 0, options.appProjectRoot, "src/main.ts"));
|
|
180
|
+
_devkit.generateFiles.call(void 0,
|
|
181
|
+
tree,
|
|
182
|
+
_path.join.call(void 0, __dirname, "./files/common"),
|
|
183
|
+
options.appProjectRoot,
|
|
184
|
+
{
|
|
185
|
+
...options,
|
|
186
|
+
tmpl: "",
|
|
187
|
+
name: options.name,
|
|
188
|
+
accountId: options.accountId ? getAccountId(options.accountId) : "",
|
|
189
|
+
vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
|
|
190
|
+
}
|
|
191
|
+
);
|
|
192
|
+
if (options.template && options.template !== "none") {
|
|
193
|
+
_devkit.generateFiles.call(void 0,
|
|
194
|
+
tree,
|
|
195
|
+
_path.join.call(void 0, __dirname, `./files/${options.template}`),
|
|
196
|
+
_path.join.call(void 0, options.appProjectRoot, "src"),
|
|
197
|
+
{
|
|
198
|
+
...options,
|
|
199
|
+
tmpl: "",
|
|
200
|
+
name: options.name,
|
|
201
|
+
accountId: options.accountId ? getAccountId(options.accountId) : "",
|
|
202
|
+
vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
|
|
203
|
+
vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
|
|
204
|
+
}
|
|
205
|
+
);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
function addTargets(tree, options) {
|
|
209
|
+
try {
|
|
210
|
+
const projectConfiguration = _devkit.readProjectConfiguration.call(void 0, tree, options.name);
|
|
211
|
+
projectConfiguration.targets = {
|
|
212
|
+
..._nullishCoalesce(projectConfiguration.targets, () => ( {})),
|
|
213
|
+
serve: {
|
|
214
|
+
executor: "@storm-software/cloudflare-tools:serve",
|
|
215
|
+
options: {
|
|
216
|
+
port: options.port
|
|
217
|
+
}
|
|
218
|
+
},
|
|
219
|
+
"nx-release-publish": {
|
|
220
|
+
executor: "@storm-software/cloudflare-tools:cloudflare-publish"
|
|
221
|
+
}
|
|
222
|
+
};
|
|
223
|
+
if (projectConfiguration.targets.build) {
|
|
224
|
+
delete projectConfiguration.targets.build;
|
|
225
|
+
}
|
|
226
|
+
_devkit.updateProjectConfiguration.call(void 0, tree, options.name, projectConfiguration);
|
|
227
|
+
} catch (e) {
|
|
228
|
+
console.error(e);
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
function removeTestFiles(tree, options) {
|
|
232
|
+
tree.delete(_path.join.call(void 0, options.appProjectRoot, "src", "index.test.ts"));
|
|
233
|
+
}
|
|
234
|
+
async function normalizeOptions(host, options, config) {
|
|
235
|
+
const { projectName: appProjectName, projectRoot: appProjectRoot } = await _projectnameandrootutils.determineProjectNameAndRootOptions.call(void 0, host, {
|
|
236
|
+
name: options.name,
|
|
237
|
+
projectType: "application",
|
|
238
|
+
directory: options.directory,
|
|
239
|
+
rootProject: options.rootProject
|
|
240
|
+
});
|
|
241
|
+
options.rootProject = appProjectRoot === ".";
|
|
242
|
+
return {
|
|
243
|
+
addPlugin: process.env.NX_ADD_PLUGINS !== "false",
|
|
244
|
+
accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
|
|
245
|
+
...options,
|
|
246
|
+
name: _devkit.names.call(void 0, appProjectName).fileName,
|
|
247
|
+
frontendProject: options.frontendProject ? _devkit.names.call(void 0, options.frontendProject).fileName : void 0,
|
|
248
|
+
appProjectRoot,
|
|
249
|
+
unitTestRunner: _nullishCoalesce(options.unitTestRunner, () => ( "vitest")),
|
|
250
|
+
rootProject: _nullishCoalesce(options.rootProject, () => ( false)),
|
|
251
|
+
template: _nullishCoalesce(options.template, () => ( "fetch-handler")),
|
|
252
|
+
port: _nullishCoalesce(options.port, () => ( 3e3))
|
|
253
|
+
};
|
|
254
|
+
}
|
|
255
|
+
var generator_default2 = applicationGenerator;
|
|
256
|
+
var applicationSchematic = _devkit.convertNxGenerator.call(void 0, applicationGenerator);
|
|
257
|
+
|
|
258
|
+
|
|
259
|
+
|
|
260
|
+
|
|
261
|
+
|
|
262
|
+
exports.applicationGenerator = applicationGenerator; exports.generator_default = generator_default2; exports.applicationSchematic = applicationSchematic;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
generator_default
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-2B7ISOXH.mjs";
|
|
4
4
|
import {
|
|
5
5
|
findWorkspaceRoot,
|
|
6
6
|
getConfig
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
} from "./chunk-6MATO2MJ.mjs";
|
|
16
16
|
import {
|
|
17
17
|
__dirname
|
|
18
|
-
} from "./chunk-
|
|
18
|
+
} from "./chunk-UEJFDB6Y.mjs";
|
|
19
19
|
|
|
20
20
|
// src/generators/worker/generator.ts
|
|
21
21
|
import {
|
|
@@ -0,0 +1,209 @@
|
|
|
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
|
+
|
|
3
|
+
|
|
4
|
+
var _chunkNU34IEWNjs = require('./chunk-NU34IEWN.js');
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
var _chunkFFOLWRMAjs = require('./chunk-FFOLWRMA.js');
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
var _chunkEQXEFXCVjs = require('./chunk-EQXEFXCV.js');
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
var _chunk4BWM53AAjs = require('./chunk-4BWM53AA.js');
|
|
19
|
+
|
|
20
|
+
// src/executors/r2-upload-publish/executor.ts
|
|
21
|
+
var _clients3 = require('@aws-sdk/client-s3');
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
var _devkit = require('@nx/devkit');
|
|
27
|
+
var _glob = require('glob');
|
|
28
|
+
var _child_process = require('child_process');
|
|
29
|
+
var _promises = require('fs/promises');
|
|
30
|
+
async function runExecutor(options, context) {
|
|
31
|
+
const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
|
|
32
|
+
if (!context.projectName) {
|
|
33
|
+
throw new Error("The executor requires a projectName.");
|
|
34
|
+
}
|
|
35
|
+
console.info(
|
|
36
|
+
`\u{1F680} Running Storm Cloudflare Publish executor on the ${context.projectName} worker`
|
|
37
|
+
);
|
|
38
|
+
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])) {
|
|
39
|
+
throw new Error("The executor requires projectsConfigurations.");
|
|
40
|
+
}
|
|
41
|
+
try {
|
|
42
|
+
const workspaceRoot = _chunkEQXEFXCVjs.findWorkspaceRoot.call(void 0, );
|
|
43
|
+
const config = await _chunkEQXEFXCVjs.getConfig.call(void 0, workspaceRoot);
|
|
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
|
+
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
|
+
const projectDetails = _chunkNU34IEWNjs.getPackageInfo.call(void 0,
|
|
47
|
+
context.projectsConfigurations.projects[context.projectName]
|
|
48
|
+
);
|
|
49
|
+
if (!_optionalChain([projectDetails, 'optionalAccess', _15 => _15.content])) {
|
|
50
|
+
throw new Error(
|
|
51
|
+
`Could not find the project details for ${context.projectName}`
|
|
52
|
+
);
|
|
53
|
+
}
|
|
54
|
+
const args = _chunkNU34IEWNjs.createCliOptions.call(void 0, { ...options });
|
|
55
|
+
if (isDryRun) {
|
|
56
|
+
args.push("--dry-run");
|
|
57
|
+
}
|
|
58
|
+
const cloudflareAccountId = process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
|
|
59
|
+
if (!_optionalChain([options, 'optionalAccess', _16 => _16.registry]) && !cloudflareAccountId) {
|
|
60
|
+
throw new Error(
|
|
61
|
+
"The Storm Registry URL is not set in the Storm config. Please set either the `extensions.cyclone.registry` or `config.extensions.cyclone.accountId` property in the Storm config."
|
|
62
|
+
);
|
|
63
|
+
}
|
|
64
|
+
if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) {
|
|
65
|
+
throw new Error(
|
|
66
|
+
"The AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables are not set. Please set these environment variables to upload to the Cyclone Registry."
|
|
67
|
+
);
|
|
68
|
+
}
|
|
69
|
+
const endpoint = _optionalChain([options, 'optionalAccess', _17 => _17.registry]) ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
|
|
70
|
+
let projectGraph;
|
|
71
|
+
try {
|
|
72
|
+
projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
|
|
73
|
+
} catch (e) {
|
|
74
|
+
await _devkit.createProjectGraphAsync.call(void 0, );
|
|
75
|
+
projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
|
|
76
|
+
}
|
|
77
|
+
if (!projectGraph) {
|
|
78
|
+
throw new Error(
|
|
79
|
+
"The executor failed because the project graph is not available. Please run the build command again."
|
|
80
|
+
);
|
|
81
|
+
}
|
|
82
|
+
_chunk4BWM53AAjs.writeInfo.call(void 0,
|
|
83
|
+
`Publishing ${context.projectName} to the Storm Registry at ${endpoint}`
|
|
84
|
+
);
|
|
85
|
+
const s3Client = new (0, _clients3.S3)({
|
|
86
|
+
region: "auto",
|
|
87
|
+
endpoint,
|
|
88
|
+
credentials: {
|
|
89
|
+
accessKeyId: process.env.AWS_ACCESS_KEY_ID,
|
|
90
|
+
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
const version = _optionalChain([projectDetails, 'access', _18 => _18.content, 'optionalAccess', _19 => _19.version]);
|
|
94
|
+
_chunk4BWM53AAjs.writeInfo.call(void 0, `Generated component version: ${version}`);
|
|
95
|
+
const files = await _glob.glob.call(void 0, _devkit.joinPathFragments.call(void 0, sourceRoot, "**/*"), {
|
|
96
|
+
ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
|
|
97
|
+
});
|
|
98
|
+
const projectPath = `registry/${context.projectName}`;
|
|
99
|
+
const internalDependencies = await _chunkFFOLWRMAjs.getInternalDependencies.call(void 0,
|
|
100
|
+
context.projectName,
|
|
101
|
+
projectGraph
|
|
102
|
+
);
|
|
103
|
+
const dependencies = internalDependencies.filter(
|
|
104
|
+
(projectNode) => !projectNode.data.tags || projectNode.data.tags.every((tag) => tag.toLowerCase() !== "component")
|
|
105
|
+
).reduce((ret, dep) => {
|
|
106
|
+
if (!ret[dep.name]) {
|
|
107
|
+
ret[dep.name] = "latest";
|
|
108
|
+
}
|
|
109
|
+
return ret;
|
|
110
|
+
}, _nullishCoalesce(projectDetails.content.dependencies, () => ( {})));
|
|
111
|
+
const release = _nullishCoalesce(options.tag, () => ( _child_process.execSync.call(void 0, "npm config get tag").toString().trim()));
|
|
112
|
+
_chunk4BWM53AAjs.writeInfo.call(void 0, `Clearing out existing items in ${projectPath}`);
|
|
113
|
+
if (!isDryRun) {
|
|
114
|
+
const response = await s3Client.listObjects({
|
|
115
|
+
Bucket: options.bucketId,
|
|
116
|
+
Prefix: projectPath
|
|
117
|
+
});
|
|
118
|
+
if (_optionalChain([response, 'optionalAccess', _20 => _20.Contents]) && response.Contents.length > 0) {
|
|
119
|
+
_chunk4BWM53AAjs.writeDebug.call(void 0,
|
|
120
|
+
`Deleting the following existing items from the component registry: ${response.Contents.map((item) => item.Key).join(", ")}`
|
|
121
|
+
);
|
|
122
|
+
await Promise.all(
|
|
123
|
+
response.Contents.map(
|
|
124
|
+
(item) => s3Client.deleteObjects({
|
|
125
|
+
Bucket: options.bucketId,
|
|
126
|
+
Delete: {
|
|
127
|
+
Objects: [
|
|
128
|
+
{
|
|
129
|
+
Key: item.Key
|
|
130
|
+
}
|
|
131
|
+
],
|
|
132
|
+
Quiet: false
|
|
133
|
+
}
|
|
134
|
+
})
|
|
135
|
+
)
|
|
136
|
+
);
|
|
137
|
+
} else {
|
|
138
|
+
_chunk4BWM53AAjs.writeDebug.call(void 0,
|
|
139
|
+
`No existing items to delete in the component registry path ${projectPath}`
|
|
140
|
+
);
|
|
141
|
+
}
|
|
142
|
+
} else {
|
|
143
|
+
_chunk4BWM53AAjs.writeWarning.call(void 0, "[Dry run]: skipping upload to the Cyclone Registry.");
|
|
144
|
+
}
|
|
145
|
+
const meta = {
|
|
146
|
+
name: context.projectName,
|
|
147
|
+
version,
|
|
148
|
+
release,
|
|
149
|
+
description: projectDetails.content.description,
|
|
150
|
+
tags: projectDetails.content.keywords,
|
|
151
|
+
dependencies,
|
|
152
|
+
devDependencies: null,
|
|
153
|
+
internalDependencies: internalDependencies.filter(
|
|
154
|
+
(projectNode) => projectNode.data.tags && projectNode.data.tags.some((tag) => tag.toLowerCase() === "component")
|
|
155
|
+
).map((dep) => dep.name)
|
|
156
|
+
};
|
|
157
|
+
if (projectDetails.type === "package.json") {
|
|
158
|
+
meta.devDependencies = projectDetails.content.devDependencies;
|
|
159
|
+
}
|
|
160
|
+
const metaJson = JSON.stringify(meta);
|
|
161
|
+
_chunk4BWM53AAjs.writeInfo.call(void 0, `Generating meta.json file:
|
|
162
|
+
${metaJson}`);
|
|
163
|
+
await _chunkFFOLWRMAjs.r2UploadFile.call(void 0,
|
|
164
|
+
s3Client,
|
|
165
|
+
options.bucketId,
|
|
166
|
+
projectPath,
|
|
167
|
+
"meta.json",
|
|
168
|
+
version,
|
|
169
|
+
metaJson,
|
|
170
|
+
"application/json",
|
|
171
|
+
isDryRun
|
|
172
|
+
);
|
|
173
|
+
await Promise.all(
|
|
174
|
+
files.map((file) => {
|
|
175
|
+
const fileName = file.replaceAll("\\", "/").replace(sourceRoot.replaceAll("\\", "/"), "");
|
|
176
|
+
return _promises.readFile.call(void 0, file, { encoding: "utf8" }).then(
|
|
177
|
+
(fileContent) => _chunkFFOLWRMAjs.r2UploadFile.call(void 0,
|
|
178
|
+
s3Client,
|
|
179
|
+
options.bucketId,
|
|
180
|
+
projectPath,
|
|
181
|
+
fileName,
|
|
182
|
+
version,
|
|
183
|
+
fileContent,
|
|
184
|
+
"text/plain",
|
|
185
|
+
isDryRun
|
|
186
|
+
)
|
|
187
|
+
);
|
|
188
|
+
})
|
|
189
|
+
);
|
|
190
|
+
_chunk4BWM53AAjs.writeSuccess.call(void 0,
|
|
191
|
+
`Successfully uploaded the ${projectName} component to the Cyclone Registry`,
|
|
192
|
+
config
|
|
193
|
+
);
|
|
194
|
+
return {
|
|
195
|
+
success: true
|
|
196
|
+
};
|
|
197
|
+
} catch (error) {
|
|
198
|
+
console.error("Failed to publish to Cloudflare Workers Registry");
|
|
199
|
+
console.error(error);
|
|
200
|
+
console.log("");
|
|
201
|
+
return {
|
|
202
|
+
success: false
|
|
203
|
+
};
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
|
|
208
|
+
|
|
209
|
+
exports.runExecutor = runExecutor;
|