@storm-software/cloudflare-tools 0.32.0 → 0.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/cloudflare-tools",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "type": "commonjs",
   "description": "⚡The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
   "repository": {

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

@@ -47172,6 +47172,7 @@ module.exports = __toCommonJS(executor_exports);
 var import_client_s3 = __toESM(require_dist_cjs90());
 var import_devkit = require("@nx/devkit");
 var import_create_cli_options = require("@storm-software/workspace-tools/utils/create-cli-options");
+var import_package_helpers = require("@storm-software/workspace-tools/utils/package-helpers");
 
 // node_modules/.pnpm/minimatch@9.0.5/node_modules/minimatch/dist/esm/index.js
 var import_brace_expansion = __toESM(require_brace_expansion(), 1);
@@ -53514,14 +53515,16 @@ async function runExecutor(options, context) {
   try {
     const workspaceRoot = findWorkspaceRoot();
     const config = await loadStormConfig(workspaceRoot);
-    const packageRoot = (0, import_devkit.joinPathFragments)(
-      context.root,
-      context.projectsConfigurations.projects[context.projectName]?.root
-    ) ?? workspaceRoot;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
     const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
-    const packageJsonPath = (0, import_devkit.joinPathFragments)(packageRoot, "package.json");
-    const projectPackageJson = (0, import_devkit.readJsonFile)(packageJsonPath);
+    const projectDetails = (0, import_package_helpers.getPackageInfo)(
+      context.projectsConfigurations.projects[context.projectName]
+    );
+    if (!projectDetails?.content) {
+      throw new Error(
+        `Could not find the project details for ${context.projectName}`
+      );
+    }
     const args = (0, import_create_cli_options.createCliOptions)({ ...options });
     if (isDryRun) {
       args.push("--dry-run");
@@ -53547,7 +53550,7 @@ async function runExecutor(options, context) {
         secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY
       }
     });
-    const version3 = projectPackageJson?.version;
+    const version3 = projectDetails.content?.version;
     writeInfo(`Generated component version: ${version3}`);
     const files = await glob((0, import_devkit.joinPathFragments)(sourceRoot, "**/*"), {
       ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
@@ -53564,7 +53567,7 @@ async function runExecutor(options, context) {
         ret[dep.name] = "latest";
       }
       return ret;
-    }, projectPackageJson?.dependencies ?? {});
+    }, projectDetails.content.dependencies ?? {});
     const release = options.tag ?? (0, import_node_child_process.execSync)("npm config get tag").toString().trim();
     writeInfo(`Clearing out existing items in ${projectPath}`);
     if (!isDryRun) {
@@ -53599,18 +53602,22 @@ async function runExecutor(options, context) {
     } else {
       writeWarning("[Dry run]: skipping upload to the Cyclone Registry.");
     }
-    const metaJson = JSON.stringify({
+    const meta = {
       name: context.projectName,
       version: version3,
       release,
-      description: projectPackageJson.description,
-      tags: projectPackageJson.keywords,
+      description: projectDetails.content.description,
+      tags: projectDetails.content.keywords,
       dependencies,
-      devDependencies: projectPackageJson.devDependencies,
+      devDependencies: null,
       internalDependencies: internalDependencies.filter(
         (projectNode) => projectNode.data.tags && projectNode.data.tags.some((tag) => tag.toLowerCase() === "component")
       ).map((dep) => dep.name)
-    });
+    };
+    if (projectDetails.type === "package.json") {
+      meta.devDependencies = projectDetails.content.devDependencies;
+    }
+    const metaJson = JSON.stringify(meta);
     writeInfo(`Generating meta.json file: 
 ${metaJson}`);
     await r2UploadFile(

package/src/generators/init/generator.js

@@ -427588,7 +427588,7 @@ var require_package3 = __commonJS({
   "packages/cloudflare-tools/package.json"(exports2, module2) {
     module2.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.32.0",
+      version: "0.33.0",
       type: "commonjs",
       description: "\u26A1The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
       repository: {

package/src/generators/worker/generator.js

@@ -663833,7 +663833,7 @@ var require_package14 = __commonJS({
   "packages/cloudflare-tools/package.json"(exports2, module2) {
     module2.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.32.0",
+      version: "0.33.0",
       type: "commonjs",
       description: "\u26A1The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
       repository: {