@storm-software/cloudflare-tools 0.70.49 → 0.71.0

package/dist/src/executors/serve/executor.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 _chunkYAUK66IMjs = require('../../../chunk-YAUK66IM.js');
+var _chunkW5IPHIXBjs = require('../../../chunk-W5IPHIXB.js');
 
 
 var _chunkNU34IEWNjs = require('../../../chunk-NU34IEWN.js');
@@ -55,7 +55,7 @@ async function* serveExecutor(options, context) {
     success: true
   };
 }
-var executor_default = _chunkYAUK66IMjs.withRunExecutor.call(void 0, 
+var executor_default = _chunkW5IPHIXBjs.withRunExecutor.call(void 0, 
   "Cloudflare Serve executor",
   serveExecutor,
   {

package/dist/src/executors/serve/executor.mjs

@@ -1,6 +1,6 @@
 import {
   withRunExecutor
-} from "../../../chunk-3JEOBMM5.mjs";
+} from "../../../chunk-C6B32MBV.mjs";
 import {
   createCliOptions
 } from "../../../chunk-PH3DHY4Q.mjs";
@@ -8,7 +8,7 @@ import "../../../chunk-PTTJW7MW.mjs";
 import "../../../chunk-6MATO2MJ.mjs";
 import {
   __require
-} from "../../../chunk-UEJFDB6Y.mjs";
+} from "../../../chunk-QN6OKPMU.mjs";
 
 // src/executors/serve/executor.ts
 import { createAsyncIterable } from "@nx/devkit/src/utils/async-iterable";

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

@@ -2,10 +2,10 @@
 
 
 
-var _chunkD4JUMEICjs = require('../../../chunk-D4JUMEIC.js');
+var _chunkDRYNN63Fjs = require('../../../chunk-DRYNN63F.js');
 require('../../../chunk-MCKGQKYU.js');
 
 
 
 
-exports.default = _chunkD4JUMEICjs.generator_default; exports.initGenerator = _chunkD4JUMEICjs.initGenerator; exports.initSchematic = _chunkD4JUMEICjs.initSchematic;
+exports.default = _chunkDRYNN63Fjs.generator_default; exports.initGenerator = _chunkDRYNN63Fjs.initGenerator; exports.initSchematic = _chunkDRYNN63Fjs.initSchematic;

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

@@ -2,8 +2,8 @@ import {
   generator_default,
   initGenerator,
   initSchematic
-} from "../../../chunk-2B7ISOXH.mjs";
-import "../../../chunk-UEJFDB6Y.mjs";
+} from "../../../chunk-J2DOKDIF.mjs";
+import "../../../chunk-QN6OKPMU.mjs";
 export {
   generator_default as default,
   initGenerator,

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

@@ -2,8 +2,8 @@
 
 
 
-var _chunk6KHWP2MOjs = require('../../../chunk-6KHWP2MO.js');
-require('../../../chunk-D4JUMEIC.js');
+var _chunkBPUFICBMjs = require('../../../chunk-BPUFICBM.js');
+require('../../../chunk-DRYNN63F.js');
 require('../../../chunk-EQXEFXCV.js');
 require('../../../chunk-4BWM53AA.js');
 require('../../../chunk-MCKGQKYU.js');
@@ -11,4 +11,4 @@ require('../../../chunk-MCKGQKYU.js');
 
 
 
-exports.applicationGenerator = _chunk6KHWP2MOjs.applicationGenerator; exports.applicationSchematic = _chunk6KHWP2MOjs.applicationSchematic; exports.default = _chunk6KHWP2MOjs.generator_default;
+exports.applicationGenerator = _chunkBPUFICBMjs.applicationGenerator; exports.applicationSchematic = _chunkBPUFICBMjs.applicationSchematic; exports.default = _chunkBPUFICBMjs.generator_default;

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

@@ -2,11 +2,11 @@ import {
   applicationGenerator,
   applicationSchematic,
   generator_default
-} from "../../../chunk-JEMQ2Y24.mjs";
-import "../../../chunk-2B7ISOXH.mjs";
+} from "../../../chunk-ZFJIFXOW.mjs";
+import "../../../chunk-J2DOKDIF.mjs";
 import "../../../chunk-PTTJW7MW.mjs";
 import "../../../chunk-6MATO2MJ.mjs";
-import "../../../chunk-UEJFDB6Y.mjs";
+import "../../../chunk-QN6OKPMU.mjs";
 export {
   applicationGenerator,
   applicationSchematic,

package/dist/src/utils/index.mjs

@@ -4,7 +4,7 @@ import {
   r2UploadFile
 } from "../../chunk-5N2NVDKX.mjs";
 import "../../chunk-6MATO2MJ.mjs";
-import "../../chunk-UEJFDB6Y.mjs";
+import "../../chunk-QN6OKPMU.mjs";
 export {
   getInternalDependencies,
   r2UploadFile

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

@@ -3,7 +3,7 @@ import {
   r2UploadFile
 } from "../../chunk-5N2NVDKX.mjs";
 import "../../chunk-6MATO2MJ.mjs";
-import "../../chunk-UEJFDB6Y.mjs";
+import "../../chunk-QN6OKPMU.mjs";
 export {
   getInternalDependencies,
   r2UploadFile

package/dist/tsup.config.mjs

@@ -1,4 +1,4 @@
-import "./chunk-UEJFDB6Y.mjs";
+import "./chunk-QN6OKPMU.mjs";
 
 // tsup.config.ts
 import { defineConfig } from "tsup";

package/docs/api/executors/r2-upload-publish/schema.md

@@ -0,0 +1,93 @@
+
+<!-- Generated by @storm-software/untyped -->
+<!-- Do not edit this file directly -->
+
+# R2 Upload Publish Executor
+
+## `path`
+- **Type**: `string`
+
+> Upload Files path
+
+
+The path to the files to upload
+
+
+## `registry`
+- **Type**: `string`
+
+> Registry
+
+
+The registry URL to publish to
+
+
+## `bucketId`
+- **Type**: `string`
+
+> Bucket ID
+
+
+The ID of the R2 bucket
+
+
+## `bucketPath`
+- **Type**: `string`
+- **Default**: `"/"`
+
+> Bucket Path
+
+
+The path in the R2 bucket to upload files to
+
+
+## `tag`
+- **Type**: `string`
+- **Default**: `"latest"`
+
+> Tag
+
+
+The tag to publish with
+
+
+## `writeMetaJson`
+- **Type**: `boolean`
+- **Default**: `false`
+
+> Write Meta JSON
+
+
+Write a `meta.json` file to the upload bucket
+
+
+## `clean`
+- **Type**: `boolean`
+- **Default**: `false`
+
+> Clean
+
+
+Clean the bucket before uploading files
+
+
+## `verbose`
+- **Type**: `boolean`
+- **Default**: `false`
+
+> Verbose
+
+
+Enable verbose logging
+
+
+## `dryRun`
+- **Type**: `boolean`
+- **Default**: `false`
+
+> Dry Run
+
+
+Perform a dry run
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/cloudflare-tools",
-  "version": "0.70.49",
+  "version": "0.71.0",
   "description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
   "repository": {
     "type": "github",
@@ -115,11 +115,11 @@
   "peerDependencies": {
     "@nx/devkit": "22.0.4",
     "@nx/js": "22.0.4",
-    "@nx/node": "^22.1.1",
-    "@nx/web": "^22.1.1",
-    "@storm-software/config": "1.134.48",
-    "@storm-software/config-tools": "1.188.48",
-    "@storm-software/workspace-tools": "1.293.18",
+    "@nx/node": "^22.1.3",
+    "@nx/web": "^22.1.3",
+    "@storm-software/config": "1.134.50",
+    "@storm-software/config-tools": "1.188.50",
+    "@storm-software/workspace-tools": "1.293.20",
     "nx": "22.0.4",
     "tsup": "8.4.0",
     "wrangler": ">=3.58.0"
@@ -135,20 +135,21 @@
   "dependencies": {
     "@aws-sdk/client-s3": "3.47.0",
     "defu": "6.1.4",
-    "glob": "^11.1.0"
+    "glob": "^11.1.0",
+    "mime-types": "^3.0.2"
   },
   "devDependencies": {
     "@nx/devkit": "22.0.4",
-    "@nx/node": "^22.1.1",
-    "@nx/web": "^22.1.1",
-    "@nx/webpack": "^22.1.1",
+    "@nx/node": "^22.1.3",
+    "@nx/web": "^22.1.3",
+    "@nx/webpack": "^22.1.3",
     "nx": "22.0.4",
     "tsup": "8.4.0",
     "untyped": "^2.0.0",
-    "wrangler": "^4.50.0"
+    "wrangler": "^4.53.0"
   },
   "publishConfig": { "access": "public" },
   "executors": "./executors.json",
   "generators": "./generators.json",
-  "gitHead": "50d5da65a592cc5ebe3ba46b3793471fd910f863"
+  "gitHead": "d41f1248a2121aefd52ac185981cddc2d3d3bfbd"
 }

package/dist/chunk-IH7ZJRS7.js

@@ -1,262 +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 _chunkEQXEFXCVjs = require('./chunk-EQXEFXCV.js');
-
-
-
-
-
-
-
-var _chunk4BWM53AAjs = require('./chunk-4BWM53AA.js');
-
-
-var _chunkD4JUMEICjs = require('./chunk-D4JUMEIC.js');
-
-// src/generators/worker/generator.ts
-
-
-
-
-
-
-
-
-
-
-
-var _devkit = require('@nx/devkit');
-var _projectnameandrootutils = require('@nx/devkit/src/generators/project-name-and-root-utils');
-var _node = require('@nx/node');
-var _versions = require('@nx/node/src/utils/versions');
-var _path = require('path');
-
-// src/generators/worker/libs/get-account-id.ts
-function getAccountId(accountId) {
-  return `account_id = "${accountId}"`;
-}
-
-// src/generators/worker/libs/vitest-imports.ts
-var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
-
-// src/generators/worker/libs/vitest-script.ts
-var vitestScript = `"test": "vitest run"`;
-
-// src/generators/worker/generator.ts
-async function applicationGenerator(tree, schema) {
-  const stopwatch = _chunk4BWM53AAjs.getStopwatch.call(void 0, "Storm Worker generator");
-  let config;
-  try {
-    _chunk4BWM53AAjs.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
-
-`, config);
-    const workspaceRoot = _chunkEQXEFXCVjs.findWorkspaceRoot.call(void 0, );
-    _chunk4BWM53AAjs.writeDebug.call(void 0, 
-      `Loading the Storm Config from environment variables and storm.json file...
-- workspaceRoot: ${workspaceRoot}`,
-      config
-    );
-    config = await _chunkEQXEFXCVjs.getConfig.call(void 0, workspaceRoot);
-    _chunk4BWM53AAjs.writeTrace.call(void 0, 
-      `Loaded Storm config into env: 
-${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
-      config
-    );
-    const options = await normalizeOptions(tree, schema, config);
-    const tasks = [];
-    tasks.push(
-      await _chunkD4JUMEICjs.generator_default.call(void 0, tree, {
-        ...options,
-        skipFormat: true
-      })
-    );
-    tasks.push(
-      await _node.applicationGenerator.call(void 0, tree, {
-        ...options,
-        framework: "none",
-        skipFormat: true,
-        unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
-        e2eTestRunner: "none",
-        name: schema.name
-      })
-    );
-    if (options.unitTestRunner === "vitest") {
-      const { vitestGenerator, createOrEditViteConfig } = _devkit.ensurePackage.call(void 0, 
-        "@nx/vite",
-        _versions.nxVersion
-      );
-      const vitestTask = await vitestGenerator(tree, {
-        project: options.name,
-        uiFramework: "none",
-        coverageProvider: "v8",
-        skipFormat: true,
-        testEnvironment: "node"
-      });
-      tasks.push(vitestTask);
-      createOrEditViteConfig(
-        tree,
-        {
-          project: options.name,
-          includeLib: false,
-          includeVitest: true,
-          testEnvironment: "node"
-        },
-        true
-      );
-    }
-    addCloudflareFiles(tree, options);
-    updateTsAppConfig(tree, options);
-    addTargets(tree, options);
-    if (options.unitTestRunner === "none") {
-      removeTestFiles(tree, options);
-    }
-    if (!options.skipFormat) {
-      await _devkit.formatFiles.call(void 0, tree);
-    }
-    if (options.template === "hono") {
-      tasks.push(() => {
-        const packageJsonPath = _devkit.joinPathFragments.call(void 0, 
-          _nullishCoalesce(options.directory, () => ( "")),
-          "package.json"
-        );
-        if (tree.exists(packageJsonPath)) {
-          _devkit.updateJson.call(void 0, tree, packageJsonPath, (json) => ({
-            ...json,
-            dependencies: {
-              hono: "4.4.0",
-              ..._optionalChain([json, 'optionalAccess', _ => _.dependencies])
-            }
-          }));
-        }
-      });
-    }
-    return _devkit.runTasksInSerial.call(void 0, ...tasks);
-  } catch (error) {
-    return () => {
-      _chunk4BWM53AAjs.writeFatal.call(void 0, 
-        "A fatal error occurred while running the generator - the process was forced to terminate",
-        config
-      );
-      _chunk4BWM53AAjs.writeError.call(void 0, 
-        `An exception was thrown in the generator's process 
- - Details: ${error.message}
- - Stacktrace: ${error.stack}`,
-        config
-      );
-    };
-  } finally {
-    stopwatch();
-  }
-}
-function updateTsAppConfig(tree, options) {
-  _devkit.updateJson.call(void 0, tree, _path.join.call(void 0, options.appProjectRoot, "tsconfig.app.json"), (json) => {
-    json.compilerOptions = {
-      ...json.compilerOptions,
-      esModuleInterop: true,
-      target: "es2021",
-      lib: ["es2021"],
-      module: "es2022",
-      moduleResolution: "node",
-      resolveJsonModule: true,
-      allowJs: true,
-      checkJs: false,
-      noEmit: true,
-      isolatedModules: true,
-      allowSyntheticDefaultImports: true,
-      forceConsistentCasingInFileNames: true,
-      strict: true,
-      skipLibCheck: true
-    };
-    json.compilerOptions.types = [
-      ...json.compilerOptions.types,
-      "@cloudflare/workers-types"
-    ];
-    return json;
-  });
-}
-function addCloudflareFiles(tree, options) {
-  tree.delete(_path.join.call(void 0, options.appProjectRoot, "src/main.ts"));
-  _devkit.generateFiles.call(void 0, 
-    tree,
-    _path.join.call(void 0, __dirname, "./files/common"),
-    options.appProjectRoot,
-    {
-      ...options,
-      tmpl: "",
-      name: options.name,
-      accountId: options.accountId ? getAccountId(options.accountId) : "",
-      vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
-    }
-  );
-  if (options.template && options.template !== "none") {
-    _devkit.generateFiles.call(void 0, 
-      tree,
-      _path.join.call(void 0, __dirname, `./files/${options.template}`),
-      _path.join.call(void 0, options.appProjectRoot, "src"),
-      {
-        ...options,
-        tmpl: "",
-        name: options.name,
-        accountId: options.accountId ? getAccountId(options.accountId) : "",
-        vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
-        vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
-      }
-    );
-  }
-}
-function addTargets(tree, options) {
-  try {
-    const projectConfiguration = _devkit.readProjectConfiguration.call(void 0, tree, options.name);
-    projectConfiguration.targets = {
-      ..._nullishCoalesce(projectConfiguration.targets, () => ( {})),
-      serve: {
-        executor: "@storm-software/cloudflare-tools:serve",
-        options: {
-          port: options.port
-        }
-      },
-      "nx-release-publish": {
-        executor: "@storm-software/cloudflare-tools:cloudflare-publish"
-      }
-    };
-    if (projectConfiguration.targets.build) {
-      delete projectConfiguration.targets.build;
-    }
-    _devkit.updateProjectConfiguration.call(void 0, tree, options.name, projectConfiguration);
-  } catch (e) {
-    console.error(e);
-  }
-}
-function removeTestFiles(tree, options) {
-  tree.delete(_path.join.call(void 0, options.appProjectRoot, "src", "index.test.ts"));
-}
-async function normalizeOptions(host, options, config) {
-  const { projectName: appProjectName, projectRoot: appProjectRoot } = await _projectnameandrootutils.determineProjectNameAndRootOptions.call(void 0, host, {
-    name: options.name,
-    projectType: "application",
-    directory: options.directory,
-    rootProject: options.rootProject
-  });
-  options.rootProject = appProjectRoot === ".";
-  return {
-    addPlugin: process.env.NX_ADD_PLUGINS !== "false",
-    accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
-    ...options,
-    name: _devkit.names.call(void 0, appProjectName).fileName,
-    frontendProject: options.frontendProject ? _devkit.names.call(void 0, options.frontendProject).fileName : void 0,
-    appProjectRoot,
-    unitTestRunner: _nullishCoalesce(options.unitTestRunner, () => ( "vitest")),
-    rootProject: _nullishCoalesce(options.rootProject, () => ( false)),
-    template: _nullishCoalesce(options.template, () => ( "fetch-handler")),
-    port: _nullishCoalesce(options.port, () => ( 3e3))
-  };
-}
-var generator_default2 = applicationGenerator;
-var applicationSchematic = _devkit.convertNxGenerator.call(void 0, applicationGenerator);
-
-
-
-
-
-exports.applicationGenerator = applicationGenerator; exports.generator_default = generator_default2; exports.applicationSchematic = applicationSchematic;