@storm-software/cloudflare-tools 0.71.29 → 0.71.31

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 # Changelog for Storm Ops - Cloudflare Tools
 
+## [0.71.30](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.30) (12/18/2025)
+
+### Bug Fixes
+
+- **cloudflare-tools:** Ensure data is uploaded as a data URL
+  ([b992fc806](https://github.com/storm-software/storm-ops/commit/b992fc806))
+
+## [0.71.29](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.29) (12/18/2025)
+
+### Bug Fixes
+
+- **cloudflare-tools:** Ensure data is encoded in base64 prior to upload
+  ([cb7de3b06](https://github.com/storm-software/storm-ops/commit/cb7de3b06))
+
 ## [0.71.28](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.28) (12/17/2025)
 
 ### Bug Fixes

package/dist/{chunk-KKU7RDA6.js → chunk-DBH3ARKO.js}

@@ -7,7 +7,7 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
   "package.json"(exports, module) {
     module.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.71.28",
+      version: "0.71.30",
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       repository: {
         type: "github",
@@ -165,10 +165,12 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
       },
       dependencies: {
         "@aws-sdk/client-s3": "^3.948.0",
+        "@aws-sdk/lib-storage": "^3.954.0",
         "@smithy/node-http-handler": "^4.4.5",
         defu: "catalog:",
         glob: "catalog:",
-        "mime-types": "^3.0.2"
+        "mime-types": "^3.0.2",
+        "pretty-bytes": "^7.1.0"
       },
       devDependencies: {
         "@nx/devkit": "catalog:",

package/dist/chunk-GBGETEC6.mjs

@@ -0,0 +1,60 @@
+import {
+  joinPaths,
+  writeDebug,
+  writeError,
+  writeWarning
+} from "./chunk-TPNHSNNZ.mjs";
+
+// src/utils/r2-bucket-helpers.ts
+import { Upload } from "@aws-sdk/lib-storage";
+import { createHash } from "node:crypto";
+import prettyBytes from "pretty-bytes";
+async function uploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
+  const key = (!bucketPath?.trim() || bucketPath?.trim() === "/" ? fileName : joinPaths(bucketPath.trim(), fileName))?.replace(/^\/+/g, "") || "";
+  writeDebug(
+    `Uploading ${key} (content-type: ${contentType}, size: ${prettyBytes(
+      Buffer.byteLength(fileContent, "utf8")
+    )}) to the ${bucketName} R2 bucket`
+  );
+  try {
+    if (!isDryRun) {
+      const upload = new Upload({
+        client,
+        params: {
+          Bucket: bucketName,
+          Key: key,
+          Body: Buffer.from(fileContent, "utf8"),
+          ContentType: contentType,
+          Metadata: {
+            version,
+            checksum: createHash("sha256").update(fileContent).digest("base64")
+          }
+        }
+      });
+      await upload.done();
+    } else {
+      writeWarning("[Dry run]: Skipping upload to the R2 bucket.");
+    }
+  } catch (error) {
+    writeError(`Failed to upload ${key} to the ${bucketName} R2 bucket.`);
+    throw error;
+  }
+}
+function getInternalDependencies(projectName, graph) {
+  const allDeps = graph.dependencies[projectName] ?? [];
+  return Array.from(
+    allDeps.reduce(
+      (acc, node) => {
+        const found = graph.nodes[node.target];
+        if (found) acc.push(found);
+        return acc;
+      },
+      []
+    )
+  );
+}
+
+export {
+  uploadFile,
+  getInternalDependencies
+};

package/dist/{chunk-YXUE6D4W.js → chunk-JFMSM7WW.js}

@@ -4,7 +4,7 @@ var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.js');
 
 
 
-var _chunkZWHJ35F5js = require('./chunk-ZWHJ35F5.js');
+var _chunkMQLXYAAZjs = require('./chunk-MQLXYAAZ.js');
 
 
 
@@ -23,6 +23,10 @@ var _chunk5GILNZWSjs = require('./chunk-5GILNZWS.js');
 var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
 
 // src/executors/r2-upload-publish/executor.ts
+
+
+
+
 var _clients3 = require('@aws-sdk/client-s3');
 
 
@@ -90,7 +94,7 @@ async function runExecutor(options, context) {
     _chunkZ2WQB55Rjs.writeDebug.call(void 0, 
       `Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
     );
-    const client = new (0, _clients3.S3)({
+    const client = new (0, _clients3.S3Client)({
       region: "auto",
       endpoint: registry,
       credentials: {
@@ -109,7 +113,7 @@ async function runExecutor(options, context) {
     const files = await _glob.glob.call(void 0, _chunkZ2WQB55Rjs.joinPaths.call(void 0, basePath, "**/*"), {
       ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
     });
-    const internalDependencies = await _chunkZWHJ35F5js.getInternalDependencies.call(void 0, 
+    const internalDependencies = await _chunkMQLXYAAZjs.getInternalDependencies.call(void 0, 
       context.projectName,
       projectGraph
     );
@@ -125,23 +129,27 @@ async function runExecutor(options, context) {
     if (options.clean === true) {
       _chunkZ2WQB55Rjs.writeDebug.call(void 0, `Clearing out existing items in ${bucketPath}`);
       if (!isDryRun) {
-        const response = await client.listObjects({
-          Bucket: bucketId,
-          Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
-        });
+        const response = await client.send(
+          new (0, _clients3.ListObjectsCommand)({
+            Bucket: bucketId,
+            Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
+          })
+        );
         if (_optionalChain([response, 'optionalAccess', _17 => _17.Contents]) && response.Contents.length > 0) {
           _chunkZ2WQB55Rjs.writeTrace.call(void 0, 
             `Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
           );
-          await client.deleteObjects({
-            Bucket: bucketId,
-            Delete: {
-              Objects: response.Contents.map((item) => ({
-                Key: item.Key
-              })),
-              Quiet: false
-            }
-          });
+          await client.send(
+            new (0, _clients3.DeleteObjectsCommand)({
+              Bucket: bucketId,
+              Delete: {
+                Objects: response.Contents.map((item) => ({
+                  Key: item.Key
+                })),
+                Quiet: false
+              }
+            })
+          );
         } else {
           _chunkZ2WQB55Rjs.writeDebug.call(void 0, 
             `No existing items to delete in the R2 bucket path ${bucketPath}`
@@ -169,7 +177,7 @@ async function runExecutor(options, context) {
       if (_optionalChain([projectDetails, 'optionalAccess', _22 => _22.type]) === "package.json") {
         meta.devDependencies = _optionalChain([projectDetails, 'optionalAccess', _23 => _23.content, 'optionalAccess', _24 => _24.devDependencies]);
       }
-      await _chunkZWHJ35F5js.uploadFile.call(void 0, 
+      await _chunkMQLXYAAZjs.uploadFile.call(void 0, 
         client,
         bucketId,
         bucketPath,
@@ -187,15 +195,13 @@ async function runExecutor(options, context) {
         }), 'optionalAccess', _25 => _25.isFile, 'call', _26 => _26()])) {
           const name = _chunkZ2WQB55Rjs.correctPaths.call(void 0, file).replace(_chunkZ2WQB55Rjs.correctPaths.call(void 0, basePath), "");
           const type = _mimetypes2.default.lookup(name) || "application/octet-stream";
-          await _chunkZWHJ35F5js.uploadFile.call(void 0, 
+          await _chunkMQLXYAAZjs.uploadFile.call(void 0, 
             client,
             bucketId,
             bucketPath,
             name,
             version,
-            type === "application/json" || type.includes("text") ? await _promises.readFile.call(void 0, file, "utf8") : Buffer.from(await _promises.readFile.call(void 0, file, "binary"), "binary").toString(
-              "base64"
-            ),
+            await _promises.readFile.call(void 0, file, "utf8"),
             type,
             isDryRun
           );

package/dist/chunk-MQLXYAAZ.js

@@ -0,0 +1,60 @@
+"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; }
+
+
+
+
+var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
+
+// src/utils/r2-bucket-helpers.ts
+var _libstorage = require('@aws-sdk/lib-storage');
+var _crypto = require('crypto');
+var _prettybytes = require('pretty-bytes'); var _prettybytes2 = _interopRequireDefault(_prettybytes);
+async function uploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
+  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, "")]) || "";
+  _chunkZ2WQB55Rjs.writeDebug.call(void 0, 
+    `Uploading ${key} (content-type: ${contentType}, size: ${_prettybytes2.default.call(void 0, 
+      Buffer.byteLength(fileContent, "utf8")
+    )}) to the ${bucketName} R2 bucket`
+  );
+  try {
+    if (!isDryRun) {
+      const upload = new (0, _libstorage.Upload)({
+        client,
+        params: {
+          Bucket: bucketName,
+          Key: key,
+          Body: Buffer.from(fileContent, "utf8"),
+          ContentType: contentType,
+          Metadata: {
+            version,
+            checksum: _crypto.createHash.call(void 0, "sha256").update(fileContent).digest("base64")
+          }
+        }
+      });
+      await upload.done();
+    } else {
+      _chunkZ2WQB55Rjs.writeWarning.call(void 0, "[Dry run]: Skipping upload to the R2 bucket.");
+    }
+  } catch (error) {
+    _chunkZ2WQB55Rjs.writeError.call(void 0, `Failed to upload ${key} to the ${bucketName} R2 bucket.`);
+    throw error;
+  }
+}
+function getInternalDependencies(projectName, graph) {
+  const allDeps = _nullishCoalesce(graph.dependencies[projectName], () => ( []));
+  return Array.from(
+    allDeps.reduce(
+      (acc, node) => {
+        const found = graph.nodes[node.target];
+        if (found) acc.push(found);
+        return acc;
+      },
+      []
+    )
+  );
+}
+
+
+
+
+exports.uploadFile = uploadFile; exports.getInternalDependencies = getInternalDependencies;

package/dist/{chunk-ODJ23C2Z.mjs → chunk-Q6BDPVT4.mjs}

@@ -4,7 +4,7 @@ import {
 import {
   getInternalDependencies,
   uploadFile
-} from "./chunk-UI2F3MMU.mjs";
+} from "./chunk-GBGETEC6.mjs";
 import {
   createCliOptions,
   getPackageInfo
@@ -23,7 +23,11 @@ import {
 } from "./chunk-TPNHSNNZ.mjs";
 
 // src/executors/r2-upload-publish/executor.ts
-import { S3 } from "@aws-sdk/client-s3";
+import {
+  DeleteObjectsCommand,
+  ListObjectsCommand,
+  S3Client
+} from "@aws-sdk/client-s3";
 import {
   createProjectGraphAsync,
   readCachedProjectGraph
@@ -90,7 +94,7 @@ async function runExecutor(options, context) {
     writeDebug(
       `Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
     );
-    const client = new S3({
+    const client = new S3Client({
       region: "auto",
       endpoint: registry,
       credentials: {
@@ -125,23 +129,27 @@ async function runExecutor(options, context) {
     if (options.clean === true) {
       writeDebug(`Clearing out existing items in ${bucketPath}`);
       if (!isDryRun) {
-        const response = await client.listObjects({
-          Bucket: bucketId,
-          Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
-        });
+        const response = await client.send(
+          new ListObjectsCommand({
+            Bucket: bucketId,
+            Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
+          })
+        );
         if (response?.Contents && response.Contents.length > 0) {
           writeTrace(
             `Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
           );
-          await client.deleteObjects({
-            Bucket: bucketId,
-            Delete: {
-              Objects: response.Contents.map((item) => ({
-                Key: item.Key
-              })),
-              Quiet: false
-            }
-          });
+          await client.send(
+            new DeleteObjectsCommand({
+              Bucket: bucketId,
+              Delete: {
+                Objects: response.Contents.map((item) => ({
+                  Key: item.Key
+                })),
+                Quiet: false
+              }
+            })
+          );
         } else {
           writeDebug(
             `No existing items to delete in the R2 bucket path ${bucketPath}`
@@ -193,9 +201,7 @@ async function runExecutor(options, context) {
             bucketPath,
             name,
             version,
-            type === "application/json" || type.includes("text") ? await readFile(file, "utf8") : Buffer.from(await readFile(file, "binary"), "binary").toString(
-              "base64"
-            ),
+            await readFile(file, "utf8"),
             type,
             isDryRun
           );

package/dist/{chunk-HF46WK23.mjs → chunk-TWWKKHQ6.mjs}

@@ -1,6 +1,6 @@
 import {
   generator_default
-} from "./chunk-EBBMMF2H.mjs";
+} from "./chunk-WSU7RB2N.mjs";
 import {
   findWorkspaceRoot,
   getConfig

package/dist/{chunk-TYB3YAPJ.js → chunk-V4DY7BGL.js}

@@ -1,6 +1,6 @@
 "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; }
 
-var _chunkKKU7RDA6js = require('./chunk-KKU7RDA6.js');
+var _chunkDBH3ARKOjs = require('./chunk-DBH3ARKO.js');
 
 
 
@@ -66,7 +66,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
     const options = await normalizeOptions(tree, schema, config);
     const tasks = [];
     tasks.push(
-      await _chunkKKU7RDA6js.generator_default.call(void 0, tree, {
+      await _chunkDBH3ARKOjs.generator_default.call(void 0, tree, {
         ...options,
         skipFormat: true
       })

package/dist/{chunk-EBBMMF2H.mjs → chunk-WSU7RB2N.mjs}

@@ -7,7 +7,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.71.28",
+      version: "0.71.30",
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       repository: {
         type: "github",
@@ -165,10 +165,12 @@ var require_package = __commonJS({
       },
       dependencies: {
         "@aws-sdk/client-s3": "^3.948.0",
+        "@aws-sdk/lib-storage": "^3.954.0",
         "@smithy/node-http-handler": "^4.4.5",
         defu: "catalog:",
         glob: "catalog:",
-        "mime-types": "^3.0.2"
+        "mime-types": "^3.0.2",
+        "pretty-bytes": "^7.1.0"
       },
       devDependencies: {
         "@nx/devkit": "catalog:",

package/dist/executors.js

@@ -1,7 +1,7 @@
 "use strict";require('./chunk-XO66D74Z.js');
-require('./chunk-YXUE6D4W.js');
+require('./chunk-JFMSM7WW.js');
 require('./chunk-KUGEZPUO.js');
-require('./chunk-ZWHJ35F5.js');
+require('./chunk-MQLXYAAZ.js');
 require('./chunk-QBD2OGUY.js');
 require('./chunk-IVVRVG36.js');
 require('./chunk-N7FW365Q.js');

package/dist/executors.mjs

@@ -1,7 +1,7 @@
 import "./chunk-YSCEY447.mjs";
-import "./chunk-ODJ23C2Z.mjs";
+import "./chunk-Q6BDPVT4.mjs";
 import "./chunk-SWYYMID7.mjs";
-import "./chunk-UI2F3MMU.mjs";
+import "./chunk-GBGETEC6.mjs";
 import "./chunk-WFPKBGV3.mjs";
 import "./chunk-NIOOY3TB.mjs";
 import "./chunk-3MAI3FU2.mjs";

package/dist/generators.js

@@ -2,11 +2,11 @@
 
 
 
-var _chunkTYB3YAPJjs = require('./chunk-TYB3YAPJ.js');
+var _chunkV4DY7BGLjs = require('./chunk-V4DY7BGL.js');
 
 
 
-var _chunkKKU7RDA6js = require('./chunk-KKU7RDA6.js');
+var _chunkDBH3ARKOjs = require('./chunk-DBH3ARKO.js');
 require('./chunk-5GILNZWS.js');
 require('./chunk-Z2WQB55R.js');
 require('./chunk-MCKGQKYU.js');
@@ -15,4 +15,4 @@ require('./chunk-MCKGQKYU.js');
 
 
 
-exports.applicationGenerator = _chunkTYB3YAPJjs.applicationGenerator; exports.applicationSchematic = _chunkTYB3YAPJjs.applicationSchematic; exports.initGenerator = _chunkKKU7RDA6js.initGenerator; exports.initSchematic = _chunkKKU7RDA6js.initSchematic;
+exports.applicationGenerator = _chunkV4DY7BGLjs.applicationGenerator; exports.applicationSchematic = _chunkV4DY7BGLjs.applicationSchematic; exports.initGenerator = _chunkDBH3ARKOjs.initGenerator; exports.initSchematic = _chunkDBH3ARKOjs.initSchematic;

package/dist/generators.mjs

@@ -2,11 +2,11 @@ import "./chunk-3J7KBHMJ.mjs";
 import {
   applicationGenerator,
   applicationSchematic
-} from "./chunk-HF46WK23.mjs";
+} from "./chunk-TWWKKHQ6.mjs";
 import {
   initGenerator,
   initSchematic
-} from "./chunk-EBBMMF2H.mjs";
+} from "./chunk-WSU7RB2N.mjs";
 import "./chunk-G4ZCI2MN.mjs";
 import "./chunk-TPNHSNNZ.mjs";
 import "./chunk-PALWHFOL.mjs";

package/dist/index.js

@@ -1,20 +1,20 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }require('./chunk-XO66D74Z.js');
-require('./chunk-YXUE6D4W.js');
+require('./chunk-JFMSM7WW.js');
 require('./chunk-DHBG5ASJ.js');
 
 
 
-var _chunkTYB3YAPJjs = require('./chunk-TYB3YAPJ.js');
+var _chunkV4DY7BGLjs = require('./chunk-V4DY7BGL.js');
 
 
 
-var _chunkKKU7RDA6js = require('./chunk-KKU7RDA6.js');
+var _chunkDBH3ARKOjs = require('./chunk-DBH3ARKO.js');
 require('./chunk-KUGEZPUO.js');
 require('./chunk-CVGPWUNP.js');
 
 
 
-var _chunkZWHJ35F5js = require('./chunk-ZWHJ35F5.js');
+var _chunkMQLXYAAZjs = require('./chunk-MQLXYAAZ.js');
 require('./chunk-QBD2OGUY.js');
 require('./chunk-IVVRVG36.js');
 
@@ -156,4 +156,4 @@ function createPackageJson(projectJsonPath, workspaceRoot) {
 
 
 
-exports.applicationGenerator = _chunkTYB3YAPJjs.applicationGenerator; exports.applicationSchematic = _chunkTYB3YAPJjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getInternalDependencies = _chunkZWHJ35F5js.getInternalDependencies; exports.initGenerator = _chunkKKU7RDA6js.initGenerator; exports.initSchematic = _chunkKKU7RDA6js.initSchematic; exports.name = name; exports.uploadFile = _chunkZWHJ35F5js.uploadFile;
+exports.applicationGenerator = _chunkV4DY7BGLjs.applicationGenerator; exports.applicationSchematic = _chunkV4DY7BGLjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getInternalDependencies = _chunkMQLXYAAZjs.getInternalDependencies; exports.initGenerator = _chunkDBH3ARKOjs.initGenerator; exports.initSchematic = _chunkDBH3ARKOjs.initSchematic; exports.name = name; exports.uploadFile = _chunkMQLXYAAZjs.uploadFile;

package/dist/index.mjs

@@ -1,20 +1,20 @@
 import "./chunk-YSCEY447.mjs";
-import "./chunk-ODJ23C2Z.mjs";
+import "./chunk-Q6BDPVT4.mjs";
 import "./chunk-3J7KBHMJ.mjs";
 import {
   applicationGenerator,
   applicationSchematic
-} from "./chunk-HF46WK23.mjs";
+} from "./chunk-TWWKKHQ6.mjs";
 import {
   initGenerator,
   initSchematic
-} from "./chunk-EBBMMF2H.mjs";
+} from "./chunk-WSU7RB2N.mjs";
 import "./chunk-SWYYMID7.mjs";
 import "./chunk-7Z5PILRU.mjs";
 import {
   getInternalDependencies,
   uploadFile
-} from "./chunk-UI2F3MMU.mjs";
+} from "./chunk-GBGETEC6.mjs";
 import "./chunk-WFPKBGV3.mjs";
 import "./chunk-NIOOY3TB.mjs";
 import {

package/dist/src/executors/r2-upload-publish/executor.js

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkYXUE6D4Wjs = require('../../../chunk-YXUE6D4W.js');
+var _chunkJFMSM7WWjs = require('../../../chunk-JFMSM7WW.js');
 require('../../../chunk-KUGEZPUO.js');
-require('../../../chunk-ZWHJ35F5.js');
+require('../../../chunk-MQLXYAAZ.js');
 require('../../../chunk-N7FW365Q.js');
 require('../../../chunk-5GILNZWS.js');
 require('../../../chunk-Z2WQB55R.js');
 require('../../../chunk-MCKGQKYU.js');
 
 
-exports.default = _chunkYXUE6D4Wjs.runExecutor;
+exports.default = _chunkJFMSM7WWjs.runExecutor;

package/dist/src/executors/r2-upload-publish/executor.mjs

@@ -1,8 +1,8 @@
 import {
   runExecutor
-} from "../../../chunk-ODJ23C2Z.mjs";
+} from "../../../chunk-Q6BDPVT4.mjs";
 import "../../../chunk-SWYYMID7.mjs";
-import "../../../chunk-UI2F3MMU.mjs";
+import "../../../chunk-GBGETEC6.mjs";
 import "../../../chunk-3MAI3FU2.mjs";
 import "../../../chunk-G4ZCI2MN.mjs";
 import "../../../chunk-TPNHSNNZ.mjs";

package/dist/src/generators/init/generator.js

@@ -2,10 +2,10 @@
 
 
 
-var _chunkKKU7RDA6js = require('../../../chunk-KKU7RDA6.js');
+var _chunkDBH3ARKOjs = require('../../../chunk-DBH3ARKO.js');
 require('../../../chunk-MCKGQKYU.js');
 
 
 
 
-exports.default = _chunkKKU7RDA6js.generator_default; exports.initGenerator = _chunkKKU7RDA6js.initGenerator; exports.initSchematic = _chunkKKU7RDA6js.initSchematic;
+exports.default = _chunkDBH3ARKOjs.generator_default; exports.initGenerator = _chunkDBH3ARKOjs.initGenerator; exports.initSchematic = _chunkDBH3ARKOjs.initSchematic;

package/dist/src/generators/init/generator.mjs

@@ -2,7 +2,7 @@ import {
   generator_default,
   initGenerator,
   initSchematic
-} from "../../../chunk-EBBMMF2H.mjs";
+} from "../../../chunk-WSU7RB2N.mjs";
 import "../../../chunk-PALWHFOL.mjs";
 export {
   generator_default as default,

package/dist/src/generators/worker/generator.js

@@ -2,8 +2,8 @@
 
 
 
-var _chunkTYB3YAPJjs = require('../../../chunk-TYB3YAPJ.js');
-require('../../../chunk-KKU7RDA6.js');
+var _chunkV4DY7BGLjs = require('../../../chunk-V4DY7BGL.js');
+require('../../../chunk-DBH3ARKO.js');
 require('../../../chunk-5GILNZWS.js');
 require('../../../chunk-Z2WQB55R.js');
 require('../../../chunk-MCKGQKYU.js');
@@ -11,4 +11,4 @@ require('../../../chunk-MCKGQKYU.js');
 
 
 
-exports.applicationGenerator = _chunkTYB3YAPJjs.applicationGenerator; exports.applicationSchematic = _chunkTYB3YAPJjs.applicationSchematic; exports.default = _chunkTYB3YAPJjs.generator_default;
+exports.applicationGenerator = _chunkV4DY7BGLjs.applicationGenerator; exports.applicationSchematic = _chunkV4DY7BGLjs.applicationSchematic; exports.default = _chunkV4DY7BGLjs.generator_default;

package/dist/src/generators/worker/generator.mjs

@@ -2,8 +2,8 @@ import {
   applicationGenerator,
   applicationSchematic,
   generator_default
-} from "../../../chunk-HF46WK23.mjs";
-import "../../../chunk-EBBMMF2H.mjs";
+} from "../../../chunk-TWWKKHQ6.mjs";
+import "../../../chunk-WSU7RB2N.mjs";
 import "../../../chunk-G4ZCI2MN.mjs";
 import "../../../chunk-TPNHSNNZ.mjs";
 import "../../../chunk-PALWHFOL.mjs";

package/dist/src/utils/index.js

@@ -2,10 +2,10 @@
 
 
 
-var _chunkZWHJ35F5js = require('../../chunk-ZWHJ35F5.js');
+var _chunkMQLXYAAZjs = require('../../chunk-MQLXYAAZ.js');
 require('../../chunk-Z2WQB55R.js');
 require('../../chunk-MCKGQKYU.js');
 
 
 
-exports.getInternalDependencies = _chunkZWHJ35F5js.getInternalDependencies; exports.uploadFile = _chunkZWHJ35F5js.uploadFile;
+exports.getInternalDependencies = _chunkMQLXYAAZjs.getInternalDependencies; exports.uploadFile = _chunkMQLXYAAZjs.uploadFile;

package/dist/src/utils/index.mjs

@@ -2,7 +2,7 @@ import "../../chunk-7Z5PILRU.mjs";
 import {
   getInternalDependencies,
   uploadFile
-} from "../../chunk-UI2F3MMU.mjs";
+} from "../../chunk-GBGETEC6.mjs";
 import "../../chunk-TPNHSNNZ.mjs";
 import "../../chunk-PALWHFOL.mjs";
 export {

package/dist/src/utils/r2-bucket-helpers.d.mts

@@ -1,4 +1,4 @@
-import { S3 } from '@aws-sdk/client-s3';
+import { S3Client } from '@aws-sdk/client-s3';
 import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
 
 /**
@@ -13,7 +13,7 @@ import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
  * @param contentType - The MIME type of the file content
  * @param isDryRun - Whether to perform a dry run without actual upload
  */
-declare function uploadFile(client: S3, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
+declare function uploadFile(client: S3Client, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
 /**
  * Get internal dependencies of a project from the project graph
  *

package/dist/src/utils/r2-bucket-helpers.d.ts

@@ -1,4 +1,4 @@
-import { S3 } from '@aws-sdk/client-s3';
+import { S3Client } from '@aws-sdk/client-s3';
 import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
 
 /**
@@ -13,7 +13,7 @@ import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
  * @param contentType - The MIME type of the file content
  * @param isDryRun - Whether to perform a dry run without actual upload
  */
-declare function uploadFile(client: S3, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
+declare function uploadFile(client: S3Client, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
 /**
  * Get internal dependencies of a project from the project graph
  *

package/dist/src/utils/r2-bucket-helpers.js

@@ -1,10 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkZWHJ35F5js = require('../../chunk-ZWHJ35F5.js');
+var _chunkMQLXYAAZjs = require('../../chunk-MQLXYAAZ.js');
 require('../../chunk-Z2WQB55R.js');
 require('../../chunk-MCKGQKYU.js');
 
 
 
-exports.getInternalDependencies = _chunkZWHJ35F5js.getInternalDependencies; exports.uploadFile = _chunkZWHJ35F5js.uploadFile;
+exports.getInternalDependencies = _chunkMQLXYAAZjs.getInternalDependencies; exports.uploadFile = _chunkMQLXYAAZjs.uploadFile;

package/dist/src/utils/r2-bucket-helpers.mjs

@@ -1,7 +1,7 @@
 import {
   getInternalDependencies,
   uploadFile
-} from "../../chunk-UI2F3MMU.mjs";
+} from "../../chunk-GBGETEC6.mjs";
 import "../../chunk-TPNHSNNZ.mjs";
 import "../../chunk-PALWHFOL.mjs";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/cloudflare-tools",
-  "version": "0.71.29",
+  "version": "0.71.31",
   "description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
   "repository": {
     "type": "github",
@@ -134,10 +134,12 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.948.0",
+    "@aws-sdk/lib-storage": "^3.954.0",
     "@smithy/node-http-handler": "^4.4.5",
     "defu": "6.1.4",
     "glob": "^11.1.0",
-    "mime-types": "^3.0.2"
+    "mime-types": "^3.0.2",
+    "pretty-bytes": "^7.1.0"
   },
   "devDependencies": {
     "@nx/devkit": "^22.2.3",
@@ -153,5 +155,5 @@
   "publishConfig": { "access": "public" },
   "executors": "./executors.json",
   "generators": "./generators.json",
-  "gitHead": "03b2e5821bed47cd112766c265e4f01907ca35cd"
+  "gitHead": "7f759c57f99e6cf104b110848fdf4d319e5886c1"
 }

package/dist/chunk-UI2F3MMU.mjs

@@ -1,52 +0,0 @@
-import {
-  joinPaths,
-  writeDebug,
-  writeWarning
-} from "./chunk-TPNHSNNZ.mjs";
-
-// src/utils/r2-bucket-helpers.ts
-import { createHash } from "node:crypto";
-async function uploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
-  const key = (!bucketPath?.trim() || bucketPath?.trim() === "/" ? fileName : joinPaths(bucketPath.trim(), fileName))?.replace(/^\/+/g, "") || "";
-  writeDebug(
-    `Uploading ${key} (content-type: ${contentType}) to the ${bucketName} R2 bucket`
-  );
-  if (!isDryRun) {
-    await client.putObject(
-      {
-        Bucket: bucketName,
-        Key: key,
-        Body: fileContent,
-        ContentType: contentType,
-        Metadata: {
-          version,
-          checksum: createHash("sha256").update(fileContent).digest("base64")
-        }
-      },
-      {
-        requestTimeout: 15 * 60 * 1e3
-        // 15 minutes
-      }
-    );
-  } else {
-    writeWarning("[Dry run]: Skipping upload to the R2 bucket.");
-  }
-}
-function getInternalDependencies(projectName, graph) {
-  const allDeps = graph.dependencies[projectName] ?? [];
-  return Array.from(
-    allDeps.reduce(
-      (acc, node) => {
-        const found = graph.nodes[node.target];
-        if (found) acc.push(found);
-        return acc;
-      },
-      []
-    )
-  );
-}
-
-export {
-  uploadFile,
-  getInternalDependencies
-};

package/dist/chunk-ZWHJ35F5.js

@@ -1,52 +0,0 @@
-"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; }
-
-
-
-var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
-
-// src/utils/r2-bucket-helpers.ts
-var _crypto = require('crypto');
-async function uploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
-  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, "")]) || "";
-  _chunkZ2WQB55Rjs.writeDebug.call(void 0, 
-    `Uploading ${key} (content-type: ${contentType}) to the ${bucketName} R2 bucket`
-  );
-  if (!isDryRun) {
-    await client.putObject(
-      {
-        Bucket: bucketName,
-        Key: key,
-        Body: fileContent,
-        ContentType: contentType,
-        Metadata: {
-          version,
-          checksum: _crypto.createHash.call(void 0, "sha256").update(fileContent).digest("base64")
-        }
-      },
-      {
-        requestTimeout: 15 * 60 * 1e3
-        // 15 minutes
-      }
-    );
-  } else {
-    _chunkZ2WQB55Rjs.writeWarning.call(void 0, "[Dry run]: Skipping upload to the R2 bucket.");
-  }
-}
-function getInternalDependencies(projectName, graph) {
-  const allDeps = _nullishCoalesce(graph.dependencies[projectName], () => ( []));
-  return Array.from(
-    allDeps.reduce(
-      (acc, node) => {
-        const found = graph.nodes[node.target];
-        if (found) acc.push(found);
-        return acc;
-      },
-      []
-    )
-  );
-}
-
-
-
-
-exports.uploadFile = uploadFile; exports.getInternalDependencies = getInternalDependencies;