@storm-software/cloudflare-tools 0.71.54 → 0.71.55
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 +6 -0
- package/README.md +1 -1
- package/dist/{chunk-BRQE2Z2B.mjs → chunk-276PU2JK.mjs} +4 -4
- package/dist/{chunk-BT5ICL3J.mjs → chunk-2VLUD7ES.mjs} +1 -1
- package/dist/{chunk-KDPVEDXB.mjs → chunk-74DC5UCP.mjs} +2 -2
- package/dist/chunk-C2B5Y63S.js +231 -0
- package/dist/chunk-C2TW7OEJ.mjs +269 -0
- package/dist/{chunk-SVDNIWTG.js → chunk-E7SXH3BE.js} +1 -1
- package/dist/{chunk-FPPYECC2.js → chunk-J5TCUMBD.js} +2 -2
- package/dist/{chunk-6RLHG2N7.mjs → chunk-PTD74LWF.mjs} +1 -1
- package/dist/chunk-QTUMOPFF.mjs +231 -0
- package/dist/{chunk-RDUI3CVF.js → chunk-SZIF5PWY.js} +2 -2
- package/dist/chunk-VQ7CQDF7.js +266 -0
- package/dist/{chunk-PVU4MZSG.mjs → chunk-Y6QXVEOO.mjs} +3 -3
- package/dist/executors.js +1 -1
- package/dist/executors.mjs +3 -3
- package/dist/generators.js +3 -3
- package/dist/generators.mjs +3 -3
- package/dist/index.js +4 -4
- package/dist/index.mjs +5 -5
- package/dist/src/executors/cloudflare-publish/executor.js +1 -1
- 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.js +2 -2
- 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/http-handler.mjs +1 -1
- 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 +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - Cloudflare Tools
|
|
4
4
|
|
|
5
|
+
## [0.71.54](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.54) (02/20/2026)
|
|
6
|
+
|
|
7
|
+
### Updated Dependencies
|
|
8
|
+
|
|
9
|
+
- Updated **workspace-tools** to **v1.294.39**
|
|
10
|
+
|
|
5
11
|
## [0.71.53](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.53) (02/20/2026)
|
|
6
12
|
|
|
7
13
|
### Updated Dependencies
|
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,6 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
generator_default
|
|
3
|
-
} from "./chunk-PVU4MZSG.mjs";
|
|
4
1
|
import {
|
|
5
2
|
findWorkspaceRoot,
|
|
6
3
|
getConfig
|
|
@@ -14,9 +11,12 @@ import {
|
|
|
14
11
|
writeInfo,
|
|
15
12
|
writeTrace
|
|
16
13
|
} from "./chunk-52X4GPEN.mjs";
|
|
14
|
+
import {
|
|
15
|
+
generator_default
|
|
16
|
+
} from "./chunk-Y6QXVEOO.mjs";
|
|
17
17
|
import {
|
|
18
18
|
__dirname
|
|
19
|
-
} from "./chunk-
|
|
19
|
+
} from "./chunk-2VLUD7ES.mjs";
|
|
20
20
|
|
|
21
21
|
// src/generators/worker/generator.ts
|
|
22
22
|
import {
|
|
@@ -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__62048a4dc615a7ea5da4008534e42c0e/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);
|
|
@@ -27,7 +27,7 @@ import {
|
|
|
27
27
|
} from "./chunk-52X4GPEN.mjs";
|
|
28
28
|
import {
|
|
29
29
|
__dirname
|
|
30
|
-
} from "./chunk-
|
|
30
|
+
} from "./chunk-2VLUD7ES.mjs";
|
|
31
31
|
|
|
32
32
|
// ../config-tools/src/utilities/apply-workspace-tokens.ts
|
|
33
33
|
var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
@@ -2669,7 +2669,7 @@ async function presetGeneratorFn(tree, options) {
|
|
|
2669
2669
|
"@storm-software/cspell": "latest",
|
|
2670
2670
|
"@storm-software/prettier": "latest",
|
|
2671
2671
|
"@taplo/cli": "0.7.0",
|
|
2672
|
-
"@types/node": "^
|
|
2672
|
+
"@types/node": "^25.3.0",
|
|
2673
2673
|
copyfiles: "2.4.1",
|
|
2674
2674
|
eslint: "9.5.0",
|
|
2675
2675
|
jest: "29.7.0",
|
|
@@ -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
|
+
|
|
4
|
+
var _chunkN7FW365Qjs = require('./chunk-N7FW365Q.js');
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
var _chunkQWSTQIUAjs = require('./chunk-QWSTQIUA.js');
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.js');
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
var _chunk6JVDTXHTjs = require('./chunk-6JVDTXHT.js');
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
var _chunk2KWRE5Y5js = require('./chunk-2KWRE5Y5.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 = _chunkQWSTQIUAjs.findWorkspaceRoot.call(void 0, );
|
|
57
|
+
const config = await _chunkQWSTQIUAjs.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 = _chunkN7FW365Qjs.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 = _chunkN7FW365Qjs.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
|
+
_chunk2KWRE5Y5js.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
|
+
_chunk2KWRE5Y5js.writeDebug.call(void 0, `Starting upload version ${version}`);
|
|
112
|
+
}
|
|
113
|
+
const basePath = options.path;
|
|
114
|
+
const files = await _glob.glob.call(void 0, _chunk2KWRE5Y5js.joinPaths.call(void 0, basePath, "**/*"), {
|
|
115
|
+
ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
|
|
116
|
+
});
|
|
117
|
+
const internalDependencies = await _chunk6JVDTXHTjs.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
|
+
_chunk2KWRE5Y5js.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
|
+
_chunk2KWRE5Y5js.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
|
+
_chunk2KWRE5Y5js.writeDebug.call(void 0,
|
|
156
|
+
`No existing items to delete in the R2 bucket path ${bucketPath}`
|
|
157
|
+
);
|
|
158
|
+
}
|
|
159
|
+
} else {
|
|
160
|
+
_chunk2KWRE5Y5js.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 _chunk6JVDTXHTjs.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 = _chunk2KWRE5Y5js.correctPaths.call(void 0, file).replace(_chunk2KWRE5Y5js.correctPaths.call(void 0, basePath), "");
|
|
198
|
+
const type = _mimetypes2.default.lookup(name) || "application/octet-stream";
|
|
199
|
+
await _chunk6JVDTXHTjs.uploadFile.call(void 0,
|
|
200
|
+
client,
|
|
201
|
+
bucketId,
|
|
202
|
+
bucketPath,
|
|
203
|
+
name,
|
|
204
|
+
version,
|
|
205
|
+
await _promises.readFile.call(void 0, file, _chunk6JVDTXHTjs.getEncoding.call(void 0, type)),
|
|
206
|
+
type,
|
|
207
|
+
isDryRun
|
|
208
|
+
);
|
|
209
|
+
}
|
|
210
|
+
})
|
|
211
|
+
);
|
|
212
|
+
_chunk2KWRE5Y5js.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;
|
|
@@ -0,0 +1,269 @@
|
|
|
1
|
+
import {
|
|
2
|
+
generator_default
|
|
3
|
+
} from "./chunk-Y6QXVEOO.mjs";
|
|
4
|
+
import {
|
|
5
|
+
findWorkspaceRoot,
|
|
6
|
+
getConfig
|
|
7
|
+
} from "./chunk-P42MQNVF.mjs";
|
|
8
|
+
import {
|
|
9
|
+
brandIcon,
|
|
10
|
+
getStopwatch,
|
|
11
|
+
writeDebug,
|
|
12
|
+
writeError,
|
|
13
|
+
writeFatal,
|
|
14
|
+
writeInfo,
|
|
15
|
+
writeTrace
|
|
16
|
+
} from "./chunk-52X4GPEN.mjs";
|
|
17
|
+
import {
|
|
18
|
+
__dirname
|
|
19
|
+
} from "./chunk-2VLUD7ES.mjs";
|
|
20
|
+
|
|
21
|
+
// src/generators/worker/generator.ts
|
|
22
|
+
import {
|
|
23
|
+
convertNxGenerator,
|
|
24
|
+
ensurePackage,
|
|
25
|
+
formatFiles,
|
|
26
|
+
generateFiles,
|
|
27
|
+
joinPathFragments,
|
|
28
|
+
names,
|
|
29
|
+
readProjectConfiguration,
|
|
30
|
+
runTasksInSerial,
|
|
31
|
+
updateJson,
|
|
32
|
+
updateProjectConfiguration
|
|
33
|
+
} from "@nx/devkit";
|
|
34
|
+
import { determineProjectNameAndRootOptions } from "@nx/devkit/src/generators/project-name-and-root-utils";
|
|
35
|
+
import { applicationGenerator as nodeApplicationGenerator } from "@nx/node";
|
|
36
|
+
import { nxVersion } from "@nx/node/src/utils/versions";
|
|
37
|
+
import { join } from "path";
|
|
38
|
+
|
|
39
|
+
// src/generators/worker/libs/get-account-id.ts
|
|
40
|
+
function getAccountId(accountId) {
|
|
41
|
+
return `account_id = "${accountId}"`;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
// src/generators/worker/libs/vitest-imports.ts
|
|
45
|
+
var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
|
|
46
|
+
|
|
47
|
+
// src/generators/worker/libs/vitest-script.ts
|
|
48
|
+
var vitestScript = `"test": "vitest run"`;
|
|
49
|
+
|
|
50
|
+
// src/generators/worker/generator.ts
|
|
51
|
+
async function applicationGenerator(tree, schema) {
|
|
52
|
+
const stopwatch = getStopwatch("Storm Worker generator");
|
|
53
|
+
let config;
|
|
54
|
+
try {
|
|
55
|
+
const workspaceRoot = findWorkspaceRoot();
|
|
56
|
+
config = await getConfig(workspaceRoot);
|
|
57
|
+
writeInfo(
|
|
58
|
+
`${brandIcon(config)} Running the Storm Worker generator...
|
|
59
|
+
|
|
60
|
+
`,
|
|
61
|
+
config
|
|
62
|
+
);
|
|
63
|
+
writeDebug(
|
|
64
|
+
`Loading the Storm Config from environment variables and storm.json file...
|
|
65
|
+
- workspaceRoot: ${workspaceRoot}`,
|
|
66
|
+
config
|
|
67
|
+
);
|
|
68
|
+
writeTrace(
|
|
69
|
+
`Loaded Storm config into env:
|
|
70
|
+
${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
|
|
71
|
+
config
|
|
72
|
+
);
|
|
73
|
+
const options = await normalizeOptions(tree, schema, config);
|
|
74
|
+
const tasks = [];
|
|
75
|
+
tasks.push(
|
|
76
|
+
await generator_default(tree, {
|
|
77
|
+
...options,
|
|
78
|
+
skipFormat: true
|
|
79
|
+
})
|
|
80
|
+
);
|
|
81
|
+
tasks.push(
|
|
82
|
+
await nodeApplicationGenerator(tree, {
|
|
83
|
+
...options,
|
|
84
|
+
framework: "none",
|
|
85
|
+
skipFormat: true,
|
|
86
|
+
unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
|
|
87
|
+
e2eTestRunner: "none",
|
|
88
|
+
name: schema.name
|
|
89
|
+
})
|
|
90
|
+
);
|
|
91
|
+
if (options.unitTestRunner === "vitest") {
|
|
92
|
+
const { vitestGenerator, createOrEditViteConfig } = ensurePackage(
|
|
93
|
+
"@nx/vite",
|
|
94
|
+
nxVersion
|
|
95
|
+
);
|
|
96
|
+
const vitestTask = await vitestGenerator(tree, {
|
|
97
|
+
project: options.name,
|
|
98
|
+
uiFramework: "none",
|
|
99
|
+
coverageProvider: "v8",
|
|
100
|
+
skipFormat: true,
|
|
101
|
+
testEnvironment: "node"
|
|
102
|
+
});
|
|
103
|
+
tasks.push(vitestTask);
|
|
104
|
+
createOrEditViteConfig(
|
|
105
|
+
tree,
|
|
106
|
+
{
|
|
107
|
+
project: options.name,
|
|
108
|
+
includeLib: false,
|
|
109
|
+
includeVitest: true,
|
|
110
|
+
testEnvironment: "node"
|
|
111
|
+
},
|
|
112
|
+
true
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
addCloudflareFiles(tree, options);
|
|
116
|
+
updateTsAppConfig(tree, options);
|
|
117
|
+
addTargets(tree, options);
|
|
118
|
+
if (options.unitTestRunner === "none") {
|
|
119
|
+
removeTestFiles(tree, options);
|
|
120
|
+
}
|
|
121
|
+
if (!options.skipFormat) {
|
|
122
|
+
await formatFiles(tree);
|
|
123
|
+
}
|
|
124
|
+
if (options.template === "hono") {
|
|
125
|
+
tasks.push(() => {
|
|
126
|
+
const packageJsonPath = joinPathFragments(
|
|
127
|
+
options.directory ?? "",
|
|
128
|
+
"package.json"
|
|
129
|
+
);
|
|
130
|
+
if (tree.exists(packageJsonPath)) {
|
|
131
|
+
updateJson(tree, packageJsonPath, (json) => ({
|
|
132
|
+
...json,
|
|
133
|
+
dependencies: {
|
|
134
|
+
hono: "4.4.0",
|
|
135
|
+
...json?.dependencies
|
|
136
|
+
}
|
|
137
|
+
}));
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
return runTasksInSerial(...tasks);
|
|
142
|
+
} catch (error) {
|
|
143
|
+
return () => {
|
|
144
|
+
writeFatal(
|
|
145
|
+
"A fatal error occurred while running the generator - the process was forced to terminate",
|
|
146
|
+
config
|
|
147
|
+
);
|
|
148
|
+
writeError(
|
|
149
|
+
`An exception was thrown in the generator's process
|
|
150
|
+
- Details: ${error.message}
|
|
151
|
+
- Stacktrace: ${error.stack}`,
|
|
152
|
+
config
|
|
153
|
+
);
|
|
154
|
+
};
|
|
155
|
+
} finally {
|
|
156
|
+
stopwatch();
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
function updateTsAppConfig(tree, options) {
|
|
160
|
+
updateJson(tree, join(options.appProjectRoot, "tsconfig.app.json"), (json) => {
|
|
161
|
+
json.compilerOptions = {
|
|
162
|
+
...json.compilerOptions,
|
|
163
|
+
esModuleInterop: true,
|
|
164
|
+
target: "es2021",
|
|
165
|
+
lib: ["es2021"],
|
|
166
|
+
module: "es2022",
|
|
167
|
+
moduleResolution: "node",
|
|
168
|
+
resolveJsonModule: true,
|
|
169
|
+
allowJs: true,
|
|
170
|
+
checkJs: false,
|
|
171
|
+
noEmit: true,
|
|
172
|
+
isolatedModules: true,
|
|
173
|
+
allowSyntheticDefaultImports: true,
|
|
174
|
+
forceConsistentCasingInFileNames: true,
|
|
175
|
+
strict: true,
|
|
176
|
+
skipLibCheck: true
|
|
177
|
+
};
|
|
178
|
+
json.compilerOptions.types = [
|
|
179
|
+
...json.compilerOptions.types,
|
|
180
|
+
"@cloudflare/workers-types"
|
|
181
|
+
];
|
|
182
|
+
return json;
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
function addCloudflareFiles(tree, options) {
|
|
186
|
+
tree.delete(join(options.appProjectRoot, "src/main.ts"));
|
|
187
|
+
generateFiles(
|
|
188
|
+
tree,
|
|
189
|
+
join(__dirname, "./files/common"),
|
|
190
|
+
options.appProjectRoot,
|
|
191
|
+
{
|
|
192
|
+
...options,
|
|
193
|
+
tmpl: "",
|
|
194
|
+
name: options.name,
|
|
195
|
+
accountId: options.accountId ? getAccountId(options.accountId) : "",
|
|
196
|
+
vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
|
|
197
|
+
}
|
|
198
|
+
);
|
|
199
|
+
if (options.template && options.template !== "none") {
|
|
200
|
+
generateFiles(
|
|
201
|
+
tree,
|
|
202
|
+
join(__dirname, `./files/${options.template}`),
|
|
203
|
+
join(options.appProjectRoot, "src"),
|
|
204
|
+
{
|
|
205
|
+
...options,
|
|
206
|
+
tmpl: "",
|
|
207
|
+
name: options.name,
|
|
208
|
+
accountId: options.accountId ? getAccountId(options.accountId) : "",
|
|
209
|
+
vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
|
|
210
|
+
vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
|
|
211
|
+
}
|
|
212
|
+
);
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
function addTargets(tree, options) {
|
|
216
|
+
try {
|
|
217
|
+
const projectConfiguration = readProjectConfiguration(tree, options.name);
|
|
218
|
+
projectConfiguration.targets = {
|
|
219
|
+
...projectConfiguration.targets ?? {},
|
|
220
|
+
serve: {
|
|
221
|
+
executor: "@storm-software/cloudflare-tools:serve",
|
|
222
|
+
options: {
|
|
223
|
+
port: options.port
|
|
224
|
+
}
|
|
225
|
+
},
|
|
226
|
+
"nx-release-publish": {
|
|
227
|
+
executor: "@storm-software/cloudflare-tools:cloudflare-publish"
|
|
228
|
+
}
|
|
229
|
+
};
|
|
230
|
+
if (projectConfiguration.targets.build) {
|
|
231
|
+
delete projectConfiguration.targets.build;
|
|
232
|
+
}
|
|
233
|
+
updateProjectConfiguration(tree, options.name, projectConfiguration);
|
|
234
|
+
} catch (e) {
|
|
235
|
+
console.error(e);
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
function removeTestFiles(tree, options) {
|
|
239
|
+
tree.delete(join(options.appProjectRoot, "src", "index.test.ts"));
|
|
240
|
+
}
|
|
241
|
+
async function normalizeOptions(host, options, config) {
|
|
242
|
+
const { projectName: appProjectName, projectRoot: appProjectRoot } = await determineProjectNameAndRootOptions(host, {
|
|
243
|
+
name: options.name,
|
|
244
|
+
projectType: "application",
|
|
245
|
+
directory: options.directory,
|
|
246
|
+
rootProject: options.rootProject
|
|
247
|
+
});
|
|
248
|
+
options.rootProject = appProjectRoot === ".";
|
|
249
|
+
return {
|
|
250
|
+
addPlugin: process.env.NX_ADD_PLUGINS !== "false",
|
|
251
|
+
accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
|
|
252
|
+
...options,
|
|
253
|
+
name: names(appProjectName).fileName,
|
|
254
|
+
frontendProject: options.frontendProject ? names(options.frontendProject).fileName : void 0,
|
|
255
|
+
appProjectRoot,
|
|
256
|
+
unitTestRunner: options.unitTestRunner ?? "vitest",
|
|
257
|
+
rootProject: options.rootProject ?? false,
|
|
258
|
+
template: options.template ?? "fetch-handler",
|
|
259
|
+
port: options.port ?? 3e3
|
|
260
|
+
};
|
|
261
|
+
}
|
|
262
|
+
var generator_default2 = applicationGenerator;
|
|
263
|
+
var applicationSchematic = convertNxGenerator(applicationGenerator);
|
|
264
|
+
|
|
265
|
+
export {
|
|
266
|
+
applicationGenerator,
|
|
267
|
+
generator_default2 as generator_default,
|
|
268
|
+
applicationSchematic
|
|
269
|
+
};
|
|
@@ -2666,7 +2666,7 @@ async function presetGeneratorFn(tree, options) {
|
|
|
2666
2666
|
"@storm-software/cspell": "latest",
|
|
2667
2667
|
"@storm-software/prettier": "latest",
|
|
2668
2668
|
"@taplo/cli": "0.7.0",
|
|
2669
|
-
"@types/node": "^
|
|
2669
|
+
"@types/node": "^25.3.0",
|
|
2670
2670
|
copyfiles: "2.4.1",
|
|
2671
2671
|
eslint: "9.5.0",
|
|
2672
2672
|
jest: "29.7.0",
|
|
@@ -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.71.
|
|
10
|
+
version: "0.71.54",
|
|
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",
|
|
@@ -138,7 +138,7 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
|
|
|
138
138
|
"@nx/web": "catalog:",
|
|
139
139
|
"@storm-software/config": "1.135.7",
|
|
140
140
|
"@storm-software/config-tools": "1.189.6",
|
|
141
|
-
"@storm-software/workspace-tools": "1.294.
|
|
141
|
+
"@storm-software/workspace-tools": "1.294.39",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|