@storm-software/cloudflare-tools 0.71.7 → 0.71.8
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 +8 -0
- package/dist/{chunk-4S4CCYBL.js → chunk-3AKRXUUE.js} +4 -4
- package/dist/chunk-G4SKWFFU.mjs +219 -0
- package/dist/chunk-H5H4H2SO.js +262 -0
- package/dist/chunk-K5JUOE3A.js +219 -0
- package/dist/{chunk-OFFMHZ3Z.mjs → chunk-QDPNOX6S.mjs} +1 -1
- package/dist/{chunk-R77S76A2.mjs → chunk-QRMW3ECS.mjs} +4 -4
- package/dist/{chunk-NMP6HE73.js → chunk-VNUNYZX4.js} +4 -4
- package/dist/chunk-Z52YIFDR.mjs +265 -0
- package/dist/generators.js +3 -3
- package/dist/generators.mjs +2 -2
- package/dist/index.js +3 -3
- package/dist/index.mjs +2 -2
- package/dist/src/generators/init/generator.js +2 -2
- package/dist/src/generators/init/generator.mjs +1 -1
- package/dist/src/generators/worker/generator.js +3 -3
- package/dist/src/generators/worker/generator.mjs +2 -2
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - Cloudflare Tools
|
|
4
4
|
|
|
5
|
+
## [0.71.7](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.7) (12/06/2025)
|
|
6
|
+
|
|
7
|
+
### Updated Dependencies
|
|
8
|
+
|
|
9
|
+
- Updated **workspace-tools** to **v1.294.1**
|
|
10
|
+
- Updated **config-tools** to **v1.188.57**
|
|
11
|
+
- Updated **config** to **v1.134.57**
|
|
12
|
+
|
|
5
13
|
## [0.71.6](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.6) (12/05/2025)
|
|
6
14
|
|
|
7
15
|
### Miscellaneous
|
|
@@ -1,8 +1,5 @@
|
|
|
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 _chunkNMP6HE73js = require('./chunk-NMP6HE73.js');
|
|
4
|
-
|
|
5
|
-
|
|
6
3
|
|
|
7
4
|
var _chunkVKMAYBQXjs = require('./chunk-VKMAYBQX.js');
|
|
8
5
|
|
|
@@ -14,6 +11,9 @@ var _chunkVKMAYBQXjs = require('./chunk-VKMAYBQX.js');
|
|
|
14
11
|
|
|
15
12
|
var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
|
|
16
13
|
|
|
14
|
+
|
|
15
|
+
var _chunkVNUNYZX4js = require('./chunk-VNUNYZX4.js');
|
|
16
|
+
|
|
17
17
|
// src/generators/worker/generator.ts
|
|
18
18
|
|
|
19
19
|
|
|
@@ -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 _chunkVNUNYZX4js.generator_default.call(void 0, tree, {
|
|
70
70
|
...options,
|
|
71
71
|
skipFormat: true
|
|
72
72
|
})
|
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import {
|
|
2
|
+
createCliOptions,
|
|
3
|
+
getPackageInfo
|
|
4
|
+
} from "./chunk-3MAI3FU2.mjs";
|
|
5
|
+
import {
|
|
6
|
+
getInternalDependencies,
|
|
7
|
+
r2UploadFile
|
|
8
|
+
} from "./chunk-5CMG7SUH.mjs";
|
|
9
|
+
import {
|
|
10
|
+
findWorkspaceRoot,
|
|
11
|
+
getConfig
|
|
12
|
+
} from "./chunk-SGTAZO2Q.mjs";
|
|
13
|
+
import {
|
|
14
|
+
correctPaths,
|
|
15
|
+
joinPaths,
|
|
16
|
+
writeDebug,
|
|
17
|
+
writeSuccess,
|
|
18
|
+
writeTrace,
|
|
19
|
+
writeWarning
|
|
20
|
+
} from "./chunk-TPNHSNNZ.mjs";
|
|
21
|
+
|
|
22
|
+
// src/executors/r2-upload-publish/executor.ts
|
|
23
|
+
import { S3 } from "@aws-sdk/client-s3";
|
|
24
|
+
import {
|
|
25
|
+
createProjectGraphAsync,
|
|
26
|
+
readCachedProjectGraph
|
|
27
|
+
} from "@nx/devkit";
|
|
28
|
+
import { glob } from "glob";
|
|
29
|
+
import mime from "mime-types";
|
|
30
|
+
import { execSync } from "node:child_process";
|
|
31
|
+
import { readFile } from "node:fs/promises";
|
|
32
|
+
async function runExecutor(options, context) {
|
|
33
|
+
const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
|
|
34
|
+
if (!context.projectName) {
|
|
35
|
+
throw new Error("The executor requires a projectName.");
|
|
36
|
+
}
|
|
37
|
+
console.info(
|
|
38
|
+
`\u{1F680} Running Storm Cloudflare Publish executor on the ${context.projectName} worker`
|
|
39
|
+
);
|
|
40
|
+
if (!context.projectName || !context.projectsConfigurations?.projects || !context.projectsConfigurations.projects[context.projectName] || !context.projectsConfigurations.projects[context.projectName]?.root) {
|
|
41
|
+
throw new Error("The executor requires projectsConfigurations.");
|
|
42
|
+
}
|
|
43
|
+
try {
|
|
44
|
+
const workspaceRoot = findWorkspaceRoot();
|
|
45
|
+
const config = await getConfig(workspaceRoot);
|
|
46
|
+
const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
|
|
47
|
+
const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
|
|
48
|
+
const projectDetails = getPackageInfo(
|
|
49
|
+
context.projectsConfigurations.projects[context.projectName]
|
|
50
|
+
);
|
|
51
|
+
const bucketId = options.bucketId;
|
|
52
|
+
const bucketPath = options.bucketPath || "/";
|
|
53
|
+
if (!bucketId) {
|
|
54
|
+
throw new Error("The executor requires a bucketId.");
|
|
55
|
+
}
|
|
56
|
+
const args = createCliOptions({ ...options });
|
|
57
|
+
if (isDryRun) {
|
|
58
|
+
args.push("--dry-run");
|
|
59
|
+
}
|
|
60
|
+
const cloudflareAccountId = process.env.CLOUDFLARE_ACCOUNT_ID || process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
|
|
61
|
+
if (!options?.registry && !cloudflareAccountId) {
|
|
62
|
+
throw new Error(
|
|
63
|
+
"The registry option and `CLOUDFLARE_ACCOUNT_ID` environment variable are not set. Please set one of these values to upload to the Cloudflare R2 bucket."
|
|
64
|
+
);
|
|
65
|
+
}
|
|
66
|
+
if (!process.env.ACCESS_KEY_ID && !process.env.CLOUDFLARE_ACCESS_KEY_ID && !process.env.AWS_ACCESS_KEY_ID || !process.env.SECRET_ACCESS_KEY && !process.env.CLOUDFLARE_SECRET_ACCESS_KEY && !process.env.AWS_SECRET_ACCESS_KEY) {
|
|
67
|
+
throw new Error(
|
|
68
|
+
"The `ACCESS_KEY_ID` and `SECRET_ACCESS_KEY` environment variables are not set. Please set these environment variables to upload to the Cloudflare R2 bucket."
|
|
69
|
+
);
|
|
70
|
+
}
|
|
71
|
+
const registry = options?.registry ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
|
|
72
|
+
let projectGraph;
|
|
73
|
+
try {
|
|
74
|
+
projectGraph = readCachedProjectGraph();
|
|
75
|
+
} catch {
|
|
76
|
+
await createProjectGraphAsync();
|
|
77
|
+
projectGraph = readCachedProjectGraph();
|
|
78
|
+
}
|
|
79
|
+
if (!projectGraph) {
|
|
80
|
+
throw new Error(
|
|
81
|
+
"The executor failed because the project graph is not available. Please run the build command again."
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
writeDebug(
|
|
85
|
+
`Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
|
|
86
|
+
);
|
|
87
|
+
const client = new S3({
|
|
88
|
+
region: "auto",
|
|
89
|
+
endpoint: registry,
|
|
90
|
+
credentials: {
|
|
91
|
+
accessKeyId: process.env.ACCESS_KEY_ID || process.env.CLOUDFLARE_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID,
|
|
92
|
+
secretAccessKey: process.env.SECRET_ACCESS_KEY || process.env.CLOUDFLARE_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
const version = projectDetails?.content?.version;
|
|
96
|
+
if (version) {
|
|
97
|
+
writeDebug(`Starting upload version ${version}`);
|
|
98
|
+
}
|
|
99
|
+
const basePath = options.path || sourceRoot;
|
|
100
|
+
const files = await glob(joinPaths(basePath, "**/*"), {
|
|
101
|
+
ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
|
|
102
|
+
});
|
|
103
|
+
const internalDependencies = await getInternalDependencies(
|
|
104
|
+
context.projectName,
|
|
105
|
+
projectGraph
|
|
106
|
+
);
|
|
107
|
+
const dependencies = internalDependencies.filter(
|
|
108
|
+
(projectNode) => !projectNode.data.tags || projectNode.data.tags.every((tag) => tag.toLowerCase() !== "component")
|
|
109
|
+
).reduce((ret, dep) => {
|
|
110
|
+
if (!ret[dep.name]) {
|
|
111
|
+
ret[dep.name] = "latest";
|
|
112
|
+
}
|
|
113
|
+
return ret;
|
|
114
|
+
}, projectDetails?.content.dependencies ?? {});
|
|
115
|
+
const release = options.tag ?? execSync("npm config get tag").toString().trim();
|
|
116
|
+
if (options.clean === true) {
|
|
117
|
+
writeDebug(`Clearing out existing items in ${bucketPath}`);
|
|
118
|
+
if (!isDryRun) {
|
|
119
|
+
const response = await client.listObjects({
|
|
120
|
+
Bucket: bucketId,
|
|
121
|
+
Prefix: bucketPath
|
|
122
|
+
});
|
|
123
|
+
if (response?.Contents && response.Contents.length > 0) {
|
|
124
|
+
writeTrace(
|
|
125
|
+
`Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
|
|
126
|
+
);
|
|
127
|
+
await Promise.all(
|
|
128
|
+
response.Contents.map(
|
|
129
|
+
(item) => client.deleteObjects({
|
|
130
|
+
Bucket: bucketId,
|
|
131
|
+
Delete: {
|
|
132
|
+
Objects: [
|
|
133
|
+
{
|
|
134
|
+
Key: item.Key
|
|
135
|
+
}
|
|
136
|
+
],
|
|
137
|
+
Quiet: false
|
|
138
|
+
}
|
|
139
|
+
})
|
|
140
|
+
)
|
|
141
|
+
);
|
|
142
|
+
} else {
|
|
143
|
+
writeDebug(
|
|
144
|
+
`No existing items to delete in the R2 bucket path ${bucketPath}`
|
|
145
|
+
);
|
|
146
|
+
}
|
|
147
|
+
} else {
|
|
148
|
+
writeWarning("[Dry run]: Skipping R2 bucket clean.");
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
if (options.writeMetaJson === true) {
|
|
152
|
+
const meta = {
|
|
153
|
+
name: context.projectName,
|
|
154
|
+
version,
|
|
155
|
+
release,
|
|
156
|
+
description: projectDetails?.content?.description,
|
|
157
|
+
tags: projectDetails?.content?.keywords,
|
|
158
|
+
dependencies,
|
|
159
|
+
devDependencies: null,
|
|
160
|
+
internalDependencies: internalDependencies.filter(
|
|
161
|
+
(projectNode) => projectNode.data.tags && projectNode.data.tags.some(
|
|
162
|
+
(tag) => tag.toLowerCase() === "component"
|
|
163
|
+
)
|
|
164
|
+
).map((dep) => dep.name)
|
|
165
|
+
};
|
|
166
|
+
if (projectDetails?.type === "package.json") {
|
|
167
|
+
meta.devDependencies = projectDetails?.content?.devDependencies;
|
|
168
|
+
}
|
|
169
|
+
const metaJson = JSON.stringify(meta);
|
|
170
|
+
writeTrace(`Generating meta.json file:
|
|
171
|
+
${metaJson}`);
|
|
172
|
+
await r2UploadFile(
|
|
173
|
+
client,
|
|
174
|
+
bucketId,
|
|
175
|
+
bucketPath,
|
|
176
|
+
"meta.json",
|
|
177
|
+
version,
|
|
178
|
+
metaJson,
|
|
179
|
+
"application/json",
|
|
180
|
+
isDryRun
|
|
181
|
+
);
|
|
182
|
+
}
|
|
183
|
+
await Promise.all(
|
|
184
|
+
files.map(async (file) => {
|
|
185
|
+
const name = correctPaths(file).replace(correctPaths(basePath), "");
|
|
186
|
+
const type = mime.lookup(name) || "application/octet-stream";
|
|
187
|
+
writeTrace(`Uploading file: ${name} (content-type: ${type})`);
|
|
188
|
+
await r2UploadFile(
|
|
189
|
+
client,
|
|
190
|
+
bucketId,
|
|
191
|
+
bucketPath,
|
|
192
|
+
name,
|
|
193
|
+
version,
|
|
194
|
+
await readFile(file, { encoding: "utf8" }),
|
|
195
|
+
type,
|
|
196
|
+
isDryRun
|
|
197
|
+
);
|
|
198
|
+
})
|
|
199
|
+
);
|
|
200
|
+
writeSuccess(
|
|
201
|
+
`Successfully uploaded the ${projectName} project to the Cloudflare R2 bucket.`,
|
|
202
|
+
config
|
|
203
|
+
);
|
|
204
|
+
return {
|
|
205
|
+
success: true
|
|
206
|
+
};
|
|
207
|
+
} catch (error) {
|
|
208
|
+
console.error("Failed to publish to Cloudflare R2 bucket");
|
|
209
|
+
console.error(error);
|
|
210
|
+
console.log("");
|
|
211
|
+
return {
|
|
212
|
+
success: false
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
export {
|
|
218
|
+
runExecutor
|
|
219
|
+
};
|
|
@@ -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
|
+
var _chunkVNUNYZX4js = require('./chunk-VNUNYZX4.js');
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
var _chunkVKMAYBQXjs = require('./chunk-VKMAYBQX.js');
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.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 = _chunkZ2WQB55Rjs.getStopwatch.call(void 0, "Storm Worker generator");
|
|
49
|
+
let config;
|
|
50
|
+
try {
|
|
51
|
+
_chunkZ2WQB55Rjs.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
|
|
52
|
+
|
|
53
|
+
`, config);
|
|
54
|
+
const workspaceRoot = _chunkVKMAYBQXjs.findWorkspaceRoot.call(void 0, );
|
|
55
|
+
_chunkZ2WQB55Rjs.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 _chunkVKMAYBQXjs.getConfig.call(void 0, workspaceRoot);
|
|
61
|
+
_chunkZ2WQB55Rjs.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 _chunkVNUNYZX4js.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
|
+
_chunkZ2WQB55Rjs.writeFatal.call(void 0,
|
|
138
|
+
"A fatal error occurred while running the generator - the process was forced to terminate",
|
|
139
|
+
config
|
|
140
|
+
);
|
|
141
|
+
_chunkZ2WQB55Rjs.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;
|
|
@@ -0,0 +1,219 @@
|
|
|
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 _chunkUAKLE2QOjs = require('./chunk-UAKLE2QO.js');
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
var _chunkVKMAYBQXjs = require('./chunk-VKMAYBQX.js');
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
|
|
21
|
+
|
|
22
|
+
// src/executors/r2-upload-publish/executor.ts
|
|
23
|
+
var _clients3 = require('@aws-sdk/client-s3');
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
var _devkit = require('@nx/devkit');
|
|
28
|
+
var _glob = require('glob');
|
|
29
|
+
var _mimetypes = require('mime-types'); var _mimetypes2 = _interopRequireDefault(_mimetypes);
|
|
30
|
+
var _child_process = require('child_process');
|
|
31
|
+
var _promises = require('fs/promises');
|
|
32
|
+
async function runExecutor(options, context) {
|
|
33
|
+
const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
|
|
34
|
+
if (!context.projectName) {
|
|
35
|
+
throw new Error("The executor requires a projectName.");
|
|
36
|
+
}
|
|
37
|
+
console.info(
|
|
38
|
+
`\u{1F680} Running Storm Cloudflare Publish executor on the ${context.projectName} worker`
|
|
39
|
+
);
|
|
40
|
+
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])) {
|
|
41
|
+
throw new Error("The executor requires projectsConfigurations.");
|
|
42
|
+
}
|
|
43
|
+
try {
|
|
44
|
+
const workspaceRoot = _chunkVKMAYBQXjs.findWorkspaceRoot.call(void 0, );
|
|
45
|
+
const config = await _chunkVKMAYBQXjs.getConfig.call(void 0, workspaceRoot);
|
|
46
|
+
const sourceRoot = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.sourceRoot]), () => ( workspaceRoot));
|
|
47
|
+
const projectName = _nullishCoalesce(_optionalChain([context, 'access', _11 => _11.projectsConfigurations, 'access', _12 => _12.projects, 'access', _13 => _13[context.projectName], 'optionalAccess', _14 => _14.name]), () => ( context.projectName));
|
|
48
|
+
const projectDetails = _chunkN7FW365Qjs.getPackageInfo.call(void 0,
|
|
49
|
+
context.projectsConfigurations.projects[context.projectName]
|
|
50
|
+
);
|
|
51
|
+
const bucketId = options.bucketId;
|
|
52
|
+
const bucketPath = options.bucketPath || "/";
|
|
53
|
+
if (!bucketId) {
|
|
54
|
+
throw new Error("The executor requires a bucketId.");
|
|
55
|
+
}
|
|
56
|
+
const args = _chunkN7FW365Qjs.createCliOptions.call(void 0, { ...options });
|
|
57
|
+
if (isDryRun) {
|
|
58
|
+
args.push("--dry-run");
|
|
59
|
+
}
|
|
60
|
+
const cloudflareAccountId = process.env.CLOUDFLARE_ACCOUNT_ID || process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
|
|
61
|
+
if (!_optionalChain([options, 'optionalAccess', _15 => _15.registry]) && !cloudflareAccountId) {
|
|
62
|
+
throw new Error(
|
|
63
|
+
"The registry option and `CLOUDFLARE_ACCOUNT_ID` environment variable are not set. Please set one of these values to upload to the Cloudflare R2 bucket."
|
|
64
|
+
);
|
|
65
|
+
}
|
|
66
|
+
if (!process.env.ACCESS_KEY_ID && !process.env.CLOUDFLARE_ACCESS_KEY_ID && !process.env.AWS_ACCESS_KEY_ID || !process.env.SECRET_ACCESS_KEY && !process.env.CLOUDFLARE_SECRET_ACCESS_KEY && !process.env.AWS_SECRET_ACCESS_KEY) {
|
|
67
|
+
throw new Error(
|
|
68
|
+
"The `ACCESS_KEY_ID` and `SECRET_ACCESS_KEY` environment variables are not set. Please set these environment variables to upload to the Cloudflare R2 bucket."
|
|
69
|
+
);
|
|
70
|
+
}
|
|
71
|
+
const registry = _optionalChain([options, 'optionalAccess', _16 => _16.registry]) ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
|
|
72
|
+
let projectGraph;
|
|
73
|
+
try {
|
|
74
|
+
projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
|
|
75
|
+
} catch (e) {
|
|
76
|
+
await _devkit.createProjectGraphAsync.call(void 0, );
|
|
77
|
+
projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
|
|
78
|
+
}
|
|
79
|
+
if (!projectGraph) {
|
|
80
|
+
throw new Error(
|
|
81
|
+
"The executor failed because the project graph is not available. Please run the build command again."
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
_chunkZ2WQB55Rjs.writeDebug.call(void 0,
|
|
85
|
+
`Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
|
|
86
|
+
);
|
|
87
|
+
const client = new (0, _clients3.S3)({
|
|
88
|
+
region: "auto",
|
|
89
|
+
endpoint: registry,
|
|
90
|
+
credentials: {
|
|
91
|
+
accessKeyId: process.env.ACCESS_KEY_ID || process.env.CLOUDFLARE_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID,
|
|
92
|
+
secretAccessKey: process.env.SECRET_ACCESS_KEY || process.env.CLOUDFLARE_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
const version = _optionalChain([projectDetails, 'optionalAccess', _17 => _17.content, 'optionalAccess', _18 => _18.version]);
|
|
96
|
+
if (version) {
|
|
97
|
+
_chunkZ2WQB55Rjs.writeDebug.call(void 0, `Starting upload version ${version}`);
|
|
98
|
+
}
|
|
99
|
+
const basePath = options.path || sourceRoot;
|
|
100
|
+
const files = await _glob.glob.call(void 0, _chunkZ2WQB55Rjs.joinPaths.call(void 0, basePath, "**/*"), {
|
|
101
|
+
ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
|
|
102
|
+
});
|
|
103
|
+
const internalDependencies = await _chunkUAKLE2QOjs.getInternalDependencies.call(void 0,
|
|
104
|
+
context.projectName,
|
|
105
|
+
projectGraph
|
|
106
|
+
);
|
|
107
|
+
const dependencies = internalDependencies.filter(
|
|
108
|
+
(projectNode) => !projectNode.data.tags || projectNode.data.tags.every((tag) => tag.toLowerCase() !== "component")
|
|
109
|
+
).reduce((ret, dep) => {
|
|
110
|
+
if (!ret[dep.name]) {
|
|
111
|
+
ret[dep.name] = "latest";
|
|
112
|
+
}
|
|
113
|
+
return ret;
|
|
114
|
+
}, _nullishCoalesce(_optionalChain([projectDetails, 'optionalAccess', _19 => _19.content, 'access', _20 => _20.dependencies]), () => ( {})));
|
|
115
|
+
const release = _nullishCoalesce(options.tag, () => ( _child_process.execSync.call(void 0, "npm config get tag").toString().trim()));
|
|
116
|
+
if (options.clean === true) {
|
|
117
|
+
_chunkZ2WQB55Rjs.writeDebug.call(void 0, `Clearing out existing items in ${bucketPath}`);
|
|
118
|
+
if (!isDryRun) {
|
|
119
|
+
const response = await client.listObjects({
|
|
120
|
+
Bucket: bucketId,
|
|
121
|
+
Prefix: bucketPath
|
|
122
|
+
});
|
|
123
|
+
if (_optionalChain([response, 'optionalAccess', _21 => _21.Contents]) && response.Contents.length > 0) {
|
|
124
|
+
_chunkZ2WQB55Rjs.writeTrace.call(void 0,
|
|
125
|
+
`Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
|
|
126
|
+
);
|
|
127
|
+
await Promise.all(
|
|
128
|
+
response.Contents.map(
|
|
129
|
+
(item) => client.deleteObjects({
|
|
130
|
+
Bucket: bucketId,
|
|
131
|
+
Delete: {
|
|
132
|
+
Objects: [
|
|
133
|
+
{
|
|
134
|
+
Key: item.Key
|
|
135
|
+
}
|
|
136
|
+
],
|
|
137
|
+
Quiet: false
|
|
138
|
+
}
|
|
139
|
+
})
|
|
140
|
+
)
|
|
141
|
+
);
|
|
142
|
+
} else {
|
|
143
|
+
_chunkZ2WQB55Rjs.writeDebug.call(void 0,
|
|
144
|
+
`No existing items to delete in the R2 bucket path ${bucketPath}`
|
|
145
|
+
);
|
|
146
|
+
}
|
|
147
|
+
} else {
|
|
148
|
+
_chunkZ2WQB55Rjs.writeWarning.call(void 0, "[Dry run]: Skipping R2 bucket clean.");
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
if (options.writeMetaJson === true) {
|
|
152
|
+
const meta = {
|
|
153
|
+
name: context.projectName,
|
|
154
|
+
version,
|
|
155
|
+
release,
|
|
156
|
+
description: _optionalChain([projectDetails, 'optionalAccess', _22 => _22.content, 'optionalAccess', _23 => _23.description]),
|
|
157
|
+
tags: _optionalChain([projectDetails, 'optionalAccess', _24 => _24.content, 'optionalAccess', _25 => _25.keywords]),
|
|
158
|
+
dependencies,
|
|
159
|
+
devDependencies: null,
|
|
160
|
+
internalDependencies: internalDependencies.filter(
|
|
161
|
+
(projectNode) => projectNode.data.tags && projectNode.data.tags.some(
|
|
162
|
+
(tag) => tag.toLowerCase() === "component"
|
|
163
|
+
)
|
|
164
|
+
).map((dep) => dep.name)
|
|
165
|
+
};
|
|
166
|
+
if (_optionalChain([projectDetails, 'optionalAccess', _26 => _26.type]) === "package.json") {
|
|
167
|
+
meta.devDependencies = _optionalChain([projectDetails, 'optionalAccess', _27 => _27.content, 'optionalAccess', _28 => _28.devDependencies]);
|
|
168
|
+
}
|
|
169
|
+
const metaJson = JSON.stringify(meta);
|
|
170
|
+
_chunkZ2WQB55Rjs.writeTrace.call(void 0, `Generating meta.json file:
|
|
171
|
+
${metaJson}`);
|
|
172
|
+
await _chunkUAKLE2QOjs.r2UploadFile.call(void 0,
|
|
173
|
+
client,
|
|
174
|
+
bucketId,
|
|
175
|
+
bucketPath,
|
|
176
|
+
"meta.json",
|
|
177
|
+
version,
|
|
178
|
+
metaJson,
|
|
179
|
+
"application/json",
|
|
180
|
+
isDryRun
|
|
181
|
+
);
|
|
182
|
+
}
|
|
183
|
+
await Promise.all(
|
|
184
|
+
files.map(async (file) => {
|
|
185
|
+
const name = _chunkZ2WQB55Rjs.correctPaths.call(void 0, file).replace(_chunkZ2WQB55Rjs.correctPaths.call(void 0, basePath), "");
|
|
186
|
+
const type = _mimetypes2.default.lookup(name) || "application/octet-stream";
|
|
187
|
+
_chunkZ2WQB55Rjs.writeTrace.call(void 0, `Uploading file: ${name} (content-type: ${type})`);
|
|
188
|
+
await _chunkUAKLE2QOjs.r2UploadFile.call(void 0,
|
|
189
|
+
client,
|
|
190
|
+
bucketId,
|
|
191
|
+
bucketPath,
|
|
192
|
+
name,
|
|
193
|
+
version,
|
|
194
|
+
await _promises.readFile.call(void 0, file, { encoding: "utf8" }),
|
|
195
|
+
type,
|
|
196
|
+
isDryRun
|
|
197
|
+
);
|
|
198
|
+
})
|
|
199
|
+
);
|
|
200
|
+
_chunkZ2WQB55Rjs.writeSuccess.call(void 0,
|
|
201
|
+
`Successfully uploaded the ${projectName} project to the Cloudflare R2 bucket.`,
|
|
202
|
+
config
|
|
203
|
+
);
|
|
204
|
+
return {
|
|
205
|
+
success: true
|
|
206
|
+
};
|
|
207
|
+
} catch (error) {
|
|
208
|
+
console.error("Failed to publish to Cloudflare R2 bucket");
|
|
209
|
+
console.error(error);
|
|
210
|
+
console.log("");
|
|
211
|
+
return {
|
|
212
|
+
success: false
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
|
|
218
|
+
|
|
219
|
+
exports.runExecutor = runExecutor;
|
|
@@ -7,7 +7,7 @@ var require_package = __commonJS({
|
|
|
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.7",
|
|
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.294.
|
|
139
|
+
"@storm-software/config": "1.134.57",
|
|
140
|
+
"@storm-software/config-tools": "1.188.57",
|
|
141
|
+
"@storm-software/workspace-tools": "1.294.1",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.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.7",
|
|
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.294.
|
|
139
|
+
"@storm-software/config": "1.134.57",
|
|
140
|
+
"@storm-software/config-tools": "1.188.57",
|
|
141
|
+
"@storm-software/workspace-tools": "1.294.1",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -0,0 +1,265 @@
|
|
|
1
|
+
import {
|
|
2
|
+
findWorkspaceRoot,
|
|
3
|
+
getConfig
|
|
4
|
+
} from "./chunk-SGTAZO2Q.mjs";
|
|
5
|
+
import {
|
|
6
|
+
getStopwatch,
|
|
7
|
+
writeDebug,
|
|
8
|
+
writeError,
|
|
9
|
+
writeFatal,
|
|
10
|
+
writeInfo,
|
|
11
|
+
writeTrace
|
|
12
|
+
} from "./chunk-TPNHSNNZ.mjs";
|
|
13
|
+
import {
|
|
14
|
+
generator_default
|
|
15
|
+
} from "./chunk-QRMW3ECS.mjs";
|
|
16
|
+
import {
|
|
17
|
+
__dirname
|
|
18
|
+
} from "./chunk-TYYFTZLS.mjs";
|
|
19
|
+
|
|
20
|
+
// src/generators/worker/generator.ts
|
|
21
|
+
import {
|
|
22
|
+
convertNxGenerator,
|
|
23
|
+
ensurePackage,
|
|
24
|
+
formatFiles,
|
|
25
|
+
generateFiles,
|
|
26
|
+
joinPathFragments,
|
|
27
|
+
names,
|
|
28
|
+
readProjectConfiguration,
|
|
29
|
+
runTasksInSerial,
|
|
30
|
+
updateJson,
|
|
31
|
+
updateProjectConfiguration
|
|
32
|
+
} from "@nx/devkit";
|
|
33
|
+
import { determineProjectNameAndRootOptions } from "@nx/devkit/src/generators/project-name-and-root-utils";
|
|
34
|
+
import { applicationGenerator as nodeApplicationGenerator } from "@nx/node";
|
|
35
|
+
import { nxVersion } from "@nx/node/src/utils/versions";
|
|
36
|
+
import { join } from "path";
|
|
37
|
+
|
|
38
|
+
// src/generators/worker/libs/get-account-id.ts
|
|
39
|
+
function getAccountId(accountId) {
|
|
40
|
+
return `account_id = "${accountId}"`;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
// src/generators/worker/libs/vitest-imports.ts
|
|
44
|
+
var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
|
|
45
|
+
|
|
46
|
+
// src/generators/worker/libs/vitest-script.ts
|
|
47
|
+
var vitestScript = `"test": "vitest run"`;
|
|
48
|
+
|
|
49
|
+
// src/generators/worker/generator.ts
|
|
50
|
+
async function applicationGenerator(tree, schema) {
|
|
51
|
+
const stopwatch = getStopwatch("Storm Worker generator");
|
|
52
|
+
let config;
|
|
53
|
+
try {
|
|
54
|
+
writeInfo(`\u26A1 Running the Storm Worker generator...
|
|
55
|
+
|
|
56
|
+
`, config);
|
|
57
|
+
const workspaceRoot = findWorkspaceRoot();
|
|
58
|
+
writeDebug(
|
|
59
|
+
`Loading the Storm Config from environment variables and storm.json file...
|
|
60
|
+
- workspaceRoot: ${workspaceRoot}`,
|
|
61
|
+
config
|
|
62
|
+
);
|
|
63
|
+
config = await getConfig(workspaceRoot);
|
|
64
|
+
writeTrace(
|
|
65
|
+
`Loaded Storm config into env:
|
|
66
|
+
${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
|
|
67
|
+
config
|
|
68
|
+
);
|
|
69
|
+
const options = await normalizeOptions(tree, schema, config);
|
|
70
|
+
const tasks = [];
|
|
71
|
+
tasks.push(
|
|
72
|
+
await generator_default(tree, {
|
|
73
|
+
...options,
|
|
74
|
+
skipFormat: true
|
|
75
|
+
})
|
|
76
|
+
);
|
|
77
|
+
tasks.push(
|
|
78
|
+
await nodeApplicationGenerator(tree, {
|
|
79
|
+
...options,
|
|
80
|
+
framework: "none",
|
|
81
|
+
skipFormat: true,
|
|
82
|
+
unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
|
|
83
|
+
e2eTestRunner: "none",
|
|
84
|
+
name: schema.name
|
|
85
|
+
})
|
|
86
|
+
);
|
|
87
|
+
if (options.unitTestRunner === "vitest") {
|
|
88
|
+
const { vitestGenerator, createOrEditViteConfig } = ensurePackage(
|
|
89
|
+
"@nx/vite",
|
|
90
|
+
nxVersion
|
|
91
|
+
);
|
|
92
|
+
const vitestTask = await vitestGenerator(tree, {
|
|
93
|
+
project: options.name,
|
|
94
|
+
uiFramework: "none",
|
|
95
|
+
coverageProvider: "v8",
|
|
96
|
+
skipFormat: true,
|
|
97
|
+
testEnvironment: "node"
|
|
98
|
+
});
|
|
99
|
+
tasks.push(vitestTask);
|
|
100
|
+
createOrEditViteConfig(
|
|
101
|
+
tree,
|
|
102
|
+
{
|
|
103
|
+
project: options.name,
|
|
104
|
+
includeLib: false,
|
|
105
|
+
includeVitest: true,
|
|
106
|
+
testEnvironment: "node"
|
|
107
|
+
},
|
|
108
|
+
true
|
|
109
|
+
);
|
|
110
|
+
}
|
|
111
|
+
addCloudflareFiles(tree, options);
|
|
112
|
+
updateTsAppConfig(tree, options);
|
|
113
|
+
addTargets(tree, options);
|
|
114
|
+
if (options.unitTestRunner === "none") {
|
|
115
|
+
removeTestFiles(tree, options);
|
|
116
|
+
}
|
|
117
|
+
if (!options.skipFormat) {
|
|
118
|
+
await formatFiles(tree);
|
|
119
|
+
}
|
|
120
|
+
if (options.template === "hono") {
|
|
121
|
+
tasks.push(() => {
|
|
122
|
+
const packageJsonPath = joinPathFragments(
|
|
123
|
+
options.directory ?? "",
|
|
124
|
+
"package.json"
|
|
125
|
+
);
|
|
126
|
+
if (tree.exists(packageJsonPath)) {
|
|
127
|
+
updateJson(tree, packageJsonPath, (json) => ({
|
|
128
|
+
...json,
|
|
129
|
+
dependencies: {
|
|
130
|
+
hono: "4.4.0",
|
|
131
|
+
...json?.dependencies
|
|
132
|
+
}
|
|
133
|
+
}));
|
|
134
|
+
}
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
return runTasksInSerial(...tasks);
|
|
138
|
+
} catch (error) {
|
|
139
|
+
return () => {
|
|
140
|
+
writeFatal(
|
|
141
|
+
"A fatal error occurred while running the generator - the process was forced to terminate",
|
|
142
|
+
config
|
|
143
|
+
);
|
|
144
|
+
writeError(
|
|
145
|
+
`An exception was thrown in the generator's process
|
|
146
|
+
- Details: ${error.message}
|
|
147
|
+
- Stacktrace: ${error.stack}`,
|
|
148
|
+
config
|
|
149
|
+
);
|
|
150
|
+
};
|
|
151
|
+
} finally {
|
|
152
|
+
stopwatch();
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
function updateTsAppConfig(tree, options) {
|
|
156
|
+
updateJson(tree, join(options.appProjectRoot, "tsconfig.app.json"), (json) => {
|
|
157
|
+
json.compilerOptions = {
|
|
158
|
+
...json.compilerOptions,
|
|
159
|
+
esModuleInterop: true,
|
|
160
|
+
target: "es2021",
|
|
161
|
+
lib: ["es2021"],
|
|
162
|
+
module: "es2022",
|
|
163
|
+
moduleResolution: "node",
|
|
164
|
+
resolveJsonModule: true,
|
|
165
|
+
allowJs: true,
|
|
166
|
+
checkJs: false,
|
|
167
|
+
noEmit: true,
|
|
168
|
+
isolatedModules: true,
|
|
169
|
+
allowSyntheticDefaultImports: true,
|
|
170
|
+
forceConsistentCasingInFileNames: true,
|
|
171
|
+
strict: true,
|
|
172
|
+
skipLibCheck: true
|
|
173
|
+
};
|
|
174
|
+
json.compilerOptions.types = [
|
|
175
|
+
...json.compilerOptions.types,
|
|
176
|
+
"@cloudflare/workers-types"
|
|
177
|
+
];
|
|
178
|
+
return json;
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
function addCloudflareFiles(tree, options) {
|
|
182
|
+
tree.delete(join(options.appProjectRoot, "src/main.ts"));
|
|
183
|
+
generateFiles(
|
|
184
|
+
tree,
|
|
185
|
+
join(__dirname, "./files/common"),
|
|
186
|
+
options.appProjectRoot,
|
|
187
|
+
{
|
|
188
|
+
...options,
|
|
189
|
+
tmpl: "",
|
|
190
|
+
name: options.name,
|
|
191
|
+
accountId: options.accountId ? getAccountId(options.accountId) : "",
|
|
192
|
+
vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
|
|
193
|
+
}
|
|
194
|
+
);
|
|
195
|
+
if (options.template && options.template !== "none") {
|
|
196
|
+
generateFiles(
|
|
197
|
+
tree,
|
|
198
|
+
join(__dirname, `./files/${options.template}`),
|
|
199
|
+
join(options.appProjectRoot, "src"),
|
|
200
|
+
{
|
|
201
|
+
...options,
|
|
202
|
+
tmpl: "",
|
|
203
|
+
name: options.name,
|
|
204
|
+
accountId: options.accountId ? getAccountId(options.accountId) : "",
|
|
205
|
+
vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
|
|
206
|
+
vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
|
|
207
|
+
}
|
|
208
|
+
);
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
function addTargets(tree, options) {
|
|
212
|
+
try {
|
|
213
|
+
const projectConfiguration = readProjectConfiguration(tree, options.name);
|
|
214
|
+
projectConfiguration.targets = {
|
|
215
|
+
...projectConfiguration.targets ?? {},
|
|
216
|
+
serve: {
|
|
217
|
+
executor: "@storm-software/cloudflare-tools:serve",
|
|
218
|
+
options: {
|
|
219
|
+
port: options.port
|
|
220
|
+
}
|
|
221
|
+
},
|
|
222
|
+
"nx-release-publish": {
|
|
223
|
+
executor: "@storm-software/cloudflare-tools:cloudflare-publish"
|
|
224
|
+
}
|
|
225
|
+
};
|
|
226
|
+
if (projectConfiguration.targets.build) {
|
|
227
|
+
delete projectConfiguration.targets.build;
|
|
228
|
+
}
|
|
229
|
+
updateProjectConfiguration(tree, options.name, projectConfiguration);
|
|
230
|
+
} catch (e) {
|
|
231
|
+
console.error(e);
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
function removeTestFiles(tree, options) {
|
|
235
|
+
tree.delete(join(options.appProjectRoot, "src", "index.test.ts"));
|
|
236
|
+
}
|
|
237
|
+
async function normalizeOptions(host, options, config) {
|
|
238
|
+
const { projectName: appProjectName, projectRoot: appProjectRoot } = await determineProjectNameAndRootOptions(host, {
|
|
239
|
+
name: options.name,
|
|
240
|
+
projectType: "application",
|
|
241
|
+
directory: options.directory,
|
|
242
|
+
rootProject: options.rootProject
|
|
243
|
+
});
|
|
244
|
+
options.rootProject = appProjectRoot === ".";
|
|
245
|
+
return {
|
|
246
|
+
addPlugin: process.env.NX_ADD_PLUGINS !== "false",
|
|
247
|
+
accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
|
|
248
|
+
...options,
|
|
249
|
+
name: names(appProjectName).fileName,
|
|
250
|
+
frontendProject: options.frontendProject ? names(options.frontendProject).fileName : void 0,
|
|
251
|
+
appProjectRoot,
|
|
252
|
+
unitTestRunner: options.unitTestRunner ?? "vitest",
|
|
253
|
+
rootProject: options.rootProject ?? false,
|
|
254
|
+
template: options.template ?? "fetch-handler",
|
|
255
|
+
port: options.port ?? 3e3
|
|
256
|
+
};
|
|
257
|
+
}
|
|
258
|
+
var generator_default2 = applicationGenerator;
|
|
259
|
+
var applicationSchematic = convertNxGenerator(applicationGenerator);
|
|
260
|
+
|
|
261
|
+
export {
|
|
262
|
+
applicationGenerator,
|
|
263
|
+
generator_default2 as generator_default,
|
|
264
|
+
applicationSchematic
|
|
265
|
+
};
|
package/dist/generators.js
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkH5H4H2SOjs = require('./chunk-H5H4H2SO.js');
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
var
|
|
9
|
+
var _chunkVNUNYZX4js = require('./chunk-VNUNYZX4.js');
|
|
10
10
|
require('./chunk-VKMAYBQX.js');
|
|
11
11
|
require('./chunk-Z2WQB55R.js');
|
|
12
12
|
require('./chunk-MCKGQKYU.js');
|
|
@@ -15,4 +15,4 @@ require('./chunk-MCKGQKYU.js');
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
exports.applicationGenerator =
|
|
18
|
+
exports.applicationGenerator = _chunkH5H4H2SOjs.applicationGenerator; exports.applicationSchematic = _chunkH5H4H2SOjs.applicationSchematic; exports.initGenerator = _chunkVNUNYZX4js.initGenerator; exports.initSchematic = _chunkVNUNYZX4js.initSchematic;
|
package/dist/generators.mjs
CHANGED
|
@@ -2,11 +2,11 @@ import "./chunk-3J7KBHMJ.mjs";
|
|
|
2
2
|
import {
|
|
3
3
|
applicationGenerator,
|
|
4
4
|
applicationSchematic
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-QDPNOX6S.mjs";
|
|
6
6
|
import {
|
|
7
7
|
initGenerator,
|
|
8
8
|
initSchematic
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-QRMW3ECS.mjs";
|
|
10
10
|
import "./chunk-SGTAZO2Q.mjs";
|
|
11
11
|
import "./chunk-TPNHSNNZ.mjs";
|
|
12
12
|
import "./chunk-TYYFTZLS.mjs";
|
package/dist/index.js
CHANGED
|
@@ -3,11 +3,11 @@ require('./chunk-DHBG5ASJ.js');
|
|
|
3
3
|
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _chunkH5H4H2SOjs = require('./chunk-H5H4H2SO.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _chunkVNUNYZX4js = require('./chunk-VNUNYZX4.js');
|
|
11
11
|
require('./chunk-CVGPWUNP.js');
|
|
12
12
|
require('./chunk-QBD2OGUY.js');
|
|
13
13
|
require('./chunk-J5JJZJO5.js');
|
|
@@ -155,4 +155,4 @@ function createPackageJson(projectJsonPath, workspaceRoot) {
|
|
|
155
155
|
|
|
156
156
|
|
|
157
157
|
|
|
158
|
-
exports.applicationGenerator =
|
|
158
|
+
exports.applicationGenerator = _chunkH5H4H2SOjs.applicationGenerator; exports.applicationSchematic = _chunkH5H4H2SOjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getInternalDependencies = _chunkUAKLE2QOjs.getInternalDependencies; exports.initGenerator = _chunkVNUNYZX4js.initGenerator; exports.initSchematic = _chunkVNUNYZX4js.initSchematic; exports.name = name; exports.r2UploadFile = _chunkUAKLE2QOjs.r2UploadFile;
|
package/dist/index.mjs
CHANGED
|
@@ -3,11 +3,11 @@ import "./chunk-3J7KBHMJ.mjs";
|
|
|
3
3
|
import {
|
|
4
4
|
applicationGenerator,
|
|
5
5
|
applicationSchematic
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-QDPNOX6S.mjs";
|
|
7
7
|
import {
|
|
8
8
|
initGenerator,
|
|
9
9
|
initSchematic
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-QRMW3ECS.mjs";
|
|
11
11
|
import "./chunk-7Z5PILRU.mjs";
|
|
12
12
|
import "./chunk-F6FHDDUJ.mjs";
|
|
13
13
|
import "./chunk-FWIGE74R.mjs";
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkVNUNYZX4js = require('../../../chunk-VNUNYZX4.js');
|
|
6
6
|
require('../../../chunk-MCKGQKYU.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
exports.default =
|
|
11
|
+
exports.default = _chunkVNUNYZX4js.generator_default; exports.initGenerator = _chunkVNUNYZX4js.initGenerator; exports.initSchematic = _chunkVNUNYZX4js.initSchematic;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
require('../../../chunk-
|
|
5
|
+
var _chunkH5H4H2SOjs = require('../../../chunk-H5H4H2SO.js');
|
|
6
|
+
require('../../../chunk-VNUNYZX4.js');
|
|
7
7
|
require('../../../chunk-VKMAYBQX.js');
|
|
8
8
|
require('../../../chunk-Z2WQB55R.js');
|
|
9
9
|
require('../../../chunk-MCKGQKYU.js');
|
|
@@ -11,4 +11,4 @@ require('../../../chunk-MCKGQKYU.js');
|
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
|
|
14
|
-
exports.applicationGenerator =
|
|
14
|
+
exports.applicationGenerator = _chunkH5H4H2SOjs.applicationGenerator; exports.applicationSchematic = _chunkH5H4H2SOjs.applicationSchematic; exports.default = _chunkH5H4H2SOjs.generator_default;
|
|
@@ -2,8 +2,8 @@ import {
|
|
|
2
2
|
applicationGenerator,
|
|
3
3
|
applicationSchematic,
|
|
4
4
|
generator_default
|
|
5
|
-
} from "../../../chunk-
|
|
6
|
-
import "../../../chunk-
|
|
5
|
+
} from "../../../chunk-QDPNOX6S.mjs";
|
|
6
|
+
import "../../../chunk-QRMW3ECS.mjs";
|
|
7
7
|
import "../../../chunk-SGTAZO2Q.mjs";
|
|
8
8
|
import "../../../chunk-TPNHSNNZ.mjs";
|
|
9
9
|
import "../../../chunk-TYYFTZLS.mjs";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storm-software/cloudflare-tools",
|
|
3
|
-
"version": "0.71.
|
|
3
|
+
"version": "0.71.8",
|
|
4
4
|
"description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "github",
|
|
@@ -117,9 +117,9 @@
|
|
|
117
117
|
"@nx/js": "^22.1.3",
|
|
118
118
|
"@nx/node": "^22.1.3",
|
|
119
119
|
"@nx/web": "^22.1.3",
|
|
120
|
-
"@storm-software/config": "1.134.
|
|
121
|
-
"@storm-software/config-tools": "1.188.
|
|
122
|
-
"@storm-software/workspace-tools": "1.294.
|
|
120
|
+
"@storm-software/config": "1.134.57",
|
|
121
|
+
"@storm-software/config-tools": "1.188.57",
|
|
122
|
+
"@storm-software/workspace-tools": "1.294.1",
|
|
123
123
|
"nx": "^22.1.3",
|
|
124
124
|
"tsup": "8.4.0",
|
|
125
125
|
"wrangler": ">=3.58.0"
|
|
@@ -151,5 +151,5 @@
|
|
|
151
151
|
"publishConfig": { "access": "public" },
|
|
152
152
|
"executors": "./executors.json",
|
|
153
153
|
"generators": "./generators.json",
|
|
154
|
-
"gitHead": "
|
|
154
|
+
"gitHead": "0be600443ae908d9754a322c3f9a83bc227933ed"
|
|
155
155
|
}
|