@storm-software/cloudflare-tools 0.71.88 → 0.71.89
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 +12 -0
- package/README.md +1 -1
- package/dist/{chunk-ZREREBVV.mjs → chunk-3G3KRE5C.mjs} +1 -1
- package/dist/{chunk-AHGSYRYA.mjs → chunk-3IB2OBMA.mjs} +6 -6
- package/dist/chunk-APKXAMXO.mjs +231 -0
- package/dist/chunk-C26E7UHD.js +231 -0
- package/dist/{chunk-T5TEGC6I.js → chunk-K4WFZ4BY.js} +6 -6
- package/dist/{chunk-7E3NJX54.js → chunk-SYYVQEM6.js} +2 -2
- 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 +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - Cloudflare Tools
|
|
4
4
|
|
|
5
|
+
## [0.71.88](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.88) (03/16/2026)
|
|
6
|
+
|
|
7
|
+
### Miscellaneous
|
|
8
|
+
|
|
9
|
+
- **monorepo:** Update workspace package source files ([1cd10beef](https://github.com/storm-software/storm-ops/commit/1cd10beef))
|
|
10
|
+
|
|
11
|
+
### Updated Dependencies
|
|
12
|
+
|
|
13
|
+
- Updated **workspace-tools** to **v1.295.14**
|
|
14
|
+
- Updated **config-tools** to **v1.189.38**
|
|
15
|
+
- Updated **config** to **v1.135.39**
|
|
16
|
+
|
|
5
17
|
## [0.71.87](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.87) (03/16/2026)
|
|
6
18
|
|
|
7
19
|
### Miscellaneous
|
package/README.md
CHANGED
|
@@ -27,7 +27,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
|
|
|
27
27
|
|
|
28
28
|
<h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
|
|
29
29
|
|
|
30
|
-
[](https://prettier.io/) [](http://nx.dev/) [](https://nextjs.org/) [](http://commitizen.github.io/cz-cli/)  [](https://fumadocs.vercel.app/) 
|
|
31
31
|
|
|
32
32
|
<!-- prettier-ignore-start -->
|
|
33
33
|
<!-- markdownlint-disable -->
|
|
@@ -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.88",
|
|
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.135.
|
|
140
|
-
"@storm-software/config-tools": "1.189.
|
|
141
|
-
"@storm-software/workspace-tools": "1.295.
|
|
139
|
+
"@storm-software/config": "1.135.39",
|
|
140
|
+
"@storm-software/config-tools": "1.189.38",
|
|
141
|
+
"@storm-software/workspace-tools": "1.295.14",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -164,8 +164,8 @@ var require_package = __commonJS({
|
|
|
164
164
|
}
|
|
165
165
|
},
|
|
166
166
|
dependencies: {
|
|
167
|
-
"@aws-sdk/client-s3": "^3.
|
|
168
|
-
"@aws-sdk/lib-storage": "^3.
|
|
167
|
+
"@aws-sdk/client-s3": "^3.1010.0",
|
|
168
|
+
"@aws-sdk/lib-storage": "^3.1010.0",
|
|
169
169
|
"@smithy/node-http-handler": "^4.5.0",
|
|
170
170
|
defu: "catalog:",
|
|
171
171
|
glob: "catalog:",
|
|
@@ -0,0 +1,231 @@
|
|
|
1
|
+
import {
|
|
2
|
+
getEncoding,
|
|
3
|
+
getInternalDependencies,
|
|
4
|
+
uploadFile
|
|
5
|
+
} from "./chunk-OPXJUL5V.mjs";
|
|
6
|
+
import {
|
|
7
|
+
createCliOptions,
|
|
8
|
+
getPackageInfo
|
|
9
|
+
} from "./chunk-3MAI3FU2.mjs";
|
|
10
|
+
import {
|
|
11
|
+
findWorkspaceRoot,
|
|
12
|
+
getConfig
|
|
13
|
+
} from "./chunk-P42MQNVF.mjs";
|
|
14
|
+
import {
|
|
15
|
+
correctPaths,
|
|
16
|
+
joinPaths,
|
|
17
|
+
writeDebug,
|
|
18
|
+
writeSuccess,
|
|
19
|
+
writeTrace,
|
|
20
|
+
writeWarning
|
|
21
|
+
} from "./chunk-52X4GPEN.mjs";
|
|
22
|
+
import {
|
|
23
|
+
createHttpHandler
|
|
24
|
+
} from "./chunk-SWYYMID7.mjs";
|
|
25
|
+
|
|
26
|
+
// src/executors/r2-upload-publish/executor.ts
|
|
27
|
+
import {
|
|
28
|
+
DeleteObjectsCommand,
|
|
29
|
+
ListObjectsCommand,
|
|
30
|
+
S3Client
|
|
31
|
+
} from "@aws-sdk/client-s3";
|
|
32
|
+
import {
|
|
33
|
+
createProjectGraphAsync,
|
|
34
|
+
readCachedProjectGraph
|
|
35
|
+
} from "@nx/devkit";
|
|
36
|
+
import { glob } from "glob";
|
|
37
|
+
import mime from "mime-types";
|
|
38
|
+
import { execSync } from "node:child_process";
|
|
39
|
+
import { statSync } from "node:fs";
|
|
40
|
+
import { readFile } from "node: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 || !context.projectsConfigurations?.projects || !context.projectsConfigurations.projects[context.projectName] || !context.projectsConfigurations.projects[context.projectName]?.root) {
|
|
53
|
+
throw new Error("The executor requires projectsConfigurations.");
|
|
54
|
+
}
|
|
55
|
+
try {
|
|
56
|
+
const workspaceRoot = findWorkspaceRoot();
|
|
57
|
+
const config = await getConfig(workspaceRoot);
|
|
58
|
+
const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
|
|
59
|
+
const projectDetails = getPackageInfo(
|
|
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 = createCliOptions({ ...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 (!options?.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 = options?.registry ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
|
|
83
|
+
let projectGraph;
|
|
84
|
+
try {
|
|
85
|
+
projectGraph = readCachedProjectGraph();
|
|
86
|
+
} catch {
|
|
87
|
+
await createProjectGraphAsync();
|
|
88
|
+
projectGraph = readCachedProjectGraph();
|
|
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
|
+
writeDebug(
|
|
96
|
+
`Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
|
|
97
|
+
);
|
|
98
|
+
const client = new 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: createHttpHandler()
|
|
108
|
+
});
|
|
109
|
+
const version = projectDetails?.content?.version;
|
|
110
|
+
if (version) {
|
|
111
|
+
writeDebug(`Starting upload version ${version}`);
|
|
112
|
+
}
|
|
113
|
+
const basePath = options.path;
|
|
114
|
+
const files = await glob(joinPaths(basePath, "**/*"), {
|
|
115
|
+
ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
|
|
116
|
+
});
|
|
117
|
+
const internalDependencies = await getInternalDependencies(
|
|
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
|
+
}, projectDetails?.content.dependencies ?? {});
|
|
129
|
+
const release = options.tag ?? execSync("npm config get tag").toString().trim();
|
|
130
|
+
if (options.clean === true) {
|
|
131
|
+
writeDebug(`Clearing out existing items in ${bucketPath}`);
|
|
132
|
+
if (!isDryRun) {
|
|
133
|
+
const response = await client.send(
|
|
134
|
+
new ListObjectsCommand({
|
|
135
|
+
Bucket: bucketId,
|
|
136
|
+
Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
|
|
137
|
+
})
|
|
138
|
+
);
|
|
139
|
+
if (response?.Contents && response.Contents.length > 0) {
|
|
140
|
+
writeTrace(
|
|
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 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
|
+
writeDebug(
|
|
156
|
+
`No existing items to delete in the R2 bucket path ${bucketPath}`
|
|
157
|
+
);
|
|
158
|
+
}
|
|
159
|
+
} else {
|
|
160
|
+
writeWarning("[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: projectDetails?.content?.description,
|
|
169
|
+
tags: projectDetails?.content?.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 (projectDetails?.type === "package.json") {
|
|
179
|
+
meta.devDependencies = projectDetails?.content?.devDependencies;
|
|
180
|
+
}
|
|
181
|
+
await uploadFile(
|
|
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 (statSync(file, {
|
|
195
|
+
throwIfNoEntry: false
|
|
196
|
+
})?.isFile()) {
|
|
197
|
+
const name = correctPaths(file).replace(correctPaths(basePath), "");
|
|
198
|
+
const type = mime.lookup(name) || "application/octet-stream";
|
|
199
|
+
await uploadFile(
|
|
200
|
+
client,
|
|
201
|
+
bucketId,
|
|
202
|
+
bucketPath,
|
|
203
|
+
name,
|
|
204
|
+
version,
|
|
205
|
+
await readFile(file, getEncoding(type)),
|
|
206
|
+
type,
|
|
207
|
+
isDryRun
|
|
208
|
+
);
|
|
209
|
+
}
|
|
210
|
+
})
|
|
211
|
+
);
|
|
212
|
+
writeSuccess(
|
|
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
|
+
export {
|
|
230
|
+
runExecutor
|
|
231
|
+
};
|
|
@@ -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
|
+
|
|
5
|
+
var _chunk6JVDTXHTjs = require('./chunk-6JVDTXHT.js');
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
var _chunkN7FW365Qjs = require('./chunk-N7FW365Q.js');
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
var _chunkQWSTQIUAjs = require('./chunk-QWSTQIUA.js');
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
var _chunk2KWRE5Y5js = require('./chunk-2KWRE5Y5.js');
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.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;
|
|
@@ -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.88",
|
|
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.135.
|
|
140
|
-
"@storm-software/config-tools": "1.189.
|
|
141
|
-
"@storm-software/workspace-tools": "1.295.
|
|
139
|
+
"@storm-software/config": "1.135.39",
|
|
140
|
+
"@storm-software/config-tools": "1.189.38",
|
|
141
|
+
"@storm-software/workspace-tools": "1.295.14",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -164,8 +164,8 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
|
|
|
164
164
|
}
|
|
165
165
|
},
|
|
166
166
|
dependencies: {
|
|
167
|
-
"@aws-sdk/client-s3": "^3.
|
|
168
|
-
"@aws-sdk/lib-storage": "^3.
|
|
167
|
+
"@aws-sdk/client-s3": "^3.1010.0",
|
|
168
|
+
"@aws-sdk/lib-storage": "^3.1010.0",
|
|
169
169
|
"@smithy/node-http-handler": "^4.5.0",
|
|
170
170
|
defu: "catalog:",
|
|
171
171
|
glob: "catalog:",
|
|
@@ -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 _chunkK4WFZ4BYjs = require('./chunk-K4WFZ4BY.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
@@ -70,7 +70,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
|
|
|
70
70
|
const options = await normalizeOptions(tree, schema, config);
|
|
71
71
|
const tasks = [];
|
|
72
72
|
tasks.push(
|
|
73
|
-
await
|
|
73
|
+
await _chunkK4WFZ4BYjs.generator_default.call(void 0, tree, {
|
|
74
74
|
...options,
|
|
75
75
|
skipFormat: true
|
|
76
76
|
})
|
package/dist/generators.js
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkSYYVQEM6js = require('./chunk-SYYVQEM6.js');
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
var
|
|
9
|
+
var _chunkK4WFZ4BYjs = require('./chunk-K4WFZ4BY.js');
|
|
10
10
|
require('./chunk-QWSTQIUA.js');
|
|
11
11
|
require('./chunk-2KWRE5Y5.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 = _chunkSYYVQEM6js.applicationGenerator; exports.applicationSchematic = _chunkSYYVQEM6js.applicationSchematic; exports.initGenerator = _chunkK4WFZ4BYjs.initGenerator; exports.initSchematic = _chunkK4WFZ4BYjs.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-3G3KRE5C.mjs";
|
|
6
6
|
import {
|
|
7
7
|
initGenerator,
|
|
8
8
|
initSchematic
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-3IB2OBMA.mjs";
|
|
10
10
|
import "./chunk-P42MQNVF.mjs";
|
|
11
11
|
import "./chunk-52X4GPEN.mjs";
|
|
12
12
|
import "./chunk-FVRCPE3R.mjs";
|
package/dist/index.js
CHANGED
|
@@ -4,11 +4,11 @@ require('./chunk-DHBG5ASJ.js');
|
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkSYYVQEM6js = require('./chunk-SYYVQEM6.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _chunkK4WFZ4BYjs = require('./chunk-K4WFZ4BY.js');
|
|
12
12
|
require('./chunk-KUGEZPUO.js');
|
|
13
13
|
require('./chunk-CVGPWUNP.js');
|
|
14
14
|
|
|
@@ -160,4 +160,4 @@ function createPackageJson(projectJsonPath, workspaceRoot) {
|
|
|
160
160
|
|
|
161
161
|
|
|
162
162
|
|
|
163
|
-
exports.applicationGenerator =
|
|
163
|
+
exports.applicationGenerator = _chunkSYYVQEM6js.applicationGenerator; exports.applicationSchematic = _chunkSYYVQEM6js.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getEncoding = _chunk6JVDTXHTjs.getEncoding; exports.getInternalDependencies = _chunk6JVDTXHTjs.getInternalDependencies; exports.initGenerator = _chunkK4WFZ4BYjs.initGenerator; exports.initSchematic = _chunkK4WFZ4BYjs.initSchematic; exports.isTextFile = _chunk6JVDTXHTjs.isTextFile; exports.name = name; exports.uploadFile = _chunk6JVDTXHTjs.uploadFile;
|
package/dist/index.mjs
CHANGED
|
@@ -4,11 +4,11 @@ import "./chunk-3J7KBHMJ.mjs";
|
|
|
4
4
|
import {
|
|
5
5
|
applicationGenerator,
|
|
6
6
|
applicationSchematic
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-3G3KRE5C.mjs";
|
|
8
8
|
import {
|
|
9
9
|
initGenerator,
|
|
10
10
|
initSchematic
|
|
11
|
-
} from "./chunk-
|
|
11
|
+
} from "./chunk-3IB2OBMA.mjs";
|
|
12
12
|
import "./chunk-SWYYMID7.mjs";
|
|
13
13
|
import "./chunk-7Z5PILRU.mjs";
|
|
14
14
|
import {
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkK4WFZ4BYjs = require('../../../chunk-K4WFZ4BY.js');
|
|
6
6
|
require('../../../chunk-MCKGQKYU.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
exports.default =
|
|
11
|
+
exports.default = _chunkK4WFZ4BYjs.generator_default; exports.initGenerator = _chunkK4WFZ4BYjs.initGenerator; exports.initSchematic = _chunkK4WFZ4BYjs.initSchematic;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
require('../../../chunk-
|
|
5
|
+
var _chunkSYYVQEM6js = require('../../../chunk-SYYVQEM6.js');
|
|
6
|
+
require('../../../chunk-K4WFZ4BY.js');
|
|
7
7
|
require('../../../chunk-QWSTQIUA.js');
|
|
8
8
|
require('../../../chunk-2KWRE5Y5.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 = _chunkSYYVQEM6js.applicationGenerator; exports.applicationSchematic = _chunkSYYVQEM6js.applicationSchematic; exports.default = _chunkSYYVQEM6js.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-3G3KRE5C.mjs";
|
|
6
|
+
import "../../../chunk-3IB2OBMA.mjs";
|
|
7
7
|
import "../../../chunk-P42MQNVF.mjs";
|
|
8
8
|
import "../../../chunk-52X4GPEN.mjs";
|
|
9
9
|
import "../../../chunk-FVRCPE3R.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.89",
|
|
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.5.1",
|
|
118
118
|
"@nx/node": "22.5.1",
|
|
119
119
|
"@nx/web": "22.5.1",
|
|
120
|
-
"@storm-software/config": "1.135.
|
|
121
|
-
"@storm-software/config-tools": "1.189.
|
|
122
|
-
"@storm-software/workspace-tools": "1.295.
|
|
120
|
+
"@storm-software/config": "1.135.39",
|
|
121
|
+
"@storm-software/config-tools": "1.189.38",
|
|
122
|
+
"@storm-software/workspace-tools": "1.295.14",
|
|
123
123
|
"nx": "22.5.1",
|
|
124
124
|
"tsup": "8.4.0",
|
|
125
125
|
"wrangler": ">=3.58.0"
|
|
@@ -133,8 +133,8 @@
|
|
|
133
133
|
"wrangler": { "optional": false }
|
|
134
134
|
},
|
|
135
135
|
"dependencies": {
|
|
136
|
-
"@aws-sdk/client-s3": "^3.
|
|
137
|
-
"@aws-sdk/lib-storage": "^3.
|
|
136
|
+
"@aws-sdk/client-s3": "^3.1010.0",
|
|
137
|
+
"@aws-sdk/lib-storage": "^3.1010.0",
|
|
138
138
|
"@smithy/node-http-handler": "^4.5.0",
|
|
139
139
|
"defu": "6.1.4",
|
|
140
140
|
"glob": "^11.1.0",
|
|
@@ -155,5 +155,5 @@
|
|
|
155
155
|
"publishConfig": { "access": "public" },
|
|
156
156
|
"executors": "./executors.json",
|
|
157
157
|
"generators": "./generators.json",
|
|
158
|
-
"gitHead": "
|
|
158
|
+
"gitHead": "a32fa17f70cc52033f165af35cf8e47ae7d021d0"
|
|
159
159
|
}
|