@storm-software/cloudflare-tools 0.71.91 → 0.71.93

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,30 @@
2
2
 
3
3
  # Changelog for Storm Ops - Cloudflare Tools
4
4
 
5
+ ## [0.71.92](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.92) (03/19/2026)
6
+
7
+ ### Miscellaneous
8
+
9
+ - **monorepo:** Regenerate `README.md` files ([17e5b35e3](https://github.com/storm-software/storm-ops/commit/17e5b35e3))
10
+
11
+ ### Updated Dependencies
12
+
13
+ - Updated **workspace-tools** to **v1.295.18**
14
+ - Updated **config-tools** to **v1.189.42**
15
+ - Updated **config** to **v1.136.1**
16
+
17
+ ## [0.71.91](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.91) (03/18/2026)
18
+
19
+ ### Features
20
+
21
+ - **config:** Added the `performance` color configuration and logLevel ([02e67c64e](https://github.com/storm-software/storm-ops/commit/02e67c64e))
22
+
23
+ ### Updated Dependencies
24
+
25
+ - Updated **workspace-tools** to **v1.295.17**
26
+ - Updated **config-tools** to **v1.189.41**
27
+ - Updated **config** to **v1.136.0**
28
+
5
29
  ## [0.71.90](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.90) (03/18/2026)
6
30
 
7
31
  ### Miscellaneous
package/README.md CHANGED
@@ -27,7 +27,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
27
27
 
28
28
  <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
29
29
 
30
- [![Version](https://img.shields.io/badge/version-0.71.89-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
30
+ [![Version](https://img.shields.io/badge/version-0.71.91-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
31
31
 
32
32
  <!-- prettier-ignore-start -->
33
33
  <!-- markdownlint-disable -->
@@ -7,7 +7,7 @@ var require_package = __commonJS({
7
7
  "package.json"(exports, module) {
8
8
  module.exports = {
9
9
  name: "@storm-software/cloudflare-tools",
10
- version: "0.71.90",
10
+ version: "0.71.92",
11
11
  private: false,
12
12
  description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
13
13
  keywords: [
@@ -156,9 +156,9 @@ var require_package = __commonJS({
156
156
  "@nx/js": "catalog:",
157
157
  "@nx/node": "catalog:",
158
158
  "@nx/web": "catalog:",
159
- "@storm-software/config": "1.135.41",
160
- "@storm-software/config-tools": "1.189.40",
161
- "@storm-software/workspace-tools": "1.295.16",
159
+ "@storm-software/config": "1.136.1",
160
+ "@storm-software/config-tools": "1.189.42",
161
+ "@storm-software/workspace-tools": "1.295.18",
162
162
  nx: "catalog:",
163
163
  tsup: "catalog:",
164
164
  wrangler: ">=3.58.0"
@@ -7,7 +7,7 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
7
7
  "package.json"(exports, module) {
8
8
  module.exports = {
9
9
  name: "@storm-software/cloudflare-tools",
10
- version: "0.71.90",
10
+ version: "0.71.92",
11
11
  private: false,
12
12
  description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
13
13
  keywords: [
@@ -156,9 +156,9 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
156
156
  "@nx/js": "catalog:",
157
157
  "@nx/node": "catalog:",
158
158
  "@nx/web": "catalog:",
159
- "@storm-software/config": "1.135.41",
160
- "@storm-software/config-tools": "1.189.40",
161
- "@storm-software/workspace-tools": "1.295.16",
159
+ "@storm-software/config": "1.136.1",
160
+ "@storm-software/config-tools": "1.189.42",
161
+ "@storm-software/workspace-tools": "1.295.18",
162
162
  nx: "catalog:",
163
163
  tsup: "catalog:",
164
164
  wrangler: ">=3.58.0"
@@ -1,6 +1,6 @@
1
1
  "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; }
2
2
 
3
- var _chunkGG5WUYILjs = require('./chunk-GG5WUYIL.js');
3
+ var _chunk6I3OFE7Sjs = require('./chunk-6I3OFE7S.js');
4
4
 
5
5
 
6
6
 
@@ -70,7 +70,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
70
70
  const options = await normalizeOptions(tree, schema, config);
71
71
  const tasks = [];
72
72
  tasks.push(
73
- await _chunkGG5WUYILjs.generator_default.call(void 0, tree, {
73
+ await _chunk6I3OFE7Sjs.generator_default.call(void 0, tree, {
74
74
  ...options,
75
75
  skipFormat: true
76
76
  })
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  generator_default
3
- } from "./chunk-KM2LU3WU.mjs";
3
+ } from "./chunk-5DW5BULI.mjs";
4
4
  import {
5
5
  findWorkspaceRoot,
6
6
  getConfig
@@ -2,11 +2,11 @@
2
2
 
3
3
 
4
4
 
5
- var _chunkLZPNL75Hjs = require('./chunk-LZPNL75H.js');
5
+ var _chunkBAYXERIRjs = require('./chunk-BAYXERIR.js');
6
6
 
7
7
 
8
8
 
9
- var _chunkGG5WUYILjs = require('./chunk-GG5WUYIL.js');
9
+ var _chunk6I3OFE7Sjs = require('./chunk-6I3OFE7S.js');
10
10
  require('./chunk-GBAVURC4.js');
11
11
  require('./chunk-PVCPJUY2.js');
12
12
  require('./chunk-MCKGQKYU.js');
@@ -15,4 +15,4 @@ require('./chunk-MCKGQKYU.js');
15
15
 
16
16
 
17
17
 
18
- exports.applicationGenerator = _chunkLZPNL75Hjs.applicationGenerator; exports.applicationSchematic = _chunkLZPNL75Hjs.applicationSchematic; exports.initGenerator = _chunkGG5WUYILjs.initGenerator; exports.initSchematic = _chunkGG5WUYILjs.initSchematic;
18
+ exports.applicationGenerator = _chunkBAYXERIRjs.applicationGenerator; exports.applicationSchematic = _chunkBAYXERIRjs.applicationSchematic; exports.initGenerator = _chunk6I3OFE7Sjs.initGenerator; exports.initSchematic = _chunk6I3OFE7Sjs.initSchematic;
@@ -2,11 +2,11 @@ import "./chunk-3J7KBHMJ.mjs";
2
2
  import {
3
3
  applicationGenerator,
4
4
  applicationSchematic
5
- } from "./chunk-RQTOQ3CF.mjs";
5
+ } from "./chunk-GNQEX4IG.mjs";
6
6
  import {
7
7
  initGenerator,
8
8
  initSchematic
9
- } from "./chunk-KM2LU3WU.mjs";
9
+ } from "./chunk-5DW5BULI.mjs";
10
10
  import "./chunk-536H3WK5.mjs";
11
11
  import "./chunk-EXZP5MWY.mjs";
12
12
  import "./chunk-FVRCPE3R.mjs";
package/dist/index.js CHANGED
@@ -4,11 +4,11 @@ require('./chunk-DHBG5ASJ.js');
4
4
 
5
5
 
6
6
 
7
- var _chunkLZPNL75Hjs = require('./chunk-LZPNL75H.js');
7
+ var _chunkBAYXERIRjs = require('./chunk-BAYXERIR.js');
8
8
 
9
9
 
10
10
 
11
- var _chunkGG5WUYILjs = require('./chunk-GG5WUYIL.js');
11
+ var _chunk6I3OFE7Sjs = require('./chunk-6I3OFE7S.js');
12
12
  require('./chunk-KUGEZPUO.js');
13
13
  require('./chunk-CVGPWUNP.js');
14
14
 
@@ -160,4 +160,4 @@ function createPackageJson(projectJsonPath, workspaceRoot) {
160
160
 
161
161
 
162
162
 
163
- exports.applicationGenerator = _chunkLZPNL75Hjs.applicationGenerator; exports.applicationSchematic = _chunkLZPNL75Hjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getEncoding = _chunkJCQYTCUMjs.getEncoding; exports.getInternalDependencies = _chunkJCQYTCUMjs.getInternalDependencies; exports.initGenerator = _chunkGG5WUYILjs.initGenerator; exports.initSchematic = _chunkGG5WUYILjs.initSchematic; exports.isTextFile = _chunkJCQYTCUMjs.isTextFile; exports.name = name; exports.uploadFile = _chunkJCQYTCUMjs.uploadFile;
163
+ exports.applicationGenerator = _chunkBAYXERIRjs.applicationGenerator; exports.applicationSchematic = _chunkBAYXERIRjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getEncoding = _chunkJCQYTCUMjs.getEncoding; exports.getInternalDependencies = _chunkJCQYTCUMjs.getInternalDependencies; exports.initGenerator = _chunk6I3OFE7Sjs.initGenerator; exports.initSchematic = _chunk6I3OFE7Sjs.initSchematic; exports.isTextFile = _chunkJCQYTCUMjs.isTextFile; exports.name = name; exports.uploadFile = _chunkJCQYTCUMjs.uploadFile;
package/dist/index.mjs CHANGED
@@ -4,11 +4,11 @@ import "./chunk-3J7KBHMJ.mjs";
4
4
  import {
5
5
  applicationGenerator,
6
6
  applicationSchematic
7
- } from "./chunk-RQTOQ3CF.mjs";
7
+ } from "./chunk-GNQEX4IG.mjs";
8
8
  import {
9
9
  initGenerator,
10
10
  initSchematic
11
- } from "./chunk-KM2LU3WU.mjs";
11
+ } from "./chunk-5DW5BULI.mjs";
12
12
  import "./chunk-SWYYMID7.mjs";
13
13
  import "./chunk-7Z5PILRU.mjs";
14
14
  import {
@@ -2,10 +2,10 @@
2
2
 
3
3
 
4
4
 
5
- var _chunkGG5WUYILjs = require('../../../chunk-GG5WUYIL.js');
5
+ var _chunk6I3OFE7Sjs = require('../../../chunk-6I3OFE7S.js');
6
6
  require('../../../chunk-MCKGQKYU.js');
7
7
 
8
8
 
9
9
 
10
10
 
11
- exports.default = _chunkGG5WUYILjs.generator_default; exports.initGenerator = _chunkGG5WUYILjs.initGenerator; exports.initSchematic = _chunkGG5WUYILjs.initSchematic;
11
+ exports.default = _chunk6I3OFE7Sjs.generator_default; exports.initGenerator = _chunk6I3OFE7Sjs.initGenerator; exports.initSchematic = _chunk6I3OFE7Sjs.initSchematic;
@@ -2,7 +2,7 @@ import {
2
2
  generator_default,
3
3
  initGenerator,
4
4
  initSchematic
5
- } from "../../../chunk-KM2LU3WU.mjs";
5
+ } from "../../../chunk-5DW5BULI.mjs";
6
6
  import "../../../chunk-FVRCPE3R.mjs";
7
7
  export {
8
8
  generator_default as default,
@@ -2,8 +2,8 @@
2
2
 
3
3
 
4
4
 
5
- var _chunkLZPNL75Hjs = require('../../../chunk-LZPNL75H.js');
6
- require('../../../chunk-GG5WUYIL.js');
5
+ var _chunkBAYXERIRjs = require('../../../chunk-BAYXERIR.js');
6
+ require('../../../chunk-6I3OFE7S.js');
7
7
  require('../../../chunk-GBAVURC4.js');
8
8
  require('../../../chunk-PVCPJUY2.js');
9
9
  require('../../../chunk-MCKGQKYU.js');
@@ -11,4 +11,4 @@ require('../../../chunk-MCKGQKYU.js');
11
11
 
12
12
 
13
13
 
14
- exports.applicationGenerator = _chunkLZPNL75Hjs.applicationGenerator; exports.applicationSchematic = _chunkLZPNL75Hjs.applicationSchematic; exports.default = _chunkLZPNL75Hjs.generator_default;
14
+ exports.applicationGenerator = _chunkBAYXERIRjs.applicationGenerator; exports.applicationSchematic = _chunkBAYXERIRjs.applicationSchematic; exports.default = _chunkBAYXERIRjs.generator_default;
@@ -2,8 +2,8 @@ import {
2
2
  applicationGenerator,
3
3
  applicationSchematic,
4
4
  generator_default
5
- } from "../../../chunk-RQTOQ3CF.mjs";
6
- import "../../../chunk-KM2LU3WU.mjs";
5
+ } from "../../../chunk-GNQEX4IG.mjs";
6
+ import "../../../chunk-5DW5BULI.mjs";
7
7
  import "../../../chunk-536H3WK5.mjs";
8
8
  import "../../../chunk-EXZP5MWY.mjs";
9
9
  import "../../../chunk-FVRCPE3R.mjs";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/cloudflare-tools",
3
- "version": "0.71.91",
3
+ "version": "0.71.93",
4
4
  "private": false,
5
5
  "description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
6
6
  "keywords": [
@@ -122,25 +122,25 @@
122
122
  "pretty-bytes": "^7.1.0"
123
123
  },
124
124
  "devDependencies": {
125
- "@nx/devkit": "^22.6.0",
125
+ "@nx/devkit": "22.6.0",
126
126
  "@nx/node": "22.5.1",
127
127
  "@nx/web": "22.5.1",
128
128
  "@nx/webpack": "22.5.1",
129
129
  "@smithy/protocol-http": "^5.3.12",
130
- "nx": "22.5.1",
130
+ "nx": "22.6.0",
131
131
  "tsup": "8.4.0",
132
132
  "untyped": "^2.0.0",
133
133
  "wrangler": "^4.75.0"
134
134
  },
135
135
  "peerDependencies": {
136
- "@nx/devkit": "^22.6.0",
137
- "@nx/js": "22.5.1",
136
+ "@nx/devkit": "22.6.0",
137
+ "@nx/js": "22.6.0",
138
138
  "@nx/node": "22.5.1",
139
139
  "@nx/web": "22.5.1",
140
- "@storm-software/config": "1.135.41",
141
- "@storm-software/config-tools": "1.189.40",
142
- "@storm-software/workspace-tools": "1.295.16",
143
- "nx": "22.5.1",
140
+ "@storm-software/config": "1.136.1",
141
+ "@storm-software/config-tools": "1.189.42",
142
+ "@storm-software/workspace-tools": "1.295.18",
143
+ "nx": "22.6.0",
144
144
  "tsup": "8.4.0",
145
145
  "wrangler": ">=3.58.0"
146
146
  },
@@ -155,5 +155,5 @@
155
155
  "publishConfig": { "access": "public" },
156
156
  "executors": "./executors.json",
157
157
  "generators": "./generators.json",
158
- "gitHead": "86357db0291c9364860c12fda996cd88e8a5e0bd"
158
+ "gitHead": "872dc0ccc98adaac38b0449ed1cf76ffb3eadee0"
159
159
  }
@@ -1,231 +0,0 @@
1
- import {
2
- createCliOptions,
3
- getPackageInfo
4
- } from "./chunk-3MAI3FU2.mjs";
5
- import {
6
- findWorkspaceRoot,
7
- getConfig
8
- } from "./chunk-536H3WK5.mjs";
9
- import {
10
- createHttpHandler
11
- } from "./chunk-SWYYMID7.mjs";
12
- import {
13
- getEncoding,
14
- getInternalDependencies,
15
- uploadFile
16
- } from "./chunk-Z7TZ4UY6.mjs";
17
- import {
18
- correctPaths,
19
- joinPaths,
20
- writeDebug,
21
- writeSuccess,
22
- writeTrace,
23
- writeWarning
24
- } from "./chunk-EXZP5MWY.mjs";
25
-
26
- // src/executors/r2-upload-publish/executor.ts
27
- import {
28
- DeleteObjectsCommand,
29
- ListObjectsCommand,
30
- S3Client
31
- } from "@aws-sdk/client-s3";
32
- import {
33
- createProjectGraphAsync,
34
- readCachedProjectGraph
35
- } from "@nx/devkit";
36
- import { glob } from "glob";
37
- import mime from "mime-types";
38
- import { execSync } from "node:child_process";
39
- import { statSync } from "node:fs";
40
- import { readFile } from "node:fs/promises";
41
- async function runExecutor(options, context) {
42
- const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
43
- if (!context.projectName) {
44
- throw new Error("The executor requires a projectName.");
45
- }
46
- if (!options.path) {
47
- throw new Error("The executor requires the `path` option to upload.");
48
- }
49
- console.info(
50
- `\u{1F680} Running Storm Cloudflare Publish executor on the ${context.projectName} worker`
51
- );
52
- if (!context.projectName || !context.projectsConfigurations?.projects || !context.projectsConfigurations.projects[context.projectName] || !context.projectsConfigurations.projects[context.projectName]?.root) {
53
- throw new Error("The executor requires projectsConfigurations.");
54
- }
55
- try {
56
- const workspaceRoot = findWorkspaceRoot();
57
- const config = await getConfig(workspaceRoot);
58
- const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
59
- const projectDetails = getPackageInfo(
60
- context.projectsConfigurations.projects[context.projectName]
61
- );
62
- const bucketId = options.bucketId;
63
- const bucketPath = options.bucketPath || "/";
64
- if (!bucketId) {
65
- throw new Error("The executor requires a bucketId.");
66
- }
67
- const args = createCliOptions({ ...options });
68
- if (isDryRun) {
69
- args.push("--dry-run");
70
- }
71
- const cloudflareAccountId = process.env.CLOUDFLARE_ACCOUNT_ID || process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
72
- if (!options?.registry && !cloudflareAccountId) {
73
- throw new Error(
74
- "The registry option and `CLOUDFLARE_ACCOUNT_ID` (or `STORM_BOT_CLOUDFLARE_ACCOUNT`) environment variable are not set. Please set one of these values to upload to the Cloudflare R2 bucket."
75
- );
76
- }
77
- if (!process.env.STORM_BOT_ACCESS_KEY_ID && !process.env.ACCESS_KEY_ID && !process.env.CLOUDFLARE_ACCESS_KEY_ID && !process.env.AWS_ACCESS_KEY_ID || !process.env.STORM_BOT_SECRET_ACCESS_KEY && !process.env.CLOUDFLARE_SECRET_ACCESS_KEY && !process.env.SECRET_ACCESS_KEY && !process.env.AWS_SECRET_ACCESS_KEY) {
78
- throw new Error(
79
- "The `ACCESS_KEY_ID` (or `STORM_BOT_ACCESS_KEY_ID`) and `SECRET_ACCESS_KEY` (or `STORM_BOT_SECRET_ACCESS_KEY`) environment variables are not set. Please set these environment variables to upload to the Cloudflare R2 bucket."
80
- );
81
- }
82
- const registry = options?.registry ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
83
- let projectGraph;
84
- try {
85
- projectGraph = readCachedProjectGraph();
86
- } catch {
87
- await createProjectGraphAsync();
88
- projectGraph = readCachedProjectGraph();
89
- }
90
- if (!projectGraph) {
91
- throw new Error(
92
- "The executor failed because the project graph is not available. Please run the build command again."
93
- );
94
- }
95
- writeDebug(
96
- `Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
97
- );
98
- const client = new S3Client({
99
- region: "auto",
100
- endpoint: registry,
101
- credentials: {
102
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
103
- accessKeyId: process.env.STORM_BOT_ACCESS_KEY_ID || process.env.CLOUDFLARE_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID || process.env.ACCESS_KEY_ID,
104
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
105
- secretAccessKey: process.env.STORM_BOT_SECRET_ACCESS_KEY || process.env.CLOUDFLARE_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY || process.env.SECRET_ACCESS_KEY
106
- },
107
- requestHandler: createHttpHandler()
108
- });
109
- const version = projectDetails?.content?.version;
110
- if (version) {
111
- writeDebug(`Starting upload version ${version}`);
112
- }
113
- const basePath = options.path;
114
- const files = await glob(joinPaths(basePath, "**/*"), {
115
- ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
116
- });
117
- const internalDependencies = await getInternalDependencies(
118
- context.projectName,
119
- projectGraph
120
- );
121
- const dependencies = internalDependencies.filter(
122
- (projectNode) => !projectNode.data.tags || projectNode.data.tags.every((tag) => tag.toLowerCase() !== "component")
123
- ).reduce((ret, dep) => {
124
- if (!ret[dep.name]) {
125
- ret[dep.name] = "latest";
126
- }
127
- return ret;
128
- }, projectDetails?.content.dependencies ?? {});
129
- const release = options.tag ?? execSync("npm config get tag").toString().trim();
130
- if (options.clean === true) {
131
- writeDebug(`Clearing out existing items in ${bucketPath}`);
132
- if (!isDryRun) {
133
- const response = await client.send(
134
- new ListObjectsCommand({
135
- Bucket: bucketId,
136
- Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
137
- })
138
- );
139
- if (response?.Contents && response.Contents.length > 0) {
140
- writeTrace(
141
- `Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
142
- );
143
- await client.send(
144
- new DeleteObjectsCommand({
145
- Bucket: bucketId,
146
- Delete: {
147
- Objects: response.Contents.map((item) => ({
148
- Key: item.Key
149
- })),
150
- Quiet: false
151
- }
152
- })
153
- );
154
- } else {
155
- writeDebug(
156
- `No existing items to delete in the R2 bucket path ${bucketPath}`
157
- );
158
- }
159
- } else {
160
- writeWarning("[Dry run]: Skipping R2 bucket clean.");
161
- }
162
- }
163
- if (options.writeMetaJson === true) {
164
- const meta = {
165
- name: context.projectName,
166
- version,
167
- release,
168
- description: projectDetails?.content?.description,
169
- tags: projectDetails?.content?.keywords,
170
- dependencies,
171
- devDependencies: null,
172
- internalDependencies: internalDependencies.filter(
173
- (projectNode) => projectNode.data.tags && projectNode.data.tags.some(
174
- (tag) => tag.toLowerCase() === "component"
175
- )
176
- ).map((dep) => dep.name)
177
- };
178
- if (projectDetails?.type === "package.json") {
179
- meta.devDependencies = projectDetails?.content?.devDependencies;
180
- }
181
- await uploadFile(
182
- client,
183
- bucketId,
184
- bucketPath,
185
- "meta.json",
186
- version,
187
- JSON.stringify(meta),
188
- "application/json",
189
- isDryRun
190
- );
191
- }
192
- await Promise.all(
193
- files.map(async (file) => {
194
- if (statSync(file, {
195
- throwIfNoEntry: false
196
- })?.isFile()) {
197
- const name = correctPaths(file).replace(correctPaths(basePath), "");
198
- const type = mime.lookup(name) || "application/octet-stream";
199
- await uploadFile(
200
- client,
201
- bucketId,
202
- bucketPath,
203
- name,
204
- version,
205
- await readFile(file, getEncoding(type)),
206
- type,
207
- isDryRun
208
- );
209
- }
210
- })
211
- );
212
- writeSuccess(
213
- `Successfully uploaded the ${projectName} project to the Cloudflare R2 bucket.`,
214
- config
215
- );
216
- return {
217
- success: true
218
- };
219
- } catch (error) {
220
- console.error("Failed to publish to Cloudflare R2 bucket");
221
- console.error(error);
222
- console.log("");
223
- return {
224
- success: false
225
- };
226
- }
227
- }
228
-
229
- export {
230
- runExecutor
231
- };
@@ -1,266 +0,0 @@
1
- "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; }
2
-
3
-
4
- var _chunkGBAVURC4js = require('./chunk-GBAVURC4.js');
5
-
6
-
7
-
8
-
9
-
10
-
11
-
12
-
13
- var _chunkPVCPJUY2js = require('./chunk-PVCPJUY2.js');
14
-
15
-
16
- var _chunkGG5WUYILjs = require('./chunk-GG5WUYIL.js');
17
-
18
- // src/generators/worker/generator.ts
19
-
20
-
21
-
22
-
23
-
24
-
25
-
26
-
27
-
28
-
29
-
30
- var _devkit = require('@nx/devkit');
31
- var _projectnameandrootutils = require('@nx/devkit/src/generators/project-name-and-root-utils');
32
- var _node = require('@nx/node');
33
- var _versions = require('@nx/node/src/utils/versions');
34
- var _path = require('path');
35
-
36
- // src/generators/worker/libs/get-account-id.ts
37
- function getAccountId(accountId) {
38
- return `account_id = "${accountId}"`;
39
- }
40
-
41
- // src/generators/worker/libs/vitest-imports.ts
42
- var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
43
-
44
- // src/generators/worker/libs/vitest-script.ts
45
- var vitestScript = `"test": "vitest run"`;
46
-
47
- // src/generators/worker/generator.ts
48
- async function applicationGenerator(tree, schema) {
49
- const stopwatch = _chunkPVCPJUY2js.getStopwatch.call(void 0, "Storm Worker generator");
50
- let config;
51
- try {
52
- const workspaceRoot = _chunkGBAVURC4js.findWorkspaceRoot.call(void 0, );
53
- config = await _chunkGBAVURC4js.getConfig.call(void 0, workspaceRoot);
54
- _chunkPVCPJUY2js.writeInfo.call(void 0,
55
- `${_chunkPVCPJUY2js.brandIcon.call(void 0, config)} Running the Storm Worker generator...
56
-
57
- `,
58
- config
59
- );
60
- _chunkPVCPJUY2js.writeDebug.call(void 0,
61
- `Loading the Storm Config from environment variables and storm.json file...
62
- - workspaceRoot: ${workspaceRoot}`,
63
- config
64
- );
65
- _chunkPVCPJUY2js.writeTrace.call(void 0,
66
- `Loaded Storm config into env:
67
- ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
68
- config
69
- );
70
- const options = await normalizeOptions(tree, schema, config);
71
- const tasks = [];
72
- tasks.push(
73
- await _chunkGG5WUYILjs.generator_default.call(void 0, tree, {
74
- ...options,
75
- skipFormat: true
76
- })
77
- );
78
- tasks.push(
79
- await _node.applicationGenerator.call(void 0, tree, {
80
- ...options,
81
- framework: "none",
82
- skipFormat: true,
83
- unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
84
- e2eTestRunner: "none",
85
- name: schema.name
86
- })
87
- );
88
- if (options.unitTestRunner === "vitest") {
89
- const { vitestGenerator, createOrEditViteConfig } = _devkit.ensurePackage.call(void 0,
90
- "@nx/vite",
91
- _versions.nxVersion
92
- );
93
- const vitestTask = await vitestGenerator(tree, {
94
- project: options.name,
95
- uiFramework: "none",
96
- coverageProvider: "v8",
97
- skipFormat: true,
98
- testEnvironment: "node"
99
- });
100
- tasks.push(vitestTask);
101
- createOrEditViteConfig(
102
- tree,
103
- {
104
- project: options.name,
105
- includeLib: false,
106
- includeVitest: true,
107
- testEnvironment: "node"
108
- },
109
- true
110
- );
111
- }
112
- addCloudflareFiles(tree, options);
113
- updateTsAppConfig(tree, options);
114
- addTargets(tree, options);
115
- if (options.unitTestRunner === "none") {
116
- removeTestFiles(tree, options);
117
- }
118
- if (!options.skipFormat) {
119
- await _devkit.formatFiles.call(void 0, tree);
120
- }
121
- if (options.template === "hono") {
122
- tasks.push(() => {
123
- const packageJsonPath = _devkit.joinPathFragments.call(void 0,
124
- _nullishCoalesce(options.directory, () => ( "")),
125
- "package.json"
126
- );
127
- if (tree.exists(packageJsonPath)) {
128
- _devkit.updateJson.call(void 0, tree, packageJsonPath, (json) => ({
129
- ...json,
130
- dependencies: {
131
- hono: "4.4.0",
132
- ..._optionalChain([json, 'optionalAccess', _ => _.dependencies])
133
- }
134
- }));
135
- }
136
- });
137
- }
138
- return _devkit.runTasksInSerial.call(void 0, ...tasks);
139
- } catch (error) {
140
- return () => {
141
- _chunkPVCPJUY2js.writeFatal.call(void 0,
142
- "A fatal error occurred while running the generator - the process was forced to terminate",
143
- config
144
- );
145
- _chunkPVCPJUY2js.writeError.call(void 0,
146
- `An exception was thrown in the generator's process
147
- - Details: ${error.message}
148
- - Stacktrace: ${error.stack}`,
149
- config
150
- );
151
- };
152
- } finally {
153
- stopwatch();
154
- }
155
- }
156
- function updateTsAppConfig(tree, options) {
157
- _devkit.updateJson.call(void 0, tree, _path.join.call(void 0, options.appProjectRoot, "tsconfig.app.json"), (json) => {
158
- json.compilerOptions = {
159
- ...json.compilerOptions,
160
- esModuleInterop: true,
161
- target: "es2021",
162
- lib: ["es2021"],
163
- module: "es2022",
164
- moduleResolution: "node",
165
- resolveJsonModule: true,
166
- allowJs: true,
167
- checkJs: false,
168
- noEmit: true,
169
- isolatedModules: true,
170
- allowSyntheticDefaultImports: true,
171
- forceConsistentCasingInFileNames: true,
172
- strict: true,
173
- skipLibCheck: true
174
- };
175
- json.compilerOptions.types = [
176
- ...json.compilerOptions.types,
177
- "@cloudflare/workers-types"
178
- ];
179
- return json;
180
- });
181
- }
182
- function addCloudflareFiles(tree, options) {
183
- tree.delete(_path.join.call(void 0, options.appProjectRoot, "src/main.ts"));
184
- _devkit.generateFiles.call(void 0,
185
- tree,
186
- _path.join.call(void 0, __dirname, "./files/common"),
187
- options.appProjectRoot,
188
- {
189
- ...options,
190
- tmpl: "",
191
- name: options.name,
192
- accountId: options.accountId ? getAccountId(options.accountId) : "",
193
- vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
194
- }
195
- );
196
- if (options.template && options.template !== "none") {
197
- _devkit.generateFiles.call(void 0,
198
- tree,
199
- _path.join.call(void 0, __dirname, `./files/${options.template}`),
200
- _path.join.call(void 0, options.appProjectRoot, "src"),
201
- {
202
- ...options,
203
- tmpl: "",
204
- name: options.name,
205
- accountId: options.accountId ? getAccountId(options.accountId) : "",
206
- vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
207
- vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
208
- }
209
- );
210
- }
211
- }
212
- function addTargets(tree, options) {
213
- try {
214
- const projectConfiguration = _devkit.readProjectConfiguration.call(void 0, tree, options.name);
215
- projectConfiguration.targets = {
216
- ..._nullishCoalesce(projectConfiguration.targets, () => ( {})),
217
- serve: {
218
- executor: "@storm-software/cloudflare-tools:serve",
219
- options: {
220
- port: options.port
221
- }
222
- },
223
- "nx-release-publish": {
224
- executor: "@storm-software/cloudflare-tools:cloudflare-publish"
225
- }
226
- };
227
- if (projectConfiguration.targets.build) {
228
- delete projectConfiguration.targets.build;
229
- }
230
- _devkit.updateProjectConfiguration.call(void 0, tree, options.name, projectConfiguration);
231
- } catch (e) {
232
- console.error(e);
233
- }
234
- }
235
- function removeTestFiles(tree, options) {
236
- tree.delete(_path.join.call(void 0, options.appProjectRoot, "src", "index.test.ts"));
237
- }
238
- async function normalizeOptions(host, options, config) {
239
- const { projectName: appProjectName, projectRoot: appProjectRoot } = await _projectnameandrootutils.determineProjectNameAndRootOptions.call(void 0, host, {
240
- name: options.name,
241
- projectType: "application",
242
- directory: options.directory,
243
- rootProject: options.rootProject
244
- });
245
- options.rootProject = appProjectRoot === ".";
246
- return {
247
- addPlugin: process.env.NX_ADD_PLUGINS !== "false",
248
- accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
249
- ...options,
250
- name: _devkit.names.call(void 0, appProjectName).fileName,
251
- frontendProject: options.frontendProject ? _devkit.names.call(void 0, options.frontendProject).fileName : void 0,
252
- appProjectRoot,
253
- unitTestRunner: _nullishCoalesce(options.unitTestRunner, () => ( "vitest")),
254
- rootProject: _nullishCoalesce(options.rootProject, () => ( false)),
255
- template: _nullishCoalesce(options.template, () => ( "fetch-handler")),
256
- port: _nullishCoalesce(options.port, () => ( 3e3))
257
- };
258
- }
259
- var generator_default2 = applicationGenerator;
260
- var applicationSchematic = _devkit.convertNxGenerator.call(void 0, applicationGenerator);
261
-
262
-
263
-
264
-
265
-
266
- exports.applicationGenerator = applicationGenerator; exports.generator_default = generator_default2; exports.applicationSchematic = applicationSchematic;
@@ -1,231 +0,0 @@
1
- "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; }
2
-
3
-
4
- var _chunkN7FW365Qjs = require('./chunk-N7FW365Q.js');
5
-
6
-
7
-
8
- var _chunkGBAVURC4js = require('./chunk-GBAVURC4.js');
9
-
10
-
11
- var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.js');
12
-
13
-
14
-
15
-
16
- var _chunkJCQYTCUMjs = require('./chunk-JCQYTCUM.js');
17
-
18
-
19
-
20
-
21
-
22
-
23
-
24
- var _chunkPVCPJUY2js = require('./chunk-PVCPJUY2.js');
25
-
26
- // src/executors/r2-upload-publish/executor.ts
27
-
28
-
29
-
30
-
31
- var _clients3 = require('@aws-sdk/client-s3');
32
-
33
-
34
-
35
- var _devkit = require('@nx/devkit');
36
- var _glob = require('glob');
37
- var _mimetypes = require('mime-types'); var _mimetypes2 = _interopRequireDefault(_mimetypes);
38
- var _child_process = require('child_process');
39
- var _fs = require('fs');
40
- var _promises = require('fs/promises');
41
- async function runExecutor(options, context) {
42
- const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
43
- if (!context.projectName) {
44
- throw new Error("The executor requires a projectName.");
45
- }
46
- if (!options.path) {
47
- throw new Error("The executor requires the `path` option to upload.");
48
- }
49
- console.info(
50
- `\u{1F680} Running Storm Cloudflare Publish executor on the ${context.projectName} worker`
51
- );
52
- if (!context.projectName || !_optionalChain([context, 'access', _ => _.projectsConfigurations, 'optionalAccess', _2 => _2.projects]) || !context.projectsConfigurations.projects[context.projectName] || !_optionalChain([context, 'access', _3 => _3.projectsConfigurations, 'access', _4 => _4.projects, 'access', _5 => _5[context.projectName], 'optionalAccess', _6 => _6.root])) {
53
- throw new Error("The executor requires projectsConfigurations.");
54
- }
55
- try {
56
- const workspaceRoot = _chunkGBAVURC4js.findWorkspaceRoot.call(void 0, );
57
- const config = await _chunkGBAVURC4js.getConfig.call(void 0, workspaceRoot);
58
- const projectName = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.name]), () => ( context.projectName));
59
- const projectDetails = _chunkN7FW365Qjs.getPackageInfo.call(void 0,
60
- context.projectsConfigurations.projects[context.projectName]
61
- );
62
- const bucketId = options.bucketId;
63
- const bucketPath = options.bucketPath || "/";
64
- if (!bucketId) {
65
- throw new Error("The executor requires a bucketId.");
66
- }
67
- const args = _chunkN7FW365Qjs.createCliOptions.call(void 0, { ...options });
68
- if (isDryRun) {
69
- args.push("--dry-run");
70
- }
71
- const cloudflareAccountId = process.env.CLOUDFLARE_ACCOUNT_ID || process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
72
- if (!_optionalChain([options, 'optionalAccess', _11 => _11.registry]) && !cloudflareAccountId) {
73
- throw new Error(
74
- "The registry option and `CLOUDFLARE_ACCOUNT_ID` (or `STORM_BOT_CLOUDFLARE_ACCOUNT`) environment variable are not set. Please set one of these values to upload to the Cloudflare R2 bucket."
75
- );
76
- }
77
- if (!process.env.STORM_BOT_ACCESS_KEY_ID && !process.env.ACCESS_KEY_ID && !process.env.CLOUDFLARE_ACCESS_KEY_ID && !process.env.AWS_ACCESS_KEY_ID || !process.env.STORM_BOT_SECRET_ACCESS_KEY && !process.env.CLOUDFLARE_SECRET_ACCESS_KEY && !process.env.SECRET_ACCESS_KEY && !process.env.AWS_SECRET_ACCESS_KEY) {
78
- throw new Error(
79
- "The `ACCESS_KEY_ID` (or `STORM_BOT_ACCESS_KEY_ID`) and `SECRET_ACCESS_KEY` (or `STORM_BOT_SECRET_ACCESS_KEY`) environment variables are not set. Please set these environment variables to upload to the Cloudflare R2 bucket."
80
- );
81
- }
82
- const registry = _optionalChain([options, 'optionalAccess', _12 => _12.registry]) ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
83
- let projectGraph;
84
- try {
85
- projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
86
- } catch (e) {
87
- await _devkit.createProjectGraphAsync.call(void 0, );
88
- projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
89
- }
90
- if (!projectGraph) {
91
- throw new Error(
92
- "The executor failed because the project graph is not available. Please run the build command again."
93
- );
94
- }
95
- _chunkPVCPJUY2js.writeDebug.call(void 0,
96
- `Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
97
- );
98
- const client = new (0, _clients3.S3Client)({
99
- region: "auto",
100
- endpoint: registry,
101
- credentials: {
102
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
103
- accessKeyId: process.env.STORM_BOT_ACCESS_KEY_ID || process.env.CLOUDFLARE_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID || process.env.ACCESS_KEY_ID,
104
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
105
- secretAccessKey: process.env.STORM_BOT_SECRET_ACCESS_KEY || process.env.CLOUDFLARE_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY || process.env.SECRET_ACCESS_KEY
106
- },
107
- requestHandler: _chunkKUGEZPUOjs.createHttpHandler.call(void 0, )
108
- });
109
- const version = _optionalChain([projectDetails, 'optionalAccess', _13 => _13.content, 'optionalAccess', _14 => _14.version]);
110
- if (version) {
111
- _chunkPVCPJUY2js.writeDebug.call(void 0, `Starting upload version ${version}`);
112
- }
113
- const basePath = options.path;
114
- const files = await _glob.glob.call(void 0, _chunkPVCPJUY2js.joinPaths.call(void 0, basePath, "**/*"), {
115
- ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
116
- });
117
- const internalDependencies = await _chunkJCQYTCUMjs.getInternalDependencies.call(void 0,
118
- context.projectName,
119
- projectGraph
120
- );
121
- const dependencies = internalDependencies.filter(
122
- (projectNode) => !projectNode.data.tags || projectNode.data.tags.every((tag) => tag.toLowerCase() !== "component")
123
- ).reduce((ret, dep) => {
124
- if (!ret[dep.name]) {
125
- ret[dep.name] = "latest";
126
- }
127
- return ret;
128
- }, _nullishCoalesce(_optionalChain([projectDetails, 'optionalAccess', _15 => _15.content, 'access', _16 => _16.dependencies]), () => ( {})));
129
- const release = _nullishCoalesce(options.tag, () => ( _child_process.execSync.call(void 0, "npm config get tag").toString().trim()));
130
- if (options.clean === true) {
131
- _chunkPVCPJUY2js.writeDebug.call(void 0, `Clearing out existing items in ${bucketPath}`);
132
- if (!isDryRun) {
133
- const response = await client.send(
134
- new (0, _clients3.ListObjectsCommand)({
135
- Bucket: bucketId,
136
- Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
137
- })
138
- );
139
- if (_optionalChain([response, 'optionalAccess', _17 => _17.Contents]) && response.Contents.length > 0) {
140
- _chunkPVCPJUY2js.writeTrace.call(void 0,
141
- `Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
142
- );
143
- await client.send(
144
- new (0, _clients3.DeleteObjectsCommand)({
145
- Bucket: bucketId,
146
- Delete: {
147
- Objects: response.Contents.map((item) => ({
148
- Key: item.Key
149
- })),
150
- Quiet: false
151
- }
152
- })
153
- );
154
- } else {
155
- _chunkPVCPJUY2js.writeDebug.call(void 0,
156
- `No existing items to delete in the R2 bucket path ${bucketPath}`
157
- );
158
- }
159
- } else {
160
- _chunkPVCPJUY2js.writeWarning.call(void 0, "[Dry run]: Skipping R2 bucket clean.");
161
- }
162
- }
163
- if (options.writeMetaJson === true) {
164
- const meta = {
165
- name: context.projectName,
166
- version,
167
- release,
168
- description: _optionalChain([projectDetails, 'optionalAccess', _18 => _18.content, 'optionalAccess', _19 => _19.description]),
169
- tags: _optionalChain([projectDetails, 'optionalAccess', _20 => _20.content, 'optionalAccess', _21 => _21.keywords]),
170
- dependencies,
171
- devDependencies: null,
172
- internalDependencies: internalDependencies.filter(
173
- (projectNode) => projectNode.data.tags && projectNode.data.tags.some(
174
- (tag) => tag.toLowerCase() === "component"
175
- )
176
- ).map((dep) => dep.name)
177
- };
178
- if (_optionalChain([projectDetails, 'optionalAccess', _22 => _22.type]) === "package.json") {
179
- meta.devDependencies = _optionalChain([projectDetails, 'optionalAccess', _23 => _23.content, 'optionalAccess', _24 => _24.devDependencies]);
180
- }
181
- await _chunkJCQYTCUMjs.uploadFile.call(void 0,
182
- client,
183
- bucketId,
184
- bucketPath,
185
- "meta.json",
186
- version,
187
- JSON.stringify(meta),
188
- "application/json",
189
- isDryRun
190
- );
191
- }
192
- await Promise.all(
193
- files.map(async (file) => {
194
- if (_optionalChain([_fs.statSync.call(void 0, file, {
195
- throwIfNoEntry: false
196
- }), 'optionalAccess', _25 => _25.isFile, 'call', _26 => _26()])) {
197
- const name = _chunkPVCPJUY2js.correctPaths.call(void 0, file).replace(_chunkPVCPJUY2js.correctPaths.call(void 0, basePath), "");
198
- const type = _mimetypes2.default.lookup(name) || "application/octet-stream";
199
- await _chunkJCQYTCUMjs.uploadFile.call(void 0,
200
- client,
201
- bucketId,
202
- bucketPath,
203
- name,
204
- version,
205
- await _promises.readFile.call(void 0, file, _chunkJCQYTCUMjs.getEncoding.call(void 0, type)),
206
- type,
207
- isDryRun
208
- );
209
- }
210
- })
211
- );
212
- _chunkPVCPJUY2js.writeSuccess.call(void 0,
213
- `Successfully uploaded the ${projectName} project to the Cloudflare R2 bucket.`,
214
- config
215
- );
216
- return {
217
- success: true
218
- };
219
- } catch (error) {
220
- console.error("Failed to publish to Cloudflare R2 bucket");
221
- console.error(error);
222
- console.log("");
223
- return {
224
- success: false
225
- };
226
- }
227
- }
228
-
229
-
230
-
231
- exports.runExecutor = runExecutor;
@@ -1,269 +0,0 @@
1
- import {
2
- findWorkspaceRoot,
3
- getConfig
4
- } from "./chunk-536H3WK5.mjs";
5
- import {
6
- brandIcon,
7
- getStopwatch,
8
- writeDebug,
9
- writeError,
10
- writeFatal,
11
- writeInfo,
12
- writeTrace
13
- } from "./chunk-EXZP5MWY.mjs";
14
- import {
15
- generator_default
16
- } from "./chunk-KM2LU3WU.mjs";
17
- import {
18
- __dirname
19
- } from "./chunk-FVRCPE3R.mjs";
20
-
21
- // src/generators/worker/generator.ts
22
- import {
23
- convertNxGenerator,
24
- ensurePackage,
25
- formatFiles,
26
- generateFiles,
27
- joinPathFragments,
28
- names,
29
- readProjectConfiguration,
30
- runTasksInSerial,
31
- updateJson,
32
- updateProjectConfiguration
33
- } from "@nx/devkit";
34
- import { determineProjectNameAndRootOptions } from "@nx/devkit/src/generators/project-name-and-root-utils";
35
- import { applicationGenerator as nodeApplicationGenerator } from "@nx/node";
36
- import { nxVersion } from "@nx/node/src/utils/versions";
37
- import { join } from "path";
38
-
39
- // src/generators/worker/libs/get-account-id.ts
40
- function getAccountId(accountId) {
41
- return `account_id = "${accountId}"`;
42
- }
43
-
44
- // src/generators/worker/libs/vitest-imports.ts
45
- var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
46
-
47
- // src/generators/worker/libs/vitest-script.ts
48
- var vitestScript = `"test": "vitest run"`;
49
-
50
- // src/generators/worker/generator.ts
51
- async function applicationGenerator(tree, schema) {
52
- const stopwatch = getStopwatch("Storm Worker generator");
53
- let config;
54
- try {
55
- const workspaceRoot = findWorkspaceRoot();
56
- config = await getConfig(workspaceRoot);
57
- writeInfo(
58
- `${brandIcon(config)} Running the Storm Worker generator...
59
-
60
- `,
61
- config
62
- );
63
- writeDebug(
64
- `Loading the Storm Config from environment variables and storm.json file...
65
- - workspaceRoot: ${workspaceRoot}`,
66
- config
67
- );
68
- writeTrace(
69
- `Loaded Storm config into env:
70
- ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
71
- config
72
- );
73
- const options = await normalizeOptions(tree, schema, config);
74
- const tasks = [];
75
- tasks.push(
76
- await generator_default(tree, {
77
- ...options,
78
- skipFormat: true
79
- })
80
- );
81
- tasks.push(
82
- await nodeApplicationGenerator(tree, {
83
- ...options,
84
- framework: "none",
85
- skipFormat: true,
86
- unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
87
- e2eTestRunner: "none",
88
- name: schema.name
89
- })
90
- );
91
- if (options.unitTestRunner === "vitest") {
92
- const { vitestGenerator, createOrEditViteConfig } = ensurePackage(
93
- "@nx/vite",
94
- nxVersion
95
- );
96
- const vitestTask = await vitestGenerator(tree, {
97
- project: options.name,
98
- uiFramework: "none",
99
- coverageProvider: "v8",
100
- skipFormat: true,
101
- testEnvironment: "node"
102
- });
103
- tasks.push(vitestTask);
104
- createOrEditViteConfig(
105
- tree,
106
- {
107
- project: options.name,
108
- includeLib: false,
109
- includeVitest: true,
110
- testEnvironment: "node"
111
- },
112
- true
113
- );
114
- }
115
- addCloudflareFiles(tree, options);
116
- updateTsAppConfig(tree, options);
117
- addTargets(tree, options);
118
- if (options.unitTestRunner === "none") {
119
- removeTestFiles(tree, options);
120
- }
121
- if (!options.skipFormat) {
122
- await formatFiles(tree);
123
- }
124
- if (options.template === "hono") {
125
- tasks.push(() => {
126
- const packageJsonPath = joinPathFragments(
127
- options.directory ?? "",
128
- "package.json"
129
- );
130
- if (tree.exists(packageJsonPath)) {
131
- updateJson(tree, packageJsonPath, (json) => ({
132
- ...json,
133
- dependencies: {
134
- hono: "4.4.0",
135
- ...json?.dependencies
136
- }
137
- }));
138
- }
139
- });
140
- }
141
- return runTasksInSerial(...tasks);
142
- } catch (error) {
143
- return () => {
144
- writeFatal(
145
- "A fatal error occurred while running the generator - the process was forced to terminate",
146
- config
147
- );
148
- writeError(
149
- `An exception was thrown in the generator's process
150
- - Details: ${error.message}
151
- - Stacktrace: ${error.stack}`,
152
- config
153
- );
154
- };
155
- } finally {
156
- stopwatch();
157
- }
158
- }
159
- function updateTsAppConfig(tree, options) {
160
- updateJson(tree, join(options.appProjectRoot, "tsconfig.app.json"), (json) => {
161
- json.compilerOptions = {
162
- ...json.compilerOptions,
163
- esModuleInterop: true,
164
- target: "es2021",
165
- lib: ["es2021"],
166
- module: "es2022",
167
- moduleResolution: "node",
168
- resolveJsonModule: true,
169
- allowJs: true,
170
- checkJs: false,
171
- noEmit: true,
172
- isolatedModules: true,
173
- allowSyntheticDefaultImports: true,
174
- forceConsistentCasingInFileNames: true,
175
- strict: true,
176
- skipLibCheck: true
177
- };
178
- json.compilerOptions.types = [
179
- ...json.compilerOptions.types,
180
- "@cloudflare/workers-types"
181
- ];
182
- return json;
183
- });
184
- }
185
- function addCloudflareFiles(tree, options) {
186
- tree.delete(join(options.appProjectRoot, "src/main.ts"));
187
- generateFiles(
188
- tree,
189
- join(__dirname, "./files/common"),
190
- options.appProjectRoot,
191
- {
192
- ...options,
193
- tmpl: "",
194
- name: options.name,
195
- accountId: options.accountId ? getAccountId(options.accountId) : "",
196
- vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
197
- }
198
- );
199
- if (options.template && options.template !== "none") {
200
- generateFiles(
201
- tree,
202
- join(__dirname, `./files/${options.template}`),
203
- join(options.appProjectRoot, "src"),
204
- {
205
- ...options,
206
- tmpl: "",
207
- name: options.name,
208
- accountId: options.accountId ? getAccountId(options.accountId) : "",
209
- vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
210
- vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
211
- }
212
- );
213
- }
214
- }
215
- function addTargets(tree, options) {
216
- try {
217
- const projectConfiguration = readProjectConfiguration(tree, options.name);
218
- projectConfiguration.targets = {
219
- ...projectConfiguration.targets ?? {},
220
- serve: {
221
- executor: "@storm-software/cloudflare-tools:serve",
222
- options: {
223
- port: options.port
224
- }
225
- },
226
- "nx-release-publish": {
227
- executor: "@storm-software/cloudflare-tools:cloudflare-publish"
228
- }
229
- };
230
- if (projectConfiguration.targets.build) {
231
- delete projectConfiguration.targets.build;
232
- }
233
- updateProjectConfiguration(tree, options.name, projectConfiguration);
234
- } catch (e) {
235
- console.error(e);
236
- }
237
- }
238
- function removeTestFiles(tree, options) {
239
- tree.delete(join(options.appProjectRoot, "src", "index.test.ts"));
240
- }
241
- async function normalizeOptions(host, options, config) {
242
- const { projectName: appProjectName, projectRoot: appProjectRoot } = await determineProjectNameAndRootOptions(host, {
243
- name: options.name,
244
- projectType: "application",
245
- directory: options.directory,
246
- rootProject: options.rootProject
247
- });
248
- options.rootProject = appProjectRoot === ".";
249
- return {
250
- addPlugin: process.env.NX_ADD_PLUGINS !== "false",
251
- accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
252
- ...options,
253
- name: names(appProjectName).fileName,
254
- frontendProject: options.frontendProject ? names(options.frontendProject).fileName : void 0,
255
- appProjectRoot,
256
- unitTestRunner: options.unitTestRunner ?? "vitest",
257
- rootProject: options.rootProject ?? false,
258
- template: options.template ?? "fetch-handler",
259
- port: options.port ?? 3e3
260
- };
261
- }
262
- var generator_default2 = applicationGenerator;
263
- var applicationSchematic = convertNxGenerator(applicationGenerator);
264
-
265
- export {
266
- applicationGenerator,
267
- generator_default2 as generator_default,
268
- applicationSchematic
269
- };