@storm-software/cloudflare-tools 0.71.118 → 0.71.120

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.
Files changed (32) hide show
  1. package/CHANGELOG.md +20 -0
  2. package/README.md +1 -1
  3. package/dist/{chunk-LACL4JSA.mjs → chunk-4TGUQQI6.mjs} +5 -5
  4. package/dist/{chunk-4GCN6FO5.mjs → chunk-B4THW2DZ.mjs} +1 -1
  5. package/dist/{chunk-BFZP3ZIE.js → chunk-ISXWYV7K.js} +4 -4
  6. package/dist/{chunk-FU2GBN2O.mjs → chunk-L5T2AN7L.mjs} +1 -1
  7. package/dist/{chunk-Q3UOHXUV.js → chunk-LGXDI6TR.js} +4 -4
  8. package/dist/{chunk-KAJQR5PF.mjs → chunk-XPPAIPSU.mjs} +1 -1
  9. package/dist/{chunk-YOYU3IRK.mjs → chunk-ZGMVA2AZ.mjs} +2 -2
  10. package/dist/executors.js +3 -3
  11. package/dist/executors.mjs +6 -6
  12. package/dist/generators.js +5 -5
  13. package/dist/generators.mjs +5 -5
  14. package/dist/index.js +10 -10
  15. package/dist/index.mjs +14 -14
  16. package/dist/src/executors/cloudflare-publish/executor.mjs +3 -3
  17. package/dist/src/executors/r2-upload-publish/executor.js +4 -4
  18. package/dist/src/executors/r2-upload-publish/executor.mjs +4 -4
  19. package/dist/src/executors/serve/executor.mjs +2 -2
  20. package/dist/src/generators/init/generator.js +2 -2
  21. package/dist/src/generators/init/generator.mjs +2 -2
  22. package/dist/src/generators/worker/generator.js +3 -3
  23. package/dist/src/generators/worker/generator.mjs +3 -3
  24. package/dist/src/utils/http-handler.mjs +1 -1
  25. package/dist/src/utils/index.mjs +1 -1
  26. package/dist/src/utils/r2-bucket-helpers.mjs +1 -1
  27. package/dist/tsup.config.mjs +1 -1
  28. package/package.json +5 -5
  29. package/dist/chunk-EBT36S6J.js +0 -231
  30. package/dist/chunk-IIS253RT.mjs +0 -231
  31. package/dist/chunk-L2YMTHF2.js +0 -266
  32. package/dist/chunk-LEATTEFI.mjs +0 -269
@@ -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
- var _chunkQ3UOHXUVjs = require('./chunk-Q3UOHXUV.js');
4
-
5
-
6
-
7
- var _chunkOEP2XBU4js = require('./chunk-OEP2XBU4.js');
8
-
9
-
10
-
11
-
12
-
13
-
14
-
15
-
16
- var _chunkRIBK362Wjs = require('./chunk-RIBK362W.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 = _chunkRIBK362Wjs.getStopwatch.call(void 0, "Storm Worker generator");
50
- let config;
51
- try {
52
- const workspaceRoot = _chunkOEP2XBU4js.findWorkspaceRoot.call(void 0, );
53
- config = await _chunkOEP2XBU4js.getConfig.call(void 0, workspaceRoot);
54
- _chunkRIBK362Wjs.writeInfo.call(void 0,
55
- `${_chunkRIBK362Wjs.brandIcon.call(void 0, config)} Running the Storm Worker generator...
56
-
57
- `,
58
- config
59
- );
60
- _chunkRIBK362Wjs.writeDebug.call(void 0,
61
- `Loading the Storm Config from environment variables and storm.json file...
62
- - workspaceRoot: ${workspaceRoot}`,
63
- config
64
- );
65
- _chunkRIBK362Wjs.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 _chunkQ3UOHXUVjs.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
- _chunkRIBK362Wjs.writeFatal.call(void 0,
142
- "A fatal error occurred while running the generator - the process was forced to terminate",
143
- config
144
- );
145
- _chunkRIBK362Wjs.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,269 +0,0 @@
1
- import {
2
- findWorkspaceRoot,
3
- getConfig
4
- } from "./chunk-5QM4JUN3.mjs";
5
- import {
6
- brandIcon,
7
- getStopwatch,
8
- writeDebug,
9
- writeError,
10
- writeFatal,
11
- writeInfo,
12
- writeTrace
13
- } from "./chunk-ZDABHOZ2.mjs";
14
- import {
15
- generator_default
16
- } from "./chunk-LACL4JSA.mjs";
17
- import {
18
- __dirname
19
- } from "./chunk-FU2GBN2O.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
- };