@storm-software/cloudflare-tools 0.71.25 → 0.71.27
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 +29 -5
- package/README.md +6 -6
- package/dist/{chunk-CNDGMWIX.js → chunk-4XAWPPHB.js} +4 -4
- package/dist/{chunk-5Q7AA7NZ.mjs → chunk-GHW7QHTG.mjs} +4 -4
- package/dist/{chunk-KDYREYFA.mjs → chunk-IJQISPL2.mjs} +17 -25
- package/dist/{chunk-AAK4343T.js → chunk-KUEPJHIH.js} +2 -2
- package/dist/{chunk-RLL4TKJF.js → chunk-KUGEZPUO.js} +4 -4
- package/dist/{chunk-EUGCYITK.mjs → chunk-SJM2TC2Y.mjs} +1 -1
- package/dist/{chunk-SNF7EFGO.mjs → chunk-SWYYMID7.mjs} +4 -4
- package/dist/{chunk-DU7SPVRQ.mjs → chunk-UI2F3MMU.mjs} +7 -4
- package/dist/{chunk-4YO62FZR.js → chunk-VQ2UEANJ.js} +20 -28
- package/dist/{chunk-RJXIDZI4.js → chunk-ZWHJ35F5.js} +7 -4
- package/dist/executors.js +3 -3
- package/dist/executors.mjs +3 -3
- package/dist/generators.js +3 -3
- package/dist/generators.mjs +2 -2
- package/dist/index.js +6 -6
- package/dist/index.mjs +5 -5
- package/dist/src/executors/r2-upload-publish/executor.js +4 -4
- package/dist/src/executors/r2-upload-publish/executor.mjs +3 -3
- 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/dist/src/utils/http-handler.js +2 -2
- package/dist/src/utils/http-handler.mjs +1 -1
- package/dist/src/utils/index.js +2 -2
- package/dist/src/utils/index.mjs +1 -1
- package/dist/src/utils/r2-bucket-helpers.d.mts +2 -2
- package/dist/src/utils/r2-bucket-helpers.d.ts +2 -2
- package/dist/src/utils/r2-bucket-helpers.js +2 -2
- package/dist/src/utils/r2-bucket-helpers.mjs +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,7 +1,35 @@
|
|
|
1
|
-

|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - Cloudflare Tools
|
|
4
4
|
|
|
5
|
+
## [0.71.26](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.26) (12/17/2025)
|
|
6
|
+
|
|
7
|
+
### Miscellaneous
|
|
8
|
+
|
|
9
|
+
- **monorepo:** Update asset paths in workspace references
|
|
10
|
+
([b6e71c5d4](https://github.com/storm-software/storm-ops/commit/b6e71c5d4))
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
- **cloudflare-tools:** Extended request timeout on upload requests
|
|
15
|
+
([c66367a9c](https://github.com/storm-software/storm-ops/commit/c66367a9c))
|
|
16
|
+
|
|
17
|
+
### Updated Dependencies
|
|
18
|
+
|
|
19
|
+
- Updated **workspace-tools** to **v1.294.16**
|
|
20
|
+
- Updated **config-tools** to **v1.188.70**
|
|
21
|
+
- Updated **config** to **v1.134.70**
|
|
22
|
+
|
|
23
|
+
## [0.71.25](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.25) (12/17/2025)
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
- **cloudflare-tools:** Resolve build issue
|
|
28
|
+
([b17dc1586](https://github.com/storm-software/storm-ops/commit/b17dc1586))
|
|
29
|
+
- **cloudflare-tools:** Resolve upload issue by splitting requests by uploaded
|
|
30
|
+
file
|
|
31
|
+
([70019abd7](https://github.com/storm-software/storm-ops/commit/70019abd7))
|
|
32
|
+
|
|
5
33
|
## [0.71.24](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.24) (12/17/2025)
|
|
6
34
|
|
|
7
35
|
### Miscellaneous
|
|
@@ -300,10 +328,6 @@
|
|
|
300
328
|
- Updated **config-tools** to **v1.188.52**
|
|
301
329
|
- Updated **config** to **v1.134.52**
|
|
302
330
|
|
|
303
|
-

|
|
304
|
-
|
|
305
|
-
# Changelog for Storm Ops - Cloudflare Tools
|
|
306
|
-
|
|
307
331
|
## [0.71.0](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.0) (12/04/2025)
|
|
308
332
|
|
|
309
333
|
### Miscellaneous
|
package/README.md
CHANGED
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
|
|
6
6
|
<div align="center">
|
|
7
7
|
<picture>
|
|
8
|
-
<source media="(prefers-color-scheme: dark)" srcset="https://public.storm-cdn.com/storm-software/banner-1280x640-dark
|
|
9
|
-
<source media="(prefers-color-scheme: light)" srcset="https://public.storm-cdn.com/storm-software/banner-1280x640-light
|
|
10
|
-
<img src="https://public.storm-cdn.com/storm-software/banner-1280x640-dark
|
|
8
|
+
<source media="(prefers-color-scheme: dark)" srcset="https://public.storm-cdn.com/storm-software/optimized/banner-1280x640-dark.gif">
|
|
9
|
+
<source media="(prefers-color-scheme: light)" srcset="https://public.storm-cdn.com/storm-software/optimized/banner-1280x640-light.gif">
|
|
10
|
+
<img src="https://public.storm-cdn.com/storm-software/optimized/banner-1280x640-dark.gif" width="100%" alt="Storm Software" />
|
|
11
11
|
</picture>
|
|
12
12
|
</div>
|
|
13
13
|
<br />
|
|
@@ -338,9 +338,9 @@ specification. Contributions of any kind welcome!
|
|
|
338
338
|
|
|
339
339
|
<div align="center">
|
|
340
340
|
<picture>
|
|
341
|
-
<source media="(prefers-color-scheme: dark)" srcset="https://public.storm-cdn.com/storm-software/banner-1280x320-dark
|
|
342
|
-
<source media="(prefers-color-scheme: light)" srcset="https://public.storm-cdn.com/storm-software/banner-1280x320-light
|
|
343
|
-
<img src="https://public.storm-cdn.com/storm-software/banner-1280x320-dark
|
|
341
|
+
<source media="(prefers-color-scheme: dark)" srcset="https://public.storm-cdn.com/storm-software/optimized/banner-1280x320-dark.webp">
|
|
342
|
+
<source media="(prefers-color-scheme: light)" srcset="https://public.storm-cdn.com/storm-software/optimized/banner-1280x320-light.webp">
|
|
343
|
+
<img src="https://public.storm-cdn.com/storm-software/optimized/banner-1280x320-dark.webp" width="100%" alt="Storm Software" />
|
|
344
344
|
</picture>
|
|
345
345
|
</div>
|
|
346
346
|
<br />
|
|
@@ -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.26",
|
|
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.70",
|
|
140
|
+
"@storm-software/config-tools": "1.188.70",
|
|
141
|
+
"@storm-software/workspace-tools": "1.294.16",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -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.26",
|
|
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.70",
|
|
140
|
+
"@storm-software/config-tools": "1.188.70",
|
|
141
|
+
"@storm-software/workspace-tools": "1.294.16",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
createHttpHandler
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-SWYYMID7.mjs";
|
|
4
4
|
import {
|
|
5
5
|
getInternalDependencies,
|
|
6
6
|
uploadFile
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-UI2F3MMU.mjs";
|
|
8
8
|
import {
|
|
9
9
|
createCliOptions,
|
|
10
10
|
getPackageInfo
|
|
@@ -23,11 +23,7 @@ import {
|
|
|
23
23
|
} from "./chunk-TPNHSNNZ.mjs";
|
|
24
24
|
|
|
25
25
|
// src/executors/r2-upload-publish/executor.ts
|
|
26
|
-
import {
|
|
27
|
-
DeleteObjectsCommand,
|
|
28
|
-
ListObjectsCommand,
|
|
29
|
-
S3Client
|
|
30
|
-
} from "@aws-sdk/client-s3";
|
|
26
|
+
import { S3 } from "@aws-sdk/client-s3";
|
|
31
27
|
import {
|
|
32
28
|
createProjectGraphAsync,
|
|
33
29
|
readCachedProjectGraph
|
|
@@ -94,7 +90,7 @@ async function runExecutor(options, context) {
|
|
|
94
90
|
writeDebug(
|
|
95
91
|
`Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
|
|
96
92
|
);
|
|
97
|
-
const client = new
|
|
93
|
+
const client = new S3({
|
|
98
94
|
region: "auto",
|
|
99
95
|
endpoint: registry,
|
|
100
96
|
credentials: {
|
|
@@ -129,27 +125,23 @@ async function runExecutor(options, context) {
|
|
|
129
125
|
if (options.clean === true) {
|
|
130
126
|
writeDebug(`Clearing out existing items in ${bucketPath}`);
|
|
131
127
|
if (!isDryRun) {
|
|
132
|
-
const response = await client.
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
})
|
|
137
|
-
);
|
|
128
|
+
const response = await client.listObjects({
|
|
129
|
+
Bucket: bucketId,
|
|
130
|
+
Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
|
|
131
|
+
});
|
|
138
132
|
if (response?.Contents && response.Contents.length > 0) {
|
|
139
133
|
writeTrace(
|
|
140
134
|
`Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
|
|
141
135
|
);
|
|
142
|
-
await client.
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
})
|
|
152
|
-
);
|
|
136
|
+
await client.deleteObjects({
|
|
137
|
+
Bucket: bucketId,
|
|
138
|
+
Delete: {
|
|
139
|
+
Objects: response.Contents.map((item) => ({
|
|
140
|
+
Key: item.Key
|
|
141
|
+
})),
|
|
142
|
+
Quiet: false
|
|
143
|
+
}
|
|
144
|
+
});
|
|
153
145
|
} else {
|
|
154
146
|
writeDebug(
|
|
155
147
|
`No existing items to delete in the R2 bucket path ${bucketPath}`
|
|
@@ -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 _chunk4XAWPPHBjs = require('./chunk-4XAWPPHB.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
@@ -66,7 +66,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
|
|
|
66
66
|
const options = await normalizeOptions(tree, schema, config);
|
|
67
67
|
const tasks = [];
|
|
68
68
|
tasks.push(
|
|
69
|
-
await
|
|
69
|
+
await _chunk4XAWPPHBjs.generator_default.call(void 0, tree, {
|
|
70
70
|
...options,
|
|
71
71
|
skipFormat: true
|
|
72
72
|
})
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
var _nodehttphandler = require('@smithy/node-http-handler');
|
|
3
3
|
function createHttpHandler() {
|
|
4
4
|
return _nodehttphandler.NodeHttpHandler.create({
|
|
5
|
-
connectionTimeout:
|
|
6
|
-
//
|
|
7
|
-
requestTimeout:
|
|
8
|
-
//
|
|
5
|
+
connectionTimeout: 15 * 60 * 1e3,
|
|
6
|
+
// 15 minutes
|
|
7
|
+
requestTimeout: 15 * 60 * 1e3
|
|
8
|
+
// 15 minutes
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
import { NodeHttpHandler } from "@smithy/node-http-handler";
|
|
3
3
|
function createHttpHandler() {
|
|
4
4
|
return NodeHttpHandler.create({
|
|
5
|
-
connectionTimeout:
|
|
6
|
-
//
|
|
7
|
-
requestTimeout:
|
|
8
|
-
//
|
|
5
|
+
connectionTimeout: 15 * 60 * 1e3,
|
|
6
|
+
// 15 minutes
|
|
7
|
+
requestTimeout: 15 * 60 * 1e3
|
|
8
|
+
// 15 minutes
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
|
|
@@ -5,7 +5,6 @@ import {
|
|
|
5
5
|
} from "./chunk-TPNHSNNZ.mjs";
|
|
6
6
|
|
|
7
7
|
// src/utils/r2-bucket-helpers.ts
|
|
8
|
-
import { PutObjectCommand } from "@aws-sdk/client-s3";
|
|
9
8
|
import { createHash } from "node:crypto";
|
|
10
9
|
async function uploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
|
|
11
10
|
const key = (!bucketPath?.trim() || bucketPath?.trim() === "/" ? fileName : joinPaths(bucketPath.trim(), fileName))?.replace(/^\/+/g, "") || "";
|
|
@@ -13,8 +12,8 @@ async function uploadFile(client, bucketName, bucketPath, fileName, version, fil
|
|
|
13
12
|
`Uploading ${key} (content-type: ${contentType}) to the ${bucketName} R2 bucket`
|
|
14
13
|
);
|
|
15
14
|
if (!isDryRun) {
|
|
16
|
-
await client.
|
|
17
|
-
|
|
15
|
+
await client.putObject(
|
|
16
|
+
{
|
|
18
17
|
Bucket: bucketName,
|
|
19
18
|
Key: key,
|
|
20
19
|
Body: fileContent,
|
|
@@ -23,7 +22,11 @@ async function uploadFile(client, bucketName, bucketPath, fileName, version, fil
|
|
|
23
22
|
version,
|
|
24
23
|
checksum: createHash("sha256").update(fileContent).digest("base64")
|
|
25
24
|
}
|
|
26
|
-
}
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
requestTimeout: 15 * 60 * 1e3
|
|
28
|
+
// 15 minutes
|
|
29
|
+
}
|
|
27
30
|
);
|
|
28
31
|
} else {
|
|
29
32
|
writeWarning("[Dry run]: Skipping upload to the R2 bucket.");
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkZWHJ35F5js = require('./chunk-ZWHJ35F5.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
@@ -23,10 +23,6 @@ var _chunk5GILNZWSjs = require('./chunk-5GILNZWS.js');
|
|
|
23
23
|
var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
|
|
24
24
|
|
|
25
25
|
// src/executors/r2-upload-publish/executor.ts
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
26
|
var _clients3 = require('@aws-sdk/client-s3');
|
|
31
27
|
|
|
32
28
|
|
|
@@ -94,7 +90,7 @@ async function runExecutor(options, context) {
|
|
|
94
90
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0,
|
|
95
91
|
`Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
|
|
96
92
|
);
|
|
97
|
-
const client = new (0, _clients3.
|
|
93
|
+
const client = new (0, _clients3.S3)({
|
|
98
94
|
region: "auto",
|
|
99
95
|
endpoint: registry,
|
|
100
96
|
credentials: {
|
|
@@ -103,7 +99,7 @@ async function runExecutor(options, context) {
|
|
|
103
99
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
104
100
|
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
|
|
105
101
|
},
|
|
106
|
-
requestHandler:
|
|
102
|
+
requestHandler: _chunkKUGEZPUOjs.createHttpHandler.call(void 0, )
|
|
107
103
|
});
|
|
108
104
|
const version = _optionalChain([projectDetails, 'optionalAccess', _13 => _13.content, 'optionalAccess', _14 => _14.version]);
|
|
109
105
|
if (version) {
|
|
@@ -113,7 +109,7 @@ async function runExecutor(options, context) {
|
|
|
113
109
|
const files = await _glob.glob.call(void 0, _chunkZ2WQB55Rjs.joinPaths.call(void 0, basePath, "**/*"), {
|
|
114
110
|
ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
|
|
115
111
|
});
|
|
116
|
-
const internalDependencies = await
|
|
112
|
+
const internalDependencies = await _chunkZWHJ35F5js.getInternalDependencies.call(void 0,
|
|
117
113
|
context.projectName,
|
|
118
114
|
projectGraph
|
|
119
115
|
);
|
|
@@ -129,27 +125,23 @@ async function runExecutor(options, context) {
|
|
|
129
125
|
if (options.clean === true) {
|
|
130
126
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0, `Clearing out existing items in ${bucketPath}`);
|
|
131
127
|
if (!isDryRun) {
|
|
132
|
-
const response = await client.
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
})
|
|
137
|
-
);
|
|
128
|
+
const response = await client.listObjects({
|
|
129
|
+
Bucket: bucketId,
|
|
130
|
+
Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
|
|
131
|
+
});
|
|
138
132
|
if (_optionalChain([response, 'optionalAccess', _17 => _17.Contents]) && response.Contents.length > 0) {
|
|
139
133
|
_chunkZ2WQB55Rjs.writeTrace.call(void 0,
|
|
140
134
|
`Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
|
|
141
135
|
);
|
|
142
|
-
await client.
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
})
|
|
152
|
-
);
|
|
136
|
+
await client.deleteObjects({
|
|
137
|
+
Bucket: bucketId,
|
|
138
|
+
Delete: {
|
|
139
|
+
Objects: response.Contents.map((item) => ({
|
|
140
|
+
Key: item.Key
|
|
141
|
+
})),
|
|
142
|
+
Quiet: false
|
|
143
|
+
}
|
|
144
|
+
});
|
|
153
145
|
} else {
|
|
154
146
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0,
|
|
155
147
|
`No existing items to delete in the R2 bucket path ${bucketPath}`
|
|
@@ -177,7 +169,7 @@ async function runExecutor(options, context) {
|
|
|
177
169
|
if (_optionalChain([projectDetails, 'optionalAccess', _22 => _22.type]) === "package.json") {
|
|
178
170
|
meta.devDependencies = _optionalChain([projectDetails, 'optionalAccess', _23 => _23.content, 'optionalAccess', _24 => _24.devDependencies]);
|
|
179
171
|
}
|
|
180
|
-
await
|
|
172
|
+
await _chunkZWHJ35F5js.uploadFile.call(void 0,
|
|
181
173
|
client,
|
|
182
174
|
bucketId,
|
|
183
175
|
bucketPath,
|
|
@@ -195,7 +187,7 @@ async function runExecutor(options, context) {
|
|
|
195
187
|
}), 'optionalAccess', _25 => _25.isFile, 'call', _26 => _26()])) {
|
|
196
188
|
const name = _chunkZ2WQB55Rjs.correctPaths.call(void 0, file).replace(_chunkZ2WQB55Rjs.correctPaths.call(void 0, basePath), "");
|
|
197
189
|
const type = _mimetypes2.default.lookup(name) || "application/octet-stream";
|
|
198
|
-
await
|
|
190
|
+
await _chunkZWHJ35F5js.uploadFile.call(void 0,
|
|
199
191
|
client,
|
|
200
192
|
bucketId,
|
|
201
193
|
bucketPath,
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
|
|
6
6
|
|
|
7
7
|
// src/utils/r2-bucket-helpers.ts
|
|
8
|
-
var _clients3 = require('@aws-sdk/client-s3');
|
|
9
8
|
var _crypto = require('crypto');
|
|
10
9
|
async function uploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
|
|
11
10
|
const key = _optionalChain([(!_optionalChain([bucketPath, 'optionalAccess', _ => _.trim, 'call', _2 => _2()]) || _optionalChain([bucketPath, 'optionalAccess', _3 => _3.trim, 'call', _4 => _4()]) === "/" ? fileName : _chunkZ2WQB55Rjs.joinPaths.call(void 0, bucketPath.trim(), fileName)), 'optionalAccess', _5 => _5.replace, 'call', _6 => _6(/^\/+/g, "")]) || "";
|
|
@@ -13,8 +12,8 @@ async function uploadFile(client, bucketName, bucketPath, fileName, version, fil
|
|
|
13
12
|
`Uploading ${key} (content-type: ${contentType}) to the ${bucketName} R2 bucket`
|
|
14
13
|
);
|
|
15
14
|
if (!isDryRun) {
|
|
16
|
-
await client.
|
|
17
|
-
|
|
15
|
+
await client.putObject(
|
|
16
|
+
{
|
|
18
17
|
Bucket: bucketName,
|
|
19
18
|
Key: key,
|
|
20
19
|
Body: fileContent,
|
|
@@ -23,7 +22,11 @@ async function uploadFile(client, bucketName, bucketPath, fileName, version, fil
|
|
|
23
22
|
version,
|
|
24
23
|
checksum: _crypto.createHash.call(void 0, "sha256").update(fileContent).digest("base64")
|
|
25
24
|
}
|
|
26
|
-
}
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
requestTimeout: 15 * 60 * 1e3
|
|
28
|
+
// 15 minutes
|
|
29
|
+
}
|
|
27
30
|
);
|
|
28
31
|
} else {
|
|
29
32
|
_chunkZ2WQB55Rjs.writeWarning.call(void 0, "[Dry run]: Skipping upload to the R2 bucket.");
|
package/dist/executors.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";require('./chunk-XO66D74Z.js');
|
|
2
|
-
require('./chunk-
|
|
3
|
-
require('./chunk-
|
|
4
|
-
require('./chunk-
|
|
2
|
+
require('./chunk-VQ2UEANJ.js');
|
|
3
|
+
require('./chunk-KUGEZPUO.js');
|
|
4
|
+
require('./chunk-ZWHJ35F5.js');
|
|
5
5
|
require('./chunk-QBD2OGUY.js');
|
|
6
6
|
require('./chunk-IVVRVG36.js');
|
|
7
7
|
require('./chunk-N7FW365Q.js');
|
package/dist/executors.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import "./chunk-YSCEY447.mjs";
|
|
2
|
-
import "./chunk-
|
|
3
|
-
import "./chunk-
|
|
4
|
-
import "./chunk-
|
|
2
|
+
import "./chunk-IJQISPL2.mjs";
|
|
3
|
+
import "./chunk-SWYYMID7.mjs";
|
|
4
|
+
import "./chunk-UI2F3MMU.mjs";
|
|
5
5
|
import "./chunk-WFPKBGV3.mjs";
|
|
6
6
|
import "./chunk-NIOOY3TB.mjs";
|
|
7
7
|
import "./chunk-3MAI3FU2.mjs";
|
package/dist/generators.js
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkKUEPJHIHjs = require('./chunk-KUEPJHIH.js');
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
var
|
|
9
|
+
var _chunk4XAWPPHBjs = require('./chunk-4XAWPPHB.js');
|
|
10
10
|
require('./chunk-5GILNZWS.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 = _chunkKUEPJHIHjs.applicationGenerator; exports.applicationSchematic = _chunkKUEPJHIHjs.applicationSchematic; exports.initGenerator = _chunk4XAWPPHBjs.initGenerator; exports.initSchematic = _chunk4XAWPPHBjs.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-SJM2TC2Y.mjs";
|
|
6
6
|
import {
|
|
7
7
|
initGenerator,
|
|
8
8
|
initSchematic
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-GHW7QHTG.mjs";
|
|
10
10
|
import "./chunk-G4ZCI2MN.mjs";
|
|
11
11
|
import "./chunk-TPNHSNNZ.mjs";
|
|
12
12
|
import "./chunk-PALWHFOL.mjs";
|
package/dist/index.js
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }require('./chunk-XO66D74Z.js');
|
|
2
|
-
require('./chunk-
|
|
2
|
+
require('./chunk-VQ2UEANJ.js');
|
|
3
3
|
require('./chunk-DHBG5ASJ.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkKUEPJHIHjs = require('./chunk-KUEPJHIH.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
12
|
-
require('./chunk-
|
|
11
|
+
var _chunk4XAWPPHBjs = require('./chunk-4XAWPPHB.js');
|
|
12
|
+
require('./chunk-KUGEZPUO.js');
|
|
13
13
|
require('./chunk-CVGPWUNP.js');
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
|
|
17
|
-
var
|
|
17
|
+
var _chunkZWHJ35F5js = require('./chunk-ZWHJ35F5.js');
|
|
18
18
|
require('./chunk-QBD2OGUY.js');
|
|
19
19
|
require('./chunk-IVVRVG36.js');
|
|
20
20
|
|
|
@@ -156,4 +156,4 @@ function createPackageJson(projectJsonPath, workspaceRoot) {
|
|
|
156
156
|
|
|
157
157
|
|
|
158
158
|
|
|
159
|
-
exports.applicationGenerator =
|
|
159
|
+
exports.applicationGenerator = _chunkKUEPJHIHjs.applicationGenerator; exports.applicationSchematic = _chunkKUEPJHIHjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getInternalDependencies = _chunkZWHJ35F5js.getInternalDependencies; exports.initGenerator = _chunk4XAWPPHBjs.initGenerator; exports.initSchematic = _chunk4XAWPPHBjs.initSchematic; exports.name = name; exports.uploadFile = _chunkZWHJ35F5js.uploadFile;
|
package/dist/index.mjs
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import "./chunk-YSCEY447.mjs";
|
|
2
|
-
import "./chunk-
|
|
2
|
+
import "./chunk-IJQISPL2.mjs";
|
|
3
3
|
import "./chunk-3J7KBHMJ.mjs";
|
|
4
4
|
import {
|
|
5
5
|
applicationGenerator,
|
|
6
6
|
applicationSchematic
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-SJM2TC2Y.mjs";
|
|
8
8
|
import {
|
|
9
9
|
initGenerator,
|
|
10
10
|
initSchematic
|
|
11
|
-
} from "./chunk-
|
|
12
|
-
import "./chunk-
|
|
11
|
+
} from "./chunk-GHW7QHTG.mjs";
|
|
12
|
+
import "./chunk-SWYYMID7.mjs";
|
|
13
13
|
import "./chunk-7Z5PILRU.mjs";
|
|
14
14
|
import {
|
|
15
15
|
getInternalDependencies,
|
|
16
16
|
uploadFile
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-UI2F3MMU.mjs";
|
|
18
18
|
import "./chunk-WFPKBGV3.mjs";
|
|
19
19
|
import "./chunk-NIOOY3TB.mjs";
|
|
20
20
|
import {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
2
|
|
|
3
|
-
var
|
|
4
|
-
require('../../../chunk-
|
|
5
|
-
require('../../../chunk-
|
|
3
|
+
var _chunkVQ2UEANJjs = require('../../../chunk-VQ2UEANJ.js');
|
|
4
|
+
require('../../../chunk-KUGEZPUO.js');
|
|
5
|
+
require('../../../chunk-ZWHJ35F5.js');
|
|
6
6
|
require('../../../chunk-N7FW365Q.js');
|
|
7
7
|
require('../../../chunk-5GILNZWS.js');
|
|
8
8
|
require('../../../chunk-Z2WQB55R.js');
|
|
9
9
|
require('../../../chunk-MCKGQKYU.js');
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
exports.default =
|
|
12
|
+
exports.default = _chunkVQ2UEANJjs.runExecutor;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import {
|
|
2
2
|
runExecutor
|
|
3
|
-
} from "../../../chunk-
|
|
4
|
-
import "../../../chunk-
|
|
5
|
-
import "../../../chunk-
|
|
3
|
+
} from "../../../chunk-IJQISPL2.mjs";
|
|
4
|
+
import "../../../chunk-SWYYMID7.mjs";
|
|
5
|
+
import "../../../chunk-UI2F3MMU.mjs";
|
|
6
6
|
import "../../../chunk-3MAI3FU2.mjs";
|
|
7
7
|
import "../../../chunk-G4ZCI2MN.mjs";
|
|
8
8
|
import "../../../chunk-TPNHSNNZ.mjs";
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunk4XAWPPHBjs = require('../../../chunk-4XAWPPHB.js');
|
|
6
6
|
require('../../../chunk-MCKGQKYU.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
exports.default =
|
|
11
|
+
exports.default = _chunk4XAWPPHBjs.generator_default; exports.initGenerator = _chunk4XAWPPHBjs.initGenerator; exports.initSchematic = _chunk4XAWPPHBjs.initSchematic;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
require('../../../chunk-
|
|
5
|
+
var _chunkKUEPJHIHjs = require('../../../chunk-KUEPJHIH.js');
|
|
6
|
+
require('../../../chunk-4XAWPPHB.js');
|
|
7
7
|
require('../../../chunk-5GILNZWS.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 = _chunkKUEPJHIHjs.applicationGenerator; exports.applicationSchematic = _chunkKUEPJHIHjs.applicationSchematic; exports.default = _chunkKUEPJHIHjs.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-SJM2TC2Y.mjs";
|
|
6
|
+
import "../../../chunk-GHW7QHTG.mjs";
|
|
7
7
|
import "../../../chunk-G4ZCI2MN.mjs";
|
|
8
8
|
import "../../../chunk-TPNHSNNZ.mjs";
|
|
9
9
|
import "../../../chunk-PALWHFOL.mjs";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunkKUGEZPUOjs = require('../../chunk-KUGEZPUO.js');
|
|
4
4
|
require('../../chunk-MCKGQKYU.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
exports.createHttpHandler =
|
|
7
|
+
exports.createHttpHandler = _chunkKUGEZPUOjs.createHttpHandler;
|
package/dist/src/utils/index.js
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkZWHJ35F5js = require('../../chunk-ZWHJ35F5.js');
|
|
6
6
|
require('../../chunk-Z2WQB55R.js');
|
|
7
7
|
require('../../chunk-MCKGQKYU.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
exports.getInternalDependencies =
|
|
11
|
+
exports.getInternalDependencies = _chunkZWHJ35F5js.getInternalDependencies; exports.uploadFile = _chunkZWHJ35F5js.uploadFile;
|
package/dist/src/utils/index.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { S3 } from '@aws-sdk/client-s3';
|
|
2
2
|
import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
|
|
3
3
|
|
|
4
4
|
/**
|
|
@@ -13,7 +13,7 @@ import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
|
|
|
13
13
|
* @param contentType - The MIME type of the file content
|
|
14
14
|
* @param isDryRun - Whether to perform a dry run without actual upload
|
|
15
15
|
*/
|
|
16
|
-
declare function uploadFile(client:
|
|
16
|
+
declare function uploadFile(client: S3, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
|
|
17
17
|
/**
|
|
18
18
|
* Get internal dependencies of a project from the project graph
|
|
19
19
|
*
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { S3 } from '@aws-sdk/client-s3';
|
|
2
2
|
import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
|
|
3
3
|
|
|
4
4
|
/**
|
|
@@ -13,7 +13,7 @@ import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
|
|
|
13
13
|
* @param contentType - The MIME type of the file content
|
|
14
14
|
* @param isDryRun - Whether to perform a dry run without actual upload
|
|
15
15
|
*/
|
|
16
|
-
declare function uploadFile(client:
|
|
16
|
+
declare function uploadFile(client: S3, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
|
|
17
17
|
/**
|
|
18
18
|
* Get internal dependencies of a project from the project graph
|
|
19
19
|
*
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
var
|
|
4
|
+
var _chunkZWHJ35F5js = require('../../chunk-ZWHJ35F5.js');
|
|
5
5
|
require('../../chunk-Z2WQB55R.js');
|
|
6
6
|
require('../../chunk-MCKGQKYU.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
exports.getInternalDependencies =
|
|
10
|
+
exports.getInternalDependencies = _chunkZWHJ35F5js.getInternalDependencies; exports.uploadFile = _chunkZWHJ35F5js.uploadFile;
|
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.27",
|
|
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.2.3",
|
|
118
118
|
"@nx/node": "^22.2.3",
|
|
119
119
|
"@nx/web": "^22.2.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.70",
|
|
121
|
+
"@storm-software/config-tools": "1.188.70",
|
|
122
|
+
"@storm-software/workspace-tools": "1.294.16",
|
|
123
123
|
"nx": "^22.2.3",
|
|
124
124
|
"tsup": "8.4.0",
|
|
125
125
|
"wrangler": ">=3.58.0"
|
|
@@ -153,5 +153,5 @@
|
|
|
153
153
|
"publishConfig": { "access": "public" },
|
|
154
154
|
"executors": "./executors.json",
|
|
155
155
|
"generators": "./generators.json",
|
|
156
|
-
"gitHead": "
|
|
156
|
+
"gitHead": "834ae98b34b239528e078d9d2ebf274dc733e97d"
|
|
157
157
|
}
|