@storm-software/cloudflare-tools 0.3.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/cloudflare-tools",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "private": false,
   "description": "⚡The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
   "keywords": [

package/src/executors/cloudflare-publish/executor.js

@@ -66706,7 +66706,7 @@ var init_schema = __esm({
       ]).default("debug").describe(
         "The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."
       ),
-      cloudflareAccountId: z2.string().trim().nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
+      cloudflareAccountId: z2.string().trim().toLowerCase().length(32).regex(/^([0-9a-fA-F]{32})$/i).nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
       configFile: z2.string().trim().nullable().default(null).describe(
         "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
       ),
@@ -68962,7 +68962,7 @@ var init_get_env = __esm({
         branch: process.env[`${prefix}BRANCH`],
         preid: process.env[`${prefix}PRE_ID`],
         externalPackagePatterns: process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`] ? JSON.parse(process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`]) : [],
-        cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`],
+        cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] ? process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] : process.env.CLOUDFLARE_ACCOUNT_ID ? process.env.CLOUDFLARE_ACCOUNT_ID : process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
         logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
           Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
         ) ? getLogLevelLabel(
@@ -69178,6 +69178,10 @@ var init_set_env = __esm({
         );
       }
       if (config.cloudflareAccountId) {
+        process.env.STORM_BOT_CLOUDFLARE_ACCOUNT ??= String(
+          config.cloudflareAccountId
+        );
+        process.env.CLOUDFLARE_ACCOUNT_ID ??= String(config.cloudflareAccountId);
         process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] = String(
           config.cloudflareAccountId
         );
@@ -406743,6 +406747,7 @@ async function runExecutor(options, context) {
     try {
       (0, import_node_child_process7.fork)(require.resolve("wrangler/bin/wrangler"), ["deploy", ...args], {
         env: {
+          CLOUDFLARE_API_TOKEN: process.env.STORM_BOT_CLOUDFLARE_TOKEN,
           ...process.env,
           FORCE_COLOR: "true"
         },

package/src/executors/serve/executor.js

@@ -66754,7 +66754,7 @@ var init_schema = __esm({
       ]).default("debug").describe(
         "The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."
       ),
-      cloudflareAccountId: z2.string().trim().nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
+      cloudflareAccountId: z2.string().trim().toLowerCase().length(32).regex(/^([0-9a-fA-F]{32})$/i).nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
       configFile: z2.string().trim().nullable().default(null).describe(
         "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
       ),
@@ -69010,7 +69010,7 @@ var init_get_env = __esm({
         branch: process.env[`${prefix}BRANCH`],
         preid: process.env[`${prefix}PRE_ID`],
         externalPackagePatterns: process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`] ? JSON.parse(process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`]) : [],
-        cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`],
+        cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] ? process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] : process.env.CLOUDFLARE_ACCOUNT_ID ? process.env.CLOUDFLARE_ACCOUNT_ID : process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
         logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
           Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
         ) ? getLogLevelLabel(
@@ -69226,6 +69226,10 @@ var init_set_env = __esm({
         );
       }
       if (config.cloudflareAccountId) {
+        process.env.STORM_BOT_CLOUDFLARE_ACCOUNT ??= String(
+          config.cloudflareAccountId
+        );
+        process.env.CLOUDFLARE_ACCOUNT_ID ??= String(config.cloudflareAccountId);
         process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] = String(
           config.cloudflareAccountId
         );

package/src/generators/init/generator.js

@@ -222214,7 +222214,7 @@ var require_package3 = __commonJS({
   "packages/cloudflare-tools/package.json"(exports2, module2) {
     module2.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.3.0",
+      version: "0.4.0",
       private: false,
       description: "\u26A1The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
       keywords: [

package/src/generators/worker/generator.js

@@ -453627,7 +453627,7 @@ var require_package13 = __commonJS({
   "packages/cloudflare-tools/package.json"(exports2, module2) {
     module2.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.3.0",
+      version: "0.4.0",
       private: false,
       description: "\u26A1The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
       keywords: [
@@ -520256,7 +520256,7 @@ var init_schema = __esm({
       ]).default("debug").describe(
         "The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."
       ),
-      cloudflareAccountId: z2.string().trim().nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
+      cloudflareAccountId: z2.string().trim().toLowerCase().length(32).regex(/^([0-9a-fA-F]{32})$/i).nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
       configFile: z2.string().trim().nullable().default(null).describe(
         "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
       ),
@@ -520965,7 +520965,7 @@ var init_get_env = __esm({
         branch: process.env[`${prefix}BRANCH`],
         preid: process.env[`${prefix}PRE_ID`],
         externalPackagePatterns: process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`] ? JSON.parse(process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`]) : [],
-        cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`],
+        cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] ? process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] : process.env.CLOUDFLARE_ACCOUNT_ID ? process.env.CLOUDFLARE_ACCOUNT_ID : process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
         logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
           Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
         ) ? getLogLevelLabel(
@@ -521181,6 +521181,10 @@ var init_set_env = __esm({
         );
       }
       if (config.cloudflareAccountId) {
+        process.env.STORM_BOT_CLOUDFLARE_ACCOUNT ??= String(
+          config.cloudflareAccountId
+        );
+        process.env.CLOUDFLARE_ACCOUNT_ID ??= String(config.cloudflareAccountId);
         process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] = String(
           config.cloudflareAccountId
         );