@storm-software/cloudflare-tools 0.71.2 → 0.71.3

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 # Changelog for Storm Ops - Cloudflare Tools
 
+## [0.71.2](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.2) (12/05/2025)
+
+### Miscellaneous
+
+- **monorepo:** Update Nx packages to v22.1.3
+  ([3d5e53580](https://github.com/storm-software/storm-ops/commit/3d5e53580))
+
+### Updated Dependencies
+
+- Updated **workspace-tools** to **v1.293.23**
+- Updated **config-tools** to **v1.188.53**
+- Updated **config** to **v1.134.53**
+
 ## [0.71.1](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.1) (12/04/2025)
 
 ### Miscellaneous

package/dist/{chunk-7ESZB4KW.mjs → chunk-4EEXR4IG.mjs}

@@ -1,7 +1,7 @@
 import {
   getInternalDependencies,
   r2UploadFile
-} from "./chunk-5N2NVDKX.mjs";
+} from "./chunk-5CMG7SUH.mjs";
 import {
   createCliOptions,
   getPackageInfo
@@ -9,19 +9,20 @@ import {
 import {
   findWorkspaceRoot,
   getConfig
-} from "./chunk-PTTJW7MW.mjs";
+} from "./chunk-SGTAZO2Q.mjs";
 import {
+  correctPaths,
+  joinPaths,
   writeDebug,
   writeSuccess,
   writeTrace,
   writeWarning
-} from "./chunk-6MATO2MJ.mjs";
+} from "./chunk-TPNHSNNZ.mjs";
 
 // src/executors/r2-upload-publish/executor.ts
 import { S3 } from "@aws-sdk/client-s3";
 import {
   createProjectGraphAsync,
-  joinPathFragments,
   readCachedProjectGraph
 } from "@nx/devkit";
 import { glob } from "glob";
@@ -95,12 +96,10 @@ async function runExecutor(options, context) {
     if (version) {
       writeDebug(`Starting upload version ${version}`);
     }
-    const files = await glob(
-      joinPathFragments(options.path || sourceRoot, "**/*"),
-      {
-        ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
-      }
-    );
+    const basePath = options.path || sourceRoot;
+    const files = await glob(joinPaths(basePath, "**/*"), {
+      ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
+    });
     const internalDependencies = await getInternalDependencies(
       context.projectName,
       projectGraph
@@ -183,7 +182,7 @@ ${metaJson}`);
     }
     await Promise.all(
       files.map(async (file) => {
-        const name = file.replaceAll("\\", "/").replace(sourceRoot.replaceAll("\\", "/"), "");
+        const name = correctPaths(file).replace(correctPaths(basePath), "");
         const type = mime.lookup(name) || "application/octet-stream";
         writeTrace(`Uploading file: ${name} (content-type: ${type})`);
         await r2UploadFile(

package/dist/chunk-5CMG7SUH.mjs

@@ -0,0 +1,43 @@
+import {
+  joinPaths,
+  writeDebug,
+  writeWarning
+} from "./chunk-TPNHSNNZ.mjs";
+
+// src/utils/r2-bucket-helpers.ts
+import { createHash } from "node:crypto";
+async function r2UploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
+  writeDebug(`Uploading file: ${joinPaths(bucketPath, fileName)}`);
+  if (!isDryRun) {
+    await client.putObject({
+      Bucket: bucketName,
+      Key: joinPaths(bucketPath, fileName),
+      Body: fileContent,
+      ContentType: contentType,
+      Metadata: {
+        version,
+        checksum: createHash("sha256").update(fileContent).digest("base64")
+      }
+    });
+  } 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 {
+  r2UploadFile,
+  getInternalDependencies
+};

package/dist/{chunk-TUJUSMGX.mjs → chunk-AOKOPGTD.mjs}

@@ -7,7 +7,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.71.1",
+      version: "0.71.2",
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       repository: {
         type: "github",
@@ -136,9 +136,9 @@ var require_package = __commonJS({
         "@nx/js": "catalog:",
         "@nx/node": "catalog:",
         "@nx/web": "catalog:",
-        "@storm-software/config": "1.134.52",
-        "@storm-software/config-tools": "1.188.52",
-        "@storm-software/workspace-tools": "1.293.22",
+        "@storm-software/config": "1.134.53",
+        "@storm-software/config-tools": "1.188.53",
+        "@storm-software/workspace-tools": "1.293.23",
         nx: "catalog:",
         tsup: "catalog:",
         wrangler: ">=3.58.0"

package/dist/{chunk-VHMJXOF4.js → chunk-BAINZIOH.js}

@@ -1,7 +1,7 @@
 "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 _chunkFFOLWRMAjs = require('./chunk-FFOLWRMA.js');
+var _chunkUAKLE2QOjs = require('./chunk-UAKLE2QO.js');
 
 
 
@@ -9,20 +9,21 @@ var _chunkNU34IEWNjs = require('./chunk-NU34IEWN.js');
 
 
 
-var _chunkEQXEFXCVjs = require('./chunk-EQXEFXCV.js');
+var _chunkVKMAYBQXjs = require('./chunk-VKMAYBQX.js');
 
 
 
 
 
-var _chunk4BWM53AAjs = require('./chunk-4BWM53AA.js');
+
+
+var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
 
 // src/executors/r2-upload-publish/executor.ts
 var _clients3 = require('@aws-sdk/client-s3');
 
 
 
-
 var _devkit = require('@nx/devkit');
 var _glob = require('glob');
 var _mimetypes = require('mime-types'); var _mimetypes2 = _interopRequireDefault(_mimetypes);
@@ -40,8 +41,8 @@ async function runExecutor(options, context) {
     throw new Error("The executor requires projectsConfigurations.");
   }
   try {
-    const workspaceRoot = _chunkEQXEFXCVjs.findWorkspaceRoot.call(void 0, );
-    const config = await _chunkEQXEFXCVjs.getConfig.call(void 0, workspaceRoot);
+    const workspaceRoot = _chunkVKMAYBQXjs.findWorkspaceRoot.call(void 0, );
+    const config = await _chunkVKMAYBQXjs.getConfig.call(void 0, workspaceRoot);
     const sourceRoot = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.sourceRoot]), () => ( workspaceRoot));
     const projectName = _nullishCoalesce(_optionalChain([context, 'access', _11 => _11.projectsConfigurations, 'access', _12 => _12.projects, 'access', _13 => _13[context.projectName], 'optionalAccess', _14 => _14.name]), () => ( context.projectName));
     const projectDetails = _chunkNU34IEWNjs.getPackageInfo.call(void 0, 
@@ -80,7 +81,7 @@ async function runExecutor(options, context) {
         "The executor failed because the project graph is not available. Please run the build command again."
       );
     }
-    _chunk4BWM53AAjs.writeDebug.call(void 0, 
+    _chunkZ2WQB55Rjs.writeDebug.call(void 0, 
       `Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
     );
     const client = new (0, _clients3.S3)({
@@ -93,15 +94,13 @@ async function runExecutor(options, context) {
     });
     const version = _optionalChain([projectDetails, 'optionalAccess', _17 => _17.content, 'optionalAccess', _18 => _18.version]);
     if (version) {
-      _chunk4BWM53AAjs.writeDebug.call(void 0, `Starting upload version ${version}`);
+      _chunkZ2WQB55Rjs.writeDebug.call(void 0, `Starting upload version ${version}`);
     }
-    const files = await _glob.glob.call(void 0, 
-      _devkit.joinPathFragments.call(void 0, options.path || sourceRoot, "**/*"),
-      {
-        ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
-      }
-    );
-    const internalDependencies = await _chunkFFOLWRMAjs.getInternalDependencies.call(void 0, 
+    const basePath = options.path || sourceRoot;
+    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 _chunkUAKLE2QOjs.getInternalDependencies.call(void 0, 
       context.projectName,
       projectGraph
     );
@@ -115,14 +114,14 @@ async function runExecutor(options, context) {
     }, _nullishCoalesce(_optionalChain([projectDetails, 'optionalAccess', _19 => _19.content, 'access', _20 => _20.dependencies]), () => ( {})));
     const release = _nullishCoalesce(options.tag, () => ( _child_process.execSync.call(void 0, "npm config get tag").toString().trim()));
     if (options.clean === true) {
-      _chunk4BWM53AAjs.writeDebug.call(void 0, `Clearing out existing items in ${bucketPath}`);
+      _chunkZ2WQB55Rjs.writeDebug.call(void 0, `Clearing out existing items in ${bucketPath}`);
       if (!isDryRun) {
         const response = await client.listObjects({
           Bucket: bucketId,
           Prefix: bucketPath
         });
         if (_optionalChain([response, 'optionalAccess', _21 => _21.Contents]) && response.Contents.length > 0) {
-          _chunk4BWM53AAjs.writeTrace.call(void 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 Promise.all(
@@ -141,12 +140,12 @@ async function runExecutor(options, context) {
             )
           );
         } else {
-          _chunk4BWM53AAjs.writeDebug.call(void 0, 
+          _chunkZ2WQB55Rjs.writeDebug.call(void 0, 
             `No existing items to delete in the R2 bucket path ${bucketPath}`
           );
         }
       } else {
-        _chunk4BWM53AAjs.writeWarning.call(void 0, "[Dry run]: Skipping R2 bucket clean.");
+        _chunkZ2WQB55Rjs.writeWarning.call(void 0, "[Dry run]: Skipping R2 bucket clean.");
       }
     }
     if (options.writeMetaJson === true) {
@@ -168,9 +167,9 @@ async function runExecutor(options, context) {
         meta.devDependencies = _optionalChain([projectDetails, 'optionalAccess', _27 => _27.content, 'optionalAccess', _28 => _28.devDependencies]);
       }
       const metaJson = JSON.stringify(meta);
-      _chunk4BWM53AAjs.writeTrace.call(void 0, `Generating meta.json file: 
+      _chunkZ2WQB55Rjs.writeTrace.call(void 0, `Generating meta.json file: 
 ${metaJson}`);
-      await _chunkFFOLWRMAjs.r2UploadFile.call(void 0, 
+      await _chunkUAKLE2QOjs.r2UploadFile.call(void 0, 
         client,
         bucketId,
         bucketPath,
@@ -183,10 +182,10 @@ ${metaJson}`);
     }
     await Promise.all(
       files.map(async (file) => {
-        const name = file.replaceAll("\\", "/").replace(sourceRoot.replaceAll("\\", "/"), "");
+        const name = _chunkZ2WQB55Rjs.correctPaths.call(void 0, file).replace(_chunkZ2WQB55Rjs.correctPaths.call(void 0, basePath), "");
         const type = _mimetypes2.default.lookup(name) || "application/octet-stream";
-        _chunk4BWM53AAjs.writeTrace.call(void 0, `Uploading file: ${name} (content-type: ${type})`);
-        await _chunkFFOLWRMAjs.r2UploadFile.call(void 0, 
+        _chunkZ2WQB55Rjs.writeTrace.call(void 0, `Uploading file: ${name} (content-type: ${type})`);
+        await _chunkUAKLE2QOjs.r2UploadFile.call(void 0, 
           client,
           bucketId,
           bucketPath,
@@ -198,7 +197,7 @@ ${metaJson}`);
         );
       })
     );
-    _chunk4BWM53AAjs.writeSuccess.call(void 0, 
+    _chunkZ2WQB55Rjs.writeSuccess.call(void 0, 
       `Successfully uploaded the ${projectName} project to the Cloudflare R2 bucket.`,
       config
     );